From 68650590ffe576aaab271a425492980ff96ea4f8 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Tue, 1 Feb 2005 23:56:46 +0000 Subject: [PATCH] * mountlist.h (MOUNTLIST_H_): New macro, to protect against double inclusion. Include , 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. --- lib/ChangeLog | 11 +++++++++++ lib/mountlist.c | 27 +++++++++++++++++++++++---- lib/mountlist.h | 26 ++++++-------------------- 3 files changed, 40 insertions(+), 24 deletions(-) diff --git a/lib/ChangeLog b/lib/ChangeLog index ff10ee17d9..e01082c512 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,14 @@ +2005-02-01 Paul Eggert + + * mountlist.h (MOUNTLIST_H_): New macro, to protect against double + inclusion. + Include , 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. + 2005-01-29 Bruno Haible * progname.c (program_name): Initialize. diff --git a/lib/mountlist.c b/lib/mountlist.c index 55071c3fc8..6d8ed25052 100644 --- a/lib/mountlist.c +++ b/lib/mountlist.c @@ -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 #endif +#include "mountlist.h" + #include -#include #include #include @@ -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 diff --git a/lib/mountlist.h b/lib/mountlist.h index c3694c2113..c90a878271 100644 --- a/lib/mountlist.h +++ b/lib/mountlist.h @@ -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 +#include /* 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 -- 2.30.2