diff options
author | jkh <jkh@FreeBSD.org> | 1998-02-08 20:18:19 +0000 |
---|---|---|
committer | jkh <jkh@FreeBSD.org> | 1998-02-08 20:18:19 +0000 |
commit | 18cd688d9628d1d08ebafa86335bc6ac5f387854 (patch) | |
tree | 13b24eb15532d861777eb8edba608e678025135a | |
parent | 8cf33a55bf8f168c6d4a13481161e8ab620df897 (diff) | |
download | FreeBSD-src-18cd688d9628d1d08ebafa86335bc6ac5f387854.zip FreeBSD-src-18cd688d9628d1d08ebafa86335bc6ac5f387854.tar.gz |
Remove some ancient cruft discovered during a recent code review.
-rw-r--r-- | release/sysinstall/bteasy17.uu | 15 | ||||
-rw-r--r-- | release/sysinstall/floppy.c | 46 | ||||
-rw-r--r-- | usr.sbin/sysinstall/floppy.c | 46 |
3 files changed, 2 insertions, 105 deletions
diff --git a/release/sysinstall/bteasy17.uu b/release/sysinstall/bteasy17.uu deleted file mode 100644 index 2cc05b2..0000000 --- a/release/sysinstall/bteasy17.uu +++ /dev/null @@ -1,15 +0,0 @@ -begin 664 bteasy17 -M,\".P([8CM"\`'S\B_2_``:Y``'RI>I@!@``B]58HD@'/#5T'+00]N0%K@26 -M]D0$_W0^Q@2`Z-H`BG0!BTP"ZPCHSP"Y`0`RT;L`?+@!`LT3<AZ!O_X!5:IU -M%NH`?```@/J!=`*R@(OJ0H#RLX@6.@>_O@>Y!`#&!BT',3+VB"V*100\`'0C -M/`5T'_[&OBH'Z'$`OD@'1D:+'`K_=`4R?01U\XVW<@?H6@"#QQ#^!BT'XLN` -M/G4$`G0+OCL'"O9U"LT8ZZR^*@?H.0#H-@`RY,T:B]J#PV"T`<T6M`!U"\T: -M.]-R\J!(!^L*S1:*Q#P<=/,$]CPQ<M8\-7?24+XH![L;!E/\K%`D?[0.S1!8 -MJ(!T\L-6N`$#NP`&N0$`,O;-$U[&!D@'/\,-B@T*1C`@+B`N("Z@9&ES:R`Q -M#0H*1&5F875L=#H@1C^@``$`!``&`P<'"@IC#F0.912`%($9@AZ3)*4GGRMU -M+U(OVS)`-_(]`&1O\TA01M-/<[)5;FGX3F]V96SL36EN:?A,:6YU^$%M;V5B -MX4)3Q$)31.E00TG80U#-5F5N:?A$;W-S9>,_OP`````````````````````` -M```````````````````````````````````````````````````````````` -1````````````````````5:H` -` -end diff --git a/release/sysinstall/floppy.c b/release/sysinstall/floppy.c index f0f51d2..c5bae4a 100644 --- a/release/sysinstall/floppy.c +++ b/release/sysinstall/floppy.c @@ -4,7 +4,7 @@ * This is probably the last attempt in the `sysinstall' line, the next * generation being slated to essentially a complete rewrite. * - * $Id: floppy.c,v 1.25 1997/04/03 13:44:57 jkh Exp $ + * $Id: floppy.c,v 1.26 1998/01/16 15:07:54 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -70,50 +70,6 @@ floppyChoiceHook(dialogMenuItem *self) return devs ? DITEM_LEAVE_MENU : DITEM_FAILURE; } -/* Our last-ditch routine for getting ROOT from a floppy */ -int -getRootFloppy(void) -{ - int fd = -1; - - if (mediaDevice->type == DEVICE_TYPE_FLOPPY) - floppyDev = mediaDevice; - else { - Device **devs; - int cnt; - - devs = deviceFind(NULL, DEVICE_TYPE_FLOPPY); - cnt = deviceCount(devs); - if (!cnt) { - msgConfirm("No floppy devices found! Something is seriously wrong!"); - return -1; - } - else if (cnt == 1) - floppyDev = devs[0]; - else { - DMenu *menu; - int ret; - WINDOW *save = savescr(); - - menu = deviceCreateMenu(&MenuMediaFloppy, DEVICE_TYPE_FLOPPY, floppyChoiceHook, NULL); - menu->title = "Please insert the ROOT floppy"; - ret = dmenuOpenSimple(menu, FALSE); - restorescr(save); - if (!ret) - return -1; - } - } - while (fd == -1) { - msgConfirm("Please insert the ROOT floppy in %s and press [ENTER]", floppyDev->description); - fd = open(floppyDev->devname, O_RDONLY); - if (isDebug()) - msgDebug("getRootFloppy on %s yields fd of %d\n", floppyDev->devname, fd); - if (fd == -1 && msgYesNo("Couldn't open the floppy - do you want to try again?") != 0) - break; - } - return fd; -} - Boolean mediaInitFloppy(Device *dev) { diff --git a/usr.sbin/sysinstall/floppy.c b/usr.sbin/sysinstall/floppy.c index f0f51d2..c5bae4a 100644 --- a/usr.sbin/sysinstall/floppy.c +++ b/usr.sbin/sysinstall/floppy.c @@ -4,7 +4,7 @@ * This is probably the last attempt in the `sysinstall' line, the next * generation being slated to essentially a complete rewrite. * - * $Id: floppy.c,v 1.25 1997/04/03 13:44:57 jkh Exp $ + * $Id: floppy.c,v 1.26 1998/01/16 15:07:54 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -70,50 +70,6 @@ floppyChoiceHook(dialogMenuItem *self) return devs ? DITEM_LEAVE_MENU : DITEM_FAILURE; } -/* Our last-ditch routine for getting ROOT from a floppy */ -int -getRootFloppy(void) -{ - int fd = -1; - - if (mediaDevice->type == DEVICE_TYPE_FLOPPY) - floppyDev = mediaDevice; - else { - Device **devs; - int cnt; - - devs = deviceFind(NULL, DEVICE_TYPE_FLOPPY); - cnt = deviceCount(devs); - if (!cnt) { - msgConfirm("No floppy devices found! Something is seriously wrong!"); - return -1; - } - else if (cnt == 1) - floppyDev = devs[0]; - else { - DMenu *menu; - int ret; - WINDOW *save = savescr(); - - menu = deviceCreateMenu(&MenuMediaFloppy, DEVICE_TYPE_FLOPPY, floppyChoiceHook, NULL); - menu->title = "Please insert the ROOT floppy"; - ret = dmenuOpenSimple(menu, FALSE); - restorescr(save); - if (!ret) - return -1; - } - } - while (fd == -1) { - msgConfirm("Please insert the ROOT floppy in %s and press [ENTER]", floppyDev->description); - fd = open(floppyDev->devname, O_RDONLY); - if (isDebug()) - msgDebug("getRootFloppy on %s yields fd of %d\n", floppyDev->devname, fd); - if (fd == -1 && msgYesNo("Couldn't open the floppy - do you want to try again?") != 0) - break; - } - return fd; -} - Boolean mediaInitFloppy(Device *dev) { |