5 files changed, 11 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 13cf0ce5f..e0b109046 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2009-06-01  Dmitry V. Levin  <ldv@altlinux.org>
 
+	* bjm.c (sys_query_module): Fix format warning reported by
+	gcc -Wformat-security.
+	* file.c (tprint_open_modes): Likewise.
+	* process.c (printargv): Likewise.
+	* signal.c (printsignal): Likewise.
+
+	Clean up header checks.
 	* configure.ac: Reformat AC_CHECK_HEADERS to keep it sorted and
 	easily updated, and reduce merging errors in the future.
 	* system.c: Convert all non-standard #ifdef checks for specific
diff --git a/bjm.c b/bjm.c
index 5947a4192..f56e48f43 100644
--- a/bjm.c
+++ b/bjm.c
@@ -142,7 +142,7 @@ struct tcb *tcp;
 					for (idx=0; idx<ret; idx++) {
 						if (idx!=0)
 							tprintf(",");
-						tprintf(mod);
+						tprintf("%s", mod);
 						mod+=strlen(mod)+1;
 					}
 					free(data);
diff --git a/file.c b/file.c
index 53c248951..8023e70d2 100644
--- a/file.c
+++ b/file.c
@@ -395,7 +395,7 @@ sprint_open_modes(mode_t flags)
 void
 tprint_open_modes(mode_t flags)
 {
-	tprintf(sprint_open_modes(flags) + sizeof("flags"));
+	tprintf("%s", sprint_open_modes(flags) + sizeof("flags"));
 }
 
 static int
diff --git a/process.c b/process.c
index 1ddf2f321..5119ede5b 100644
--- a/process.c
+++ b/process.c
@@ -1785,7 +1785,7 @@ long addr;
 			cp.p64 = cp.p32;
 		if (cp.p64 == 0)
 			break;
-		tprintf(sep);
+		tprintf("%s", sep);
 		printstr(tcp, cp.p64, -1);
 		addr += personality_wordsize[current_personality];
 	}
diff --git a/signal.c b/signal.c
index 403fe3b51..320365760 100644
--- a/signal.c
+++ b/signal.c
@@ -402,7 +402,7 @@ void
 printsignal(nr)
 int nr;
 {
-	tprintf(signame(nr));
+	tprintf("%s", signame(nr));
 }
 
 void