mirror of
https://github.com/freebsd/freebsd-src.git
synced 2024-11-28 09:02:44 +00:00
Sync up for this snapshot.
This commit is contained in:
parent
467027edc6
commit
05bbe72676
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=11804
@ -54,7 +54,7 @@
|
||||
#include "sysinstall.h"
|
||||
|
||||
#define APACHE_BASE "/usr/local/www"
|
||||
#define APACHE_HELPFILE "apache.hlp"
|
||||
#define APACHE_HELPFILE "apache"
|
||||
#define APACHE_PACKAGE "apache-0.8.14"
|
||||
|
||||
typedef struct
|
||||
@ -489,6 +489,7 @@ installApache(char *unused)
|
||||
msgNotify("Writing configuration files....");
|
||||
sleep(1);
|
||||
|
||||
(void)vsystem("mkdir -p %s/config", APACHE_BASE);
|
||||
sprintf(file, "%s/config/access.conf", APACHE_BASE);
|
||||
if (file_readable(file))
|
||||
{
|
||||
|
@ -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.3 1995/10/22 01:32:42 jkh Exp $
|
||||
* $Id: doc.c,v 1.5 1995/10/22 17:39:05 jkh Exp $
|
||||
*
|
||||
* Jordan Hubbard
|
||||
*
|
||||
@ -67,6 +67,8 @@ docBrowser(char *junk)
|
||||
int
|
||||
docShowDocument(char *str)
|
||||
{
|
||||
char tmp[512], target[512];
|
||||
char *where = NULL;
|
||||
char *browser = variable_get(VAR_BROWSER_BINARY);
|
||||
|
||||
if (!file_executable(browser)) {
|
||||
@ -76,17 +78,16 @@ docShowDocument(char *str)
|
||||
return RET_FAIL;
|
||||
}
|
||||
if (!strcmp(str, "Home"))
|
||||
vsystem("%s http://www.freebsd.org", browser);
|
||||
else if (!strcmp(str, "Other")) {
|
||||
}
|
||||
where = "http://www.freebsd.org";
|
||||
else if (!strcmp(str, "Other"))
|
||||
where = msgGetInput("http://www.freebsd.org", "Please enter the URL of the location you wish to visit.");
|
||||
else {
|
||||
char target[512];
|
||||
|
||||
sprintf(target, "/usr/share/doc/%s/%s.html", str, str);
|
||||
if (file_readable(target))
|
||||
vsystem("%s file:%s", browser, target);
|
||||
else
|
||||
vsystem("%s http://www.freebsd.org/%s");
|
||||
if (!file_readable(target))
|
||||
sprintf(target, "http://www.freebsd.org/%s", str);
|
||||
where = target;
|
||||
}
|
||||
sprintf(tmp, "%s %s", browser, where);
|
||||
systemExecute(tmp);
|
||||
return RET_SUCCESS;
|
||||
}
|
||||
|
@ -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.3 1995/10/22 01:32:42 jkh Exp $
|
||||
* $Id: doc.c,v 1.5 1995/10/22 17:39:05 jkh Exp $
|
||||
*
|
||||
* Jordan Hubbard
|
||||
*
|
||||
@ -67,6 +67,8 @@ docBrowser(char *junk)
|
||||
int
|
||||
docShowDocument(char *str)
|
||||
{
|
||||
char tmp[512], target[512];
|
||||
char *where = NULL;
|
||||
char *browser = variable_get(VAR_BROWSER_BINARY);
|
||||
|
||||
if (!file_executable(browser)) {
|
||||
@ -76,17 +78,16 @@ docShowDocument(char *str)
|
||||
return RET_FAIL;
|
||||
}
|
||||
if (!strcmp(str, "Home"))
|
||||
vsystem("%s http://www.freebsd.org", browser);
|
||||
else if (!strcmp(str, "Other")) {
|
||||
}
|
||||
where = "http://www.freebsd.org";
|
||||
else if (!strcmp(str, "Other"))
|
||||
where = msgGetInput("http://www.freebsd.org", "Please enter the URL of the location you wish to visit.");
|
||||
else {
|
||||
char target[512];
|
||||
|
||||
sprintf(target, "/usr/share/doc/%s/%s.html", str, str);
|
||||
if (file_readable(target))
|
||||
vsystem("%s file:%s", browser, target);
|
||||
else
|
||||
vsystem("%s http://www.freebsd.org/%s");
|
||||
if (!file_readable(target))
|
||||
sprintf(target, "http://www.freebsd.org/%s", str);
|
||||
where = target;
|
||||
}
|
||||
sprintf(tmp, "%s %s", browser, where);
|
||||
systemExecute(tmp);
|
||||
return RET_SUCCESS;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user