--- /home/tyson/MacOS/B20B29/msdosfs-435.40.5/fsck_msdos.tproj/main.c 2014-01-25 04:07:04.000000000 +0100 +++ main.c 1997-10-17 13:20:03.000000000 +0200 @@ -1,25 +1,5 @@ -/* - * Copyright (c) 2000 Apple Computer, Inc. All rights reserved. - * - * @APPLE_LICENSE_HEADER_START@ - * - * This file contains Original Code and/or Modifications of Original Code - * as defined in and that are subject to the Apple Public Source License - * Version 2.0 (the 'License'). You may not use this file except in - * compliance with the License. Please obtain a copy of the License at - * http://www.opensource.apple.com/apsl/ and read it before using this - * file. - * - * The Original Code and all software distributed under the License are - * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER - * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES, - * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. - * Please see the License for the specific language governing rights and - * limitations under the License. - * - * @APPLE_LICENSE_HEADER_END@ - */ +/* $NetBSD: main.c,v 1.11 1997/10/17 11:20:03 ws Exp $ */ + /* * Copyright (C) 1995 Wolfgang Solfrank * Copyright (c) 1995 Martin Husemann @@ -54,6 +34,9 @@ #include +#ifndef lint +__RCSID("$NetBSD: main.c,v 1.11 1997/10/17 11:20:03 ws Exp $"); +#endif /* not lint */ #include #include @@ -73,10 +56,7 @@ int alwaysno; /* assume "no" for all questions */ int alwaysyes; /* assume "yes" for all questions */ int preen; /* set when preening */ -int quick; /* set to quickly check if volume is dirty */ -int quiet; /* set to supress most messages */ int rdonly; /* device is opened read only (supersedes above) */ -size_t maxmem; /* If non-zero, limit major allocations to this many bytes */ static void usage __P((void)); int main __P((int, char **)); @@ -84,7 +64,7 @@ static void usage() { - errexit("Usage: fsck_msdos [-fnpqy] [-M [k|K|m|M]] filesystem ... \n"); + errexit("Usage: fsck_msdos [-fnpy] filesystem ... \n"); } int @@ -94,16 +74,8 @@ { int ret = 0, erg; int ch; - int offset; - /* - * Allow default maximum memory to be specified at compile time. - */ - #ifdef FSCK_MAX_MEM - maxmem = FSCK_MAX_MEM; - #endif - - while ((ch = getopt(argc, argv, "pynfqM:")) != -1) { + while ((ch = getopt(argc, argv, "pynf")) != -1) { switch (ch) { case 'f': /* @@ -125,37 +97,7 @@ alwaysyes = alwaysno = 0; break; - case 'q': - quick = 1; - break; - case 'M': - if (sscanf(optarg, "%zi%n", &maxmem, &offset) == 0) - { - pfatal("Size argument '%s' not recognized\n", optarg); - usage(); - } - switch (optarg[offset]) - { - case 'M': - case 'm': - maxmem *= 1024; - /* Fall through */ - case 'K': - case 'k': - maxmem *= 1024; - if (optarg[offset+1]) - goto bad_multiplier; - break; - case '\0': - break; - default: -bad_multiplier: - pfatal("Size multiplier '%s' not recognized\n", optarg+offset); - usage(); - } - break; default: - pfatal("Option '%c' not recognized\n", optopt); usage(); break; } @@ -166,11 +108,8 @@ if (!argc) usage(); - /* - * Realistically, this does not work well with multiple filesystems. - */ while (--argc >= 0) { - setcdevname(*argv); + setcdevname(*argv, preen); erg = checkfilesys(*argv++); if (erg > ret) ret = erg; @@ -210,10 +149,8 @@ va_start(ap); #endif vsnprintf(prompt, sizeof(prompt), fmt, ap); - if (alwaysyes || rdonly) { - if (!quiet) - printf("%s? %s\n", prompt, rdonly ? "no" : "yes"); + printf("%s? %s\n", prompt, rdonly ? "no" : "yes"); return !rdonly; } do {