diff options
author | jkh <jkh@FreeBSD.org> | 1996-04-23 01:29:35 +0000 |
---|---|---|
committer | jkh <jkh@FreeBSD.org> | 1996-04-23 01:29:35 +0000 |
commit | e665fee23a1e8faaacaceda94ce45295956dee10 (patch) | |
tree | 61dd517d68f78c02b32b70a1ec457f1509801e87 /release/sysinstall/ftp_strat.c | |
parent | 70a317a618a87b0eac973736356fadfa45b35959 (diff) | |
download | FreeBSD-src-e665fee23a1e8faaacaceda94ce45295956dee10.zip FreeBSD-src-e665fee23a1e8faaacaceda94ce45295956dee10.tar.gz |
Bring this into sync.
I still have a _very very annoying_ display bug which occurs when a menu
item causes a submenu to be displayed - the screen repaints for the original
menu (which is restored upon return from the submenu) are off by about 4
characters. I've tried restoring the screen, the cursor position, you name
it - same deal. Grrrr! This commit is my first step in trying to get someone
else to help me look into this one since I'm just tearing my hair out at this
point!
Diffstat (limited to 'release/sysinstall/ftp_strat.c')
-rw-r--r-- | release/sysinstall/ftp_strat.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/release/sysinstall/ftp_strat.c b/release/sysinstall/ftp_strat.c index 860d724..480b725 100644 --- a/release/sysinstall/ftp_strat.c +++ b/release/sysinstall/ftp_strat.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: ftp_strat.c,v 1.11 1996/03/21 09:30:09 jkh Exp $ + * $Id: ftp_strat.c,v 1.12 1996/04/13 13:31:37 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -63,7 +63,6 @@ get_new_host(Device *dev, Boolean probe) i = TRUE; else { i = FALSE; - dialog_clear(); msgConfirm("The %s file failed to load from the FTP site you\n" "selected. Please select another one from the FTP menu.", lastRequest ? lastRequest : "requested"); MenuMediaFTP.title = "Request failed - please select another site"; @@ -121,13 +120,11 @@ mediaInitFTP(Device *dev) return FALSE; if (!ftp && (ftp = FtpInit()) == NULL) { - dialog_clear(); msgConfirm("FTP initialisation failed!"); return FALSE; } cp = variable_get(VAR_FTP_PATH); if (!cp) { - dialog_clear(); msgConfirm("%s is not set!", VAR_FTP_PATH); return FALSE; } @@ -135,7 +132,6 @@ mediaInitFTP(Device *dev) msgDebug("Attempting to open connection for URL: %s\n", cp); hostname = variable_get(VAR_HOSTNAME); if (strncmp("ftp://", cp, 6) != NULL) { - dialog_clear(); msgConfirm("Invalid URL: %s\n(A URL must start with `ftp://' here)", cp); return FALSE; } @@ -158,7 +154,6 @@ mediaInitFTP(Device *dev) } msgNotify("Looking up host %s..", hostname); if ((gethostbyname(hostname) == NULL) && (inet_addr(hostname) == INADDR_NONE)) { - dialog_clear(); msgConfirm("Cannot resolve hostname `%s'! Are you sure that your\n" "name server, gateway and network interface are correctly configured?", hostname); netDevice->shutdown(netDevice); @@ -181,10 +176,8 @@ retry: if (FtpOpen(ftp, hostname, login_name, password) != 0) { if (variable_get(VAR_NO_CONFIRM)) msgNotify("Couldn't open FTP connection to %s", hostname); - else { - dialog_clear(); + else msgConfirm("Couldn't open FTP connection to %s", hostname); - } if (ftpShouldAbort(dev, ++retries) || !get_new_host(dev, FALSE)) return FALSE; goto retry; |