@@ -1,3 +1,7 @@

+Tue Feb  3 20:11:07 CET 2009 (tk)

+---------------------------------

+ * libclamav, shared: minor cleanups; fix handling of long file names (bb#1349)

+

 Fri Jan 30 09:13:15 CET 2009 (tk)

 ---------------------------------

  * shared/optparser.c: improve handling of short switches (bb#1374)

@@ -1221,7 +1221,7 @@ static int chdir_tmp(const char *dbname, const char *tmpdir)

 	    return -1;

 	}

-	if(cvd_unpack(cvdfile, tmpdir) == -1) {

+	if(cli_cvdunpack(cvdfile, tmpdir) == -1) {

 	    logg("!chdir_tmp: Can't unpack %s into %s\n", cvdfile, tmpdir);

 	    cli_rmdirs(tmpdir);

 	    return -1;

@@ -44,7 +44,11 @@

 #define TAR_BLOCKSIZE 512

-int cli_untgz(int fd, const char *destdir)

+#ifndef	O_BINARY

+#define	O_BINARY	0

+#endif

+

+static int cli_untgz(int fd, const char *destdir)

 {

 	char *path, osize[13], name[101], type;

 	char block[TAR_BLOCKSIZE];

@@ -576,3 +580,22 @@ int cli_cvdload(FILE *fs, struct cl_engine *engine, unsigned int *signo, unsigne

 	return ret;

     }

 }

+

+int cli_cvdunpack(const char *file, const char *dir)

+{

+	int fd, ret;

+

+

+    fd = open(file, O_RDONLY|O_BINARY);

+    if(fd == -1)

+	return -1;

+

+    if(lseek(fd, 512, SEEK_SET) < 0) {

+	close(fd);

+	return -1;

+    }

+

+    ret = cli_untgz(fd, dir);

+    close(fd);

+    return ret;

+}

@@ -32,6 +32,6 @@ struct cli_dbio {

 };

 int cli_cvdload(FILE *fs, struct cl_engine *engine, unsigned int *signo, unsigned int daily, unsigned int options, unsigned int cld);

-int cli_untgz(int fd, const char *destdir);

+int cli_cvdunpack(const char *file, const char *dir);

 #endif

@@ -28,7 +28,7 @@ CLAMAV_PUBLIC {

 CLAMAV_PRIVATE {

   global:

     cli_strtok;

-    cli_untgz;

+    cli_cvdunpack;

     cli_regcomp;

     cli_regexec;

     cli_regfree;

@@ -124,6 +124,7 @@ CLAMAV_PRIVATE {

     mp_read_radix;

     mp_clear;

     cli_versig;

+    cli_filecopy;

   local:

     *;

 };

@@ -774,99 +774,6 @@ int cli_rmdirs(const char *dirname)

 }

 #endif

-/* Function: readn

-        Try hard to read the requested number of bytes

-*/

-int cli_readn(int fd, void *buff, unsigned int count)

-{

-        int retval;

-        unsigned int todo;

-        unsigned char *current;

-

-

-        todo = count;

-        current = (unsigned char *) buff;

-

-        do {

-                retval = read(fd, current, todo);

-                if (retval == 0) {

-                        return (count - todo);

-                }

-                if (retval < 0) {

-			if (errno == EINTR) {

-				continue;

-			}

-			cli_errmsg("cli_readn: read error: %s\n", strerror(errno));

-                        return -1;

-                }

-                todo -= retval;

-                current += retval;

-        } while (todo > 0);

-

-

-        return count;

-}

-

-/* Function: writen

-        Try hard to write the specified number of bytes

-*/

-int cli_writen(int fd, const void *buff, unsigned int count)

-{

-        int retval;

-        unsigned int todo;

-        const unsigned char *current;

-

-

-        todo = count;

-        current = (const unsigned char *) buff;

-

-        do {

-                retval = write(fd, current, todo);

-                if (retval < 0) {

-			if (errno == EINTR) {

-				continue;

-			}

-			cli_errmsg("cli_writen: write error: %s\n", strerror(errno));

-                        return -1;

-                }

-                todo -= retval;

-                current += retval;

-        } while (todo > 0);

-

-

-        return count;

-}

-

-int cli_filecopy(const char *src, const char *dest)

-{

-	char *buffer;

-	int s, d, bytes;

-

-

-    if((s = open(src, O_RDONLY|O_BINARY)) == -1)

-	return -1;

-

-    if((d = open(dest, O_CREAT|O_WRONLY|O_TRUNC|O_BINARY, S_IRWXU)) == -1) {

-	close(s);

-	return -1;

-    }

-

-    if(!(buffer = cli_malloc(FILEBUFF))) {

-	close(s);

-	close(d);

-	return -1;

-    }

-

-    while((bytes = cli_readn(s, buffer, FILEBUFF)) > 0)

-	cli_writen(d, buffer, bytes);

-

-    free(buffer);

-    close(s);

-

-    return close(d);

-}

-

-

 /* Implement a generic bitset, trog@clamav.net */

 #define BITS_PER_CHAR (8)

@@ -66,6 +66,10 @@

 #include "ltdl.h"

 #include "matcher-ac.h"

+#ifndef	O_BINARY

+#define	O_BINARY	0

+#endif

+

 #ifdef CL_THREAD_SAFE

 #  include <pthread.h>

@@ -273,3 +277,94 @@ const char* cli_ctime(const time_t *timep, char *buf, const size_t bufsize)

 	return ret;

 }

+/* Function: readn

+        Try hard to read the requested number of bytes

+*/

+int cli_readn(int fd, void *buff, unsigned int count)

+{

+        int retval;

+        unsigned int todo;

+        unsigned char *current;

+

+

+        todo = count;

+        current = (unsigned char *) buff;

+

+        do {

+                retval = read(fd, current, todo);

+                if (retval == 0) {

+                        return (count - todo);

+                }

+                if (retval < 0) {

+			if (errno == EINTR) {

+				continue;

+			}

+			cli_errmsg("cli_readn: read error: %s\n", strerror(errno));

+                        return -1;

+                }

+                todo -= retval;

+                current += retval;

+        } while (todo > 0);

+

+

+        return count;

+}

+

+/* Function: writen

+        Try hard to write the specified number of bytes

+*/

+int cli_writen(int fd, const void *buff, unsigned int count)

+{

+        int retval;

+        unsigned int todo;

+        const unsigned char *current;

+

+

+        todo = count;

+        current = (const unsigned char *) buff;

+

+        do {

+                retval = write(fd, current, todo);

+                if (retval < 0) {

+			if (errno == EINTR) {

+				continue;

+			}

+			cli_errmsg("cli_writen: write error: %s\n", strerror(errno));

+                        return -1;

+                }

+                todo -= retval;

+                current += retval;

+        } while (todo > 0);

+

+

+        return count;

+}

+

+int cli_filecopy(const char *src, const char *dest)

+{

+	char *buffer;

+	int s, d, bytes;

+

+

+    if((s = open(src, O_RDONLY|O_BINARY)) == -1)

+	return -1;

+

+    if((d = open(dest, O_CREAT|O_WRONLY|O_TRUNC|O_BINARY, S_IRWXU)) == -1) {

+	close(s);

+	return -1;

+    }

+

+    if(!(buffer = cli_malloc(FILEBUFF))) {

+	close(s);

+	close(d);

+	return -1;

+    }

+

+    while((bytes = cli_readn(s, buffer, FILEBUFF)) > 0)

+	cli_writen(d, buffer, bytes);

+

+    free(buffer);

+    close(s);

+

+    return close(d);

+}

@@ -113,7 +113,6 @@ char *freshdbdir(void)

     return retdir;

 }

-

 void print_version(const char *dbdir)

 {

 	char *fdbdir, *path;

@@ -156,9 +155,9 @@ void print_version(const char *dbdir)

     free(path);

 }

 #endif

+

 int filecopy(const char *src, const char *dest)

 {

-

 #ifdef C_DARWIN

 	pid_t pid;

@@ -177,110 +176,11 @@ int filecopy(const char *src, const char *dest)

     return -1;

-#else

-	char buffer[FILEBUFF];

-	int s, d, bytes, ret;

-	struct stat sb;

-

-

-    if((s = open(src, O_RDONLY|O_BINARY)) == -1)

-	return -1;

-

-    if((d = open(dest, O_CREAT|O_WRONLY|O_TRUNC|O_BINARY, 0644)) == -1) {

-	close(s);

-	return -1;

-    }

-

-    while((bytes = read(s, buffer, FILEBUFF)) > 0)

-	if(write(d, buffer, bytes) < bytes) {

-	    close(s);

-	    close(d);

-	    return -1;

-	}

-

-    close(s);

-    /* njh@bandsman.co.uk: check result of close for NFS file */

-    ret = close(d);

-

-    stat(src, &sb);

-    chmod(dest, sb.st_mode);

-

-    return ret;

-

+#else /* C_DARWIN */

+    return cli_filecopy(src, dest);

 #endif

-

 }

-#ifndef CL_NOLIBCLAMAV

-int dircopy(const char *src, const char *dest)

-{

-	DIR *dd;

-	struct dirent *dent;

-	struct stat sb;

-	char spath[512], dpath[512];

-

-

-    if(stat(dest, &sb) == -1) {

-	if(mkdir(dest, 0755)) {

-	    /* mprintf("!dircopy: Can't create temporary directory %s\n", dest); */

-	    return -1;

-	}

-    }

-

-    if((dd = opendir(src)) == NULL) {

-        /* mprintf("!dircopy: Can't open directory %s\n", src); */

-        return -1;

-    }

-

-    while((dent = readdir(dd))) {

-#if (!defined(C_INTERIX)) && (!defined(C_WINDOWS))

-	if(dent->d_ino)

-#endif

-	{

-	    if(!strcmp(dent->d_name, ".") || !strcmp(dent->d_name, ".."))

-		continue;

-

-	    snprintf(spath, sizeof(spath), "%s/%s", src, dent->d_name);

-	    snprintf(dpath, sizeof(dpath), "%s/%s", dest, dent->d_name);

-

-	    if(filecopy(spath, dpath) == -1) {

-		/* mprintf("!dircopy: Can't copy %s to %s\n", spath, dpath); */

-		cli_rmdirs(dest);

-		closedir(dd);

-		return -1;

-	    }

-	}

-    }

-

-    closedir(dd);

-    return 0;

-}

-#endif

-

-#ifndef CL_NOLIBCLAMAV

-int cvd_unpack(const char *cvd, const char *destdir)

-{

-	int fd;

-

-

-    if((fd = open(cvd, O_RDONLY|O_BINARY)) == -1)

-	return -1;

-

-    if(lseek(fd, 512, SEEK_SET) == -1) {

-	close(fd);

-	return -1;

-    }

-

-    if(cli_untgz(fd, destdir) == -1) {

-	close(fd);

-	return -1;

-    }

-    close(fd);

-

-    return 0;

-}

-#endif

-

 int daemonize(void)

 {

 #if defined(C_OS2) || defined(C_WINDOWS)

@@ -33,8 +33,6 @@

 char *freshdbdir(void);

 void print_version(const char *dbdir);

 int filecopy(const char *src, const char *dest);

-int dircopy(const char *src, const char *dest);

-int cvd_unpack(const char *cvd, const char *destdir);

 int daemonize(void);

 const char *get_version(void);

 int match_regex(const char *filename, const char *pattern);

@@ -76,7 +76,7 @@ pthread_mutex_t logg_mutex = PTHREAD_MUTEX_INITIALIZER;

 #endif

-FILE *logg_fd = NULL;

+FILE *logg_fp = NULL;

 short int logg_verbose = 0, logg_nowarn = 0, logg_lock = 1, logg_time = 0, logg_foreground = 1;

 unsigned int logg_size = 0;

@@ -88,43 +88,89 @@ short logg_syslog;

 short int mprintf_disabled = 0, mprintf_verbose = 0, mprintf_quiet = 0,

 	  mprintf_stdout = 0, mprintf_nowarn = 0;

+#define ARGLEN(args, str, len)			    \

+{						    \

+	int arglen = 0, i;			    \

+	char *pt;				    \

+    va_start(args, str);			    \

+    len = strlen(str);				    \

+    for(i = 0; i < len - 1; i++) {		    \

+	if(str[i] == '%') {			    \

+	    switch(str[++i]) {			    \

+		case 's':			    \

+		    pt  = va_arg(args, char *);	    \

+		    if(pt)			    \

+			arglen += strlen(pt);	    \

+		    break;			    \

+		default:			    \

+		    va_arg(args, int);		    \

+		    arglen += 10;		    \

+		    break;			    \

+	    }					    \

+	}					    \

+    }						    \

+    va_end(args);				    \

+    len += arglen;				    \

+}

+

 int mdprintf(int desc, const char *str, ...)

 {

 	va_list args;

-	char buff[512];

-	int bytes;

-

+	char buffer[512], *abuffer = NULL, *buff;

+	int bytes, len, ret;

+

+

+    ARGLEN(args, str, len);

+    if(len <= sizeof(buffer)) {

+	len = sizeof(buffer);

+	buff = buffer;

+    } else {

+	abuffer = malloc(len);

+	if(!abuffer) {

+	    len = sizeof(buffer);

+	    buff = buffer;

+	} else {

+	    buff = abuffer;

+	}

+    }

     va_start(args, str);

-    bytes = vsnprintf(buff, sizeof(buff), str, args);

+    bytes = vsnprintf(buff, len, str, args);

     va_end(args);

+    buff[len - 1] = 0;

-    if(bytes == -1)

+    if(bytes < 0) {

+	if(len > sizeof(buffer))

+	    free(abuffer);

 	return bytes;

+    }

+    if((size_t) bytes >= len)

+	bytes = len - 1;

+

+    ret = send(desc, buff, bytes, 0);

-    if(bytes >= (int) sizeof(buff))

-	bytes = sizeof(buff) - 1;

+    if(len > sizeof(buffer))

+	free(abuffer);

-    return send(desc, buff, bytes, 0);

+    return bytes;

 }

-void logg_close(void) {

+void logg_close(void)

+{

+#if defined(USE_SYSLOG) && !defined(C_AIX)

+    if(logg_syslog)

+    	closelog();

+#endif

 #ifdef CL_THREAD_SAFE

     pthread_mutex_lock(&logg_mutex);

 #endif

-    if (logg_fd) {

-	fclose(logg_fd);

-	logg_fd = NULL;

+    if(logg_fp) {

+	fclose(logg_fp);

+	logg_fp = NULL;

     }

 #ifdef CL_THREAD_SAFE

     pthread_mutex_unlock(&logg_mutex);

 #endif

-

-#if defined(USE_SYSLOG) && !defined(C_AIX)

-    if(logg_syslog) {

-    	closelog();

-    }

-#endif

 }

 int logg(const char *str, ...)

@@ -133,29 +179,45 @@ int logg(const char *str, ...)

 #ifdef F_WRLCK

 	struct flock fl;

 #endif

-	char vbuff[1025];

+	char buffer[1025], *abuffer = NULL, *buff;

 	time_t currtime;

 	struct stat sb;

 	mode_t old_umask;

-

-

+	int len;

+

+

+    ARGLEN(args, str, len);

+    if(len <= sizeof(buffer)) {

+	len = sizeof(buffer);

+	buff = buffer;

+    } else {

+	abuffer = malloc(len);

+	if(!abuffer) {

+	    len = sizeof(buffer);

+	    buff = buffer;

+	} else {

+	    buff = abuffer;

+	}

+    }

     va_start(args, str);

-    vsnprintf(vbuff, sizeof(vbuff), str, args);

+    vsnprintf(buff, len, str, args);

     va_end(args);

-    vbuff[1024] = 0;

+    buff[len - 1] = 0;

 #ifdef CL_THREAD_SAFE

     pthread_mutex_lock(&logg_mutex);

 #endif

     if(logg_file) {

-	if(!logg_fd) {

+	if(!logg_fp) {

 	    old_umask = umask(0037);

-	    if((logg_fd = fopen(logg_file, "at")) == NULL) {

+	    if((logg_fp = fopen(logg_file, "at")) == NULL) {

 		umask(old_umask);

 #ifdef CL_THREAD_SAFE

 		pthread_mutex_unlock(&logg_mutex);

 #endif

 		printf("ERROR: Can't open %s in append mode (check permissions!).\n", logg_file);

+		if(len > sizeof(buffer))

+		    free(abuffer);

 		return -1;

 	    } else umask(old_umask);

@@ -163,11 +225,13 @@ int logg(const char *str, ...)

 	    if(logg_lock) {

 		memset(&fl, 0, sizeof(fl));

 		fl.l_type = F_WRLCK;

-		if(fcntl(fileno(logg_fd), F_SETLK, &fl) == -1) {

+		if(fcntl(fileno(logg_fp), F_SETLK, &fl) == -1) {

 #ifdef CL_THREAD_SAFE

 		    pthread_mutex_unlock(&logg_mutex);

 #endif

 		    printf("ERROR: %s is locked by another process\n", logg_file);

+		    if(len > sizeof(buffer))

+			free(abuffer);

 		    return -1;

 		}

 	    }

@@ -178,71 +242,73 @@ int logg(const char *str, ...)

 	    if(stat(logg_file, &sb) != -1) {

 		if((unsigned int) sb.st_size > logg_size) {

 		    logg_file = NULL;

-		    fprintf(logg_fd, "Log size = %u, max = %u\n", (unsigned int) sb.st_size, logg_size);

-		    fprintf(logg_fd, "LOGGING DISABLED (Maximal log file size exceeded).\n");

-		    fclose(logg_fd);

-		    logg_fd = NULL;

+		    fprintf(logg_fp, "Log size = %u, max = %u\n", (unsigned int) sb.st_size, logg_size);

+		    fprintf(logg_fp, "LOGGING DISABLED (Maximal log file size exceeded).\n");

+		    fclose(logg_fp);

+		    logg_fp = NULL;

 		}

 	    }

 	}

-	if(logg_fd) {

+	if(logg_fp) {

             /* Need to avoid logging time for verbose messages when logverbose

                is not set or we get a bunch of timestamps in the log without

                newlines... */

-	    if(logg_time && ((*vbuff != '*') || logg_verbose)) {

+	    if(logg_time && ((*buff != '*') || logg_verbose)) {

 	        char timestr[32];

 		time(&currtime);

 		cli_ctime(&currtime, timestr, sizeof(timestr));

 		/* cut trailing \n */

 		timestr[strlen(timestr)-1] = '\0';

-		fprintf(logg_fd, "%s -> ", timestr);

+		fprintf(logg_fp, "%s -> ", timestr);

 	    }

-	    if(*vbuff == '!') {

-		fprintf(logg_fd, "ERROR: %s", vbuff + 1);

-	    } else if(*vbuff == '^') {

+	    if(*buff == '!') {

+		fprintf(logg_fp, "ERROR: %s", buff + 1);

+	    } else if(*buff == '^') {

 		if(!logg_nowarn)

-		    fprintf(logg_fd, "WARNING: %s", vbuff + 1);

-	    } else if(*vbuff == '*') {

+		    fprintf(logg_fp, "WARNING: %s", buff + 1);

+	    } else if(*buff == '*') {

 		if(logg_verbose)

-		    fprintf(logg_fd, "%s", vbuff + 1);

-	    } else if(*vbuff == '#' || *vbuff == '~') {

-		fprintf(logg_fd, "%s", vbuff + 1);

+		    fprintf(logg_fp, "%s", buff + 1);

+	    } else if(*buff == '#' || *buff == '~') {

+		fprintf(logg_fp, "%s", buff + 1);

 	    } else

-		fprintf(logg_fd, "%s", vbuff);

+		fprintf(logg_fp, "%s", buff);

-	    fflush(logg_fd);

+	    fflush(logg_fp);

 	}

     }

 #if defined(USE_SYSLOG) && !defined(C_AIX)

     if(logg_syslog) {

-	if(vbuff[0] == '!') {

-	    syslog(LOG_ERR, "%s", vbuff + 1);

-	} else if(vbuff[0] == '^') {

+	if(buff[0] == '!') {

+	    syslog(LOG_ERR, "%s", buff + 1);

+	} else if(buff[0] == '^') {

 	    if(!logg_nowarn)

-		syslog(LOG_WARNING, "%s", vbuff + 1);

-	} else if(vbuff[0] == '*') {

+		syslog(LOG_WARNING, "%s", buff + 1);

+	} else if(buff[0] == '*') {

 	    if(logg_verbose) {

-		syslog(LOG_DEBUG, "%s", vbuff + 1);

+		syslog(LOG_DEBUG, "%s", buff + 1);

 	    }

-	} else if(vbuff[0] == '#' || vbuff[0] == '~') {

-	    syslog(LOG_INFO, "%s", vbuff + 1);

-	} else syslog(LOG_INFO, "%s", vbuff);

+	} else if(buff[0] == '#' || buff[0] == '~') {

+	    syslog(LOG_INFO, "%s", buff + 1);

+	} else syslog(LOG_INFO, "%s", buff);

     }

 #endif

     if(logg_foreground) {

-	if(vbuff[0] != '#')

-	    mprintf("%s", vbuff);

+	if(buff[0] != '#')

+	    mprintf("%s", buff);

     }

 #ifdef CL_THREAD_SAFE

     pthread_mutex_unlock(&logg_mutex);

 #endif

+    if(len > sizeof(buffer))

+	free(abuffer);

     return 0;

 }

@@ -250,7 +316,8 @@ void mprintf(const char *str, ...)

 {

 	va_list args;

 	FILE *fd;

-	char buff[512];

+	char buffer[512], *abuffer = NULL, *buff;

+	int len;

     if(mprintf_disabled) 

@@ -273,9 +340,23 @@ void mprintf(const char *str, ...)

  * quiet       stderr     no         no

  */

+    ARGLEN(args, str, len);

+    if(len <= sizeof(buffer)) {

+	len = sizeof(buffer);

+	buff = buffer;

+    } else {

+	abuffer = malloc(len);

+	if(!abuffer) {

+	    len = sizeof(buffer);

+	    buff = buffer;

+	} else {

+	    buff = abuffer;

+	}

+    }

     va_start(args, str);

-    vsnprintf(buff, sizeof(buff), str, args);

+    vsnprintf(buff, len, str, args);

     va_end(args);

+    buff[len - 1] = 0;

     if(buff[0] == '!') {

        if(!mprintf_stdout)

@@ -302,6 +383,9 @@ void mprintf(const char *str, ...)

     if(fd == stdout)

 	fflush(stdout);

+

+    if(len > sizeof(buffer))

+	free(abuffer);

 }

 struct facstruct {

@@ -812,7 +812,7 @@ static int build(const struct optstruct *opts)

 	return -1;

     }

-    if(cvd_unpack(olddb, pt) == -1) {

+    if(cli_cvdunpack(olddb, pt) == -1) {

 	mprintf("!build: Can't unpack CVD file %s\n", olddb);

 	cli_rmdirs(pt);

 	free(pt);

@@ -838,7 +838,7 @@ static int build(const struct optstruct *opts)

 	return -1;

     }

-    if(cvd_unpack(newcvd, pt) == -1) {

+    if(cli_cvdunpack(newcvd, pt) == -1) {

 	mprintf("!build: Can't unpack CVD file %s\n", newcvd);

 	cli_rmdirs(pt);

 	free(pt);

@@ -904,7 +904,7 @@ static int unpack(const struct optstruct *opts)

 	name[sizeof(name)-1]='\0';

     }

-    if(cvd_unpack(name, ".") == -1) {

+    if(cli_cvdunpack(name, ".") == -1) {

 	mprintf("!unpack: Can't unpack file %s\n", name);

 	return -1;

     }

@@ -1060,7 +1060,7 @@ static int listdb(const char *filename)

 	    return -1;

 	}

-	if(cvd_unpack(filename, dir) == -1) {

+	if(cli_cvdunpack(filename, dir) == -1) {

 	    mprintf("!listdb: Can't unpack CVD file %s\n", filename);

 	    cli_rmdirs(dir);

 	    free(dir);

@@ -1417,6 +1417,50 @@ static int compare(const char *oldpath, const char *newpath, FILE *diff)

     return 0;

 }

+static int dircopy(const char *src, const char *dest)

+{

+	DIR *dd;

+	struct dirent *dent;

+	struct stat sb;

+	char spath[512], dpath[512];

+

+

+    if(stat(dest, &sb) == -1) {

+	if(mkdir(dest, 0755)) {

+	    /* mprintf("!dircopy: Can't create temporary directory %s\n", dest); */

+	    return -1;

+	}

+    }

+

+    if((dd = opendir(src)) == NULL) {

+        /* mprintf("!dircopy: Can't open directory %s\n", src); */

+        return -1;

+    }

+

+    while((dent = readdir(dd))) {

+#if (!defined(C_INTERIX)) && (!defined(C_WINDOWS))

+	if(dent->d_ino)

+#endif

+	{

+	    if(!strcmp(dent->d_name, ".") || !strcmp(dent->d_name, ".."))

+		continue;

+

+	    snprintf(spath, sizeof(spath), "%s/%s", src, dent->d_name);

+	    snprintf(dpath, sizeof(dpath), "%s/%s", dest, dent->d_name);

+

+	    if(filecopy(spath, dpath) == -1) {

+		/* mprintf("!dircopy: Can't copy %s to %s\n", spath, dpath); */

+		cli_rmdirs(dest);

+		closedir(dd);

+		return -1;

+	    }

+	}

+    }

+

+    closedir(dd);

+    return 0;

+}

+

 static int verifydiff(const char *diff, const char *cvd, const char *incdir)

 {

 	char *tempdir, cwd[512];

@@ -1446,7 +1490,7 @@ static int verifydiff(const char *diff, const char *cvd, const char *incdir)

     }

     if(cvd) {

-	if(cvd_unpack(cvd, tempdir) == -1) {

+	if(cli_cvdunpack(cvd, tempdir) == -1) {

 	    mprintf("!verifydiff: Can't unpack CVD file %s\n", cvd);

 	    cli_rmdirs(tempdir);

 	    free(tempdir);

@@ -1634,7 +1678,7 @@ static int makediff(const struct optstruct *opts)

 	return -1;

     }

-    if(cvd_unpack(optget(opts, "diff")->strarg, odir) == -1) {

+    if(cli_cvdunpack(optget(opts, "diff")->strarg, odir) == -1) {

 	mprintf("!makediff: Can't unpack CVD file %s\n", optget(opts, "diff")->strarg);

 	cli_rmdirs(odir);

 	free(odir);

@@ -1657,7 +1701,7 @@ static int makediff(const struct optstruct *opts)

 	return -1;

     }

-    if(cvd_unpack(opts->filename[0], ndir) == -1) {

+    if(cli_cvdunpack(opts->filename[0], ndir) == -1) {

 	mprintf("!makediff: Can't unpack CVD file %s\n", opts->filename[0]);

 	cli_rmdirs(odir);

 	cli_rmdirs(ndir);