[GNUnet-SVN] r705 - GNUnet/src/conf

[durner]

Author: durner
Date: 2005-04-28 12:52:33 -0700 (Thu, 28 Apr 2005)
New Revision: 705

Modified:
   GNUnet/src/conf/confdata.c
Log:
fix moving previous config file

Modified: GNUnet/src/conf/confdata.c
===================================================================
--- GNUnet/src/conf/confdata.c  2005-04-27 16:06:30 UTC (rev 704)
+++ GNUnet/src/conf/confdata.c  2005-04-28 19:52:33 UTC (rev 705)
@@ -220,7 +220,7 @@
        struct symbol *sym;
        struct menu *menu;
        const char *basename;
-       char dirname[128], tmpname[128], newname[128];
+       char dirname[128], tmpname[128], dstname[128], newname[128];
        int type;
        const char *str;
 
@@ -325,16 +325,16 @@
                }
        }
        fclose(out);
-       if (!name || basename != conf_def_filename) {
-               if (!name)
-                       name = conf_def_filename;
-               sprintf(tmpname, "%s.old", name);
-    UNLINK(tmpname);
-               RENAME(name, tmpname);
-       }
-       sprintf(tmpname, "%s%s", dirname, basename);
-       if (RENAME(newname, tmpname))
+       
+       sprintf(tmpname, "%s%s.old", dirname, basename);
+       UNLINK(tmpname);
+       sprintf(dstname, "%s%s", dirname, basename);
+       RENAME(dstname, tmpname);
+
+       if (RENAME(newname, dstname))
                return 1;
+               
+       UNLINK(newname);
 
        sym_change_count = 0;