[src/netbsd-1-5]: src/bin/pax Pullup 1.19 [kleink]:

[tv <tv%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/8fa388840a26
branches:  netbsd-1-5
changeset: 489982:8fa388840a26
user:      tv <tv%NetBSD.org@localhost>
date:      Wed Oct 25 16:19:07 2000 +0000

description:
Pullup 1.19 [kleink]:
Don't abuse LC_TIME for strftime(3) format strings.

diffstat:

 bin/pax/gen_subs.c |  36 +++++++++++++-----------------------
 1 files changed, 13 insertions(+), 23 deletions(-)

diffs (64 lines):

diff -r f4d65529332b -r 8fa388840a26 bin/pax/gen_subs.c
--- a/bin/pax/gen_subs.c        Wed Oct 25 16:18:52 2000 +0000
+++ b/bin/pax/gen_subs.c        Wed Oct 25 16:19:07 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: gen_subs.c,v 1.18 2000/06/17 18:19:10 mrg Exp $        */
+/*     $NetBSD: gen_subs.c,v 1.18.2.1 2000/10/25 16:19:07 tv Exp $     */
 
 /*-
  * Copyright (c) 1992 Keith Muller.
@@ -42,7 +42,7 @@
 #if 0
 static char sccsid[] = "@(#)gen_subs.c 8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: gen_subs.c,v 1.18 2000/06/17 18:19:10 mrg Exp $");
+__RCSID("$NetBSD: gen_subs.c,v 1.18.2.1 2000/10/25 16:19:07 tv Exp $");
 #endif
 #endif /* not lint */
 
@@ -117,17 +117,13 @@
        sbp = &(arcn->sb);
        strmode(sbp->st_mode, f_mode);
 
-       if (ltmfrmt == NULL) {
-               /*
-                * no locale specified format. time format based on age
-                * compared to the time pax was started.
-                */
-               if ((sbp->st_mtime + SIXMONTHS) <= now)
-                       timefrmt = OLDFRMT;
-               else
-                       timefrmt = CURFRMT;
-       } else
-               timefrmt = ltmfrmt;
+       /*
+        * time format based on age compared to the time pax was started.
+        */
+       if ((sbp->st_mtime + SIXMONTHS) <= now)
+               timefrmt = OLDFRMT;
+       else
+               timefrmt = CURFRMT;
 
        /*
         * print file mode, link count, uid, gid and time
@@ -190,16 +186,10 @@
        char f_mode[MODELEN];
        const char *timefrmt;
 
-       if (ltmfrmt == NULL) {
-               /*
-                * no locale specified format
-                */
-               if ((arcn->sb.st_mtime + SIXMONTHS) <= time((time_t *)NULL))
-                       timefrmt = OLDFRMT;
-               else
-                       timefrmt = CURFRMT;
-       } else
-               timefrmt = ltmfrmt;
+       if ((arcn->sb.st_mtime + SIXMONTHS) <= time((time_t *)NULL))
+               timefrmt = OLDFRMT;
+       else
+               timefrmt = CURFRMT;
 
        /*
         * convert time to string, and print