[GNUnet-SVN] r7275 - in GNUnet/src: setup setup/lib util/os

[gnunet]

Author: moon
Date: 2008-06-19 11:40:28 -0600 (Thu, 19 Jun 2008)
New Revision: 7275

Modified:
   GNUnet/src/setup/gnunet-setup.c
   GNUnet/src/setup/lib/wizard_util.c
   GNUnet/src/util/os/osconfig.c
Log:
fix 'Error: success' when setting autostart for gnunetd
fix unconventional service name on Unix (likely causing failure)
improve two strings



Modified: GNUnet/src/setup/gnunet-setup.c
===================================================================
--- GNUnet/src/setup/gnunet-setup.c     2008-06-19 14:04:20 UTC (rev 7274)
+++ GNUnet/src/setup/gnunet-setup.c     2008-06-19 17:40:28 UTC (rev 7275)
@@ -260,7 +260,7 @@
           GNUNET_GE_LOG (ectx,
                          GNUNET_GE_WARNING | GNUNET_GE_REQUEST |
                          GNUNET_GE_USER,
-                         _("No interface specified, using default\n"));
+                         _("No interface specified, using default.\n"));
           operation = "config";
 #if HAVE_DIALOG
           operation = "menuconfig";
@@ -412,7 +412,7 @@
   GNUNET_free (cfgFilename);
   if (done == GNUNET_NO)
     {
-      fprintf (stderr, _("Unknown operation `%s'\n"), operation);
+      fprintf (stderr, _("Unknown operation '%s'.\n"), operation);
       fprintf (stderr, _("Use --help to get a list of options.\n"));
 #if HAVE_GUILE
       GNUNET_GNS_free_specification (gns);

Modified: GNUnet/src/setup/lib/wizard_util.c
===================================================================
--- GNUnet/src/setup/lib/wizard_util.c  2008-06-19 14:04:20 UTC (rev 7274)
+++ GNUnet/src/setup/lib/wizard_util.c  2008-06-19 17:40:28 UTC (rev 7275)
@@ -175,7 +175,7 @@
 
   ret = GNUNET_configure_user_account (0, 1, user_name, group_name);
 
-  if (ret)
+  if (ret != GNUNET_OK)
     {
 #ifdef MINGW
       char *err;

Modified: GNUnet/src/util/os/osconfig.c
===================================================================
--- GNUnet/src/util/os/osconfig.c       2008-06-19 14:04:20 UTC (rev 7274)
+++ GNUnet/src/util/os/osconfig.c       2008-06-19 17:40:28 UTC (rev 7275)
@@ -309,11 +309,16 @@
 #else
   struct stat buf;
   int ret;
+  int i;
   char *initscript;
 
-  initscript = GNUNET_malloc (strlen (servicename) + 13);
+  i = strlen (application) - 1;
+  while ( (application < &application[i]) && (application[i] != DIR_SEPARATOR) 
)
+    i--;
+
+  initscript = GNUNET_malloc (strlen (&application[i]) + 13);
   strcpy (initscript, "/etc/init.d/");
-  strcat (initscript, servicename);
+  strcat (initscript, &application[i]);
 
   /* Unix */
   if ((ACCESS ("/usr/sbin/update-rc.d", X_OK) != 0))
@@ -484,7 +489,8 @@
       errno = 0;
       if (ACCESS ("/usr/sbin/update-rc.d", W_OK) == 0)
         {
-          if (-1 != system ("/usr/sbin/update-rc.d gnunetd remove"))
+          ret = system ("/usr/sbin/update-rc.d gnunetd remove");
+          if (ret != 0)
             {
               GNUNET_GE_LOG_STRERROR_FILE (ectx,
                                            GNUNET_GE_WARNING | GNUNET_GE_USER
@@ -497,7 +503,8 @@
         }
       else if (ACCESS ("/sbin/rc-update", W_OK) == 0)
         {
-          if (-1 != system ("/sbin/rc-update del gnunetd"))
+          ret = system ("/sbin/rc-update del gnunetd");
+          if (ret != 0)
             {
               GNUNET_GE_LOG_STRERROR_FILE (ectx,
                                            GNUNET_GE_WARNING | GNUNET_GE_USER