Changeset 13975

Timestamp:

Feb 5, 2013, 2:35:01 PM (8 years ago)

Author:

jordan

Message:

(libT) #5275 'quotactl breaks compilation of libT/platform.c on Solaris' -- fixed with patch from spaam

File:

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

trunk/libtransmission/platform.c

@@ -15 +15 @@
  #ifdef __FreeBSD__
   #include <ufs/ufs/quota.h> /* quotactl() */
+ #elif defined (__sun)
+  #include <sys/fs/ufs_quota.h> /* quotactl */
  #else
   #include <sys/quota.h> /* quotactl() */
  #endif
  #ifdef HAVE_GETMNTENT
-  #include <mntent.h>
-  #include <paths.h> /* _PATH_MOUNTED */
+  #ifdef __sun
+   #include <stdio.h>
+   #include <sys/mntent.h>
+   #include <sys/mnttab.h>
+   #define _PATH_MOUNTED MNTTAB
+  #else
+   #include <mntent.h>
+   #include <paths.h> /* _PATH_MOUNTED */
+  #endif
  #else /* BSD derived systems */
   #include <sys/param.h>
@@ -730 +739 @@
 
   FILE * fp;
+
+#ifdef __sun
+  struct mnttab * mnt;
+  fp = fopen(_PATH_MOUNTED, "r");
+  if (fp == NULL)
+    return NULL;
+
+  while (getmntent(fp, mnt))
+    if (!tr_strcmp0 (path, mnt->mnt_mountp))
+      break;
+  fclose(fp);
+  return mnt ? mnt->mnt_fstype : NULL;
+#else
   struct mntent * mnt;
 
@@ -742 +764 @@
   endmntent(fp);
   return mnt ? mnt->mnt_fsname : NULL;
-
+#endif
 #else /* BSD derived systems */
 
@@ -769 +791 @@
 
   FILE * fp;
+#ifdef __sun
+  struct mnttab *mnt;
+  fp = fopen(_PATH_MOUNTED, "r");
+  if (fp == NULL)
+    return NULL;
+  while (getmntent(fp, mnt))
+    if (!tr_strcmp0 (device, mnt->mnt_mountp))
+      break;
+  fclose(fp);
+  return mnt ? mnt->mnt_fstype : NULL;
+#else
   struct mntent *mnt;
 
@@ -781 +814 @@
   endmntent(fp);
   return mnt ? mnt->mnt_type : NULL;
-
+#endif
 #else /* BSD derived systems */
 
@@ -837 +870 @@
 #if defined(__FreeBSD__) || defined(SYS_DARWIN)
   if (quotactl(device, QCMD(Q_GETQUOTA, USRQUOTA), getuid(), (caddr_t) &dq) == 0)
+    {
+#elif defined(__sun)
+  struct quotctl  op; 
+  int fd = open(device, O_RDONLY); 
+  if (fd < 0) 
+    return -1; 
+  op.op = Q_GETQUOTA; 
+  op.uid = getuid(); 
+  op.addr = (caddr_t) &dq; 
+  if (ioctl(fd, Q_QUOTACTL, &op) == 0)
+    {
+      close(fd);
 #else
   if (quotactl(QCMD(Q_GETQUOTA, USRQUOTA), device, getuid(), (caddr_t) &dq) == 0)
-#endif
-    {
+    {
+#endif
       if (dq.dqb_bsoftlimit > 0)
         {
@@ -861 +906 @@
 #elif defined(__UCLIBC__)
       spaceused = (int64_t) btodb(dq.dqb_curblocks);
+#elif defined(__sun)
+      spaceused = (int64_t) dq.dqb_curblocks >> 1;
 #else
       spaceused = btodb(dq.dqb_curspace);
@@ -871 +918 @@
 #endif
     }
-
+#if defined(__sun)
+  close(fd);
+#endif
   /* something went wrong */
   return -1;