Allow applications to change ProjectData with only some fields

Some simple applications (e.g. thin clients) might want to change the
ProjectData structure (e.g. for gettext), but might not meet all the
requirements needed to fill it out completely.

A thin client might not provide any library, making the `libname' field
useless.  More importantly, not every application requires a configuration:
some of them, especially clients, might simply use command line options to
drive their behaviour.

1 files changed, 15 insertions, 10 deletions

diff --git a/src/util/program.c b/src/util/program.c
index 8bda34b4f..b5484855c 100644
--- a/src/util/program.c
+++ b/src/util/program.c
@@ -232,15 +232,20 @@ GNUNET_PROGRAM_run2 (int argc,
          sizeof(struct GNUNET_GETOPT_CommandLineOption),
          &cmd_sorter);
   loglev = NULL;
-  xdg = getenv ("XDG_CONFIG_HOME");
-  if (NULL != xdg)
-    GNUNET_asprintf (&cfg_fn,
-                     "%s%s%s",
-                     xdg,
-                     DIR_SEPARATOR_STR,
-                     pd->config_file);
+  if (NULL != pd->config_file && NULL != pd->user_config_file)
+  {
+    xdg = getenv ("XDG_CONFIG_HOME");
+    if (NULL != xdg)
+      GNUNET_asprintf (&cfg_fn,
+                       "%s%s%s",
+                       xdg,
+                       DIR_SEPARATOR_STR,
+                       pd->config_file);
+    else
+      cfg_fn = GNUNET_strdup (pd->user_config_file);
+  }
   else
-    cfg_fn = GNUNET_strdup (pd->user_config_file);
+    cfg_fn = NULL;
   lpfx = GNUNET_strdup (binaryName);
   if (NULL != (spc = strstr (lpfx, " ")))
     *spc = '\0';
@@ -269,7 +274,7 @@ GNUNET_PROGRAM_run2 (int argc,
   }
   else
   {
-    if (GNUNET_YES == GNUNET_DISK_file_test (cfg_fn))
+    if (NULL != cfg_fn && GNUNET_YES == GNUNET_DISK_file_test (cfg_fn))
     {
       if (GNUNET_SYSERR == GNUNET_CONFIGURATION_load (cfg, cfg_fn))
       {
@@ -284,7 +289,7 @@ GNUNET_PROGRAM_run2 (int argc,
         goto cleanup;
       }
     }
-    else
+    else if (NULL != cfg_fn)
     {
       GNUNET_free (cfg_fn);
       cfg_fn = NULL;