Re: [bug-gnulib] ME_DUMMY in mountlist.h should probably recognise "subfs".

[Paul Eggert]

James Youngman <address@hidden> writes:

> Dmitry V. Levin tells me that the "subfs" filesystem is like autofs
> and should therefore cause ME_DUMMY in mountlist.h to result in a
> nonzero value.

Thanks.  I installed this more-ambitious cleanup patch into gnulib and
coreutils.  I don't see why ME_DUMMY and ME_REMOTE need to be
exported, so I moved them into mountlist.c; if someone needs them
please give me a holler.

2005-02-01  Paul Eggert  <address@hidden>

        * mountlist.h (MOUNTLIST_H_): New macro, to protect against double
        inclusion.
        Include <sys/types.h>, for dev_t.
        (ME_DUMMY, ME_REMOTE): Move from here....
        * mountlist.c (ME_DUMMY, ME_REMOTE): To here.
        (ME_DUMMY): Count "subfs" as a dummy.  Problem reported by
        Dmitry V. Levin.
        Include mountlist.h first, to test the interface.

--- mountlist.c 4 Oct 2004 20:17:39 -0000       1.47
+++ mountlist.c 1 Feb 2005 23:56:00 -0000
@@ -1,5 +1,7 @@
 /* mountlist.c -- return a list of mounted file systems
-   Copyright (C) 1991, 1992, 1997-2004 Free Software Foundation, Inc.
+
+   Copyright (C) 1991, 1992, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+   2004, 2005 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
@@ -19,8 +21,9 @@
 # include <config.h>
 #endif
 
+#include "mountlist.h"
+
 #include <stdio.h>
-#include <sys/types.h>
 #include <stdlib.h>
 #include <string.h>
 
@@ -133,8 +136,6 @@ char *strstr ();
 # define MNT_IGNORE(M) 0
 #endif
 
-#include "mountlist.h"
-
 #if USE_UNLOCKED_IO
 # include "unlocked-io.h"
 #endif
@@ -143,6 +144,24 @@ char *strstr ();
 # define SIZE_MAX ((size_t) -1)
 #endif
 
+#ifndef ME_DUMMY
+# define ME_DUMMY(Fs_name, Fs_type)            \
+    (strcmp (Fs_type, "autofs") == 0           \
+     || strcmp (Fs_type, "subfs") == 0         \
+     /* for Irix 6.5 */                                \
+     || strcmp (Fs_type, "ignore") == 0)
+#endif
+
+#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 `//').  */
+# define ME_REMOTE(Fs_name, Fs_type)           \
+    (strchr (Fs_name, ':') != 0                        \
+     || ((Fs_name)[0] == '/'                   \
+        && (Fs_name)[1] == '/'                 \
+        && strcmp (Fs_type, "smbfs") == 0))
+#endif
+
 #if MOUNTED_GETMNTINFO
 
 # if ! HAVE_F_FSTYPENAME_IN_STATFS
--- mountlist.h 7 Aug 2004 00:09:39 -0000       1.12
+++ mountlist.h 1 Feb 2005 23:56:00 -0000
@@ -1,7 +1,7 @@
 /* mountlist.h -- declarations for list of mounted file systems
 
-   Copyright (C) 1991, 1992, 1998, 2000, 2001, 2002, 2003, 2004 Free
-   Software Foundation, Inc.
+   Copyright (C) 1991, 1992, 1998, 2000, 2001, 2002, 2003, 2004, 2005
+   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
@@ -17,7 +17,11 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
+#ifndef MOUNTLIST_H_
+#define MOUNTLIST_H_
+
 #include <stdbool.h>
+#include <sys/types.h>
 
 /* A mount table entry. */
 struct mount_entry
@@ -34,22 +38,4 @@ struct mount_entry
 
 struct mount_entry *read_file_system_list (bool need_fs_type);
 
-#ifndef ME_DUMMY
-# define ME_DUMMY(Fs_name, Fs_type) \
-    (!strcmp (Fs_type, "autofs") \
-     /* for Irix 6.5 */ \
-     || !strcmp (Fs_type, "ignore"))
-#endif
-
-#undef STREQ
-#define STREQ(a, b) (strcmp ((a), (b)) == 0)
-
-#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 `//').  */
-# define ME_REMOTE(Fs_name, Fs_type)   \
-    (strchr ((Fs_name), ':') != 0      \
-     || ((Fs_name)[0] == '/'           \
-        && (Fs_name)[1] == '/'         \
-        && STREQ (Fs_type, "smbfs")))
 #endif