--- suX/src/sux.c	2011/05/20 16:26:53	1.1.1.1.2.2
+++ suX/src/sux.c	2011/05/20 17:10:52	1.1.1.1.2.6
@@ -3,7 +3,7 @@
  *  by Michael Pounov <misho@aitbg.com>
  *
  * $Author: misho $
- * $Id: sux.c,v 1.1.1.1.2.2 2011/05/20 16:26:53 misho Exp $
+ * $Id: sux.c,v 1.1.1.1.2.6 2011/05/20 17:10:52 misho Exp $
  *
  *************************************************************************/
 #include "global.h"
@@ -18,25 +18,31 @@ FILE *lf;
 static inline void
 Log(int lvl, const char *fmt, ...)
 {
-	va_list lst;
+	va_list lst, cp;
 
 	if (lvl <= Verbose) {
 		va_start(lst, fmt);
+		va_copy(cp, lst);
 		vfprintf(lf, fmt, lst);
-		vsyslog(LOG_WARNING, fmt, lst);
 		va_end(lst);
+		fprintf(lf, "\n");
+		vsyslog(LOG_WARNING, fmt, cp);
+		va_end(cp);
 	}
 }
 
 static inline void
 Err(const char *fmt, ...)
 {
-	va_list lst;
+	va_list lst, cp;
 
 	va_start(lst, fmt);
+	va_copy(cp, lst);
 	vfprintf(lf, fmt, lst);
-	vsyslog(LOG_ERR, fmt, lst);
 	va_end(lst);
+	fprintf(lf, "\n");
+	vsyslog(LOG_ERR, fmt, cp);
+	va_end(cp);
 }
 
 static void
@@ -47,7 +53,9 @@ initProg()
 	proc.proc_prio = getpriority(PRIO_PROCESS, 0);
 	getcwd(proc.proc_dir, sizeof proc.proc_dir);
 
-	lf = stdout;
+	lf = fopen(DEFAULT_LOG, "a");
+	if (!lf)
+		lf = stdout;
 
 	openlog(PACKAGE_NAME, LOG_CONS | LOG_PID | LOG_NDELAY | LOG_PERROR, LOG_USER);
 }
@@ -218,6 +226,7 @@ Run(char **argv)
 		return -1;
 	}
 
+	/*
 	if (setgid(proc.proc_gid) == -1) {
 		Err("Error:: setgid #%d - %s\n", errno, strerror(errno));
 		if (args)
@@ -236,8 +245,9 @@ Run(char **argv)
 			free(args);
 		return -1;
 	}
+	*/
 
-	Log(1, "UID:GID=%d:%d Prio=%d Class=%s Name=%s Dir=%s Cmd=%s\n", proc.proc_uid, proc.proc_gid, 
+	Log(0, "UID:GID=%d:%d Prio=%d Class=%s Name=%s Dir=%s Cmd=%s", proc.proc_uid, proc.proc_gid, 
 			proc.proc_prio, proc.proc_class, proc.proc_name, proc.proc_dir, proc.proc_cmd);
 
 	if (3 <= Verbose) {
@@ -246,6 +256,8 @@ Run(char **argv)
 			Log(3, "args: %s", *el);
 	}
 
+	fflush(lf);
+
 	execve(cmd, args, environ);
 	if (args)
 		free(args);
@@ -257,28 +269,25 @@ Run(char **argv)
 int
 main(int argc, char **argv)
 {
-	char ch, *str, szCfg[MAXPATHLEN], szLog[MAXPATHLEN], flg = 0;
+	char ch, *str, szCfg[MAXPATHLEN], flg = 0;
 	struct passwd *pass;
 	struct group *grp;
 	FILE *f;
 
 	initProg();
 	strlcpy(szCfg, DEFAULT_CONFIG, sizeof szCfg);
-	strlcpy(szLog, DEFAULT_LOG, sizeof szLog);
 
 	while ((ch = getopt(argc, argv, "hvc:u:g:p:d:l:")) != -1)
 		switch (ch) {
 			case 'l':
-				strlcpy(szLog, optarg, sizeof szLog);
-				f = fopen(szLog, "a+");
+				f = fopen(optarg, "a");
 				if (!f) {
 					Err("Error:: logfile #%d - %s", errno, strerror(errno));
 					return 1;
 				} else
-					if (flg & 16 && fileno(lf) > 2)
+					if (fileno(lf) > 2)
 						fclose(lf);
 				lf = f;
-				flg |= 16;
 				break;
 			case 'd':
 				strlcpy(proc.proc_dir, optarg, sizeof proc.proc_dir);
@@ -317,7 +326,7 @@ main(int argc, char **argv)
 			case 'h':
 			default:
 				Usage();
-				if (flg & 16)
+				if (fileno(lf) > 2)
 					fclose(lf);
 				return 1;
 		}
@@ -326,7 +335,7 @@ main(int argc, char **argv)
 	if (!argc) {
 		if (!(str = getenv("PATH_TRANSLATED"))) {
 			Usage();
-			if (flg & 16)
+			if (fileno(lf) > 2)
 				fclose(lf);
 			return 1;
 		} else
@@ -336,13 +345,13 @@ main(int argc, char **argv)
 	Log(2, "Try to load config %s", szCfg);
 	if (LoadConfig(szCfg, &cfg)) {
 		Err("Error:: can`t load config #%d - %s\n", cfg_GetErrno(), cfg_GetError());
-		if (flg & 16)
+		if (fileno(lf) > 2)
 			fclose(lf);
 		return 2;
 	} else
 		if (LoadCfgData(flg) == -1) {
 			UnloadConfig(&cfg);
-			if (flg & 16)
+			if (fileno(lf) > 2)
 				fclose(lf);
 			closelog();
 			return 3;
@@ -350,13 +359,13 @@ main(int argc, char **argv)
 	UnloadConfig(&cfg);
 
 	if (Run(argv) == -1) {
-		if (flg & 16)
+		if (fileno(lf) > 2)
 			fclose(lf);
 		closelog();
 		return 4;
 	}
 
-	if (flg & 16)
+	if (fileno(lf) > 2)
 		fclose(lf);
 	closelog();
 	return 0;