Misc see kes-1.31 13May03

[bacula/bacula] / bacula / src / lib / btime.c

diff --git a/bacula/src/lib/btime.c b/bacula/src/lib/btime.c
index a0325e6cc4c373bb712ee291b340c27cbad7c1e8..0b4b6df2215cd1723f9eabaf4a1a3bfd1ef6c549 100644 (file)
--- a/bacula/src/lib/btime.c
+++ b/bacula/src/lib/btime.c
@@ -4,7 +4,7 @@
  *   Version $Id$
  */
 /*
-   Copyright (C) 2000, 2001, 2002 Kern Sibbald and John Walker
+   Copyright (C) 2000-2003 Kern Sibbald and John Walker
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -24,10 +24,25 @@
  */
 
 
+/* Concerning times. There are a number of differnt time standards
+ * in Bacula (fdate_t, ftime_t, time_t (Unix standard), btime_t, and
+ *  utime_t).  fdate_t and ftime_t are deprecated and should no longer
+ *  be used, and in general, Unix time time_t should no longer be used,
+ *  it is being phased out. 
+ *     
+ *  Epoch is the base of Unix time in seconds (time_t, ...) 
+ *     and is 1 Jan 1970 at 0:0
+ *
+ *  The major two times that should be left are:
+ *     btime_t (64 bit integer in microseconds base Epoch)
+ *     utime_t (64 bit integer in seconds base Epoch)
+ */
+
 #include "bacula.h"
 #include <math.h>
 
-void bstrftime(char *dt, int maxlen, uint32_t tim)
+/* Formatted time */
+void bstrftime(char *dt, int maxlen, utime_t tim)
 {
    time_t ttime = tim;
    struct tm tm;
@@ -37,6 +52,44 @@ void bstrftime(char *dt, int maxlen, uint32_t tim)
    strftime(dt, maxlen, "%d-%b-%Y %H:%M", &tm);
 }
 
+/* Unix time to standard time string yyyy-mm-dd hh:mm:ss */
+char *bstrutime(char *dt, int maxlen, utime_t tim)
+{
+   time_t ttime = tim;
+   struct tm tm;
+   localtime_r(&ttime, &tm);
+   strftime(dt, maxlen, "%Y-%m-%d %H:%M:%S", &tm);
+   return dt;
+}
+
+/* Convert standard time string yyyy-mm-dd hh:mm:ss to Unix time */
+utime_t str_to_utime(char *str) 
+{
+   struct tm tm;
+   time_t ttime;
+
+   if (sscanf(str, "%d-%d-%d %d:%d:%d", &tm.tm_year, &tm.tm_mon, &tm.tm_mday,
+                                       &tm.tm_hour, &tm.tm_min, &tm.tm_sec) != 6) {
+      return 0;
+   }
+   if (tm.tm_mon > 0) {
+      tm.tm_mon--;
+   } else { 
+      return 0;
+   }
+   if (tm.tm_year >= 1900) {
+      tm.tm_year -= 1900;
+   } else {
+      return 0;
+   }
+   ttime = mktime(&tm);
+   if (ttime == -1) {      
+      ttime = 0;
+   }
+   return (utime_t)ttime;
+}
+
+/* Deprecated. Do not use. */
 void get_current_time(struct date_time *dt)
 {
    struct tm tm;
@@ -71,14 +124,22 @@ btime_t get_current_btime()
 }
 
 /* Convert btime to Unix time */
-time_t btime_to_etime(btime_t bt)
+time_t btime_to_unix(btime_t bt)
 {
    return (time_t)(bt/1000000);                   
 }
 
+/* Convert btime to utime */
+utime_t btime_to_utime(btime_t bt)
+{
+   return (utime_t)bt;
+}
+
+
 
 /*  date_encode  --  Encode civil date as a Julian day number. */
 
+/* Deprecated. Do not use. */
 fdate_t date_encode(uint32_t year, uint8_t month, uint8_t day)
 {
 
@@ -115,6 +176,7 @@ fdate_t date_encode(uint32_t year, uint8_t month, uint8_t day)
 /*  time_encode  --  Encode time from hours, minutes, and seconds
                     into a fraction of a day.  */
 
+/* Deprecated. Do not use. */
 ftime_t time_encode(uint8_t hour, uint8_t minute, uint8_t second,
                   float32_t second_fraction)
 {
@@ -126,6 +188,7 @@ ftime_t time_encode(uint8_t hour, uint8_t minute, uint8_t second,
 /*  date_time_encode  --  Set day number and fraction from date
                          and time.  */
 
+/* Deprecated. Do not use. */
 void date_time_encode(struct date_time *dt,
                      uint32_t year, uint8_t month, uint8_t day,
                      uint8_t hour, uint8_t minute, uint8_t second,
@@ -137,6 +200,7 @@ void date_time_encode(struct date_time *dt,
 
 /*  date_decode  --  Decode a Julian day number into civil date.  */
 
+/* Deprecated. Do not use. */
 void date_decode(fdate_t date, uint32_t *year, uint8_t *month,
                 uint8_t *day)
 {
@@ -165,6 +229,7 @@ void date_decode(fdate_t date, uint32_t *year, uint8_t *month,
 
 /*  time_decode  --  Decode a day fraction into civil time.  */
 
+/* Deprecated. Do not use. */
 void time_decode(ftime_t time, uint8_t *hour, uint8_t *minute,
                 uint8_t *second, float32_t *second_fraction)
 {
@@ -182,6 +247,7 @@ void time_decode(ftime_t time, uint8_t *hour, uint8_t *minute,
 /*  date_time_decode  --  Decode a Julian day and day fraction
                          into civil date and time.  */
 
+/* Deprecated. Do not use. */
 void date_time_decode(struct date_time *dt,
                      uint32_t *year, uint8_t *month, uint8_t *day,
                      uint8_t *hour, uint8_t *minute, uint8_t *second,
@@ -195,6 +261,7 @@ void date_time_decode(struct date_time *dt,
  *                to a Julian day and day fraction.
  */
 
+/* Deprecated. Do not use. */
 void tm_encode(struct date_time *dt,
                      struct tm *tm) 
 {
@@ -215,6 +282,7 @@ void tm_encode(struct date_time *dt,
 /*  tm_decode  --  Decode a Julian day and day fraction
                   into civil date and time in tm structure */
 
+/* Deprecated. Do not use. */
 void tm_decode(struct date_time *dt,
                      struct tm *tm) 
 {
@@ -240,6 +308,7 @@ void tm_decode(struct date_time *dt,
                                     1    dt1 > dt2
 */
 
+/* Deprecated. Do not use. */
 int date_time_compare(struct date_time *dt1, struct date_time *dt2)
 {
     if (dt1->julian_day_number == dt2->julian_day_number) {