diff options
Diffstat (limited to 'lib/ZVariables.c')
| -rw-r--r-- | lib/ZVariables.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/lib/ZVariables.c b/lib/ZVariables.c index 06de7bf..36635cd 100644 --- a/lib/ZVariables.c +++ b/lib/ZVariables.c @@ -17,15 +17,14 @@ static char rcsid_ZVariables_c[] = "$Header$"; #endif -#include <zephyr/mit-copyright.h> -#include <zephyr/zephyr_internal.h> +#include <internal.h> #include <ctype.h> #include <pwd.h> -static int get_localvarfile(); -static char *get_varval(); -static int varline(); +static int get_localvarfile __P((char *bfr)); +static char *get_varval __P((char *fn, char *val)); +static int varline __P((char *bfr, char *var)); char *ZGetVariable(var) char *var; @@ -36,10 +35,11 @@ char *ZGetVariable(var) if (get_localvarfile(varfile)) return ((char *)0); - if (ret = get_varval(varfile, var)) + if ((ret = get_varval(varfile, var)) != ZERR_NONE) return (ret); - return (get_varval(DEFAULT_VARS_FILE, var)); + sprintf(varfile, "%s/zephyr.vars", CONFDIR); + return (get_varval(varfile, var)); } Code_t ZSetVariable(var, value) @@ -60,7 +60,7 @@ Code_t ZSetVariable(var, value) if (!(fpout = fopen(varfilebackup, "w"))) return (errno); - if (fpin = fopen(varfile, "r")) { + if ((fpin = fopen(varfile, "r")) != NULL) { while (fgets(varbfr, sizeof varbfr, fpin) != (char *) 0) { if (varbfr[strlen(varbfr)-1] < ' ') varbfr[strlen(varbfr)-1] = '\0'; @@ -96,7 +96,7 @@ Code_t ZUnsetVariable(var) if (!(fpout = fopen(varfilebackup, "w"))) return (errno); - if (fpin = fopen(varfile, "r")) { + if ((fpin = fopen(varfile, "r")) != NULL) { while (fgets(varbfr, sizeof varbfr, fpin) != (char *) 0) { if (varbfr[strlen(varbfr)-1] < ' ') varbfr[strlen(varbfr)-1] = '\0'; @@ -112,7 +112,7 @@ Code_t ZUnsetVariable(var) return (ZERR_NONE); } -static get_localvarfile(bfr) +static int get_localvarfile(bfr) char *bfr; { char *envptr; @@ -123,7 +123,7 @@ static get_localvarfile(bfr) (void) strcpy(bfr, envptr); else { if (!(pwd = getpwuid((int) getuid()))) { - fprintf(stderr, "Zephyr internal failure: Can't find your entry in /etc/passwd\n"); + fprintf(stderr, "Zephyr internal failure: Can't determine your home directory.\n"); return (1); } (void) strcpy(bfr, pwd->pw_dir); |