ExternalVendorCode/serval-dna
1
0
Fork 0
mirror of https://github.com/servalproject/serval-dna.git synced 2025-03-10 22:43:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix bugs revealed by dna config tests

Browse Source
This commit is contained in:
Andrew Bettison 2012-04-12 17:40:00 +09:30
parent 42b117f735
commit 6b8f504db4
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
commandline.c
View File

@ -560,9 +560,9 @@ static int set_variable(const char *var, const char *val)
line[0]=0; fgets(line,1024,in);
while(line[0]) {
if (!strncasecmp(var, line, varlen) && line[varlen] == '=') {
found = 1;
if (val)
if (!found && val)
fprintf(out, "%s=%s\n", var, val);
found = 1;
} else
fprintf(out,"%s",line);
line[0]=0; fgets(line,1024,in);
@ -590,6 +590,8 @@ int app_server_set(int argc,char **argv,struct command_line_option *o)
int app_server_del(int argc,char **argv,struct command_line_option *o)
{
char *var = cli_arg(argc, argv, o, "variable", "");
if (create_serval_instance_dir() == -1)
return -1;
return set_variable(var, NULL);
}
@ -598,6 +600,8 @@ int app_server_get(int argc,char **argv,struct command_line_option *o)
char *var = cli_arg(argc, argv, o, "variable", "");
char conffile[1024];
FILE *in;
if (create_serval_instance_dir() == -1)
return -1;
if (!FORM_SERVAL_INSTANCE_PATH(conffile, "serval.conf") ||
!((in = fopen(conffile, "r")) || (in = fopen(conffile, "w")))
) {