projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix compilation errors related to rpl_mkdir on mingw.
[gnulib.git]
/
lib
/
mountlist.c
diff --git
a/lib/mountlist.c
b/lib/mountlist.c
index
1b64241
..
4c975c6
100644
(file)
--- a/
lib/mountlist.c
+++ b/
lib/mountlist.c
@@
-1,12
+1,12
@@
/* mountlist.c -- return a list of mounted file systems
Copyright (C) 1991, 1992, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
/* 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.
+ 2004, 2005, 2006
, 2007
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
+14,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"
@@
-30,10
+27,6
@@
#include "xalloc.h"
#include "xalloc.h"
-#ifndef strstr
-char *strstr ();
-#endif
-
#include <errno.h>
#include <fcntl.h>
#include <errno.h>
#include <fcntl.h>
@@
-145,6
+138,16
@@
char *strstr ();
# define SIZE_MAX ((size_t) -1)
#endif
# 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) \
(strcmp (Fs_type, "autofs") == 0 \
#ifndef ME_DUMMY
# define ME_DUMMY(Fs_name, Fs_type) \
(strcmp (Fs_type, "autofs") == 0 \
@@
-170,7
+173,7
@@
char *strstr ();
#if MOUNTED_GETMNTINFO
#if MOUNTED_GETMNTINFO
-# if ! HAVE_
F_FSTYPENAME_IN_STATFS
+# if ! HAVE_
STRUCT_STATFS_F_FSTYPENAME
static char *
fstype_to_string (short int t)
{
static char *
fstype_to_string (short int t)
{
@@
-264,12
+267,12
@@
fstype_to_string (short int t)
return "?";
}
}
return "?";
}
}
-# endif
/* ! HAVE_F_FSTYPENAME_IN_STATFS */
+# endif
static char *
fsp_to_string (const struct statfs *fsp)
{
static char *
fsp_to_string (const struct statfs *fsp)
{
-# if
defined HAVE_F_FSTYPENAME_IN_STATFS
+# if
HAVE_STRUCT_STATFS_F_FSTYPENAME
return (char *) (fsp->f_fstypename);
# else
return fstype_to_string (fsp->f_type);
return (char *) (fsp->f_fstypename);
# else
return fstype_to_string (fsp->f_type);