projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fts: fts_open: do not let an empty string cause immediate failure
[gnulib.git]
/
lib
/
mountlist.c
diff --git
a/lib/mountlist.c
b/lib/mountlist.c
index
285c3de
..
50e90ee
100644
(file)
--- a/
lib/mountlist.c
+++ b/
lib/mountlist.c
@@
-1,12
+1,11
@@
/* mountlist.c -- return a list of mounted file systems
/* mountlist.c -- return a list of mounted file systems
- Copyright (C) 1991, 1992, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
- 2004, 2005, 2006 Free Software Foundation, Inc.
+ Copyright (C) 1991, 1992, 1997-2009 Free Software Foundation, Inc.
- This program is free software
;
you can redistribute it and/or modify
+ 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
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
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-14,12
+13,9
@@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
#include "mountlist.h"
#include "mountlist.h"
@@
-27,13
+23,10
@@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <stdint.h>
#include "xalloc.h"
#include "xalloc.h"
-#ifndef strstr
-char *strstr ();
-#endif
-
#include <errno.h>
#include <fcntl.h>
#include <errno.h>
#include <fcntl.h>
@@
-141,9
+134,15
@@
char *strstr ();
# include "unlocked-io.h"
#endif
# include "unlocked-io.h"
#endif
-#ifndef SIZE_MAX
-# define SIZE_MAX ((size_t) -1)
-#endif
+/* The results of open() in this file are not used with fchdir,
+ therefore save some unnecessary work in fchdir.c. */
+#undef open
+#undef close
+
+/* The results of opendir() in this file are not used with dirfd and fchdir,
+ therefore save some unnecessary work in fchdir.c. */
+#undef opendir
+#undef closedir
#ifndef ME_DUMMY
# define ME_DUMMY(Fs_name, Fs_type) \
#ifndef ME_DUMMY
# define ME_DUMMY(Fs_name, Fs_type) \
@@
-297,7
+296,6
@@
fstype_to_string (int t)
/* Return the device number from MOUNT_OPTIONS, if possible.
Otherwise return (dev_t) -1. */
/* Return the device number from MOUNT_OPTIONS, if possible.
Otherwise return (dev_t) -1. */
-
static dev_t
dev_from_mount_options (char const *mount_options)
{
static dev_t
dev_from_mount_options (char const *mount_options)
{
@@
-324,7
+322,7
@@
dev_from_mount_options (char const *mount_options)
}
# endif
}
# endif
-
+ (void) mount_options;
return -1;
}
return -1;
}
@@
-341,6
+339,7
@@
read_file_system_list (bool need_fs_type)
struct mount_entry *mount_list;
struct mount_entry *me;
struct mount_entry **mtail = &mount_list;
struct mount_entry *mount_list;
struct mount_entry *me;
struct mount_entry **mtail = &mount_list;
+ (void) need_fs_type;
#ifdef MOUNTED_LISTMNTENT
{
#ifdef MOUNTED_LISTMNTENT
{
@@
-375,7
+374,7
@@
read_file_system_list (bool need_fs_type)
#ifdef MOUNTED_GETMNTENT1 /* GNU/Linux, 4.3BSD, SunOS, HP-UX, Dynix, Irix. */
{
struct mntent *mnt;
#ifdef MOUNTED_GETMNTENT1 /* GNU/Linux, 4.3BSD, SunOS, HP-UX, Dynix, Irix. */
{
struct mntent *mnt;
- char *table = MOUNTED;
+ char
const
*table = MOUNTED;
FILE *fp;
fp = setmntent (table, "r");
FILE *fp;
fp = setmntent (table, "r");