Skip to content

Commit 573b9ed

Browse files
author
perseant
committed
Regularize error reporting of mount_* commands for failure of mount(2)
to the form: mount_xxx: dev on dir: reason for failure
1 parent fa3b367 commit 573b9ed

File tree

13 files changed

+62
-41
lines changed

13 files changed

+62
-41
lines changed

‎sbin/mount_ados/mount_ados.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $NetBSD: mount_ados.c,v 1.8 1998/03/01 02:20:11 fvdl Exp $ */
1+
/* $NetBSD: mount_ados.c,v 1.9 1999/06/25 19:28:35 perseant Exp $ */
22

33
/*
44
* Copyright (c) 1994 Christopher G. Demetriou
@@ -32,7 +32,7 @@
3232

3333
#include <sys/cdefs.h>
3434
#ifndef lint
35-
__RCSID("$NetBSD: mount_ados.c,v 1.8 1998/03/01 02:20:11 fvdl Exp $");
35+
__RCSID("$NetBSD: mount_ados.c,v 1.9 1999/06/25 19:28:35 perseant Exp $");
3636
#endif /* not lint */
3737

3838
#include <sys/cdefs.h>
@@ -134,7 +134,7 @@ main(argc, argv)
134134
}
135135

136136
if (mount(MOUNT_ADOSFS, dir, mntflags, &args) < 0)
137-
err(1, "mount");
137+
err(1, "%s on %s", dev, dir);
138138

139139
exit (0);
140140
}

‎sbin/mount_cd9660/mount_cd9660.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $NetBSD: mount_cd9660.c,v 1.7 1999/05/28 10:10:25 mjl Exp $ */
1+
/* $NetBSD: mount_cd9660.c,v 1.8 1999/06/25 19:28:35 perseant Exp $ */
22

33
/*
44
* Copyright (c) 1992, 1993, 1994
@@ -50,7 +50,7 @@ __COPYRIGHT("@(#) Copyright (c) 1992, 1993, 1994\n\
5050
#if 0
5151
static char sccsid[] = "@(#)mount_cd9660.c 8.7 (Berkeley) 5/1/95";
5252
#else
53-
__RCSID("$NetBSD: mount_cd9660.c,v 1.7 1999/05/28 10:10:25 mjl Exp $");
53+
__RCSID("$NetBSD: mount_cd9660.c,v 1.8 1999/06/25 19:28:35 perseant Exp $");
5454
#endif
5555
#endif /* not lint */
5656

@@ -124,7 +124,7 @@ main(argc, argv)
124124
args.flags = opts;
125125

126126
if (mount(MOUNT_CD9660, dir, mntflags, &args) < 0)
127-
err(1, "%s", "");
127+
err(1, "%s on %s", dev, dir);
128128
exit(0);
129129
}
130130

‎sbin/mount_fdesc/mount_fdesc.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $NetBSD: mount_fdesc.c,v 1.9 1997/09/16 12:26:56 lukem Exp $ */
1+
/* $NetBSD: mount_fdesc.c,v 1.10 1999/06/25 19:28:36 perseant Exp $ */
22

33
/*
44
* Copyright (c) 1990, 1992 Jan-Simon Pendry
@@ -47,7 +47,7 @@ __COPYRIGHT("@(#) Copyright (c) 1992, 1993, 1994\n\
4747
#if 0
4848
static char sccsid[] = "@(#)mount_fdesc.c 8.3 (Berkeley) 4/26/95";
4949
#else
50-
__RCSID("$NetBSD: mount_fdesc.c,v 1.9 1997/09/16 12:26:56 lukem Exp $");
50+
__RCSID("$NetBSD: mount_fdesc.c,v 1.10 1999/06/25 19:28:36 perseant Exp $");
5151
#endif
5252
#endif /* not lint */
5353

@@ -94,7 +94,7 @@ main(argc, argv)
9494
usage();
9595

9696
if (mount(MOUNT_FDESC, argv[1], mntflags, NULL))
97-
err(1, "%s", "");
97+
err(1, "fdesc on %s", argv[1]);
9898
exit(0);
9999
}
100100

‎sbin/mount_filecore/mount_filecore.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $NetBSD: mount_filecore.c,v 1.1 1998/08/14 03:38:51 mark Exp $ */
1+
/* $NetBSD: mount_filecore.c,v 1.2 1999/06/25 19:28:36 perseant Exp $ */
22

33
/*
44
* Copyright (c) 1998 Andrew McMurry
@@ -138,7 +138,7 @@ main(argc, argv)
138138
args.flags = opts;
139139

140140
if (mount(MOUNT_FILECORE, dir, mntflags, &args) < 0)
141-
err(1, "%s", "");
141+
err(1, "%s on %s", dev, dir);
142142
exit(0);
143143
}
144144

‎sbin/mount_kernfs/mount_kernfs.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $NetBSD: mount_kernfs.c,v 1.10 1997/09/16 12:29:16 lukem Exp $ */
1+
/* $NetBSD: mount_kernfs.c,v 1.11 1999/06/25 19:28:36 perseant Exp $ */
22

33
/*
44
* Copyright (c) 1990, 1992 Jan-Simon Pendry
@@ -47,7 +47,7 @@ __COPYRIGHT("@(#) Copyright (c) 1992, 1993, 1994\n\
4747
#if 0
4848
static char sccsid[] = "@(#)mount_kernfs.c 8.3 (Berkeley) 5/4/95";
4949
#else
50-
__RCSID("$NetBSD: mount_kernfs.c,v 1.10 1997/09/16 12:29:16 lukem Exp $");
50+
__RCSID("$NetBSD: mount_kernfs.c,v 1.11 1999/06/25 19:28:36 perseant Exp $");
5151
#endif
5252
#endif /* not lint */
5353

@@ -94,7 +94,7 @@ main(argc, argv)
9494
usage();
9595

9696
if (mount(MOUNT_KERNFS, argv[1], mntflags, NULL))
97-
err(1, "%s", "");
97+
err(1, "kernfs on %s", argv[1]);
9898
exit(0);
9999
}
100100

‎sbin/mount_lfs/mount_lfs.c‎

Lines changed: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $NetBSD: mount_lfs.c,v 1.7 1998/03/01 02:20:41 fvdl Exp $ */
1+
/* $NetBSD: mount_lfs.c,v 1.8 1999/06/25 19:28:36 perseant Exp $ */
22

33
/*-
44
* Copyright (c) 1993, 1994
@@ -43,7 +43,7 @@ __COPYRIGHT("@(#) Copyright (c) 1993, 1994\n\
4343
#if 0
4444
static char sccsid[] = "@(#)mount_lfs.c 8.4 (Berkeley) 4/26/95";
4545
#else
46-
__RCSID("$NetBSD: mount_lfs.c,v 1.7 1998/03/01 02:20:41 fvdl Exp $");
46+
__RCSID("$NetBSD: mount_lfs.c,v 1.8 1999/06/25 19:28:36 perseant Exp $");
4747
#endif
4848
#endif /* not lint */
4949

@@ -53,6 +53,7 @@ __RCSID("$NetBSD: mount_lfs.c,v 1.7 1998/03/01 02:20:41 fvdl Exp $");
5353
#include <ufs/ufs/ufsmount.h>
5454

5555
#include <err.h>
56+
#include <errno.h>
5657
#include <stdio.h>
5758
#include <stdlib.h>
5859
#include <string.h>
@@ -81,6 +82,7 @@ main(argc, argv)
8182
struct ufs_args args;
8283
int ch, mntflags, noclean;
8384
char *fs_name, *options;
85+
const char *errcause;
8486

8587
options = NULL;
8688
mntflags = noclean = 0;
@@ -108,7 +110,7 @@ main(argc, argv)
108110
if (argc != 2)
109111
usage();
110112

111-
args.fspec = argv[0]; /* the name of the device file */
113+
args.fspec = argv[0]; /* the name of the device file */
112114
fs_name = argv[1]; /* the mount point */
113115

114116
#define DEFAULT_ROOTUID -2
@@ -118,8 +120,24 @@ main(argc, argv)
118120
else
119121
args.export.ex_flags = 0;
120122

121-
if (mount(MOUNT_LFS, fs_name, mntflags, &args))
122-
err(1, "%s", "");
123+
if (mount(MOUNT_LFS, fs_name, mntflags, &args)) {
124+
switch (errno) {
125+
case EMFILE:
126+
errcause = "mount table full";
127+
break;
128+
case EINVAL:
129+
if (mntflags & MNT_UPDATE)
130+
errcause =
131+
"specified device does not match mounted device";
132+
else
133+
errcause = "incorrect super block";
134+
break;
135+
default:
136+
errcause = strerror(errno);
137+
break;
138+
}
139+
errx(1, "%s on %s: %s", args.fspec, fs_name, errcause);
140+
}
123141

124142
if (!noclean)
125143
invoke_cleaner(fs_name);

‎sbin/mount_msdos/mount_msdos.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $NetBSD: mount_msdos.c,v 1.19 1998/03/01 02:20:45 fvdl Exp $ */
1+
/* $NetBSD: mount_msdos.c,v 1.20 1999/06/25 19:28:36 perseant Exp $ */
22

33
/*
44
* Copyright (c) 1994 Christopher G. Demetriou
@@ -32,7 +32,7 @@
3232

3333
#include <sys/cdefs.h>
3434
#ifndef lint
35-
__RCSID("$NetBSD: mount_msdos.c,v 1.19 1998/03/01 02:20:45 fvdl Exp $");
35+
__RCSID("$NetBSD: mount_msdos.c,v 1.20 1999/06/25 19:28:36 perseant Exp $");
3636
#endif /* not lint */
3737

3838
#include <sys/cdefs.h>
@@ -146,7 +146,7 @@ main(argc, argv)
146146
}
147147

148148
if (mount(MOUNT_MSDOS, dir, mntflags, &args) < 0)
149-
err(1, "mount");
149+
err(1, "%s on %s", dev, dir);
150150

151151
exit (0);
152152
}

‎sbin/mount_nfs/mount_nfs.c‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $NetBSD: mount_nfs.c,v 1.22 1998/05/14 07:44:09 tron Exp $ */
1+
/* $NetBSD: mount_nfs.c,v 1.23 1999/06/25 19:28:37 perseant Exp $ */
22

33
/*
44
* Copyright (c) 1992, 1993, 1994
@@ -46,7 +46,7 @@ __COPYRIGHT("@(#) Copyright (c) 1992, 1993, 1994\n\
4646
#if 0
4747
static char sccsid[] = "@(#)mount_nfs.c 8.11 (Berkeley) 5/4/95";
4848
#else
49-
__RCSID("$NetBSD: mount_nfs.c,v 1.22 1998/05/14 07:44:09 tron Exp $");
49+
__RCSID("$NetBSD: mount_nfs.c,v 1.23 1999/06/25 19:28:37 perseant Exp $");
5050
#endif
5151
#endif /* not lint */
5252

@@ -205,7 +205,7 @@ main(argc, argv)
205205
struct nfs_args nfsargs;
206206
struct nfsd_cargs ncd;
207207
int mntflags, altflags, i, nfssvc_flag, num;
208-
char *name, *p, *spec;
208+
char *name, *p, *spec, *ospec;
209209
#ifdef NFSKERB
210210
uid_t last_ruid;
211211

@@ -431,11 +431,14 @@ main(argc, argv)
431431

432432
spec = *argv++;
433433
name = *argv;
434+
if((ospec = strdup(spec))==NULL) {
435+
err(1,"strdup");
436+
}
434437

435438
if (!getnfsargs(spec, nfsargsp))
436439
exit(1);
437440
if (mount(MOUNT_NFS, name, mntflags, nfsargsp))
438-
err(1, "%s", name);
441+
err(1, "%s on %s", ospec, name);
439442
if (nfsargsp->flags & (NFSMNT_NQNFS | NFSMNT_KERB)) {
440443
if ((opflags & ISBGRND) == 0) {
441444
if ((i = fork()) != 0) {

‎sbin/mount_ntfs/mount_ntfs.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $NetBSD: mount_ntfs.c,v 1.2 1999/05/06 16:08:55 christos Exp $ */
1+
/* $NetBSD: mount_ntfs.c,v 1.3 1999/06/25 19:28:37 perseant Exp $ */
22

33
/*
44
* Copyright (c) 1994 Christopher G. Demetriou
@@ -35,7 +35,7 @@
3535
*/
3636
#include <sys/cdefs.h>
3737
#ifndef lint
38-
__RCSID("$NetBSD: mount_ntfs.c,v 1.2 1999/05/06 16:08:55 christos Exp $");
38+
__RCSID("$NetBSD: mount_ntfs.c,v 1.3 1999/06/25 19:28:37 perseant Exp $");
3939
#endif
4040

4141
#include <sys/cdefs.h>
@@ -187,7 +187,7 @@ main(argc, argv)
187187
#else
188188
if (mount(MOUNT_NTFS, dir, mntflags, &args) < 0)
189189
#endif
190-
err(EX_OSERR, "%s", dev);
190+
err(EX_OSERR, "%s on %s", dev, dir);
191191

192192
exit (0);
193193
}

‎sbin/mount_null/mount_null.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $NetBSD: mount_null.c,v 1.5 1997/09/16 12:31:02 lukem Exp $ */
1+
/* $NetBSD: mount_null.c,v 1.6 1999/06/25 19:28:37 perseant Exp $ */
22

33
/*
44
* Copyright (c) 1992, 1993, 1994
@@ -46,7 +46,7 @@ __COPYRIGHT("@(#) Copyright (c) 1992, 1993, 1994\n\
4646
#if 0
4747
static char sccsid[] = "@(#)mount_null.c 8.6 (Berkeley) 4/26/95";
4848
#else
49-
__RCSID("$NetBSD: mount_null.c,v 1.5 1997/09/16 12:31:02 lukem Exp $");
49+
__RCSID("$NetBSD: mount_null.c,v 1.6 1999/06/25 19:28:37 perseant Exp $");
5050
#endif
5151
#endif /* not lint */
5252

@@ -106,7 +106,7 @@ main(argc, argv)
106106
args.target = target;
107107

108108
if (mount(MOUNT_NULL, argv[1], mntflags, &args))
109-
err(1, "%s", "");
109+
err(1, "%s on %s", target, argv[1]);
110110
exit(0);
111111
}
112112

0 commit comments

Comments
 (0)