X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fmountlist.c;h=6f7d07cbc1b9eb970801d2669e2ffcd29c499b15;hb=115741fa52092c59e33d75428b776513caa88f87;hp=32e1843abb279576c48251c65988642e07103bac;hpb=bcf3308e2e282ece45f37973230629fd3f657a9f;p=gnulib.git

diff --git a/lib/mountlist.c b/lib/mountlist.c
index 32e1843ab..6f7d07cbc 100644
--- a/lib/mountlist.c
+++ b/lib/mountlist.c
@@ -84,7 +84,7 @@ extern int errno;
 # include <sys/fs_types.h>
 #endif
 
-#ifdef MOUNTED_NEXT_DEV		/* BeOS.  */
+#ifdef MOUNTED_FS_STAT_DEV	/* BeOS.  */
 # include <fs_info.h>
 # include <dirent.h>
 #endif
@@ -260,7 +260,7 @@ static char *
 fsp_to_string (const struct statfs *fsp)
 {
 # if defined HAVE_F_FSTYPENAME_IN_STATFS
-  return fsp->f_fstypename;
+  return (char *) (fsp->f_fstypename);
 # else
   return fstype_to_string (fsp->f_type);
 # endif
@@ -417,7 +417,7 @@ read_filesystem_list (int need_fs_type)
   }
 #endif /* MOUNTED_GETMNT. */
 
-#if defined (MOUNTED_NEXT_DEV) /* BeOS */
+#if defined (MOUNTED_FS_STAT_DEV) /* BeOS */
   {
     /* The next_dev() and fs_stat_dev() system calls give the list of
        all filesystems, including the information returned by statvfs()
@@ -468,7 +468,7 @@ read_filesystem_list (int need_fs_type)
                 strcpy (name + 1, d->d_name);
               }
 
-            if (stat (name, &statbuf) >= 0 && S_ISDIR (statbuf.st_mode))
+            if (lstat (name, &statbuf) >= 0 && S_ISDIR (statbuf.st_mode))
               {
                 struct rootdir_entry *re;
 
@@ -520,7 +520,7 @@ read_filesystem_list (int need_fs_type)
         free (re);
       }
   }
-#endif /* MOUNTED_NEXT_DEV */
+#endif /* MOUNTED_FS_STAT_DEV */
 
 #if defined (MOUNTED_GETFSSTAT)	/* __alpha running OSF_1 */
   {
@@ -712,6 +712,7 @@ read_filesystem_list (int need_fs_type)
   {
     int bufsize;
     char *entries, *thisent;
+    struct vmount *vmp;
 
     /* Ask how many bytes to allocate for the mounted filesystem info.  */
     mntctl (MCTL_QUERY, sizeof bufsize, (struct vmount *) &bufsize);
@@ -724,7 +725,6 @@ read_filesystem_list (int need_fs_type)
 	 thisent += vmp->vmt_length)
       {
 	char *options, *ignore;
-	struct vmount *vmp;
 
 	vmp = (struct vmount *) thisent;
 	me = (struct mount_entry *) xmalloc (sizeof (struct mount_entry));