Changeset 14120

Timestamp:

Jul 14, 2013, 11:00:39 PM (8 years ago)

Author:

jordan

Message:

(trunk, libT) #5275: fix platform quota crash on solaris 2.12, patch by godot

File:

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

trunk/libtransmission/platform-quota.c

@@ -28 +28 @@
  #ifdef HAVE_GETMNTENT
   #ifdef __sun
+   #include <sys/types.h>
+   #include <sys/stat.h>
+   #include <fcntl.h>
    #include <stdio.h>
    #include <sys/mntent.h>
@@ -74 +77 @@
 
 #ifdef __sun
-  struct mnttab * mnt;
+  struct mnttab mnt;
   fp = fopen(_PATH_MOUNTED, "r");
   if (fp == NULL)
     return NULL;
 
-  while (getmntent(fp, mnt))
-    if (!tr_strcmp0 (path, mnt->mnt_mountp))
+  while (getmntent(fp, &mnt))
+    if (!tr_strcmp0 (path, mnt.mnt_mountp))
       break;
   fclose(fp);
-  return mnt ? mnt->mnt_fstype : NULL;
+  return mnt.mnt_special;
 #else
   struct mntent * mnt;
@@ -125 +128 @@
   FILE * fp;
 #ifdef __sun
-  struct mnttab *mnt;
+  struct mnttab mnt;
   fp = fopen(_PATH_MOUNTED, "r");
   if (fp == NULL)
     return NULL;
-  while (getmntent(fp, mnt))
-    if (!tr_strcmp0 (device, mnt->mnt_mountp))
+  while (getmntent(fp, &mnt))
+    if (!tr_strcmp0 (device, mnt.mnt_mountp))
       break;
   fclose(fp);
-  return mnt ? mnt->mnt_fstype : NULL;
+  return mnt.mnt_fstype;
 #else
   struct mntent *mnt;