Mercurial > gnulib
annotate lib/mountlist.c @ 5318:7c24a825b51d
Remove dependencies on unlocked-io.
| author | Paul Eggert <eggert@cs.ucla.edu> |
|---|---|
| date | Mon, 04 Oct 2004 20:17:39 +0000 |
| parents | a535859efd14 |
| children | f2a6ab91acad |
| rev | line source |
|---|---|
| 5159 | 1 /* mountlist.c -- return a list of mounted file systems |
| 4986 | 2 Copyright (C) 1991, 1992, 1997-2004 Free Software Foundation, Inc. |
| 5 | 3 |
| 4 This program is free software; you can redistribute it and/or modify | |
| 5 it under the terms of the GNU General Public License as published by | |
| 6 the Free Software Foundation; either version 2, or (at your option) | |
| 7 any later version. | |
| 8 | |
| 9 This program is distributed in the hope that it will be useful, | |
| 10 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 11 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 12 GNU General Public License for more details. | |
| 13 | |
| 14 You should have received a copy of the GNU General Public License | |
|
650
b4ef1c1a0171
update FSF address in copyright
Jim Meyering <jim@meyering.net>
parents:
619
diff
changeset
|
15 along with this program; if not, write to the Free Software Foundation, |
|
b4ef1c1a0171
update FSF address in copyright
Jim Meyering <jim@meyering.net>
parents:
619
diff
changeset
|
16 Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ |
| 5 | 17 |
|
1278
9ad625a30b7d
Use #if, not #ifdef with HAVE_ macros
Jim Meyering <jim@meyering.net>
parents:
1183
diff
changeset
|
18 #if HAVE_CONFIG_H |
| 917 | 19 # include <config.h> |
| 326 | 20 #endif |
| 21 | |
| 5 | 22 #include <stdio.h> |
| 23 #include <sys/types.h> | |
| 4666 | 24 #include <stdlib.h> |
| 25 #include <string.h> | |
| 5 | 26 |
|
3621
56f442359b0d
Include unlocked-io.h after all system headers.
Jim Meyering <jim@meyering.net>
parents:
3618
diff
changeset
|
27 #include "xalloc.h" |
| 5 | 28 |
|
1183
ebbcc79d5bef
Declare stpcpy only if not defined as macro.
Jim Meyering <jim@meyering.net>
parents:
928
diff
changeset
|
29 #ifndef strstr |
| 5 | 30 char *strstr (); |
|
1183
ebbcc79d5bef
Declare stpcpy only if not defined as macro.
Jim Meyering <jim@meyering.net>
parents:
928
diff
changeset
|
31 #endif |
| 5 | 32 |
|
1399
edb0581923b9
(read_filesystem_list): If SVR4, lock /etc/.mnttab.lock if available,
Jim Meyering <jim@meyering.net>
parents:
1396
diff
changeset
|
33 #include <errno.h> |
|
edb0581923b9
(read_filesystem_list): If SVR4, lock /etc/.mnttab.lock if available,
Jim Meyering <jim@meyering.net>
parents:
1396
diff
changeset
|
34 |
|
edb0581923b9
(read_filesystem_list): If SVR4, lock /etc/.mnttab.lock if available,
Jim Meyering <jim@meyering.net>
parents:
1396
diff
changeset
|
35 #ifdef HAVE_FCNTL_H |
|
edb0581923b9
(read_filesystem_list): If SVR4, lock /etc/.mnttab.lock if available,
Jim Meyering <jim@meyering.net>
parents:
1396
diff
changeset
|
36 # include <fcntl.h> |
|
edb0581923b9
(read_filesystem_list): If SVR4, lock /etc/.mnttab.lock if available,
Jim Meyering <jim@meyering.net>
parents:
1396
diff
changeset
|
37 #endif |
|
edb0581923b9
(read_filesystem_list): If SVR4, lock /etc/.mnttab.lock if available,
Jim Meyering <jim@meyering.net>
parents:
1396
diff
changeset
|
38 |
|
edb0581923b9
(read_filesystem_list): If SVR4, lock /etc/.mnttab.lock if available,
Jim Meyering <jim@meyering.net>
parents:
1396
diff
changeset
|
39 #ifdef HAVE_UNISTD_H |
|
edb0581923b9
(read_filesystem_list): If SVR4, lock /etc/.mnttab.lock if available,
Jim Meyering <jim@meyering.net>
parents:
1396
diff
changeset
|
40 # include <unistd.h> |
|
edb0581923b9
(read_filesystem_list): If SVR4, lock /etc/.mnttab.lock if available,
Jim Meyering <jim@meyering.net>
parents:
1396
diff
changeset
|
41 #endif |
|
edb0581923b9
(read_filesystem_list): If SVR4, lock /etc/.mnttab.lock if available,
Jim Meyering <jim@meyering.net>
parents:
1396
diff
changeset
|
42 |
|
1278
9ad625a30b7d
Use #if, not #ifdef with HAVE_ macros
Jim Meyering <jim@meyering.net>
parents:
1183
diff
changeset
|
43 #if HAVE_SYS_PARAM_H |
| 917 | 44 # include <sys/param.h> |
| 326 | 45 #endif |
| 46 | |
| 3537 | 47 #if defined MOUNTED_GETFSSTAT /* OSF_1 and Darwin1.3.x */ |
| 48 # if HAVE_SYS_UCRED_H | |
| 4986 | 49 # include <grp.h> /* needed on OSF V4.0 for definition of NGROUPS, |
| 50 NGROUPS is used as an array dimension in ucred.h */ | |
| 3537 | 51 # include <sys/ucred.h> /* needed by powerpc-apple-darwin1.3.7 */ |
| 52 # endif | |
| 53 # if HAVE_SYS_MOUNT_H | |
| 54 # include <sys/mount.h> | |
| 55 # endif | |
| 56 # if HAVE_SYS_FS_TYPES_H | |
| 57 # include <sys/fs_types.h> /* needed by powerpc-apple-darwin1.3.7 */ | |
| 58 # endif | |
| 59 # if HAVE_STRUCT_FSSTAT_F_FSTYPENAME | |
| 60 # define FS_TYPE(Ent) ((Ent).f_fstypename) | |
| 61 # else | |
| 62 # define FS_TYPE(Ent) mnt_names[(Ent).f_type] | |
| 63 # endif | |
| 326 | 64 #endif /* MOUNTED_GETFSSTAT */ |
| 65 | |
| 5 | 66 #ifdef MOUNTED_GETMNTENT1 /* 4.3BSD, SunOS, HP-UX, Dynix, Irix. */ |
| 917 | 67 # include <mntent.h> |
|
3502
ebfd8c693504
Remove useless parentheses in #if directives.
Jim Meyering <jim@meyering.net>
parents:
2677
diff
changeset
|
68 # if !defined MOUNTED |
|
ebfd8c693504
Remove useless parentheses in #if directives.
Jim Meyering <jim@meyering.net>
parents:
2677
diff
changeset
|
69 # if defined _PATH_MOUNTED /* GNU libc */ |
|
ebfd8c693504
Remove useless parentheses in #if directives.
Jim Meyering <jim@meyering.net>
parents:
2677
diff
changeset
|
70 # define MOUNTED _PATH_MOUNTED |
|
ebfd8c693504
Remove useless parentheses in #if directives.
Jim Meyering <jim@meyering.net>
parents:
2677
diff
changeset
|
71 # endif |
|
ebfd8c693504
Remove useless parentheses in #if directives.
Jim Meyering <jim@meyering.net>
parents:
2677
diff
changeset
|
72 # if defined MNT_MNTTAB /* HP-UX. */ |
| 917 | 73 # define MOUNTED MNT_MNTTAB |
| 5 | 74 # endif |
|
3502
ebfd8c693504
Remove useless parentheses in #if directives.
Jim Meyering <jim@meyering.net>
parents:
2677
diff
changeset
|
75 # if defined MNTTABNAME /* Dynix. */ |
| 917 | 76 # define MOUNTED MNTTABNAME |
| 5 | 77 # endif |
| 917 | 78 # endif |
| 5 | 79 #endif |
| 80 | |
| 81 #ifdef MOUNTED_GETMNTINFO /* 4.4BSD. */ | |
| 917 | 82 # include <sys/mount.h> |
| 5 | 83 #endif |
| 84 | |
| 85 #ifdef MOUNTED_GETMNT /* Ultrix. */ | |
| 917 | 86 # include <sys/mount.h> |
| 87 # include <sys/fs_types.h> | |
| 5 | 88 #endif |
| 89 | |
|
2677
a15fc2b3bc82
Use MOUNTED_FS_STAT_DEV instead of MOUNTED_NEXT_DEV,
Jim Meyering <jim@meyering.net>
parents:
2667
diff
changeset
|
90 #ifdef MOUNTED_FS_STAT_DEV /* BeOS. */ |
|
2453
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
91 # include <fs_info.h> |
|
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
92 # include <dirent.h> |
|
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
93 #endif |
|
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
94 |
| 5 | 95 #ifdef MOUNTED_FREAD /* SVR2. */ |
| 917 | 96 # include <mnttab.h> |
| 5 | 97 #endif |
| 98 | |
| 99 #ifdef MOUNTED_FREAD_FSTYP /* SVR3. */ | |
| 917 | 100 # include <mnttab.h> |
| 101 # include <sys/fstyp.h> | |
| 102 # include <sys/statfs.h> | |
| 5 | 103 #endif |
| 104 | |
|
619
dbaeca6a1983
(read_filesystem_list) [MOUNTED_LISTMNTENT]: New function.
Jim Meyering <jim@meyering.net>
parents:
492
diff
changeset
|
105 #ifdef MOUNTED_LISTMNTENT |
| 917 | 106 # include <mntent.h> |
|
619
dbaeca6a1983
(read_filesystem_list) [MOUNTED_LISTMNTENT]: New function.
Jim Meyering <jim@meyering.net>
parents:
492
diff
changeset
|
107 #endif |
|
dbaeca6a1983
(read_filesystem_list) [MOUNTED_LISTMNTENT]: New function.
Jim Meyering <jim@meyering.net>
parents:
492
diff
changeset
|
108 |
| 5 | 109 #ifdef MOUNTED_GETMNTENT2 /* SVR4. */ |
| 917 | 110 # include <sys/mnttab.h> |
| 5 | 111 #endif |
| 112 | |
| 113 #ifdef MOUNTED_VMOUNT /* AIX. */ | |
| 917 | 114 # include <fshelp.h> |
| 115 # include <sys/vfs.h> | |
| 5 | 116 #endif |
| 117 | |
| 326 | 118 #ifdef DOLPHIN |
| 119 /* So special that it's not worth putting this in autoconf. */ | |
| 917 | 120 # undef MOUNTED_FREAD_FSTYP |
| 121 # define MOUNTED_GETMNTTBL | |
| 326 | 122 #endif |
| 123 | |
|
1278
9ad625a30b7d
Use #if, not #ifdef with HAVE_ macros
Jim Meyering <jim@meyering.net>
parents:
1183
diff
changeset
|
124 #if HAVE_SYS_MNTENT_H |
|
918
09fe18b51677
(read_filesystem_list): Show automount-related
Jim Meyering <jim@meyering.net>
parents:
917
diff
changeset
|
125 /* 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
|
126 # include <sys/mntent.h> |
|
09fe18b51677
(read_filesystem_list): Show automount-related
Jim Meyering <jim@meyering.net>
parents:
917
diff
changeset
|
127 #endif |
|
09fe18b51677
(read_filesystem_list): Show automount-related
Jim Meyering <jim@meyering.net>
parents:
917
diff
changeset
|
128 |
|
3991
ab906cd2631e
2002-07-13 Bruno Haible <bruno@clisp.org>
Jim Meyering <jim@meyering.net>
parents:
3621
diff
changeset
|
129 #undef MNT_IGNORE |
|
3502
ebfd8c693504
Remove useless parentheses in #if directives.
Jim Meyering <jim@meyering.net>
parents:
2677
diff
changeset
|
130 #if defined MNTOPT_IGNORE && defined HAVE_HASMNTOPT |
|
918
09fe18b51677
(read_filesystem_list): Show automount-related
Jim Meyering <jim@meyering.net>
parents:
917
diff
changeset
|
131 # define MNT_IGNORE(M) hasmntopt ((M), MNTOPT_IGNORE) |
|
09fe18b51677
(read_filesystem_list): Show automount-related
Jim Meyering <jim@meyering.net>
parents:
917
diff
changeset
|
132 #else |
|
09fe18b51677
(read_filesystem_list): Show automount-related
Jim Meyering <jim@meyering.net>
parents:
917
diff
changeset
|
133 # define MNT_IGNORE(M) 0 |
|
09fe18b51677
(read_filesystem_list): Show automount-related
Jim Meyering <jim@meyering.net>
parents:
917
diff
changeset
|
134 #endif |
|
09fe18b51677
(read_filesystem_list): Show automount-related
Jim Meyering <jim@meyering.net>
parents:
917
diff
changeset
|
135 |
|
3621
56f442359b0d
Include unlocked-io.h after all system headers.
Jim Meyering <jim@meyering.net>
parents:
3618
diff
changeset
|
136 #include "mountlist.h" |
|
5318
7c24a825b51d
Remove dependencies on unlocked-io.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5159
diff
changeset
|
137 |
|
7c24a825b51d
Remove dependencies on unlocked-io.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5159
diff
changeset
|
138 #if USE_UNLOCKED_IO |
|
7c24a825b51d
Remove dependencies on unlocked-io.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5159
diff
changeset
|
139 # include "unlocked-io.h" |
|
7c24a825b51d
Remove dependencies on unlocked-io.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5159
diff
changeset
|
140 #endif |
|
3621
56f442359b0d
Include unlocked-io.h after all system headers.
Jim Meyering <jim@meyering.net>
parents:
3618
diff
changeset
|
141 |
| 5159 | 142 #ifndef SIZE_MAX |
| 143 # define SIZE_MAX ((size_t) -1) | |
| 144 #endif | |
| 5 | 145 |
|
1389
e947a465b033
(fsp_to_string): Clean out some crufty #ifdefs
Jim Meyering <jim@meyering.net>
parents:
1278
diff
changeset
|
146 #if MOUNTED_GETMNTINFO |
|
e947a465b033
(fsp_to_string): Clean out some crufty #ifdefs
Jim Meyering <jim@meyering.net>
parents:
1278
diff
changeset
|
147 |
|
1396
f3912c1d7674
(fstype_to_string): Guard with #if ! HAVE_F_FSTYPENAME_IN_STATFS.
Jim Meyering <jim@meyering.net>
parents:
1389
diff
changeset
|
148 # if ! HAVE_F_FSTYPENAME_IN_STATFS |
| 5 | 149 static char * |
| 5159 | 150 fstype_to_string (short int t) |
| 5 | 151 { |
| 152 switch (t) | |
| 153 { | |
|
1396
f3912c1d7674
(fstype_to_string): Guard with #if ! HAVE_F_FSTYPENAME_IN_STATFS.
Jim Meyering <jim@meyering.net>
parents:
1389
diff
changeset
|
154 # ifdef MOUNT_PC |
| 5 | 155 case MOUNT_PC: |
| 156 return "pc"; | |
|
1396
f3912c1d7674
(fstype_to_string): Guard with #if ! HAVE_F_FSTYPENAME_IN_STATFS.
Jim Meyering <jim@meyering.net>
parents:
1389
diff
changeset
|
157 # endif |
|
f3912c1d7674
(fstype_to_string): Guard with #if ! HAVE_F_FSTYPENAME_IN_STATFS.
Jim Meyering <jim@meyering.net>
parents:
1389
diff
changeset
|
158 # ifdef MOUNT_MFS |
| 5 | 159 case MOUNT_MFS: |
| 160 return "mfs"; | |
|
1396
f3912c1d7674
(fstype_to_string): Guard with #if ! HAVE_F_FSTYPENAME_IN_STATFS.
Jim Meyering <jim@meyering.net>
parents:
1389
diff
changeset
|
161 # endif |
|
f3912c1d7674
(fstype_to_string): Guard with #if ! HAVE_F_FSTYPENAME_IN_STATFS.
Jim Meyering <jim@meyering.net>
parents:
1389
diff
changeset
|
162 # ifdef MOUNT_LO |
| 5 | 163 case MOUNT_LO: |
| 164 return "lo"; | |
|
1396
f3912c1d7674
(fstype_to_string): Guard with #if ! HAVE_F_FSTYPENAME_IN_STATFS.
Jim Meyering <jim@meyering.net>
parents:
1389
diff
changeset
|
165 # endif |
|
f3912c1d7674
(fstype_to_string): Guard with #if ! HAVE_F_FSTYPENAME_IN_STATFS.
Jim Meyering <jim@meyering.net>
parents:
1389
diff
changeset
|
166 # ifdef MOUNT_TFS |
| 5 | 167 case MOUNT_TFS: |
| 168 return "tfs"; | |
|
1396
f3912c1d7674
(fstype_to_string): Guard with #if ! HAVE_F_FSTYPENAME_IN_STATFS.
Jim Meyering <jim@meyering.net>
parents:
1389
diff
changeset
|
169 # endif |
|
f3912c1d7674
(fstype_to_string): Guard with #if ! HAVE_F_FSTYPENAME_IN_STATFS.
Jim Meyering <jim@meyering.net>
parents:
1389
diff
changeset
|
170 # ifdef MOUNT_TMP |
| 5 | 171 case MOUNT_TMP: |
| 172 return "tmp"; | |
|
1396
f3912c1d7674
(fstype_to_string): Guard with #if ! HAVE_F_FSTYPENAME_IN_STATFS.
Jim Meyering <jim@meyering.net>
parents:
1389
diff
changeset
|
173 # endif |
|
f3912c1d7674
(fstype_to_string): Guard with #if ! HAVE_F_FSTYPENAME_IN_STATFS.
Jim Meyering <jim@meyering.net>
parents:
1389
diff
changeset
|
174 # ifdef MOUNT_UFS |
|
736
bf298c166b8d
(fstype_to_string): Handle fstypes of freebsd.
Jim Meyering <jim@meyering.net>
parents:
650
diff
changeset
|
175 case MOUNT_UFS: |
|
bf298c166b8d
(fstype_to_string): Handle fstypes of freebsd.
Jim Meyering <jim@meyering.net>
parents:
650
diff
changeset
|
176 return "ufs" ; |
|
1396
f3912c1d7674
(fstype_to_string): Guard with #if ! HAVE_F_FSTYPENAME_IN_STATFS.
Jim Meyering <jim@meyering.net>
parents:
1389
diff
changeset
|
177 # endif |
|
f3912c1d7674
(fstype_to_string): Guard with #if ! HAVE_F_FSTYPENAME_IN_STATFS.
Jim Meyering <jim@meyering.net>
parents:
1389
diff
changeset
|
178 # ifdef MOUNT_NFS |
|
736
bf298c166b8d
(fstype_to_string): Handle fstypes of freebsd.
Jim Meyering <jim@meyering.net>
parents:
650
diff
changeset
|
179 case MOUNT_NFS: |
|
bf298c166b8d
(fstype_to_string): Handle fstypes of freebsd.
Jim Meyering <jim@meyering.net>
parents:
650
diff
changeset
|
180 return "nfs" ; |
|
1396
f3912c1d7674
(fstype_to_string): Guard with #if ! HAVE_F_FSTYPENAME_IN_STATFS.
Jim Meyering <jim@meyering.net>
parents:
1389
diff
changeset
|
181 # endif |
|
f3912c1d7674
(fstype_to_string): Guard with #if ! HAVE_F_FSTYPENAME_IN_STATFS.
Jim Meyering <jim@meyering.net>
parents:
1389
diff
changeset
|
182 # ifdef MOUNT_MSDOS |
|
736
bf298c166b8d
(fstype_to_string): Handle fstypes of freebsd.
Jim Meyering <jim@meyering.net>
parents:
650
diff
changeset
|
183 case MOUNT_MSDOS: |
|
bf298c166b8d
(fstype_to_string): Handle fstypes of freebsd.
Jim Meyering <jim@meyering.net>
parents:
650
diff
changeset
|
184 return "msdos" ; |
|
1396
f3912c1d7674
(fstype_to_string): Guard with #if ! HAVE_F_FSTYPENAME_IN_STATFS.
Jim Meyering <jim@meyering.net>
parents:
1389
diff
changeset
|
185 # endif |
|
f3912c1d7674
(fstype_to_string): Guard with #if ! HAVE_F_FSTYPENAME_IN_STATFS.
Jim Meyering <jim@meyering.net>
parents:
1389
diff
changeset
|
186 # ifdef MOUNT_LFS |
|
736
bf298c166b8d
(fstype_to_string): Handle fstypes of freebsd.
Jim Meyering <jim@meyering.net>
parents:
650
diff
changeset
|
187 case MOUNT_LFS: |
|
bf298c166b8d
(fstype_to_string): Handle fstypes of freebsd.
Jim Meyering <jim@meyering.net>
parents:
650
diff
changeset
|
188 return "lfs" ; |
|
1396
f3912c1d7674
(fstype_to_string): Guard with #if ! HAVE_F_FSTYPENAME_IN_STATFS.
Jim Meyering <jim@meyering.net>
parents:
1389
diff
changeset
|
189 # endif |
|
f3912c1d7674
(fstype_to_string): Guard with #if ! HAVE_F_FSTYPENAME_IN_STATFS.
Jim Meyering <jim@meyering.net>
parents:
1389
diff
changeset
|
190 # ifdef MOUNT_LOFS |
|
736
bf298c166b8d
(fstype_to_string): Handle fstypes of freebsd.
Jim Meyering <jim@meyering.net>
parents:
650
diff
changeset
|
191 case MOUNT_LOFS: |
|
bf298c166b8d
(fstype_to_string): Handle fstypes of freebsd.
Jim Meyering <jim@meyering.net>
parents:
650
diff
changeset
|
192 return "lofs" ; |
|
1396
f3912c1d7674
(fstype_to_string): Guard with #if ! HAVE_F_FSTYPENAME_IN_STATFS.
Jim Meyering <jim@meyering.net>
parents:
1389
diff
changeset
|
193 # endif |
|
f3912c1d7674
(fstype_to_string): Guard with #if ! HAVE_F_FSTYPENAME_IN_STATFS.
Jim Meyering <jim@meyering.net>
parents:
1389
diff
changeset
|
194 # ifdef MOUNT_FDESC |
|
736
bf298c166b8d
(fstype_to_string): Handle fstypes of freebsd.
Jim Meyering <jim@meyering.net>
parents:
650
diff
changeset
|
195 case MOUNT_FDESC: |
|
bf298c166b8d
(fstype_to_string): Handle fstypes of freebsd.
Jim Meyering <jim@meyering.net>
parents:
650
diff
changeset
|
196 return "fdesc" ; |
|
1396
f3912c1d7674
(fstype_to_string): Guard with #if ! HAVE_F_FSTYPENAME_IN_STATFS.
Jim Meyering <jim@meyering.net>
parents:
1389
diff
changeset
|
197 # endif |
|
f3912c1d7674
(fstype_to_string): Guard with #if ! HAVE_F_FSTYPENAME_IN_STATFS.
Jim Meyering <jim@meyering.net>
parents:
1389
diff
changeset
|
198 # ifdef MOUNT_PORTAL |
|
736
bf298c166b8d
(fstype_to_string): Handle fstypes of freebsd.
Jim Meyering <jim@meyering.net>
parents:
650
diff
changeset
|
199 case MOUNT_PORTAL: |
|
bf298c166b8d
(fstype_to_string): Handle fstypes of freebsd.
Jim Meyering <jim@meyering.net>
parents:
650
diff
changeset
|
200 return "portal" ; |
|
1396
f3912c1d7674
(fstype_to_string): Guard with #if ! HAVE_F_FSTYPENAME_IN_STATFS.
Jim Meyering <jim@meyering.net>
parents:
1389
diff
changeset
|
201 # endif |
|
f3912c1d7674
(fstype_to_string): Guard with #if ! HAVE_F_FSTYPENAME_IN_STATFS.
Jim Meyering <jim@meyering.net>
parents:
1389
diff
changeset
|
202 # ifdef MOUNT_NULL |
|
736
bf298c166b8d
(fstype_to_string): Handle fstypes of freebsd.
Jim Meyering <jim@meyering.net>
parents:
650
diff
changeset
|
203 case MOUNT_NULL: |
|
bf298c166b8d
(fstype_to_string): Handle fstypes of freebsd.
Jim Meyering <jim@meyering.net>
parents:
650
diff
changeset
|
204 return "null" ; |
|
1396
f3912c1d7674
(fstype_to_string): Guard with #if ! HAVE_F_FSTYPENAME_IN_STATFS.
Jim Meyering <jim@meyering.net>
parents:
1389
diff
changeset
|
205 # endif |
|
f3912c1d7674
(fstype_to_string): Guard with #if ! HAVE_F_FSTYPENAME_IN_STATFS.
Jim Meyering <jim@meyering.net>
parents:
1389
diff
changeset
|
206 # ifdef MOUNT_UMAP |
|
736
bf298c166b8d
(fstype_to_string): Handle fstypes of freebsd.
Jim Meyering <jim@meyering.net>
parents:
650
diff
changeset
|
207 case MOUNT_UMAP: |
|
bf298c166b8d
(fstype_to_string): Handle fstypes of freebsd.
Jim Meyering <jim@meyering.net>
parents:
650
diff
changeset
|
208 return "umap" ; |
|
1396
f3912c1d7674
(fstype_to_string): Guard with #if ! HAVE_F_FSTYPENAME_IN_STATFS.
Jim Meyering <jim@meyering.net>
parents:
1389
diff
changeset
|
209 # endif |
|
f3912c1d7674
(fstype_to_string): Guard with #if ! HAVE_F_FSTYPENAME_IN_STATFS.
Jim Meyering <jim@meyering.net>
parents:
1389
diff
changeset
|
210 # ifdef MOUNT_KERNFS |
|
736
bf298c166b8d
(fstype_to_string): Handle fstypes of freebsd.
Jim Meyering <jim@meyering.net>
parents:
650
diff
changeset
|
211 case MOUNT_KERNFS: |
|
bf298c166b8d
(fstype_to_string): Handle fstypes of freebsd.
Jim Meyering <jim@meyering.net>
parents:
650
diff
changeset
|
212 return "kernfs" ; |
|
1396
f3912c1d7674
(fstype_to_string): Guard with #if ! HAVE_F_FSTYPENAME_IN_STATFS.
Jim Meyering <jim@meyering.net>
parents:
1389
diff
changeset
|
213 # endif |
|
f3912c1d7674
(fstype_to_string): Guard with #if ! HAVE_F_FSTYPENAME_IN_STATFS.
Jim Meyering <jim@meyering.net>
parents:
1389
diff
changeset
|
214 # ifdef MOUNT_PROCFS |
|
736
bf298c166b8d
(fstype_to_string): Handle fstypes of freebsd.
Jim Meyering <jim@meyering.net>
parents:
650
diff
changeset
|
215 case MOUNT_PROCFS: |
|
bf298c166b8d
(fstype_to_string): Handle fstypes of freebsd.
Jim Meyering <jim@meyering.net>
parents:
650
diff
changeset
|
216 return "procfs" ; |
|
1396
f3912c1d7674
(fstype_to_string): Guard with #if ! HAVE_F_FSTYPENAME_IN_STATFS.
Jim Meyering <jim@meyering.net>
parents:
1389
diff
changeset
|
217 # endif |
|
f3912c1d7674
(fstype_to_string): Guard with #if ! HAVE_F_FSTYPENAME_IN_STATFS.
Jim Meyering <jim@meyering.net>
parents:
1389
diff
changeset
|
218 # ifdef MOUNT_AFS |
|
736
bf298c166b8d
(fstype_to_string): Handle fstypes of freebsd.
Jim Meyering <jim@meyering.net>
parents:
650
diff
changeset
|
219 case MOUNT_AFS: |
|
bf298c166b8d
(fstype_to_string): Handle fstypes of freebsd.
Jim Meyering <jim@meyering.net>
parents:
650
diff
changeset
|
220 return "afs" ; |
|
1396
f3912c1d7674
(fstype_to_string): Guard with #if ! HAVE_F_FSTYPENAME_IN_STATFS.
Jim Meyering <jim@meyering.net>
parents:
1389
diff
changeset
|
221 # endif |
|
f3912c1d7674
(fstype_to_string): Guard with #if ! HAVE_F_FSTYPENAME_IN_STATFS.
Jim Meyering <jim@meyering.net>
parents:
1389
diff
changeset
|
222 # ifdef MOUNT_CD9660 |
|
736
bf298c166b8d
(fstype_to_string): Handle fstypes of freebsd.
Jim Meyering <jim@meyering.net>
parents:
650
diff
changeset
|
223 case MOUNT_CD9660: |
|
bf298c166b8d
(fstype_to_string): Handle fstypes of freebsd.
Jim Meyering <jim@meyering.net>
parents:
650
diff
changeset
|
224 return "cd9660" ; |
|
1396
f3912c1d7674
(fstype_to_string): Guard with #if ! HAVE_F_FSTYPENAME_IN_STATFS.
Jim Meyering <jim@meyering.net>
parents:
1389
diff
changeset
|
225 # endif |
|
f3912c1d7674
(fstype_to_string): Guard with #if ! HAVE_F_FSTYPENAME_IN_STATFS.
Jim Meyering <jim@meyering.net>
parents:
1389
diff
changeset
|
226 # ifdef MOUNT_UNION |
|
736
bf298c166b8d
(fstype_to_string): Handle fstypes of freebsd.
Jim Meyering <jim@meyering.net>
parents:
650
diff
changeset
|
227 case MOUNT_UNION: |
|
bf298c166b8d
(fstype_to_string): Handle fstypes of freebsd.
Jim Meyering <jim@meyering.net>
parents:
650
diff
changeset
|
228 return "union" ; |
|
1396
f3912c1d7674
(fstype_to_string): Guard with #if ! HAVE_F_FSTYPENAME_IN_STATFS.
Jim Meyering <jim@meyering.net>
parents:
1389
diff
changeset
|
229 # endif |
|
f3912c1d7674
(fstype_to_string): Guard with #if ! HAVE_F_FSTYPENAME_IN_STATFS.
Jim Meyering <jim@meyering.net>
parents:
1389
diff
changeset
|
230 # ifdef MOUNT_DEVFS |
|
736
bf298c166b8d
(fstype_to_string): Handle fstypes of freebsd.
Jim Meyering <jim@meyering.net>
parents:
650
diff
changeset
|
231 case MOUNT_DEVFS: |
|
bf298c166b8d
(fstype_to_string): Handle fstypes of freebsd.
Jim Meyering <jim@meyering.net>
parents:
650
diff
changeset
|
232 return "devfs" ; |
|
1396
f3912c1d7674
(fstype_to_string): Guard with #if ! HAVE_F_FSTYPENAME_IN_STATFS.
Jim Meyering <jim@meyering.net>
parents:
1389
diff
changeset
|
233 # endif |
|
f3912c1d7674
(fstype_to_string): Guard with #if ! HAVE_F_FSTYPENAME_IN_STATFS.
Jim Meyering <jim@meyering.net>
parents:
1389
diff
changeset
|
234 # ifdef MOUNT_EXT2FS |
|
736
bf298c166b8d
(fstype_to_string): Handle fstypes of freebsd.
Jim Meyering <jim@meyering.net>
parents:
650
diff
changeset
|
235 case MOUNT_EXT2FS: |
|
bf298c166b8d
(fstype_to_string): Handle fstypes of freebsd.
Jim Meyering <jim@meyering.net>
parents:
650
diff
changeset
|
236 return "ext2fs" ; |
|
1396
f3912c1d7674
(fstype_to_string): Guard with #if ! HAVE_F_FSTYPENAME_IN_STATFS.
Jim Meyering <jim@meyering.net>
parents:
1389
diff
changeset
|
237 # endif |
| 5 | 238 default: |
| 239 return "?"; | |
| 240 } | |
| 241 } | |
|
1396
f3912c1d7674
(fstype_to_string): Guard with #if ! HAVE_F_FSTYPENAME_IN_STATFS.
Jim Meyering <jim@meyering.net>
parents:
1389
diff
changeset
|
242 # endif /* ! HAVE_F_FSTYPENAME_IN_STATFS */ |
|
1389
e947a465b033
(fsp_to_string): Clean out some crufty #ifdefs
Jim Meyering <jim@meyering.net>
parents:
1278
diff
changeset
|
243 |
|
e947a465b033
(fsp_to_string): Clean out some crufty #ifdefs
Jim Meyering <jim@meyering.net>
parents:
1278
diff
changeset
|
244 /* __NetBSD__ || BSD_NET2 || __OpenBSD__ */ |
|
e947a465b033
(fsp_to_string): Clean out some crufty #ifdefs
Jim Meyering <jim@meyering.net>
parents:
1278
diff
changeset
|
245 static char * |
|
e947a465b033
(fsp_to_string): Clean out some crufty #ifdefs
Jim Meyering <jim@meyering.net>
parents:
1278
diff
changeset
|
246 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
|
247 { |
|
e947a465b033
(fsp_to_string): Clean out some crufty #ifdefs
Jim Meyering <jim@meyering.net>
parents:
1278
diff
changeset
|
248 # if defined HAVE_F_FSTYPENAME_IN_STATFS |
|
2667
a61942f1a535
(fsp_to_string) [HAVE_F_FSTYPENAME_IN_STATFS]:
Jim Meyering <jim@meyering.net>
parents:
2570
diff
changeset
|
249 return (char *) (fsp->f_fstypename); |
|
1389
e947a465b033
(fsp_to_string): Clean out some crufty #ifdefs
Jim Meyering <jim@meyering.net>
parents:
1278
diff
changeset
|
250 # else |
|
e947a465b033
(fsp_to_string): Clean out some crufty #ifdefs
Jim Meyering <jim@meyering.net>
parents:
1278
diff
changeset
|
251 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
|
252 # endif |
|
e947a465b033
(fsp_to_string): Clean out some crufty #ifdefs
Jim Meyering <jim@meyering.net>
parents:
1278
diff
changeset
|
253 } |
|
e947a465b033
(fsp_to_string): Clean out some crufty #ifdefs
Jim Meyering <jim@meyering.net>
parents:
1278
diff
changeset
|
254 |
| 5 | 255 #endif /* MOUNTED_GETMNTINFO */ |
| 256 | |
| 257 #ifdef MOUNTED_VMOUNT /* AIX. */ | |
| 258 static char * | |
| 1446 | 259 fstype_to_string (int t) |
| 5 | 260 { |
| 261 struct vfs_ent *e; | |
| 262 | |
| 263 e = getvfsbytype (t); | |
| 264 if (!e || !e->vfsent_name) | |
| 265 return "none"; | |
| 266 else | |
| 267 return e->vfsent_name; | |
| 268 } | |
| 269 #endif /* MOUNTED_VMOUNT */ | |
| 270 | |
| 5159 | 271 /* Return a list of the currently mounted file systems, or NULL on error. |
| 5 | 272 Add each entry to the tail of the list so that they stay in order. |
| 5159 | 273 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
|
274 the returned list are valid. Otherwise, they might not be. */ |
| 5 | 275 |
| 276 struct mount_entry * | |
| 5159 | 277 read_file_system_list (bool need_fs_type) |
| 5 | 278 { |
| 279 struct mount_entry *mount_list; | |
| 280 struct mount_entry *me; | |
| 1413 | 281 struct mount_entry **mtail = &mount_list; |
| 5 | 282 |
|
619
dbaeca6a1983
(read_filesystem_list) [MOUNTED_LISTMNTENT]: New function.
Jim Meyering <jim@meyering.net>
parents:
492
diff
changeset
|
283 #ifdef MOUNTED_LISTMNTENT |
|
dbaeca6a1983
(read_filesystem_list) [MOUNTED_LISTMNTENT]: New function.
Jim Meyering <jim@meyering.net>
parents:
492
diff
changeset
|
284 { |
|
dbaeca6a1983
(read_filesystem_list) [MOUNTED_LISTMNTENT]: New function.
Jim Meyering <jim@meyering.net>
parents:
492
diff
changeset
|
285 struct tabmntent *mntlist, *p; |
|
dbaeca6a1983
(read_filesystem_list) [MOUNTED_LISTMNTENT]: New function.
Jim Meyering <jim@meyering.net>
parents:
492
diff
changeset
|
286 struct mntent *mnt; |
|
dbaeca6a1983
(read_filesystem_list) [MOUNTED_LISTMNTENT]: New function.
Jim Meyering <jim@meyering.net>
parents:
492
diff
changeset
|
287 struct mount_entry *me; |
| 876 | 288 |
|
619
dbaeca6a1983
(read_filesystem_list) [MOUNTED_LISTMNTENT]: New function.
Jim Meyering <jim@meyering.net>
parents:
492
diff
changeset
|
289 /* the third and fourth arguments could be used to filter mounts, |
|
dbaeca6a1983
(read_filesystem_list) [MOUNTED_LISTMNTENT]: New function.
Jim Meyering <jim@meyering.net>
parents:
492
diff
changeset
|
290 but Crays doesn't seem to have any mounts that we want to |
|
dbaeca6a1983
(read_filesystem_list) [MOUNTED_LISTMNTENT]: New function.
Jim Meyering <jim@meyering.net>
parents:
492
diff
changeset
|
291 remove. Specifically, automount create normal NFS mounts. |
|
dbaeca6a1983
(read_filesystem_list) [MOUNTED_LISTMNTENT]: New function.
Jim Meyering <jim@meyering.net>
parents:
492
diff
changeset
|
292 */ |
|
dbaeca6a1983
(read_filesystem_list) [MOUNTED_LISTMNTENT]: New function.
Jim Meyering <jim@meyering.net>
parents:
492
diff
changeset
|
293 |
|
4548
a61e996662a3
Merge mountlist changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4287
diff
changeset
|
294 if (listmntent (&mntlist, KMTAB, NULL, NULL) < 0) |
|
619
dbaeca6a1983
(read_filesystem_list) [MOUNTED_LISTMNTENT]: New function.
Jim Meyering <jim@meyering.net>
parents:
492
diff
changeset
|
295 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
|
296 for (p = mntlist; p; p = p->next) { |
|
619
dbaeca6a1983
(read_filesystem_list) [MOUNTED_LISTMNTENT]: New function.
Jim Meyering <jim@meyering.net>
parents:
492
diff
changeset
|
297 mnt = p->ment; |
|
4839
72b30d7ed3c6
Catch size calculation overflow problem on Alphas running OSF/1.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4716
diff
changeset
|
298 me = xmalloc (sizeof *me); |
|
4548
a61e996662a3
Merge mountlist changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4287
diff
changeset
|
299 me->me_devname = xstrdup (mnt->mnt_fsname); |
|
a61e996662a3
Merge mountlist changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4287
diff
changeset
|
300 me->me_mountdir = xstrdup (mnt->mnt_dir); |
|
a61e996662a3
Merge mountlist changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4287
diff
changeset
|
301 me->me_type = xstrdup (mnt->mnt_type); |
|
4839
72b30d7ed3c6
Catch size calculation overflow problem on Alphas running OSF/1.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4716
diff
changeset
|
302 me->me_type_malloced = 1; |
|
1453
d5f389e692e8
(read_filesystem_list): Remove all_fs
Jim Meyering <jim@meyering.net>
parents:
1446
diff
changeset
|
303 me->me_dummy = ME_DUMMY (me->me_devname, me->me_type); |
|
d5f389e692e8
(read_filesystem_list): Remove all_fs
Jim Meyering <jim@meyering.net>
parents:
1446
diff
changeset
|
304 me->me_remote = ME_REMOTE (me->me_devname, me->me_type); |
|
619
dbaeca6a1983
(read_filesystem_list) [MOUNTED_LISTMNTENT]: New function.
Jim Meyering <jim@meyering.net>
parents:
492
diff
changeset
|
305 me->me_dev = -1; |
| 1413 | 306 *mtail = me; |
| 307 mtail = &me->me_next; | |
|
619
dbaeca6a1983
(read_filesystem_list) [MOUNTED_LISTMNTENT]: New function.
Jim Meyering <jim@meyering.net>
parents:
492
diff
changeset
|
308 } |
|
4548
a61e996662a3
Merge mountlist changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4287
diff
changeset
|
309 freemntlist (mntlist); |
|
619
dbaeca6a1983
(read_filesystem_list) [MOUNTED_LISTMNTENT]: New function.
Jim Meyering <jim@meyering.net>
parents:
492
diff
changeset
|
310 } |
|
dbaeca6a1983
(read_filesystem_list) [MOUNTED_LISTMNTENT]: New function.
Jim Meyering <jim@meyering.net>
parents:
492
diff
changeset
|
311 #endif |
|
dbaeca6a1983
(read_filesystem_list) [MOUNTED_LISTMNTENT]: New function.
Jim Meyering <jim@meyering.net>
parents:
492
diff
changeset
|
312 |
| 5 | 313 #ifdef MOUNTED_GETMNTENT1 /* 4.3BSD, SunOS, HP-UX, Dynix, Irix. */ |
| 314 { | |
| 315 struct mntent *mnt; | |
| 316 char *table = MOUNTED; | |
| 317 FILE *fp; | |
| 318 char *devopt; | |
| 319 | |
| 320 fp = setmntent (table, "r"); | |
| 321 if (fp == NULL) | |
| 322 return NULL; | |
| 323 | |
| 324 while ((mnt = getmntent (fp))) | |
| 325 { | |
|
4839
72b30d7ed3c6
Catch size calculation overflow problem on Alphas running OSF/1.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4716
diff
changeset
|
326 me = xmalloc (sizeof *me); |
| 5 | 327 me->me_devname = xstrdup (mnt->mnt_fsname); |
| 328 me->me_mountdir = xstrdup (mnt->mnt_dir); | |
| 329 me->me_type = xstrdup (mnt->mnt_type); | |
|
4839
72b30d7ed3c6
Catch size calculation overflow problem on Alphas running OSF/1.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4716
diff
changeset
|
330 me->me_type_malloced = 1; |
|
1453
d5f389e692e8
(read_filesystem_list): Remove all_fs
Jim Meyering <jim@meyering.net>
parents:
1446
diff
changeset
|
331 me->me_dummy = ME_DUMMY (me->me_devname, me->me_type); |
|
d5f389e692e8
(read_filesystem_list): Remove all_fs
Jim Meyering <jim@meyering.net>
parents:
1446
diff
changeset
|
332 me->me_remote = ME_REMOTE (me->me_devname, me->me_type); |
| 5 | 333 devopt = strstr (mnt->mnt_opts, "dev="); |
| 334 if (devopt) | |
| 5159 | 335 me->me_dev = strtoul (devopt + 4, NULL, 16); |
| 5 | 336 else |
|
492
33a21db1201a
(read_filesystem_list): Cast -1 to dev_t before assignment.
Jim Meyering <jim@meyering.net>
parents:
326
diff
changeset
|
337 me->me_dev = (dev_t) -1; /* Magic; means not known yet. */ |
| 5 | 338 |
| 339 /* Add to the linked list. */ | |
| 1413 | 340 *mtail = me; |
| 341 mtail = &me->me_next; | |
| 5 | 342 } |
| 343 | |
| 344 if (endmntent (fp) == 0) | |
| 1413 | 345 goto free_then_fail; |
| 5 | 346 } |
| 347 #endif /* MOUNTED_GETMNTENT1. */ | |
| 348 | |
| 349 #ifdef MOUNTED_GETMNTINFO /* 4.4BSD. */ | |
| 350 { | |
| 351 struct statfs *fsp; | |
| 352 int entries; | |
| 353 | |
| 354 entries = getmntinfo (&fsp, MNT_NOWAIT); | |
| 355 if (entries < 0) | |
| 356 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
|
357 for (; entries-- > 0; fsp++) |
| 5 | 358 { |
|
1444
8a70cc03ce0d
(read_filesystem_list) [MOUNTED_GETMNTINFO]: Use fsp_to_string.
Jim Meyering <jim@meyering.net>
parents:
1443
diff
changeset
|
359 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
|
360 |
|
4839
72b30d7ed3c6
Catch size calculation overflow problem on Alphas running OSF/1.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4716
diff
changeset
|
361 me = xmalloc (sizeof *me); |
| 5 | 362 me->me_devname = xstrdup (fsp->f_mntfromname); |
| 363 me->me_mountdir = xstrdup (fsp->f_mntonname); | |
|
1444
8a70cc03ce0d
(read_filesystem_list) [MOUNTED_GETMNTINFO]: Use fsp_to_string.
Jim Meyering <jim@meyering.net>
parents:
1443
diff
changeset
|
364 me->me_type = fs_type; |
|
4839
72b30d7ed3c6
Catch size calculation overflow problem on Alphas running OSF/1.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4716
diff
changeset
|
365 me->me_type_malloced = 0; |
|
1453
d5f389e692e8
(read_filesystem_list): Remove all_fs
Jim Meyering <jim@meyering.net>
parents:
1446
diff
changeset
|
366 me->me_dummy = ME_DUMMY (me->me_devname, me->me_type); |
|
d5f389e692e8
(read_filesystem_list): Remove all_fs
Jim Meyering <jim@meyering.net>
parents:
1446
diff
changeset
|
367 me->me_remote = ME_REMOTE (me->me_devname, me->me_type); |
|
492
33a21db1201a
(read_filesystem_list): Cast -1 to dev_t before assignment.
Jim Meyering <jim@meyering.net>
parents:
326
diff
changeset
|
368 me->me_dev = (dev_t) -1; /* Magic; means not known yet. */ |
| 5 | 369 |
| 370 /* Add to the linked list. */ | |
| 1413 | 371 *mtail = me; |
| 372 mtail = &me->me_next; | |
| 5 | 373 } |
| 374 } | |
| 375 #endif /* MOUNTED_GETMNTINFO */ | |
| 376 | |
| 377 #ifdef MOUNTED_GETMNT /* Ultrix. */ | |
| 378 { | |
| 379 int offset = 0; | |
| 380 int val; | |
| 381 struct fs_data fsd; | |
| 382 | |
| 1413 | 383 while (errno = 0, |
|
1476
2fc06b743001
(read_filesystem_list) [MOUNTED_GETMNT]: Don't infloop on getmnt(2) returning 0.
Jim Meyering <jim@meyering.net>
parents:
1453
diff
changeset
|
384 0 < (val = getmnt (&offset, &fsd, sizeof (fsd), NOSTAT_MANY, |
|
2fc06b743001
(read_filesystem_list) [MOUNTED_GETMNT]: Don't infloop on getmnt(2) returning 0.
Jim Meyering <jim@meyering.net>
parents:
1453
diff
changeset
|
385 (char *) 0))) |
| 5 | 386 { |
|
4839
72b30d7ed3c6
Catch size calculation overflow problem on Alphas running OSF/1.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4716
diff
changeset
|
387 me = xmalloc (sizeof *me); |
| 5 | 388 me->me_devname = xstrdup (fsd.fd_req.devname); |
| 389 me->me_mountdir = xstrdup (fsd.fd_req.path); | |
| 390 me->me_type = gt_names[fsd.fd_req.fstype]; | |
|
4839
72b30d7ed3c6
Catch size calculation overflow problem on Alphas running OSF/1.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4716
diff
changeset
|
391 me->me_type_malloced = 0; |
|
1453
d5f389e692e8
(read_filesystem_list): Remove all_fs
Jim Meyering <jim@meyering.net>
parents:
1446
diff
changeset
|
392 me->me_dummy = ME_DUMMY (me->me_devname, me->me_type); |
|
d5f389e692e8
(read_filesystem_list): Remove all_fs
Jim Meyering <jim@meyering.net>
parents:
1446
diff
changeset
|
393 me->me_remote = ME_REMOTE (me->me_devname, me->me_type); |
| 5 | 394 me->me_dev = fsd.fd_req.dev; |
| 395 | |
| 396 /* Add to the linked list. */ | |
| 1413 | 397 *mtail = me; |
| 398 mtail = &me->me_next; | |
| 5 | 399 } |
| 400 if (val < 0) | |
| 1413 | 401 goto free_then_fail; |
| 5 | 402 } |
| 403 #endif /* MOUNTED_GETMNT. */ | |
| 404 | |
|
3502
ebfd8c693504
Remove useless parentheses in #if directives.
Jim Meyering <jim@meyering.net>
parents:
2677
diff
changeset
|
405 #if defined MOUNTED_FS_STAT_DEV /* BeOS */ |
|
2453
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
406 { |
|
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
407 /* The next_dev() and fs_stat_dev() system calls give the list of |
| 5159 | 408 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
|
409 (fs type, total blocks, free blocks etc.), but without the mount |
| 5159 | 410 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
|
411 rootfs, directly under /. |
|
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
412 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
|
413 identical to the volume name of the device. |
|
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
414 We therefore get the list of subdirectories of /, and the list |
| 5159 | 415 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
|
416 |
|
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
417 DIR *dirp; |
|
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
418 struct rootdir_entry |
|
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
419 { |
|
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
420 char *name; |
|
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
421 dev_t dev; |
|
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
422 ino_t ino; |
|
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
423 struct rootdir_entry *next; |
|
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
424 }; |
|
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
425 struct rootdir_entry *rootdir_list; |
|
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
426 struct rootdir_entry **rootdir_tail; |
|
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
427 int32 pos; |
|
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
428 dev_t dev; |
|
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
429 fs_info fi; |
|
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
430 |
|
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
431 /* 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
|
432 rootdir_list = NULL; |
|
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
433 rootdir_tail = &rootdir_list; |
|
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
434 dirp = opendir ("/"); |
|
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
435 if (dirp) |
|
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
436 { |
|
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
437 struct dirent *d; |
|
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
438 |
|
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
439 while ((d = readdir (dirp)) != NULL) |
|
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
440 { |
|
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
441 char *name; |
|
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
442 struct stat statbuf; |
|
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
443 |
|
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
444 if (strcmp (d->d_name, "..") == 0) |
|
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
445 continue; |
|
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
446 |
|
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
447 if (strcmp (d->d_name, ".") == 0) |
|
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
448 name = xstrdup ("/"); |
|
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
449 else |
|
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
450 { |
|
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
451 name = xmalloc (1 + strlen (d->d_name) + 1); |
|
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
452 name[0] = '/'; |
|
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
453 strcpy (name + 1, d->d_name); |
|
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
454 } |
|
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
455 |
|
2677
a15fc2b3bc82
Use MOUNTED_FS_STAT_DEV instead of MOUNTED_NEXT_DEV,
Jim Meyering <jim@meyering.net>
parents:
2667
diff
changeset
|
456 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
|
457 { |
|
4839
72b30d7ed3c6
Catch size calculation overflow problem on Alphas running OSF/1.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4716
diff
changeset
|
458 struct rootdir_entry *re = xmalloc (sizeof *re); |
|
2453
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
459 re->name = name; |
|
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
460 re->dev = statbuf.st_dev; |
|
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
461 re->ino = statbuf.st_ino; |
|
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
462 |
|
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
463 /* Add to the linked list. */ |
|
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
464 *rootdir_tail = re; |
|
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
465 rootdir_tail = &re->next; |
|
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
466 } |
|
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
467 else |
|
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
468 free (name); |
|
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
469 } |
|
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
470 closedir (dirp); |
|
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
471 } |
|
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
472 *rootdir_tail = NULL; |
|
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
473 |
|
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
474 for (pos = 0; (dev = next_dev (&pos)) >= 0; ) |
|
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
475 if (fs_stat_dev (dev, &fi) >= 0) |
|
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
476 { |
|
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
477 /* Note: fi.dev == dev. */ |
|
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
478 struct rootdir_entry *re; |
|
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
479 |
|
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
480 for (re = rootdir_list; re; re = re->next) |
|
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
481 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
|
482 break; |
|
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
483 |
|
4839
72b30d7ed3c6
Catch size calculation overflow problem on Alphas running OSF/1.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4716
diff
changeset
|
484 me = xmalloc (sizeof *me); |
|
2453
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
485 me->me_devname = xstrdup (fi.device_name[0] != '\0' ? fi.device_name : fi.fsh_name); |
|
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
486 me->me_mountdir = xstrdup (re != NULL ? re->name : fi.fsh_name); |
|
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
487 me->me_type = xstrdup (fi.fsh_name); |
|
4839
72b30d7ed3c6
Catch size calculation overflow problem on Alphas running OSF/1.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4716
diff
changeset
|
488 me->me_type_malloced = 1; |
|
2453
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
489 me->me_dev = fi.dev; |
|
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
490 me->me_dummy = 0; |
|
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
491 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
|
492 |
|
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
493 /* Add to the linked list. */ |
|
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
494 *mtail = me; |
|
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
495 mtail = &me->me_next; |
|
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
496 } |
|
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
497 *mtail = NULL; |
|
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
498 |
|
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
499 while (rootdir_list != NULL) |
|
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
500 { |
|
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
501 struct rootdir_entry *re = rootdir_list; |
|
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
502 rootdir_list = re->next; |
|
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
503 free (re->name); |
|
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
504 free (re); |
|
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
505 } |
|
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
506 } |
|
2677
a15fc2b3bc82
Use MOUNTED_FS_STAT_DEV instead of MOUNTED_NEXT_DEV,
Jim Meyering <jim@meyering.net>
parents:
2667
diff
changeset
|
507 #endif /* MOUNTED_FS_STAT_DEV */ |
|
2453
f3784b04894c
(read_filesystem_list): Add BeOS support.
Jim Meyering <jim@meyering.net>
parents:
1887
diff
changeset
|
508 |
|
3502
ebfd8c693504
Remove useless parentheses in #if directives.
Jim Meyering <jim@meyering.net>
parents:
2677
diff
changeset
|
509 #if defined MOUNTED_GETFSSTAT /* __alpha running OSF_1 */ |
| 326 | 510 { |
|
4839
72b30d7ed3c6
Catch size calculation overflow problem on Alphas running OSF/1.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4716
diff
changeset
|
511 int numsys, counter; |
|
72b30d7ed3c6
Catch size calculation overflow problem on Alphas running OSF/1.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4716
diff
changeset
|
512 size_t bufsize; |
| 326 | 513 struct statfs *stats; |
| 514 | |
|
4548
a61e996662a3
Merge mountlist changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4287
diff
changeset
|
515 numsys = getfsstat ((struct statfs *)0, 0L, MNT_NOWAIT); |
| 326 | 516 if (numsys < 0) |
| 517 return (NULL); | |
|
4839
72b30d7ed3c6
Catch size calculation overflow problem on Alphas running OSF/1.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4716
diff
changeset
|
518 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
|
519 xalloc_die (); |
| 326 | 520 |
|
4839
72b30d7ed3c6
Catch size calculation overflow problem on Alphas running OSF/1.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4716
diff
changeset
|
521 bufsize = (1 + numsys) * sizeof *stats; |
|
4548
a61e996662a3
Merge mountlist changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4287
diff
changeset
|
522 stats = xmalloc (bufsize); |
|
a61e996662a3
Merge mountlist changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4287
diff
changeset
|
523 numsys = getfsstat (stats, bufsize, MNT_NOWAIT); |
| 326 | 524 |
| 525 if (numsys < 0) | |
| 526 { | |
| 527 free (stats); | |
| 528 return (NULL); | |
| 529 } | |
| 530 | |
| 531 for (counter = 0; counter < numsys; counter++) | |
| 532 { | |
|
4839
72b30d7ed3c6
Catch size calculation overflow problem on Alphas running OSF/1.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4716
diff
changeset
|
533 me = xmalloc (sizeof *me); |
| 326 | 534 me->me_devname = xstrdup (stats[counter].f_mntfromname); |
| 535 me->me_mountdir = xstrdup (stats[counter].f_mntonname); | |
| 3537 | 536 me->me_type = xstrdup (FS_TYPE (stats[counter])); |
|
4839
72b30d7ed3c6
Catch size calculation overflow problem on Alphas running OSF/1.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4716
diff
changeset
|
537 me->me_type_malloced = 1; |
|
1453
d5f389e692e8
(read_filesystem_list): Remove all_fs
Jim Meyering <jim@meyering.net>
parents:
1446
diff
changeset
|
538 me->me_dummy = ME_DUMMY (me->me_devname, me->me_type); |
|
d5f389e692e8
(read_filesystem_list): Remove all_fs
Jim Meyering <jim@meyering.net>
parents:
1446
diff
changeset
|
539 me->me_remote = ME_REMOTE (me->me_devname, me->me_type); |
|
492
33a21db1201a
(read_filesystem_list): Cast -1 to dev_t before assignment.
Jim Meyering <jim@meyering.net>
parents:
326
diff
changeset
|
540 me->me_dev = (dev_t) -1; /* Magic; means not known yet. */ |
| 326 | 541 |
| 542 /* Add to the linked list. */ | |
| 1413 | 543 *mtail = me; |
| 544 mtail = &me->me_next; | |
| 326 | 545 } |
| 546 | |
| 547 free (stats); | |
| 548 } | |
| 549 #endif /* MOUNTED_GETFSSTAT */ | |
| 550 | |
|
3502
ebfd8c693504
Remove useless parentheses in #if directives.
Jim Meyering <jim@meyering.net>
parents:
2677
diff
changeset
|
551 #if defined MOUNTED_FREAD || defined MOUNTED_FREAD_FSTYP /* SVR[23]. */ |
| 5 | 552 { |
| 553 struct mnttab mnt; | |
| 554 char *table = "/etc/mnttab"; | |
| 555 FILE *fp; | |
| 556 | |
| 557 fp = fopen (table, "r"); | |
| 558 if (fp == NULL) | |
| 559 return NULL; | |
| 560 | |
| 561 while (fread (&mnt, sizeof mnt, 1, fp) > 0) | |
| 562 { | |
|
4839
72b30d7ed3c6
Catch size calculation overflow problem on Alphas running OSF/1.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4716
diff
changeset
|
563 me = xmalloc (sizeof *me); |
| 917 | 564 # ifdef GETFSTYP /* SVR3. */ |
| 5 | 565 me->me_devname = xstrdup (mnt.mt_dev); |
| 917 | 566 # else |
| 5 | 567 me->me_devname = xmalloc (strlen (mnt.mt_dev) + 6); |
| 568 strcpy (me->me_devname, "/dev/"); | |
| 569 strcpy (me->me_devname + 5, mnt.mt_dev); | |
| 917 | 570 # endif |
| 5 | 571 me->me_mountdir = xstrdup (mnt.mt_filsys); |
|
492
33a21db1201a
(read_filesystem_list): Cast -1 to dev_t before assignment.
Jim Meyering <jim@meyering.net>
parents:
326
diff
changeset
|
572 me->me_dev = (dev_t) -1; /* Magic; means not known yet. */ |
|
1453
d5f389e692e8
(read_filesystem_list): Remove all_fs
Jim Meyering <jim@meyering.net>
parents:
1446
diff
changeset
|
573 me->me_type = ""; |
|
4839
72b30d7ed3c6
Catch size calculation overflow problem on Alphas running OSF/1.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4716
diff
changeset
|
574 me->me_type_malloced = 0; |
|
1453
d5f389e692e8
(read_filesystem_list): Remove all_fs
Jim Meyering <jim@meyering.net>
parents:
1446
diff
changeset
|
575 # ifdef GETFSTYP /* SVR3. */ |
|
d5f389e692e8
(read_filesystem_list): Remove all_fs
Jim Meyering <jim@meyering.net>
parents:
1446
diff
changeset
|
576 if (need_fs_type) |
|
d5f389e692e8
(read_filesystem_list): Remove all_fs
Jim Meyering <jim@meyering.net>
parents:
1446
diff
changeset
|
577 { |
|
d5f389e692e8
(read_filesystem_list): Remove all_fs
Jim Meyering <jim@meyering.net>
parents:
1446
diff
changeset
|
578 struct statfs fsd; |
|
d5f389e692e8
(read_filesystem_list): Remove all_fs
Jim Meyering <jim@meyering.net>
parents:
1446
diff
changeset
|
579 char typebuf[FSTYPSZ]; |
|
d5f389e692e8
(read_filesystem_list): Remove all_fs
Jim Meyering <jim@meyering.net>
parents:
1446
diff
changeset
|
580 |
|
d5f389e692e8
(read_filesystem_list): Remove all_fs
Jim Meyering <jim@meyering.net>
parents:
1446
diff
changeset
|
581 if (statfs (me->me_mountdir, &fsd, sizeof fsd, 0) != -1 |
|
d5f389e692e8
(read_filesystem_list): Remove all_fs
Jim Meyering <jim@meyering.net>
parents:
1446
diff
changeset
|
582 && sysfs (GETFSTYP, fsd.f_fstyp, typebuf) != -1) |
|
4839
72b30d7ed3c6
Catch size calculation overflow problem on Alphas running OSF/1.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4716
diff
changeset
|
583 { |
|
72b30d7ed3c6
Catch size calculation overflow problem on Alphas running OSF/1.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4716
diff
changeset
|
584 me->me_type = xstrdup (typebuf); |
|
72b30d7ed3c6
Catch size calculation overflow problem on Alphas running OSF/1.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4716
diff
changeset
|
585 me->me_type_malloced = 1; |
|
72b30d7ed3c6
Catch size calculation overflow problem on Alphas running OSF/1.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4716
diff
changeset
|
586 } |
|
1453
d5f389e692e8
(read_filesystem_list): Remove all_fs
Jim Meyering <jim@meyering.net>
parents:
1446
diff
changeset
|
587 } |
|
d5f389e692e8
(read_filesystem_list): Remove all_fs
Jim Meyering <jim@meyering.net>
parents:
1446
diff
changeset
|
588 # endif |
|
d5f389e692e8
(read_filesystem_list): Remove all_fs
Jim Meyering <jim@meyering.net>
parents:
1446
diff
changeset
|
589 me->me_dummy = ME_DUMMY (me->me_devname, me->me_type); |
|
d5f389e692e8
(read_filesystem_list): Remove all_fs
Jim Meyering <jim@meyering.net>
parents:
1446
diff
changeset
|
590 me->me_remote = ME_REMOTE (me->me_devname, me->me_type); |
| 5 | 591 |
| 592 /* Add to the linked list. */ | |
| 1413 | 593 *mtail = me; |
| 594 mtail = &me->me_next; | |
| 595 } | |
| 596 | |
| 597 if (ferror (fp)) | |
| 598 { | |
|
4716
da9adb0ac598
Comment about the validity of errno.
Bruno Haible <bruno@clisp.org>
parents:
4666
diff
changeset
|
599 /* The last fread() call must have failed. */ |
| 1413 | 600 int saved_errno = errno; |
| 601 fclose (fp); | |
| 602 errno = saved_errno; | |
| 603 goto free_then_fail; | |
| 5 | 604 } |
| 605 | |
| 606 if (fclose (fp) == EOF) | |
| 1413 | 607 goto free_then_fail; |
| 5 | 608 } |
| 609 #endif /* MOUNTED_FREAD || MOUNTED_FREAD_FSTYP. */ | |
| 610 | |
| 326 | 611 #ifdef MOUNTED_GETMNTTBL /* DolphinOS goes it's own way */ |
| 612 { | |
|
4548
a61e996662a3
Merge mountlist changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4287
diff
changeset
|
613 struct mntent **mnttbl = getmnttbl (), **ent; |
| 326 | 614 for (ent=mnttbl;*ent;ent++) |
| 615 { | |
|
4839
72b30d7ed3c6
Catch size calculation overflow problem on Alphas running OSF/1.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4716
diff
changeset
|
616 me = xmalloc (sizeof *me); |
| 326 | 617 me->me_devname = xstrdup ( (*ent)->mt_resource); |
|
4548
a61e996662a3
Merge mountlist changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4287
diff
changeset
|
618 me->me_mountdir = xstrdup ( (*ent)->mt_directory); |
|
4839
72b30d7ed3c6
Catch size calculation overflow problem on Alphas running OSF/1.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4716
diff
changeset
|
619 me->me_type = xstrdup ((*ent)->mt_fstype); |
|
72b30d7ed3c6
Catch size calculation overflow problem on Alphas running OSF/1.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4716
diff
changeset
|
620 me->me_type_malloced = 1; |
|
1453
d5f389e692e8
(read_filesystem_list): Remove all_fs
Jim Meyering <jim@meyering.net>
parents:
1446
diff
changeset
|
621 me->me_dummy = ME_DUMMY (me->me_devname, me->me_type); |
|
d5f389e692e8
(read_filesystem_list): Remove all_fs
Jim Meyering <jim@meyering.net>
parents:
1446
diff
changeset
|
622 me->me_remote = ME_REMOTE (me->me_devname, me->me_type); |
|
492
33a21db1201a
(read_filesystem_list): Cast -1 to dev_t before assignment.
Jim Meyering <jim@meyering.net>
parents:
326
diff
changeset
|
623 me->me_dev = (dev_t) -1; /* Magic; means not known yet. */ |
| 326 | 624 |
| 625 /* Add to the linked list. */ | |
| 1413 | 626 *mtail = me; |
| 627 mtail = &me->me_next; | |
| 326 | 628 } |
|
4548
a61e996662a3
Merge mountlist changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4287
diff
changeset
|
629 endmnttbl (); |
| 326 | 630 } |
| 631 #endif | |
| 632 | |
| 5 | 633 #ifdef MOUNTED_GETMNTENT2 /* SVR4. */ |
| 634 { | |
| 635 struct mnttab mnt; | |
| 636 char *table = MNTTAB; | |
| 637 FILE *fp; | |
| 638 int ret; | |
|
1399
edb0581923b9
(read_filesystem_list): If SVR4, lock /etc/.mnttab.lock if available,
Jim Meyering <jim@meyering.net>
parents:
1396
diff
changeset
|
639 int lockfd = -1; |
|
edb0581923b9
(read_filesystem_list): If SVR4, lock /etc/.mnttab.lock if available,
Jim Meyering <jim@meyering.net>
parents:
1396
diff
changeset
|
640 |
|
edb0581923b9
(read_filesystem_list): If SVR4, lock /etc/.mnttab.lock if available,
Jim Meyering <jim@meyering.net>
parents:
1396
diff
changeset
|
641 # 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
|
642 /* 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
|
643 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
|
644 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
|
645 (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
|
646 # ifndef MNTTAB_LOCK |
|
edb0581923b9
(read_filesystem_list): If SVR4, lock /etc/.mnttab.lock if available,
Jim Meyering <jim@meyering.net>
parents:
1396
diff
changeset
|
647 # 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
|
648 # endif |
|
edb0581923b9
(read_filesystem_list): If SVR4, lock /etc/.mnttab.lock if available,
Jim Meyering <jim@meyering.net>
parents:
1396
diff
changeset
|
649 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
|
650 if (0 <= lockfd) |
|
edb0581923b9
(read_filesystem_list): If SVR4, lock /etc/.mnttab.lock if available,
Jim Meyering <jim@meyering.net>
parents:
1396
diff
changeset
|
651 { |
|
edb0581923b9
(read_filesystem_list): If SVR4, lock /etc/.mnttab.lock if available,
Jim Meyering <jim@meyering.net>
parents:
1396
diff
changeset
|
652 struct flock flock; |
|
edb0581923b9
(read_filesystem_list): If SVR4, lock /etc/.mnttab.lock if available,
Jim Meyering <jim@meyering.net>
parents:
1396
diff
changeset
|
653 flock.l_type = F_RDLCK; |
|
edb0581923b9
(read_filesystem_list): If SVR4, lock /etc/.mnttab.lock if available,
Jim Meyering <jim@meyering.net>
parents:
1396
diff
changeset
|
654 flock.l_whence = SEEK_SET; |
|
edb0581923b9
(read_filesystem_list): If SVR4, lock /etc/.mnttab.lock if available,
Jim Meyering <jim@meyering.net>
parents:
1396
diff
changeset
|
655 flock.l_start = 0; |
|
edb0581923b9
(read_filesystem_list): If SVR4, lock /etc/.mnttab.lock if available,
Jim Meyering <jim@meyering.net>
parents:
1396
diff
changeset
|
656 flock.l_len = 0; |
|
edb0581923b9
(read_filesystem_list): If SVR4, lock /etc/.mnttab.lock if available,
Jim Meyering <jim@meyering.net>
parents:
1396
diff
changeset
|
657 while (fcntl (lockfd, F_SETLKW, &flock) == -1) |
|
edb0581923b9
(read_filesystem_list): If SVR4, lock /etc/.mnttab.lock if available,
Jim Meyering <jim@meyering.net>
parents:
1396
diff
changeset
|
658 if (errno != EINTR) |
| 1413 | 659 { |
| 660 int saved_errno = errno; | |
| 661 close (lockfd); | |
| 662 errno = saved_errno; | |
| 663 return NULL; | |
| 664 } | |
|
1399
edb0581923b9
(read_filesystem_list): If SVR4, lock /etc/.mnttab.lock if available,
Jim Meyering <jim@meyering.net>
parents:
1396
diff
changeset
|
665 } |
| 1413 | 666 else if (errno != ENOENT) |
| 667 return NULL; | |
|
1399
edb0581923b9
(read_filesystem_list): If SVR4, lock /etc/.mnttab.lock if available,
Jim Meyering <jim@meyering.net>
parents:
1396
diff
changeset
|
668 # endif |
| 5 | 669 |
| 1413 | 670 errno = 0; |
| 5 | 671 fp = fopen (table, "r"); |
| 672 if (fp == NULL) | |
| 1413 | 673 ret = errno; |
| 1401 | 674 else |
|
1400
8e5de8bcae9f
(read_filesystem_list) [MOUNTED_GETMNTENT2]:
Jim Meyering <jim@meyering.net>
parents:
1399
diff
changeset
|
675 { |
| 1401 | 676 while ((ret = getmntent (fp, &mnt)) == 0) |
| 677 { | |
|
4839
72b30d7ed3c6
Catch size calculation overflow problem on Alphas running OSF/1.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4716
diff
changeset
|
678 me = xmalloc (sizeof *me); |
| 1401 | 679 me->me_devname = xstrdup (mnt.mnt_special); |
| 680 me->me_mountdir = xstrdup (mnt.mnt_mountp); | |
| 681 me->me_type = xstrdup (mnt.mnt_fstype); | |
|
4839
72b30d7ed3c6
Catch size calculation overflow problem on Alphas running OSF/1.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4716
diff
changeset
|
682 me->me_type_malloced = 1; |
|
1453
d5f389e692e8
(read_filesystem_list): Remove all_fs
Jim Meyering <jim@meyering.net>
parents:
1446
diff
changeset
|
683 me->me_dummy = MNT_IGNORE (&mnt) != 0; |
|
d5f389e692e8
(read_filesystem_list): Remove all_fs
Jim Meyering <jim@meyering.net>
parents:
1446
diff
changeset
|
684 me->me_remote = ME_REMOTE (me->me_devname, me->me_type); |
| 1401 | 685 me->me_dev = (dev_t) -1; /* Magic; means not known yet. */ |
| 686 | |
| 687 /* Add to the linked list. */ | |
| 1413 | 688 *mtail = me; |
| 689 mtail = &me->me_next; | |
| 1401 | 690 } |
| 691 | |
| 1413 | 692 ret = fclose (fp) == EOF ? errno : 0 < ret ? 0 : -1; |
|
1400
8e5de8bcae9f
(read_filesystem_list) [MOUNTED_GETMNTENT2]:
Jim Meyering <jim@meyering.net>
parents:
1399
diff
changeset
|
693 } |
| 5 | 694 |
| 1401 | 695 if (0 <= lockfd && close (lockfd) != 0) |
| 1413 | 696 ret = errno; |
| 5 | 697 |
| 1413 | 698 if (0 <= ret) |
| 699 { | |
| 700 errno = ret; | |
| 701 goto free_then_fail; | |
| 702 } | |
| 5 | 703 } |
| 704 #endif /* MOUNTED_GETMNTENT2. */ | |
| 705 | |
| 706 #ifdef MOUNTED_VMOUNT /* AIX. */ | |
| 707 { | |
| 708 int bufsize; | |
| 709 char *entries, *thisent; | |
|
2570
70878b295de9
move vmp decl back out to the scope where it belongs
Jim Meyering <jim@meyering.net>
parents:
2553
diff
changeset
|
710 struct vmount *vmp; |
|
4287
0c926607b93d
Merge change from Coreutils.
Jim Meyering <jim@meyering.net>
parents:
3993
diff
changeset
|
711 int n_entries; |
|
0c926607b93d
Merge change from Coreutils.
Jim Meyering <jim@meyering.net>
parents:
3993
diff
changeset
|
712 int i; |
| 5 | 713 |
| 5159 | 714 /* Ask how many bytes to allocate for the mounted file system info. */ |
|
4287
0c926607b93d
Merge change from Coreutils.
Jim Meyering <jim@meyering.net>
parents:
3993
diff
changeset
|
715 if (mntctl (MCTL_QUERY, sizeof bufsize, (struct vmount *) &bufsize) != 0) |
|
0c926607b93d
Merge change from Coreutils.
Jim Meyering <jim@meyering.net>
parents:
3993
diff
changeset
|
716 return NULL; |
| 5 | 717 entries = xmalloc (bufsize); |
| 718 | |
| 5159 | 719 /* Get the list of mounted file systems. */ |
|
4287
0c926607b93d
Merge change from Coreutils.
Jim Meyering <jim@meyering.net>
parents:
3993
diff
changeset
|
720 n_entries = mntctl (MCTL_QUERY, bufsize, (struct vmount *) entries); |
|
0c926607b93d
Merge change from Coreutils.
Jim Meyering <jim@meyering.net>
parents:
3993
diff
changeset
|
721 if (n_entries < 0) |
|
0c926607b93d
Merge change from Coreutils.
Jim Meyering <jim@meyering.net>
parents:
3993
diff
changeset
|
722 { |
|
0c926607b93d
Merge change from Coreutils.
Jim Meyering <jim@meyering.net>
parents:
3993
diff
changeset
|
723 int saved_errno = errno; |
|
0c926607b93d
Merge change from Coreutils.
Jim Meyering <jim@meyering.net>
parents:
3993
diff
changeset
|
724 free (entries); |
|
0c926607b93d
Merge change from Coreutils.
Jim Meyering <jim@meyering.net>
parents:
3993
diff
changeset
|
725 errno = saved_errno; |
|
0c926607b93d
Merge change from Coreutils.
Jim Meyering <jim@meyering.net>
parents:
3993
diff
changeset
|
726 return NULL; |
|
0c926607b93d
Merge change from Coreutils.
Jim Meyering <jim@meyering.net>
parents:
3993
diff
changeset
|
727 } |
| 5 | 728 |
|
4287
0c926607b93d
Merge change from Coreutils.
Jim Meyering <jim@meyering.net>
parents:
3993
diff
changeset
|
729 for (i = 0, thisent = entries; |
|
0c926607b93d
Merge change from Coreutils.
Jim Meyering <jim@meyering.net>
parents:
3993
diff
changeset
|
730 i < n_entries; |
|
0c926607b93d
Merge change from Coreutils.
Jim Meyering <jim@meyering.net>
parents:
3993
diff
changeset
|
731 i++, thisent += vmp->vmt_length) |
| 5 | 732 { |
|
2550
3ce1a171e216
(read_filesystem_list) [MOUNTED_VMOUNT]: Ignore mounts
Jim Meyering <jim@meyering.net>
parents:
2453
diff
changeset
|
733 char *options, *ignore; |
|
3ce1a171e216
(read_filesystem_list) [MOUNTED_VMOUNT]: Ignore mounts
Jim Meyering <jim@meyering.net>
parents:
2453
diff
changeset
|
734 |
|
2553
d9a356ee2e12
Back out last change. Instead, do this...
Jim Meyering <jim@meyering.net>
parents:
2550
diff
changeset
|
735 vmp = (struct vmount *) thisent; |
|
4839
72b30d7ed3c6
Catch size calculation overflow problem on Alphas running OSF/1.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4716
diff
changeset
|
736 me = xmalloc (sizeof *me); |
| 5 | 737 if (vmp->vmt_flags & MNT_REMOTE) |
| 738 { | |
| 739 char *host, *path; | |
| 740 | |
|
1453
d5f389e692e8
(read_filesystem_list): Remove all_fs
Jim Meyering <jim@meyering.net>
parents:
1446
diff
changeset
|
741 me->me_remote = 1; |
| 5 | 742 /* Prepend the remote pathname. */ |
| 743 host = thisent + vmp->vmt_data[VMT_HOSTNAME].vmt_off; | |
| 744 path = thisent + vmp->vmt_data[VMT_OBJECT].vmt_off; | |
| 745 me->me_devname = xmalloc (strlen (host) + strlen (path) + 2); | |
| 746 strcpy (me->me_devname, host); | |
| 747 strcat (me->me_devname, ":"); | |
| 748 strcat (me->me_devname, path); | |
| 749 } | |
| 750 else | |
| 751 { | |
|
1453
d5f389e692e8
(read_filesystem_list): Remove all_fs
Jim Meyering <jim@meyering.net>
parents:
1446
diff
changeset
|
752 me->me_remote = 0; |
| 326 | 753 me->me_devname = xstrdup (thisent + |
| 5 | 754 vmp->vmt_data[VMT_OBJECT].vmt_off); |
| 755 } | |
| 756 me->me_mountdir = xstrdup (thisent + vmp->vmt_data[VMT_STUB].vmt_off); | |
| 757 me->me_type = xstrdup (fstype_to_string (vmp->vmt_gfstype)); | |
|
4839
72b30d7ed3c6
Catch size calculation overflow problem on Alphas running OSF/1.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4716
diff
changeset
|
758 me->me_type_malloced = 1; |
|
2553
d9a356ee2e12
Back out last change. Instead, do this...
Jim Meyering <jim@meyering.net>
parents:
2550
diff
changeset
|
759 options = thisent + vmp->vmt_data[VMT_ARGS].vmt_off; |
|
d9a356ee2e12
Back out last change. Instead, do this...
Jim Meyering <jim@meyering.net>
parents:
2550
diff
changeset
|
760 ignore = strstr (options, "ignore"); |
|
d9a356ee2e12
Back out last change. Instead, do this...
Jim Meyering <jim@meyering.net>
parents:
2550
diff
changeset
|
761 me->me_dummy = (ignore |
|
d9a356ee2e12
Back out last change. Instead, do this...
Jim Meyering <jim@meyering.net>
parents:
2550
diff
changeset
|
762 && (ignore == options || ignore[-1] == ',') |
|
d9a356ee2e12
Back out last change. Instead, do this...
Jim Meyering <jim@meyering.net>
parents:
2550
diff
changeset
|
763 && (ignore[sizeof "ignore" - 1] == ',' |
|
d9a356ee2e12
Back out last change. Instead, do this...
Jim Meyering <jim@meyering.net>
parents:
2550
diff
changeset
|
764 || ignore[sizeof "ignore" - 1] == '\0')); |
|
492
33a21db1201a
(read_filesystem_list): Cast -1 to dev_t before assignment.
Jim Meyering <jim@meyering.net>
parents:
326
diff
changeset
|
765 me->me_dev = (dev_t) -1; /* vmt_fsid might be the info we want. */ |
| 5 | 766 |
| 767 /* Add to the linked list. */ | |
| 1413 | 768 *mtail = me; |
| 769 mtail = &me->me_next; | |
| 5 | 770 } |
| 771 free (entries); | |
| 772 } | |
| 773 #endif /* MOUNTED_VMOUNT. */ | |
| 774 | |
| 1413 | 775 *mtail = NULL; |
| 5 | 776 return mount_list; |
| 1413 | 777 |
| 778 | |
| 779 free_then_fail: | |
| 780 { | |
| 781 int saved_errno = errno; | |
| 782 *mtail = NULL; | |
|
1436
5919c19d9a1a
(read_filesystem_list): Fix more memory leaks on failure.
Jim Meyering <jim@meyering.net>
parents:
1413
diff
changeset
|
783 |
| 1413 | 784 while (mount_list) |
| 785 { | |
| 786 me = mount_list->me_next; | |
|
1436
5919c19d9a1a
(read_filesystem_list): Fix more memory leaks on failure.
Jim Meyering <jim@meyering.net>
parents:
1413
diff
changeset
|
787 free (mount_list->me_devname); |
|
5919c19d9a1a
(read_filesystem_list): Fix more memory leaks on failure.
Jim Meyering <jim@meyering.net>
parents:
1413
diff
changeset
|
788 free (mount_list->me_mountdir); |
|
4839
72b30d7ed3c6
Catch size calculation overflow problem on Alphas running OSF/1.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4716
diff
changeset
|
789 if (mount_list->me_type_malloced) |
|
72b30d7ed3c6
Catch size calculation overflow problem on Alphas running OSF/1.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4716
diff
changeset
|
790 free (mount_list->me_type); |
| 1413 | 791 free (mount_list); |
| 792 mount_list = me; | |
| 793 } | |
| 794 | |
| 795 errno = saved_errno; | |
| 796 return NULL; | |
| 797 } | |
| 5 | 798 } |