diff --git a/gl/mountlist.c b/gl/mountlist.c
index bb01f91efb6b694156e9b84dbbd4dfa4fbb3e37a..50e90eed473253e4be76068808ba7161bbd67c67 100644 (file)
--- a/gl/mountlist.c
+++ b/gl/mountlist.c
/* 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
- 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
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/>. */
#include <config.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <stdint.h>
#include "xalloc.h"
-#ifndef strstr
-char *strstr ();
-#endif
-
#include <errno.h>
#include <fcntl.h>
# 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
/* 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)
{
}
# endif
-
+ (void) mount_options;
return -1;
}
struct mount_entry *mount_list;
struct mount_entry *me;
struct mount_entry **mtail = &mount_list;
+ (void) need_fs_type;
#ifdef MOUNTED_LISTMNTENT
{
#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");