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>

1 files changed, 6 insertions, 6 deletions

diff --git a/release/sysinstall/cdrom.c b/release/sysinstall/cdrom.c
index 517fa90..beb22db 100644
--- a/release/sysinstall/cdrom.c
+++ b/release/sysinstall/cdrom.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: cdrom.c,v 1.25 1996/10/10 09:22:24 jkh Exp $
+ * $Id: cdrom.c,v 1.26 1996/10/14 21:32:22 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -120,7 +120,7 @@ mediaInitCDROM(Device *dev)
     return TRUE;
 }
 
-int
+FILE *
 mediaGetCDROM(Device *dev, char *file, Boolean probe)
 {
     char	buf[PATH_MAX];
@@ -129,15 +129,15 @@ mediaGetCDROM(Device *dev, char *file, Boolean probe)
 	msgDebug("Request for %s from CDROM\n", file);
     snprintf(buf, PATH_MAX, "/cdrom/%s", file);
     if (file_readable(buf))
-	return open(buf, O_RDONLY);
+	return fopen(buf, "r");
     snprintf(buf, PATH_MAX, "/cdrom/dists/%s", file);
     if (file_readable(buf))
-	return open(buf, O_RDONLY);
+	return fopen(buf, "r");
     snprintf(buf, PATH_MAX, "/cdrom/%s/%s", variable_get(VAR_RELNAME), file);
     if (file_readable(buf))
-	return open(buf, O_RDONLY);
+	return fopen(buf, "r");
     snprintf(buf, PATH_MAX, "/cdrom/%s/dists/%s", variable_get(VAR_RELNAME), file);
-    return open(buf, O_RDONLY);
+    return fopen(buf, "r");
 }
 
 void