[BusyBox-cvs] busybox/sysklogd syslogd.c,1.101,1.102

Glenn McGrath bug1 at busybox.net
Wed Sep 10 23:35:48 UTC 2003


Update of /var/cvs/busybox/sysklogd
In directory winder:/tmp/cvs-serv4728/sysklogd

Modified Files:
	syslogd.c 
Log Message:
Vodz, last_patch_104


Index: syslogd.c
===================================================================
RCS file: /var/cvs/busybox/sysklogd/syslogd.c,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -d -r1.101 -r1.102
--- syslogd.c	29 Aug 2003 07:35:08 -0000	1.101
+++ syslogd.c	10 Sep 2003 23:35:45 -0000	1.102
@@ -56,7 +56,7 @@
 /* Path to the unix socket */
 static char lfile[MAXPATHLEN];
 
-static char *logFilePath = __LOG_FILE;
+static const char *logFilePath = __LOG_FILE;
 
 /* interval between marks in seconds */
 static int MarkInterval = 20 * 60;
@@ -588,7 +588,7 @@
 			doFork = FALSE;
 			break;
 		case 'O':
-			logFilePath = bb_xstrdup(optarg);
+			logFilePath = optarg;
 			break;
 #ifdef CONFIG_FEATURE_REMOTE_LOG
 		case 'R':
@@ -623,12 +623,13 @@
 	/* Store away localhost's name before the fork */
 	gethostname(LocalHostName, sizeof(LocalHostName));
 	if ((p = strchr(LocalHostName, '.'))) {
-		*p++ = '\0';
+		*p = '\0';
 	}
 
 	umask(0);
 
-	if ((doFork == TRUE) && (daemon(0, 1) < 0)) {
+	if (doFork == TRUE) {
+		if(daemon(0, 1) < 0)
 		bb_perror_msg_and_die("daemon");
 #if defined(__uClinux__)
 		vfork_daemon_rexec(argc, argv, "-n");




More information about the busybox-cvs mailing list