Author: durner
Date: 2005-03-23 10:52:06 -0800 (Wed, 23 Mar 2005)
New Revision: 482
Modified:
GNUnet/contrib/config.in
GNUnet/src/conf/confdata.c
Log:
fix
Modified: GNUnet/contrib/config.in
===================================================================
--- GNUnet/contrib/config.in 2005-03-22 01:43:43 UTC (rev 481)
+++ GNUnet/contrib/config.in 2005-03-23 18:52:06 UTC (rev 482)
@@ -40,7 +40,7 @@
config HELOEXPIRES
int "How many minutes should peer advertisements last?"
- default "1440"
+ default 1440
depends on ADVANCED
help
How many minutes is the current IP valid? (GNUnet will sign
HELO
Modified: GNUnet/src/conf/confdata.c
===================================================================
--- GNUnet/src/conf/confdata.c 2005-03-22 01:43:43 UTC (rev 481)
+++ GNUnet/src/conf/confdata.c 2005-03-23 18:52:06 UTC (rev 482)
@@ -214,7 +214,7 @@
case S_STRING:
if (*p++ != '"')
break;
- for (p2 = p; (p2 = strpbrk(p2, "\"\\")); p2++) {
+ for (p2 = p; *p2; p2++) {
if (*p2 == '"') {
*p2 = 0;
break;
@@ -344,8 +344,7 @@
"# Automatically generated by gnunet-setup:
don't edit\n"
"#\n");
- if (!sym_change_count)
- sym_clear_all_valid();
+ sym_clear_all_valid();
menu = rootmenu.list;
while (menu) {
@@ -401,29 +400,10 @@
}
break;
case S_STRING:
- /* FIXME */
str = sym_get_string_value(sym);
- fprintf(out, "CONFIG_%s!%s=\"", sym->sect,
sym->name);
- if (out_h)
- fprintf(out_h, "%s = \"", sym->name);
- do {
- l = strcspn(str, "\"\\");
- if (l) {
- GN_FWRITE(str, l, 1, out);
- if (out_h)
- GN_FWRITE(str, l, 1, out_h);
- }
- str += l;
- while (*str == '\\' || *str == '"') {
- fprintf(out, "\\%c", *str);
- if (out_h)
- fprintf(out_h, "\\%c",
*str);
- str++;
- }
- } while (*str);
- fputs("\"\n", out);
- if (out_h)
- fputs("\"\n", out_h);
+ fprintf(out, "CONFIG_%s!%s=\"%s\"\n",
sym->sect, sym->name, str);
+ if (out_h)
+ fprintf(out_h, "%s = \"%s\"\n", sym->name, str);
break;
case S_HEX:
str = sym_get_string_value(sym);
@@ -466,6 +446,7 @@
if (!name)
name = conf_def_filename;
sprintf(tmpname, "%s.old", name);
+ UNLINK(tmpname);
RENAME(name, tmpname);
}
sprintf(tmpname, "%s%s", dirname, basename);
_______________________________________________
GNUnet-SVN mailing list
GNUnet-SVN@gnu.org
http://lists.gnu.org/mailman/listinfo/gnunet-svn
