merge most of the s/390 loader changes. as with the last batch, an email

about these will be coming soon

1 files changed, 35 insertions, 0 deletions

diff --git a/loader/urls.c b/loader/urls.c
index 7939a566c..52ce537f2 100644
--- a/loader/urls.c
+++ b/loader/urls.c
@@ -115,6 +115,41 @@ int urlinstFinishTransfer(struct iurlinfo * ui, int fd) {
     return 0;
 }
 
+int setupRemote(struct iurlinfo * ui) {
+    char *env, *d, *e;
+     
+    if (!(env = getenv("RPMSERVER"))) {
+	ui->address = "";
+	ui->prefix = "";
+	return 0;
+    }
+
+    if (!strncmp(env, "ftp://",6))
+	env += 6;
+    else if (!strncmp(env, "http://",7))
+	env += 7;
+
+    if (!(d = index (env, '/'))) {
+	d = "";
+        ui->prefix = strdup(d);
+    }
+    else   /* make sure the path either starts with a / or a ~ */
+	if(*d != '/') {
+		ui->prefix = (char *)malloc(strlen(d)+2);
+		*ui->prefix = '/';
+		strcat(ui->prefix, d);
+	}
+	else ui->prefix = strdup(d);
+
+    ui->address = strdup(env);
+    if (ui->address && (d = index (ui->address, '/')))
+	*d = '\0';
+    if (ui->address && (d = index (ui->address, ':')))
+	*d = '\0';
+
+    return 0;
+}
+
 char * addrToIp(char * hostname) {
     struct in_addr ad;
     char * chptr;