option for revision directories to be created using local time rather than utc

Author: gruszczy

headers.h

@@ -46,6 +46,9 @@
 #define lock(mutex) pthread_mutex_lock(&mutex)
 #define unlock(mutex) pthread_mutex_unlock(&mutex)
 
+#define REV_LOCAL_TIME 1
+#define REV_GMT_TIME 2
+
 struct file_system_info {
 	int repo_count;
 	int *rev_count;
@@ -56,6 +59,8 @@ struct file_system_info {
     // TODO: this must be fixed; it doesn't hold actual information about revs,
     // but only the most recent revs for multiple repos
     char **revs;
+    
+    int rev_dir_time;
 };
 
 #endif

layout/versions.c

@@ -8,7 +8,8 @@ struct node *version_tree = NULL;
 
 int read_layout_versions(char *, char *);
 
-void read_revision_versions(char *rev, int rev_index, char *);
+void read_revision_versions(struct file_system_info *, char *rev, 
+                            int rev_index, char *);
 
 #define CURRENT_SNAPSHOT "mirror_metadata.current.snapshot"
 
@@ -26,7 +27,7 @@ int versions_init(struct file_system_info *fsinfo){
     read_layout_versions(fsinfo->revs[fsinfo->rev_count[0] - 1], NULL);
     for (i = fsinfo->rev_count[0] - 1; i >= 0; i--){
         add_snapshot(fsinfo->revs[i], CURRENT_SNAPSHOT, data_dir);
-		read_revision_versions(fsinfo->revs[i], fsinfo->rev_count[0] - i - 1, NULL);
+		read_revision_versions(fsinfo, fsinfo->revs[i], fsinfo->rev_count[0] - i - 1, NULL);
 	};
     return 0;
 
@@ -64,7 +65,7 @@ int versions_init_multi(struct file_system_info *fsinfo){
 		};
 		for (j = fsinfo->rev_count[i] - 1; j >= 0; j--){
             add_snapshot(fsinfo->revs[j], CURRENT_SNAPSHOT, data_dir);
-		    read_revision_versions(fsinfo->revs[j], fsinfo->rev_count[i] - j - 1, fsinfo->repo_names[i]);
+		    read_revision_versions(fsinfo, fsinfo->revs[j], fsinfo->rev_count[i] - j - 1, fsinfo->repo_names[i]);
 		};
 		versions_init_multi_free_revs;
 	};
@@ -122,7 +123,8 @@ int read_layout_versions(char *revision, char *prefix){
 
 };
 
-void read_revision_versions(char *revision, int rev_index, char *prefix){
+void read_revision_versions(struct file_system_info *fsinfo, char *revision, 
+                            int rev_index, char *prefix){
 
 #define read_revision_versions_finish {						\
 			gmstrcpy(&path, data_dir, "/", revision, 0);	\
@@ -136,7 +138,7 @@ void read_revision_versions(char *revision, int rev_index, char *prefix){
 		}
 
 	char *path = NULL;
-	char *sufix = get_revs_dir(revision);
+	char *sufix = get_revs_dir(fsinfo, revision);
 	char *file_path = NULL;
 	struct stats stats, *temp;
 	FILE *file = NULL;

parse.c

@@ -29,6 +29,8 @@
 
 #define OPT_FUSE "-o"
 
+#define OPT_DIR_LOCAL_TIME_FULL "--local-time"
+
 #define isOption(string) ((string[0] == '-') ? 1 : 0)
 
 // private functions
@@ -137,6 +139,8 @@ void parse_option(struct file_system_info *fsinfo, int argc, char **argv, int *i
         if (add_fuse_option(argc, argv, index) != 0)
             fail(ERR_PARAMETRES);
     }
+    else if (strcmp(argv[*index], OPT_DIR_LOCAL_TIME_FULL) == 0) 
+        fsinfo->rev_dir_time = REV_LOCAL_TIME;
     else 
 		fail(ERR_UNKNOWN_OPTION);
 

rdiff-backup-fs.c

@@ -27,6 +27,7 @@ int run(int argc, char **argv){
     int i = 0, options_count = 0;
 
     file_system_info = single(struct file_system_info);
+    file_system_info->rev_dir_time = REV_GMT_TIME;
 
     parse(file_system_info, argc, argv);
     initialize(file_system_info);

structure/full.c

@@ -2,9 +2,9 @@
 
 // prototypes:
 
-int add_revs_dir(char *, char *);
+int add_revs_dir(struct file_system_info *, char *, char *);
 
-void read_revision_all(char *, char *, int);
+void read_revision_all(struct file_system_info *, char *, char *, int);
 
 int read_stats_all(struct stats *stats, char *prefix, int rev, FILE *file);
 
@@ -25,7 +25,7 @@ int full_build(struct file_system_info *fsinfo){
         return -1;
     for (i = fsinfo->rev_count[0] - 1; i >= 0; i--){
         add_snapshot(fsinfo->revs[i], CURRENT_SNAPSHOT, data_dir);
-		read_revision_all(NULL, fsinfo->revs[i], fsinfo->rev_count[0] - i - 1);
+		read_revision_all(fsinfo, NULL, fsinfo->revs[i], fsinfo->rev_count[0] - i - 1);
 	};
     gtreenlinks(structure_tree);
 	return 0;
@@ -60,7 +60,7 @@ int full_build_multi(struct file_system_info *fsinfo){
 		};
 		for (j = fsinfo->rev_count[i] - 1; j >= 0; j--){
             add_snapshot(fsinfo->revs[j], CURRENT_SNAPSHOT, data_dir);
-		    read_revision_all(fsinfo->repo_names[i], fsinfo->revs[j], fsinfo->rev_count[i] - j - 1);
+		    read_revision_all(fsinfo, fsinfo->repo_names[i], fsinfo->revs[j], fsinfo->rev_count[i] - j - 1);
 		};
 		full_build_multi_free_revs;
     };
@@ -98,7 +98,8 @@ char** full_get_children(struct file_system_info *fsinfo, char *repo, char *revi
 
 // private:
 
-void read_revision_all(char *repo, char *rev, int rev_index){
+void read_revision_all(struct file_system_info *fsinfo, char *repo, char *rev, 
+                       int rev_index){
 
 #define read_revision_error {						\
 	    gstrdel(file);									\
@@ -115,18 +116,18 @@ void read_revision_all(char *repo, char *rev, int rev_index){
     struct stats *stats = calloc(1, sizeof(struct stats));
 
 	if (repo == NULL){
-		if (gmstrcpy(&rev_dir, "/", get_revs_dir(rev), 0) != 0)
+		if (gmstrcpy(&rev_dir, "/", get_revs_dir(fsinfo, rev), 0) != 0)
 			read_revision_error;
 	}
 	else{ // repo != NULL
-    	if (gmstrcpy(&rev_dir, "/", repo, "/", get_revs_dir(rev), 0) != 0)
+    	if (gmstrcpy(&rev_dir, "/", repo, "/", get_revs_dir(fsinfo, rev), 0) != 0)
 			read_revision_error;
 	};
     if (gmstrcpy(&file_path, data_dir, "/", CURRENT_SNAPSHOT, 0) != 0)
 		read_revision_error;
     if ((file = fopen(file_path, "r")) == NULL)
 		read_revision_error;
-    add_revs_dir(rev, repo);
+    add_revs_dir(fsinfo, rev, repo);
 
     while (read_stats_all(stats, rev_dir, rev_index, file) == 0)
         update_tree(structure_tree, stats, stats->path);
@@ -158,21 +159,21 @@ int read_stats_all(struct stats *stats, char *prefix, int rev, FILE *file){
 
 };
 
-int add_revs_dir(char *revision, char *repository){
+int add_revs_dir(struct file_system_info *fsinfo, char *revision, char *repository){
 
     struct stats stats;
 
     memset(&stats, 0, sizeof(stats));
     if (revision == NULL)
 		return -1;
     if (repository == NULL){
-		gmstrcpy(&stats.path, "/", get_revs_dir(revision), NULL);
+		gmstrcpy(&stats.path, "/", get_revs_dir(fsinfo, revision), NULL);
 		// printf("[Function: add_revs_dir] Adding revision %s to the data structure;\n", stats->path);
 		// stats->name = stats->path + strlen("/")'
 		stats.name = stats.path + 1;
     }
     else{
-		gmstrcpy(&stats.path, "/", repository, "/", get_revs_dir(revision), NULL);
+		gmstrcpy(&stats.path, "/", repository, "/", get_revs_dir(fsinfo, revision), NULL);
 		// stats->name = stats->path + strlen("/") + strlen(repository) + strlen("/");
 		stats.name = stats.path + 1 + strlen(repository) + 1;
     };

structure/necessary.c

@@ -99,7 +99,7 @@ int necessary_build(struct file_system_info *fsinfo){
     pthread_mutex_init(&cache_list.mutex, 0);
     repositories[0].revisions = calloc(fsinfo->rev_count[0], sizeof(revision_t));
     for (i = 0; i < fsinfo->rev_count[0]; i++) {
-        repositories[0].revisions[i].name = get_revs_dir(fsinfo->revs[i]);
+        repositories[0].revisions[i].name = get_revs_dir(fsinfo, fsinfo->revs[i]);
         gstrcpy(&repositories[0].revisions[i].file, fsinfo->revs[i]);
         pthread_mutex_init(&repositories[0].revisions[i].mutex, 0);
         set_directory_stats(&repositories[0].revisions[i].stats);
@@ -127,7 +127,7 @@ int necessary_build_multi(struct file_system_info *fsinfo){
             return -1;
         repositories[i].revisions = calloc(fsinfo->rev_count[i], sizeof(revision_t));
         for (j = 0; j < fsinfo->rev_count[i]; j++){
-            repositories[i].revisions[j].name = get_revs_dir(fsinfo->revs[j]);
+            repositories[i].revisions[j].name = get_revs_dir(fsinfo, fsinfo->revs[j]);
             set_directory_stats(&repositories[i].revisions[j].stats);
             gstrcpy(&repositories[i].revisions[j].file, fsinfo->revs[j]);
         }

support/grdiff.c

@@ -16,6 +16,15 @@
  */
 int unzip(char *, char *);
 
+/*
+ * returns gmt time of revision creation
+ * 
+ * @1: filename of revision's mirror_metadata file
+ * 
+ * returns: gmt time on success, -1 otherwise
+ */
+static time_t get_revs_date(char *);
+
 // public:
 
 int update_tree(tree_t tree, stats_t *stats, char *path){
@@ -109,7 +118,7 @@ int gather_revisions(struct file_system_info *fsinfo, char *repo_path, char *des
 };
 
 // FIXME: what about seasonal time?
-time_t get_revs_date(char *mirror){
+static time_t get_revs_date(char *mirror){
 
     #define FACTORS_COUNT 8
     #define FACTORS_SHORT_COUNT 6
@@ -146,10 +155,16 @@ time_t get_revs_date(char *mirror){
 
 };
 
-char* get_revs_dir(char *mirror){
+char* get_revs_dir(struct file_system_info *fsinfo, char *mirror){
 
     time_t rev_date = get_revs_date(mirror);
-    struct tm *rev_tm = gmtime(&rev_date);
+    struct tm *rev_tm = 0;
+    if (fsinfo->rev_dir_time == REV_LOCAL_TIME)
+        rev_tm = localtime(&rev_date);
+    else if (fsinfo->rev_dir_time == REV_GMT_TIME)
+        rev_tm = gmtime(&rev_date);
+    else
+        return NULL;
     char *result = gstralloc(strlen(ARCHFS_DIR_FORMAT_LENGTH));
 
     sprintf(result, ARCHFS_DIR_FORMAT, rev_tm->tm_year + 1900, 

support/grdiff.h

@@ -27,24 +27,14 @@ int unzip_revs(char *, char *);
  */
 int count_revs(char *);
 
-/*
- * returns gmt time of revision creation
- * 
- * @1: filename of revision's mirror_metadata file
- * 
- * returns: gmt time on success, -1 otherwise
- */
-
-time_t get_revs_date(char *);
-
 /*
  * returns name of directory for a revision
  * 
  * @1: filename of revision's mirror_metadata file
  * 
  * returns: name of directory on success, NULL otherwise
  */
-char* get_revs_dir(char *);
+char* get_revs_dir(struct file_system_info *, char *);
 
 /*
  * read single portion of file stats from a stream