summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorguenther <guenther@openbsd.org>2016-08-23 03:31:44 +0000
committerguenther <guenther@openbsd.org>2016-08-23 03:31:44 +0000
commitd4d3b6b2b7541c2e72675f1fcc6fd922c9562ced (patch)
tree503df4f714dc290f7350dc379581447f00619f0d
parentConvert %q to %ll in format strings (diff)
downloadwireguard-openbsd-d4d3b6b2b7541c2e72675f1fcc6fd922c9562ced.tar.xz
wireguard-openbsd-d4d3b6b2b7541c2e72675f1fcc6fd922c9562ced.zip
Only try to set the times on a directory once, at the end, to avoid
duplication of warning messages ok krw@
-rw-r--r--bin/pax/file_subs.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/bin/pax/file_subs.c b/bin/pax/file_subs.c
index b568c4eed20..8d96763331a 100644
--- a/bin/pax/file_subs.c
+++ b/bin/pax/file_subs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: file_subs.c,v 1.49 2016/08/14 18:30:33 guenther Exp $ */
+/* $OpenBSD: file_subs.c,v 1.50 2016/08/23 03:31:44 guenther Exp $ */
/* $NetBSD: file_subs.c,v 1.4 1995/03/21 09:07:18 cgd Exp $ */
/*-
@@ -522,9 +522,7 @@ badlink:
arcn->sb.st_ino = sb.st_ino;
add_dir(nm, &(arcn->sb), 0);
}
- }
-
- if (patime || pmtime)
+ } else if (patime || pmtime)
set_ftime(nm, &arcn->sb.st_mtim, &arcn->sb.st_atim, 0);
return(0);
}