summaryrefslogtreecommitdiffstats
path: root/usr.sbin/sysinstall/doc.c
diff options
context:
space:
mode:
authorjkh <jkh@FreeBSD.org>1996-04-07 03:52:36 +0000
committerjkh <jkh@FreeBSD.org>1996-04-07 03:52:36 +0000
commit61af07d0231e53139c2d8c49081a0f43da46af74 (patch)
treea289c0714788a15dfb0bcf3c9030a3425c5072c3 /usr.sbin/sysinstall/doc.c
parent318997a39fbec1e8347a1ff0431ca2713799510f (diff)
downloadFreeBSD-src-61af07d0231e53139c2d8c49081a0f43da46af74.zip
FreeBSD-src-61af07d0231e53139c2d8c49081a0f43da46af74.tar.gz
Major surgery.
1. Use new dialog menu hacks (no strings, just arrays of dialogMenuItem structs) so that I can create composite menus with radio/checkbox/... items in them, removing some long-standing UI bogons in various menus. This work isn't finished yet, but will be done in two phases. This is phase one. 2. Remove all the script installation stuff. I never got time to document it, it was arcane and it just complicated much of the code. There are better ways of doing this if I want to do auto-driven installations later. 3. Remove much dead code and otherwise attempt to remove as much historical grot as possible so that this code is easier to hack on. This is also a two-stage process, phase one of which is now complete.
Diffstat (limited to 'usr.sbin/sysinstall/doc.c')
-rw-r--r--usr.sbin/sysinstall/doc.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/usr.sbin/sysinstall/doc.c b/usr.sbin/sysinstall/doc.c
index 187362d..013dd93 100644
--- a/usr.sbin/sysinstall/doc.c
+++ b/usr.sbin/sysinstall/doc.c
@@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
- * $Id: doc.c,v 1.9 1995/11/04 08:47:22 jkh Exp $
+ * $Id: doc.c,v 1.10 1995/11/06 12:49:23 jkh Exp $
*
* Jordan Hubbard
*
@@ -19,7 +19,7 @@
* and fire it up on the first copy of the handbook we can find.
*/
int
-docBrowser(char *junk)
+docBrowser(dialogMenuItem *self)
{
char *browser = variable_get(VAR_BROWSER_PACKAGE);
@@ -53,17 +53,20 @@ docBrowser(char *junk)
}
/* Run browser on the appropriate doc */
- dmenuOpenSimple(&MenuHTMLDoc);
- return RET_SUCCESS;
+ if (dmenuOpenSimple(&MenuHTMLDoc))
+ return RET_SUCCESS;
+ else
+ return RET_FAIL;
}
/* Try to show one of the documents requested from the HTML doc menu */
int
-docShowDocument(char *str)
+docShowDocument(dialogMenuItem *self)
{
char tmp[512], target[512];
char *where = NULL;
char *browser = variable_get(VAR_BROWSER_BINARY);
+ char *str = self->prompt;
if (!file_executable(browser)) {
dialog_clear();
OpenPOWER on IntegriCloud