Changeset 1200

Timestamp:

Dec 13, 2006, 9:32:54 PM (16 years ago)

Author:

titer

Message:

Don't try to create the parent folder, and only create sub-folders for read-write access

File:

• branches/io/libtransmission/fdlimit.c (modified) (5 diffs)

branches/io/libtransmission/fdlimit.c

@@ -61 +61 @@
  * Local prototypes
  **********************************************************************/
+static int  ErrorFromErrno();
 static void CloseFile( tr_fd_t * f, int i );
-static int  CheckCanOpen( char * folder, char * name, int write );
+static int  CheckFolder( char * folder, char * name, int write );
 
 
@@ -151 +152 @@
 
     /* We'll need to open it, make sure that we can */
-    if( ( ret = CheckCanOpen( folder, name, write ) ) )
+    if( ( ret = CheckFolder( folder, name, write ) ) )
     {
         tr_err( "Can not open %s in %s (%d)", name, folder, ret );
@@ -206 +207 @@
     if( f->open[winner].file < 0 )
     {
-        tr_err( "Could not open %s in %s (%d)", name, folder, errno );
+        ret = ErrorFromErrno();
         tr_lockUnlock( &f->lock );
-        return TR_ERROR_IO_OTHER;
+        tr_err( "Could not open %s in %s (%d)", name, folder, ret );
+        return ret;
     }
     snprintf( f->open[winner].folder, MAX_PATH_LENGTH, "%s", folder );
@@ -339 +341 @@
  * Local functions
  **********************************************************************/
+
+/***********************************************************************
+ * ErrorFromErrno
+ **********************************************************************/
+static int ErrorFromErrno()
+{
+    if( errno == EACCES || errno == EROFS )
+        return TR_ERROR_IO_PERMISSIONS;
+    return TR_ERROR_IO_OTHER;
+}
 
 /***********************************************************************
@@ -363 +375 @@
 
 /***********************************************************************
- * CheckCanOpen
+ * CheckFolder
  ***********************************************************************
  *
  **********************************************************************/
-static int CheckCanOpen( char * folder, char * name, int write )
-{
-    return 0;
-}
+static int CheckFolder( char * folder, char * name, int write )
+{
+    struct stat sb;
+    char * path, * p, * s;
+    int ret = 0;
+
+    if( stat( folder, &sb ) || !S_ISDIR( sb.st_mode ) )
+    {
+        return TR_ERROR_IO_PARENT;
+    }
+
+    asprintf( &path, "%s/%s", folder, name );
+
+    p = path + strlen( folder ) + 1;;
+    while( ( s = strchr( p, '/' ) ) )
+    {
+        *s = '\0';
+        if( stat( folder, &sb ) )
+        {
+            /* Sub-folder does not exist */
+            if( !write )
+            {
+                ret = TR_ERROR_IO_OTHER;
+                break;
+            }
+            if( mkdir( path, 0777 ) )
+            {
+                ret = ErrorFromErrno();
+                break;
+            }
+        }
+        else
+        {
+            if( !S_ISDIR( sb.st_mode ) )
+            {
+                ret = TR_ERROR_IO_OTHER;
+                break;
+            }
+        }
+        *s = '/';
+    }
+    free( path );
+
+    return ret;
+}