refactoring: new error for failing to read repo; not using global variables in unzipping functions

Author: gruszczy

errors.c

@@ -33,6 +33,9 @@ void fail(int error){
 	    case (ERR_FULL_ONLY):
 	    	printf("Disk-only filesystem cannot be used, probably because of chosen layout;\n");
 	    	break;
+        case (ERR_REPO_READ):
+            printf("Failed to read repository;\n");
+            break;
 		default:
 		    printf("Unknown error\n");
 	    	break;

errors.h

@@ -11,6 +11,7 @@
 #define ERR_RDIFF 7
 
 #define ERR_FULL_ONLY 9
+#define ERR_REPO_READ 10
 
 void fail(int);
 

initialize.c

@@ -125,8 +125,10 @@ void initialize(){
 	layout_setup();
     fuse_operations_setup();
 
-    if (repo_count == 1)
-		init(repos[0]);
+    if (repo_count == 1){
+		if (init(repos[0]) == -1)
+            fail(ERR_REPO_READ);
+    }
     else if (repo_count > 1)
 		init_multi(repo_count, repos);
     else

layout/versions.c

@@ -33,7 +33,8 @@ int versions_init(char *repo){
 	// printf("[Function: init_versions] Received repo path %s;\n", path);
 	gtreenew(&version_tree);
 	rev_count = single(int);
-    rev_count[0] = gather_revisions(repo, &revs);    
+    if ((rev_count[0] = gather_revisions(repo, &revs)) <= 0)
+        versions_init_finish(-1);
     read_layout_versions(revs[rev_count[0] - 1], NULL);
     for (i = rev_count[0] - 1; i >= 0; i--){
     	extension = gpthext(revs[i]);
@@ -139,7 +140,7 @@ int read_layout_versions(char *revision, char *prefix){
 	char *path = NULL;
 	FILE *file = NULL;
 	struct stats stats;
-		
+    
 	if (gmstrcpy(&path, data_dir, "/", revision, 0) != 0)
 		read_layout_versions_finish(-1);
 	if ((file = fopen(path, "r")) == NULL)

structure/necessary.c

@@ -24,7 +24,7 @@ static struct stats root;
 
 static struct node * get_revision_tree(char *repo, char *revision);
 
-static void free_revision_tree(char *repo, char *revision);
+// static void free_revision_tree(char *repo, char *revision);
 
 static int build_revision_tree(revision_t *, int, int);
 
@@ -172,7 +172,7 @@ tree_t get_revision_tree(char *repo, char *rev){
     return revisions[j].tree;
 }
 
-void free_revision_tree(char *repo, char *rev){
+/*void free_revision_tree(char *repo, char *rev){
 
     revision_t *revisions = NULL;
     int count = 0;
@@ -201,7 +201,7 @@ void free_revision_tree(char *repo, char *rev){
         return;
     gtreedel(revisions[j].tree, "/");
     free(revisions[j].tree);
-};
+};*/
 
 int build_revision_tree(revision_t *revisions, int count, int rev_index){
 

support/grdiff.c

@@ -2,7 +2,15 @@
 
 // prototypes:
 
-int unzip(char *path);
+/*
+ * unzip target file to target directory
+ * 
+ * @1: file to be unzipped
+ * @2: directory where unzipped file should be stored
+ * 
+ * returns: 0 on sucesss, -1 otherwise
+ */
+int unzip(char *, char *);
 
 // public:
 
@@ -22,9 +30,7 @@ int unzip_revs(char *path, char *dest){
     char *extension = NULL;
     int descriptor = 0;
 
-#ifdef DEBUG_DEEP
-	printf("[Function: unzip_revs] Unzipping revisions in %s directory;\n", path);
-#endif
+	// printf("[Function: unzip_revs] Unzipping revisions in %s directory;\n", path);
     if ((dir = opendir(path)) == NULL)
     	return -1;
     for (entry = readdir(dir); entry != NULL; entry = readdir(dir)){
@@ -34,7 +40,7 @@ int unzip_revs(char *path, char *dest){
             extension = gpthext(entry->d_name);
             if (strcmp(extension, "gz") == 0){
 	            gstrdel(extension);
-            	if (unzip(mirror) == -1)
+            	if (unzip(mirror, dest) == -1)
             		continue;
             }
             else{
@@ -50,7 +56,6 @@ int unzip_revs(char *path, char *dest){
         };
     };
     closedir(dir);
-    
     return rev_count;
 
 };
@@ -312,7 +317,7 @@ int snapshot_append(char *file){
 
 // private:
 
-int unzip(char *path){
+int unzip(char *path, char *dest){
 
 #define unzip_error	{							\
     	    gstrdel(temp); 						\
@@ -333,13 +338,11 @@ int unzip(char *path){
     FILE *file = NULL;
     gzFile archive = NULL;
 
-    if (gstrcpy(&temp, path) == -1)
-		unzip_error;
-    if (gpthcld(&temp, temp) == -1)
+    if (gpthcld(&temp, path) == -1)
 		unzip_error;
     if (gpthugz(&temp) == -1)
 		unzip_error;
-    if (gmstrcpy(&target, data_dir, "/", temp, 0) == -1)
+    if (gmstrcpy(&target, dest, "/", temp, 0) == -1)
 		unzip_error;
 
     if ((file = fopen(target, "w")) == NULL)