[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r7213 - in GNUnet/src: setup/gtk setup/lib util/os
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r7213 - in GNUnet/src: setup/gtk setup/lib util/os |
|
Date: |
Sat, 14 Jun 2008 12:28:48 -0600 (MDT) |
Author: durner
Date: 2008-06-14 12:28:48 -0600 (Sat, 14 Jun 2008)
New Revision: 7213
Modified:
GNUnet/src/setup/gtk/wizard_gtk.c
GNUnet/src/setup/lib/wizard_util.c
GNUnet/src/setup/lib/wizard_util.h
GNUnet/src/util/os/osconfig.c
Log:
reformat
Modified: GNUnet/src/setup/gtk/wizard_gtk.c
===================================================================
--- GNUnet/src/setup/gtk/wizard_gtk.c 2008-06-14 18:25:38 UTC (rev 7212)
+++ GNUnet/src/setup/gtk/wizard_gtk.c 2008-06-14 18:28:48 UTC (rev 7213)
@@ -473,7 +473,8 @@
}
if (GNUNET_GNS_wiz_autostart_service (err_ctx, GNUNET_SERVICE_TYPE_GNUNETD,
- doAutoStart, user_name, group_name) != GNUNET_OK)
+ doAutoStart, user_name,
+ group_name) != GNUNET_OK)
{
#ifndef MINGW
showErr (_("Unable to change startup process:"), STRERROR (errno));
Modified: GNUnet/src/setup/lib/wizard_util.c
===================================================================
--- GNUnet/src/setup/lib/wizard_util.c 2008-06-14 18:25:38 UTC (rev 7212)
+++ GNUnet/src/setup/lib/wizard_util.c 2008-06-14 18:28:48 UTC (rev 7213)
@@ -84,8 +84,9 @@
* @return GNUNET_OK on success, GNUNET_SYSERR on error
*/
int
-GNUNET_GNS_wiz_autostart_service (struct GNUNET_GE_Context *ectx, int
serviceType,
- int doAutoStart, char *username, char
*groupname)
+GNUNET_GNS_wiz_autostart_service (struct GNUNET_GE_Context *ectx,
+ int serviceType, int doAutoStart,
+ char *username, char *groupname)
{
int ret;
char *exe;
@@ -95,23 +96,23 @@
exe = (char *) GNUNET_realloc (exe, strlen (exe) + 22); /* 11 =
"gnunet-auto-share.exe" */
if (serviceType == GNUNET_SERVICE_TYPE_GNUNETD)
{
- strcat(exe, "gnunetd");
+ strcat (exe, "gnunetd");
name = "GNUnet";
}
else if (serviceType == GNUNET_SERVICE_TYPE_AUTOSHARE)
{
- strcat(exe, "gnunet-auto-share");
+ strcat (exe, "gnunet-auto-share");
name = "GNUnet Auto Share";
}
else
return GNUNET_SYSERR;
-
+
#ifdef WINDOWS
strcat (exe, ".exe");
#endif
ret =
- GNUNET_configure_autostart (ectx , 0, doAutoStart,
+ GNUNET_configure_autostart (ectx, 0, doAutoStart,
name, exe, username, groupname);
GNUNET_free (exe);
if (ret != GNUNET_YES)
Modified: GNUnet/src/setup/lib/wizard_util.h
===================================================================
--- GNUnet/src/setup/lib/wizard_util.h 2008-06-14 18:25:38 UTC (rev 7212)
+++ GNUnet/src/setup/lib/wizard_util.h 2008-06-14 18:28:48 UTC (rev 7213)
@@ -32,8 +32,9 @@
int GNUNET_GNS_wiz_is_nic_default (struct GNUNET_GC_Configuration *cfg,
const char *name, int suggestion);
-int GNUNET_GNS_wiz_autostart_service (struct GNUNET_GE_Context *ectx, int
serviceType,
- int doAutoStart, char *username, char
*groupname);
+int GNUNET_GNS_wiz_autostart_service (struct GNUNET_GE_Context *ectx,
+ int serviceType, int doAutoStart,
+ char *username, char *groupname);
int GNUNET_GNS_wiz_create_group_user (char *group_name, char *user_name);
Modified: GNUnet/src/util/os/osconfig.c
===================================================================
--- GNUnet/src/util/os/osconfig.c 2008-06-14 18:25:38 UTC (rev 7212)
+++ GNUnet/src/util/os/osconfig.c 2008-06-14 18:28:48 UTC (rev 7213)
@@ -311,10 +311,10 @@
int ret;
char *initscipt;
- initscript = (char *) MALLOC(strlen(servicename) + 13);
- strcpy(initscript, "/etc/init.d/");
- strcat(initscript, servicename);
-
+ initscript = (char *) MALLOC (strlen (servicename) + 13);
+ strcpy (initscript, "/etc/init.d/");
+ strcat (initscript, servicename);
+
/* Unix */
if ((ACCESS ("/usr/sbin/update-rc.d", X_OK) != 0))
{
@@ -324,7 +324,7 @@
GNUNET_GE_ERROR | GNUNET_GE_USER |
GNUNET_GE_ADMIN | GNUNET_GE_IMMEDIATE,
"access", "/usr/sbin/update-rc.d");
- FREE(initscript);
+ FREE (initscript);
return GNUNET_SYSERR;
}
}
@@ -339,7 +339,7 @@
GNUNET_GE_ADMIN | GNUNET_GE_IMMEDIATE,
"access", application);
}
-
+
if (STAT (initscript, &buf) == -1)
{
/* create init file */
@@ -351,7 +351,7 @@
GNUNET_GE_ADMIN |
GNUNET_GE_IMMEDIATE, "fopen",
"/etc/init.d/gnunetd");
- FREE(initscript);
+ FREE (initscript);
return 2;
}
@@ -386,8 +386,13 @@
" echo \"Usage: %s
{start|stop|reload|restart|force-reload}\" >&2\n"
" exit 1\n"
" ;;\n"
- "\n" "esac\n" "exit 0\n", "gnunet-setup", servicename,
servicename, application,
- servicename, servicename, initscript);
+ "\n"
+ "esac\n"
+ "exit 0\n",
+ "gnunet-setup",
+ servicename,
+ servicename,
+ application, servicename, servicename, initscript);
fclose (f);
if (0 != CHMOD (initscript,
S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH))
@@ -397,7 +402,7 @@
| GNUNET_GE_ADMIN |
GNUNET_GE_IMMEDIATE, "chmod",
initscript);
- FREE(initscript);
+ FREE (initscript);
return GNUNET_SYSERR;
}
}
@@ -429,7 +434,7 @@
"/usr/sbin/update-rc.d gnunetd defaults",
WEXITSTATUS (ret));
}
- FREE(initscript);
+ FREE (initscript);
return GNUNET_SYSERR;
}
}
@@ -458,12 +463,12 @@
"/sbin/rc-update add gnunetd default",
WEXITSTATUS (ret));
}
- FREE(initscript);
+ FREE (initscript);
return GNUNET_SYSERR;
}
}
}
- FREE(initscript);
+ FREE (initscript);
return GNUNET_YES;
}
else
@@ -474,7 +479,7 @@
GNUNET_GE_WARNING | GNUNET_GE_USER |
GNUNET_GE_ADMIN | GNUNET_GE_IMMEDIATE,
"unlink", initscript);
- FREE(initscript);
+ FREE (initscript);
return GNUNET_SYSERR;
}
errno = 0;
@@ -487,7 +492,7 @@
| GNUNET_GE_ADMIN |
GNUNET_GE_IMMEDIATE, "system",
"/usr/sbin/update-rc.d");
- FREE(initscript);
+ FREE (initscript);
return GNUNET_SYSERR;
}
}
@@ -500,15 +505,15 @@
| GNUNET_GE_ADMIN |
GNUNET_GE_IMMEDIATE, "system",
"/sbin/rc-update");
- FREE(initscript);
+ FREE (initscript);
return GNUNET_SYSERR;
}
}
- FREE(initscript);
+ FREE (initscript);
return GNUNET_YES;
}
#endif
- FREE(initscript);
+ FREE (initscript);
return GNUNET_SYSERR;
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r7213 - in GNUnet/src: setup/gtk setup/lib util/os,
gnunet <=