summaryrefslogtreecommitdiffstats
path: root/sbin
diff options
context:
space:
mode:
authorbde <bde@FreeBSD.org>1997-03-12 16:46:32 +0000
committerbde <bde@FreeBSD.org>1997-03-12 16:46:32 +0000
commit70568e2da562c7eac7e830b32464e20cdef294b0 (patch)
treeef74c383bdec757a0e99a405d24fe33e7a4434bf /sbin
parent948d236d70c59075dd07b58f513f045a3c0bbf15 (diff)
downloadFreeBSD-src-70568e2da562c7eac7e830b32464e20cdef294b0.zip
FreeBSD-src-70568e2da562c7eac7e830b32464e20cdef294b0.tar.gz
Finished (?) merging with Lite2: cleaned up #include mess.
Updated getopt() usage.
Diffstat (limited to 'sbin')
-rw-r--r--sbin/fsck/main.c8
-rw-r--r--sbin/fsck_ffs/main.c8
-rw-r--r--sbin/fsck_ifs/main.c8
3 files changed, 3 insertions, 21 deletions
diff --git a/sbin/fsck/main.c b/sbin/fsck/main.c
index b658831..b7343da 100644
--- a/sbin/fsck/main.c
+++ b/sbin/fsck/main.c
@@ -43,7 +43,6 @@ static const char sccsid[] = "@(#)main.c 8.6 (Berkeley) 5/14/95";
#include <sys/param.h>
#include <sys/time.h>
-#include <sys/proc.h>
#include <sys/mount.h>
#include <ufs/ufs/dinode.h>
@@ -53,10 +52,7 @@ static const char sccsid[] = "@(#)main.c 8.6 (Berkeley) 5/14/95";
#include <ctype.h>
#include <err.h>
#include <fstab.h>
-#include <stdlib.h>
-#include <unistd.h>
#include <string.h>
-#include <stdio.h>
#include "fsck.h"
@@ -75,11 +71,9 @@ main(argc, argv)
{
int ch;
int ret, maxrun = 0;
- extern char *optarg;
- extern int optind;
sync();
- while ((ch = getopt(argc, argv, "dfpnNyYb:c:l:m:")) != EOF) {
+ while ((ch = getopt(argc, argv, "dfpnNyYb:c:l:m:")) != -1) {
switch (ch) {
case 'p':
preen++;
diff --git a/sbin/fsck_ffs/main.c b/sbin/fsck_ffs/main.c
index b658831..b7343da 100644
--- a/sbin/fsck_ffs/main.c
+++ b/sbin/fsck_ffs/main.c
@@ -43,7 +43,6 @@ static const char sccsid[] = "@(#)main.c 8.6 (Berkeley) 5/14/95";
#include <sys/param.h>
#include <sys/time.h>
-#include <sys/proc.h>
#include <sys/mount.h>
#include <ufs/ufs/dinode.h>
@@ -53,10 +52,7 @@ static const char sccsid[] = "@(#)main.c 8.6 (Berkeley) 5/14/95";
#include <ctype.h>
#include <err.h>
#include <fstab.h>
-#include <stdlib.h>
-#include <unistd.h>
#include <string.h>
-#include <stdio.h>
#include "fsck.h"
@@ -75,11 +71,9 @@ main(argc, argv)
{
int ch;
int ret, maxrun = 0;
- extern char *optarg;
- extern int optind;
sync();
- while ((ch = getopt(argc, argv, "dfpnNyYb:c:l:m:")) != EOF) {
+ while ((ch = getopt(argc, argv, "dfpnNyYb:c:l:m:")) != -1) {
switch (ch) {
case 'p':
preen++;
diff --git a/sbin/fsck_ifs/main.c b/sbin/fsck_ifs/main.c
index b658831..b7343da 100644
--- a/sbin/fsck_ifs/main.c
+++ b/sbin/fsck_ifs/main.c
@@ -43,7 +43,6 @@ static const char sccsid[] = "@(#)main.c 8.6 (Berkeley) 5/14/95";
#include <sys/param.h>
#include <sys/time.h>
-#include <sys/proc.h>
#include <sys/mount.h>
#include <ufs/ufs/dinode.h>
@@ -53,10 +52,7 @@ static const char sccsid[] = "@(#)main.c 8.6 (Berkeley) 5/14/95";
#include <ctype.h>
#include <err.h>
#include <fstab.h>
-#include <stdlib.h>
-#include <unistd.h>
#include <string.h>
-#include <stdio.h>
#include "fsck.h"
@@ -75,11 +71,9 @@ main(argc, argv)
{
int ch;
int ret, maxrun = 0;
- extern char *optarg;
- extern int optind;
sync();
- while ((ch = getopt(argc, argv, "dfpnNyYb:c:l:m:")) != EOF) {
+ while ((ch = getopt(argc, argv, "dfpnNyYb:c:l:m:")) != -1) {
switch (ch) {
case 'p':
preen++;
OpenPOWER on IntegriCloud