stuff

[oweals/gnunet.git] / src / util / program.c

diff --git a/src/util/program.c b/src/util/program.c
index 1a4c1175dd524680e3026b8719bba1ca79472af6..145d97a57dfecc4a204422f9f28ec34bba4a0e2a 100644 (file)
--- a/src/util/program.c
+++ b/src/util/program.c
@@ -38,8 +38,8 @@
 #if HAVE_ARGZ_H
 #include <argz.h>
 #else
-#include "program_lib_strndup.c"
 #include "program_lib_strnlen.c"
+#include "program_lib_strndup.c"
 #include "program_lib_mempcpy.c"
 #include "program_lib_argz.c"
 #endif
@@ -138,6 +138,7 @@ GNUNET_PROGRAM_run (int argc,
   struct CommandContext cc;
   char *path;
   char *loglev;
+  char *logfile;
   int ret;
   unsigned int cnt;
   struct GNUNET_CONFIGURATION_Handle *cfg;
@@ -145,11 +146,13 @@ GNUNET_PROGRAM_run (int argc,
     GNUNET_GETOPT_OPTION_CFG_FILE (&cc.cfgfile),
     GNUNET_GETOPT_OPTION_HELP (binaryHelp),
     GNUNET_GETOPT_OPTION_LOGLEVEL (&loglev),
+    GNUNET_GETOPT_OPTION_LOGFILE (&logfile),
     GNUNET_GETOPT_OPTION_VERSION (PACKAGE_VERSION)
   };
   struct GNUNET_GETOPT_CommandLineOption *allopts;
   const char *gargs;
 
+  logfile = NULL;
   gargs = getenv ("GNUNET_ARGS");
   if (gargs != NULL)
     {
@@ -201,13 +204,14 @@ GNUNET_PROGRAM_run (int argc,
   qsort (allopts, cnt, sizeof (struct GNUNET_GETOPT_CommandLineOption),
          &cmd_sorter);
   loglev = GNUNET_strdup ("WARNING");
+  cc.cfgfile = GNUNET_strdup (GNUNET_DEFAULT_USER_CONFIG_FILE);
   if ((-1 == (ret = GNUNET_GETOPT_run (binaryName,
                                        allopts,
                                        (unsigned int) argc, argv))) ||
       ((GNUNET_OK !=
         GNUNET_log_setup (binaryName,
                           loglev,
-                          NULL)) ||
+                          logfile)) ||
        (GNUNET_OK != GNUNET_CONFIGURATION_load (cfg, cc.cfgfile))))
 
     {