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

+Mon Feb 16 13:16:53 CET 2009 (tk)

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

+ * libclamav/clamd: fix double-slash when scanning the root dir (bb#1394)

+

 Sun Feb 15 19:14:00 CET 2009 (acab)

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

  * clamav-milter/clamav-milter.c: don't umask()

@@ -591,7 +591,10 @@ static int cli_ftw_dir(const char *dirname, int flags, int maxdepth, cli_ftw_cb

 		if (ret != CL_SUCCESS)

 		    break;

 	    }

-	    sprintf(fname, "%s/%s", dirname, dent->d_name);

+            if(!strcmp(dirname, "/"))

+		sprintf(fname, "/%s", dent->d_name);

+	    else

+		sprintf(fname, "%s/%s", dirname, dent->d_name);

 	    ret = handle_filetype(fname, flags, &statbuf, &stated, &ft, callback, data);

 	    if (ret != CL_SUCCESS) {