From 927e4bb644ca6a50fd3e802806bbddce42daa1a6 Mon Sep 17 00:00:00 2001 From: Mikhail Gusarov Date: Sun, 21 Mar 2010 14:22:47 +0600 Subject: touch: do not ignore argument of -d/-t option Previously -d/-t was no-op due to wrong handling of args passed to utimes(2). Signed-off-by: Mikhail Gusarov Signed-off-by: Denys Vlasenko --- coreutils/touch.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coreutils/touch.c b/coreutils/touch.c index 3f7b265bd..dceb7c1cc 100644 --- a/coreutils/touch.c +++ b/coreutils/touch.c @@ -104,7 +104,7 @@ int touch_main(int argc UNUSED_PARAM, char **argv) } do { - if (utimes(*argv, reference_file ? timebuf : NULL) != 0) { + if (utimes(*argv, (reference_file || date_str) ? timebuf : NULL) != 0) { if (errno == ENOENT) { /* no such file */ if (opts) { /* creation is disabled, so ignore */ continue; @@ -113,7 +113,7 @@ int touch_main(int argc UNUSED_PARAM, char **argv) fd = open(*argv, O_RDWR | O_CREAT, 0666); if (fd >= 0) { xclose(fd); - if (reference_file) + if (reference_file || date_str) utimes(*argv, timebuf); continue; } -- cgit v1.2.3