[GNUnet-SVN] r7235 - in GNUnet: contrib/win src/applications/fs/tools src/include

[gnunet]

Author: durner
Date: 2008-06-15 05:34:54 -0600 (Sun, 15 Jun 2008)
New Revision: 7235

Modified:
   GNUnet/contrib/win/Installer.nsi
   GNUnet/src/applications/fs/tools/gnunet-auto-share.c
   GNUnet/src/include/gnunet_directories.h
Log:
gnunet-auto-share for Windows

Modified: GNUnet/contrib/win/Installer.nsi
===================================================================
--- GNUnet/contrib/win/Installer.nsi    2008-06-15 07:21:00 UTC (rev 7234)
+++ GNUnet/contrib/win/Installer.nsi    2008-06-15 11:34:54 UTC (rev 7235)
@@ -214,6 +214,8 @@
       inst_conf:
         SetOutPath "$DATADIR\GNU\GNUnet\etc"
         File "C:\GNUnet\etc\gnunetd.conf"
+        ; site wide user config (gnunet-auto-share)
+        File "C:\GNUnet\etc\gnunet.conf"
       noinst_conf:
         FileClose $0
                SectionEnd

Modified: GNUnet/src/applications/fs/tools/gnunet-auto-share.c
===================================================================
--- GNUnet/src/applications/fs/tools/gnunet-auto-share.c        2008-06-15 
07:21:00 UTC (rev 7234)
+++ GNUnet/src/applications/fs/tools/gnunet-auto-share.c        2008-06-15 
11:34:54 UTC (rev 7235)
@@ -71,7 +71,13 @@
 
 static struct GNUNET_FSUI_Context *ctx;
 
-static char *cfgFilename = GNUNET_DEFAULT_CLIENT_CONFIG_FILE;
+static char *cfgFilename =
+#ifndef MINGW  
+  GNUNET_DEFAULT_CLIENT_CONFIG_FILE
+#else
+  GNUNET_DEFAULT_CLIENT_SITE_CONFIG_FILE
+#endif
+  ;
 
 static struct GNUNET_ECRS_URI *gloKeywords;
 
@@ -154,6 +160,8 @@
    gettext_noop ("set the desired LEVEL of sender-anonymity"),
    1, &GNUNET_getopt_configure_set_uint, &anonymity},
   GNUNET_COMMAND_LINE_OPTION_CFG_FILE (&cfgFilename),   /* -c */
+  {'@', "win-service", NULL, "", 0,
+   &GNUNET_getopt_configure_set_option, "GNUNET-AUTO-SHARE:WINSERVICE"},
   {'d', "debug", NULL,
    gettext_noop ("run in debug mode; gnunet-auto-share will "
                  "not daemonize and error messages will "
@@ -964,7 +972,7 @@
                                                GNUNET_NO) == GNUNET_YES)
     {
       SERVICE_TABLE_ENTRY DispatchTable[] =
-        { {"gnunet-auto-share", ServiceMain}
+        { {"GNUnet Auto Share", ServiceMain}
       , {NULL, NULL}
       };
       errorCode = (GNStartServiceCtrlDispatcher (DispatchTable) != 0);

Modified: GNUnet/src/include/gnunet_directories.h
===================================================================
--- GNUnet/src/include/gnunet_directories.h     2008-06-15 07:21:00 UTC (rev 
7234)
+++ GNUnet/src/include/gnunet_directories.h     2008-06-15 11:34:54 UTC (rev 
7235)
@@ -29,6 +29,7 @@
 #define GNUNET_DIRECTORIES
 
 #define GNUNET_DEFAULT_CLIENT_CONFIG_FILE "~/.gnunet/gnunet.conf"
+#define GNUNET_DEFAULT_CLIENT_SITE_CONFIG_FILE "/etc/gnunet.conf"
 #define GNUNET_DEFAULT_DAEMON_CONFIG_FILE "/etc/gnunetd.conf"
 #define GNUNET_DEFAULT_DAEMON_VAR_DIRECTORY       "$GNUNETD_HOME"
 #define GNUNET_DEFAULT_HOME_DIRECTORY      "$GNUNET_HOME"