I installed this into gnulib:
2006-08-09 Paul Eggert <[EMAIL PROTECTED]>
Sync from coreutils.
* lib/regex.m4 (gl_PREREQ_REGEX): Require AC_C_RESTRICT, not
gl_C_RESTRICT, now that we assume Autoconf 2.59 or later.
* lib/strtok_r.m4 (gl_FUNC_STRTOK_R): Likewise.
* lib/time_r.m4 (gl_TIME_R): Likewise.
2006-07-19 Mike Frysinger <[EMAIL PROTECTED]>
* lib/mountlist.c [ME_REMOTE]: Filter out cifs.
Reported by Toralf Förster in <http://bugs.gentoo.org/141012>.
Index: lib/mountlist.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/mountlist.c,v
retrieving revision 1.54
diff -p -u -r1.54 mountlist.c
--- lib/mountlist.c 9 Jan 2006 23:13:56 -0000 1.54
+++ lib/mountlist.c 9 Aug 2006 22:26:23 -0000
@@ -1,7 +1,7 @@
/* mountlist.c -- return a list of mounted file systems
Copyright (C) 1991, 1992, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
- 2004, 2005 Free Software Foundation, Inc.
+ 2004, 2005, 2006 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
@@ -153,12 +153,13 @@ char *strstr ();
#ifndef ME_REMOTE
/* A file system is `remote' if its Fs_name contains a `:'
- or if (it is of type smbfs and its Fs_name starts with `//'). */
+ or if (it is of type (smbfs or cifs) and its Fs_name starts with `//'). */
# define ME_REMOTE(Fs_name, Fs_type) \
- (strchr (Fs_name, ':') != 0 \
+ (strchr (Fs_name, ':') != NULL \
|| ((Fs_name)[0] == '/' \
&& (Fs_name)[1] == '/' \
- && strcmp (Fs_type, "smbfs") == 0))
+ && (strcmp (Fs_type, "smbfs") == 0 \
+ || strcmp (Fs_type, "cifs") == 0)))
#endif
#if MOUNTED_GETMNTINFO
Index: m4/regex.m4
===================================================================
RCS file: /cvsroot/gnulib/gnulib/m4/regex.m4,v
retrieving revision 1.54
diff -p -u -r1.54 regex.m4
--- m4/regex.m4 9 Jul 2006 01:31:04 -0000 1.54
+++ m4/regex.m4 9 Aug 2006 22:26:23 -0000
@@ -1,4 +1,4 @@
-#serial 37
+#serial 38
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
# 2006 Free Software Foundation, Inc.
@@ -163,7 +163,7 @@ AC_DEFUN([gl_REGEX],
AC_DEFUN([gl_PREREQ_REGEX],
[
AC_REQUIRE([AC_GNU_SOURCE])
- AC_REQUIRE([gl_C_RESTRICT])
+ AC_REQUIRE([AC_C_RESTRICT])
AC_REQUIRE([AM_LANGINFO_CODESET])
AC_CHECK_HEADERS_ONCE([locale.h wchar.h wctype.h])
AC_CHECK_FUNCS_ONCE([mbrtowc mempcpy wcrtomb wcscoll])
Index: m4/strtok_r.m4
===================================================================
RCS file: /cvsroot/gnulib/gnulib/m4/strtok_r.m4,v
retrieving revision 1.2
diff -p -u -r1.2 strtok_r.m4
--- m4/strtok_r.m4 23 Jan 2005 08:06:57 -0000 1.2
+++ m4/strtok_r.m4 9 Aug 2006 22:26:23 -0000
@@ -1,4 +1,4 @@
-# strtok_r.m4 serial 2
+# strtok_r.m4 serial 3
dnl Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -13,5 +13,5 @@ AC_DEFUN([gl_FUNC_STRTOK_R],
# Prerequisites of lib/strtok_r.h and lib/strtok_r.c.
AC_DEFUN([gl_PREREQ_STRTOK_R], [
- AC_REQUIRE([gl_C_RESTRICT])
+ AC_REQUIRE([AC_C_RESTRICT])
])
Index: m4/time_r.m4
===================================================================
RCS file: /cvsroot/gnulib/gnulib/m4/time_r.m4,v
retrieving revision 1.3
diff -p -u -r1.3 time_r.m4
--- m4/time_r.m4 12 Apr 2006 07:11:09 -0000 1.3
+++ m4/time_r.m4 9 Aug 2006 22:26:23 -0000
@@ -11,7 +11,7 @@ AC_DEFUN([gl_TIME_R],
[
AC_LIBSOURCES([time_r.c, time_r.h])
AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
- AC_REQUIRE([gl_C_RESTRICT])
+ AC_REQUIRE([AC_C_RESTRICT])
AC_CACHE_CHECK([whether localtime_r is compatible with its POSIX signature],
[gl_cv_time_r_posix],
