diff options
author | jkh <jkh@FreeBSD.org> | 1999-05-27 10:32:50 +0000 |
---|---|---|
committer | jkh <jkh@FreeBSD.org> | 1999-05-27 10:32:50 +0000 |
commit | 4e040793c0e05bef154e78a09e4b935ec7211c08 (patch) | |
tree | cba908c43d1dc405a0355ca3366a996075be6f56 /release/sysinstall | |
parent | 5f3f513bc6580435bbbd98c35680c067ddc41886 (diff) | |
download | FreeBSD-src-4e040793c0e05bef154e78a09e4b935ec7211c08.zip FreeBSD-src-4e040793c0e05bef154e78a09e4b935ec7211c08.tar.gz |
Do a clean-up pass on error/warning messages.
Diffstat (limited to 'release/sysinstall')
-rw-r--r-- | release/sysinstall/devices.c | 17 | ||||
-rw-r--r-- | release/sysinstall/index.c | 18 | ||||
-rw-r--r-- | release/sysinstall/install.c | 15 | ||||
-rw-r--r-- | release/sysinstall/msg.c | 16 | ||||
-rw-r--r-- | release/sysinstall/package.c | 18 | ||||
-rw-r--r-- | release/sysinstall/sysinstall.h | 3 |
6 files changed, 35 insertions, 52 deletions
diff --git a/release/sysinstall/devices.c b/release/sysinstall/devices.c index be7a729..c05e38c 100644 --- a/release/sysinstall/devices.c +++ b/release/sysinstall/devices.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: devices.c,v 1.90 1999/04/06 17:08:29 wpaul Exp $ + * $Id: devices.c,v 1.91 1999/05/21 04:37:48 wpaul Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -240,14 +240,12 @@ deviceGetAll(void) ifc.ifc_buf = buffer; s = socket(AF_INET, SOCK_DGRAM, 0); - if (s < 0) { - msgConfirm("ifconfig: socket"); + if (s < 0) goto skipif; /* Jump over network iface probing */ - } - if (ioctl(s, SIOCGIFCONF, (char *) &ifc) < 0) { - msgConfirm("ifconfig (SIOCGIFCONF)"); + + if (ioctl(s, SIOCGIFCONF, (char *) &ifc) < 0) goto skipif; /* Jump over network iface probing */ - } + ifflags = ifc.ifc_req->ifr_flags; end = (struct ifreq *) (ifc.ifc_buf + ifc.ifc_len); for (ifptr = ifc.ifc_req; ifptr < end; ifptr++) { @@ -287,10 +285,9 @@ deviceGetAll(void) mediaInitNetwork, NULL, mediaShutdownNetwork, NULL); msgDebug("Found a network device named %s\n", ifptr->ifr_name); close(s); - if ((s = socket(AF_INET, SOCK_DGRAM, 0)) < 0) { - msgConfirm("ifconfig: socket"); + if ((s = socket(AF_INET, SOCK_DGRAM, 0)) < 0) continue; - } + if (ifptr->ifr_addr.sa_len) /* I'm not sure why this is here - it's inherited */ ifptr = (struct ifreq *)((caddr_t)ifptr + ifptr->ifr_addr.sa_len - sizeof(struct sockaddr)); } diff --git a/release/sysinstall/index.c b/release/sysinstall/index.c index 48f34f7..24d0a3d 100644 --- a/release/sysinstall/index.c +++ b/release/sysinstall/index.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: index.c,v 1.66 1999/05/14 12:15:32 jkh Exp $ + * $Id: index.c,v 1.67 1999/05/15 14:34:21 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -634,19 +634,11 @@ index_extract(Device *dev, PkgNodePtr top, PkgNodePtr who, Boolean depended) *cp2 = '\0'; if ((tmp2 = index_search(top, cp, NULL)) != NULL) { status = index_extract(dev, top, tmp2, TRUE); - if (DITEM_STATUS(status) != DITEM_SUCCESS) { - if (variable_get(VAR_NO_CONFIRM)) - msgNotify("Loading of dependant package %s failed", cp); - else - msgConfirm("Loading of dependant package %s failed", cp); - } - } - else if (!package_exists(cp)) { - if (variable_get(VAR_NO_CONFIRM)) - msgNotify("Warning: %s is a required package but was not found.", cp); - else - msgConfirm("Warning: %s is a required package but was not found.", cp); + if (DITEM_STATUS(status) != DITEM_SUCCESS) + msgCNotify("Loading of dependant package %s failed", cp); } + else if (!package_exists(cp)) + msgCNotify("Warning: %s is a required package but was not found.", cp); if (cp2) cp = cp2 + 1; else diff --git a/release/sysinstall/install.c b/release/sysinstall/install.c index 6e8141e..c037b50 100644 --- a/release/sysinstall/install.c +++ b/release/sysinstall/install.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: install.c,v 1.235 1999/05/07 11:02:56 jkh Exp $ + * $Id: install.c,v 1.236 1999/05/12 09:02:35 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -174,19 +174,6 @@ checkLabels(Boolean whinge, Chunk **rdev, Chunk **sdev, Chunk **udev, Chunk **vd "swap partition."); status = FALSE; } - if (!usrdev && whinge && !variable_get(VAR_NO_USR)) { - msgConfirm("WARNING: No /usr filesystem found. This is not technically\n" - "an error if your root filesystem is big enough (or you later\n" - "intend to mount your /usr filesystem over NFS), but it may otherwise\n" - "cause you trouble if you're not exactly sure what you are doing!"); - } - if (!vardev && whinge && variable_cmp(SYSTEM_STATE, "upgrade")) { - msgConfirm("WARNING: No /var filesystem found. This is not technically\n" - "an error if your root filesystem is big enough (or you later\n" - "intend to link /var to someplace else), but it may otherwise\n" - "cause your root filesystem to fill up if you receive lots of mail\n" - "or edit large temporary files."); - } return status; } diff --git a/release/sysinstall/msg.c b/release/sysinstall/msg.c index e61b767..a7116e9 100644 --- a/release/sysinstall/msg.c +++ b/release/sysinstall/msg.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: msg.c,v 1.46 1997/09/09 16:27:50 jkh Exp $ + * $Id: msg.c,v 1.47 1997/09/20 02:48:48 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -217,6 +217,20 @@ msgNotify(char *fmt, ...) dialog_msgbox(NULL, errstr, -1, -1, 0); } +/* Put up a message in a popup or notifier box, depending on NO_CONFIRM */ +void +msgCNotify(char *fmt, ...) +{ + va_list args; + + va_start(args, fmt); + if (variable_get(VAR_NO_CONFIRM)) + msgNotify(fmt, args); + else + msgConfirm(fmt, args); + va_end(args); +} + /* Put up a message in a popup yes/no box and return 1 for YES, 0 for NO */ int msgYesNo(char *fmt, ...) diff --git a/release/sysinstall/package.c b/release/sysinstall/package.c index 70d9602..7cc980e 100644 --- a/release/sysinstall/package.c +++ b/release/sysinstall/package.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: package.c,v 1.75 1999/05/15 14:34:22 jkh Exp $ + * $Id: package.c,v 1.76 1999/05/18 00:44:28 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -218,12 +218,8 @@ package_extract(Device *dev, char *name, Boolean depended) i = waitpid(pid, &tot, 0); if (sigpipe_caught || i < 0 || WEXITSTATUS(tot)) { ret = DITEM_FAILURE | DITEM_RESTORE; - if (variable_get(VAR_NO_CONFIRM)) - msgNotify("Add of package %s aborted, error code %d -\n" - "Please check the debug screen for more info.", name, WEXITSTATUS(tot)); - else - msgConfirm("Add of package %s aborted, error code %d -\n" - "Please check the debug screen for more info.", name, WEXITSTATUS(tot)); + msgCNotify("Add of package %s aborted, error code %d -\n" + "Please check the debug screen for more info.", name, WEXITSTATUS(tot)); } else msgNotify("Package %s was added successfully", name); @@ -237,12 +233,8 @@ package_extract(Device *dev, char *name, Boolean depended) } else { dialog_clear_norefresh(); - if (variable_get(VAR_NO_CONFIRM)) - msgNotify("Unable to fetch package %s from selected media.\n" - "No package add will be done.", name); - else - msgConfirm("Unable to fetch package %s from selected media.\n" - "No package add will be done.", name); + msgCNotify("Unable to fetch package %s from selected media.\n" + "No package add will be done.", name); ret = DITEM_FAILURE | DITEM_RESTORE; } signal(SIGPIPE, SIG_IGN); diff --git a/release/sysinstall/sysinstall.h b/release/sysinstall/sysinstall.h index 9c35d41..c2ad3518 100644 --- a/release/sysinstall/sysinstall.h +++ b/release/sysinstall/sysinstall.h @@ -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: sysinstall.h,v 1.164 1999/05/12 09:02:37 jkh Exp $ + * $Id: sysinstall.h,v 1.165 1999/05/15 14:34:22 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -645,6 +645,7 @@ extern void msgError(char *fmt, ...); extern void msgFatal(char *fmt, ...); extern void msgConfirm(char *fmt, ...); extern void msgNotify(char *fmt, ...); +extern void msgCNotify(char *fmt, ...); extern void msgWeHaveOutput(char *fmt, ...); extern int msgYesNo(char *fmt, ...); extern char *msgGetInput(char *buf, char *fmt, ...); |