From: Jonas 'Sortie' Termansen <sortie@maxsi.org>
Date: Wed, 27 Aug 2014 10:07:29 +0000 (+0200)
Subject: Print a uid_t value portably
X-Git-Tag: v0.19.2.1~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b93e0b2a5b353699769696a09640ffde837e66d0;p=thirdparty%2Fgettext.git

Print a uid_t value portably
---

diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index 2164d230b..a228a5d29 100644
--- a/gettext-tools/src/ChangeLog
+++ b/gettext-tools/src/ChangeLog
@@ -1,3 +1,9 @@
+2014-08-28  Jonas 'Sortie' Termansen <sortie@maxsi.org>  (tiny change)
+
+	* msginit.c: Include <stdint.h>.
+	(get_user_pwd): Cast uid_t value into uintmax_t and print it with
+	'%ju' format directive.
+
 2014-08-27  Jonas 'Sortie' Termansen <sortie@maxsi.org>  (tiny change)
 
 	* msgfilter.c (process_message): Use proper format directive for
diff --git a/gettext-tools/src/msginit.c b/gettext-tools/src/msginit.c
index b3ef6d765..951aa2e0c 100644
--- a/gettext-tools/src/msginit.c
+++ b/gettext-tools/src/msginit.c
@@ -26,6 +26,7 @@
 #include <getopt.h>
 #include <limits.h>
 #include <locale.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -1059,7 +1060,7 @@ get_user_pwd ()
   if (userpasswd != NULL)
     return userpasswd;
   if (errno != 0)
-    error (EXIT_FAILURE, errno, "getpwuid(\"%d\")", getuid ());
+    error (EXIT_FAILURE, errno, "getpwuid(%ju)", (uintmax_t) getuid ());
 #endif
 
   return NULL;