merge from (now defunct) anaconda-dispatch branch

added telnet server support (not turned on) along with support for cramfs'd
files in many places

1 files changed, 21 insertions, 8 deletions

diff --git a/loader/misc.c b/loader/misc.c
index 776520a0e..13f727a04 100644
--- a/loader/misc.c
+++ b/loader/misc.c
@@ -5,19 +5,15 @@
 
 #include "log.h"
 
-int copyFile(char * source, char * dest) {
-    int infd = -1, outfd = -1;
+int copyFileFd(int infd, char * dest) {
+    int outfd;
     char buf[4096];
     int i;
     int rc = 0;
 
     outfd = open(dest, O_CREAT | O_RDWR, 0666);
-    infd = open(source, O_RDONLY);
 
-    if (infd < 0) {
-	logMessage("failed to open %s: %s", source, strerror(errno));
-	return 1;
-    } else if (outfd < 0) {
+    if (outfd < 0) {
 	close(infd);
 	logMessage("failed to open %s: %s", dest, strerror(errno));
 	return 1;
@@ -30,12 +26,29 @@ int copyFile(char * source, char * dest) {
 	}
     }
 
-    close(infd);
     close(outfd);
 
     return rc;
 }
 
+int copyFile(char * source, char * dest) {
+    int infd = -1;
+    int rc;
+
+    infd = open(source, O_RDONLY);
+
+    if (infd < 0) {
+	logMessage("failed to open %s: %s", source, strerror(errno));
+	return 1;
+    }
+
+    rc = copyFileFd(infd, dest);
+
+    close(infd);
+
+    return rc;
+}
+
 char * readLine(FILE * f) {
     char buf[1024];