From bead2e7139048bc73563fd52c30d1ce5ae124a87 Mon Sep 17 00:00:00 2001 From: jkh Date: Sun, 19 Dec 1999 06:34:22 +0000 Subject: More cosmetic surgery and a nasty null pointer bug in index.c fixed. --- release/sysinstall/index.c | 2 +- release/sysinstall/menus.c | 87 +++++++++++++++++++++++++++----------------- release/sysinstall/options.c | 1 + release/sysinstall/package.c | 4 +- 4 files changed, 59 insertions(+), 35 deletions(-) (limited to 'release/sysinstall') diff --git a/release/sysinstall/index.c b/release/sysinstall/index.c index 8b1a4ef..f8a5c4d 100644 --- a/release/sysinstall/index.c +++ b/release/sysinstall/index.c @@ -751,7 +751,7 @@ index_initialize(char *path) fclose(fp); index_sort(&Top); index_initted = TRUE; + restorescr(w); } - restorescr(w); return DITEM_SUCCESS; } diff --git a/release/sysinstall/menus.c b/release/sysinstall/menus.c index ff0b96c..ad944fa 100644 --- a/release/sysinstall/menus.c +++ b/release/sysinstall/menus.c @@ -331,7 +331,7 @@ DMenu MenuInitial = { "install", /* help file */ { { "Select" }, { "X Exit Install", NULL, NULL, dmenuExit }, - { "? Usage", "Quick start - How to use this menu system", NULL, dmenuDisplayFile, NULL, "usage" }, + { " Usage", "Quick start - How to use this menu system", NULL, dmenuDisplayFile, NULL, "usage" }, { "Novice", "Begin a novice installation (for beginners)", NULL, installNovice }, { "Express", "Begin a quick installation (for the impatient)", NULL, installExpress }, { " Custom", "Begin a custom installation (for experts)", NULL, dmenuSubmenu, NULL, &MenuInstallCustom }, @@ -357,14 +357,14 @@ DMenu MenuDocumentation = { "consult the README file.", "Confused? Press F1 for help.", "usage", - { { "1 README", "A general description of FreeBSD. Read this!", NULL, dmenuDisplayFile, NULL, "README" }, + { { "X Exit", "Exit this menu (returning to previous)", NULL, dmenuExit }, + { "1 README", "A general description of FreeBSD. Read this!", NULL, dmenuDisplayFile, NULL, "README" }, { "2 Hardware", "The FreeBSD survival guide for PC hardware.", NULL, dmenuDisplayFile, NULL, "HARDWARE" }, { "3 Install", "A step-by-step guide to installing FreeBSD.", NULL, dmenuDisplayFile, NULL, "INSTALL" }, { "4 Copyright", "The FreeBSD Copyright notices.", NULL, dmenuDisplayFile, NULL, "COPYRIGHT" }, { "5 Release" ,"The release notes for this version of FreeBSD.", NULL, dmenuDisplayFile, NULL, "RELNOTES" }, { "6 Shortcuts", "Creating shortcuts to sysinstall.", NULL, dmenuDisplayFile, NULL, "shortcuts" }, { "7 HTML Docs", "Go to the HTML documentation menu (post-install).", NULL, docBrowser }, - { "X Exit", "Exit this menu (returning to previous)", NULL, dmenuExit }, { NULL } }, }; @@ -437,11 +437,11 @@ DMenu MenuMouse = { "menu).", NULL, NULL, - { { "1 Type", "Select mouse protocol type", NULL, dmenuSubmenu, NULL, &MenuMouseType }, + { { "X Exit", "Exit this menu (returning to previous)", NULL, dmenuExit }, + { "1 Type", "Select mouse protocol type", NULL, dmenuSubmenu, NULL, &MenuMouseType }, { "2 Port", "Select mouse port", NULL, dmenuSubmenu, NULL, &MenuMousePort }, { "3 Enable", "Test and run the mouse daemon", NULL, mousedTest, NULL, NULL }, { "4 Disable", "Disable the mouse daemon", NULL, mousedDisable, NULL, NULL }, - { "X Exit", "Exit this menu (returning to previous)", NULL, dmenuExit }, { NULL } }, }; @@ -462,11 +462,13 @@ DMenu MenuXF86Config = { #endif NULL, NULL, + { { "X Exit", "Exit this menu (returning to previous)", + NULL, dmenuExit }, #ifdef __alpha__ - { { "xf86config", "Shell-script based XFree86 configuration tool.", + { "xf86config", "Shell-script based XFree86 configuration tool.", NULL, dmenuSetVariable, NULL, VAR_XF86_CONFIG "=xf86config" }, #else - { { "XF86Setup", "Fully graphical XFree86 configuration tool.", + { "XF86Setup", "Fully graphical XFree86 configuration tool.", NULL, dmenuSetVariable, NULL, VAR_XF86_CONFIG "=XF86Setup" }, { "xf86config", "Shell-script based XFree86 configuration tool.", NULL, dmenuSetVariable, NULL, VAR_XF86_CONFIG "=xf86config" }, @@ -490,7 +492,9 @@ DMenu MenuXDesktops = { "you can choose any one of the following desktops as alternatives.", NULL, NULL, - { { "1 KDE", "The K Desktop Environment.", + { { "X Exit", "Exit this menu (returning to previous)", + NULL, dmenuExit }, + { "1 KDE", "The K Desktop Environment.", NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=kde" }, { "2 GNOME + Afterstep", "GNOME + Afterstep window manager.", NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=gnome" }, @@ -787,7 +791,9 @@ DMenu MenuDistributions = { "item or press [ENTER].", "Press F1 for more information on these options.", "distributions", - { { "All", "All system sources, binaries and X Window System)", + { { "X Exit", "Exit this menu (returning to previous)", + checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' }, + { "All", "All system sources, binaries and X Window System)", checkDistEverything, distSetEverything }, { "Reset", "Reset selected distribution list to nothing", NULL, distReset, NULL, NULL, ' ', ' ', ' ' }, @@ -818,7 +824,9 @@ DMenu MenuSubDistributions = { "DES distribution out of the U.S.! It is for U.S. customers only.", NULL, NULL, - { { "All", "All system sources, binaries and X Window System", + { { "X Exit", "Exit this menu (returning to previous)", + checkTrue, dmenuExit, '<', '<', '<' }, + { "All", "All system sources, binaries and X Window System", NULL, distSetEverything }, { "Reset", "Reset all of the below", NULL, distReset, NULL, NULL, ' ', ' ', ' ' }, @@ -874,7 +882,9 @@ DMenu MenuDESDistributions = { "distributions of this software, please consult the release notes.", NULL, NULL, - { { "All", "Select all of the below", + { { "X Exit", "Exit this menu (returning to previous)", + checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' }, + { "All", "Select all of the below", NULL, setDES }, { "Reset", "Reset all of the below", NULL, clearDES, NULL, NULL, ' ', ' ', ' ' }, @@ -903,7 +913,9 @@ DMenu MenuSrcDistributions = { "you wish to install (remember to use SPACE, not ENTER!).", NULL, NULL, - { { "All", "Select all of the below", + { { "X Exit", "Exit this menu (returning to previous)", + checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' }, + { "All", "Select all of the below", NULL, setSrc }, { "Reset", "Reset all of the below", NULL, clearSrc, NULL, NULL, ' ', ' ', ' ' }, @@ -947,12 +959,12 @@ DMenu MenuXF86Select = { "distribution sets.", NULL, NULL, - { { "All", "Select all XFree86 distribution sets", NULL, setX11All }, + { { "X Exit", "Exit this menu (returning to previous)", NULL, dmenuExit }, + { "All", "Select all XFree86 distribution sets", NULL, setX11All }, { "Reset", "Reset XFree86 distribution sets", NULL, clearX11All }, { "Basic", "Basic component menu (required)", NULL, dmenuSubmenu, NULL, &MenuXF86SelectCore }, { "Server", "X server menu", NULL, dmenuSubmenu, NULL, &MenuXF86SelectServer }, { "Fonts", "Font set menu", NULL, dmenuSubmenu, NULL, &MenuXF86SelectFonts }, - { "X Exit", "Exit this menu (returning to previous)", checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' }, { NULL } }, }; @@ -963,7 +975,9 @@ DMenu MenuXF86SelectCore = { "Bin, lib, and set are recommended for a minimum installaion.", NULL, NULL, - { { "All", "Select all below", + { { "X Exit", "Exit this menu (returning to previous)", + checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' }, + { "All", "Select all below", NULL, setX11Misc }, { "Reset", "Reset all below", NULL, clearX11Misc, NULL, NULL, ' ', ' ', ' ' }, @@ -1007,7 +1021,9 @@ install. At the minimum, you should install the standard\n\ (these are selected by default).", NULL, NULL, - { { "All", "All fonts", + { { "X Exit", "Exit this menu (returning to previous)", + checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' }, + { "All", "All fonts", NULL, setX11Fonts }, { "Reset", "Reset font selections", NULL, clearX11Fonts, NULL, NULL, ' ', ' ', ' ' }, @@ -1035,7 +1051,9 @@ DMenu MenuXF86SelectServer = { "machines, the 9EGC or 9840 servers.", NULL, NULL, - { { "All", "Select all of the above", + { { "X Exit", "Exit this menu (returning to previous)", + checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' }, + { "All", "Select all of the above", NULL, setX11Servers }, { "Reset", "Reset all of the above", NULL, clearX11Servers, NULL, NULL, ' ', ' ', ' ' }, @@ -1142,11 +1160,11 @@ DMenu MenuHTMLDoc = { "to enter an arbitrary URL for browsing.", "Press F1 for more help on what you see here.", "html", - { { "1 Handbook", "The FreeBSD Handbook.", NULL, docShowDocument }, + { { "X Exit", "Exit this menu (returning to previous)", NULL, dmenuExit }, + { "1 Handbook", "The FreeBSD Handbook.", NULL, docShowDocument }, { "2 FAQ", "The Frequently Asked Questions guide.", NULL, docShowDocument }, { "3 Home", "The Home Pages for the FreeBSD Project (requires net)", NULL, docShowDocument }, { "4 Other", "Enter a URL.", NULL, docShowDocument }, - { "X Exit", "Exit this menu (returning to previous)", NULL, dmenuExit }, { NULL } }, }; @@ -1159,7 +1177,8 @@ DMenu MenuInstallCustom = { "to install it from and how you wish to allocate disk storage to FreeBSD.", "Press F1 to read the installation guide", "install", - { { "1 Options", "View/Set various installation options", NULL, optionsEditor }, + { { "X Exit", "Exit this menu (returning to previous)", NULL, dmenuExit }, + { "1 Options", "View/Set various installation options", NULL, optionsEditor }, #ifdef __alpha__ { "2 Label", "Label disk partitions", NULL, diskLabelEditor }, { "3 Distributions", "Select distribution(s) to extract", NULL, dmenuSubmenu, NULL, &MenuDistributions }, @@ -1172,7 +1191,6 @@ DMenu MenuInstallCustom = { { "5 Media", "Choose the installation media type", NULL, dmenuSubmenu, NULL, &MenuMedia }, { "6 Commit", "Perform any pending Partition/Label/Extract actions", NULL, installCustomCommit }, #endif - { "X Exit", "Exit this menu (returning to previous)", NULL, dmenuExit }, { NULL } }, }; @@ -1210,7 +1228,9 @@ DMenu MenuConfigure = { "software not provided in the base distributions.", "Press F1 for more information on these options", "configure", - { { " Distributions", "Install additional distribution sets", + { { "X Exit", "Exit this menu (returning to previous)", + NULL, dmenuExit }, + { " Distributions", "Install additional distribution sets", NULL, distExtractAll }, { " Packages", "Install pre-packaged software for FreeBSD", NULL, configPackages }, @@ -1244,8 +1264,6 @@ DMenu MenuConfigure = { NULL, configXDesktop }, { " HTML Docs", "Go to the HTML documentation menu (post-install)", NULL, docBrowser }, - { "X Exit", "Exit this menu (returning to previous)", - NULL, dmenuExit }, { NULL } }, }; @@ -1257,7 +1275,9 @@ DMenu MenuStartup = { "RETURN key will leave this menu (as with all checkbox menus).", NULL, NULL, - { { " APM", "Auto-power management services (typically laptops)", + { { "X Exit", "Exit this menu (returning to previous)", + checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' }, + { " APM", "Auto-power management services (typically laptops)", dmenuVarCheck, dmenuToggleVariable, NULL, "apm_enable=YES" }, { " pccard", "Enable PCCARD (AKA PCMCIA) services (also laptops)", dmenuVarCheck, dmenuToggleVariable, NULL, "pccard_enable=YES" }, @@ -1303,7 +1323,9 @@ DMenu MenuNetworking = { "aspects of your system's network configuration.", NULL, NULL, - { { " Interfaces", "Configure additional network interfaces", + { { "X Exit", "Exit this menu (returning to previous)", + checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' }, + { " Interfaces", "Configure additional network interfaces", NULL, tcpMenuSelect }, { " NFS client", "This machine will be an NFS client", dmenuVarCheck, dmenuToggleVariable, NULL, "nfs_client_enable=YES" }, @@ -1403,12 +1425,12 @@ DMenu MenuSyscons = { "When you are done setting configuration options, select Cancel.", "Configure your system console settings", NULL, - { { "1 Font", "Choose an alternate screen font", NULL, dmenuSubmenu, NULL, &MenuSysconsFont }, + { { "X Exit", "Exit this menu (returning to previous)", NULL, dmenuExit }, + { "1 Font", "Choose an alternate screen font", NULL, dmenuSubmenu, NULL, &MenuSysconsFont }, { "2 Keymap", "Choose an alternate keyboard map", NULL, dmenuSubmenu, NULL, &MenuSysconsKeymap }, { "3 Repeat", "Set the rate at which keys repeat", NULL, dmenuSubmenu, NULL, &MenuSysconsKeyrate }, { "4 Saver", "Configure the screen saver", NULL, dmenuSubmenu, NULL, &MenuSysconsSaver }, { "5 Screenmap", "Choose an alternate screenmap", NULL, dmenuSubmenu, NULL, &MenuSysconsScrnmap }, - { "X Exit", "Exit this menu (returning to previous)", NULL, dmenuExit }, { NULL } }, }; @@ -1581,9 +1603,9 @@ DMenu MenuUsermgmt = { "login accounts.\n", "Configure your user groups and users", NULL, - { { "User", "Add a new user to the system.", NULL, userAddUser }, + { { "X Exit", "Exit this menu (returning to previous)", NULL, dmenuExit }, + { "User", "Add a new user to the system.", NULL, userAddUser }, { "Group", "Add a new user group to the system.", NULL, userAddGroup }, - { "X Exit", "Exit this menu (returning to previous)", NULL, dmenuExit }, { NULL } }, }; @@ -1598,10 +1620,9 @@ DMenu MenuFixit = { " limited to the subset of commands that is already available right now.", "Press F1 for more detailed repair instructions", "fixit", -{ { "1 CDROM", "Use the 2nd \"live\" CDROM from the distribution", NULL, installFixitCDROM }, +{ { "X Exit", "Exit this menu (returning to previous)", NULL, dmenuExit }, + { "1 CDROM", "Use the 2nd \"live\" CDROM from the distribution", NULL, installFixitCDROM }, { "2 Floppy", "Use a floppy generated from the fixit image", NULL, installFixitFloppy }, { "3 Shell", "Start an Emergency Holographic Shell", NULL, installFixitHoloShell }, - { "X Exit", "Exit this menu (returning to previous)", NULL, dmenuExit }, { NULL } }, }; - diff --git a/release/sysinstall/options.c b/release/sysinstall/options.c index 4177abe..8f3c97f 100644 --- a/release/sysinstall/options.c +++ b/release/sysinstall/options.c @@ -53,6 +53,7 @@ varCheck(Option opt) static char * resetLogo(char *str) { + clear(); return "[RESET!]"; } diff --git a/release/sysinstall/package.c b/release/sysinstall/package.c index 2f810a7..e63c601 100644 --- a/release/sysinstall/package.c +++ b/release/sysinstall/package.c @@ -217,6 +217,7 @@ package_extract(Device *dev, char *name, Boolean depended) msgInfo("Package %s read successfully - waiting for pkg_add(1)", name); refresh(); i = waitpid(pid, &tot, 0); + dialog_clear_norefresh(); if (sigpipe_caught || i < 0 || WEXITSTATUS(tot)) { ret = DITEM_FAILURE; if (variable_get(VAR_NO_CONFIRM)) @@ -237,6 +238,7 @@ 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); @@ -246,5 +248,5 @@ package_extract(Device *dev, char *name, Boolean depended) ret = DITEM_FAILURE; } signal(SIGPIPE, SIG_IGN); - return ret; + return ret | DITEM_RESTORE; } -- cgit v1.1