Changeset 1763

Timestamp:

Apr 20, 2007, 2:05:07 AM (15 years ago)

Author:

joshe

Message:

Add more I/O error codes.

Location:

trunk/libtransmission

Files:

• fdlimit.c (modified) (5 diffs)
• inout.c (modified) (1 diff)
• transmission.h (modified) (1 diff)
• utils.c (modified) (2 diffs)
• utils.h (modified) (1 diff)

trunk/libtransmission/fdlimit.c

@@ -68 +68 @@
  * Local prototypes
  **********************************************************************/
-static int  ErrorFromErrno();
 static int  OpenFile( int i, char * folder, char * name, int write );
 static void CloseFile( int i );
@@ -408 +407 @@
 
 /***********************************************************************
- * ErrorFromErrno
- **********************************************************************/
-static int ErrorFromErrno()
-{
-    if( errno == EACCES || errno == EROFS )
-        return TR_ERROR_IO_PERMISSIONS;
-    return TR_ERROR_IO_OTHER;
-}
-
-/***********************************************************************
  * CheckFolder
  ***********************************************************************
@@ -427 +416 @@
     struct stat sb;
     char * path;
+    int ret;
 
     tr_dbg( "Opening %s in %s (%d)", name, folder, write );
@@ -451 +441 @@
                 if( mkdir( path, 0777 ) )
                 {
+                    ret = tr_ioErrorFromErrno();
                     tr_err( "Could not create folder '%s'", path );
                     free( path );
-                    return ErrorFromErrno();
+                    return ret;
                 }
             }
@@ -472 +463 @@
     /* Now try to really open the file */
     file->file = open( path, write ? ( O_RDWR | O_CREAT ) : O_RDONLY, 0666 );
-    free( path );
-
     if( file->file < 0 )
     {
-        int ret = ErrorFromErrno();
+        ret = tr_ioErrorFromErrno();
+        free( path );
         tr_err( "Could not open %s in %s (%d, %d)", name, folder, write, ret );
         return ret;
     }
+    free( path );
 
     return TR_OK;

trunk/libtransmission/inout.c

@@ -410 +410 @@
             if( readOrWrite( file, buf, cur ) != cur )
             {
+                ret = tr_ioErrorFromErrno();
                 tr_fdFileRelease( file );
-                ret = TR_ERROR_IO_OTHER;
                 goto cleanup;
             }

trunk/libtransmission/transmission.h

@@ -66 +66 @@
 #define TR_ERROR_ASSERT         0x82000000
 /* I/O errors */
-#define TR_ERROR_IO_MASK        0x0000000F
+#define TR_ERROR_IO_MASK        0x000000FF
 #define TR_ERROR_IO_PARENT      0x80000001
 #define TR_ERROR_IO_PERMISSIONS 0x80000002
-#define TR_ERROR_IO_OTHER       0x80000008
+#define TR_ERROR_IO_SPACE       0x80000004
+#define TR_ERROR_IO_RESOURCES   0x80000008
+#define TR_ERROR_IO_OTHER       0x80000010
 /* Misc */
-#define TR_ERROR_TC_MASK        0x000000F0
-#define TR_ERROR_TC_ERROR       0x80000010
-#define TR_ERROR_TC_WARNING     0x80000020
+#define TR_ERROR_TC_MASK        0x00000F00
+#define TR_ERROR_TC_ERROR       0x80000100
+#define TR_ERROR_TC_WARNING     0x80000200
 
 /***********************************************************************

trunk/libtransmission/utils.c

@@ -360 +360 @@
 }
 
+int
+tr_ioErrorFromErrno( void )
+{
+    if( EACCES == errno || EROFS == errno )
+    {
+        return TR_ERROR_IO_PERMISSIONS;
+    }
+    else if( ENOSPC == errno )
+    {
+        return TR_ERROR_IO_SPACE;
+    }
+    else if( EMFILE == errno || EFBIG == errno )
+    {
+        return TR_ERROR_IO_RESOURCES;
+    }
+    tr_dbg( "generic i/o errno from errno: %s", strerror( errno ) );
+    return TR_ERROR_IO_OTHER;
+}
+
 char *
 tr_errorString( int code )
@@ -375 +394 @@
         case TR_ERROR_IO_PERMISSIONS:
             return "Insufficient permissions";
+        case TR_ERROR_IO_SPACE:
+            return "Insufficient free space";
+        case TR_ERROR_IO_RESOURCES:
+            return "Insufficient resources";
         case TR_ERROR_IO_OTHER:
             return "Generic I/O error";

trunk/libtransmission/utils.h

@@ -74 +74 @@
 char * tr_dupstr( const char * base, int len );
 
+int    tr_ioErrorFromErrno( void );
+
 char * tr_errorString( int code );