X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fmountlist.h;h=926bfdfd55657c917f93e736ec597f06ee66b1eb;hb=b94f2b3ac7049ef66bded4596431c453e3710209;hp=963670d4b9951b4d2bf36e999852812f5413501c;hpb=ae9fb019a793319f2f09d902e5e137f35b6a1b74;p=gnulib.git

diff --git a/lib/mountlist.h b/lib/mountlist.h
index 963670d4b..926bfdfd5 100644
--- a/lib/mountlist.h
+++ b/lib/mountlist.h
@@ -1,10 +1,12 @@
-/* mountlist.h -- declarations for list of mounted filesystems
-   Copyright (C) 1991, 1992 Free Software Foundation, Inc.
+/* mountlist.h -- declarations for list of mounted file systems
 
-   This program is free software; you can redistribute it and/or modify
+   Copyright (C) 1991-1992, 1998, 2000-2005, 2009-2011 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
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,27 +14,27 @@
    GNU General Public License for more details.
 
    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.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#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_type;		/* "nfs", "4.2", etc. */
-  dev_t me_dev;			/* Device number of me_mountdir. */
+  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 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;
 };
 
-#if __STDC__
-struct mount_entry *read_filesystem_list (int need_fs_type, int all_fs);
-#else
-struct mount_entry *read_filesystem_list ();
-#endif
+struct mount_entry *read_file_system_list (bool need_fs_type);
 
-/* In most environments, by default, a filesystem type is remote if it
-   begins with "nfs".  This allows variants like "nfs3".  */
-#ifndef REMOTE_FS_TYPE
-# define REMOTE_FS_TYPE(t) (!strncmp (t, "nfs", 3))
 #endif