summaryrefslogtreecommitdiff
path: root/sbin/fsck_ext2fs
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2015-10-14 14:33:46 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2015-10-14 14:33:46 +0000
commite9e3890d5f6f8ad7e6418d99a04881cd69e43fed (patch)
tree3876c2f4ed3925569b3c203e779c7b64c326cdee /sbin/fsck_ext2fs
parent71e350f4c80a88e567c8186bf97f751f6460b22c (diff)
Only accept one filesystem/device as argument for checking. Few people
will be calling these directly, and not for the multiple filesystem case. fsck(8) is generally the parent and will handle things. ok semarie; this change will also help a goal jsing has
Diffstat (limited to 'sbin/fsck_ext2fs')
-rw-r--r--sbin/fsck_ext2fs/fsck_ext2fs.816
-rw-r--r--sbin/fsck_ext2fs/main.c9
2 files changed, 12 insertions, 13 deletions
diff --git a/sbin/fsck_ext2fs/fsck_ext2fs.8 b/sbin/fsck_ext2fs/fsck_ext2fs.8
index 71cfd1a3fe3..012b0fd1f95 100644
--- a/sbin/fsck_ext2fs/fsck_ext2fs.8
+++ b/sbin/fsck_ext2fs/fsck_ext2fs.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: fsck_ext2fs.8,v 1.17 2015/07/27 18:46:19 jmc Exp $
+.\" $OpenBSD: fsck_ext2fs.8,v 1.18 2015/10/14 14:33:45 deraadt Exp $
.\" $NetBSD: fsck_ext2fs.8,v 1.1 1997/06/11 11:21:48 bouyer Exp $
.\"
.\" Copyright (c) 1997 Manuel Bouyer.
@@ -31,7 +31,7 @@
.\"
.\" @(#)fsck.8 8.3 (Berkeley) 11/29/94
.\"
-.Dd $Mdocdate: July 27 2015 $
+.Dd $Mdocdate: October 14 2015 $
.Dt FSCK_EXT2FS 8
.Os
.Sh NAME
@@ -42,11 +42,11 @@
.Op Fl dfnpy
.Op Fl b Ar block#
.Op Fl m Ar mode
-.Ar filesystem ...
+.Ar filesystem
.Sh DESCRIPTION
.Nm
-performs interactive file system consistency checks and repairs for each of
-the file systems specified.
+performs interactive file system consistency checks and repairs
+the filesystem specified.
It is normally invoked from
.Xr fsck 8 .
.Pp
@@ -93,7 +93,7 @@ Without the
.Fl p
option,
.Nm
-audits and interactively repairs inconsistent conditions for file systems.
+audits and interactively repairs inconsistent conditions for the filesystem.
If the file system is inconsistent, the operator is prompted for concurrence
before each correction is attempted.
It should be noted that some of the corrective actions which are not
@@ -123,7 +123,7 @@ Block 8193 is usually an alternate super block.
.It Fl d
Print debugging output.
.It Fl f
-Force checking of file systems.
+Force checking of the filesystem.
Normally, if a file system is cleanly unmounted, the kernel will set a
.Dq clean flag
in the file system superblock and
@@ -150,7 +150,7 @@ response to all questions asked by
except for
.Dq CONTINUE? ,
which is assumed to be affirmative.
-File systems will not be opened for writing.
+The filesystem will not be opened for writing.
This is the default for file systems to be checked that are
concurrently mounted writable.
.It Fl p
diff --git a/sbin/fsck_ext2fs/main.c b/sbin/fsck_ext2fs/main.c
index a4c3e2baa20..90406108f7b 100644
--- a/sbin/fsck_ext2fs/main.c
+++ b/sbin/fsck_ext2fs/main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: main.c,v 1.22 2015/02/07 02:09:13 deraadt Exp $ */
+/* $OpenBSD: main.c,v 1.23 2015/10/14 14:33:45 deraadt Exp $ */
/* $NetBSD: main.c,v 1.1 1997/06/11 11:21:50 bouyer Exp $ */
/*
@@ -111,7 +111,7 @@ main(int argc, char *argv[])
argc -= optind;
argv += optind;
- if (!argc)
+ if (argc != 1)
usage();
if (signal(SIGINT, SIG_IGN) != SIG_IGN)
@@ -119,8 +119,7 @@ main(int argc, char *argv[])
if (preen)
(void)signal(SIGQUIT, catchquit);
- while (argc-- > 0)
- (void)checkfilesys(blockcheck(*argv++), 0, 0L, 0);
+ (void)checkfilesys(blockcheck(*argv), 0, 0L, 0);
if (returntosingle)
ret = 2;
@@ -303,7 +302,7 @@ usage(void)
extern char *__progname;
(void) fprintf(stderr,
- "usage: %s [-dfnpy] [-b block#] [-m mode] filesystem ...\n",
+ "usage: %s [-dfnpy] [-b block#] [-m mode] filesystem\n",
__progname);
exit(1);
}