upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-05-28 04:12:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Deal with both foo.hlp and FOO.TXT files.

Browse source
This commit is contained in:
Jordan K. Hubbard 1998-11-03 03:38:56 +00:00
parent 93713c9d5f
commit aa9f92fbdb
8 changed files with 52 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
release/sysinstall/installUpgrade.c
View file

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: installUpgrade.c,v 1.58 1998/05/24 02:49:54 steve Exp $
* $Id: installUpgrade.c,v 1.59 1998/08/28 01:03:41 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -164,7 +164,7 @@ installUpgrade(dialogMenuItem *self)
return installUpgradeNonInteractive(self);
variable_set2(SYSTEM_STATE, "upgrade");
systemDisplayHelp("upgrade");
systemDisplayHelp("UPGRADE");
dialog_clear_norefresh();
if (msgYesNo("Given all that scary stuff you just read, are you sure you want to\n"

18
release/sysinstall/menus.c
View file

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: menus.c,v 1.170 1998/09/30 11:49:35 jkh Exp $
* $Id: menus.c,v 1.171 1998/09/30 21:39:02 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -233,11 +233,11 @@ DMenu MenuIndex = {
{ "Distributions, Adding", "Installing additional distribution sets", NULL, distExtractAll },
{ "Distributions, XFree86","XFree86 distribution menu.", NULL, distSetXF86 },
{ "Documentation", "Installation instructions, README, etc.", NULL, dmenuSubmenu, NULL, &MenuDocumentation },
{ "Doc, README", "The distribution README file.", NULL, dmenuDisplayFile, NULL, "readme" },
{ "Doc, Hardware", "The distribution hardware guide.", NULL, dmenuDisplayFile, NULL, "hardware" },
{ "Doc, Install", "The distribution installation guide.", NULL, dmenuDisplayFile, NULL, "install" },
{ "Doc, README", "The distribution README file.", NULL, dmenuDisplayFile, NULL, "README" },
{ "Doc, Hardware", "The distribution hardware guide.", NULL, dmenuDisplayFile, NULL, "HARDWARE" },
{ "Doc, Install", "The distribution installation guide.", NULL, dmenuDisplayFile, NULL, "INSTALL" },
{ "Doc, Copyright", "The distribution copyright notices.", NULL, dmenuDisplayFile, NULL, "COPYRIGHT" },
{ "Doc, Release", "The distribution release notes.", NULL, dmenuDisplayFile, NULL, "relnotes" },
{ "Doc, Release", "The distribution release notes.", NULL, dmenuDisplayFile, NULL, "RELNOTES" },
{ "Doc, HTML", "The HTML documentation menu.", NULL, docBrowser },
{ "Emergency shell", "Start an Emergency Holographic shell.", NULL, installFixitHoloShell },
{ "Fdisk", "The disk Partition Editor", NULL, diskPartitionEditor },
@ -325,11 +325,11 @@ 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" },
{ "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" },
{ { "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" },
{ "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 },
{ "0 Exit", "Exit this menu (returning to previous)", NULL, dmenuExit },

8
release/sysinstall/system.c
View file

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: system.c,v 1.83 1998/09/30 11:44:29 jkh Exp $
* $Id: system.c,v 1.84 1998/09/30 13:36:53 jkh Exp $
*
* Jordan Hubbard
*
@ -221,9 +221,15 @@ systemHelpFile(char *file, char *buf)
return NULL;
snprintf(buf, FILENAME_MAX, "/stand/help/%s.hlp.gz", file);
if (file_readable(buf))
return expand(buf);
snprintf(buf, FILENAME_MAX, "/stand/help/%s.TXT.gz", file);
if (file_readable(buf))
return expand(buf);
snprintf(buf, FILENAME_MAX, "/usr/src/release/sysinstall/help/%s.hlp", file);
if (file_readable(buf))
return buf;
snprintf(buf, FILENAME_MAX, "/usr/src/release/sysinstall/help/%s.TXT", file);
if (file_readable(buf))
return buf;
return NULL;

18
usr.sbin/sade/menus.c
View file

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: menus.c,v 1.170 1998/09/30 11:49:35 jkh Exp $
* $Id: menus.c,v 1.171 1998/09/30 21:39:02 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -233,11 +233,11 @@ DMenu MenuIndex = {
{ "Distributions, Adding", "Installing additional distribution sets", NULL, distExtractAll },
{ "Distributions, XFree86","XFree86 distribution menu.", NULL, distSetXF86 },
{ "Documentation", "Installation instructions, README, etc.", NULL, dmenuSubmenu, NULL, &MenuDocumentation },
{ "Doc, README", "The distribution README file.", NULL, dmenuDisplayFile, NULL, "readme" },
{ "Doc, Hardware", "The distribution hardware guide.", NULL, dmenuDisplayFile, NULL, "hardware" },
{ "Doc, Install", "The distribution installation guide.", NULL, dmenuDisplayFile, NULL, "install" },
{ "Doc, README", "The distribution README file.", NULL, dmenuDisplayFile, NULL, "README" },
{ "Doc, Hardware", "The distribution hardware guide.", NULL, dmenuDisplayFile, NULL, "HARDWARE" },
{ "Doc, Install", "The distribution installation guide.", NULL, dmenuDisplayFile, NULL, "INSTALL" },
{ "Doc, Copyright", "The distribution copyright notices.", NULL, dmenuDisplayFile, NULL, "COPYRIGHT" },
{ "Doc, Release", "The distribution release notes.", NULL, dmenuDisplayFile, NULL, "relnotes" },
{ "Doc, Release", "The distribution release notes.", NULL, dmenuDisplayFile, NULL, "RELNOTES" },
{ "Doc, HTML", "The HTML documentation menu.", NULL, docBrowser },
{ "Emergency shell", "Start an Emergency Holographic shell.", NULL, installFixitHoloShell },
{ "Fdisk", "The disk Partition Editor", NULL, diskPartitionEditor },
@ -325,11 +325,11 @@ 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" },
{ "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" },
{ { "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" },
{ "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 },
{ "0 Exit", "Exit this menu (returning to previous)", NULL, dmenuExit },

8
usr.sbin/sade/system.c
View file

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: system.c,v 1.83 1998/09/30 11:44:29 jkh Exp $
* $Id: system.c,v 1.84 1998/09/30 13:36:53 jkh Exp $
*
* Jordan Hubbard
*
@ -221,9 +221,15 @@ systemHelpFile(char *file, char *buf)
return NULL;
snprintf(buf, FILENAME_MAX, "/stand/help/%s.hlp.gz", file);
if (file_readable(buf))
return expand(buf);
snprintf(buf, FILENAME_MAX, "/stand/help/%s.TXT.gz", file);
if (file_readable(buf))
return expand(buf);
snprintf(buf, FILENAME_MAX, "/usr/src/release/sysinstall/help/%s.hlp", file);
if (file_readable(buf))
return buf;
snprintf(buf, FILENAME_MAX, "/usr/src/release/sysinstall/help/%s.TXT", file);
if (file_readable(buf))
return buf;
return NULL;

4
usr.sbin/sysinstall/installUpgrade.c
View file

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: installUpgrade.c,v 1.58 1998/05/24 02:49:54 steve Exp $
* $Id: installUpgrade.c,v 1.59 1998/08/28 01:03:41 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -164,7 +164,7 @@ installUpgrade(dialogMenuItem *self)
return installUpgradeNonInteractive(self);
variable_set2(SYSTEM_STATE, "upgrade");
systemDisplayHelp("upgrade");
systemDisplayHelp("UPGRADE");
dialog_clear_norefresh();
if (msgYesNo("Given all that scary stuff you just read, are you sure you want to\n"

18
usr.sbin/sysinstall/menus.c
View file

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: menus.c,v 1.170 1998/09/30 11:49:35 jkh Exp $
* $Id: menus.c,v 1.171 1998/09/30 21:39:02 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -233,11 +233,11 @@ DMenu MenuIndex = {
{ "Distributions, Adding", "Installing additional distribution sets", NULL, distExtractAll },
{ "Distributions, XFree86","XFree86 distribution menu.", NULL, distSetXF86 },
{ "Documentation", "Installation instructions, README, etc.", NULL, dmenuSubmenu, NULL, &MenuDocumentation },
{ "Doc, README", "The distribution README file.", NULL, dmenuDisplayFile, NULL, "readme" },
{ "Doc, Hardware", "The distribution hardware guide.", NULL, dmenuDisplayFile, NULL, "hardware" },
{ "Doc, Install", "The distribution installation guide.", NULL, dmenuDisplayFile, NULL, "install" },
{ "Doc, README", "The distribution README file.", NULL, dmenuDisplayFile, NULL, "README" },
{ "Doc, Hardware", "The distribution hardware guide.", NULL, dmenuDisplayFile, NULL, "HARDWARE" },
{ "Doc, Install", "The distribution installation guide.", NULL, dmenuDisplayFile, NULL, "INSTALL" },
{ "Doc, Copyright", "The distribution copyright notices.", NULL, dmenuDisplayFile, NULL, "COPYRIGHT" },
{ "Doc, Release", "The distribution release notes.", NULL, dmenuDisplayFile, NULL, "relnotes" },
{ "Doc, Release", "The distribution release notes.", NULL, dmenuDisplayFile, NULL, "RELNOTES" },
{ "Doc, HTML", "The HTML documentation menu.", NULL, docBrowser },
{ "Emergency shell", "Start an Emergency Holographic shell.", NULL, installFixitHoloShell },
{ "Fdisk", "The disk Partition Editor", NULL, diskPartitionEditor },
@ -325,11 +325,11 @@ 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" },
{ "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" },
{ { "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" },
{ "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 },
{ "0 Exit", "Exit this menu (returning to previous)", NULL, dmenuExit },

8
usr.sbin/sysinstall/system.c
View file

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: system.c,v 1.83 1998/09/30 11:44:29 jkh Exp $
* $Id: system.c,v 1.84 1998/09/30 13:36:53 jkh Exp $
*
* Jordan Hubbard
*
@ -221,9 +221,15 @@ systemHelpFile(char *file, char *buf)
return NULL;
snprintf(buf, FILENAME_MAX, "/stand/help/%s.hlp.gz", file);
if (file_readable(buf))
return expand(buf);
snprintf(buf, FILENAME_MAX, "/stand/help/%s.TXT.gz", file);
if (file_readable(buf))
return expand(buf);
snprintf(buf, FILENAME_MAX, "/usr/src/release/sysinstall/help/%s.hlp", file);
if (file_readable(buf))
return buf;
snprintf(buf, FILENAME_MAX, "/usr/src/release/sysinstall/help/%s.TXT", file);
if (file_readable(buf))
return buf;
return NULL;