* 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
* 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 (time_t, ...) and is 1 Jan 1970 at 0:0
+ * Epoch is the base of Unix time in seconds (time_t, ...)
+ * and is 1 Jan 1970 at 0:0 UTC
*
* The major two times that should be left are:
* btime_t (64 bit integer in microseconds base Epoch)
#include "bacula.h"
#include <math.h>
-void bstrftime(char *dt, int maxlen, utime_t tim)
+/* Formatted time for user display: dd-Mon-yyyy hh:mm */
+char *bstrftime(char *dt, int maxlen, utime_t tim)
{
time_t ttime = tim;
struct tm tm;
/* ***FIXME**** the format and localtime_r() should be user configurable */
localtime_r(&ttime, &tm);
strftime(dt, maxlen, "%d-%b-%Y %H:%M", &tm);
+ return dt;
}
+/* Formatted time for user display: dd-Mon-yy hh:mm (no century) */
+char *bstrftime_nc(char *dt, int maxlen, utime_t tim)
+{
+ time_t ttime = tim;
+ struct tm tm;
+
+ /* ***FIXME**** the format and localtime_r() should be user configurable */
+ localtime_r(&ttime, &tm);
+ /* NOTE! since the compiler complains about %y, I use %y and cut the century */
+ strftime(dt, maxlen, "%d-%b-%Y %H:%M", &tm);
+ strcpy(dt+7, dt+9);
+ return dt;
+}
+
+
+/* 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) {
} else {
return 0;
}
- return (utime_t)mktime(&tm);
+ tm.tm_wday = tm.tm_yday = 0;
+ tm.tm_isdst = -1;
+ ttime = mktime(&tm);
+ if (ttime == -1) {
+ ttime = 0;
+ }
+ return (utime_t)ttime;
}
-void get_current_time(struct date_time *dt)
-{
- struct tm tm;
- time_t now;
-
- now = time(NULL);
- gmtime_r(&now, &tm);
- Dmsg6(200, "m=%d d=%d y=%d h=%d m=%d s=%d\n", tm.tm_mon+1, tm.tm_mday, tm.tm_year+1900,
- tm.tm_hour, tm.tm_min, tm.tm_sec);
- tm_encode(dt, &tm);
-#ifdef DEBUG
- Dmsg2(200, "jday=%f jmin=%f\n", dt->julian_day_number, dt->julian_day_fraction);
- tm_decode(dt, &tm);
- Dmsg6(200, "m=%d d=%d y=%d h=%d m=%d s=%d\n", tm.tm_mon+1, tm.tm_mday, tm.tm_year+1900,
- tm.tm_hour, tm.tm_min, tm.tm_sec);
-#endif
-}
/*
* Bacula's time (btime_t) is an unsigned 64 bit integer that contains
- * the number of microseconds since Epoch Time (1 Jan 1970).
+ * the number of microseconds since Epoch Time (1 Jan 1970) UTC.
*/
btime_t get_current_btime()
/* Convert btime to utime */
utime_t btime_to_utime(btime_t bt)
{
- return (utime_t)bt;
+ return (utime_t)(bt/1000000);
}
+/*
+ * Return the week of the month, base 0 (wpos)
+ * given tm_mday and tm_wday. Value returned
+ * can be from 0 to 4 => week1, ... week5
+ */
+int tm_wom(int mday, int wday)
+{
+ int fs; /* first sunday */
+ fs = (mday%7) - wday;
+ if (fs <= 0) {
+ fs += 7;
+ }
+ if (mday <= fs) {
+// Dmsg2(100, "wom=0 wday=%d <= fs=%d\n", wday, fs);
+ return 0;
+ }
+ int wom = 1 + (mday - fs - 1) / 7;
+// Dmsg3(100, "wom=%d wday=%d fs=%d\n", wom, wday, fs);
+ return wom;
+}
+
+/*
+ * Given a Unix date return the week of the year.
+ * The returned value can be 0-53. Officially
+ * the weeks are numbered from 1 to 53 where week1
+ * is the week in which the first Thursday of the
+ * year occurs (alternatively, the week which contains
+ * the 4th of January). We return 0, if the week of the
+ * year does not fall in the current year.
+ */
+int tm_woy(time_t stime)
+{
+ int woy, fty, tm_yday;
+ time_t time4;
+ struct tm tm;
+ memset(&tm, 0, sizeof(struct tm));
+ localtime_r(&stime, &tm);
+ tm_yday = tm.tm_yday;
+ tm.tm_mon = 0;
+ tm.tm_mday = 4;
+ time4 = mktime(&tm);
+ localtime_r(&time4, &tm);
+ fty = 1 - tm.tm_wday;
+ if (fty <= 0) {
+ fty += 7;
+ }
+ woy = tm_yday - fty + 4;
+ if (woy < 0) {
+ return 0;
+ }
+ return 1 + woy / 7;
+}
+
+/* Deprecated. Do not use. */
+void get_current_time(struct date_time *dt)
+{
+ struct tm tm;
+ time_t now;
+
+ now = time(NULL);
+ gmtime_r(&now, &tm);
+ Dmsg6(200, "m=%d d=%d y=%d h=%d m=%d s=%d\n", tm.tm_mon+1, tm.tm_mday, tm.tm_year+1900,
+ tm.tm_hour, tm.tm_min, tm.tm_sec);
+ tm_encode(dt, &tm);
+#ifdef DEBUG
+ Dmsg2(200, "jday=%f jmin=%f\n", dt->julian_day_number, dt->julian_day_fraction);
+ tm_decode(dt, &tm);
+ Dmsg6(200, "m=%d d=%d y=%d h=%d m=%d s=%d\n", tm.tm_mon+1, tm.tm_mday, tm.tm_year+1900,
+ tm.tm_hour, tm.tm_min, tm.tm_sec);
+#endif
+}
/* 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)
{
/* 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)
{
/* 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,
/* 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)
{
/* 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)
{
/* 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,
* to a Julian day and day fraction.
*/
+/* Deprecated. Do not use. */
void tm_encode(struct date_time *dt,
struct tm *tm)
{
/* 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)
{
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) {
projects / bacula / bacula / blobdiff