diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2005-02-01 23:58:01 +0000 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2005-02-01 23:58:01 +0000 |
| commit | c4a0cafe715f323c2b03a4cf12f43a75882a3922 (patch) | |
| tree | 623158b349cb959951fd701b63bc8a9911c19f0c | |
| parent | da6844d3f6733da79015295fbdc73ba857499a79 (diff) | |
| download | coreutils-c4a0cafe715f323c2b03a4cf12f43a75882a3922.tar.xz | |
Include mountlist.h first, to test the interface.
(ME_DUMMY, ME_REMOTE): Moved here from mountlist.c.
(ME_DUMMY): Count "subfs" as a dummy.
| -rw-r--r-- | lib/mountlist.c | 27 |
1 files changed, 23 insertions, 4 deletions
diff --git a/lib/mountlist.c b/lib/mountlist.c index 55071c3fc..6d8ed2505 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 <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 |