hardenedbsd/HardenedBSD
1
0
Fork 0
mirror of https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git synced 2025-01-11 17:04:19 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Clean up the variable handling code a little.

Browse Source 
Write /etc/hosts in the right place.
This commit is contained in:
Jordan K. Hubbard 1995-05-26 20:45:20 +00:00
parent a7f54e2e75
commit 395dda4194
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=8771
9 changed files with 105 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
release/sysinstall/config.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: config.c,v 1.7 1995/05/26 08:41:35 jkh Exp $
* $Id: config.c,v 1.8 1995/05/26 19:28:00 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -311,11 +311,6 @@ configResolv(void)
fprintf(fp, "nameserver\t%s\n", getenv(VAR_NAMESERVER));
msgNotify("Wrote /etc/resolv.conf");
fclose(fp);
if (getenv(VAR_IPADDR)) {
fp = fopen("/etc/hosts", "a");
fprintf(fp, "%s\t\t%s\n", getenv(VAR_IPADDR), getenv(VAR_HOSTNAME));
fclose(fp);
}
alreadyDone = TRUE;
}

10
release/sysinstall/install.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: install.c,v 1.58 1995/05/26 10:20:46 jkh Exp $
* $Id: install.c,v 1.59 1995/05/26 10:32:28 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -220,12 +220,20 @@ static void
installFinal(void)
{
static Boolean alreadyDone = FALSE;
FILE *fp;
if (alreadyDone)
return;
configFstab();
configSysconfig();
configResolv();
/* Tack ourselves at the end of /etc/hosts */
if (getenv(VAR_IPADDR)) {
fp = fopen("/etc/hosts", "a");
fprintf(fp, "%s\t\t%s\n", getenv(VAR_IPADDR), getenv(VAR_HOSTNAME));
fclose(fp);
}
alreadyDone = TRUE;
msgConfirm("Installation completed successfully.\nHit return now to go back to the main menu.");
SystemWasInstalled = TRUE;

49
release/sysinstall/variable.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: variable.c,v 1.1 1995/05/01 21:56:32 jkh Exp $
* $Id: variable.c,v 1.2 1995/05/20 10:33:13 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -45,32 +45,11 @@
/* Routines for dealing with variable lists */
void
variable_set(char *var)
{
char tmp[VAR_NAME_MAX + VAR_VALUE_MAX], *cp;
Variable *newvar;
newvar = (Variable *)safe_malloc(sizeof(Variable));
strncpy(tmp, var, VAR_NAME_MAX + VAR_VALUE_MAX);
if ((cp = index(tmp, '=')) == NULL)
msgFatal("Invalid variable format: %s", var);
*cp = '\0';
strncpy(newvar->name, tmp, VAR_NAME_MAX);
strncpy(newvar->value, cp + 1, VAR_VALUE_MAX);
newvar->next = VarHead;
VarHead = newvar;
setenv(newvar->name, newvar->value, 1);
msgInfo("Set %s to %s", newvar->name, newvar->value);
}
void
variable_set2(char *var, char *value)
static void
make_variable(char *var, char *value)
{
Variable *newvar;
if (!var || !value)
msgFatal("Null name or value passed to set_variable2!");
setenv(var, value, 1);
newvar = (Variable *)safe_malloc(sizeof(Variable));
strncpy(newvar->name, var, VAR_NAME_MAX);
@ -80,3 +59,25 @@ variable_set2(char *var, char *value)
setenv(newvar->name, newvar->value, 1);
msgInfo("Set %s to %s", newvar->name, newvar->value);
}
void
variable_set(char *var)
{
char tmp[VAR_NAME_MAX + VAR_VALUE_MAX], *cp;
strncpy(tmp, var, VAR_NAME_MAX + VAR_VALUE_MAX);
if ((cp = index(tmp, '=')) == NULL)
msgFatal("Invalid variable format: %s", var);
*(cp++) = '\0';
make_variable(tmp, cp);
}
void
variable_set2(char *var, char *value)
{
Variable *newvar;
if (!var || !value)
msgFatal("Null name or value passed to set_variable2!");
make_variable(var, value);
}

7
usr.sbin/sade/config.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: config.c,v 1.7 1995/05/26 08:41:35 jkh Exp $
* $Id: config.c,v 1.8 1995/05/26 19:28:00 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -311,11 +311,6 @@ configResolv(void)
fprintf(fp, "nameserver\t%s\n", getenv(VAR_NAMESERVER));
msgNotify("Wrote /etc/resolv.conf");
fclose(fp);
if (getenv(VAR_IPADDR)) {
fp = fopen("/etc/hosts", "a");
fprintf(fp, "%s\t\t%s\n", getenv(VAR_IPADDR), getenv(VAR_HOSTNAME));
fclose(fp);
}
alreadyDone = TRUE;
}

10
usr.sbin/sade/install.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: install.c,v 1.58 1995/05/26 10:20:46 jkh Exp $
* $Id: install.c,v 1.59 1995/05/26 10:32:28 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -220,12 +220,20 @@ static void
installFinal(void)
{
static Boolean alreadyDone = FALSE;
FILE *fp;
if (alreadyDone)
return;
configFstab();
configSysconfig();
configResolv();
/* Tack ourselves at the end of /etc/hosts */
if (getenv(VAR_IPADDR)) {
fp = fopen("/etc/hosts", "a");
fprintf(fp, "%s\t\t%s\n", getenv(VAR_IPADDR), getenv(VAR_HOSTNAME));
fclose(fp);
}
alreadyDone = TRUE;
msgConfirm("Installation completed successfully.\nHit return now to go back to the main menu.");
SystemWasInstalled = TRUE;

49
usr.sbin/sade/variable.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: variable.c,v 1.1 1995/05/01 21:56:32 jkh Exp $
* $Id: variable.c,v 1.2 1995/05/20 10:33:13 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -45,32 +45,11 @@
/* Routines for dealing with variable lists */
void
variable_set(char *var)
{
char tmp[VAR_NAME_MAX + VAR_VALUE_MAX], *cp;
Variable *newvar;
newvar = (Variable *)safe_malloc(sizeof(Variable));
strncpy(tmp, var, VAR_NAME_MAX + VAR_VALUE_MAX);
if ((cp = index(tmp, '=')) == NULL)
msgFatal("Invalid variable format: %s", var);
*cp = '\0';
strncpy(newvar->name, tmp, VAR_NAME_MAX);
strncpy(newvar->value, cp + 1, VAR_VALUE_MAX);
newvar->next = VarHead;
VarHead = newvar;
setenv(newvar->name, newvar->value, 1);
msgInfo("Set %s to %s", newvar->name, newvar->value);
}
void
variable_set2(char *var, char *value)
static void
make_variable(char *var, char *value)
{
Variable *newvar;
if (!var || !value)
msgFatal("Null name or value passed to set_variable2!");
setenv(var, value, 1);
newvar = (Variable *)safe_malloc(sizeof(Variable));
strncpy(newvar->name, var, VAR_NAME_MAX);
@ -80,3 +59,25 @@ variable_set2(char *var, char *value)
setenv(newvar->name, newvar->value, 1);
msgInfo("Set %s to %s", newvar->name, newvar->value);
}
void
variable_set(char *var)
{
char tmp[VAR_NAME_MAX + VAR_VALUE_MAX], *cp;
strncpy(tmp, var, VAR_NAME_MAX + VAR_VALUE_MAX);
if ((cp = index(tmp, '=')) == NULL)
msgFatal("Invalid variable format: %s", var);
*(cp++) = '\0';
make_variable(tmp, cp);
}
void
variable_set2(char *var, char *value)
{
Variable *newvar;
if (!var || !value)
msgFatal("Null name or value passed to set_variable2!");
make_variable(var, value);
}

7
usr.sbin/sysinstall/config.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: config.c,v 1.7 1995/05/26 08:41:35 jkh Exp $
* $Id: config.c,v 1.8 1995/05/26 19:28:00 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -311,11 +311,6 @@ configResolv(void)
fprintf(fp, "nameserver\t%s\n", getenv(VAR_NAMESERVER));
msgNotify("Wrote /etc/resolv.conf");
fclose(fp);
if (getenv(VAR_IPADDR)) {
fp = fopen("/etc/hosts", "a");
fprintf(fp, "%s\t\t%s\n", getenv(VAR_IPADDR), getenv(VAR_HOSTNAME));
fclose(fp);
}
alreadyDone = TRUE;
}

10
usr.sbin/sysinstall/install.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: install.c,v 1.58 1995/05/26 10:20:46 jkh Exp $
* $Id: install.c,v 1.59 1995/05/26 10:32:28 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -220,12 +220,20 @@ static void
installFinal(void)
{
static Boolean alreadyDone = FALSE;
FILE *fp;
if (alreadyDone)
return;
configFstab();
configSysconfig();
configResolv();
/* Tack ourselves at the end of /etc/hosts */
if (getenv(VAR_IPADDR)) {
fp = fopen("/etc/hosts", "a");
fprintf(fp, "%s\t\t%s\n", getenv(VAR_IPADDR), getenv(VAR_HOSTNAME));
fclose(fp);
}
alreadyDone = TRUE;
msgConfirm("Installation completed successfully.\nHit return now to go back to the main menu.");
SystemWasInstalled = TRUE;

49
usr.sbin/sysinstall/variable.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: variable.c,v 1.1 1995/05/01 21:56:32 jkh Exp $
* $Id: variable.c,v 1.2 1995/05/20 10:33:13 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -45,32 +45,11 @@
/* Routines for dealing with variable lists */
void
variable_set(char *var)
{
char tmp[VAR_NAME_MAX + VAR_VALUE_MAX], *cp;
Variable *newvar;
newvar = (Variable *)safe_malloc(sizeof(Variable));
strncpy(tmp, var, VAR_NAME_MAX + VAR_VALUE_MAX);
if ((cp = index(tmp, '=')) == NULL)
msgFatal("Invalid variable format: %s", var);
*cp = '\0';
strncpy(newvar->name, tmp, VAR_NAME_MAX);
strncpy(newvar->value, cp + 1, VAR_VALUE_MAX);
newvar->next = VarHead;
VarHead = newvar;
setenv(newvar->name, newvar->value, 1);
msgInfo("Set %s to %s", newvar->name, newvar->value);
}
void
variable_set2(char *var, char *value)
static void
make_variable(char *var, char *value)
{
Variable *newvar;
if (!var || !value)
msgFatal("Null name or value passed to set_variable2!");
setenv(var, value, 1);
newvar = (Variable *)safe_malloc(sizeof(Variable));
strncpy(newvar->name, var, VAR_NAME_MAX);
@ -80,3 +59,25 @@ variable_set2(char *var, char *value)
setenv(newvar->name, newvar->value, 1);
msgInfo("Set %s to %s", newvar->name, newvar->value);
}
void
variable_set(char *var)
{
char tmp[VAR_NAME_MAX + VAR_VALUE_MAX], *cp;
strncpy(tmp, var, VAR_NAME_MAX + VAR_VALUE_MAX);
if ((cp = index(tmp, '=')) == NULL)
msgFatal("Invalid variable format: %s", var);
*(cp++) = '\0';
make_variable(tmp, cp);
}
void
variable_set2(char *var, char *value)
{
Variable *newvar;
if (!var || !value)
msgFatal("Null name or value passed to set_variable2!");
make_variable(var, value);
}