diff options
-rw-r--r-- | release/sysinstall/options.c | 8 | ||||
-rw-r--r-- | release/sysinstall/package.c | 6 | ||||
-rw-r--r-- | usr.sbin/sysinstall/options.c | 8 | ||||
-rw-r--r-- | usr.sbin/sysinstall/package.c | 6 |
4 files changed, 14 insertions, 14 deletions
diff --git a/release/sysinstall/options.c b/release/sysinstall/options.c index 18485f6..0127afe 100644 --- a/release/sysinstall/options.c +++ b/release/sysinstall/options.c @@ -4,7 +4,7 @@ * This is probably the last attempt in the `sysinstall' line, the next * generation being slated for what's essentially a complete rewrite. * - * $Id: options.c,v 1.12 1995/10/18 00:12:36 jkh Exp $ + * $Id: options.c,v 1.13 1995/10/18 05:01:59 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -212,7 +212,7 @@ optionsEditor(char *str) switch (key) { case KEY_F(1): case '?': - systemDisplayFile("options"); + systemDisplayHelp("options"); break; case KEY_UP: @@ -240,13 +240,13 @@ optionsEditor(char *str) case ' ': fire(Options[currOpt]); - dialog_clear(); clear(); + dialog_clear(); continue; case 'Q': - dialog_clear(); clear(); + dialog_clear(); return RET_SUCCESS; default: diff --git a/release/sysinstall/package.c b/release/sysinstall/package.c index 5fe2f20..dcf3e34 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.2 1995/10/16 15:14:21 jkh Exp $ + * $Id: package.c,v 1.3 1995/10/18 00:12:38 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -77,7 +77,7 @@ package_extract(Device *dev, char *name) if (fd >= 0) { pid_t tpid; - msgNotify("Fetching %s from %s\n", path, dev->name); + msgNotify("Fetching %s from %s", path, dev->name); pen[0] = '\0'; if ((where = make_playpen(pen, 0)) != NULL) { if (isDebug()) @@ -93,7 +93,6 @@ package_extract(Device *dev, char *name) else { int pstat; - close(fd); tpid = waitpid(tpid, &pstat, 0); if (vsystem("(pwd; cat +CONTENTS) | pkg_add %s-S", !strcmp(variable_get(CPIO_VERBOSITY_LEVEL), "high") ? "-v " : "")) @@ -101,6 +100,7 @@ package_extract(Device *dev, char *name) "Please check debugging screen for possible further details.", path); else ret = RET_SUCCESS; + close(fd); } if (chdir(where) == -1) msgFatal("Unable to get back to where I was before, Jojo!\n(That was: %s)\n", where); diff --git a/usr.sbin/sysinstall/options.c b/usr.sbin/sysinstall/options.c index 18485f6..0127afe 100644 --- a/usr.sbin/sysinstall/options.c +++ b/usr.sbin/sysinstall/options.c @@ -4,7 +4,7 @@ * This is probably the last attempt in the `sysinstall' line, the next * generation being slated for what's essentially a complete rewrite. * - * $Id: options.c,v 1.12 1995/10/18 00:12:36 jkh Exp $ + * $Id: options.c,v 1.13 1995/10/18 05:01:59 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -212,7 +212,7 @@ optionsEditor(char *str) switch (key) { case KEY_F(1): case '?': - systemDisplayFile("options"); + systemDisplayHelp("options"); break; case KEY_UP: @@ -240,13 +240,13 @@ optionsEditor(char *str) case ' ': fire(Options[currOpt]); - dialog_clear(); clear(); + dialog_clear(); continue; case 'Q': - dialog_clear(); clear(); + dialog_clear(); return RET_SUCCESS; default: diff --git a/usr.sbin/sysinstall/package.c b/usr.sbin/sysinstall/package.c index 5fe2f20..dcf3e34 100644 --- a/usr.sbin/sysinstall/package.c +++ b/usr.sbin/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.2 1995/10/16 15:14:21 jkh Exp $ + * $Id: package.c,v 1.3 1995/10/18 00:12:38 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -77,7 +77,7 @@ package_extract(Device *dev, char *name) if (fd >= 0) { pid_t tpid; - msgNotify("Fetching %s from %s\n", path, dev->name); + msgNotify("Fetching %s from %s", path, dev->name); pen[0] = '\0'; if ((where = make_playpen(pen, 0)) != NULL) { if (isDebug()) @@ -93,7 +93,6 @@ package_extract(Device *dev, char *name) else { int pstat; - close(fd); tpid = waitpid(tpid, &pstat, 0); if (vsystem("(pwd; cat +CONTENTS) | pkg_add %s-S", !strcmp(variable_get(CPIO_VERBOSITY_LEVEL), "high") ? "-v " : "")) @@ -101,6 +100,7 @@ package_extract(Device *dev, char *name) "Please check debugging screen for possible further details.", path); else ret = RET_SUCCESS; + close(fd); } if (chdir(where) == -1) msgFatal("Unable to get back to where I was before, Jojo!\n(That was: %s)\n", where); |