svn commit: r189517 - head/usr.bin/tar

[Tim Kientzle]

Author: kientzle
Date: Sun Mar  8 05:34:20 2009
New Revision: 189517
URL: http://svn.freebsd.org/changeset/base/189517

Log:
  Merge r552,r559 from libarchive.googlecode.com:  High-resolution time
  support on Tru64, AIX, and GNU Hurd, thanks to Björn Jacke.

Modified:
  head/usr.bin/tar/bsdtar_platform.h

Modified: head/usr.bin/tar/bsdtar_platform.h
==============================================================================
--- head/usr.bin/tar/bsdtar_platform.h	Sun Mar  8 05:28:52 2009	(r189516)
+++ head/usr.bin/tar/bsdtar_platform.h	Sun Mar  8 05:34:20 2009	(r189517)
@@ -137,15 +137,22 @@
 #if HAVE_STRUCT_STAT_ST_MTIMESPEC_TV_NSEC
 #define	ARCHIVE_STAT_CTIME_NANOS(st)	(st)->st_ctimespec.tv_nsec
 #define	ARCHIVE_STAT_MTIME_NANOS(st)	(st)->st_mtimespec.tv_nsec
-#else
-#if HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC
+#elif HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC
 #define	ARCHIVE_STAT_CTIME_NANOS(st)	(st)->st_ctim.tv_nsec
 #define	ARCHIVE_STAT_MTIME_NANOS(st)	(st)->st_mtim.tv_nsec
+#elif HAVE_STRUCT_STAT_ST_MTIME_N
+#define	ARCHIVE_STAT_CTIME_NANOS(st)	(st)->st_ctime_n
+#define	ARCHIVE_STAT_MTIME_NANOS(st)	(st)->st_mtime_n
+#elif HAVE_STRUCT_STAT_ST_UMTIME
+#define	ARCHIVE_STAT_CTIME_NANOS(st)	(st)->st_uctime * 1000
+#define	ARCHIVE_STAT_MTIME_NANOS(st)	(st)->st_umtime * 1000
+#elif HAVE_STRUCT_STAT_ST_MTIME_USEC
+#define	ARCHIVE_STAT_CTIME_NANOS(st)	(st)->st_ctime_usec * 1000
+#define	ARCHIVE_STAT_MTIME_NANOS(st)	(st)->st_mtime_usec * 1000
 #else
 #define	ARCHIVE_STAT_CTIME_NANOS(st)	(0)
 #define	ARCHIVE_STAT_MTIME_NANOS(st)	(0)
 #endif
-#endif
 
 /* How to mark functions that don't return. */
 /* This facilitates use of some newer static code analysis tools. */