Changeset 13714 for trunk/libtransmission/platform.c

Timestamp:

Dec 29, 2012, 1:47:44 AM (9 years ago)

Author:

jordan

Message:

(trunk, libT) #3833 'freespace argument for session-get' -- 0001-Port-quota-handling-to-BSD-and-Mac-OS-X.patch from taem

File:

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

trunk/libtransmission/platform.c

@@ -14 +14 @@
  #include <sys/types.h> /* types needed by quota.h */
  #include <sys/quota.h> /* quotactl */
+ #ifdef __FreeBSD__
+  #include <ufs/ufs/quota.h> /* quotactl() */
+ #else
+  #include <sys/quota.h> /* quotactl() */
+ #endif
  #ifdef HAVE_GETMNTENT
   #include <mntent.h>
@@ -829 +834 @@
   int64_t limit;
   int64_t freespace;
-
-  if (quotactl(QCMD(Q_GETQUOTA, USRQUOTA), device, getuid(), (caddr_t) & dq) == 0)
+  int64_t spaceused;
+
+#if defined(__FreeBSD__) || defined(SYS_DARWIN)
+  if (quotactl(device, QCMD(Q_GETQUOTA, USRQUOTA), getuid(), &dq) == 0)
+#else
+  if (quotactl(QCMD(Q_GETQUOTA, USRQUOTA), device, getuid(), (caddr_t) &dq) == 0)
+#endif
     {
       if (dq.dqb_bsoftlimit > 0)
@@ -846 +856 @@
           return -1;
         }
-
-      freespace = limit - btodb(dq.dqb_curspace);
+#if defined(__FreeBSD__) || defined(SYS_DARWIN)
+      spaceused = (int64_t) dqb_curblocks >> 1;
+#else
+      spaceused = btodb(dq.dqb_curspace);
+#endif
+      freespace = limit - spaceused;
       return (freespace < 0) ? 0 : freespace * 1024;
     }