diff options
| author | Davis Mosenkovs <davikovs@gmail.com> | 2016-04-20 14:44:13 -0700 |
|---|---|---|
| committer | Rob Landley <rob@landley.net> | 2016-04-21 17:16:13 -0500 |
| commit | 00385e8d0e1f83a58710ada4a210d15102542b7d (patch) | |
| tree | 201971a9221151d20a1f1224fb480f32effff1ed | |
| parent | 7b6957fa1e23f1b0f614bb5102c527bee2db3002 (diff) | |
| download | toybox-00385e8d0e1f83a58710ada4a210d15102542b7d.tar.gz | |
Fix touch -t seconds parsing
| -rwxr-xr-x | tests/touch.test | 12 | ||||
| -rw-r--r-- | toys/posix/touch.c | 7 |
2 files changed, 17 insertions, 2 deletions
diff --git a/tests/touch.test b/tests/touch.test index d386156d..d193d7cc 100755 --- a/tests/touch.test +++ b/tests/touch.test @@ -11,6 +11,18 @@ testing "-c" "touch -c walrus && [ -e walrus ] && echo yes" "yes\n" "" "" testing "-c missing" "touch -c warrus && [ ! -e warrus ] && echo yes" \ "yes\n" "" "" +testing "-t" \ + "touch -t 201201231234 walrus && date -r walrus +%Y%m%d-%H%M%S.%N" \ + "20120123-123400.000000000\n" "" "" + +testing "-t seconds" \ + "touch -t 201201231234.56 walrus && date -r walrus +%Y%m%d-%H%M%S.%N" \ + "20120123-123456.000000000\n" "" "" + +testing "-t nanoseconds" \ + "touch -t 201201231234.56123456789 walrus && date -r walrus +%Y%m%d-%H%M%S.%N" \ + "20120123-123456.123456789\n" "" "" + testing "-d" \ "touch -d 2009-02-13T23:31:30Z walrus && date -r walrus +%s" \ "1234567890\n" "" "" diff --git a/toys/posix/touch.c b/toys/posix/touch.c index 052448ba..22a1e2e8 100644 --- a/toys/posix/touch.c +++ b/toys/posix/touch.c @@ -80,10 +80,13 @@ void touch_main(void) if (s) break; toybuf[1]='y'; } + tm.tm_sec = 0; ts->tv_nsec = 0; if (s && *s=='.' && sscanf(s, ".%2u%n", &(tm.tm_sec), &len) == 1) { - sscanf(s += len, "%lu%n", &ts->tv_nsec, &len); - len++; + if (sscanf(s += len, "%lu%n", &ts->tv_nsec, &len) == 1) { + s--; + len++; + } else len = 0; } else len = 0; } if (len) { |