X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fmountlist.h;h=ad66def57a568f65a649803c4b701e72a468aafa;hb=1b5bc6ed268e3f86e5fab50eb42794400e29ea2f;hp=e4019a586afe23c21f333a3c508f3f27fbdde978;hpb=5d783169ebad91b3a6d6128559ad6cccd6a0cd4b;p=gnulib.git
diff --git a/lib/mountlist.h b/lib/mountlist.h
index e4019a586..ad66def57 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, 1998 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-2010 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,36 +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 . */
+
+#ifndef MOUNTLIST_H_
+# define MOUNTLIST_H_
+
+# include
+# include
/* 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. */
- unsigned int me_dummy : 1; /* Nonzero for dummy filesystems. */
- unsigned int me_remote : 1; /* Nonzero for remote fileystems. */
+ 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;
};
-#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