Re: [Toybox] [PATCH] date: add --iso and the %:z output format.

2020-11-15 Thread Rob Landley 


On 11/15/20 1:10 PM, enh wrote:
> 
> 
> On Sun, Nov 15, 2020, 00:53 Rob Landley  > wrote:
> 
> On 11/14/20 5:06 PM, enh via Toybox wrote:
> > I didn't know until implementing this that --iso is actually called
> > --iso-8601 and that GNU date will actually accept any prefix. --iso-8
> > works fine too. I've assumed that --iso (that I always used) and
> > --iso-8601 (as given in the documentation) are the only two that matter.
> > ---
> 
> Please explain this line:
> 
>       strcpy(out+4, out+3);
> 
> 
> strftime only supports the -0800 style of time zone, so that moves the 00 up 
> so
> we can insert the : and get -08:00. 

Let me rephrase:

Pleee...

I switched it to memmove().

Rob
___
Toybox mailing list
Toybox@lists.landley.net
http://lists.landley.net/listinfo.cgi/toybox-landley.net

Re: [Toybox] [PATCH] date: add --iso and the %:z output format.

2020-11-15 Thread enh via Toybox 
On Sun, Nov 15, 2020, 00:53 Rob Landley  wrote:

> On 11/14/20 5:06 PM, enh via Toybox wrote:
> > I didn't know until implementing this that --iso is actually called
> > --iso-8601 and that GNU date will actually accept any prefix. --iso-8
> > works fine too. I've assumed that --iso (that I always used) and
> > --iso-8601 (as given in the documentation) are the only two that matter.
> > ---
>
> Please explain this line:
>
>   strcpy(out+4, out+3);
>

strftime only supports the -0800 style of time zone, so that moves the 00
up so we can insert the : and get -08:00.

Rob
>
___
Toybox mailing list
Toybox@lists.landley.net
http://lists.landley.net/listinfo.cgi/toybox-landley.net

Re: [Toybox] [PATCH] date: add --iso and the %:z output format.

2020-11-15 Thread Rob Landley 
On 11/14/20 5:06 PM, enh via Toybox wrote:
> I didn't know until implementing this that --iso is actually called
> --iso-8601 and that GNU date will actually accept any prefix. --iso-8
> works fine too. I've assumed that --iso (that I always used) and
> --iso-8601 (as given in the documentation) are the only two that matter.
> ---

Please explain this line:

  strcpy(out+4, out+3);

Rob
___
Toybox mailing list
Toybox@lists.landley.net
http://lists.landley.net/listinfo.cgi/toybox-landley.net

[Toybox] [PATCH] date: add --iso and the %:z output format.

2020-11-14 Thread enh via Toybox 
I didn't know until implementing this that --iso is actually called
--iso-8601 and that GNU date will actually accept any prefix. --iso-8
works fine too. I've assumed that --iso (that I always used) and
--iso-8601 (as given in the documentation) are the only two that matter.
---
 tests/date.test   | 15 
 toys/posix/date.c | 62 +++
 2 files changed, 56 insertions(+), 21 deletions(-)
From 4078158041d200fc32795d2761f41cf925023c38 Mon Sep 17 00:00:00 2001
From: Elliott Hughes 
Date: Sat, 14 Nov 2020 15:02:43 -0800
Subject: [PATCH] date: add --iso and the %:z output format.

I didn't know until implementing this that --iso is actually called
--iso-8601 and that GNU date will actually accept any prefix. --iso-8
works fine too. I've assumed that --iso (that I always used) and
--iso-8601 (as given in the documentation) are the only two that matter.
---
 tests/date.test   | 15 
 toys/posix/date.c | 62 +++
 2 files changed, 56 insertions(+), 21 deletions(-)

diff --git a/tests/date.test b/tests/date.test
index 9240131a..6aaf937e 100644
--- a/tests/date.test
+++ b/tests/date.test
@@ -53,6 +53,21 @@ testing "trailing %" "touch -d 2012-01-23T12:34:56.123456789 f && date -r f +%Y%
 testing "just %" "touch -d 2012-01-23T12:34:56.123456789 f && date -r f +%" "%\n" "" ""
 rm -f f
 
+# Test --iso...
+testing "-I" "touch -d 2012-01-23T12:34:56.123456789Z f && date -r f -u -I" \
+  "2012-01-23\n" "" ""
+testing "-Id" "touch -d 2012-01-23T12:34:56.123456789Z f && date -r f -u -Id" \
+  "2012-01-23\n" "" ""
+testing "-Ih" "touch -d 2012-01-23T12:34:56.123456789Z f && date -r f -u -Ih" \
+  "2012-01-23T12+00:00\n" "" ""
+testing "-Im" "touch -d 2012-01-23T12:34:56.123456789Z f && date -r f -u -Im" \
+  "2012-01-23T12:34+00:00\n" "" ""
+testing "-Is" "touch -d 2012-01-23T12:34:56.123456789Z f && date -r f -u -Is" \
+  "2012-01-23T12:34:56+00:00\n" "" ""
+testing "-In" "touch -d 2012-01-23T12:34:56.123456789Z f && date -r f -u -In" \
+  "2012-01-23T12:34:56,123456789+00:00\n" "" ""
+rm -f f
+
 # Test embedded TZ to take a date in one time zone and display it in another.
 testing "TZ=" "TZ='America/Los_Angeles' date -d 'TZ=\"Europe/Berlin\" 2018-01-04 08:00'" "Wed Jan  3 23:00:00 PST 2018\n" "" ""
 testing "TZ=" "TZ='America/Los_Angeles' date -d 'TZ=\"Europe/Berlin\" 2018-10-04 08:00'" "Wed Oct  3 23:00:00 PDT 2018\n" "" ""
diff --git a/toys/posix/date.c b/toys/posix/date.c
index 5cf8591a..293947d0 100644
--- a/toys/posix/date.c
+++ b/toys/posix/date.c
@@ -7,18 +7,19 @@
  * Note: setting a 2 year date is 50 years back/forward from today,
  * not posix's hardwired magic dates.
 
-USE_DATE(NEWTOY(date, "d:D:r:u(utc)[!dr]", TOYFLAG_BIN))
+USE_DATE(NEWTOY(date, "d:D:I(iso)(iso-8601):;r:u(utc)[!dr]", TOYFLAG_BIN))
 
 config DATE
   bool "date"
   default y
   help
-usage: date [-u] [-r FILE] [-d DATE] [+DISPLAY_FORMAT] [-D SET_FORMAT] [SET]
+usage: date [-u] [-I RES] [-r FILE] [-d DATE] [+DISPLAY_FORMAT] [-D SET_FORMAT] [SET]
 
 Set/get the current date/time. With no SET shows the current date.
 
 -d	Show DATE instead of current time (convert date format)
 -D	+FORMAT for SET or -d (instead of MMDDhhmm[[CC]YY][.ss])
+-I RES	ISO 8601 with RESolution d=date/h=hours/m=minutes/s=seconds/n=ns
 -r	Use modification time of FILE instead of current date
 -u	Use UTC instead of current timezone
 
@@ -49,16 +50,16 @@ config DATE
 %U Week of year (0-53 start Sunday)   %W Week of year (0-53 start Monday)
 %V Week of year (1-53 start Monday, week < 4 days not part of this year)
 
-%F "%Y-%m-%d" %R "%H:%M"%T "%H:%M:%S"%z numeric timezone
-%D "%m/%d/%y" %r "%I:%M:%S %p"  %h "%b"  %s unix epoch time
-%x locale date%X locale time%c locale date/time
+%F "%Y-%m-%d"   %R "%H:%M"%T "%H:%M:%S"%z  timezone (-0800)
+%D "%m/%d/%y"   %r "%I:%M:%S %p"  %h "%b"  %:z timezone (-08:00)
+%x locale date  %X locale time%c locale date/time  %s  unix epoch time
 */
 
 #define FOR_date
 #include "toys.h"
 
 GLOBALS(
-  char *r, *D, *d;
+  char *r, *I, *D, *d;
 
   unsigned nano;
 )
@@ -88,28 +89,40 @@ static void parse_date(char *str, time_t *t)
   }
 }
 
-// Print strftime plus %N escape(s). note: modifies fmt for %N
+// Print strftime plus %N and %:z escape(s). Note: modifies fmt in those cases.
 static void puts_time(char *fmt, struct tm *tm)
 {
-  char *s, *snap;
-  long width = width;
+  char *s, *snap, *out;
 
   for (s = fmt;;s++) {
+long n = 0;
 
-// Find next %N or end
+// Find next %N/%:z or end of format string.
 if (*(snap = s) == '%') {
-  width = isdigit(*++s) ? *(s++)-'0' : 9;
-  if (*s && *s != 'N') continue;
+  ++s;
+  if (*s == 'N') n = 9;
+  else if (isdigit(*s) && *(s+1) == 'N') n = *(s++)-'0';
+  else if (*s == ':' && *(s+1) == 'z') s++, n++;
+  if (*s && *s != 'N' &&