From 3f27542156125118800235c5ac1bac125fd7752c Mon Sep 17 00:00:00 2001
From: Aaron Griffin <aaron@archlinux.org>
Date: Sun, 15 Oct 2006 19:34:52 +0000
Subject: Merged frugalware changes.  Added a few other minor things too, but
 there's alot to list.  The diff should show you 8)

---
 src/pacman/log.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'src/pacman/log.c')

diff --git a/src/pacman/log.c b/src/pacman/log.c
index 2d929bd1..25524fe3 100644
--- a/src/pacman/log.c
+++ b/src/pacman/log.c
@@ -24,14 +24,15 @@
 #include <string.h>
 #include <stdarg.h>
 #include <ctype.h>
+#include <time.h>
 #include <libintl.h>
 
 #include <alpm.h>
 /* pacman */
-#include "util.h"
 #include "log.h"
 #include "list.h"
 #include "conf.h"
+#include "util.h"
 
 #define LOG_STR_LEN 256
 
@@ -43,7 +44,7 @@ int neednl; /* for cleaner message output */
  */
 void cb_log(unsigned short level, char *msg)
 {
-	char str[9] = "";
+	char str[LOG_STR_LEN] = "";
 
 	if(!strlen(msg)) {
 		return;
@@ -69,7 +70,7 @@ void cb_log(unsigned short level, char *msg)
 			sprintf(str, _("function"));
 		break;
 		default:
-			sprintf(str, _("???"));
+			sprintf(str, "???");
 		break;
 	}
 
@@ -132,7 +133,7 @@ int yesno(char *fmt, ...)
 	va_start(args, fmt);
 	vsnprintf(str, LOG_STR_LEN, fmt, args);
 	va_end(args);
-	MSG(NL, str);
+	pm_fprintf(stderr, NL, str);
 
 	if(fgets(response, 32, stdin)) {
 		/* trim whitespace and newlines */
-- 
cgit v1.2.3