[GNUnet-SVN] r282 - GNUnet/src/util branches/GNUnet06 branches/GNUnet06/src/util

[grothoff]

Author: grothoff
Date: 2005-02-16 22:14:27 -0800 (Wed, 16 Feb 2005)
New Revision: 282

Modified:
   GNUnet/src/util/configuration.c
   branches/GNUnet06/ChangeLog
   branches/GNUnet06/src/util/configuration.c
Log:
adding support for GNUNET(D)_CONFIG environment variable lookup

Modified: GNUnet/src/util/configuration.c
===================================================================
--- GNUnet/src/util/configuration.c     2005-02-16 22:11:25 UTC (rev 281)
+++ GNUnet/src/util/configuration.c     2005-02-17 06:14:27 UTC (rev 282)
@@ -406,10 +406,16 @@
   if (cfgName == NULL) {
     if (testConfigurationString("GNUNETD",
                                "_MAGIC_",
-                               "YES"))
-      expCfgName = STRDUP(DEFAULT_DAEMON_CONFIG_FILE);
-    else
-      expCfgName = expandFileName(DEFAULT_CLIENT_CONFIG_FILE);
+                               "YES")) {
+      expCfgName = getenv("GNUNETD_CONFIG");
+      if (expCfgName == NULL)
+       expCfgName = DEFAULT_DAEMON_CONFIG_FILE;
+    } else {
+      expCfgName = getenv("GNUNET_CONFIG");
+      if (expCfgName == NULL)
+       expCfgName = DEFAULT_CLIENT_CONFIG_FILE;
+    }
+    expCfgName = expandFileName(expCfgName);
     setConfigurationString("FILES",
                           "gnunet.conf",
                           expCfgName);

Modified: branches/GNUnet06/ChangeLog
===================================================================
--- branches/GNUnet06/ChangeLog 2005-02-16 22:11:25 UTC (rev 281)
+++ branches/GNUnet06/ChangeLog 2005-02-17 06:14:27 UTC (rev 282)
@@ -1,3 +1,7 @@
+Thu Feb 17 01:14:30 EST 2005
+       Various memory leaks for Win32 fixed.
+       Added support for GNUNET(D)_CONFIG environment variable.
+
 Wed Feb  9 13:33:38 EST 2005
         Fixed problems with the logrotate code.  Releasing GNUnet 0.6.6a.
 

Modified: branches/GNUnet06/src/util/configuration.c
===================================================================
--- branches/GNUnet06/src/util/configuration.c  2005-02-16 22:11:25 UTC (rev 
281)
+++ branches/GNUnet06/src/util/configuration.c  2005-02-17 06:14:27 UTC (rev 
282)
@@ -406,10 +406,16 @@
   if (cfgName == NULL) {
     if (testConfigurationString("GNUNETD",
                                "_MAGIC_",
-                               "YES"))
-      expCfgName = STRDUP(DEFAULT_DAEMON_CONFIG_FILE);
-    else
-      expCfgName = expandFileName(DEFAULT_CLIENT_CONFIG_FILE);
+                               "YES")) {
+      expCfgName = getenv("GNUNETD_CONFIG");
+      if (expCfgName == NULL)
+       expCfgName = DEFAULT_DAEMON_CONFIG_FILE;
+    } else {
+      expCfgName = getenv("GNUNET_CONFIG");
+      if (expCfgName == NULL)
+       expCfgName = DEFAULT_CLIENT_CONFIG_FILE;
+    }
+    expCfgName = expandFileName(expCfgName);
     setConfigurationString("FILES",
                           "gnunet.conf",
                           expCfgName);