[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. 99ae9353f6834da0cb73f59f4b32d1f0ae1263fa

[Stephen Gran]

The following commit has been merged in the debian/unstable branch:
commit f3d57299bb00fec2d270f5e44a08b993671dbcad
Author: Stephen Gran <steve at lobefin.net>
Date:   Thu Sep 4 13:25:12 2008 +0100

    Revert "sigtool/sigtool.c: make use of the UNLINK command in cdiffs (bb#1080)"
    
    This reverts commit 67a12f05afb036df8404704d56e69c4a4a1674f1.

diff --git a/ChangeLog b/ChangeLog
index 57d000b..a8556e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,3 @@
-Wed Jul  2 13:24:25 CEST 2008 (tk)
-----------------------------------
-  * sigtool/sigtool.c: make use of the UNLINK command in cdiffs (bb#1080)
-
 Wed Jul  2 12:43:46 CEST 2008 (tk)
 ----------------------------------
   * sigtool/sigtool.c: verify MD5's in --run-cdiff
diff --git a/sigtool/sigtool.c b/sigtool/sigtool.c
index 5cd04f2..08a1de3 100644
--- a/sigtool/sigtool.c
+++ b/sigtool/sigtool.c
@@ -1506,7 +1506,7 @@ static int diffdirs(const char *old, const char *new, const char *patch)
 	FILE *diff;
 	DIR *dd;
 	struct dirent *dent;
-	char cwd[512], path[1024];
+	char cwd[512], opath[1024];
 
 
     if(!getcwd(cwd, sizeof(cwd))) {
@@ -1539,8 +1539,8 @@ static int diffdirs(const char *old, const char *new, const char *patch)
 	    if(!strcmp(dent->d_name, ".") || !strcmp(dent->d_name, ".."))
 		continue;
 
-	    snprintf(path, sizeof(path), "%s/%s", old, dent->d_name);
-	    if(compare(path, dent->d_name, diff) == -1) {
+	    snprintf(opath, sizeof(opath), "%s/%s", old, dent->d_name);
+	    if(compare(opath, dent->d_name, diff) == -1) {
 		fclose(diff);
 		unlink(patch);
 		closedir(dd);
@@ -1548,28 +1548,7 @@ static int diffdirs(const char *old, const char *new, const char *patch)
 	    }
 	}
     }
-    closedir(dd);
-
-    /* check for removed files */
-    if((dd = opendir(old)) == NULL) {
-        mprintf("!diffdirs: Can't open directory %s\n", old);
-	fclose(diff);
-	return -1;
-    }
 
-    while((dent = readdir(dd))) {
-#ifndef C_INTERIX
-	if(dent->d_ino)
-#endif
-	{
-	    if(!strcmp(dent->d_name, ".") || !strcmp(dent->d_name, ".."))
-		continue;
-
-	    snprintf(path, sizeof(path), "%s/%s", new, dent->d_name);
-	    if(access(path, R_OK))
-		fprintf(diff, "UNLINK %s\n", dent->d_name);
-	}
-    }
     closedir(dd);
 
     fclose(diff);

-- 
Debian repository for ClamAV