Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/usr.bin/eject KNFify
details: https://anonhg.NetBSD.org/src/rev/fa836205a120
branches: trunk
changeset: 515862:fa836205a120
user: bjh21 <bjh21%NetBSD.org@localhost>
date: Sat Oct 06 14:29:55 2001 +0000
description:
KNFify
diffstat:
usr.bin/eject/eject.c | 542 +++++++++++++++++++++++--------------------------
1 files changed, 260 insertions(+), 282 deletions(-)
diffs (truncated from 651 to 300 lines):
diff -r cd242f0b7d70 -r fa836205a120 usr.bin/eject/eject.c
--- a/usr.bin/eject/eject.c Sat Oct 06 13:59:41 2001 +0000
+++ b/usr.bin/eject/eject.c Sat Oct 06 14:29:55 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: eject.c,v 1.14 2001/08/20 08:21:10 ad Exp $ */
+/* $NetBSD: eject.c,v 1.15 2001/10/06 14:29:55 bjh21 Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -26,7 +26,7 @@
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
* TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
@@ -40,11 +40,11 @@
#ifndef lint
__COPYRIGHT("@(#) Copyright (c) 1999 The NetBSD Foundation, Inc.\n\
All rights reserved.\n");
-#endif /* not lint */
+#endif /* not lint */
#ifndef lint
-__RCSID("$NetBSD: eject.c,v 1.14 2001/08/20 08:21:10 ad Exp $");
-#endif /* not lint */
+__RCSID("$NetBSD: eject.c,v 1.15 2001/10/06 14:29:55 bjh21 Exp $");
+#endif /* not lint */
#include <sys/types.h>
#include <sys/cdio.h>
@@ -65,362 +65,340 @@
#include <util.h>
struct nicknames_s {
- char *name; /* The name given on the command line. */
- char *devname; /* The base name of the device */
- int type; /* The type of device, for determining
- what ioctl to use. */
+ char *name; /* The name given on the command line. */
+ char *devname; /* The base name of the device */
+ int type; /* The type of device, for determining what
+ * ioctl to use. */
#define TAPE 0x10
#define DISK 0x20
- /* OR one of the above with one of the below: */
+ /* OR one of the above with one of the below: */
#define NOTLOADABLE 0x00
#define LOADABLE 0x01
#define TYPEMASK ((int)~0x01)
-} nicknames[] = {
- { "diskette", "fd", DISK | NOTLOADABLE },
- { "floppy", "fd", DISK | NOTLOADABLE },
- { "fd", "fd", DISK | NOTLOADABLE },
- { "sd", "sd", DISK | NOTLOADABLE },
- { "cdrom", "cd", DISK | LOADABLE },
- { "cd", "cd", DISK | LOADABLE },
- { "cdr", "cd", DISK | LOADABLE },
- { "cdrw", "cd", DISK | LOADABLE },
- { "dvdrom", "cd", DISK | LOADABLE },
- { "dvd", "cd", DISK | LOADABLE },
- { "dvdr", "cd", DISK | LOADABLE },
- { "dvdrw", "cd", DISK | LOADABLE },
- { "mcd", "mcd", DISK | LOADABLE }, /* XXX Is this true? */
- { "tape", "st", TAPE | NOTLOADABLE },
- { "st", "st", TAPE | NOTLOADABLE },
- { "dat", "st", TAPE | NOTLOADABLE },
- { "exabyte", "st", TAPE | NOTLOADABLE },
+} nicknames[] = {
+ { "diskette", "fd", DISK | NOTLOADABLE },
+ { "floppy", "fd", DISK | NOTLOADABLE },
+ { "fd", "fd", DISK | NOTLOADABLE },
+ { "sd", "sd", DISK | NOTLOADABLE },
+ { "cdrom", "cd", DISK | LOADABLE },
+ { "cd", "cd", DISK | LOADABLE },
+ { "cdr", "cd", DISK | LOADABLE },
+ { "cdrw", "cd", DISK | LOADABLE },
+ { "dvdrom", "cd", DISK | LOADABLE },
+ { "dvd", "cd", DISK | LOADABLE },
+ { "dvdr", "cd", DISK | LOADABLE },
+ { "dvdrw", "cd", DISK | LOADABLE },
+ { "mcd", "mcd", DISK | LOADABLE }, /* XXX Is this true? */
+ { "tape", "st", TAPE | NOTLOADABLE },
+ { "st", "st", TAPE | NOTLOADABLE },
+ { "dat", "st", TAPE | NOTLOADABLE },
+ { "exabyte", "st", TAPE | NOTLOADABLE },
};
-#define MAXNICKLEN 12 /* at least enough room for the
- longest nickname */
-#define MAXDEVLEN (MAXNICKLEN + 7) /* "/dev/r" ... "a" */
+#define MAXNICKLEN 12 /* at least enough room for the longest
+ * nickname */
+#define MAXDEVLEN (MAXNICKLEN + 7) /* "/dev/r" ... "a" */
struct devtypes_s {
- char *name;
- int type;
-} devtypes[] = {
- { "diskette", DISK | NOTLOADABLE },
- { "floppy", DISK | NOTLOADABLE },
- { "cdrom", DISK | LOADABLE },
- { "disk", DISK | NOTLOADABLE },
- { "tape", TAPE | NOTLOADABLE },
+ char *name;
+ int type;
+} devtypes[] = {
+ { "diskette", DISK | NOTLOADABLE },
+ { "floppy", DISK | NOTLOADABLE },
+ { "cdrom", DISK | LOADABLE },
+ { "disk", DISK | NOTLOADABLE },
+ { "tape", TAPE | NOTLOADABLE },
};
int verbose_f = 0;
int umount_f = 1;
int load_f = 0;
-int main __P((int, char *[]));
-void usage __P((void));
-char *nick2dev __P((char *));
-char *nick2rdev __P((char *));
-int guess_devtype __P((char *));
-char *guess_nickname __P((char *));
-void eject_tape __P((char *));
-void eject_disk __P((char *));
-void unmount_dev __P((char *));
+int main(int, char *[]);
+void usage(void);
+char *nick2dev(char *);
+char *nick2rdev(char *);
+int guess_devtype(char *);
+char *guess_nickname(char *);
+void eject_tape(char *);
+void eject_disk(char *);
+void unmount_dev(char *);
int
-main(int argc,
- char *argv[])
+main(int argc, char *argv[])
{
- int ch;
- int devtype = -1;
- int n, i;
- char *devname = NULL;
+ int ch;
+ int devtype = -1;
+ int n, i;
+ char *devname = NULL;
- while((ch = getopt(argc, argv, "d:flnt:v")) != -1) {
- switch(ch) {
- case 'd':
- devname = optarg;
- break;
- case 'f':
- umount_f = 0;
- break;
- case 'l':
- load_f = 1;
- break;
- case 'n':
- for(n = 0; n < sizeof(nicknames) / sizeof(nicknames[0]);
- n++) {
- struct nicknames_s *np = &nicknames[n];
+ while ((ch = getopt(argc, argv, "d:flnt:v")) != -1) {
+ switch (ch) {
+ case 'd':
+ devname = optarg;
+ break;
+ case 'f':
+ umount_f = 0;
+ break;
+ case 'l':
+ load_f = 1;
+ break;
+ case 'n':
+ for (n = 0; n < sizeof(nicknames) / sizeof(nicknames[0]);
+ n++) {
+ struct nicknames_s *np = &nicknames[n];
- printf("%s -> %s\n", np->name, nick2dev(np->name));
- }
- return(0);
- case 't':
- for(i = 0; i < sizeof(devtypes) / sizeof(devtypes[0]);
- i++) {
- if(strcasecmp(devtypes[i].name, optarg) == 0) {
- devtype = devtypes[i].type;
- break;
+ printf("%s -> %s\n", np->name, nick2dev(np->name));
+ }
+ return (0);
+ case 't':
+ for (i = 0; i < sizeof(devtypes) / sizeof(devtypes[0]);
+ i++) {
+ if (strcasecmp(devtypes[i].name, optarg) == 0) {
+ devtype = devtypes[i].type;
+ break;
+ }
+ }
+ if (devtype == -1)
+ errx(1, "%s: unknown device type\n", optarg);
+ break;
+ case 'v':
+ verbose_f = 1;
+ break;
+ default:
+ warnx("-%c: unknown switch", ch);
+ usage();
+ /* NOTREACHED */
}
- }
- if(devtype == -1) {
- errx(1, "%s: unknown device type\n", optarg);
- }
- break;
- case 'v':
- verbose_f = 1;
- break;
- default:
- warnx("-%c: unknown switch", ch);
- usage();
- /* NOTREACHED */
}
- }
- argc -= optind;
- argv += optind;
-
- if(devname == NULL) {
- if(argc == 0) {
- usage();
- /* NOTREACHED */
- } else
- devname = argv[0];
- }
-
+ argc -= optind;
+ argv += optind;
- if(devtype == -1) {
- devtype = guess_devtype(devname);
- }
- if(devtype == -1) {
- errx(1, "%s: unable to determine type of device",
- devname);
- }
- if(verbose_f) {
- printf("device type == ");
- if((devtype & TYPEMASK) == TAPE)
- printf("tape\n");
+ if (devname == NULL) {
+ if (argc == 0) {
+ usage();
+ /* NOTREACHED */
+ } else
+ devname = argv[0];
+ }
+ if (devtype == -1)
+ devtype = guess_devtype(devname);
+ if (devtype == -1)
+ errx(1, "%s: unable to determine type of device",
+ devname);
+ if (verbose_f) {
+ printf("device type == ");
+ if ((devtype & TYPEMASK) == TAPE)
+ printf("tape\n");
+ else
+ printf("disk, floppy, or cdrom\n");
+ }
+ if (umount_f)
+ unmount_dev(devname);
+
+ /* XXX Tapes and disks have different ioctl's: */
+ if ((devtype & TYPEMASK) == TAPE)
+ eject_tape(devname);
else
- printf("disk, floppy, or cdrom\n");
- }
-
- if(umount_f)
- unmount_dev(devname);
+ eject_disk(devname);
- /* XXX Tapes and disks have different ioctl's: */
- if((devtype & TYPEMASK) == TAPE)
- eject_tape(devname);
- else
- eject_disk(devname);
+ if (verbose_f)
+ printf("done.\n");
- if(verbose_f)
- printf("done.\n");
-
- return(0);
+ return (0);
}
Home |
Main Index |
Thread Index |
Old Index