diff options
author | jkh <jkh@FreeBSD.org> | 1996-12-11 09:35:06 +0000 |
---|---|---|
committer | jkh <jkh@FreeBSD.org> | 1996-12-11 09:35:06 +0000 |
commit | 3727883bddbc2a8ead72a97011cf4763fe5c7ede (patch) | |
tree | 3e96d1a8c70e76ad8e35ec46e4c61b3f0ab3295c /usr.sbin/sysinstall/floppy.c | |
parent | 90d182874d165b16fcb0758a86668941f1ddda01 (diff) | |
download | FreeBSD-src-3727883bddbc2a8ead72a97011cf4763fe5c7ede.zip FreeBSD-src-3727883bddbc2a8ead72a97011cf4763fe5c7ede.tar.gz |
Do a few things I've been threatening to do for a long time:
1. Don't use the MSDOSFS code for accessing FreeBSD distribution data.
Use Robert Nordier's stand-alone DOS I/O library for the purpose.
It this works as well as Robert says it does, it should drastically reduce
(or even eliminate) our "I can't install from my DOS partition!" calls.
2. As a result of the above, go to stdio file descriptors for all
media types.
3. Taking advantage of #2, start using libftpio for FTP transfers instead
of maintaining our own parallel version of the FTP transfer code.
Yay! I ripped something out for a change!
#1 Submitted-By: Robert Nordier <rnordier@iafrica.com>
Diffstat (limited to 'usr.sbin/sysinstall/floppy.c')
-rw-r--r-- | usr.sbin/sysinstall/floppy.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/usr.sbin/sysinstall/floppy.c b/usr.sbin/sysinstall/floppy.c index 8d4b519..71e5be7 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.15 1996/09/15 23:55:22 jkh Exp $ + * $Id: floppy.c,v 1.16 1996/10/09 09:53:30 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -152,34 +152,34 @@ mediaInitFloppy(Device *dev) return TRUE; } -int +FILE * mediaGetFloppy(Device *dev, char *file, Boolean probe) { - char buf[PATH_MAX]; - int fd; - int nretries = 5; + char buf[PATH_MAX]; + FILE *fp; + int nretries = 5; snprintf(buf, PATH_MAX, "/dist/%s", file); msgDebug("Request for %s from floppy on /dist, probe is %d.\n", buf, probe); if (!file_readable(buf)) { if (probe) - return -1; + return NULL; else { while (!file_readable(buf)) { if (!--nretries) { msgConfirm("GetFloppy: Failed to get %s after retries;\ngiving up.", buf); - return -1; + return NULL; } distWanted = buf; mediaShutdownFloppy(dev); if (!mediaInitFloppy(dev)) - return -1; + return NULL; } } } - fd = open(buf, O_RDONLY); - return fd; + fp = fopen(buf, "r"); + return fp; } void |