add back visit_directory_toplev

git-svn-id: file:///var/lib/svn/clamav-devel/branches/clamd-proto@4659 77e5149b-7576-45b1-b177-96237e5ba77b

ChangeLog

@@ -1,3 +1,8 @@
+Thu Jan 29 11:39:58 EET 2009 (edwin)
+------------------------------------
+ * clamd/scanner.c, libclamav/others.h, libclamav/others_common.c: 
+ add back visit_directory_toplev
+
 Wed Jan 28 19:31:56 EET 2009 (edwin)
 ------------------------------------
  * clamd/session.c, libclamav/others.h, libclamav/others_common.c: 

clamd/scanner.c

@@ -349,6 +349,8 @@ int scan_callback(struct stat *sb, char *filename, const char *msg, enum cli_ftw
 			 "%s: Not supported file type. ERROR%c", msg,
 			 scandata->term);
 	    return CL_SUCCESS;
+	case visit_directory_toplev:
+	    return CL_SUCCESS;
 	case visit_file:
 	    break;
     }

libclamav/others.h

@@ -376,6 +376,7 @@ int cli_matchregex(const char *str, const char *regex);
 
 enum cli_ftw_reason {
     visit_file,
+    visit_directory_toplev, /* this is a directory at toplevel of recursion */
     /* must not free its args in the below cases! */
     error_mem, /* recommended to return CL_EMEM */
     /* recommended to return CL_SUCCESS below */

libclamav/others_common.c

@@ -409,6 +409,11 @@ int cli_ftw(const char *path, int flags, int maxdepth, cli_ftw_cb callback, stru
     entry.is_dir = ft == ft_directory;
     entry.filename = entry.is_dir ? NULL : strdup(path);
     entry.dirname = entry.is_dir ? path : NULL;
+    if (entry.is_dir) {
+	int ret = callback(entry.statbuf, NULL, path, visit_directory_toplev, data);
+	if (ret != CL_SUCCESS)
+	    return ret;
+    }
     return handle_entry(&entry, flags, maxdepth, callback, data);
 }