Module Name: src Committed By: tls Date: Sun Aug 10 06:59:18 UTC 2014
Modified Files: src/usr.bin/xinstall [tls-earlyentropy]: xinstall.c Log Message: Rebase. To generate a diff of this commit: cvs rdiff -u -r1.115 -r1.115.18.1 src/usr.bin/xinstall/xinstall.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/usr.bin/xinstall/xinstall.c diff -u src/usr.bin/xinstall/xinstall.c:1.115 src/usr.bin/xinstall/xinstall.c:1.115.18.1 --- src/usr.bin/xinstall/xinstall.c:1.115 Tue Sep 6 18:50:32 2011 +++ src/usr.bin/xinstall/xinstall.c Sun Aug 10 06:59:18 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: xinstall.c,v 1.115 2011/09/06 18:50:32 joerg Exp $ */ +/* $NetBSD: xinstall.c,v 1.115.18.1 2014/08/10 06:59:18 tls Exp $ */ /* * Copyright (c) 1987, 1993 @@ -46,7 +46,7 @@ __COPYRIGHT("@(#) Copyright (c) 1987, 19 #if 0 static char sccsid[] = "@(#)xinstall.c 8.1 (Berkeley) 7/21/93"; #else -__RCSID("$NetBSD: xinstall.c,v 1.115 2011/09/06 18:50:32 joerg Exp $"); +__RCSID("$NetBSD: xinstall.c,v 1.115.18.1 2014/08/10 06:59:18 tls Exp $"); #endif #endif /* not lint */ @@ -1202,8 +1202,10 @@ metadata_log(const char *path, const cha if (*type == 'f') /* type=file */ fprintf(metafp, " size=%lld", (long long)size); if (tv != NULL && dopreserve) - fprintf(metafp, " time=%lld.%ld", - (long long)tv[1].tv_sec, (long)tv[1].tv_usec); + fprintf(metafp, " time=%lld.%0*lld", + (long long)tv[1].tv_sec, + (tv[1].tv_usec == 0 ? 1 : 9), + (long long)tv[1].tv_usec * 1000); if (digestresult && digest) fprintf(metafp, " %s=%s", digest, digestresult); if (fflags)