get the easy bits of the merge first.... hampton loader and isys directories

should be fine since I had originally just copied them into hampton from head :)

1 files changed, 12 insertions, 15 deletions

diff --git a/loader/urls.c b/loader/urls.c
index 52ce537f2..df93dcf43 100644
--- a/loader/urls.c
+++ b/loader/urls.c
@@ -16,6 +16,8 @@
 #include "urls.h"
 #include "log.h"
 #include "windows.h"
+#include "misc.h"
+#include "net.h"
 
 #if 0
 static const char * urlfilter(const char * u)
@@ -115,8 +117,9 @@ int urlinstFinishTransfer(struct iurlinfo * ui, int fd) {
     return 0;
 }
 
+#if defined (__s390__) || defined (__s390x__)
 int setupRemote(struct iurlinfo * ui) {
-    char *env, *d, *e;
+    char *env, *d;
      
     if (!(env = getenv("RPMSERVER"))) {
 	ui->address = "";
@@ -149,6 +152,7 @@ int setupRemote(struct iurlinfo * ui) {
 
     return 0;
 }
+#endif /* #if defined (__s390__) || defined (__s390x__) */
 
 char * addrToIp(char * hostname) {
     struct in_addr ad;
@@ -176,6 +180,7 @@ int urlMainSetupPanel(struct iurlinfo * ui, urlprotocol protocol,
     int width, height;
     newtGrid entryGrid, buttons, grid;
     char * chptr;
+    char * buf;
 
     if (ui->address) {
 	site = ui->address;
@@ -194,22 +199,14 @@ int urlMainSetupPanel(struct iurlinfo * ui, urlprotocol protocol,
     
     switch (protocol) {
     case URL_METHOD_FTP:
-	reflowedText = newtReflowText(
-            _("Please enter the following information:\n"
-	      "\n"
-	      "    o the name or IP number of your FTP server\n" 
-	      "    o the directory on that server containing\n" 
-	      "      Red Hat Linux for your architecture\n"),
-	    47, 5, 5, &width, &height);
+	buf = sdupprintf(_(netServerPrompt), "FTP", PRODUCTNAME);
+	reflowedText = newtReflowText(buf, 47, 5, 5, &width, &height);
+	free(buf);
 	break;
     case URL_METHOD_HTTP:
-	reflowedText = newtReflowText(
-            _("Please enter the following information:\n"
-	      "\n"
-	      "    o the name or IP number of your web server\n" 
-	      "    o the directory on that server containing\n" 
-	      "      Red Hat Linux for your architecure\n"), 
-	    47, 5, 5, &width, &height);
+	buf = sdupprintf(_(netServerPrompt), "Web", PRODUCTNAME);
+	reflowedText = newtReflowText(buf, 47, 5, 5, &width, &height);
+	free(buf);
 	break;
     }
     text = newtTextbox(-1, -1, width, height, NEWT_TEXTBOX_WRAP);