diff options
| author |   kstailey <kstailey@openbsd.org> | 1997-06-20 14:40:00 +0000 |
|---|---|---|
| committer | kstailey <kstailey@openbsd.org> | 1997-06-20 14:40:00 +0000 |
| commit | b56b18d028df48fe757846928f05f22be52e1943 (patch) | |
| tree | ff7724126c071c436b2e8f47394bf22be6e85160 | |
| parent | Now that mount(2) sets errno to EFTYPE, not EINVAL for "invalid file system" (diff) | |
| download | wireguard-openbsd-b56b18d028df48fe757846928f05f22be52e1943.tar.xz wireguard-openbsd-b56b18d028df48fe757846928f05f22be52e1943.zip | |
Now that mount(2) sets errno to EFTYPE, not EINVAL for "invalid file system"
we can use NLS for the text, not a hardcode English message.
| -rw-r--r-- | sbin/mount_ext2fs/mount_ext2fs.c | 9 | ||||
| -rw-r--r-- | sbin/mount_msdos/mount_msdos.c | 9 |
2 files changed, 6 insertions, 12 deletions
diff --git a/sbin/mount_ext2fs/mount_ext2fs.c b/sbin/mount_ext2fs/mount_ext2fs.c index ed91b4147a7..9167520cfb5 100644 --- a/sbin/mount_ext2fs/mount_ext2fs.c +++ b/sbin/mount_ext2fs/mount_ext2fs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mount_ext2fs.c,v 1.4 1997/05/30 08:48:58 downsj Exp $ */ +/* $OpenBSD: mount_ext2fs.c,v 1.5 1997/06/20 14:40:00 kstailey Exp $ */ /* $NetBSD: mount_ffs.c,v 1.3 1996/04/13 01:31:19 jtc Exp $ */ /*- @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)mount_ufs.c 8.2 (Berkeley) 3/27/94"; #else -static char rcsid[] = "$OpenBSD: mount_ext2fs.c,v 1.4 1997/05/30 08:48:58 downsj Exp $"; +static char rcsid[] = "$OpenBSD: mount_ext2fs.c,v 1.5 1997/06/20 14:40:00 kstailey Exp $"; #endif #endif /* not lint */ @@ -111,11 +111,8 @@ main(argc, argv) errcause = "mount table full"; break; case EINVAL: - if (mntflags & MNT_UPDATE) - errcause = + errcause = "specified device does not match mounted device"; - else - errcause = "incorrect super block"; break; default: errcause = strerror(errno); diff --git a/sbin/mount_msdos/mount_msdos.c b/sbin/mount_msdos/mount_msdos.c index dd06fe3f167..8755d93c579 100644 --- a/sbin/mount_msdos/mount_msdos.c +++ b/sbin/mount_msdos/mount_msdos.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mount_msdos.c,v 1.9 1997/01/15 23:41:22 millert Exp $ */ +/* $OpenBSD: mount_msdos.c,v 1.10 1997/06/20 14:44:39 kstailey Exp $ */ /* $NetBSD: mount_msdos.c,v 1.16 1996/10/24 00:12:50 cgd Exp $ */ /* @@ -32,7 +32,7 @@ */ #ifndef lint -static char rcsid[] = "$OpenBSD: mount_msdos.c,v 1.9 1997/01/15 23:41:22 millert Exp $"; +static char rcsid[] = "$OpenBSD: mount_msdos.c,v 1.10 1997/06/20 14:44:39 kstailey Exp $"; #endif /* not lint */ #include <sys/cdefs.h> @@ -151,11 +151,8 @@ main(argc, argv) errcause = "mount table full"; break; case EINVAL: - if (mntflags & MNT_UPDATE) - errcause = + errcause = "specified device does not match mounted device"; - else - errcause = "incorrect super block"; break; default: errcause = strerror(errno); |