aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRuslan Ermilov <ru@FreeBSD.org>2001-03-02 16:19:49 +0000
committerRuslan Ermilov <ru@FreeBSD.org>2001-03-02 16:19:49 +0000
commit7a6be913664526370f69f43e340b7ed33f20ea8f (patch)
tree27ac042cce5bc47e81dff3f29c831cfd60479287
parentfbedc117969203601b7a24d5ba4c1ba5794f0a4f (diff)
downloadsrc-7a6be913664526370f69f43e340b7ed33f20ea8f.tar.gz
src-7a6be913664526370f69f43e340b7ed33f20ea8f.zip
POSIX wrote:
: LC_TIME This variable shall determine the format and : contents of date and time strings when the -v : option is specified. Developers took this wrong. LC_TIME specifies the locale name, not the ``format'' argument of strftime(). Oops: pax -w -f /tmp/foo /dev/null LC_TIME=de_DE.ISO_8859-1 pax -v -f /tmp/foo
Notes
Notes: svn path=/head/; revision=73345
-rw-r--r--bin/pax/extern.h1
-rw-r--r--bin/pax/gen_subs.c32
-rw-r--r--bin/pax/pax.c8
3 files changed, 11 insertions, 30 deletions
diff --git a/bin/pax/extern.h b/bin/pax/extern.h
index 2b062cbde300..5f7625e7b4c8 100644
--- a/bin/pax/extern.h
+++ b/bin/pax/extern.h
@@ -223,7 +223,6 @@ extern int pids;
extern int exit_val;
extern int docrc;
extern char *dirptr;
-extern char *ltmfrmt;
extern char *argv0;
int main __P((int, char **));
void sig_cleanup __P((int));
diff --git a/bin/pax/gen_subs.c b/bin/pax/gen_subs.c
index 83cfdc5355fd..bd04aa88657f 100644
--- a/bin/pax/gen_subs.c
+++ b/bin/pax/gen_subs.c
@@ -106,17 +106,13 @@ ls_list(arcn, now)
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
@@ -178,16 +174,10 @@ ls_tty(arcn)
char f_mode[MODELEN];
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
diff --git a/bin/pax/pax.c b/bin/pax/pax.c
index 7bcc81e7ad0b..641d53fab0c7 100644
--- a/bin/pax/pax.c
+++ b/bin/pax/pax.c
@@ -95,7 +95,6 @@ int pids; /* preserve file uid/gid */
int exit_val; /* exit value */
int docrc; /* check/create file crc */
char *dirptr; /* destination dir in a copy */
-char *ltmfrmt; /* -v locale time format (if any) */
char *argv0; /* root of argv[0] */
sigset_t s_mask; /* signal mask for cleanup critical sect */
@@ -350,13 +349,6 @@ gen_init()
}
/*
- * Handle posix locale
- *
- * set user defines time printing format for -v option
- */
- ltmfrmt = getenv("LC_TIME");
-
- /*
* signal handling to reset stored directory times and modes. Since
* we deal with broken pipes via failed writes we ignore it. We also
* deal with any file size limit thorugh failed writes. Cpu time