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

[durner]

Author: durner
Date: 2005-08-16 12:23:15 -0700 (Tue, 16 Aug 2005)
New Revision: 1694

Modified:
   GNUnet/src/conf/wizard_curs.c
Log:
gone

Modified: GNUnet/src/conf/wizard_curs.c
===================================================================
--- GNUnet/src/conf/wizard_curs.c       2005-08-16 19:16:45 UTC (rev 1693)
+++ GNUnet/src/conf/wizard_curs.c       2005-08-16 19:23:15 UTC (rev 1694)
@@ -84,7 +84,7 @@
   int idx, ret, autostart = 0, adv = 0;
   struct symbol *sym, *symFile;
   char *defval, *user_name = NULL, *group_name = NULL;
-  char *confDir, *confFile, *conf;
+  char *confFile;
   int fileLen;
   char * filename;
 
@@ -596,52 +596,9 @@
        dialog_clear();
        
        while(true) {
-         /* Check write permission */
-         sym = sym_find("config-daemon.in_CONF_DEF_DIR", "Meta");
-         sym_calc_value_ext(sym, 1);
-         confDir = strdup(sym_get_string_value(sym));
-       
-         symFile = sym_find("config-daemon.in_CONF_DEF_FILE", "Meta");
-         sym_calc_value_ext(symFile, 1);
-         confFile = strdup(sym_get_string_value(symFile));
-       
-               fileLen = strlen(confFile);
-               conf = malloc(strlen(confDir) + fileLen + 1);
-               strcpy(conf, confDir);
-               strcat(conf, confFile);
-               if (ACCESS(conf, W_OK))
-               {
-                       conf = realloc(conf, fileLen + 13);
-                       strcpy(conf, "/etc/gnunetd.conf");
-                       errno = 0;
-                       /**
-                        * 1. Do we have write permission to /etc/gnunetd.conf?
-                        * 2. If it doesn't exists, check for write permission 
to /etc/
-                        */
-                       if (ACCESS(conf, W_OK) == 0 ||
-                               (errno == ENOENT && ACCESS("/etc/", W_OK) == 0))
-                       {
-                               confDir = strdup("/etc/");
-                               confFile = strdup("gnunetd.conf");
-                       }
-                       else
-                       {
-                               conf = realloc(conf, fileLen + 11);
-                               strcpy(conf, "~/.gnunet/gnunetd.conf");
-                               
-                               confDir = strdup("~/.gnunet/");
-                               confFile = strdup("gnunetd.conf");
-                       }                        
-               }
-       
-               sym_set_string_value(sym, confDir);
-               sym_set_string_value(symFile, confFile);
-               mkdirp(confDir);
-               free(confDir);
-               free(confFile);
-
-               /* Write conf */
-               if (conf_write() != 0) {
+    confFile = getConfigurationString("GNUNET-SETUP",
+                "FILENAME");
+               if (conf_write(confFile) != 0) {
                  char * err;
                  const char * prefix;
                  const char * strerr;
@@ -649,8 +606,8 @@
                  prefix = _("Unable to save configuration file %s: %s.\n\nTry 
again?");
                  strerr = STRERROR(errno);
                        
-                 err = malloc(strlen(conf) + strlen(prefix) + strlen(strerr) + 
1);
-                 sprintf(err, prefix, conf, strerr);
+                 err = malloc(strlen(confFile) + strlen(prefix) + 
strlen(strerr) + 1);
+                 sprintf(err, prefix, confFile, strerr);
                        
                  ret = dialog_yesno(_("GNUnet configuration"),
                                     err, 
@@ -662,8 +619,6 @@
                else
                  ret = 1;
                        
-               free(conf);
-                       
                if (ret == 1 || ret == -1)
                        break;
        }