Changeset 13698 for trunk/libtransmission/platform.c

Timestamp:

Dec 27, 2012, 7:45:01 PM (8 years ago)

Author:

jordan

Message:

(trunk, libT) #3833 'freespace' argument for 'session-get' RPC method -- apply taem's 0003-Cache-download-dir-s-block-device-and-FS-type.patch​ to cache the download dir's block device and FS type

File:

• trunk/libtransmission/platform.c (modified) (3 diffs)

trunk/libtransmission/platform.c

@@ -889 +889 @@
 
 static int64_t
-tr_getQuotaFreeSpace( const char * path )
+tr_getQuotaFreeSpace( const char * path, char * device, char * fstype )
 {
     int64_t ret=-1;
 #ifndef WIN32
-    char *d, *device;
-    char *fstype;
-
-    if ((d = getblkdev(path)) == NULL)
-    {
-        return ret;
-    }
-    /* 'd' points to static area of memory, so copy it */
-    device = tr_strdup(d);
-
-    fstype = getfstype(device);
-    if (fstype != NULL && strcasecmp(fstype, "xfs") == 0)
+    char *d;
+    char *fs;
+
+    if (strlen(device) == 0)
+    {
+        if ((d = getblkdev(path)) == NULL)
+        {
+            return ret;
+        }
+        /* Save device for future use */
+        tr_strlcpy(device, d, PATH_MAX + 1);
+    }
+
+    if (strlen(fstype) == 0)
+    {
+        if ((fs = getfstype(device)) != NULL)
+        {
+             /* Save FS type for future use */
+             tr_strlcpy(fstype, fs, PATH_MAX + 1);
+        }
+    }
+
+    if (strcasecmp(fstype, "xfs") == 0)
     {
 #ifdef HAVE_XQM
@@ -913 +924 @@
     }
 
-    tr_free(device);
 #endif /* WIN32 */
     return ret;
@@ -936 +946 @@
 
 int64_t
-tr_getFreeSpace( const char * path )
-{
-    int64_t i = tr_getQuotaFreeSpace( path );
+tr_getFreeSpace( const char * path, char * device, char * fstype )
+{
+    int64_t i = tr_getQuotaFreeSpace( path, device, fstype );
     if( i < 0 )
         i = tr_getDiskFreeSpace( path );