Don't use non-standard %qd.

3 files changed, 46 insertions, 9 deletions

diff --git a/misc/colorls/distinfo b/misc/colorls/distinfo
index 89a2b54009b..f724f618ed1 100644
--- a/misc/colorls/distinfo
+++ b/misc/colorls/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.8 2012/03/01 17:22:38 hans Exp $
+$NetBSD: distinfo,v 1.9 2013/09/10 14:24:20 joerg Exp $
 
 SHA1 (ls.tar.gz) = f0d069e71faade167feaf14c4e6327bcc14d6616
 RMD160 (ls.tar.gz) = 7b607b7ab953ad0dc603c269fa03648cd54ac04f
 Size (ls.tar.gz) = 11768 bytes
 SHA1 (patch-aa) = 831f286605126a136b540b4456916db8cc8ff7e4
 SHA1 (patch-ab) = 8f26c3e16bb85371bbb16c5f77a667b3a456af68
-SHA1 (patch-ac) = cccd6669acec44b9efc2e7c8992fd2905371885f
+SHA1 (patch-ac) = c96de4d9964055ca0244cecbc5ed2249ce2aa803
 SHA1 (patch-ad) = d502e96261a950c5307794f01422147430c76aba
-SHA1 (patch-ae) = f901c10b02f9a965e10603a2d0365f0439b00e65
+SHA1 (patch-ae) = f217206de7b35bf03db4b95040f26bdf850b7cb7
 SHA1 (patch-extern.h) = ecb2f17ab8f17a42f744c26a86d243d90b309fd5
 SHA1 (patch-stat__flags.c) = 2def9b687a3c81611543875b5e99f86a65183680
diff --git a/misc/colorls/patches/patch-ac b/misc/colorls/patches/patch-ac
index a2bd5b925d2..120eab67b60 100644
--- a/misc/colorls/patches/patch-ac
+++ b/misc/colorls/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.5 2012/03/01 16:25:16 hans Exp $
+$NetBSD: patch-ac,v 1.6 2013/09/10 14:24:20 joerg Exp $
 
 --- ls.c.orig	1996-12-21 23:40:58.000000000 +0000
 +++ ls.c
@@ -148,6 +148,15 @@ $NetBSD: patch-ac,v 1.5 2012/03/01 16:25:16 hans Exp $
  				cur->fts_pointer = np;
  			}
  		}
+@@ -500,7 +535,7 @@ display(p, list)
+ 		d.s_inode = strlen(buf);
+ 		(void)snprintf(buf, sizeof(buf), "%lu", maxnlink);
+ 		d.s_nlink = strlen(buf);
+-		(void)snprintf(buf, sizeof(buf), "%qu", maxsize);
++		(void)snprintf(buf, sizeof(buf), "%llu", (long long)maxsize);
+ 		d.s_size = strlen(buf);
+ 		d.s_user = maxuser;
+ 	}
 @@ -521,7 +556,11 @@ display(p, list)
   */
  static int
diff --git a/misc/colorls/patches/patch-ae b/misc/colorls/patches/patch-ae
index 7e1196fc13b..7e9bbe91305 100644
--- a/misc/colorls/patches/patch-ae
+++ b/misc/colorls/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.3 2011/06/14 13:25:57 wiz Exp $
+$NetBSD: patch-ae,v 1.4 2013/09/10 14:24:20 joerg Exp $
 
 --- print.c.orig	1996-12-21 23:40:58.000000000 +0000
 +++ print.c
@@ -37,7 +37,31 @@ $NetBSD: patch-ae,v 1.3 2011/06/14 13:25:57 wiz Exp $
  void
  printscol(dp)
  	DISPLAY *dp;
-@@ -124,10 +145,14 @@ printlong(dp)
+@@ -97,8 +118,8 @@ printlong(dp)
+ 		if (f_inode)
+ 			(void)printf("%*lu ", dp->s_inode, (u_long)sp->st_ino);
+ 		if (f_size)
+-			(void)printf("%*qd ",
+-			    dp->s_block, howmany(sp->st_blocks, blocksize));
++			(void)printf("%*lld ",
++			    dp->s_block, (long long)howmany(sp->st_blocks, blocksize));
+ 		(void)strmode(sp->st_mode, buf);
+ 		np = p->fts_pointer;
+ 		(void)printf("%s %*u %-*s  %-*s  ", buf, dp->s_nlink,
+@@ -114,20 +135,24 @@ printlong(dp)
+ 				(void)printf("%3d, %3d ",
+ 				    major(sp->st_rdev), minor(sp->st_rdev));
+ 		else if (dp->bcfile)
+-			(void)printf("%*s%*qd ",
+-			    8 - dp->s_size, "", dp->s_size, sp->st_size);
++			(void)printf("%*s%*lld ",
++			    8 - dp->s_size, "", dp->s_size, (long long)sp->st_size);
+ 		else
+-			(void)printf("%*qd ", dp->s_size, sp->st_size);
++			(void)printf("%*lld ", dp->s_size, (long long)sp->st_size);
+ 		if (f_accesstime)
+ 			printtime(sp->st_atime);
+ 		else if (f_statustime)
  			printtime(sp->st_ctime);
  		else
  			printtime(sp->st_mtime);
@@ -80,10 +104,14 @@ $NetBSD: patch-ae,v 1.3 2011/06/14 13:25:57 wiz Exp $
  			endcol += colwidth;
  		}
  		(void)putchar('\n');
-@@ -219,9 +256,13 @@ printaname(p, inodefield, sizefield)
+@@ -217,11 +254,15 @@ printaname(p, inodefield, sizefield)
+ 	if (f_inode)
+ 		chcnt += printf("%*lu ", (int)inodefield, (u_long)sp->st_ino);
  	if (f_size)
- 		chcnt += printf("%*qd ",
- 		    (int)sizefield, howmany(sp->st_blocks, blocksize));
+-		chcnt += printf("%*qd ",
+-		    (int)sizefield, howmany(sp->st_blocks, blocksize));
++		chcnt += printf("%*lld ",
++		    (int)sizefield, (long long)howmany(sp->st_blocks, blocksize));
 +	if (f_color)
 +		(void)colortype(sp->st_mode);
  	chcnt += printf("%s", p->fts_name);