From 18b6da4d1ad6df328721834a4836ad2a4d06a60c Mon Sep 17 00:00:00 2001 From: Bradford Hovinen Date: Thu, 25 Jan 2001 15:23:51 +0000 Subject: [PATCH] Increment array 2001-01-25 Bradford Hovinen * location.c (location_rollback_all_to): Increment array * util.c (parse_date): Normalize values 2001-01-24 Bradford Hovinen * config-log.c (do_load): Disabled locking for now --- archiver/ChangeLog | 8 ++++++++ archiver/TODO | 1 + archiver/config-log.c | 2 ++ archiver/location.c | 1 + archiver/util.c | 6 +++--- 5 files changed, 15 insertions(+), 3 deletions(-) diff --git a/archiver/ChangeLog b/archiver/ChangeLog index f1189f624..991280208 100644 --- a/archiver/ChangeLog +++ b/archiver/ChangeLog @@ -1,5 +1,13 @@ +2001-01-25 Bradford Hovinen + + * location.c (location_rollback_all_to): Increment array index + + * util.c (parse_date): Normalize values + 2001-01-24 Bradford Hovinen + * config-log.c (do_load): Disabled locking for now + * archiver-spec: Added fine-grained location management description 2001-01-15 Bradford Hovinen diff --git a/archiver/TODO b/archiver/TODO index 5be73333a..24768bf8e 100644 --- a/archiver/TODO +++ b/archiver/TODO @@ -3,6 +3,7 @@ * Fix race in lock handling and add timeout support (look in gnome-mime) * Support multiple backends from CLI * Add translateable backend description support + * Some way to store the rollback time for each backend, for GUI purposes Long-term * Add clustering support: diff --git a/archiver/config-log.c b/archiver/config-log.c index 733f1cb78..c026db797 100644 --- a/archiver/config-log.c +++ b/archiver/config-log.c @@ -774,6 +774,7 @@ do_load (ConfigLog *config_log) do_unload (config_log); config_log_reset_filenames (config_log); +#if 0 /* Locking disabled for now */ /* FIXME: Race condition here, plus lock handling should be * better */ @@ -782,6 +783,7 @@ do_load (ConfigLog *config_log) lock_file = fopen (config_log->lock_filename, "w"); fclose (lock_file); +#endif config_log->file = fopen (config_log->filename, "r"); diff --git a/archiver/location.c b/archiver/location.c index 45f2b660f..873b5feb9 100644 --- a/archiver/location.c +++ b/archiver/location.c @@ -555,6 +555,7 @@ location_rollback_all_to (Location *location, struct tm *date, if (id_array[i] != -1) do_rollback (location->p->fullpath, node->data, id_array[i]); + i++; } if (parent_chain && location->p->inherits_location != NULL) diff --git a/archiver/util.c b/archiver/util.c index 934e056d3..04ee9fe3a 100644 --- a/archiver/util.c +++ b/archiver/util.c @@ -63,15 +63,15 @@ parse_date (char *str) if (!ok) return NULL; date = g_new (struct tm, 1); - date->tm_year = value; - date->tm_mon = 12; + date->tm_year = value - 1900; + date->tm_mon = 11; date->tm_mday = 31; date->tm_hour = 23; date->tm_min = 59; date->tm_sec = 59; if (extract_number (&str, &value, 2)) - date->tm_mon = value; + date->tm_mon = value - 1; else return date;