Mercurial > gnulib
annotate lib/mountlist.c @ 40144:cdd46dde7e34
mountlist: Port better to Android.
* lib/mountlist.c (MOUNTED): Redefine on Android.
* m4/ls-mntd-fs.m4 (gl_LIST_MOUNTED_FILE_SYSTEMS): Redefine MOUNTED on
Android.
author | Bruno Haible <bruno@clisp.org> |
---|---|
date | Sat, 26 Jan 2019 22:49:57 +0100 |
parents | b06060465f09 |
children | 62fbdb07f551 |
rev | line source |
---|---|
5159 | 1 /* mountlist.c -- return a list of mounted file systems |
5632
f2a6ab91acad
* mountlist.h (MOUNTLIST_H_): New macro, to protect against double
Paul Eggert <eggert@cs.ucla.edu>
parents:
5318
diff
changeset
|
2 |
40057
b06060465f09
maint: Run 'make update-copyright'
Paul Eggert <eggert@cs.ucla.edu>
parents:
39935
diff
changeset
|
3 Copyright (C) 1991-1992, 1997-2019 Free Software Foundation, Inc. |
5 | 4 |
9309
bbbbbf4cd1c5
Change copyright notice from GPLv2+ to GPLv3+.
Bruno Haible <bruno@clisp.org>
parents:
7944
diff
changeset
|
5 This program is free software: you can redistribute it and/or modify |
5 | 6 it under the terms of the GNU General Public License as published by |
9309
bbbbbf4cd1c5
Change copyright notice from GPLv2+ to GPLv3+.
Bruno Haible <bruno@clisp.org>
parents:
7944
diff
changeset
|
7 the Free Software Foundation; either version 3 of the License, or |
bbbbbf4cd1c5
Change copyright notice from GPLv2+ to GPLv3+.
Bruno Haible <bruno@clisp.org>
parents:
7944
diff
changeset
|
8 (at your option) any later version. |
5 | 9 |
10 This program is distributed in the hope that it will be useful, | |
11 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
13 GNU General Public License for more details. | |
14 | |
15 You should have received a copy of the GNU General Public License | |
19190 | 16 along with this program. If not, see <https://www.gnu.org/licenses/>. */ |
5 | 17 |
7302
8a1a9361108c
* _fpending.c: Include <config.h> unconditionally, since we no
Paul Eggert <eggert@cs.ucla.edu>
parents:
7247
diff
changeset
|
18 #include <config.h> |
326 | 19 |
5632
f2a6ab91acad
* mountlist.h (MOUNTLIST_H_): New macro, to protect against double
Paul Eggert <eggert@cs.ucla.edu>
parents:
5318
diff
changeset
|
20 #include "mountlist.h" |
f2a6ab91acad
* mountlist.h (MOUNTLIST_H_): New macro, to protect against double
Paul Eggert <eggert@cs.ucla.edu>
parents:
5318
diff
changeset
|
21 |
6527 | 22 #include <limits.h> |
5 | 23 #include <stdio.h> |
4666 | 24 #include <stdlib.h> |
25 #include <string.h> | |
11395
5442b2430859
avoid gcc warnings about unused macro definitions
Jim Meyering <meyering@redhat.com>
parents:
11112
diff
changeset
|
26 #include <stdint.h> |
5 | 27 |
3621
56f442359b0d
Include unlocked-io.h after all system headers.
Jim Meyering <jim@meyering.net>
parents:
3618
diff
changeset
|
28 #include "xalloc.h" |
5 | 29 |
1399
edb0581923b9
(read_filesystem_list): If SVR4, lock /etc/.mnttab.lock if available,
Jim Meyering <jim@meyering.net>
parents:
1396
diff
changeset
|
30 #include <errno.h> |
edb0581923b9
(read_filesystem_list): If SVR4, lock /etc/.mnttab.lock if available,
Jim Meyering <jim@meyering.net>
parents:
1396
diff
changeset
|
31 |
5955
ace6ea191424
Assume HAVE_FCNTL_H (i.e., include <fcntl.h> unconditionally,
Jim Meyering <jim@meyering.net>
parents:
5907
diff
changeset
|
32 #include <fcntl.h> |
1399
edb0581923b9
(read_filesystem_list): If SVR4, lock /etc/.mnttab.lock if available,
Jim Meyering <jim@meyering.net>
parents:
1396
diff
changeset
|
33 |
6275 | 34 #include <unistd.h> |
1399
edb0581923b9
(read_filesystem_list): If SVR4, lock /etc/.mnttab.lock if available,
Jim Meyering <jim@meyering.net>
parents:
1396
diff
changeset
|
35 |
1278
9ad625a30b7d
Use #if, not #ifdef with HAVE_ macros
Jim Meyering <jim@meyering.net>
parents:
1183
diff
changeset
|
36 #if HAVE_SYS_PARAM_H |
917 | 37 # include <sys/param.h> |
326 | 38 #endif |
39 | |
18419
d81946484cce
mountlist: include sysmacros.h for glibc
Eric Blake <eblake@redhat.com>
parents:
18255
diff
changeset
|
40 #if MAJOR_IN_MKDEV |
d81946484cce
mountlist: include sysmacros.h for glibc
Eric Blake <eblake@redhat.com>
parents:
18255
diff
changeset
|
41 # include <sys/mkdev.h> |
d81946484cce
mountlist: include sysmacros.h for glibc
Eric Blake <eblake@redhat.com>
parents:
18255
diff
changeset
|
42 #elif MAJOR_IN_SYSMACROS |
d81946484cce
mountlist: include sysmacros.h for glibc
Eric Blake <eblake@redhat.com>
parents:
18255
diff
changeset
|
43 # include <sys/sysmacros.h> |
d81946484cce
mountlist: include sysmacros.h for glibc
Eric Blake <eblake@redhat.com>
parents:
18255
diff
changeset
|
44 #endif |
d81946484cce
mountlist: include sysmacros.h for glibc
Eric Blake <eblake@redhat.com>
parents:
18255
diff
changeset
|
45 |
39905
c3122bb580fe
mountlist: Modernize platform lists.
Bruno Haible <bruno@clisp.org>
parents:
19484
diff
changeset
|
46 #if defined MOUNTED_GETFSSTAT /* OSF/1, also (obsolete) Apple Darwin 1.3 */ |
3537 | 47 # if HAVE_SYS_UCRED_H |
4986 | 48 # include <grp.h> /* needed on OSF V4.0 for definition of NGROUPS, |
12421
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
49 NGROUPS is used as an array dimension in ucred.h */ |
3537 | 50 # include <sys/ucred.h> /* needed by powerpc-apple-darwin1.3.7 */ |
51 # endif | |
52 # if HAVE_SYS_MOUNT_H | |
53 # include <sys/mount.h> | |
54 # endif | |
55 # if HAVE_SYS_FS_TYPES_H | |
56 # include <sys/fs_types.h> /* needed by powerpc-apple-darwin1.3.7 */ | |
57 # endif | |
58 # if HAVE_STRUCT_FSSTAT_F_FSTYPENAME | |
59 # define FS_TYPE(Ent) ((Ent).f_fstypename) | |
60 # else | |
61 # define FS_TYPE(Ent) mnt_names[(Ent).f_type] | |
62 # endif | |
326 | 63 #endif /* MOUNTED_GETFSSTAT */ |
64 | |
39905
c3122bb580fe
mountlist: Modernize platform lists.
Bruno Haible <bruno@clisp.org>
parents:
19484
diff
changeset
|
65 #ifdef MOUNTED_GETMNTENT1 /* glibc, HP-UX, IRIX, Cygwin, Android, |
39931
5b70149cc627
fsusage, mountlist, getloadavg: Remove support for Dynix/ptx.
Bruno Haible <bruno@clisp.org>
parents:
39927
diff
changeset
|
66 also (obsolete) 4.3BSD, SunOS */ |
917 | 67 # include <mntent.h> |
17951
2ae3c246cda5
mountlist: remove dependency on libmount
Pádraig Brady <P@draigBrady.com>
parents:
17937
diff
changeset
|
68 # include <sys/types.h> |
40144
cdd46dde7e34
mountlist: Port better to Android.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
69 # if defined __ANDROID__ /* Android */ |
cdd46dde7e34
mountlist: Port better to Android.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
70 /* Bionic versions from between 2014-01-09 and 2015-01-08 define MOUNTED to |
cdd46dde7e34
mountlist: Port better to Android.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
71 an incorrect value; older Bionic versions don't define it at all. */ |
cdd46dde7e34
mountlist: Port better to Android.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
72 # undef MOUNTED |
cdd46dde7e34
mountlist: Port better to Android.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
73 # define MOUNTED "/proc/mounts" |
cdd46dde7e34
mountlist: Port better to Android.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
74 # elif !defined MOUNTED |
12421
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
75 # if defined _PATH_MOUNTED /* GNU libc */ |
3502
ebfd8c693504
Remove useless parentheses in #if directives.
Jim Meyering <jim@meyering.net>
parents:
2677
diff
changeset
|
76 # define MOUNTED _PATH_MOUNTED |
ebfd8c693504
Remove useless parentheses in #if directives.
Jim Meyering <jim@meyering.net>
parents:
2677
diff
changeset
|
77 # endif |
12421
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
78 # if defined MNT_MNTTAB /* HP-UX. */ |
917 | 79 # define MOUNTED MNT_MNTTAB |
5 | 80 # endif |
917 | 81 # endif |
5 | 82 #endif |
83 | |
39905
c3122bb580fe
mountlist: Modernize platform lists.
Bruno Haible <bruno@clisp.org>
parents:
19484
diff
changeset
|
84 #ifdef MOUNTED_GETMNTINFO /* Mac OS X, FreeBSD, OpenBSD, also (obsolete) 4.4BSD */ |
917 | 85 # include <sys/mount.h> |
5 | 86 #endif |
87 | |
39907
b14bcf3a1610
mountlist: Add support for Minix.
Bruno Haible <bruno@clisp.org>
parents:
39905
diff
changeset
|
88 #ifdef MOUNTED_GETMNTINFO2 /* NetBSD, Minix */ |
7154
7a3549db58ef
* lib/mountlist.c [MOUNTED_GETMNTINFO2]: Include sys/statvfs.h.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7099
diff
changeset
|
89 # include <sys/statvfs.h> |
7a3549db58ef
* lib/mountlist.c [MOUNTED_GETMNTINFO2]: Include sys/statvfs.h.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7099
diff
changeset
|
90 #endif |
7a3549db58ef
* lib/mountlist.c [MOUNTED_GETMNTINFO2]: Include sys/statvfs.h.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7099
diff
changeset
|
91 |
39905
c3122bb580fe
mountlist: Modernize platform lists.
Bruno Haible <bruno@clisp.org>
parents:
19484
diff
changeset
|
92 #ifdef MOUNTED_FS_STAT_DEV /* Haiku, also (obsolete) BeOS */ |
2453
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
93 # include <fs_info.h> |
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
94 # include <dirent.h> |
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
95 #endif |
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
96 |
39905
c3122bb580fe
mountlist: Modernize platform lists.
Bruno Haible <bruno@clisp.org>
parents:
19484
diff
changeset
|
97 #ifdef MOUNTED_FREAD_FSTYP /* (obsolete) SVR3 */ |
917 | 98 # include <mnttab.h> |
99 # include <sys/fstyp.h> | |
100 # include <sys/statfs.h> | |
5 | 101 #endif |
102 | |
39908
f2b5499e6ee2
mountlist: Improve support for Solaris in 64-bit mode.
Bruno Haible <bruno@clisp.org>
parents:
39907
diff
changeset
|
103 #ifdef MOUNTED_GETEXTMNTENT /* Solaris >= 8 */ |
f2b5499e6ee2
mountlist: Improve support for Solaris in 64-bit mode.
Bruno Haible <bruno@clisp.org>
parents:
39907
diff
changeset
|
104 # include <sys/mnttab.h> |
f2b5499e6ee2
mountlist: Improve support for Solaris in 64-bit mode.
Bruno Haible <bruno@clisp.org>
parents:
39907
diff
changeset
|
105 #endif |
f2b5499e6ee2
mountlist: Improve support for Solaris in 64-bit mode.
Bruno Haible <bruno@clisp.org>
parents:
39907
diff
changeset
|
106 |
f2b5499e6ee2
mountlist: Improve support for Solaris in 64-bit mode.
Bruno Haible <bruno@clisp.org>
parents:
39907
diff
changeset
|
107 #ifdef MOUNTED_GETMNTENT2 /* Solaris < 8, also (obsolete) SVR4 */ |
917 | 108 # include <sys/mnttab.h> |
5 | 109 #endif |
110 | |
39905
c3122bb580fe
mountlist: Modernize platform lists.
Bruno Haible <bruno@clisp.org>
parents:
19484
diff
changeset
|
111 #ifdef MOUNTED_VMOUNT /* AIX */ |
917 | 112 # include <fshelp.h> |
113 # include <sys/vfs.h> | |
5 | 114 #endif |
115 | |
39905
c3122bb580fe
mountlist: Modernize platform lists.
Bruno Haible <bruno@clisp.org>
parents:
19484
diff
changeset
|
116 #ifdef MOUNTED_INTERIX_STATVFS /* Interix */ |
14191
00edc8eebaa5
mountlist: add support for Interix
Markus Duft <mduft@gentoo.org>
parents:
14079
diff
changeset
|
117 # include <sys/statvfs.h> |
00edc8eebaa5
mountlist: add support for Interix
Markus Duft <mduft@gentoo.org>
parents:
14079
diff
changeset
|
118 # include <dirent.h> |
00edc8eebaa5
mountlist: add support for Interix
Markus Duft <mduft@gentoo.org>
parents:
14079
diff
changeset
|
119 #endif |
00edc8eebaa5
mountlist: add support for Interix
Markus Duft <mduft@gentoo.org>
parents:
14079
diff
changeset
|
120 |
1278
9ad625a30b7d
Use #if, not #ifdef with HAVE_ macros
Jim Meyering <jim@meyering.net>
parents:
1183
diff
changeset
|
121 #if HAVE_SYS_MNTENT_H |
918
09fe18b51677
(read_filesystem_list): Show automount-related
Jim Meyering <jim@meyering.net>
parents:
917
diff
changeset
|
122 /* This is to get MNTOPT_IGNORE on e.g. SVR4. */ |
09fe18b51677
(read_filesystem_list): Show automount-related
Jim Meyering <jim@meyering.net>
parents:
917
diff
changeset
|
123 # include <sys/mntent.h> |
09fe18b51677
(read_filesystem_list): Show automount-related
Jim Meyering <jim@meyering.net>
parents:
917
diff
changeset
|
124 #endif |
09fe18b51677
(read_filesystem_list): Show automount-related
Jim Meyering <jim@meyering.net>
parents:
917
diff
changeset
|
125 |
17332
e6a6fd004283
mountlist: port to HP NonStop
Paul Eggert <eggert@cs.ucla.edu>
parents:
17300
diff
changeset
|
126 #ifndef HAVE_HASMNTOPT |
e6a6fd004283
mountlist: port to HP NonStop
Paul Eggert <eggert@cs.ucla.edu>
parents:
17300
diff
changeset
|
127 # define hasmntopt(mnt, opt) ((char *) 0) |
e6a6fd004283
mountlist: port to HP NonStop
Paul Eggert <eggert@cs.ucla.edu>
parents:
17300
diff
changeset
|
128 #endif |
e6a6fd004283
mountlist: port to HP NonStop
Paul Eggert <eggert@cs.ucla.edu>
parents:
17300
diff
changeset
|
129 |
3991
ab906cd2631e
2002-07-13 Bruno Haible <bruno@clisp.org>
Jim Meyering <jim@meyering.net>
parents:
3621
diff
changeset
|
130 #undef MNT_IGNORE |
17332
e6a6fd004283
mountlist: port to HP NonStop
Paul Eggert <eggert@cs.ucla.edu>
parents:
17300
diff
changeset
|
131 #ifdef MNTOPT_IGNORE |
17697
5a079c01ad79
mountlist: avoid hasmntopt const type warning on solaris
Ben Walton <bdwalton@gmail.com>
parents:
17666
diff
changeset
|
132 # if defined __sun && defined __SVR4 |
5a079c01ad79
mountlist: avoid hasmntopt const type warning on solaris
Ben Walton <bdwalton@gmail.com>
parents:
17666
diff
changeset
|
133 /* Solaris defines hasmntopt(struct mnttab *, char *) |
5a079c01ad79
mountlist: avoid hasmntopt const type warning on solaris
Ben Walton <bdwalton@gmail.com>
parents:
17666
diff
changeset
|
134 while it is otherwise hasmntopt(struct mnttab *, const char *). */ |
5a079c01ad79
mountlist: avoid hasmntopt const type warning on solaris
Ben Walton <bdwalton@gmail.com>
parents:
17666
diff
changeset
|
135 # define MNT_IGNORE(M) hasmntopt (M, (char *) MNTOPT_IGNORE) |
5a079c01ad79
mountlist: avoid hasmntopt const type warning on solaris
Ben Walton <bdwalton@gmail.com>
parents:
17666
diff
changeset
|
136 # else |
5a079c01ad79
mountlist: avoid hasmntopt const type warning on solaris
Ben Walton <bdwalton@gmail.com>
parents:
17666
diff
changeset
|
137 # define MNT_IGNORE(M) hasmntopt (M, MNTOPT_IGNORE) |
5a079c01ad79
mountlist: avoid hasmntopt const type warning on solaris
Ben Walton <bdwalton@gmail.com>
parents:
17666
diff
changeset
|
138 # endif |
918
09fe18b51677
(read_filesystem_list): Show automount-related
Jim Meyering <jim@meyering.net>
parents:
917
diff
changeset
|
139 #else |
09fe18b51677
(read_filesystem_list): Show automount-related
Jim Meyering <jim@meyering.net>
parents:
917
diff
changeset
|
140 # define MNT_IGNORE(M) 0 |
09fe18b51677
(read_filesystem_list): Show automount-related
Jim Meyering <jim@meyering.net>
parents:
917
diff
changeset
|
141 #endif |
09fe18b51677
(read_filesystem_list): Show automount-related
Jim Meyering <jim@meyering.net>
parents:
917
diff
changeset
|
142 |
5318
7c24a825b51d
Remove dependencies on unlocked-io.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5159
diff
changeset
|
143 #if USE_UNLOCKED_IO |
7c24a825b51d
Remove dependencies on unlocked-io.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5159
diff
changeset
|
144 # include "unlocked-io.h" |
7c24a825b51d
Remove dependencies on unlocked-io.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5159
diff
changeset
|
145 #endif |
3621
56f442359b0d
Include unlocked-io.h after all system headers.
Jim Meyering <jim@meyering.net>
parents:
3618
diff
changeset
|
146 |
7863 | 147 /* The results of opendir() in this file are not used with dirfd and fchdir, |
148 therefore save some unnecessary work in fchdir.c. */ | |
17937
34065aa26b62
glob, etc.: port to MSVC v18 on MS-Windows 8.1
Paul Eggert <eggert@cs.ucla.edu>
parents:
17848
diff
changeset
|
149 #ifdef GNULIB_defined_opendir |
34065aa26b62
glob, etc.: port to MSVC v18 on MS-Windows 8.1
Paul Eggert <eggert@cs.ucla.edu>
parents:
17848
diff
changeset
|
150 # undef opendir |
34065aa26b62
glob, etc.: port to MSVC v18 on MS-Windows 8.1
Paul Eggert <eggert@cs.ucla.edu>
parents:
17848
diff
changeset
|
151 #endif |
34065aa26b62
glob, etc.: port to MSVC v18 on MS-Windows 8.1
Paul Eggert <eggert@cs.ucla.edu>
parents:
17848
diff
changeset
|
152 #ifdef GNULIB_defined_closedir |
34065aa26b62
glob, etc.: port to MSVC v18 on MS-Windows 8.1
Paul Eggert <eggert@cs.ucla.edu>
parents:
17848
diff
changeset
|
153 # undef closedir |
34065aa26b62
glob, etc.: port to MSVC v18 on MS-Windows 8.1
Paul Eggert <eggert@cs.ucla.edu>
parents:
17848
diff
changeset
|
154 #endif |
7863 | 155 |
17147
c4a6dcd5073a
mountlist: do not classify a bind-mounted dir entry as "dummy"
Andrew Warshall <warshall@99main.com>
parents:
16235
diff
changeset
|
156 #define ME_DUMMY_0(Fs_name, Fs_type) \ |
c4a6dcd5073a
mountlist: do not classify a bind-mounted dir entry as "dummy"
Andrew Warshall <warshall@99main.com>
parents:
16235
diff
changeset
|
157 (strcmp (Fs_type, "autofs") == 0 \ |
c4a6dcd5073a
mountlist: do not classify a bind-mounted dir entry as "dummy"
Andrew Warshall <warshall@99main.com>
parents:
16235
diff
changeset
|
158 || strcmp (Fs_type, "proc") == 0 \ |
c4a6dcd5073a
mountlist: do not classify a bind-mounted dir entry as "dummy"
Andrew Warshall <warshall@99main.com>
parents:
16235
diff
changeset
|
159 || strcmp (Fs_type, "subfs") == 0 \ |
17206
6a46fcdee530
mountlist: recognize more "dummy" file systems
Eric Wong <normalperson@yhbt.net>
parents:
17150
diff
changeset
|
160 /* for Linux 2.6/3.x */ \ |
6a46fcdee530
mountlist: recognize more "dummy" file systems
Eric Wong <normalperson@yhbt.net>
parents:
17150
diff
changeset
|
161 || strcmp (Fs_type, "debugfs") == 0 \ |
6a46fcdee530
mountlist: recognize more "dummy" file systems
Eric Wong <normalperson@yhbt.net>
parents:
17150
diff
changeset
|
162 || strcmp (Fs_type, "devpts") == 0 \ |
6a46fcdee530
mountlist: recognize more "dummy" file systems
Eric Wong <normalperson@yhbt.net>
parents:
17150
diff
changeset
|
163 || strcmp (Fs_type, "fusectl") == 0 \ |
6a46fcdee530
mountlist: recognize more "dummy" file systems
Eric Wong <normalperson@yhbt.net>
parents:
17150
diff
changeset
|
164 || strcmp (Fs_type, "mqueue") == 0 \ |
6a46fcdee530
mountlist: recognize more "dummy" file systems
Eric Wong <normalperson@yhbt.net>
parents:
17150
diff
changeset
|
165 || strcmp (Fs_type, "rpc_pipefs") == 0 \ |
6a46fcdee530
mountlist: recognize more "dummy" file systems
Eric Wong <normalperson@yhbt.net>
parents:
17150
diff
changeset
|
166 || strcmp (Fs_type, "sysfs") == 0 \ |
6a46fcdee530
mountlist: recognize more "dummy" file systems
Eric Wong <normalperson@yhbt.net>
parents:
17150
diff
changeset
|
167 /* FreeBSD, Linux 2.4 */ \ |
6a46fcdee530
mountlist: recognize more "dummy" file systems
Eric Wong <normalperson@yhbt.net>
parents:
17150
diff
changeset
|
168 || strcmp (Fs_type, "devfs") == 0 \ |
17147
c4a6dcd5073a
mountlist: do not classify a bind-mounted dir entry as "dummy"
Andrew Warshall <warshall@99main.com>
parents:
16235
diff
changeset
|
169 /* for NetBSD 3.0 */ \ |
c4a6dcd5073a
mountlist: do not classify a bind-mounted dir entry as "dummy"
Andrew Warshall <warshall@99main.com>
parents:
16235
diff
changeset
|
170 || strcmp (Fs_type, "kernfs") == 0 \ |
c4a6dcd5073a
mountlist: do not classify a bind-mounted dir entry as "dummy"
Andrew Warshall <warshall@99main.com>
parents:
16235
diff
changeset
|
171 /* for Irix 6.5 */ \ |
c4a6dcd5073a
mountlist: do not classify a bind-mounted dir entry as "dummy"
Andrew Warshall <warshall@99main.com>
parents:
16235
diff
changeset
|
172 || strcmp (Fs_type, "ignore") == 0) |
c4a6dcd5073a
mountlist: do not classify a bind-mounted dir entry as "dummy"
Andrew Warshall <warshall@99main.com>
parents:
16235
diff
changeset
|
173 |
c4a6dcd5073a
mountlist: do not classify a bind-mounted dir entry as "dummy"
Andrew Warshall <warshall@99main.com>
parents:
16235
diff
changeset
|
174 /* Historically, we have marked as "dummy" any file system of type "none", |
c4a6dcd5073a
mountlist: do not classify a bind-mounted dir entry as "dummy"
Andrew Warshall <warshall@99main.com>
parents:
16235
diff
changeset
|
175 but now that programs like du need to know about bind-mounted directories, |
c4a6dcd5073a
mountlist: do not classify a bind-mounted dir entry as "dummy"
Andrew Warshall <warshall@99main.com>
parents:
16235
diff
changeset
|
176 we grant an exception to any with "bind" in its list of mount options. |
c4a6dcd5073a
mountlist: do not classify a bind-mounted dir entry as "dummy"
Andrew Warshall <warshall@99main.com>
parents:
16235
diff
changeset
|
177 I.e., those are *not* dummy entries. */ |
c4a6dcd5073a
mountlist: do not classify a bind-mounted dir entry as "dummy"
Andrew Warshall <warshall@99main.com>
parents:
16235
diff
changeset
|
178 #ifdef MOUNTED_GETMNTENT1 |
17784
f8a2b0c3de24
mountlist: don't use libmount to decide on dummy/remote
Pádraig Brady <P@draigBrady.com>
parents:
17756
diff
changeset
|
179 # define ME_DUMMY(Fs_name, Fs_type, Bind) \ |
17147
c4a6dcd5073a
mountlist: do not classify a bind-mounted dir entry as "dummy"
Andrew Warshall <warshall@99main.com>
parents:
16235
diff
changeset
|
180 (ME_DUMMY_0 (Fs_name, Fs_type) \ |
17784
f8a2b0c3de24
mountlist: don't use libmount to decide on dummy/remote
Pádraig Brady <P@draigBrady.com>
parents:
17756
diff
changeset
|
181 || (strcmp (Fs_type, "none") == 0 && !Bind)) |
17147
c4a6dcd5073a
mountlist: do not classify a bind-mounted dir entry as "dummy"
Andrew Warshall <warshall@99main.com>
parents:
16235
diff
changeset
|
182 #else |
c4a6dcd5073a
mountlist: do not classify a bind-mounted dir entry as "dummy"
Andrew Warshall <warshall@99main.com>
parents:
16235
diff
changeset
|
183 # define ME_DUMMY(Fs_name, Fs_type) \ |
c4a6dcd5073a
mountlist: do not classify a bind-mounted dir entry as "dummy"
Andrew Warshall <warshall@99main.com>
parents:
16235
diff
changeset
|
184 (ME_DUMMY_0 (Fs_name, Fs_type) || strcmp (Fs_type, "none") == 0) |
5632
f2a6ab91acad
* mountlist.h (MOUNTLIST_H_): New macro, to protect against double
Paul Eggert <eggert@cs.ucla.edu>
parents:
5318
diff
changeset
|
185 #endif |
f2a6ab91acad
* mountlist.h (MOUNTLIST_H_): New macro, to protect against double
Paul Eggert <eggert@cs.ucla.edu>
parents:
5318
diff
changeset
|
186 |
14055
b968dd130aed
mountlist: fix local drive detection on cygwin
Eric Blake <eblake@redhat.com>
parents:
12845
diff
changeset
|
187 #ifdef __CYGWIN__ |
b968dd130aed
mountlist: fix local drive detection on cygwin
Eric Blake <eblake@redhat.com>
parents:
12845
diff
changeset
|
188 # include <windows.h> |
b968dd130aed
mountlist: fix local drive detection on cygwin
Eric Blake <eblake@redhat.com>
parents:
12845
diff
changeset
|
189 # define ME_REMOTE me_remote |
16235
18a38c9615f0
In commentary, do not use ` to quote.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16201
diff
changeset
|
190 /* All cygwin mount points include ':' or start with '//'; so it |
14055
b968dd130aed
mountlist: fix local drive detection on cygwin
Eric Blake <eblake@redhat.com>
parents:
12845
diff
changeset
|
191 requires a native Windows call to determine remote disks. */ |
b968dd130aed
mountlist: fix local drive detection on cygwin
Eric Blake <eblake@redhat.com>
parents:
12845
diff
changeset
|
192 static bool |
b968dd130aed
mountlist: fix local drive detection on cygwin
Eric Blake <eblake@redhat.com>
parents:
12845
diff
changeset
|
193 me_remote (char const *fs_name, char const *fs_type _GL_UNUSED) |
b968dd130aed
mountlist: fix local drive detection on cygwin
Eric Blake <eblake@redhat.com>
parents:
12845
diff
changeset
|
194 { |
b968dd130aed
mountlist: fix local drive detection on cygwin
Eric Blake <eblake@redhat.com>
parents:
12845
diff
changeset
|
195 if (fs_name[0] && fs_name[1] == ':') |
b968dd130aed
mountlist: fix local drive detection on cygwin
Eric Blake <eblake@redhat.com>
parents:
12845
diff
changeset
|
196 { |
14056
602afdb74dc3
mountlist: tweak previous commit
Eric Blake <eblake@redhat.com>
parents:
14055
diff
changeset
|
197 char drive[4]; |
602afdb74dc3
mountlist: tweak previous commit
Eric Blake <eblake@redhat.com>
parents:
14055
diff
changeset
|
198 sprintf (drive, "%c:\\", fs_name[0]); |
14055
b968dd130aed
mountlist: fix local drive detection on cygwin
Eric Blake <eblake@redhat.com>
parents:
12845
diff
changeset
|
199 switch (GetDriveType (drive)) |
b968dd130aed
mountlist: fix local drive detection on cygwin
Eric Blake <eblake@redhat.com>
parents:
12845
diff
changeset
|
200 { |
b968dd130aed
mountlist: fix local drive detection on cygwin
Eric Blake <eblake@redhat.com>
parents:
12845
diff
changeset
|
201 case DRIVE_REMOVABLE: |
b968dd130aed
mountlist: fix local drive detection on cygwin
Eric Blake <eblake@redhat.com>
parents:
12845
diff
changeset
|
202 case DRIVE_FIXED: |
b968dd130aed
mountlist: fix local drive detection on cygwin
Eric Blake <eblake@redhat.com>
parents:
12845
diff
changeset
|
203 case DRIVE_CDROM: |
b968dd130aed
mountlist: fix local drive detection on cygwin
Eric Blake <eblake@redhat.com>
parents:
12845
diff
changeset
|
204 case DRIVE_RAMDISK: |
b968dd130aed
mountlist: fix local drive detection on cygwin
Eric Blake <eblake@redhat.com>
parents:
12845
diff
changeset
|
205 return false; |
b968dd130aed
mountlist: fix local drive detection on cygwin
Eric Blake <eblake@redhat.com>
parents:
12845
diff
changeset
|
206 } |
b968dd130aed
mountlist: fix local drive detection on cygwin
Eric Blake <eblake@redhat.com>
parents:
12845
diff
changeset
|
207 } |
b968dd130aed
mountlist: fix local drive detection on cygwin
Eric Blake <eblake@redhat.com>
parents:
12845
diff
changeset
|
208 return true; |
b968dd130aed
mountlist: fix local drive detection on cygwin
Eric Blake <eblake@redhat.com>
parents:
12845
diff
changeset
|
209 } |
b968dd130aed
mountlist: fix local drive detection on cygwin
Eric Blake <eblake@redhat.com>
parents:
12845
diff
changeset
|
210 #endif |
b968dd130aed
mountlist: fix local drive detection on cygwin
Eric Blake <eblake@redhat.com>
parents:
12845
diff
changeset
|
211 |
5632
f2a6ab91acad
* mountlist.h (MOUNTLIST_H_): New macro, to protect against double
Paul Eggert <eggert@cs.ucla.edu>
parents:
5318
diff
changeset
|
212 #ifndef ME_REMOTE |
16235
18a38c9615f0
In commentary, do not use ` to quote.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16201
diff
changeset
|
213 /* A file system is "remote" if its Fs_name contains a ':' |
18255
93e9ece52a3c
mountlist: recognize autofs-mounted remote file systems, too
Kamil Dudka <kdudka@redhat.com>
parents:
18244
diff
changeset
|
214 or if (it is of type (smbfs or cifs) and its Fs_name starts with '//') |
93e9ece52a3c
mountlist: recognize autofs-mounted remote file systems, too
Kamil Dudka <kdudka@redhat.com>
parents:
18244
diff
changeset
|
215 or Fs_name is equal to "-hosts" (used by autofs to mount remote fs). */ |
12421
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
216 # define ME_REMOTE(Fs_name, Fs_type) \ |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
217 (strchr (Fs_name, ':') != NULL \ |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
218 || ((Fs_name)[0] == '/' \ |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
219 && (Fs_name)[1] == '/' \ |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
220 && (strcmp (Fs_type, "smbfs") == 0 \ |
18255
93e9ece52a3c
mountlist: recognize autofs-mounted remote file systems, too
Kamil Dudka <kdudka@redhat.com>
parents:
18244
diff
changeset
|
221 || strcmp (Fs_type, "cifs") == 0)) \ |
93e9ece52a3c
mountlist: recognize autofs-mounted remote file systems, too
Kamil Dudka <kdudka@redhat.com>
parents:
18244
diff
changeset
|
222 || (strcmp("-hosts", Fs_name) == 0)) |
5632
f2a6ab91acad
* mountlist.h (MOUNTLIST_H_): New macro, to protect against double
Paul Eggert <eggert@cs.ucla.edu>
parents:
5318
diff
changeset
|
223 #endif |
f2a6ab91acad
* mountlist.h (MOUNTLIST_H_): New macro, to protect against double
Paul Eggert <eggert@cs.ucla.edu>
parents:
5318
diff
changeset
|
224 |
39905
c3122bb580fe
mountlist: Modernize platform lists.
Bruno Haible <bruno@clisp.org>
parents:
19484
diff
changeset
|
225 #if MOUNTED_GETMNTINFO /* Mac OS X, FreeBSD, OpenBSD, also (obsolete) 4.4BSD */ |
1389
e947a465b033
(fsp_to_string): Clean out some crufty #ifdefs
Jim Meyering <jim@meyering.net>
parents:
1278
diff
changeset
|
226 |
7247
c77c9dc7d8c6
* lib/mountlist.c: All uses of HAVE_F_FSTYPENAME_IN_STATFS replaced by
Paul Eggert <eggert@cs.ucla.edu>
parents:
7154
diff
changeset
|
227 # if ! HAVE_STRUCT_STATFS_F_FSTYPENAME |
5 | 228 static char * |
5159 | 229 fstype_to_string (short int t) |
5 | 230 { |
231 switch (t) | |
232 { | |
1396
f3912c1d7674
(fstype_to_string): Guard with #if ! HAVE_F_FSTYPENAME_IN_STATFS.
Jim Meyering <jim@meyering.net>
parents:
1389
diff
changeset
|
233 # ifdef MOUNT_PC |
5 | 234 case MOUNT_PC: |
235 return "pc"; | |
1396
f3912c1d7674
(fstype_to_string): Guard with #if ! HAVE_F_FSTYPENAME_IN_STATFS.
Jim Meyering <jim@meyering.net>
parents:
1389
diff
changeset
|
236 # endif |
f3912c1d7674
(fstype_to_string): Guard with #if ! HAVE_F_FSTYPENAME_IN_STATFS.
Jim Meyering <jim@meyering.net>
parents:
1389
diff
changeset
|
237 # ifdef MOUNT_MFS |
5 | 238 case MOUNT_MFS: |
239 return "mfs"; | |
1396
f3912c1d7674
(fstype_to_string): Guard with #if ! HAVE_F_FSTYPENAME_IN_STATFS.
Jim Meyering <jim@meyering.net>
parents:
1389
diff
changeset
|
240 # endif |
f3912c1d7674
(fstype_to_string): Guard with #if ! HAVE_F_FSTYPENAME_IN_STATFS.
Jim Meyering <jim@meyering.net>
parents:
1389
diff
changeset
|
241 # ifdef MOUNT_LO |
5 | 242 case MOUNT_LO: |
243 return "lo"; | |
1396
f3912c1d7674
(fstype_to_string): Guard with #if ! HAVE_F_FSTYPENAME_IN_STATFS.
Jim Meyering <jim@meyering.net>
parents:
1389
diff
changeset
|
244 # endif |
f3912c1d7674
(fstype_to_string): Guard with #if ! HAVE_F_FSTYPENAME_IN_STATFS.
Jim Meyering <jim@meyering.net>
parents:
1389
diff
changeset
|
245 # ifdef MOUNT_TFS |
5 | 246 case MOUNT_TFS: |
247 return "tfs"; | |
1396
f3912c1d7674
(fstype_to_string): Guard with #if ! HAVE_F_FSTYPENAME_IN_STATFS.
Jim Meyering <jim@meyering.net>
parents:
1389
diff
changeset
|
248 # endif |
f3912c1d7674
(fstype_to_string): Guard with #if ! HAVE_F_FSTYPENAME_IN_STATFS.
Jim Meyering <jim@meyering.net>
parents:
1389
diff
changeset
|
249 # ifdef MOUNT_TMP |
5 | 250 case MOUNT_TMP: |
251 return "tmp"; | |
1396
f3912c1d7674
(fstype_to_string): Guard with #if ! HAVE_F_FSTYPENAME_IN_STATFS.
Jim Meyering <jim@meyering.net>
parents:
1389
diff
changeset
|
252 # endif |
f3912c1d7674
(fstype_to_string): Guard with #if ! HAVE_F_FSTYPENAME_IN_STATFS.
Jim Meyering <jim@meyering.net>
parents:
1389
diff
changeset
|
253 # ifdef MOUNT_UFS |
736
bf298c166b8d
(fstype_to_string): Handle fstypes of freebsd.
Jim Meyering <jim@meyering.net>
parents:
650
diff
changeset
|
254 case MOUNT_UFS: |
bf298c166b8d
(fstype_to_string): Handle fstypes of freebsd.
Jim Meyering <jim@meyering.net>
parents:
650
diff
changeset
|
255 return "ufs" ; |
1396
f3912c1d7674
(fstype_to_string): Guard with #if ! HAVE_F_FSTYPENAME_IN_STATFS.
Jim Meyering <jim@meyering.net>
parents:
1389
diff
changeset
|
256 # endif |
f3912c1d7674
(fstype_to_string): Guard with #if ! HAVE_F_FSTYPENAME_IN_STATFS.
Jim Meyering <jim@meyering.net>
parents:
1389
diff
changeset
|
257 # ifdef MOUNT_NFS |
736
bf298c166b8d
(fstype_to_string): Handle fstypes of freebsd.
Jim Meyering <jim@meyering.net>
parents:
650
diff
changeset
|
258 case MOUNT_NFS: |
bf298c166b8d
(fstype_to_string): Handle fstypes of freebsd.
Jim Meyering <jim@meyering.net>
parents:
650
diff
changeset
|
259 return "nfs" ; |
1396
f3912c1d7674
(fstype_to_string): Guard with #if ! HAVE_F_FSTYPENAME_IN_STATFS.
Jim Meyering <jim@meyering.net>
parents:
1389
diff
changeset
|
260 # endif |
f3912c1d7674
(fstype_to_string): Guard with #if ! HAVE_F_FSTYPENAME_IN_STATFS.
Jim Meyering <jim@meyering.net>
parents:
1389
diff
changeset
|
261 # ifdef MOUNT_MSDOS |
736
bf298c166b8d
(fstype_to_string): Handle fstypes of freebsd.
Jim Meyering <jim@meyering.net>
parents:
650
diff
changeset
|
262 case MOUNT_MSDOS: |
bf298c166b8d
(fstype_to_string): Handle fstypes of freebsd.
Jim Meyering <jim@meyering.net>
parents:
650
diff
changeset
|
263 return "msdos" ; |
1396
f3912c1d7674
(fstype_to_string): Guard with #if ! HAVE_F_FSTYPENAME_IN_STATFS.
Jim Meyering <jim@meyering.net>
parents:
1389
diff
changeset
|
264 # endif |
f3912c1d7674
(fstype_to_string): Guard with #if ! HAVE_F_FSTYPENAME_IN_STATFS.
Jim Meyering <jim@meyering.net>
parents:
1389
diff
changeset
|
265 # ifdef MOUNT_LFS |
736
bf298c166b8d
(fstype_to_string): Handle fstypes of freebsd.
Jim Meyering <jim@meyering.net>
parents:
650
diff
changeset
|
266 case MOUNT_LFS: |
bf298c166b8d
(fstype_to_string): Handle fstypes of freebsd.
Jim Meyering <jim@meyering.net>
parents:
650
diff
changeset
|
267 return "lfs" ; |
1396
f3912c1d7674
(fstype_to_string): Guard with #if ! HAVE_F_FSTYPENAME_IN_STATFS.
Jim Meyering <jim@meyering.net>
parents:
1389
diff
changeset
|
268 # endif |
f3912c1d7674
(fstype_to_string): Guard with #if ! HAVE_F_FSTYPENAME_IN_STATFS.
Jim Meyering <jim@meyering.net>
parents:
1389
diff
changeset
|
269 # ifdef MOUNT_LOFS |
736
bf298c166b8d
(fstype_to_string): Handle fstypes of freebsd.
Jim Meyering <jim@meyering.net>
parents:
650
diff
changeset
|
270 case MOUNT_LOFS: |
bf298c166b8d
(fstype_to_string): Handle fstypes of freebsd.
Jim Meyering <jim@meyering.net>
parents:
650
diff
changeset
|
271 return "lofs" ; |
1396
f3912c1d7674
(fstype_to_string): Guard with #if ! HAVE_F_FSTYPENAME_IN_STATFS.
Jim Meyering <jim@meyering.net>
parents:
1389
diff
changeset
|
272 # endif |
f3912c1d7674
(fstype_to_string): Guard with #if ! HAVE_F_FSTYPENAME_IN_STATFS.
Jim Meyering <jim@meyering.net>
parents:
1389
diff
changeset
|
273 # ifdef MOUNT_FDESC |
736
bf298c166b8d
(fstype_to_string): Handle fstypes of freebsd.
Jim Meyering <jim@meyering.net>
parents:
650
diff
changeset
|
274 case MOUNT_FDESC: |
bf298c166b8d
(fstype_to_string): Handle fstypes of freebsd.
Jim Meyering <jim@meyering.net>
parents:
650
diff
changeset
|
275 return "fdesc" ; |
1396
f3912c1d7674
(fstype_to_string): Guard with #if ! HAVE_F_FSTYPENAME_IN_STATFS.
Jim Meyering <jim@meyering.net>
parents:
1389
diff
changeset
|
276 # endif |
f3912c1d7674
(fstype_to_string): Guard with #if ! HAVE_F_FSTYPENAME_IN_STATFS.
Jim Meyering <jim@meyering.net>
parents:
1389
diff
changeset
|
277 # ifdef MOUNT_PORTAL |
736
bf298c166b8d
(fstype_to_string): Handle fstypes of freebsd.
Jim Meyering <jim@meyering.net>
parents:
650
diff
changeset
|
278 case MOUNT_PORTAL: |
bf298c166b8d
(fstype_to_string): Handle fstypes of freebsd.
Jim Meyering <jim@meyering.net>
parents:
650
diff
changeset
|
279 return "portal" ; |
1396
f3912c1d7674
(fstype_to_string): Guard with #if ! HAVE_F_FSTYPENAME_IN_STATFS.
Jim Meyering <jim@meyering.net>
parents:
1389
diff
changeset
|
280 # endif |
f3912c1d7674
(fstype_to_string): Guard with #if ! HAVE_F_FSTYPENAME_IN_STATFS.
Jim Meyering <jim@meyering.net>
parents:
1389
diff
changeset
|
281 # ifdef MOUNT_NULL |
736
bf298c166b8d
(fstype_to_string): Handle fstypes of freebsd.
Jim Meyering <jim@meyering.net>
parents:
650
diff
changeset
|
282 case MOUNT_NULL: |
bf298c166b8d
(fstype_to_string): Handle fstypes of freebsd.
Jim Meyering <jim@meyering.net>
parents:
650
diff
changeset
|
283 return "null" ; |
1396
f3912c1d7674
(fstype_to_string): Guard with #if ! HAVE_F_FSTYPENAME_IN_STATFS.
Jim Meyering <jim@meyering.net>
parents:
1389
diff
changeset
|
284 # endif |
f3912c1d7674
(fstype_to_string): Guard with #if ! HAVE_F_FSTYPENAME_IN_STATFS.
Jim Meyering <jim@meyering.net>
parents:
1389
diff
changeset
|
285 # ifdef MOUNT_UMAP |
736
bf298c166b8d
(fstype_to_string): Handle fstypes of freebsd.
Jim Meyering <jim@meyering.net>
parents:
650
diff
changeset
|
286 case MOUNT_UMAP: |
bf298c166b8d
(fstype_to_string): Handle fstypes of freebsd.
Jim Meyering <jim@meyering.net>
parents:
650
diff
changeset
|
287 return "umap" ; |
1396
f3912c1d7674
(fstype_to_string): Guard with #if ! HAVE_F_FSTYPENAME_IN_STATFS.
Jim Meyering <jim@meyering.net>
parents:
1389
diff
changeset
|
288 # endif |
f3912c1d7674
(fstype_to_string): Guard with #if ! HAVE_F_FSTYPENAME_IN_STATFS.
Jim Meyering <jim@meyering.net>
parents:
1389
diff
changeset
|
289 # ifdef MOUNT_KERNFS |
736
bf298c166b8d
(fstype_to_string): Handle fstypes of freebsd.
Jim Meyering <jim@meyering.net>
parents:
650
diff
changeset
|
290 case MOUNT_KERNFS: |
bf298c166b8d
(fstype_to_string): Handle fstypes of freebsd.
Jim Meyering <jim@meyering.net>
parents:
650
diff
changeset
|
291 return "kernfs" ; |
1396
f3912c1d7674
(fstype_to_string): Guard with #if ! HAVE_F_FSTYPENAME_IN_STATFS.
Jim Meyering <jim@meyering.net>
parents:
1389
diff
changeset
|
292 # endif |
f3912c1d7674
(fstype_to_string): Guard with #if ! HAVE_F_FSTYPENAME_IN_STATFS.
Jim Meyering <jim@meyering.net>
parents:
1389
diff
changeset
|
293 # ifdef MOUNT_PROCFS |
736
bf298c166b8d
(fstype_to_string): Handle fstypes of freebsd.
Jim Meyering <jim@meyering.net>
parents:
650
diff
changeset
|
294 case MOUNT_PROCFS: |
bf298c166b8d
(fstype_to_string): Handle fstypes of freebsd.
Jim Meyering <jim@meyering.net>
parents:
650
diff
changeset
|
295 return "procfs" ; |
1396
f3912c1d7674
(fstype_to_string): Guard with #if ! HAVE_F_FSTYPENAME_IN_STATFS.
Jim Meyering <jim@meyering.net>
parents:
1389
diff
changeset
|
296 # endif |
f3912c1d7674
(fstype_to_string): Guard with #if ! HAVE_F_FSTYPENAME_IN_STATFS.
Jim Meyering <jim@meyering.net>
parents:
1389
diff
changeset
|
297 # ifdef MOUNT_AFS |
736
bf298c166b8d
(fstype_to_string): Handle fstypes of freebsd.
Jim Meyering <jim@meyering.net>
parents:
650
diff
changeset
|
298 case MOUNT_AFS: |
bf298c166b8d
(fstype_to_string): Handle fstypes of freebsd.
Jim Meyering <jim@meyering.net>
parents:
650
diff
changeset
|
299 return "afs" ; |
1396
f3912c1d7674
(fstype_to_string): Guard with #if ! HAVE_F_FSTYPENAME_IN_STATFS.
Jim Meyering <jim@meyering.net>
parents:
1389
diff
changeset
|
300 # endif |
f3912c1d7674
(fstype_to_string): Guard with #if ! HAVE_F_FSTYPENAME_IN_STATFS.
Jim Meyering <jim@meyering.net>
parents:
1389
diff
changeset
|
301 # ifdef MOUNT_CD9660 |
736
bf298c166b8d
(fstype_to_string): Handle fstypes of freebsd.
Jim Meyering <jim@meyering.net>
parents:
650
diff
changeset
|
302 case MOUNT_CD9660: |
bf298c166b8d
(fstype_to_string): Handle fstypes of freebsd.
Jim Meyering <jim@meyering.net>
parents:
650
diff
changeset
|
303 return "cd9660" ; |
1396
f3912c1d7674
(fstype_to_string): Guard with #if ! HAVE_F_FSTYPENAME_IN_STATFS.
Jim Meyering <jim@meyering.net>
parents:
1389
diff
changeset
|
304 # endif |
f3912c1d7674
(fstype_to_string): Guard with #if ! HAVE_F_FSTYPENAME_IN_STATFS.
Jim Meyering <jim@meyering.net>
parents:
1389
diff
changeset
|
305 # ifdef MOUNT_UNION |
736
bf298c166b8d
(fstype_to_string): Handle fstypes of freebsd.
Jim Meyering <jim@meyering.net>
parents:
650
diff
changeset
|
306 case MOUNT_UNION: |
bf298c166b8d
(fstype_to_string): Handle fstypes of freebsd.
Jim Meyering <jim@meyering.net>
parents:
650
diff
changeset
|
307 return "union" ; |
1396
f3912c1d7674
(fstype_to_string): Guard with #if ! HAVE_F_FSTYPENAME_IN_STATFS.
Jim Meyering <jim@meyering.net>
parents:
1389
diff
changeset
|
308 # endif |
f3912c1d7674
(fstype_to_string): Guard with #if ! HAVE_F_FSTYPENAME_IN_STATFS.
Jim Meyering <jim@meyering.net>
parents:
1389
diff
changeset
|
309 # ifdef MOUNT_DEVFS |
736
bf298c166b8d
(fstype_to_string): Handle fstypes of freebsd.
Jim Meyering <jim@meyering.net>
parents:
650
diff
changeset
|
310 case MOUNT_DEVFS: |
bf298c166b8d
(fstype_to_string): Handle fstypes of freebsd.
Jim Meyering <jim@meyering.net>
parents:
650
diff
changeset
|
311 return "devfs" ; |
1396
f3912c1d7674
(fstype_to_string): Guard with #if ! HAVE_F_FSTYPENAME_IN_STATFS.
Jim Meyering <jim@meyering.net>
parents:
1389
diff
changeset
|
312 # endif |
f3912c1d7674
(fstype_to_string): Guard with #if ! HAVE_F_FSTYPENAME_IN_STATFS.
Jim Meyering <jim@meyering.net>
parents:
1389
diff
changeset
|
313 # ifdef MOUNT_EXT2FS |
736
bf298c166b8d
(fstype_to_string): Handle fstypes of freebsd.
Jim Meyering <jim@meyering.net>
parents:
650
diff
changeset
|
314 case MOUNT_EXT2FS: |
bf298c166b8d
(fstype_to_string): Handle fstypes of freebsd.
Jim Meyering <jim@meyering.net>
parents:
650
diff
changeset
|
315 return "ext2fs" ; |
1396
f3912c1d7674
(fstype_to_string): Guard with #if ! HAVE_F_FSTYPENAME_IN_STATFS.
Jim Meyering <jim@meyering.net>
parents:
1389
diff
changeset
|
316 # endif |
5 | 317 default: |
318 return "?"; | |
319 } | |
320 } | |
7247
c77c9dc7d8c6
* lib/mountlist.c: All uses of HAVE_F_FSTYPENAME_IN_STATFS replaced by
Paul Eggert <eggert@cs.ucla.edu>
parents:
7154
diff
changeset
|
321 # endif |
1389
e947a465b033
(fsp_to_string): Clean out some crufty #ifdefs
Jim Meyering <jim@meyering.net>
parents:
1278
diff
changeset
|
322 |
e947a465b033
(fsp_to_string): Clean out some crufty #ifdefs
Jim Meyering <jim@meyering.net>
parents:
1278
diff
changeset
|
323 static char * |
e947a465b033
(fsp_to_string): Clean out some crufty #ifdefs
Jim Meyering <jim@meyering.net>
parents:
1278
diff
changeset
|
324 fsp_to_string (const struct statfs *fsp) |
e947a465b033
(fsp_to_string): Clean out some crufty #ifdefs
Jim Meyering <jim@meyering.net>
parents:
1278
diff
changeset
|
325 { |
7247
c77c9dc7d8c6
* lib/mountlist.c: All uses of HAVE_F_FSTYPENAME_IN_STATFS replaced by
Paul Eggert <eggert@cs.ucla.edu>
parents:
7154
diff
changeset
|
326 # if HAVE_STRUCT_STATFS_F_FSTYPENAME |
2667
a61942f1a535
(fsp_to_string) [HAVE_F_FSTYPENAME_IN_STATFS]:
Jim Meyering <jim@meyering.net>
parents:
2570
diff
changeset
|
327 return (char *) (fsp->f_fstypename); |
1389
e947a465b033
(fsp_to_string): Clean out some crufty #ifdefs
Jim Meyering <jim@meyering.net>
parents:
1278
diff
changeset
|
328 # else |
e947a465b033
(fsp_to_string): Clean out some crufty #ifdefs
Jim Meyering <jim@meyering.net>
parents:
1278
diff
changeset
|
329 return fstype_to_string (fsp->f_type); |
e947a465b033
(fsp_to_string): Clean out some crufty #ifdefs
Jim Meyering <jim@meyering.net>
parents:
1278
diff
changeset
|
330 # endif |
e947a465b033
(fsp_to_string): Clean out some crufty #ifdefs
Jim Meyering <jim@meyering.net>
parents:
1278
diff
changeset
|
331 } |
e947a465b033
(fsp_to_string): Clean out some crufty #ifdefs
Jim Meyering <jim@meyering.net>
parents:
1278
diff
changeset
|
332 |
5 | 333 #endif /* MOUNTED_GETMNTINFO */ |
334 | |
39905
c3122bb580fe
mountlist: Modernize platform lists.
Bruno Haible <bruno@clisp.org>
parents:
19484
diff
changeset
|
335 #ifdef MOUNTED_VMOUNT /* AIX */ |
5 | 336 static char * |
1446 | 337 fstype_to_string (int t) |
5 | 338 { |
339 struct vfs_ent *e; | |
340 | |
341 e = getvfsbytype (t); | |
342 if (!e || !e->vfsent_name) | |
343 return "none"; | |
344 else | |
345 return e->vfsent_name; | |
346 } | |
347 #endif /* MOUNTED_VMOUNT */ | |
348 | |
6527 | 349 |
350 #if defined MOUNTED_GETMNTENT1 || defined MOUNTED_GETMNTENT2 | |
351 | |
352 /* Return the device number from MOUNT_OPTIONS, if possible. | |
353 Otherwise return (dev_t) -1. */ | |
354 static dev_t | |
11112
e7df8edd0e88
still avoid unused-parameter warnings, but do it cleanly
Jim Meyering <meyering@redhat.com>
parents:
11110
diff
changeset
|
355 dev_from_mount_options (char const *mount_options) |
6527 | 356 { |
357 /* GNU/Linux allows file system implementations to define their own | |
358 meaning for "dev=" mount options, so don't trust the meaning | |
359 here. */ | |
360 # ifndef __linux__ | |
361 | |
362 static char const dev_pattern[] = ",dev="; | |
363 char const *devopt = strstr (mount_options, dev_pattern); | |
364 | |
365 if (devopt) | |
366 { | |
367 char const *optval = devopt + sizeof dev_pattern - 1; | |
368 char *optvalend; | |
369 unsigned long int dev; | |
370 errno = 0; | |
371 dev = strtoul (optval, &optvalend, 16); | |
372 if (optval != optvalend | |
12421
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
373 && (*optvalend == '\0' || *optvalend == ',') |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
374 && ! (dev == ULONG_MAX && errno == ERANGE) |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
375 && dev == (dev_t) dev) |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
376 return dev; |
6527 | 377 } |
378 | |
379 # endif | |
11112
e7df8edd0e88
still avoid unused-parameter warnings, but do it cleanly
Jim Meyering <meyering@redhat.com>
parents:
11110
diff
changeset
|
380 (void) mount_options; |
6527 | 381 return -1; |
382 } | |
383 | |
384 #endif | |
385 | |
39905
c3122bb580fe
mountlist: Modernize platform lists.
Bruno Haible <bruno@clisp.org>
parents:
19484
diff
changeset
|
386 #if defined MOUNTED_GETMNTENT1 && defined __linux__ /* GNU/Linux, Android */ |
17951
2ae3c246cda5
mountlist: remove dependency on libmount
Pádraig Brady <P@draigBrady.com>
parents:
17937
diff
changeset
|
387 |
2ae3c246cda5
mountlist: remove dependency on libmount
Pádraig Brady <P@draigBrady.com>
parents:
17937
diff
changeset
|
388 /* Unescape the paths in mount tables. |
2ae3c246cda5
mountlist: remove dependency on libmount
Pádraig Brady <P@draigBrady.com>
parents:
17937
diff
changeset
|
389 STR is updated in place. */ |
2ae3c246cda5
mountlist: remove dependency on libmount
Pádraig Brady <P@draigBrady.com>
parents:
17937
diff
changeset
|
390 |
2ae3c246cda5
mountlist: remove dependency on libmount
Pádraig Brady <P@draigBrady.com>
parents:
17937
diff
changeset
|
391 static void |
2ae3c246cda5
mountlist: remove dependency on libmount
Pádraig Brady <P@draigBrady.com>
parents:
17937
diff
changeset
|
392 unescape_tab (char *str) |
2ae3c246cda5
mountlist: remove dependency on libmount
Pádraig Brady <P@draigBrady.com>
parents:
17937
diff
changeset
|
393 { |
2ae3c246cda5
mountlist: remove dependency on libmount
Pádraig Brady <P@draigBrady.com>
parents:
17937
diff
changeset
|
394 size_t i, j = 0; |
2ae3c246cda5
mountlist: remove dependency on libmount
Pádraig Brady <P@draigBrady.com>
parents:
17937
diff
changeset
|
395 size_t len = strlen (str) + 1; |
2ae3c246cda5
mountlist: remove dependency on libmount
Pádraig Brady <P@draigBrady.com>
parents:
17937
diff
changeset
|
396 for (i = 0; i < len; i++) |
2ae3c246cda5
mountlist: remove dependency on libmount
Pádraig Brady <P@draigBrady.com>
parents:
17937
diff
changeset
|
397 { |
2ae3c246cda5
mountlist: remove dependency on libmount
Pádraig Brady <P@draigBrady.com>
parents:
17937
diff
changeset
|
398 if (str[i] == '\\' && (i + 4 < len) |
2ae3c246cda5
mountlist: remove dependency on libmount
Pádraig Brady <P@draigBrady.com>
parents:
17937
diff
changeset
|
399 && str[i + 1] >= '0' && str[i + 1] <= '3' |
2ae3c246cda5
mountlist: remove dependency on libmount
Pádraig Brady <P@draigBrady.com>
parents:
17937
diff
changeset
|
400 && str[i + 2] >= '0' && str[i + 2] <= '7' |
2ae3c246cda5
mountlist: remove dependency on libmount
Pádraig Brady <P@draigBrady.com>
parents:
17937
diff
changeset
|
401 && str[i + 3] >= '0' && str[i + 3] <= '7') |
2ae3c246cda5
mountlist: remove dependency on libmount
Pádraig Brady <P@draigBrady.com>
parents:
17937
diff
changeset
|
402 { |
2ae3c246cda5
mountlist: remove dependency on libmount
Pádraig Brady <P@draigBrady.com>
parents:
17937
diff
changeset
|
403 str[j++] = (str[i + 1] - '0') * 64 + |
2ae3c246cda5
mountlist: remove dependency on libmount
Pádraig Brady <P@draigBrady.com>
parents:
17937
diff
changeset
|
404 (str[i + 2] - '0') * 8 + |
2ae3c246cda5
mountlist: remove dependency on libmount
Pádraig Brady <P@draigBrady.com>
parents:
17937
diff
changeset
|
405 (str[i + 3] - '0'); |
2ae3c246cda5
mountlist: remove dependency on libmount
Pádraig Brady <P@draigBrady.com>
parents:
17937
diff
changeset
|
406 i += 3; |
2ae3c246cda5
mountlist: remove dependency on libmount
Pádraig Brady <P@draigBrady.com>
parents:
17937
diff
changeset
|
407 } |
2ae3c246cda5
mountlist: remove dependency on libmount
Pádraig Brady <P@draigBrady.com>
parents:
17937
diff
changeset
|
408 else |
2ae3c246cda5
mountlist: remove dependency on libmount
Pádraig Brady <P@draigBrady.com>
parents:
17937
diff
changeset
|
409 str[j++] = str[i]; |
2ae3c246cda5
mountlist: remove dependency on libmount
Pádraig Brady <P@draigBrady.com>
parents:
17937
diff
changeset
|
410 } |
2ae3c246cda5
mountlist: remove dependency on libmount
Pádraig Brady <P@draigBrady.com>
parents:
17937
diff
changeset
|
411 } |
2ae3c246cda5
mountlist: remove dependency on libmount
Pádraig Brady <P@draigBrady.com>
parents:
17937
diff
changeset
|
412 #endif |
2ae3c246cda5
mountlist: remove dependency on libmount
Pádraig Brady <P@draigBrady.com>
parents:
17937
diff
changeset
|
413 |
5159 | 414 /* Return a list of the currently mounted file systems, or NULL on error. |
5 | 415 Add each entry to the tail of the list so that they stay in order. |
5159 | 416 If NEED_FS_TYPE is true, ensure that the file system type fields in |
1453
d5f389e692e8
(read_filesystem_list): Remove all_fs
Jim Meyering <jim@meyering.net>
parents:
1446
diff
changeset
|
417 the returned list are valid. Otherwise, they might not be. */ |
5 | 418 |
419 struct mount_entry * | |
11112
e7df8edd0e88
still avoid unused-parameter warnings, but do it cleanly
Jim Meyering <meyering@redhat.com>
parents:
11110
diff
changeset
|
420 read_file_system_list (bool need_fs_type) |
5 | 421 { |
422 struct mount_entry *mount_list; | |
423 struct mount_entry *me; | |
1413 | 424 struct mount_entry **mtail = &mount_list; |
11112
e7df8edd0e88
still avoid unused-parameter warnings, but do it cleanly
Jim Meyering <meyering@redhat.com>
parents:
11110
diff
changeset
|
425 (void) need_fs_type; |
5 | 426 |
39905
c3122bb580fe
mountlist: Modernize platform lists.
Bruno Haible <bruno@clisp.org>
parents:
19484
diff
changeset
|
427 #ifdef MOUNTED_GETMNTENT1 /* glibc, HP-UX, IRIX, Cygwin, Android, |
39931
5b70149cc627
fsusage, mountlist, getloadavg: Remove support for Dynix/ptx.
Bruno Haible <bruno@clisp.org>
parents:
39927
diff
changeset
|
428 also (obsolete) 4.3BSD, SunOS */ |
5 | 429 { |
17951
2ae3c246cda5
mountlist: remove dependency on libmount
Pádraig Brady <P@draigBrady.com>
parents:
17937
diff
changeset
|
430 FILE *fp; |
5 | 431 |
39905
c3122bb580fe
mountlist: Modernize platform lists.
Bruno Haible <bruno@clisp.org>
parents:
19484
diff
changeset
|
432 # ifdef __linux__ |
17951
2ae3c246cda5
mountlist: remove dependency on libmount
Pádraig Brady <P@draigBrady.com>
parents:
17937
diff
changeset
|
433 /* Try parsing mountinfo first, as that make device IDs available. |
2ae3c246cda5
mountlist: remove dependency on libmount
Pádraig Brady <P@draigBrady.com>
parents:
17937
diff
changeset
|
434 Note we could use libmount routines to simplify this parsing a little |
2ae3c246cda5
mountlist: remove dependency on libmount
Pádraig Brady <P@draigBrady.com>
parents:
17937
diff
changeset
|
435 (and that code is in previous versions of this function), however |
2ae3c246cda5
mountlist: remove dependency on libmount
Pádraig Brady <P@draigBrady.com>
parents:
17937
diff
changeset
|
436 libmount depends on libselinux which pulls in many dependencies. */ |
2ae3c246cda5
mountlist: remove dependency on libmount
Pádraig Brady <P@draigBrady.com>
parents:
17937
diff
changeset
|
437 char const *mountinfo = "/proc/self/mountinfo"; |
2ae3c246cda5
mountlist: remove dependency on libmount
Pádraig Brady <P@draigBrady.com>
parents:
17937
diff
changeset
|
438 fp = fopen (mountinfo, "r"); |
2ae3c246cda5
mountlist: remove dependency on libmount
Pádraig Brady <P@draigBrady.com>
parents:
17937
diff
changeset
|
439 if (fp != NULL) |
5 | 440 { |
17951
2ae3c246cda5
mountlist: remove dependency on libmount
Pádraig Brady <P@draigBrady.com>
parents:
17937
diff
changeset
|
441 char *line = NULL; |
2ae3c246cda5
mountlist: remove dependency on libmount
Pádraig Brady <P@draigBrady.com>
parents:
17937
diff
changeset
|
442 size_t buf_size = 0; |
2ae3c246cda5
mountlist: remove dependency on libmount
Pádraig Brady <P@draigBrady.com>
parents:
17937
diff
changeset
|
443 |
2ae3c246cda5
mountlist: remove dependency on libmount
Pádraig Brady <P@draigBrady.com>
parents:
17937
diff
changeset
|
444 while (getline (&line, &buf_size, fp) != -1) |
2ae3c246cda5
mountlist: remove dependency on libmount
Pádraig Brady <P@draigBrady.com>
parents:
17937
diff
changeset
|
445 { |
2ae3c246cda5
mountlist: remove dependency on libmount
Pádraig Brady <P@draigBrady.com>
parents:
17937
diff
changeset
|
446 unsigned int devmaj, devmin; |
18087
b20684a49361
mountlist: add me_mntroot field on Linux machines
Dave Chiluk <chiluk@canonical.com>
parents:
18028
diff
changeset
|
447 int target_s, target_e, type_s, type_e; |
b20684a49361
mountlist: add me_mntroot field on Linux machines
Dave Chiluk <chiluk@canonical.com>
parents:
18028
diff
changeset
|
448 int source_s, source_e, mntroot_s, mntroot_e; |
17951
2ae3c246cda5
mountlist: remove dependency on libmount
Pádraig Brady <P@draigBrady.com>
parents:
17937
diff
changeset
|
449 char test; |
2ae3c246cda5
mountlist: remove dependency on libmount
Pádraig Brady <P@draigBrady.com>
parents:
17937
diff
changeset
|
450 char *dash; |
2ae3c246cda5
mountlist: remove dependency on libmount
Pádraig Brady <P@draigBrady.com>
parents:
17937
diff
changeset
|
451 int rc; |
2ae3c246cda5
mountlist: remove dependency on libmount
Pádraig Brady <P@draigBrady.com>
parents:
17937
diff
changeset
|
452 |
2ae3c246cda5
mountlist: remove dependency on libmount
Pádraig Brady <P@draigBrady.com>
parents:
17937
diff
changeset
|
453 rc = sscanf(line, "%*u " /* id - discarded */ |
2ae3c246cda5
mountlist: remove dependency on libmount
Pádraig Brady <P@draigBrady.com>
parents:
17937
diff
changeset
|
454 "%*u " /* parent - discarded */ |
2ae3c246cda5
mountlist: remove dependency on libmount
Pádraig Brady <P@draigBrady.com>
parents:
17937
diff
changeset
|
455 "%u:%u " /* dev major:minor */ |
18087
b20684a49361
mountlist: add me_mntroot field on Linux machines
Dave Chiluk <chiluk@canonical.com>
parents:
18028
diff
changeset
|
456 "%n%*s%n " /* mountroot */ |
17951
2ae3c246cda5
mountlist: remove dependency on libmount
Pádraig Brady <P@draigBrady.com>
parents:
17937
diff
changeset
|
457 "%n%*s%n" /* target, start and end */ |
2ae3c246cda5
mountlist: remove dependency on libmount
Pádraig Brady <P@draigBrady.com>
parents:
17937
diff
changeset
|
458 "%c", /* more data... */ |
2ae3c246cda5
mountlist: remove dependency on libmount
Pádraig Brady <P@draigBrady.com>
parents:
17937
diff
changeset
|
459 &devmaj, &devmin, |
18087
b20684a49361
mountlist: add me_mntroot field on Linux machines
Dave Chiluk <chiluk@canonical.com>
parents:
18028
diff
changeset
|
460 &mntroot_s, &mntroot_e, |
17951
2ae3c246cda5
mountlist: remove dependency on libmount
Pádraig Brady <P@draigBrady.com>
parents:
17937
diff
changeset
|
461 &target_s, &target_e, |
2ae3c246cda5
mountlist: remove dependency on libmount
Pádraig Brady <P@draigBrady.com>
parents:
17937
diff
changeset
|
462 &test); |
18087
b20684a49361
mountlist: add me_mntroot field on Linux machines
Dave Chiluk <chiluk@canonical.com>
parents:
18028
diff
changeset
|
463 |
b20684a49361
mountlist: add me_mntroot field on Linux machines
Dave Chiluk <chiluk@canonical.com>
parents:
18028
diff
changeset
|
464 if (rc != 3 && rc != 7) /* 7 if %n included in count. */ |
17951
2ae3c246cda5
mountlist: remove dependency on libmount
Pádraig Brady <P@draigBrady.com>
parents:
17937
diff
changeset
|
465 continue; |
17756
326ae329c003
mountlist: use /proc/self/mountinfo when available
Fridolin Pokorny <fpokorny@redhat.com>
parents:
17697
diff
changeset
|
466 |
17951
2ae3c246cda5
mountlist: remove dependency on libmount
Pádraig Brady <P@draigBrady.com>
parents:
17937
diff
changeset
|
467 /* skip optional fields, terminated by " - " */ |
2ae3c246cda5
mountlist: remove dependency on libmount
Pádraig Brady <P@draigBrady.com>
parents:
17937
diff
changeset
|
468 dash = strstr (line + target_e, " - "); |
2ae3c246cda5
mountlist: remove dependency on libmount
Pádraig Brady <P@draigBrady.com>
parents:
17937
diff
changeset
|
469 if (! dash) |
2ae3c246cda5
mountlist: remove dependency on libmount
Pádraig Brady <P@draigBrady.com>
parents:
17937
diff
changeset
|
470 continue; |
17756
326ae329c003
mountlist: use /proc/self/mountinfo when available
Fridolin Pokorny <fpokorny@redhat.com>
parents:
17697
diff
changeset
|
471 |
17951
2ae3c246cda5
mountlist: remove dependency on libmount
Pádraig Brady <P@draigBrady.com>
parents:
17937
diff
changeset
|
472 rc = sscanf(dash, " - " |
2ae3c246cda5
mountlist: remove dependency on libmount
Pádraig Brady <P@draigBrady.com>
parents:
17937
diff
changeset
|
473 "%n%*s%n " /* FS type, start and end */ |
2ae3c246cda5
mountlist: remove dependency on libmount
Pádraig Brady <P@draigBrady.com>
parents:
17937
diff
changeset
|
474 "%n%*s%n " /* source, start and end */ |
2ae3c246cda5
mountlist: remove dependency on libmount
Pádraig Brady <P@draigBrady.com>
parents:
17937
diff
changeset
|
475 "%c", /* more data... */ |
2ae3c246cda5
mountlist: remove dependency on libmount
Pádraig Brady <P@draigBrady.com>
parents:
17937
diff
changeset
|
476 &type_s, &type_e, |
2ae3c246cda5
mountlist: remove dependency on libmount
Pádraig Brady <P@draigBrady.com>
parents:
17937
diff
changeset
|
477 &source_s, &source_e, |
2ae3c246cda5
mountlist: remove dependency on libmount
Pádraig Brady <P@draigBrady.com>
parents:
17937
diff
changeset
|
478 &test); |
2ae3c246cda5
mountlist: remove dependency on libmount
Pádraig Brady <P@draigBrady.com>
parents:
17937
diff
changeset
|
479 if (rc != 1 && rc != 5) /* 5 if %n included in count. */ |
2ae3c246cda5
mountlist: remove dependency on libmount
Pádraig Brady <P@draigBrady.com>
parents:
17937
diff
changeset
|
480 continue; |
2ae3c246cda5
mountlist: remove dependency on libmount
Pádraig Brady <P@draigBrady.com>
parents:
17937
diff
changeset
|
481 |
2ae3c246cda5
mountlist: remove dependency on libmount
Pádraig Brady <P@draigBrady.com>
parents:
17937
diff
changeset
|
482 /* manipulate the sub-strings in place. */ |
18087
b20684a49361
mountlist: add me_mntroot field on Linux machines
Dave Chiluk <chiluk@canonical.com>
parents:
18028
diff
changeset
|
483 line[mntroot_e] = '\0'; |
17951
2ae3c246cda5
mountlist: remove dependency on libmount
Pádraig Brady <P@draigBrady.com>
parents:
17937
diff
changeset
|
484 line[target_e] = '\0'; |
2ae3c246cda5
mountlist: remove dependency on libmount
Pádraig Brady <P@draigBrady.com>
parents:
17937
diff
changeset
|
485 dash[type_e] = '\0'; |
2ae3c246cda5
mountlist: remove dependency on libmount
Pádraig Brady <P@draigBrady.com>
parents:
17937
diff
changeset
|
486 dash[source_e] = '\0'; |
2ae3c246cda5
mountlist: remove dependency on libmount
Pádraig Brady <P@draigBrady.com>
parents:
17937
diff
changeset
|
487 unescape_tab (dash + source_s); |
2ae3c246cda5
mountlist: remove dependency on libmount
Pádraig Brady <P@draigBrady.com>
parents:
17937
diff
changeset
|
488 unescape_tab (line + target_s); |
18087
b20684a49361
mountlist: add me_mntroot field on Linux machines
Dave Chiluk <chiluk@canonical.com>
parents:
18028
diff
changeset
|
489 unescape_tab (line + mntroot_s); |
17951
2ae3c246cda5
mountlist: remove dependency on libmount
Pádraig Brady <P@draigBrady.com>
parents:
17937
diff
changeset
|
490 |
17756
326ae329c003
mountlist: use /proc/self/mountinfo when available
Fridolin Pokorny <fpokorny@redhat.com>
parents:
17697
diff
changeset
|
491 me = xmalloc (sizeof *me); |
326ae329c003
mountlist: use /proc/self/mountinfo when available
Fridolin Pokorny <fpokorny@redhat.com>
parents:
17697
diff
changeset
|
492 |
17951
2ae3c246cda5
mountlist: remove dependency on libmount
Pádraig Brady <P@draigBrady.com>
parents:
17937
diff
changeset
|
493 me->me_devname = xstrdup (dash + source_s); |
2ae3c246cda5
mountlist: remove dependency on libmount
Pádraig Brady <P@draigBrady.com>
parents:
17937
diff
changeset
|
494 me->me_mountdir = xstrdup (line + target_s); |
18087
b20684a49361
mountlist: add me_mntroot field on Linux machines
Dave Chiluk <chiluk@canonical.com>
parents:
18028
diff
changeset
|
495 me->me_mntroot = xstrdup (line + mntroot_s); |
17951
2ae3c246cda5
mountlist: remove dependency on libmount
Pádraig Brady <P@draigBrady.com>
parents:
17937
diff
changeset
|
496 me->me_type = xstrdup (dash + type_s); |
17756
326ae329c003
mountlist: use /proc/self/mountinfo when available
Fridolin Pokorny <fpokorny@redhat.com>
parents:
17697
diff
changeset
|
497 me->me_type_malloced = 1; |
17951
2ae3c246cda5
mountlist: remove dependency on libmount
Pádraig Brady <P@draigBrady.com>
parents:
17937
diff
changeset
|
498 me->me_dev = makedev (devmaj, devmin); |
2ae3c246cda5
mountlist: remove dependency on libmount
Pádraig Brady <P@draigBrady.com>
parents:
17937
diff
changeset
|
499 /* we pass "false" for the "Bind" option as that's only |
17784
f8a2b0c3de24
mountlist: don't use libmount to decide on dummy/remote
Pádraig Brady <P@draigBrady.com>
parents:
17756
diff
changeset
|
500 significant when the Fs_type is "none" which will not be |
f8a2b0c3de24
mountlist: don't use libmount to decide on dummy/remote
Pádraig Brady <P@draigBrady.com>
parents:
17756
diff
changeset
|
501 the case when parsing "/proc/self/mountinfo", and only |
f8a2b0c3de24
mountlist: don't use libmount to decide on dummy/remote
Pádraig Brady <P@draigBrady.com>
parents:
17756
diff
changeset
|
502 applies for static /etc/mtab files. */ |
f8a2b0c3de24
mountlist: don't use libmount to decide on dummy/remote
Pádraig Brady <P@draigBrady.com>
parents:
17756
diff
changeset
|
503 me->me_dummy = ME_DUMMY (me->me_devname, me->me_type, false); |
f8a2b0c3de24
mountlist: don't use libmount to decide on dummy/remote
Pádraig Brady <P@draigBrady.com>
parents:
17756
diff
changeset
|
504 me->me_remote = ME_REMOTE (me->me_devname, me->me_type); |
17756
326ae329c003
mountlist: use /proc/self/mountinfo when available
Fridolin Pokorny <fpokorny@redhat.com>
parents:
17697
diff
changeset
|
505 |
326ae329c003
mountlist: use /proc/self/mountinfo when available
Fridolin Pokorny <fpokorny@redhat.com>
parents:
17697
diff
changeset
|
506 /* Add to the linked list. */ |
326ae329c003
mountlist: use /proc/self/mountinfo when available
Fridolin Pokorny <fpokorny@redhat.com>
parents:
17697
diff
changeset
|
507 *mtail = me; |
326ae329c003
mountlist: use /proc/self/mountinfo when available
Fridolin Pokorny <fpokorny@redhat.com>
parents:
17697
diff
changeset
|
508 mtail = &me->me_next; |
326ae329c003
mountlist: use /proc/self/mountinfo when available
Fridolin Pokorny <fpokorny@redhat.com>
parents:
17697
diff
changeset
|
509 } |
5 | 510 |
17951
2ae3c246cda5
mountlist: remove dependency on libmount
Pádraig Brady <P@draigBrady.com>
parents:
17937
diff
changeset
|
511 free (line); |
2ae3c246cda5
mountlist: remove dependency on libmount
Pádraig Brady <P@draigBrady.com>
parents:
17937
diff
changeset
|
512 |
2ae3c246cda5
mountlist: remove dependency on libmount
Pádraig Brady <P@draigBrady.com>
parents:
17937
diff
changeset
|
513 if (ferror (fp)) |
2ae3c246cda5
mountlist: remove dependency on libmount
Pádraig Brady <P@draigBrady.com>
parents:
17937
diff
changeset
|
514 { |
2ae3c246cda5
mountlist: remove dependency on libmount
Pádraig Brady <P@draigBrady.com>
parents:
17937
diff
changeset
|
515 int saved_errno = errno; |
2ae3c246cda5
mountlist: remove dependency on libmount
Pádraig Brady <P@draigBrady.com>
parents:
17937
diff
changeset
|
516 fclose (fp); |
2ae3c246cda5
mountlist: remove dependency on libmount
Pádraig Brady <P@draigBrady.com>
parents:
17937
diff
changeset
|
517 errno = saved_errno; |
2ae3c246cda5
mountlist: remove dependency on libmount
Pádraig Brady <P@draigBrady.com>
parents:
17937
diff
changeset
|
518 goto free_then_fail; |
2ae3c246cda5
mountlist: remove dependency on libmount
Pádraig Brady <P@draigBrady.com>
parents:
17937
diff
changeset
|
519 } |
2ae3c246cda5
mountlist: remove dependency on libmount
Pádraig Brady <P@draigBrady.com>
parents:
17937
diff
changeset
|
520 |
2ae3c246cda5
mountlist: remove dependency on libmount
Pádraig Brady <P@draigBrady.com>
parents:
17937
diff
changeset
|
521 if (fclose (fp) == EOF) |
2ae3c246cda5
mountlist: remove dependency on libmount
Pádraig Brady <P@draigBrady.com>
parents:
17937
diff
changeset
|
522 goto free_then_fail; |
5 | 523 } |
17951
2ae3c246cda5
mountlist: remove dependency on libmount
Pádraig Brady <P@draigBrady.com>
parents:
17937
diff
changeset
|
524 else /* fallback to /proc/self/mounts (/etc/mtab). */ |
39905
c3122bb580fe
mountlist: Modernize platform lists.
Bruno Haible <bruno@clisp.org>
parents:
19484
diff
changeset
|
525 # endif /* __linux __ */ |
17756
326ae329c003
mountlist: use /proc/self/mountinfo when available
Fridolin Pokorny <fpokorny@redhat.com>
parents:
17697
diff
changeset
|
526 { |
326ae329c003
mountlist: use /proc/self/mountinfo when available
Fridolin Pokorny <fpokorny@redhat.com>
parents:
17697
diff
changeset
|
527 struct mntent *mnt; |
326ae329c003
mountlist: use /proc/self/mountinfo when available
Fridolin Pokorny <fpokorny@redhat.com>
parents:
17697
diff
changeset
|
528 char const *table = MOUNTED; |
5 | 529 |
17756
326ae329c003
mountlist: use /proc/self/mountinfo when available
Fridolin Pokorny <fpokorny@redhat.com>
parents:
17697
diff
changeset
|
530 fp = setmntent (table, "r"); |
326ae329c003
mountlist: use /proc/self/mountinfo when available
Fridolin Pokorny <fpokorny@redhat.com>
parents:
17697
diff
changeset
|
531 if (fp == NULL) |
326ae329c003
mountlist: use /proc/self/mountinfo when available
Fridolin Pokorny <fpokorny@redhat.com>
parents:
17697
diff
changeset
|
532 return NULL; |
326ae329c003
mountlist: use /proc/self/mountinfo when available
Fridolin Pokorny <fpokorny@redhat.com>
parents:
17697
diff
changeset
|
533 |
326ae329c003
mountlist: use /proc/self/mountinfo when available
Fridolin Pokorny <fpokorny@redhat.com>
parents:
17697
diff
changeset
|
534 while ((mnt = getmntent (fp))) |
326ae329c003
mountlist: use /proc/self/mountinfo when available
Fridolin Pokorny <fpokorny@redhat.com>
parents:
17697
diff
changeset
|
535 { |
17784
f8a2b0c3de24
mountlist: don't use libmount to decide on dummy/remote
Pádraig Brady <P@draigBrady.com>
parents:
17756
diff
changeset
|
536 bool bind = hasmntopt (mnt, "bind"); |
f8a2b0c3de24
mountlist: don't use libmount to decide on dummy/remote
Pádraig Brady <P@draigBrady.com>
parents:
17756
diff
changeset
|
537 |
17756
326ae329c003
mountlist: use /proc/self/mountinfo when available
Fridolin Pokorny <fpokorny@redhat.com>
parents:
17697
diff
changeset
|
538 me = xmalloc (sizeof *me); |
326ae329c003
mountlist: use /proc/self/mountinfo when available
Fridolin Pokorny <fpokorny@redhat.com>
parents:
17697
diff
changeset
|
539 me->me_devname = xstrdup (mnt->mnt_fsname); |
326ae329c003
mountlist: use /proc/self/mountinfo when available
Fridolin Pokorny <fpokorny@redhat.com>
parents:
17697
diff
changeset
|
540 me->me_mountdir = xstrdup (mnt->mnt_dir); |
18087
b20684a49361
mountlist: add me_mntroot field on Linux machines
Dave Chiluk <chiluk@canonical.com>
parents:
18028
diff
changeset
|
541 me->me_mntroot = NULL; |
17756
326ae329c003
mountlist: use /proc/self/mountinfo when available
Fridolin Pokorny <fpokorny@redhat.com>
parents:
17697
diff
changeset
|
542 me->me_type = xstrdup (mnt->mnt_type); |
326ae329c003
mountlist: use /proc/self/mountinfo when available
Fridolin Pokorny <fpokorny@redhat.com>
parents:
17697
diff
changeset
|
543 me->me_type_malloced = 1; |
17784
f8a2b0c3de24
mountlist: don't use libmount to decide on dummy/remote
Pádraig Brady <P@draigBrady.com>
parents:
17756
diff
changeset
|
544 me->me_dummy = ME_DUMMY (me->me_devname, me->me_type, bind); |
17756
326ae329c003
mountlist: use /proc/self/mountinfo when available
Fridolin Pokorny <fpokorny@redhat.com>
parents:
17697
diff
changeset
|
545 me->me_remote = ME_REMOTE (me->me_devname, me->me_type); |
326ae329c003
mountlist: use /proc/self/mountinfo when available
Fridolin Pokorny <fpokorny@redhat.com>
parents:
17697
diff
changeset
|
546 me->me_dev = dev_from_mount_options (mnt->mnt_opts); |
326ae329c003
mountlist: use /proc/self/mountinfo when available
Fridolin Pokorny <fpokorny@redhat.com>
parents:
17697
diff
changeset
|
547 |
326ae329c003
mountlist: use /proc/self/mountinfo when available
Fridolin Pokorny <fpokorny@redhat.com>
parents:
17697
diff
changeset
|
548 /* Add to the linked list. */ |
326ae329c003
mountlist: use /proc/self/mountinfo when available
Fridolin Pokorny <fpokorny@redhat.com>
parents:
17697
diff
changeset
|
549 *mtail = me; |
326ae329c003
mountlist: use /proc/self/mountinfo when available
Fridolin Pokorny <fpokorny@redhat.com>
parents:
17697
diff
changeset
|
550 mtail = &me->me_next; |
326ae329c003
mountlist: use /proc/self/mountinfo when available
Fridolin Pokorny <fpokorny@redhat.com>
parents:
17697
diff
changeset
|
551 } |
326ae329c003
mountlist: use /proc/self/mountinfo when available
Fridolin Pokorny <fpokorny@redhat.com>
parents:
17697
diff
changeset
|
552 |
326ae329c003
mountlist: use /proc/self/mountinfo when available
Fridolin Pokorny <fpokorny@redhat.com>
parents:
17697
diff
changeset
|
553 if (endmntent (fp) == 0) |
326ae329c003
mountlist: use /proc/self/mountinfo when available
Fridolin Pokorny <fpokorny@redhat.com>
parents:
17697
diff
changeset
|
554 goto free_then_fail; |
326ae329c003
mountlist: use /proc/self/mountinfo when available
Fridolin Pokorny <fpokorny@redhat.com>
parents:
17697
diff
changeset
|
555 } |
5 | 556 } |
557 #endif /* MOUNTED_GETMNTENT1. */ | |
558 | |
39905
c3122bb580fe
mountlist: Modernize platform lists.
Bruno Haible <bruno@clisp.org>
parents:
19484
diff
changeset
|
559 #ifdef MOUNTED_GETMNTINFO /* Mac OS X, FreeBSD, OpenBSD, also (obsolete) 4.4BSD */ |
5 | 560 { |
561 struct statfs *fsp; | |
562 int entries; | |
563 | |
564 entries = getmntinfo (&fsp, MNT_NOWAIT); | |
565 if (entries < 0) | |
566 return NULL; | |
1443
13bcee72981f
(read_filesystem_list): If all_fs is negative, omit non-local filesytems.
Jim Meyering <jim@meyering.net>
parents:
1436
diff
changeset
|
567 for (; entries-- > 0; fsp++) |
5 | 568 { |
12421
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
569 char *fs_type = fsp_to_string (fsp); |
1443
13bcee72981f
(read_filesystem_list): If all_fs is negative, omit non-local filesytems.
Jim Meyering <jim@meyering.net>
parents:
1436
diff
changeset
|
570 |
12421
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
571 me = xmalloc (sizeof *me); |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
572 me->me_devname = xstrdup (fsp->f_mntfromname); |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
573 me->me_mountdir = xstrdup (fsp->f_mntonname); |
18087
b20684a49361
mountlist: add me_mntroot field on Linux machines
Dave Chiluk <chiluk@canonical.com>
parents:
18028
diff
changeset
|
574 me->me_mntroot = NULL; |
12421
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
575 me->me_type = fs_type; |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
576 me->me_type_malloced = 0; |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
577 me->me_dummy = ME_DUMMY (me->me_devname, me->me_type); |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
578 me->me_remote = ME_REMOTE (me->me_devname, me->me_type); |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
579 me->me_dev = (dev_t) -1; /* Magic; means not known yet. */ |
5 | 580 |
12421
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
581 /* Add to the linked list. */ |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
582 *mtail = me; |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
583 mtail = &me->me_next; |
5 | 584 } |
585 } | |
586 #endif /* MOUNTED_GETMNTINFO */ | |
587 | |
39907
b14bcf3a1610
mountlist: Add support for Minix.
Bruno Haible <bruno@clisp.org>
parents:
39905
diff
changeset
|
588 #ifdef MOUNTED_GETMNTINFO2 /* NetBSD, Minix */ |
7154
7a3549db58ef
* lib/mountlist.c [MOUNTED_GETMNTINFO2]: Include sys/statvfs.h.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7099
diff
changeset
|
589 { |
7a3549db58ef
* lib/mountlist.c [MOUNTED_GETMNTINFO2]: Include sys/statvfs.h.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7099
diff
changeset
|
590 struct statvfs *fsp; |
7a3549db58ef
* lib/mountlist.c [MOUNTED_GETMNTINFO2]: Include sys/statvfs.h.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7099
diff
changeset
|
591 int entries; |
7a3549db58ef
* lib/mountlist.c [MOUNTED_GETMNTINFO2]: Include sys/statvfs.h.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7099
diff
changeset
|
592 |
7a3549db58ef
* lib/mountlist.c [MOUNTED_GETMNTINFO2]: Include sys/statvfs.h.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7099
diff
changeset
|
593 entries = getmntinfo (&fsp, MNT_NOWAIT); |
7a3549db58ef
* lib/mountlist.c [MOUNTED_GETMNTINFO2]: Include sys/statvfs.h.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7099
diff
changeset
|
594 if (entries < 0) |
7a3549db58ef
* lib/mountlist.c [MOUNTED_GETMNTINFO2]: Include sys/statvfs.h.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7099
diff
changeset
|
595 return NULL; |
7a3549db58ef
* lib/mountlist.c [MOUNTED_GETMNTINFO2]: Include sys/statvfs.h.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7099
diff
changeset
|
596 for (; entries-- > 0; fsp++) |
7a3549db58ef
* lib/mountlist.c [MOUNTED_GETMNTINFO2]: Include sys/statvfs.h.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7099
diff
changeset
|
597 { |
12421
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
598 me = xmalloc (sizeof *me); |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
599 me->me_devname = xstrdup (fsp->f_mntfromname); |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
600 me->me_mountdir = xstrdup (fsp->f_mntonname); |
18087
b20684a49361
mountlist: add me_mntroot field on Linux machines
Dave Chiluk <chiluk@canonical.com>
parents:
18028
diff
changeset
|
601 me->me_mntroot = NULL; |
12421
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
602 me->me_type = xstrdup (fsp->f_fstypename); |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
603 me->me_type_malloced = 1; |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
604 me->me_dummy = ME_DUMMY (me->me_devname, me->me_type); |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
605 me->me_remote = ME_REMOTE (me->me_devname, me->me_type); |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
606 me->me_dev = (dev_t) -1; /* Magic; means not known yet. */ |
7154
7a3549db58ef
* lib/mountlist.c [MOUNTED_GETMNTINFO2]: Include sys/statvfs.h.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7099
diff
changeset
|
607 |
12421
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
608 /* Add to the linked list. */ |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
609 *mtail = me; |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
610 mtail = &me->me_next; |
7154
7a3549db58ef
* lib/mountlist.c [MOUNTED_GETMNTINFO2]: Include sys/statvfs.h.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7099
diff
changeset
|
611 } |
7a3549db58ef
* lib/mountlist.c [MOUNTED_GETMNTINFO2]: Include sys/statvfs.h.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7099
diff
changeset
|
612 } |
7a3549db58ef
* lib/mountlist.c [MOUNTED_GETMNTINFO2]: Include sys/statvfs.h.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7099
diff
changeset
|
613 #endif /* MOUNTED_GETMNTINFO2 */ |
7a3549db58ef
* lib/mountlist.c [MOUNTED_GETMNTINFO2]: Include sys/statvfs.h.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7099
diff
changeset
|
614 |
39905
c3122bb580fe
mountlist: Modernize platform lists.
Bruno Haible <bruno@clisp.org>
parents:
19484
diff
changeset
|
615 #if defined MOUNTED_FS_STAT_DEV /* Haiku, also (obsolete) BeOS */ |
2453
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
616 { |
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
617 /* The next_dev() and fs_stat_dev() system calls give the list of |
5159 | 618 all file systems, including the information returned by statvfs() |
2453
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
619 (fs type, total blocks, free blocks etc.), but without the mount |
5159 | 620 point. But on BeOS all file systems except / are mounted in the |
2453
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
621 rootfs, directly under /. |
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
622 The directory name of the mount point is often, but not always, |
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
623 identical to the volume name of the device. |
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
624 We therefore get the list of subdirectories of /, and the list |
5159 | 625 of all file systems, and match the two lists. */ |
2453
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
626 |
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
627 DIR *dirp; |
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
628 struct rootdir_entry |
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
629 { |
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
630 char *name; |
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
631 dev_t dev; |
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
632 ino_t ino; |
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
633 struct rootdir_entry *next; |
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
634 }; |
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
635 struct rootdir_entry *rootdir_list; |
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
636 struct rootdir_entry **rootdir_tail; |
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
637 int32 pos; |
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
638 dev_t dev; |
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
639 fs_info fi; |
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
640 |
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
641 /* All volumes are mounted in the rootfs, directly under /. */ |
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
642 rootdir_list = NULL; |
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
643 rootdir_tail = &rootdir_list; |
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
644 dirp = opendir ("/"); |
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
645 if (dirp) |
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
646 { |
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
647 struct dirent *d; |
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
648 |
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
649 while ((d = readdir (dirp)) != NULL) |
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
650 { |
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
651 char *name; |
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
652 struct stat statbuf; |
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
653 |
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
654 if (strcmp (d->d_name, "..") == 0) |
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
655 continue; |
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
656 |
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
657 if (strcmp (d->d_name, ".") == 0) |
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
658 name = xstrdup ("/"); |
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
659 else |
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
660 { |
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
661 name = xmalloc (1 + strlen (d->d_name) + 1); |
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
662 name[0] = '/'; |
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
663 strcpy (name + 1, d->d_name); |
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
664 } |
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
665 |
2677
a15fc2b3bc82
Use MOUNTED_FS_STAT_DEV instead of MOUNTED_NEXT_DEV,
Jim Meyering <jim@meyering.net>
parents:
2667
diff
changeset
|
666 if (lstat (name, &statbuf) >= 0 && S_ISDIR (statbuf.st_mode)) |
2453
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
667 { |
12421
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
668 struct rootdir_entry *re = xmalloc (sizeof *re); |
2453
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
669 re->name = name; |
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
670 re->dev = statbuf.st_dev; |
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
671 re->ino = statbuf.st_ino; |
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
672 |
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
673 /* Add to the linked list. */ |
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
674 *rootdir_tail = re; |
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
675 rootdir_tail = &re->next; |
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
676 } |
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
677 else |
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
678 free (name); |
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
679 } |
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
680 closedir (dirp); |
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
681 } |
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
682 *rootdir_tail = NULL; |
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
683 |
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
684 for (pos = 0; (dev = next_dev (&pos)) >= 0; ) |
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
685 if (fs_stat_dev (dev, &fi) >= 0) |
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
686 { |
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
687 /* Note: fi.dev == dev. */ |
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
688 struct rootdir_entry *re; |
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
689 |
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
690 for (re = rootdir_list; re; re = re->next) |
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
691 if (re->dev == fi.dev && re->ino == fi.root) |
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
692 break; |
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
693 |
12421
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
694 me = xmalloc (sizeof *me); |
14192
68883c50dbf9
mountlist: clean up code formatting
Jim Meyering <meyering@redhat.com>
parents:
14191
diff
changeset
|
695 me->me_devname = xstrdup (fi.device_name[0] != '\0' |
68883c50dbf9
mountlist: clean up code formatting
Jim Meyering <meyering@redhat.com>
parents:
14191
diff
changeset
|
696 ? fi.device_name : fi.fsh_name); |
2453
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
697 me->me_mountdir = xstrdup (re != NULL ? re->name : fi.fsh_name); |
18087
b20684a49361
mountlist: add me_mntroot field on Linux machines
Dave Chiluk <chiluk@canonical.com>
parents:
18028
diff
changeset
|
698 me->me_mntroot = NULL; |
2453
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
699 me->me_type = xstrdup (fi.fsh_name); |
12421
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
700 me->me_type_malloced = 1; |
2453
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
701 me->me_dev = fi.dev; |
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
702 me->me_dummy = 0; |
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
703 me->me_remote = (fi.flags & B_FS_IS_SHARED) != 0; |
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
704 |
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
705 /* Add to the linked list. */ |
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
706 *mtail = me; |
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
707 mtail = &me->me_next; |
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
708 } |
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
709 *mtail = NULL; |
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
710 |
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
711 while (rootdir_list != NULL) |
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
712 { |
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
713 struct rootdir_entry *re = rootdir_list; |
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
714 rootdir_list = re->next; |
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
715 free (re->name); |
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
716 free (re); |
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
717 } |
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
718 } |
2677
a15fc2b3bc82
Use MOUNTED_FS_STAT_DEV instead of MOUNTED_NEXT_DEV,
Jim Meyering <jim@meyering.net>
parents:
2667
diff
changeset
|
719 #endif /* MOUNTED_FS_STAT_DEV */ |
2453
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
720 |
39905
c3122bb580fe
mountlist: Modernize platform lists.
Bruno Haible <bruno@clisp.org>
parents:
19484
diff
changeset
|
721 #if defined MOUNTED_GETFSSTAT /* OSF/1, also (obsolete) Apple Darwin 1.3 */ |
326 | 722 { |
4839
72b30d7ed3c6
Catch size calculation overflow problem on Alphas running OSF/1.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4716
diff
changeset
|
723 int numsys, counter; |
72b30d7ed3c6
Catch size calculation overflow problem on Alphas running OSF/1.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4716
diff
changeset
|
724 size_t bufsize; |
326 | 725 struct statfs *stats; |
726 | |
14192
68883c50dbf9
mountlist: clean up code formatting
Jim Meyering <meyering@redhat.com>
parents:
14191
diff
changeset
|
727 numsys = getfsstat (NULL, 0L, MNT_NOWAIT); |
326 | 728 if (numsys < 0) |
14192
68883c50dbf9
mountlist: clean up code formatting
Jim Meyering <meyering@redhat.com>
parents:
14191
diff
changeset
|
729 return NULL; |
4839
72b30d7ed3c6
Catch size calculation overflow problem on Alphas running OSF/1.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4716
diff
changeset
|
730 if (SIZE_MAX / sizeof *stats <= numsys) |
72b30d7ed3c6
Catch size calculation overflow problem on Alphas running OSF/1.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4716
diff
changeset
|
731 xalloc_die (); |
326 | 732 |
4839
72b30d7ed3c6
Catch size calculation overflow problem on Alphas running OSF/1.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4716
diff
changeset
|
733 bufsize = (1 + numsys) * sizeof *stats; |
4548
a61e996662a3
Merge mountlist changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4287
diff
changeset
|
734 stats = xmalloc (bufsize); |
a61e996662a3
Merge mountlist changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4287
diff
changeset
|
735 numsys = getfsstat (stats, bufsize, MNT_NOWAIT); |
326 | 736 |
737 if (numsys < 0) | |
738 { | |
12421
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
739 free (stats); |
14192
68883c50dbf9
mountlist: clean up code formatting
Jim Meyering <meyering@redhat.com>
parents:
14191
diff
changeset
|
740 return NULL; |
326 | 741 } |
742 | |
743 for (counter = 0; counter < numsys; counter++) | |
744 { | |
12421
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
745 me = xmalloc (sizeof *me); |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
746 me->me_devname = xstrdup (stats[counter].f_mntfromname); |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
747 me->me_mountdir = xstrdup (stats[counter].f_mntonname); |
18087
b20684a49361
mountlist: add me_mntroot field on Linux machines
Dave Chiluk <chiluk@canonical.com>
parents:
18028
diff
changeset
|
748 me->me_mntroot = NULL; |
12421
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
749 me->me_type = xstrdup (FS_TYPE (stats[counter])); |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
750 me->me_type_malloced = 1; |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
751 me->me_dummy = ME_DUMMY (me->me_devname, me->me_type); |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
752 me->me_remote = ME_REMOTE (me->me_devname, me->me_type); |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
753 me->me_dev = (dev_t) -1; /* Magic; means not known yet. */ |
326 | 754 |
12421
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
755 /* Add to the linked list. */ |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
756 *mtail = me; |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
757 mtail = &me->me_next; |
326 | 758 } |
759 | |
760 free (stats); | |
761 } | |
762 #endif /* MOUNTED_GETFSSTAT */ | |
763 | |
39923
8e97d3ff3b45
mountlist: Remove support for SVR2.
Bruno Haible <bruno@clisp.org>
parents:
39908
diff
changeset
|
764 #if defined MOUNTED_FREAD_FSTYP /* (obsolete) SVR3 */ |
5 | 765 { |
766 struct mnttab mnt; | |
767 char *table = "/etc/mnttab"; | |
768 FILE *fp; | |
769 | |
770 fp = fopen (table, "r"); | |
771 if (fp == NULL) | |
772 return NULL; | |
773 | |
774 while (fread (&mnt, sizeof mnt, 1, fp) > 0) | |
775 { | |
12421
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
776 me = xmalloc (sizeof *me); |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
777 me->me_devname = xstrdup (mnt.mt_dev); |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
778 me->me_mountdir = xstrdup (mnt.mt_filsys); |
18087
b20684a49361
mountlist: add me_mntroot field on Linux machines
Dave Chiluk <chiluk@canonical.com>
parents:
18028
diff
changeset
|
779 me->me_mntroot = NULL; |
12421
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
780 me->me_dev = (dev_t) -1; /* Magic; means not known yet. */ |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
781 me->me_type = ""; |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
782 me->me_type_malloced = 0; |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
783 if (need_fs_type) |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
784 { |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
785 struct statfs fsd; |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
786 char typebuf[FSTYPSZ]; |
1453
d5f389e692e8
(read_filesystem_list): Remove all_fs
Jim Meyering <jim@meyering.net>
parents:
1446
diff
changeset
|
787 |
12421
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
788 if (statfs (me->me_mountdir, &fsd, sizeof fsd, 0) != -1 |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
789 && sysfs (GETFSTYP, fsd.f_fstyp, typebuf) != -1) |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
790 { |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
791 me->me_type = xstrdup (typebuf); |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
792 me->me_type_malloced = 1; |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
793 } |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
794 } |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
795 me->me_dummy = ME_DUMMY (me->me_devname, me->me_type); |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
796 me->me_remote = ME_REMOTE (me->me_devname, me->me_type); |
5 | 797 |
12421
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
798 /* Add to the linked list. */ |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
799 *mtail = me; |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
800 mtail = &me->me_next; |
1413 | 801 } |
802 | |
803 if (ferror (fp)) | |
804 { | |
12421
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
805 /* The last fread() call must have failed. */ |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
806 int saved_errno = errno; |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
807 fclose (fp); |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
808 errno = saved_errno; |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
809 goto free_then_fail; |
5 | 810 } |
811 | |
812 if (fclose (fp) == EOF) | |
1413 | 813 goto free_then_fail; |
5 | 814 } |
39923
8e97d3ff3b45
mountlist: Remove support for SVR2.
Bruno Haible <bruno@clisp.org>
parents:
39908
diff
changeset
|
815 #endif /* MOUNTED_FREAD_FSTYP. */ |
5 | 816 |
39908
f2b5499e6ee2
mountlist: Improve support for Solaris in 64-bit mode.
Bruno Haible <bruno@clisp.org>
parents:
39907
diff
changeset
|
817 #ifdef MOUNTED_GETEXTMNTENT /* Solaris >= 8 */ |
f2b5499e6ee2
mountlist: Improve support for Solaris in 64-bit mode.
Bruno Haible <bruno@clisp.org>
parents:
39907
diff
changeset
|
818 { |
f2b5499e6ee2
mountlist: Improve support for Solaris in 64-bit mode.
Bruno Haible <bruno@clisp.org>
parents:
39907
diff
changeset
|
819 struct extmnttab mnt; |
f2b5499e6ee2
mountlist: Improve support for Solaris in 64-bit mode.
Bruno Haible <bruno@clisp.org>
parents:
39907
diff
changeset
|
820 const char *table = MNTTAB; |
f2b5499e6ee2
mountlist: Improve support for Solaris in 64-bit mode.
Bruno Haible <bruno@clisp.org>
parents:
39907
diff
changeset
|
821 FILE *fp; |
f2b5499e6ee2
mountlist: Improve support for Solaris in 64-bit mode.
Bruno Haible <bruno@clisp.org>
parents:
39907
diff
changeset
|
822 int ret; |
f2b5499e6ee2
mountlist: Improve support for Solaris in 64-bit mode.
Bruno Haible <bruno@clisp.org>
parents:
39907
diff
changeset
|
823 |
f2b5499e6ee2
mountlist: Improve support for Solaris in 64-bit mode.
Bruno Haible <bruno@clisp.org>
parents:
39907
diff
changeset
|
824 /* No locking is needed, because the contents of /etc/mnttab is generated |
f2b5499e6ee2
mountlist: Improve support for Solaris in 64-bit mode.
Bruno Haible <bruno@clisp.org>
parents:
39907
diff
changeset
|
825 by the kernel. */ |
f2b5499e6ee2
mountlist: Improve support for Solaris in 64-bit mode.
Bruno Haible <bruno@clisp.org>
parents:
39907
diff
changeset
|
826 |
f2b5499e6ee2
mountlist: Improve support for Solaris in 64-bit mode.
Bruno Haible <bruno@clisp.org>
parents:
39907
diff
changeset
|
827 errno = 0; |
f2b5499e6ee2
mountlist: Improve support for Solaris in 64-bit mode.
Bruno Haible <bruno@clisp.org>
parents:
39907
diff
changeset
|
828 fp = fopen (table, "r"); |
f2b5499e6ee2
mountlist: Improve support for Solaris in 64-bit mode.
Bruno Haible <bruno@clisp.org>
parents:
39907
diff
changeset
|
829 if (fp == NULL) |
f2b5499e6ee2
mountlist: Improve support for Solaris in 64-bit mode.
Bruno Haible <bruno@clisp.org>
parents:
39907
diff
changeset
|
830 ret = errno; |
f2b5499e6ee2
mountlist: Improve support for Solaris in 64-bit mode.
Bruno Haible <bruno@clisp.org>
parents:
39907
diff
changeset
|
831 else |
f2b5499e6ee2
mountlist: Improve support for Solaris in 64-bit mode.
Bruno Haible <bruno@clisp.org>
parents:
39907
diff
changeset
|
832 { |
f2b5499e6ee2
mountlist: Improve support for Solaris in 64-bit mode.
Bruno Haible <bruno@clisp.org>
parents:
39907
diff
changeset
|
833 while ((ret = getextmntent (fp, &mnt, 1)) == 0) |
f2b5499e6ee2
mountlist: Improve support for Solaris in 64-bit mode.
Bruno Haible <bruno@clisp.org>
parents:
39907
diff
changeset
|
834 { |
f2b5499e6ee2
mountlist: Improve support for Solaris in 64-bit mode.
Bruno Haible <bruno@clisp.org>
parents:
39907
diff
changeset
|
835 me = xmalloc (sizeof *me); |
f2b5499e6ee2
mountlist: Improve support for Solaris in 64-bit mode.
Bruno Haible <bruno@clisp.org>
parents:
39907
diff
changeset
|
836 me->me_devname = xstrdup (mnt.mnt_special); |
f2b5499e6ee2
mountlist: Improve support for Solaris in 64-bit mode.
Bruno Haible <bruno@clisp.org>
parents:
39907
diff
changeset
|
837 me->me_mountdir = xstrdup (mnt.mnt_mountp); |
f2b5499e6ee2
mountlist: Improve support for Solaris in 64-bit mode.
Bruno Haible <bruno@clisp.org>
parents:
39907
diff
changeset
|
838 me->me_mntroot = NULL; |
f2b5499e6ee2
mountlist: Improve support for Solaris in 64-bit mode.
Bruno Haible <bruno@clisp.org>
parents:
39907
diff
changeset
|
839 me->me_type = xstrdup (mnt.mnt_fstype); |
f2b5499e6ee2
mountlist: Improve support for Solaris in 64-bit mode.
Bruno Haible <bruno@clisp.org>
parents:
39907
diff
changeset
|
840 me->me_type_malloced = 1; |
f2b5499e6ee2
mountlist: Improve support for Solaris in 64-bit mode.
Bruno Haible <bruno@clisp.org>
parents:
39907
diff
changeset
|
841 me->me_dummy = MNT_IGNORE (&mnt) != 0; |
f2b5499e6ee2
mountlist: Improve support for Solaris in 64-bit mode.
Bruno Haible <bruno@clisp.org>
parents:
39907
diff
changeset
|
842 me->me_remote = ME_REMOTE (me->me_devname, me->me_type); |
f2b5499e6ee2
mountlist: Improve support for Solaris in 64-bit mode.
Bruno Haible <bruno@clisp.org>
parents:
39907
diff
changeset
|
843 me->me_dev = makedev (mnt.mnt_major, mnt.mnt_minor); |
f2b5499e6ee2
mountlist: Improve support for Solaris in 64-bit mode.
Bruno Haible <bruno@clisp.org>
parents:
39907
diff
changeset
|
844 |
f2b5499e6ee2
mountlist: Improve support for Solaris in 64-bit mode.
Bruno Haible <bruno@clisp.org>
parents:
39907
diff
changeset
|
845 /* Add to the linked list. */ |
f2b5499e6ee2
mountlist: Improve support for Solaris in 64-bit mode.
Bruno Haible <bruno@clisp.org>
parents:
39907
diff
changeset
|
846 *mtail = me; |
f2b5499e6ee2
mountlist: Improve support for Solaris in 64-bit mode.
Bruno Haible <bruno@clisp.org>
parents:
39907
diff
changeset
|
847 mtail = &me->me_next; |
f2b5499e6ee2
mountlist: Improve support for Solaris in 64-bit mode.
Bruno Haible <bruno@clisp.org>
parents:
39907
diff
changeset
|
848 } |
f2b5499e6ee2
mountlist: Improve support for Solaris in 64-bit mode.
Bruno Haible <bruno@clisp.org>
parents:
39907
diff
changeset
|
849 |
f2b5499e6ee2
mountlist: Improve support for Solaris in 64-bit mode.
Bruno Haible <bruno@clisp.org>
parents:
39907
diff
changeset
|
850 ret = fclose (fp) == EOF ? errno : 0 < ret ? 0 : -1; |
f2b5499e6ee2
mountlist: Improve support for Solaris in 64-bit mode.
Bruno Haible <bruno@clisp.org>
parents:
39907
diff
changeset
|
851 /* Here ret = -1 means success, ret >= 0 means failure. */ |
f2b5499e6ee2
mountlist: Improve support for Solaris in 64-bit mode.
Bruno Haible <bruno@clisp.org>
parents:
39907
diff
changeset
|
852 } |
f2b5499e6ee2
mountlist: Improve support for Solaris in 64-bit mode.
Bruno Haible <bruno@clisp.org>
parents:
39907
diff
changeset
|
853 |
f2b5499e6ee2
mountlist: Improve support for Solaris in 64-bit mode.
Bruno Haible <bruno@clisp.org>
parents:
39907
diff
changeset
|
854 if (0 <= ret) |
f2b5499e6ee2
mountlist: Improve support for Solaris in 64-bit mode.
Bruno Haible <bruno@clisp.org>
parents:
39907
diff
changeset
|
855 { |
f2b5499e6ee2
mountlist: Improve support for Solaris in 64-bit mode.
Bruno Haible <bruno@clisp.org>
parents:
39907
diff
changeset
|
856 errno = ret; |
f2b5499e6ee2
mountlist: Improve support for Solaris in 64-bit mode.
Bruno Haible <bruno@clisp.org>
parents:
39907
diff
changeset
|
857 goto free_then_fail; |
f2b5499e6ee2
mountlist: Improve support for Solaris in 64-bit mode.
Bruno Haible <bruno@clisp.org>
parents:
39907
diff
changeset
|
858 } |
f2b5499e6ee2
mountlist: Improve support for Solaris in 64-bit mode.
Bruno Haible <bruno@clisp.org>
parents:
39907
diff
changeset
|
859 } |
39927
355c5b4c3f91
fsusage, mountlist: Remove support for DolphinOS (an SVR3 variant).
Bruno Haible <bruno@clisp.org>
parents:
39923
diff
changeset
|
860 #endif /* MOUNTED_GETEXTMNTENT */ |
39908
f2b5499e6ee2
mountlist: Improve support for Solaris in 64-bit mode.
Bruno Haible <bruno@clisp.org>
parents:
39907
diff
changeset
|
861 |
f2b5499e6ee2
mountlist: Improve support for Solaris in 64-bit mode.
Bruno Haible <bruno@clisp.org>
parents:
39907
diff
changeset
|
862 #ifdef MOUNTED_GETMNTENT2 /* Solaris < 8, also (obsolete) SVR4 */ |
5 | 863 { |
864 struct mnttab mnt; | |
39908
f2b5499e6ee2
mountlist: Improve support for Solaris in 64-bit mode.
Bruno Haible <bruno@clisp.org>
parents:
39907
diff
changeset
|
865 const char *table = MNTTAB; |
5 | 866 FILE *fp; |
867 int ret; | |
1399
edb0581923b9
(read_filesystem_list): If SVR4, lock /etc/.mnttab.lock if available,
Jim Meyering <jim@meyering.net>
parents:
1396
diff
changeset
|
868 int lockfd = -1; |
edb0581923b9
(read_filesystem_list): If SVR4, lock /etc/.mnttab.lock if available,
Jim Meyering <jim@meyering.net>
parents:
1396
diff
changeset
|
869 |
edb0581923b9
(read_filesystem_list): If SVR4, lock /etc/.mnttab.lock if available,
Jim Meyering <jim@meyering.net>
parents:
1396
diff
changeset
|
870 # if defined F_RDLCK && defined F_SETLKW |
edb0581923b9
(read_filesystem_list): If SVR4, lock /etc/.mnttab.lock if available,
Jim Meyering <jim@meyering.net>
parents:
1396
diff
changeset
|
871 /* MNTTAB_LOCK is a macro name of our own invention; it's not present in |
edb0581923b9
(read_filesystem_list): If SVR4, lock /etc/.mnttab.lock if available,
Jim Meyering <jim@meyering.net>
parents:
1396
diff
changeset
|
872 e.g. Solaris 2.6. If the SVR4 folks ever define a macro |
edb0581923b9
(read_filesystem_list): If SVR4, lock /etc/.mnttab.lock if available,
Jim Meyering <jim@meyering.net>
parents:
1396
diff
changeset
|
873 for this file name, we should use their macro name instead. |
edb0581923b9
(read_filesystem_list): If SVR4, lock /etc/.mnttab.lock if available,
Jim Meyering <jim@meyering.net>
parents:
1396
diff
changeset
|
874 (Why not just lock MNTTAB directly? We don't know.) */ |
edb0581923b9
(read_filesystem_list): If SVR4, lock /etc/.mnttab.lock if available,
Jim Meyering <jim@meyering.net>
parents:
1396
diff
changeset
|
875 # ifndef MNTTAB_LOCK |
edb0581923b9
(read_filesystem_list): If SVR4, lock /etc/.mnttab.lock if available,
Jim Meyering <jim@meyering.net>
parents:
1396
diff
changeset
|
876 # define MNTTAB_LOCK "/etc/.mnttab.lock" |
edb0581923b9
(read_filesystem_list): If SVR4, lock /etc/.mnttab.lock if available,
Jim Meyering <jim@meyering.net>
parents:
1396
diff
changeset
|
877 # endif |
edb0581923b9
(read_filesystem_list): If SVR4, lock /etc/.mnttab.lock if available,
Jim Meyering <jim@meyering.net>
parents:
1396
diff
changeset
|
878 lockfd = open (MNTTAB_LOCK, O_RDONLY); |
edb0581923b9
(read_filesystem_list): If SVR4, lock /etc/.mnttab.lock if available,
Jim Meyering <jim@meyering.net>
parents:
1396
diff
changeset
|
879 if (0 <= lockfd) |
edb0581923b9
(read_filesystem_list): If SVR4, lock /etc/.mnttab.lock if available,
Jim Meyering <jim@meyering.net>
parents:
1396
diff
changeset
|
880 { |
12421
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
881 struct flock flock; |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
882 flock.l_type = F_RDLCK; |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
883 flock.l_whence = SEEK_SET; |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
884 flock.l_start = 0; |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
885 flock.l_len = 0; |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
886 while (fcntl (lockfd, F_SETLKW, &flock) == -1) |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
887 if (errno != EINTR) |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
888 { |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
889 int saved_errno = errno; |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
890 close (lockfd); |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
891 errno = saved_errno; |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
892 return NULL; |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
893 } |
1399
edb0581923b9
(read_filesystem_list): If SVR4, lock /etc/.mnttab.lock if available,
Jim Meyering <jim@meyering.net>
parents:
1396
diff
changeset
|
894 } |
1413 | 895 else if (errno != ENOENT) |
896 return NULL; | |
1399
edb0581923b9
(read_filesystem_list): If SVR4, lock /etc/.mnttab.lock if available,
Jim Meyering <jim@meyering.net>
parents:
1396
diff
changeset
|
897 # endif |
5 | 898 |
1413 | 899 errno = 0; |
5 | 900 fp = fopen (table, "r"); |
901 if (fp == NULL) | |
1413 | 902 ret = errno; |
1401 | 903 else |
1400
8e5de8bcae9f
(read_filesystem_list) [MOUNTED_GETMNTENT2]:
Jim Meyering <jim@meyering.net>
parents:
1399
diff
changeset
|
904 { |
12421
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
905 while ((ret = getmntent (fp, &mnt)) == 0) |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
906 { |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
907 me = xmalloc (sizeof *me); |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
908 me->me_devname = xstrdup (mnt.mnt_special); |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
909 me->me_mountdir = xstrdup (mnt.mnt_mountp); |
18087
b20684a49361
mountlist: add me_mntroot field on Linux machines
Dave Chiluk <chiluk@canonical.com>
parents:
18028
diff
changeset
|
910 me->me_mntroot = NULL; |
12421
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
911 me->me_type = xstrdup (mnt.mnt_fstype); |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
912 me->me_type_malloced = 1; |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
913 me->me_dummy = MNT_IGNORE (&mnt) != 0; |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
914 me->me_remote = ME_REMOTE (me->me_devname, me->me_type); |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
915 me->me_dev = dev_from_mount_options (mnt.mnt_mntopts); |
1401 | 916 |
12421
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
917 /* Add to the linked list. */ |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
918 *mtail = me; |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
919 mtail = &me->me_next; |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
920 } |
1401 | 921 |
12421
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
922 ret = fclose (fp) == EOF ? errno : 0 < ret ? 0 : -1; |
39908
f2b5499e6ee2
mountlist: Improve support for Solaris in 64-bit mode.
Bruno Haible <bruno@clisp.org>
parents:
39907
diff
changeset
|
923 /* Here ret = -1 means success, ret >= 0 means failure. */ |
1400
8e5de8bcae9f
(read_filesystem_list) [MOUNTED_GETMNTENT2]:
Jim Meyering <jim@meyering.net>
parents:
1399
diff
changeset
|
924 } |
5 | 925 |
1401 | 926 if (0 <= lockfd && close (lockfd) != 0) |
1413 | 927 ret = errno; |
5 | 928 |
1413 | 929 if (0 <= ret) |
930 { | |
12421
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
931 errno = ret; |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
932 goto free_then_fail; |
1413 | 933 } |
5 | 934 } |
935 #endif /* MOUNTED_GETMNTENT2. */ | |
936 | |
39905
c3122bb580fe
mountlist: Modernize platform lists.
Bruno Haible <bruno@clisp.org>
parents:
19484
diff
changeset
|
937 #ifdef MOUNTED_VMOUNT /* AIX */ |
5 | 938 { |
939 int bufsize; | |
18009
9d5c839f66b6
acl-permissions: more porting to AIX
Paul Eggert <eggert@cs.ucla.edu>
parents:
17951
diff
changeset
|
940 void *entries; |
9d5c839f66b6
acl-permissions: more porting to AIX
Paul Eggert <eggert@cs.ucla.edu>
parents:
17951
diff
changeset
|
941 char *thisent; |
2570
70878b295de9
move vmp decl back out to the scope where it belongs
Jim Meyering <jim@meyering.net>
parents:
2553
diff
changeset
|
942 struct vmount *vmp; |
4287
0c926607b93d
Merge change from Coreutils.
Jim Meyering <jim@meyering.net>
parents:
3993
diff
changeset
|
943 int n_entries; |
0c926607b93d
Merge change from Coreutils.
Jim Meyering <jim@meyering.net>
parents:
3993
diff
changeset
|
944 int i; |
5 | 945 |
5159 | 946 /* Ask how many bytes to allocate for the mounted file system info. */ |
18009
9d5c839f66b6
acl-permissions: more porting to AIX
Paul Eggert <eggert@cs.ucla.edu>
parents:
17951
diff
changeset
|
947 entries = &bufsize; |
9d5c839f66b6
acl-permissions: more porting to AIX
Paul Eggert <eggert@cs.ucla.edu>
parents:
17951
diff
changeset
|
948 if (mntctl (MCTL_QUERY, sizeof bufsize, entries) != 0) |
4287
0c926607b93d
Merge change from Coreutils.
Jim Meyering <jim@meyering.net>
parents:
3993
diff
changeset
|
949 return NULL; |
5 | 950 entries = xmalloc (bufsize); |
951 | |
5159 | 952 /* Get the list of mounted file systems. */ |
18009
9d5c839f66b6
acl-permissions: more porting to AIX
Paul Eggert <eggert@cs.ucla.edu>
parents:
17951
diff
changeset
|
953 n_entries = mntctl (MCTL_QUERY, bufsize, entries); |
4287
0c926607b93d
Merge change from Coreutils.
Jim Meyering <jim@meyering.net>
parents:
3993
diff
changeset
|
954 if (n_entries < 0) |
0c926607b93d
Merge change from Coreutils.
Jim Meyering <jim@meyering.net>
parents:
3993
diff
changeset
|
955 { |
12421
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
956 int saved_errno = errno; |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
957 free (entries); |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
958 errno = saved_errno; |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
959 return NULL; |
4287
0c926607b93d
Merge change from Coreutils.
Jim Meyering <jim@meyering.net>
parents:
3993
diff
changeset
|
960 } |
5 | 961 |
4287
0c926607b93d
Merge change from Coreutils.
Jim Meyering <jim@meyering.net>
parents:
3993
diff
changeset
|
962 for (i = 0, thisent = entries; |
12421
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
963 i < n_entries; |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
964 i++, thisent += vmp->vmt_length) |
5 | 965 { |
12421
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
966 char *options, *ignore; |
2550
3ce1a171e216
(read_filesystem_list) [MOUNTED_VMOUNT]: Ignore mounts
Jim Meyering <jim@meyering.net>
parents:
2453
diff
changeset
|
967 |
12421
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
968 vmp = (struct vmount *) thisent; |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
969 me = xmalloc (sizeof *me); |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
970 if (vmp->vmt_flags & MNT_REMOTE) |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
971 { |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
972 char *host, *dir; |
5 | 973 |
12421
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
974 me->me_remote = 1; |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
975 /* Prepend the remote dirname. */ |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
976 host = thisent + vmp->vmt_data[VMT_HOSTNAME].vmt_off; |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
977 dir = thisent + vmp->vmt_data[VMT_OBJECT].vmt_off; |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
978 me->me_devname = xmalloc (strlen (host) + strlen (dir) + 2); |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
979 strcpy (me->me_devname, host); |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
980 strcat (me->me_devname, ":"); |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
981 strcat (me->me_devname, dir); |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
982 } |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
983 else |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
984 { |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
985 me->me_remote = 0; |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
986 me->me_devname = xstrdup (thisent + |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
987 vmp->vmt_data[VMT_OBJECT].vmt_off); |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
988 } |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
989 me->me_mountdir = xstrdup (thisent + vmp->vmt_data[VMT_STUB].vmt_off); |
18087
b20684a49361
mountlist: add me_mntroot field on Linux machines
Dave Chiluk <chiluk@canonical.com>
parents:
18028
diff
changeset
|
990 me->me_mntroot = NULL; |
12421
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
991 me->me_type = xstrdup (fstype_to_string (vmp->vmt_gfstype)); |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
992 me->me_type_malloced = 1; |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
993 options = thisent + vmp->vmt_data[VMT_ARGS].vmt_off; |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
994 ignore = strstr (options, "ignore"); |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
995 me->me_dummy = (ignore |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
996 && (ignore == options || ignore[-1] == ',') |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
997 && (ignore[sizeof "ignore" - 1] == ',' |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
998 || ignore[sizeof "ignore" - 1] == '\0')); |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
999 me->me_dev = (dev_t) -1; /* vmt_fsid might be the info we want. */ |
5 | 1000 |
12421
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
1001 /* Add to the linked list. */ |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
1002 *mtail = me; |
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
1003 mtail = &me->me_next; |
5 | 1004 } |
1005 free (entries); | |
1006 } | |
1007 #endif /* MOUNTED_VMOUNT. */ | |
1008 | |
39905
c3122bb580fe
mountlist: Modernize platform lists.
Bruno Haible <bruno@clisp.org>
parents:
19484
diff
changeset
|
1009 #ifdef MOUNTED_INTERIX_STATVFS /* Interix */ |
14191
00edc8eebaa5
mountlist: add support for Interix
Markus Duft <mduft@gentoo.org>
parents:
14079
diff
changeset
|
1010 { |
00edc8eebaa5
mountlist: add support for Interix
Markus Duft <mduft@gentoo.org>
parents:
14079
diff
changeset
|
1011 DIR *dirp = opendir ("/dev/fs"); |
00edc8eebaa5
mountlist: add support for Interix
Markus Duft <mduft@gentoo.org>
parents:
14079
diff
changeset
|
1012 char node[9 + NAME_MAX]; |
00edc8eebaa5
mountlist: add support for Interix
Markus Duft <mduft@gentoo.org>
parents:
14079
diff
changeset
|
1013 |
00edc8eebaa5
mountlist: add support for Interix
Markus Duft <mduft@gentoo.org>
parents:
14079
diff
changeset
|
1014 if (!dirp) |
00edc8eebaa5
mountlist: add support for Interix
Markus Duft <mduft@gentoo.org>
parents:
14079
diff
changeset
|
1015 goto free_then_fail; |
00edc8eebaa5
mountlist: add support for Interix
Markus Duft <mduft@gentoo.org>
parents:
14079
diff
changeset
|
1016 |
00edc8eebaa5
mountlist: add support for Interix
Markus Duft <mduft@gentoo.org>
parents:
14079
diff
changeset
|
1017 while (1) |
00edc8eebaa5
mountlist: add support for Interix
Markus Duft <mduft@gentoo.org>
parents:
14079
diff
changeset
|
1018 { |
00edc8eebaa5
mountlist: add support for Interix
Markus Duft <mduft@gentoo.org>
parents:
14079
diff
changeset
|
1019 struct statvfs dev; |
00edc8eebaa5
mountlist: add support for Interix
Markus Duft <mduft@gentoo.org>
parents:
14079
diff
changeset
|
1020 struct dirent entry; |
00edc8eebaa5
mountlist: add support for Interix
Markus Duft <mduft@gentoo.org>
parents:
14079
diff
changeset
|
1021 struct dirent *result; |
00edc8eebaa5
mountlist: add support for Interix
Markus Duft <mduft@gentoo.org>
parents:
14079
diff
changeset
|
1022 |
18244
976d848c1f8d
readdir_r: now obsolescent
Paul Eggert <eggert@cs.ucla.edu>
parents:
18189
diff
changeset
|
1023 /* FIXME: readdir_r is planned to be withdrawn from POSIX and |
976d848c1f8d
readdir_r: now obsolescent
Paul Eggert <eggert@cs.ucla.edu>
parents:
18189
diff
changeset
|
1024 marked obsolescent in glibc. Use readdir instead. */ |
14191
00edc8eebaa5
mountlist: add support for Interix
Markus Duft <mduft@gentoo.org>
parents:
14079
diff
changeset
|
1025 if (readdir_r (dirp, &entry, &result) || result == NULL) |
00edc8eebaa5
mountlist: add support for Interix
Markus Duft <mduft@gentoo.org>
parents:
14079
diff
changeset
|
1026 break; |
00edc8eebaa5
mountlist: add support for Interix
Markus Duft <mduft@gentoo.org>
parents:
14079
diff
changeset
|
1027 |
00edc8eebaa5
mountlist: add support for Interix
Markus Duft <mduft@gentoo.org>
parents:
14079
diff
changeset
|
1028 strcpy (node, "/dev/fs/"); |
00edc8eebaa5
mountlist: add support for Interix
Markus Duft <mduft@gentoo.org>
parents:
14079
diff
changeset
|
1029 strcat (node, entry.d_name); |
00edc8eebaa5
mountlist: add support for Interix
Markus Duft <mduft@gentoo.org>
parents:
14079
diff
changeset
|
1030 |
00edc8eebaa5
mountlist: add support for Interix
Markus Duft <mduft@gentoo.org>
parents:
14079
diff
changeset
|
1031 if (statvfs (node, &dev) == 0) |
00edc8eebaa5
mountlist: add support for Interix
Markus Duft <mduft@gentoo.org>
parents:
14079
diff
changeset
|
1032 { |
00edc8eebaa5
mountlist: add support for Interix
Markus Duft <mduft@gentoo.org>
parents:
14079
diff
changeset
|
1033 me = xmalloc (sizeof *me); |
00edc8eebaa5
mountlist: add support for Interix
Markus Duft <mduft@gentoo.org>
parents:
14079
diff
changeset
|
1034 me->me_devname = xstrdup (dev.f_mntfromname); |
00edc8eebaa5
mountlist: add support for Interix
Markus Duft <mduft@gentoo.org>
parents:
14079
diff
changeset
|
1035 me->me_mountdir = xstrdup (dev.f_mntonname); |
18087
b20684a49361
mountlist: add me_mntroot field on Linux machines
Dave Chiluk <chiluk@canonical.com>
parents:
18028
diff
changeset
|
1036 me->me_mntroot = NULL; |
14191
00edc8eebaa5
mountlist: add support for Interix
Markus Duft <mduft@gentoo.org>
parents:
14079
diff
changeset
|
1037 me->me_type = xstrdup (dev.f_fstypename); |
00edc8eebaa5
mountlist: add support for Interix
Markus Duft <mduft@gentoo.org>
parents:
14079
diff
changeset
|
1038 me->me_type_malloced = 1; |
00edc8eebaa5
mountlist: add support for Interix
Markus Duft <mduft@gentoo.org>
parents:
14079
diff
changeset
|
1039 me->me_dummy = ME_DUMMY (me->me_devname, me->me_type); |
00edc8eebaa5
mountlist: add support for Interix
Markus Duft <mduft@gentoo.org>
parents:
14079
diff
changeset
|
1040 me->me_remote = ME_REMOTE (me->me_devname, me->me_type); |
00edc8eebaa5
mountlist: add support for Interix
Markus Duft <mduft@gentoo.org>
parents:
14079
diff
changeset
|
1041 me->me_dev = (dev_t) -1; /* Magic; means not known yet. */ |
00edc8eebaa5
mountlist: add support for Interix
Markus Duft <mduft@gentoo.org>
parents:
14079
diff
changeset
|
1042 |
00edc8eebaa5
mountlist: add support for Interix
Markus Duft <mduft@gentoo.org>
parents:
14079
diff
changeset
|
1043 /* Add to the linked list. */ |
00edc8eebaa5
mountlist: add support for Interix
Markus Duft <mduft@gentoo.org>
parents:
14079
diff
changeset
|
1044 *mtail = me; |
00edc8eebaa5
mountlist: add support for Interix
Markus Duft <mduft@gentoo.org>
parents:
14079
diff
changeset
|
1045 mtail = &me->me_next; |
00edc8eebaa5
mountlist: add support for Interix
Markus Duft <mduft@gentoo.org>
parents:
14079
diff
changeset
|
1046 } |
00edc8eebaa5
mountlist: add support for Interix
Markus Duft <mduft@gentoo.org>
parents:
14079
diff
changeset
|
1047 } |
17502
94372321dd20
mountlist: fix resource leak with MOUNTED_INTERIX_STATVFS
Andrew Borodin <aborodin@vmail.ru>
parents:
17435
diff
changeset
|
1048 closedir (dirp); |
14191
00edc8eebaa5
mountlist: add support for Interix
Markus Duft <mduft@gentoo.org>
parents:
14079
diff
changeset
|
1049 } |
00edc8eebaa5
mountlist: add support for Interix
Markus Duft <mduft@gentoo.org>
parents:
14079
diff
changeset
|
1050 #endif /* MOUNTED_INTERIX_STATVFS */ |
00edc8eebaa5
mountlist: add support for Interix
Markus Duft <mduft@gentoo.org>
parents:
14079
diff
changeset
|
1051 |
1413 | 1052 *mtail = NULL; |
5 | 1053 return mount_list; |
1413 | 1054 |
1055 | |
18028
4b0e76619c7f
mountlist: avoid an unused-label warning on OS X
Jim Meyering <meyering@fb.com>
parents:
18009
diff
changeset
|
1056 free_then_fail: _GL_UNUSED_LABEL |
1413 | 1057 { |
1058 int saved_errno = errno; | |
1059 *mtail = NULL; | |
1436
5919c19d9a1a
(read_filesystem_list): Fix more memory leaks on failure.
Jim Meyering <jim@meyering.net>
parents:
1413
diff
changeset
|
1060 |
1413 | 1061 while (mount_list) |
1062 { | |
12421
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
1063 me = mount_list->me_next; |
17435
62bc285cb037
mountlist: add support for deallocating returned list entries
Pádraig Brady <P@draigBrady.com>
parents:
17332
diff
changeset
|
1064 free_mount_entry (mount_list); |
12421
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
11395
diff
changeset
|
1065 mount_list = me; |
1413 | 1066 } |
1067 | |
1068 errno = saved_errno; | |
1069 return NULL; | |
1070 } | |
5 | 1071 } |
17435
62bc285cb037
mountlist: add support for deallocating returned list entries
Pádraig Brady <P@draigBrady.com>
parents:
17332
diff
changeset
|
1072 |
62bc285cb037
mountlist: add support for deallocating returned list entries
Pádraig Brady <P@draigBrady.com>
parents:
17332
diff
changeset
|
1073 /* Free a mount entry as returned from read_file_system_list (). */ |
62bc285cb037
mountlist: add support for deallocating returned list entries
Pádraig Brady <P@draigBrady.com>
parents:
17332
diff
changeset
|
1074 |
62bc285cb037
mountlist: add support for deallocating returned list entries
Pádraig Brady <P@draigBrady.com>
parents:
17332
diff
changeset
|
1075 void free_mount_entry (struct mount_entry *me) |
62bc285cb037
mountlist: add support for deallocating returned list entries
Pádraig Brady <P@draigBrady.com>
parents:
17332
diff
changeset
|
1076 { |
62bc285cb037
mountlist: add support for deallocating returned list entries
Pádraig Brady <P@draigBrady.com>
parents:
17332
diff
changeset
|
1077 free (me->me_devname); |
62bc285cb037
mountlist: add support for deallocating returned list entries
Pádraig Brady <P@draigBrady.com>
parents:
17332
diff
changeset
|
1078 free (me->me_mountdir); |
18087
b20684a49361
mountlist: add me_mntroot field on Linux machines
Dave Chiluk <chiluk@canonical.com>
parents:
18028
diff
changeset
|
1079 free (me->me_mntroot); |
17435
62bc285cb037
mountlist: add support for deallocating returned list entries
Pádraig Brady <P@draigBrady.com>
parents:
17332
diff
changeset
|
1080 if (me->me_type_malloced) |
62bc285cb037
mountlist: add support for deallocating returned list entries
Pádraig Brady <P@draigBrady.com>
parents:
17332
diff
changeset
|
1081 free (me->me_type); |
62bc285cb037
mountlist: add support for deallocating returned list entries
Pádraig Brady <P@draigBrady.com>
parents:
17332
diff
changeset
|
1082 free (me); |
62bc285cb037
mountlist: add support for deallocating returned list entries
Pádraig Brady <P@draigBrady.com>
parents:
17332
diff
changeset
|
1083 } |