X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fmountlist.h;h=7f5a6f77ab4be6cfee2063d316d85c118508969b;hb=738e912a0f97a43c2b195bcec6fe34512208e81f;hp=8acec77fb3b95982d6cf45c948fe2607cc307f71;hpb=d610b32d9e6ba44bc17a6cd60bdeda8b7c103e1b;p=gnulib.git

diff --git a/lib/mountlist.h b/lib/mountlist.h
index 8acec77fb..7f5a6f77a 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, 2000, 2001 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
@@ -13,44 +15,27 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+#ifndef MOUNTLIST_H_
+# define MOUNTLIST_H_
+
+# include <stdbool.h>
+# include <sys/types.h>
 
 /* A mount table entry. */
 struct mount_entry
 {
-  char *me_devname;		/* Device node pathname, including "/dev/". */
-  char *me_mountdir;		/* Mount point directory pathname. */
+  char *me_devname;		/* Device node name, including "/dev/". */
+  char *me_mountdir;		/* Mount point directory name. */
   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, "autofs") \
-     /* for Irix 6.5 */ \
-     || !strcmp (Fs_type, "ignore"))
-#endif
+struct mount_entry *read_file_system_list (bool need_fs_type);
 
-#ifndef ME_REMOTE
-/* A file system is `remote' if its Fs_name contains a `:'
-   or if (it is of type smbfs and its Fs_name starts with `//').  */
-# define ME_REMOTE(Fs_name, Fs_type)	\
-    (strchr ((Fs_name), ':') != 0	\
-     || ((Fs_name)[0] == '/'		\
-	 && (Fs_name)[1] == '/'		\
-	 && STREQ (Fs_type, "smbfs")))
 #endif