Changeset 204 for branches/samba-3.2.x/source/lib/time.c

Timestamp:

May 20, 2009, 6:46:53 PM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 branch to 3.2.4

File:

• branches/samba-3.2.x/source/lib/time.c (modified) (2 diffs)

branches/samba-3.2.x/source/lib/time.c

@@ -827 +827 @@
 ****************************************************************************/
 
-time_t get_create_time(const SMB_STRUCT_STAT *st,bool fake_dirs)
+static time_t calc_create_time(const SMB_STRUCT_STAT *st)
 {
         time_t ret, ret1;
 
-        if(S_ISDIR(st->st_mode) && fake_dirs) {
-                return (time_t)315493200L;          /* 1/1/1980 */
-        }
-    
         ret = MIN(st->st_ctime, st->st_mtime);
         ret1 = MIN(ret, st->st_atime);
@@ -849 +845 @@
 }
 
-struct timespec get_create_timespec(const SMB_STRUCT_STAT *st,bool fake_dirs)
-{
-        struct timespec ts;
-        ts.tv_sec = get_create_time(st, fake_dirs);
-        ts.tv_nsec = 0;
-        return ts;
+/****************************************************************************
+ Return the 'create time' from a stat struct if it exists (birthtime) or else
+ use the best approximation.
+****************************************************************************/
+
+struct timespec get_create_timespec(const SMB_STRUCT_STAT *pst,bool fake_dirs)
+{
+        struct timespec ret;
+
+        if(S_ISDIR(pst->st_mode) && fake_dirs) {
+                ret.tv_sec = 315493200L;          /* 1/1/1980 */
+                ret.tv_nsec = 0;
+                return ret;
+        }
+
+#if defined(HAVE_STAT_ST_BIRTHTIMESPEC)
+        ret = pst->st_birthtimespec;
+#elif defined(HAVE_STAT_ST_BIRTHTIMENSEC)
+        ret.tv_sec = pst->st_birthtime;
+        ret.tv_nsec = pst->st_birthtimenspec;
+#elif defined(HAVE_STAT_ST_BIRTHTIME)
+        ret.tv_sec = pst->st_birthtime;
+        ret.tv_nsec = 0;
+#else
+        ret.tv_sec = calc_create_time(pst);
+        ret.tv_nsec = 0;
+#endif
+
+        /* Deal with systems that don't initialize birthtime correctly.
+         * Pointed out by SATOH Fumiyasu <fumiyas@osstech.jp>.
+         */
+        if (null_timespec(ret)) {
+                ret.tv_sec = calc_create_time(pst);
+                ret.tv_nsec = 0;
+        }
+        return ret;
 }