X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprocess.c;h=9969146f5b00ce42d00c5f8d5260b2c9d63e238b;hp=2f10bfd8a3164139e6208124b1fce76f92551928;hb=985d19caf20058db3c764f0f6fbeafa8bcc59fcc;hpb=363d86365d97315cb71f84a1acad4f32cd69f26b

diff --git a/src/process.c b/src/process.c
index 2f10bfd8..9969146f 100644
--- a/src/process.c
+++ b/src/process.c
@@ -47,11 +47,6 @@ extern bool use_logfile;
 static sigset_t emptysigset;
 #endif
 
-static void memory_full(int size) {
-	logger(LOG_ERR, "Memory exhausted (couldn't allocate %d bytes), exitting.", size);
-	exit(1);
-}
-
 /* Some functions the less gifted operating systems might lack... */
 
 #ifdef HAVE_MINGW
@@ -77,25 +72,25 @@ bool install_service(void) {
 	}
 
 	if(!strchr(program_name, '\\')) {
-		GetCurrentDirectory(sizeof command - 1, command + 1);
-		strncat(command, "\\", sizeof command - strlen(command));
+		GetCurrentDirectory(sizeof(command) - 1, command + 1);
+		strncat(command, "\\", sizeof(command) - strlen(command));
 	}
 
-	strncat(command, program_name, sizeof command - strlen(command));
+	strncat(command, program_name, sizeof(command) - strlen(command));
 
-	strncat(command, "\"", sizeof command - strlen(command));
+	strncat(command, "\"", sizeof(command) - strlen(command));
 
 	for(argp = g_argv + 1; *argp; argp++) {
 		space = strchr(*argp, ' ');
-		strncat(command, " ", sizeof command - strlen(command));
+		strncat(command, " ", sizeof(command) - strlen(command));
 		
 		if(space)
-			strncat(command, "\"", sizeof command - strlen(command));
+			strncat(command, "\"", sizeof(command) - strlen(command));
 		
-		strncat(command, *argp, sizeof command - strlen(command));
+		strncat(command, *argp, sizeof(command) - strlen(command));
 
 		if(space)
-			strncat(command, "\"", sizeof command - strlen(command));
+			strncat(command, "\"", sizeof(command) - strlen(command));
 	}
 
 	service = CreateService(manager, identname, identname,
@@ -339,10 +334,8 @@ bool detach(void) {
 
 	openlogger(identname, use_logfile?LOGMODE_FILE:(do_detach?LOGMODE_SYSLOG:LOGMODE_STDERR));
 
-	logger(LOG_NOTICE, "tincd %s (%s %s) starting, debug level %d",
-			   VERSION, __DATE__, __TIME__, debug_level);
-
-	xalloc_fail_func = memory_full;
+	logger(LOG_NOTICE, "tincd %s starting, debug level %d",
+			   VERSION, debug_level);
 
 	return true;
 }