refactoring: better functions for copying and appending snapshots

Author: gruszczy

externs.h

@@ -1,5 +1,4 @@
 #include <fuse.h>
-#include "support/gstring.h"
 
 extern int repo_count;
 extern int *rev_count;

headers.h

@@ -45,8 +45,6 @@
 #define POLICY_SIMPLE 1
 #define POLICY_LIMIT 2
 
-#define CURRENT_SNAPSHOT "mirror_metadata.current.snapshot"
-
 #define ARCHFS_DIR_FORMAT "%4d-%02d-%02dT%02d:%02d:%02d"
 #define ARCHFS_DIR_FORMAT_LENGTH "XXXX-XX-XXTXX:XX:XX"
 

layout/versions.c

@@ -12,6 +12,8 @@ void read_revision_versions(char *rev, int rev_index, char *, int);
 
 int versions_add_repo_dir(char *, int);
 
+#define CURRENT_SNAPSHOT "mirror_metadata.current.snapshot"
+
 // public:
 
 int versions_init(char *repo){
@@ -39,9 +41,9 @@ int versions_init(char *repo){
     for (i = rev_count[0] - 1; i >= 0; i--){
     	extension = gpthext(revs[i]);
     	if (strcmp(extension, "snapshot") == 0)
-    		snapshot_copy(revs[i], data_dir);
+    		snapshot_copy(revs[i], CURRENT_SNAPSHOT, data_dir);
     	else // strcmp(extension, "diff") == 0)
-    		snapshot_append(revs[i], data_dir);
+    		snapshot_append(revs[i], CURRENT_SNAPSHOT, data_dir);
 		gstrdel(extension);
 		read_revision_versions(revs[i], rev_count[0] - i - 1, NULL, -1);
 	};
@@ -88,9 +90,9 @@ int versions_init_multi(int count, char **repos){
 		for (j = rev_count[i] - 1; j >= 0; j--){
 	    	extension = gpthext(revs[j]);
 	    	if (strcmp(extension, "snapshot") == 0)
-	    		snapshot_copy(revs[j], data_dir);
+	    		snapshot_copy(revs[j], CURRENT_SNAPSHOT, data_dir);
 	    	else // strcmp(extension, "diff") == 0)
-	    		snapshot_append(revs[j], data_dir);
+	    		snapshot_append(revs[j], CURRENT_SNAPSHOT, data_dir);
 			gstrdel(extension);
 		    read_revision_versions(revs[j], rev_count[i] - j - 1, repo_names[i], i);
 		};

structure/full.c

@@ -10,6 +10,8 @@ void read_revision_all(char *, char *, int, int);
 
 int read_stats_all(struct stats *stats, char *prefix, int repo, int rev, FILE *file);
 
+#define CURRENT_SNAPSHOT "mirror_metadata.current.snapshot"
+
 // variables:
 
 tree_t structure_tree = NULL;
@@ -40,9 +42,9 @@ int full_build(char *repo){
     for (i = rev_count[0] - 1; i >= 0; i--){
     	extension = gpthext(revs[i]);
     	if (strcmp(extension, "snapshot") == 0)
-    		snapshot_copy(revs[i], data_dir);
+    		snapshot_copy(revs[i], CURRENT_SNAPSHOT, data_dir);
     	else // strcmp(extension, "diff") == 0)
-    		snapshot_append(revs[i], data_dir);
+    		snapshot_append(revs[i], CURRENT_SNAPSHOT, data_dir);
 		gstrdel(extension);
 		read_revision_all(NULL, revs[i], -1, rev_count[0] - i - 1);
 	};
@@ -91,9 +93,9 @@ int full_build_multi(int count, char **repo){
 		for (j = rev_count[i] - 1; j >= 0; j--){
 			extension = gpthext(revs[j]);
 			if (strcmp(extension, "snapshot") == 0)
-    			snapshot_copy(revs[j], data_dir);
+    			snapshot_copy(revs[j], CURRENT_SNAPSHOT, data_dir);
     		else // strcmp(extension, "diff") == 0)
-    			snapshot_append(revs[j], data_dir);
+    			snapshot_append(revs[j], CURRENT_SNAPSHOT, data_dir);
 		    gstrdel(extension);
 		    read_revision_all(repo_names[i], revs[j], i, rev_count[i] - j - 1);
 		};

structure/necessary.c

@@ -94,16 +94,11 @@ int necessary_build_multi(int count, char **repo){
     for (i = 0; i < repo_count; i++){
         if ((rev_count[i] = gather_revisions(repos[i], data_dir, &revs)) == -1)
             necessary_build_multi_finish(-1);
-        pass(4)
         repositories[i].revisions = calloc(rev_count[i], sizeof(revision_t));
         for (j = 0; j < rev_count[i]; j++){
-            pass(5);
             repositories[i].revisions[j].name = get_revs_dir(revs[i]);
-            pass(6);
             gstrcpy(&repositories[0].revisions[i].file, revs[i]);
-            pass(7);
         }
-        pass(8);
     }
     necessary_build_multi_finish(0);
 }
@@ -344,7 +339,7 @@ char * build_snapshot(revision_t *revisions, int count, int rev_index, int snaps
     if ((snapshot_desc = mkstemp(temp_snapshot)) == -1)
         build_snapshot_error;
     gmstrcpy(&snapshot, data_dir, "/", revisions[snapshot_index].file, 0);
-    printf("%s\n", snapshot);
+    
     if ((revision_desc = open(snapshot, O_RDONLY)) == -1)
         build_snapshot_error;
     if (gdesccopy(revision_desc, snapshot_desc))

support/grdiff.c

@@ -256,7 +256,7 @@ int get_revisions(char *where, int count, char **revs){
 
 }
 
-int snapshot_copy(char *revision, char *directory){
+int snapshot_copy(char *revision, char *target, char *directory){
 
 	char *path = NULL;
 	char *snapshot = NULL;
@@ -266,7 +266,7 @@ int snapshot_copy(char *revision, char *directory){
 	size_t result = 0;
 
 	gmstrcpy(&path, directory, "/", revision, 0);
-	gmstrcpy(&snapshot, directory, "/", CURRENT_SNAPSHOT, 0);
+	gmstrcpy(&snapshot, directory, "/", target, 0);
 #ifdef DEBUG_DEEP
 	printf("[Function: snapshot_copy] Copying from %s to %s\n", path, snapshot);
 #endif
@@ -285,23 +285,23 @@ int snapshot_copy(char *revision, char *directory){
 
 };
 
-int snapshot_append(char *file, char *directory){
+int snapshot_append(char *revision, char *target, char *directory){
 
 	char *snapshot = NULL;
 	int snapshot_desc = 0;
-	char *revision = NULL;
+	char *path = NULL;
 	int revision_desc = 0;
 	char buffer[1024];
 	size_t result = 0;
 
-	gmstrcpy(&revision, directory, "/", file, 0);
-	gmstrcpy(&snapshot, directory, "/", CURRENT_SNAPSHOT, 0);
+	gmstrcpy(&path, directory, "/", revision, 0);
+	gmstrcpy(&snapshot, directory, "/", target, 0);
 #ifdef DEBUG_DEEP
-	printf("[Function: snapshot_append] Appending from %s to %s\n", revision, snapshot);
+	printf("[Function: snapshot_append] Appending from %s to %s\n", path, snapshot);
 #endif
 	if ((snapshot_desc = open(snapshot, O_WRONLY | O_APPEND)) == -1)
 		return -1;
-	if ((revision_desc = open(revision, O_RDONLY)) == -1){
+	if ((revision_desc = open(path, O_RDONLY)) == -1){
 		close(snapshot_desc);
 		return -1;
 	};

support/grdiff.h

@@ -58,9 +58,27 @@ int read_stats(struct stats *stats, FILE *file);
 
 int get_revisions(char *, int, char **);
 
-int snapshot_copy(char *, char *);
+/*
+ * copy given revision to a certain target in a given directory
+ * 
+ * @1: revision file name to be copied
+ * @2: target file name
+ * @3: directory where both files are stored
+ * 
+ * returns: 0 on sucess, -1 otherwise
+ */
+int snapshot_copy(char *, char *, char *);
 
-int snapshot_append(char *file, char *);
+/*
+ * append given revision to a certain target in a given directory
+ * 
+ * @1: revision file name to be appended
+ * @2: target file name
+ * @3: directory where both files are stored
+ * 
+ * returns: 0 on sucess, -1 otherwise
+ */
+int snapshot_append(char *, char *, char *);
 
 int update_tree(tree_t, stats_t *);