Sync from coreutils.

* m4/regex.m4 (gl_PREREQ_REGEX): Require AC_C_RESTRICT, not
gl_C_RESTRICT, now that we assume Autoconf 2.59 or later.
* m4/strtok_r.m4 (gl_FUNC_STRTOK_R): Likewise.
* m4/time_r.m4 (gl_TIME_R): Likewise.

2006-07-19  Mike Frysinger  <vapier@gentoo.org>
* lib/mountlist.c [ME_REMOTE]: Filter out cifs.
See <http://bugs.gentoo.org/141012>.

diff --git a/lib/ChangeLog b/lib/ChangeLog
index c356e990a299780d4d9ace41a4ace59f630f642a..3ae7e876b5e015c52098db61a80fb65f06daac67 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,12 @@
+2006-08-09  Paul Eggert  <eggert@cs.ucla.edu>
+
+       Sync from coreutils.
+
+       2006-07-19  Mike Frysinger  <vapier@gentoo.org>
+
+       * lib/mountlist.c [ME_REMOTE]: Filter out cifs.
+       Reported by Toralf Förster in <http://bugs.gentoo.org/141012>.
+
 2006-08-08  Eric Blake  <ebb9@byu.net>
 
        * verror.c (verror_at_line): Work around glibc bug 2997, so that

diff --git a/lib/mountlist.c b/lib/mountlist.c
index b957a973fdf19cfe2fde7712dac024a526864208..3774c8e4ecd5375794baa0b4a1eabbb3415d7d46 100644 (file)
--- a/lib/mountlist.c
+++ b/lib/mountlist.c
@@ -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

diff --git a/m4/ChangeLog b/m4/ChangeLog
index 1c706da31a8c762ae53e257f52401e13de8a09ec..bb522472e4aaf508067ff749fc2d0744cb5c6c65 100644 (file)
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,11 @@
+2006-08-09  Paul Eggert  <eggert@cs.ucla.edu>
+
+       Merge from coreutils.
+       * regex.m4 (gl_PREREQ_REGEX): Require AC_C_RESTRICT, not
+       gl_C_RESTRICT, now that we assume Autoconf 2.59 or later.
+       * strtok_r.m4 (gl_FUNC_STRTOK_R): Likewise.
+       * time_r.m4 (gl_TIME_R): Likewise.
+
 2006-07-31  Bruno Haible  <bruno@clisp.org>
 
        * localcharset.m4 (gl_LOCALCHARSET): Remove tests for <stddef.h>,

diff --git a/m4/regex.m4 b/m4/regex.m4
index cd713660ef11859f6786f5b9ec9a5b0cff5823ea..5ca868bbed55bc12ac371172125c8142a7869228 100644 (file)
--- a/m4/regex.m4
+++ b/m4/regex.m4
@@ -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])

diff --git a/m4/strtok_r.m4 b/m4/strtok_r.m4
index 28515a651af7247115815b18909ea6a609a0000a..332701cc51d93ba7fd82ded78310f71ef4bab4cb 100644 (file)
--- a/m4/strtok_r.m4
+++ b/m4/strtok_r.m4
@@ -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])
 ])

diff --git a/m4/time_r.m4 b/m4/time_r.m4
index 8146f085c984c5e1ef635560e4098cad1cc6ceba..204c424dd382a96078c189ee1c99b5d318cb909b 100644 (file)
--- a/m4/time_r.m4
+++ b/m4/time_r.m4
@@ -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],