Mercurial > gnulib
changeset 918:09fe18b51677
(read_filesystem_list): Show automount-related
duplicate filesystems only when --all specified. With suggestions
from Stuart Kemp.
| author | Jim Meyering <jim@meyering.net> |
|---|---|
| date | Sat, 24 May 1997 14:43:21 +0000 |
| parents | 9a12bc8964d5 |
| children | df6499461bd8 |
| files | lib/mountlist.c |
| diffstat | 1 files changed, 16 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lib/mountlist.c Sat May 24 14:42:40 1997 +0000 +++ b/lib/mountlist.c Sat May 24 14:43:21 1997 +0000 @@ -1,5 +1,5 @@ /* mountlist.c -- return a list of mounted filesystems - Copyright (C) 1991, 1992 Free Software Foundation, Inc. + Copyright (C) 1991, 1992, 1997 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 @@ -99,6 +99,17 @@ # define MOUNTED_GETMNTTBL #endif +#ifdef HAVE_SYS_MNTENT_H +/* This is to get MNTOPT_IGNORE on e.g. SVR4. */ +# include <sys/mntent.h> +#endif + +#if defined (MNTOPT_IGNORE) && defined (HAVE_HASMNTOPT) +# define MNT_IGNORE(M) hasmntopt ((M), MNTOPT_IGNORE) +#else +# define MNT_IGNORE(M) 0 +#endif + #ifdef MOUNTED_GETMNTENT1 /* 4.3BSD, SunOS, HP-UX, Dynix, Irix. */ /* Return the value of the hexadecimal number represented by CP. No prefix (like '0x') or suffix (like 'h') is expected to be @@ -502,6 +513,10 @@ while ((ret = getmntent (fp, &mnt)) == 0) { + /* Don't show automounted filesystems twice on e.g., Solaris. */ + if (!all_fs && MNT_IGNORE (&mnt)) + continue; + me = (struct mount_entry *) xmalloc (sizeof (struct mount_entry)); me->me_devname = xstrdup (mnt.mnt_special); me->me_mountdir = xstrdup (mnt.mnt_mountp);