From de47eb59bb829423b1d0f47ba13099073999b3cb Mon Sep 17 00:00:00 2001
From: Nicolas Planel <nplanel@mandriva.com>
Date: Wed, 29 Oct 2003 16:07:11 +0000
Subject: Corporate Server 2.1.1 release

---
 mdk-stage1/insmod-modutils/util/logger.c | 49 +++++++++++++++-----------------
 1 file changed, 23 insertions(+), 26 deletions(-)

(limited to 'mdk-stage1/insmod-modutils/util/logger.c')

diff --git a/mdk-stage1/insmod-modutils/util/logger.c b/mdk-stage1/insmod-modutils/util/logger.c
index 3b790df5a..4774a0beb 100644
--- a/mdk-stage1/insmod-modutils/util/logger.c
+++ b/mdk-stage1/insmod-modutils/util/logger.c
@@ -20,8 +20,7 @@
    Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
   */
 
-#ident "$Id$"
-
+#include <limits.h>
 #include <stdio.h>
 #include <stdarg.h>
 #include <stdlib.h>
@@ -32,9 +31,10 @@
 
 /*======================================================================*/
 
+int log;
+
 int errors;
 const char *error_file;
-int log;
 
 #define STOREMSG
 #ifdef STOREMSG
@@ -44,29 +44,12 @@ struct cbuf {
 	char *msg;
 } *head, *tail;
 
-static void savemsg(int type, char *msg)
-{
-	struct cbuf *me = (struct cbuf *)xmalloc(sizeof(struct cbuf));
-	char *s = xstrdup(msg);
-
-	me->next = NULL;
-	me->type = type;
-	me->msg = s;
-
-	if (tail)
-		tail->next = me;
-	else
-		head = me;
-	tail = me;
-}
-
-#endif /* STOREMSG */
-
 static void dumpmsg(void)
 {
 	for (;head; head = head->next)
 		syslog(head->type, "%s", head->msg);
 }
+#endif /* STOREMSG */
 
 void setsyslog(const char *program)
 {
@@ -77,13 +60,27 @@ void setsyslog(const char *program)
 	log = 1;
 }
 
-
-
 #ifdef _STANDALONE_
 static int silent;
 
 const char *program_name;
 
+static void savemsg(int type, char *msg)
+{
+	struct cbuf *me = (struct cbuf *)xmalloc(sizeof(struct cbuf));
+	char *s = xstrdup(msg);
+
+	me->next = NULL;
+	me->type = type;
+	me->msg = s;
+
+	if (tail)
+		tail->next = me;
+	else
+		head = me;
+	tail = me;
+}
+
 void error(const char *fmt,...)
 {
 	va_list args;
@@ -91,7 +88,7 @@ void error(const char *fmt,...)
 	if (silent)
 		;
 	else if (log) {
-		char buf[1024];
+		char buf[2*PATH_MAX];
 		int n;
 
 		if (error_file)
@@ -124,7 +121,7 @@ void lprintf(const char *fmt,...)
 
 	if (silent);
 	else if (log) {
-		char buf[1024];
+		char buf[2*PATH_MAX];
 		va_start(args, fmt);
 		vsnprintf(buf, sizeof(buf), fmt, args);
 		va_end(args);
@@ -140,7 +137,6 @@ void lprintf(const char *fmt,...)
 		putchar('\n');
 	}
 }
-
 #else /* _STANDALONE_ */
 #include "../../log.h"
 void error(const char *s, ...)
@@ -161,3 +157,4 @@ void lprintf(const char *s, ...)
 	va_end(p);
 }
 #endif
+
-- 
cgit v1.2.1