X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fmountlist.h;h=c90a878271005097be179c351baf04d05e1be745;hb=534f92e85132b32dab5327c3dfe11e95c0b05e0a;hp=e4019a586afe23c21f333a3c508f3f27fbdde978;hpb=5d783169ebad91b3a6d6128559ad6cccd6a0cd4b;p=gnulib.git

diff --git a/lib/mountlist.h b/lib/mountlist.h
index e4019a586..c90a87827 100644
--- a/lib/mountlist.h
+++ b/lib/mountlist.h
@@ -1,5 +1,7 @@
-/* mountlist.h -- declarations for list of mounted filesystems
-   Copyright (C) 1991, 1992, 1998 Free Software Foundation, Inc.
+/* mountlist.h -- declarations for list of mounted file systems
+
+   Copyright (C) 1991, 1992, 1998, 2000, 2001, 2002, 2003, 2004, 2005
+   Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -15,6 +17,12 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
+#ifndef MOUNTLIST_H_
+#define MOUNTLIST_H_
+
+#include <stdbool.h>
+#include <sys/types.h>
+
 /* A mount table entry. */
 struct mount_entry
 {
@@ -22,26 +30,12 @@ struct mount_entry
   char *me_mountdir;		/* Mount point directory pathname. */
   char *me_type;		/* "nfs", "4.2", etc. */
   dev_t me_dev;			/* Device number of me_mountdir. */
-  unsigned int me_dummy : 1;	/* Nonzero for dummy filesystems. */
+  unsigned int me_dummy : 1;	/* Nonzero for dummy file systems. */
   unsigned int me_remote : 1;	/* Nonzero for remote fileystems. */
+  unsigned int me_type_malloced : 1; /* Nonzero if me_type was malloced. */
   struct mount_entry *me_next;
 };
 
-#ifndef PARAMS
-# if defined PROTOTYPES || (defined __STDC__ && __STDC__)
-#  define PARAMS(Args) Args
-# else
-#  define PARAMS(Args) ()
-# endif
-#endif
-
-struct mount_entry *read_filesystem_list PARAMS ((int need_fs_type));
-
-#ifndef ME_DUMMY
-# define ME_DUMMY(fs_name, fs_type) \
-    (!strcmp (fs_type, "auto") || !strcmp (fs_type, "ignore"))
-#endif
+struct mount_entry *read_file_system_list (bool need_fs_type);
 
-#ifndef ME_REMOTE
-# define ME_REMOTE(fs_name, fs_type) (strchr (fs_name, ':') != 0)
 #endif