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

+Thu Jul 27 14:18:57 CEST 2006 (tk)

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

+  * shared/misc.c: add dircopy()

+

 Wed Jul 26 17:00:59 CEST 2006 (tk)

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

   * libclamav/readdb.c: add support for incremental directories

@@ -132,7 +132,9 @@ int filecopy(const char *src, const char *dest)

 #else

 	char buffer[FILEBUFF];

-	int s, d, bytes;

+	int s, d, bytes, ret;

+	struct stat sb;

+

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

 	return -1;

@@ -146,9 +148,13 @@ int filecopy(const char *src, const char *dest)

 	write(d, buffer, bytes);

     close(s);

-

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

-    return close(d);

+    ret = close(d);

+

+    stat(src, &sb);

+    chmod(dest, sb.st_mode);

+

+    return ret;

 #endif

@@ -210,6 +216,50 @@ int rmdirs(const char *dirname)

     return 0;

 }

+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, 0700)) {

+	    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))) {

+#ifndef C_INTERIX

+	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);

+		rmdirs(dest);

+		closedir(dd);

+		return -1;

+	    }

+	}

+    }

+

+    closedir(dd);

+    return 0;

+}

+

 int isnumb(const char *str)

 {

     while(*str) {

@@ -27,6 +27,7 @@ void print_version(void);

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

 int isnumb(const char *str);

 int rmdirs(const char *dirname);

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

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

 #endif