CVS commit: src/usr.bin/unzip

[Christos Zoulas]

Module Name:    src
Committed By:   christos
Date:           Wed Aug 17 13:37:40 UTC 2011

Modified Files:
        src/usr.bin/unzip: unzip.c

Log Message:
kill 2 digit year format.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/usr.bin/unzip/unzip.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/usr.bin/unzip/unzip.c
diff -u src/usr.bin/unzip/unzip.c:1.15 src/usr.bin/unzip/unzip.c:1.16
--- src/usr.bin/unzip/unzip.c:1.15	Thu Jul 14 02:35:30 2011
+++ src/usr.bin/unzip/unzip.c	Wed Aug 17 09:37:39 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: unzip.c,v 1.15 2011/07/14 06:35:30 wiz Exp $ */
+/* $NetBSD: unzip.c,v 1.16 2011/08/17 13:37:39 christos Exp $ */
 
 /*-
  * Copyright (c) 2009, 2010 Joerg Sonnenberger <jo...@netbsd.org>
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: unzip.c,v 1.15 2011/07/14 06:35:30 wiz Exp $");
+__RCSID("$NetBSD: unzip.c,v 1.16 2011/08/17 13:37:39 christos Exp $");
 
 #include <sys/queue.h>
 #include <sys/stat.h>
@@ -823,7 +823,7 @@
 	time_t mtime;
 
 	mtime = archive_entry_mtime(e);
-	strftime(buf, sizeof(buf), "%m-%d-%g %R", localtime(&mtime));
+	strftime(buf, sizeof(buf), "%m-%d-%G %R", localtime(&mtime));
 
 	if (v_opt == 1) {
 		printf(" %8ju  %s   %s\n",
@@ -893,11 +893,11 @@
 	    printf("Archive:  %s\n", fn);
 
 	if (v_opt == 1) {
-		printf("  Length     Date   Time    Name\n");
-		printf(" --------    ----   ----    ----\n");
+		printf("  Length       Date   Time    Name\n");
+		printf(" --------      ----   ----    ----\n");
 	} else if (v_opt == 2) {
-		printf(" Length   Method    Size  Ratio   Date   Time   CRC-32    Name\n");
-		printf("--------  ------  ------- -----   ----   ----   ------    ----\n");
+		printf(" Length   Method    Size  Ratio     Date   Time   CRC-32    Name\n");
+		printf("--------  ------  ------- -----     ----   ----   ------    ----\n");
 	}
 
 	total_size = 0;
@@ -922,12 +922,12 @@
 	}
 
 	if (v_opt == 1) {
-		printf(" --------                   -------\n");
-		printf(" %8ju                   %ju file%s\n",
+		printf(" --------                     -------\n");
+		printf(" %8ju                     %ju file%s\n",
 		    total_size, file_count, file_count != 1 ? "s" : "");
 	} else if (v_opt == 2) {
-		printf("--------          -------  ---                            -------\n");
-		printf("%8ju          %7ju   0%%                            %ju file%s\n",
+		printf("--------          -------  ---                              -------\n");
+		printf("%8ju          %7ju   0%%                              %ju file%s\n",
 		    total_size, total_size, file_count,
 		    file_count != 1 ? "s" : "");
 	}