aboutsummaryrefslogtreecommitdiff
path: root/release/sysinstall/apache.c
diff options
context:
space:
mode:
authorJordan K. Hubbard <jkh@FreeBSD.org>1996-12-09 08:22:19 +0000
committerJordan K. Hubbard <jkh@FreeBSD.org>1996-12-09 08:22:19 +0000
commit00b69db338558f07cd23191647a641b53fded983 (patch)
tree703f1957c7cb4d3138f4dca933a94c51a76a6ae6 /release/sysinstall/apache.c
parent8bc3ddf57f95b8be12692eb1cc52d01bee4c7b1f (diff)
Notes
Diffstat (limited to 'release/sysinstall/apache.c')
-rw-r--r--release/sysinstall/apache.c34
1 files changed, 17 insertions, 17 deletions
diff --git a/release/sysinstall/apache.c b/release/sysinstall/apache.c
index d33b4cf56e63..bc52542d6078 100644
--- a/release/sysinstall/apache.c
+++ b/release/sysinstall/apache.c
@@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
- * $Id: apache.c,v 1.27 1996/09/01 08:17:13 jkh Exp $
+ * $Id: apache.c,v 1.28 1996/11/04 12:56:15 jkh Exp $
*
* Copyright (c) 1995
* Coranth Gryphon. All rights reserved.
@@ -232,15 +232,15 @@ apacheOpenDialog(void)
sprintf(tconf.hostname, "www.%s", tmp);
}
- strcpy(tconf.defuser, DEFAULT_USER);
- strcpy(tconf.defgroup, DEFAULT_GROUP);
+ SAFE_STRCPY(tconf.defuser, DEFAULT_USER);
+ SAFE_STRCPY(tconf.defgroup, DEFAULT_GROUP);
- strcpy(tconf.userdir, USER_HOMEDIR);
- strcpy(tconf.welcome, WELCOME_FILE);
+ SAFE_STRCPY(tconf.userdir, USER_HOMEDIR);
+ SAFE_STRCPY(tconf.welcome, WELCOME_FILE);
- strcpy(tconf.logdir, LOGS_SUBDIR);
- strcpy(tconf.accesslog, ACCESS_LOGNAME);
- strcpy(tconf.errorlog, ERROR_LOGNAME);
+ SAFE_STRCPY(tconf.logdir, LOGS_SUBDIR);
+ SAFE_STRCPY(tconf.accesslog, ACCESS_LOGNAME);
+ SAFE_STRCPY(tconf.errorlog, ERROR_LOGNAME);
sprintf(tconf.docroot, "%s/%s", APACHE_BASE,DATA_SUBDIR);
@@ -399,21 +399,21 @@ configApache(dialogMenuItem *self)
}
/*** Fix defaults for invalid value ***/
if (!tconf.logdir[0])
- strcpy(tconf.logdir, LOGS_SUBDIR);
+ SAFE_STRCPY(tconf.logdir, LOGS_SUBDIR);
if (!tconf.accesslog[0])
- strcpy(tconf.accesslog, ACCESS_LOGNAME);
+ SAFE_STRCPY(tconf.accesslog, ACCESS_LOGNAME);
if (!tconf.errorlog[0])
- strcpy(tconf.errorlog, ERROR_LOGNAME);
+ SAFE_STRCPY(tconf.errorlog, ERROR_LOGNAME);
if (!tconf.welcome[0])
- strcpy(tconf.welcome, WELCOME_FILE);
+ SAFE_STRCPY(tconf.welcome, WELCOME_FILE);
if (!tconf.userdir[0])
- strcpy(tconf.userdir, USER_HOMEDIR);
+ SAFE_STRCPY(tconf.userdir, USER_HOMEDIR);
if (!tconf.defuser[0])
- strcpy(tconf.defuser, DEFAULT_USER);
+ SAFE_STRCPY(tconf.defuser, DEFAULT_USER);
if (!tconf.defgroup[0])
- strcpy(tconf.defgroup, DEFAULT_GROUP);
+ SAFE_STRCPY(tconf.defgroup, DEFAULT_GROUP);
/*** If the user did not specify a directory, use default ***/
@@ -433,9 +433,9 @@ configApache(dialogMenuItem *self)
if (!file_readable(file)) {
tptr = msgGetInput(NULL, "What is your company name?");
if (tptr && tptr[0])
- strcpy(company, tptr);
+ SAFE_STRCPY(company, tptr);
else
- strcpy(company, "our Web Page");
+ SAFE_STRCPY(company, "our Web Page");
msgNotify("Creating sample web page...");
fptr = fopen(file,"w");