diff options
| author | Jordan K. Hubbard <jkh@FreeBSD.org> | 2000-02-20 23:50:01 +0000 |
|---|---|---|
| committer | Jordan K. Hubbard <jkh@FreeBSD.org> | 2000-02-20 23:50:01 +0000 |
| commit | 38d34983905632e7b933380d82b55fc32d161887 (patch) | |
| tree | 41406dfa00b11e81f756e5dc603e0e849178e16d /usr.sbin | |
| parent | f53cb8a8cc9b699c1f213d987a4fe41ca843d148 (diff) | |
| download | src-38d34983905632e7b933380d82b55fc32d161887.tar.gz src-38d34983905632e7b933380d82b55fc32d161887.zip | |
Make the doc menu work again by checking the right variables.
Notes
Notes:
svn path=/head/; revision=57367
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/sysinstall/doc.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/usr.sbin/sysinstall/doc.c b/usr.sbin/sysinstall/doc.c index 19cd4a8b2e8d..9e7459fe41e1 100644 --- a/usr.sbin/sysinstall/doc.c +++ b/usr.sbin/sysinstall/doc.c @@ -86,9 +86,8 @@ docBrowser(dialogMenuItem *self) int docShowDocument(dialogMenuItem *self) { - char tmp[512], target[512]; - char *where = NULL; - char *browser = variable_get(VAR_BROWSER_BINARY); + char *tmp[512], target[512]; + char *where, *browser = variable_get(VAR_BROWSER_BINARY); char *str = self->prompt; if (!file_executable(browser)) { @@ -96,24 +95,25 @@ docShowDocument(dialogMenuItem *self) "properly set in the Options editor.", browser); return DITEM_FAILURE; } - if (!strstr(str, "Home")) - where = "http://www.freebsd.org"; - else if (!strstr(str, "Other")) + /* Default to Home */ + where = strcpy(target, "http://www.freebsd.org"); + if (strstr(str, "Other")) { where = msgGetInput("http://www.freebsd.org", "Please enter the URL of the location you wish to visit."); - else if (!strstr(str, "FAQ")) { - strcpy(target, "/usr/share/doc/faq/index.html"); + if (where) + strcpy(target, where); + } + else if (strstr(str, "FAQ")) { + where = strcpy(target, "/usr/share/doc/faq/index.html"); if (!file_readable(target)) - strcpy(target, "http://www.freebsd.org/FAQ"); - where = target; + where = strcpy(target, "http://www.freebsd.org/FAQ"); } - else if (!strstr(str, "Handbook")) { - strcpy(target, "/usr/share/doc/handbook/index.html"); + else if (strstr(str, "Handbook")) { + where = strcpy(target, "/usr/share/doc/handbook/index.html"); if (!file_readable(target)) - strcpy(target, "http://www.freebsd.org/handbook"); - where = target; + where = strcpy(target, "http://www.freebsd.org/handbook"); } if (where) { - sprintf(tmp, "%s %s", browser, where); + sprintf(tmp, "%s %s", browser, target); systemExecute(tmp); return DITEM_SUCCESS; } |