@@ -1,3 +1,16 @@

+Wed Aug 18 17:17:20 CEST 2004 (tk)

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

+  * clamscan: Scan mail files by default. Add new option --no-mail.

+  * clamd: Add new option MailFollowURLs. See documentation and source code

+	   for details. WARNING: This option may open your system to a DoS

+	   attack. Never use it on loaded servers.

+  * clamscan: Add new option --mail-follow-urls

+  * sigtool: Add new option --md5

+  * sigtool: Remove ability of automatic signature generation - inexperienced

+	     users should now use MD5 hashes (*.hdb databases) to create

+	     their own signatures

+  * docs: Update manual pages

+

 Wed Aug 18 15:24:00 BST 2004 (trog)

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

   * libclamav/chmunpack.c: make sure we don't get filename collisions

@@ -327,6 +327,12 @@ int acceptloop_th(int socketd, struct cl_node *root, const struct cfgstruct *cop

     if(cfgopt(copt, "ScanMail")) {

 	logg("Mail files support enabled.\n");

 	options |= CL_MAIL;

+

+	if(cfgopt(copt, "MailFollowURLs")) {

+	    logg("Mail: URL scanning enabled.\n");

+	    options |= CL_MAILURL;

+	}

+

     } else {

 	logg("Mail files support disabled.\n");

     }

@@ -192,22 +192,24 @@ void help(void)

     mprintf("                          Clam AntiVirus Scanner "VERSION"\n");

     mprintf("                (C) 2002 - 2004 Tomasz Kojm <tkojm@clamav.net>\n\n");

-    mprintf("    --help                -h             Show help\n");

-    mprintf("    --version             -V             Print version number and exit\n");

+    mprintf("    --help                -h             Print this help screen\n");

+    mprintf("    --version             -V             Print version number\n");

     mprintf("    --verbose             -v             Be verbose\n");

-    mprintf("    --debug                              Enable debug messages\n");

-    mprintf("    --quiet                              Be quiet - only output error messages\n");

+    mprintf("    --debug                              Enable libclamav's debug messages\n");

+    mprintf("    --quiet                              Only output error messages\n");

     mprintf("    --stdout                             Write to stdout instead of stderr\n");

-    mprintf("                                         (this help is always written to stdout)\n");

+    mprintf("    --no-summary                         Disable summary at end of scanning\n");

+    mprintf("    --infected            -i             Only print infected files\n");

+    mprintf("    --bell                               Sound bell on virus detection\n");

+

     mprintf("\n");

     mprintf("    --tempdir=DIRECTORY                  Create temporary files in DIRECTORY\n");

     mprintf("    --leave-temps                        Do not remove temporary files\n");

     mprintf("    --database=FILE/DIR   -d FILE/DIR    Load virus database from FILE or load\n");

     mprintf("                                         all .cvd and .db[2] files from DIR\n");

     mprintf("    --log=FILE            -l FILE        Save scan report to FILE\n");

-    mprintf("    --recursive           -r             Scan directories recursively\n");

-    mprintf("    --infected            -i             Print infected files only\n");

-    mprintf("    --remove                             Remove infected files. Be careful.\n");

+    mprintf("    --recursive           -r             Scan subdirectories recursively\n");

+    mprintf("    --remove                             Remove infected files. Be careful!\n");

     mprintf("    --move=DIRECTORY                     Move infected files into DIRECTORY\n");

 #ifdef HAVE_REGEX_H

     mprintf("    --exclude=REGEX                      Don't scan file names matching REGEX\n");

@@ -216,16 +218,18 @@ void help(void)

     mprintf("    --exclude=PATT                       Don't scan file names containing PATT\n");

     mprintf("    --include=PATT                       Only scan file names containing PATT\n");

 #endif

-    mprintf("    --bell                               Sound bell on virus detection\n");

-    mprintf("    --no-summary                         Disable summary at end of scanning\n");

-    mprintf("    --mbox                -m             Treat stdin as a mailbox\n");

+

     mprintf("\n");

+    mprintf("    --no-mail                            Disable mail file support\n");

     mprintf("    --no-pe                              Disable PE analysis\n");

     mprintf("    --no-ole2                            Disable OLE2 support\n");

     mprintf("    --no-html                            Disable HTML support\n");

     mprintf("    --no-archive                         Disable libclamav archive support\n");

     mprintf("    --detect-broken                      Try to detect broken executable files\n");

     mprintf("    --block-encrypted                    Block encrypted archives\n");

+    mprintf("    --mail-follow-urls                   Download and scan URLs\n");

+

+    mprintf("\n");

     mprintf("    --max-space=#n                       Extract first #n kilobytes only\n");

     mprintf("    --max-files=#n                       Extract first #n files only\n");

     mprintf("    --max-recursion=#n                   Maximal recursion level\n");

@@ -237,9 +241,7 @@ void help(void)

     mprintf("    --lha[=FULLPATH]                     Enable support for .lha files\n");

     mprintf("    --jar[=FULLPATH]                     Enable support for .jar files\n");

     mprintf("    --tar[=FULLPATH]                     Enable support for .tar files\n");

-    mprintf("    --deb[=FULLPATH to ar]               Enable support for .deb files,\n");

-    mprintf("                                         implies --tgz , but doesn't conflict\n");

-    mprintf("                                         with --tgz=FULLPATH.\n");

+    mprintf("    --deb[=FULLPATH to ar]               Enable support for .deb files\n");

     mprintf("    --tgz[=FULLPATH]                     enable support for .tar.gz, .tgz files\n\n");

     exit(0);

@@ -48,7 +48,6 @@

 #include "manager.h"

 #include "treewalk.h"

 #include "shared.h"

-#include "mbox.h"

 #include "str.h"

 #include "strrcpy.h"

 #include "memory.h"

@@ -60,7 +59,6 @@

 dev_t procdev;

 #endif

-extern int cli_mbox(const char *dir, int desc, unsigned int options); /* FIXME */

 int scanmanager(const struct optstruct *opt)

 {

@@ -212,68 +210,7 @@ int scanmanager(const struct optstruct *opt)

 	    ret = scandirs(cwd, trie, user, opt, limits);

     } else if(!strcmp(opt->filename, "-")) { /* read data from stdin */

-	/*

-	 * njh@bandsman.co.uk: treat the input as a mailbox, the program

-	 * can then be used as a filter called when mail is received

-	 */

-	if(optc(opt, 'm')) {

-		const char *tmpdir;

-		char *dir;

-

-		/* njh@bandsman.co.uk: BeOS */

-#if !defined(C_CYGWIN) && !defined(C_BEOS)

-		if(!geteuid()) {

-		    if((user = getpwnam(UNPUSER)) == NULL) {

-			mprintf("@Can't get information about user %s\n", UNPUSER);

-			exit(60); /* this is critical problem, so we just exit here */

-		    }

-		}

-#endif

-

-		tmpdir = getenv("TMPDIR");

-

-		if(tmpdir == NULL)

-#ifdef P_tmpdir

-			tmpdir = P_tmpdir;

-#else

-			tmpdir = "/tmp";

-#endif

-

-		if(checkaccess(tmpdir, UNPUSER, W_OK) != 1) {

-			mprintf("@Can't write to the temporary directory.\n");

-			exit(64);

-		}

-		/* generate the temporary directory */

-

-		dir = cli_gentemp(tmpdir);

-		if(mkdir(dir, 0700)) {

-			mprintf("@Can't create the temporary directory %s\n", dir);

-			exit(63); /* critical */

-		}

-

-		if(user)

-			chown(dir, user->pw_uid, user->pw_gid);

-

-		/*

-		 * Extract the attachments into the temporary directory

-		 */

-		ret = cli_mbox(dir, 0, 0);

-

-		if(ret == 0) {

-			/* fix permissions of extracted files */

-			fixperms(dir);

-

-			if(ret == 0) /* execute successful */

-				ret = treewalk(dir, trie, user, opt, limits);

-

-			/* remove the directory - as clamav */

-			clamav_rmdirs(dir);

-

-			/* free dir - it's not necessary now */

-			free(dir);

-		}

-	} else

-	    ret = checkstdin(trie, limits);

+	ret = checkstdin(trie, limits);

     } else {

 	int x;

@@ -442,9 +379,15 @@ int scanfile(const char *filename, struct cl_node *root, const struct passwd *us

     else

 	options |= CL_HTML;

-    if(optc(opt, 'm'))

+    if(optl(opt, "no-mail")) {

+	options &= ~CL_MAIL;

+    } else {

 	options |= CL_MAIL;

+	if(optl(opt, "mail-follow-urls"))

+	    options |= CL_MAILURL;

+    }

+

     /* 

      * check the extension  - this is a special case, normally we don't need to

      * do this (libclamav detects archive by its magic string), but here we

@@ -94,7 +94,9 @@ int main(int argc, char **argv)

 	    {"no-pe", 0, 0, 0},

 	    {"no-ole2", 0, 0, 0},

 	    {"no-html", 0, 0, 0},

-	    {"mbox", 0, 0, 'm'},

+	    {"mbox", 0, 0, 'm'}, /* not used */

+	    {"no-mail", 0, 0, 0},

+	    {"mail-follow-urls", 0, 0, 0},

 	    {"unzip", 2, 0, 0},

 	    {"unrar", 2, 0, 0},

 	    {"unace", 2, 0, 0}, /* not used */

@@ -1,5 +1,5 @@

 .\" Manual page created by Tomasz Kojm, 20021001.

-.TH "clamav.conf" "5" "August 4, 2004" "Tomasz Kojm" "Clam AntiVirus"

+.TH "clamav.conf" "5" "August 18, 2004" "Tomasz Kojm" "Clam AntiVirus"

 .SH "NAME"

 .LP 

 \fBclamav.conf\fR \- a configuration file for Clam AntiVirus Daemon

@@ -125,8 +125,7 @@ Do internal checks every NUMBER seconds.

 Default: 3600

 .TP 

 \fBVirusEvent COMMAND\fR

-Execute the COMMAND when virus is found. In the command string %v and %f will be replaced by a virus name and an infected file name respectively.

-\fBSECURITY WARNING: Make sure the virus event command cannot be exploited eg. by using some special file name when %f is in use. Always use a full path to the command. Never delete/move files with this directive !

+Execute the COMMAND when virus is found. In the command string %v will be replaced by a virus name.

 \fR

 .br 

 Default: disabled.

@@ -180,7 +179,12 @@ Enables HTML detection and normalisation.

 Default: enabled.

 .TP 

 \fBScanMail\fR

-Enable scanning of Mbox, Maildir and raw mail files.

+Enable scanning of mail files.

+.br 

+Default: enabled.

+.TP 

+\fBMailFollowURLs\fR

+If an email contains URLs ClamAV can download and scan them. \fBWARNING: This option may open your system to a DoS attack. Never use it on loaded servers.\fR

 .br 

 Default: disabled.

 .TP 

@@ -1,5 +1,5 @@

 .\" Manual page created by Tomasz Kojm, 14/15 IV 2002

-.TH "clamscan" "1" "August 4, 2004" "Tomasz Kojm" "Clam AntiVirus"

+.TH "clamscan" "1" "August 18, 2004" "Tomasz Kojm" "Clam AntiVirus"

 .SH "NAME"

 .LP 

 clamscan \- scan files and directories against viruses

@@ -57,10 +57,6 @@ Don't scan file names containing PATT. It may be used multiple times.

 .TP 

 \fB\-\-include=PATT\fR

 Only scan file names containing PATT. It may be used multiple times.

-.TP 

-\fB\-\-mbox\fR

-Enable scanning of various mail file types (also treat stdin as a mailbox \- for backward compatibility).

-.TP 

 \fB\-i, \-\-infected\fR

 Only print infected files.

 .TP 

@@ -70,6 +66,9 @@ Remove infected files. \fBBe careful.\fR

 \fB\-\-move=DIRECTORY\fR

 Move infected files into DIRECTORY. Directory must be writeable for the 'clamav' user or unprivileged user running clamscan.

 .TP 

+\fB\-\-no\-mail\fR

+Disable scanning of mail files.

+.TP 

 \fB\-\-no\-pe\fR

 PE stands for Portable Executable \- it's an executable file format used in all 32\-bit versions of Windows operating systems. By default ClamAV performs deeper analysis of executable files and tries to decompress popular executable packers such as UPX. This option \fBdisables\fR PE support and is not recommended !

 .TP 

@@ -88,6 +87,9 @@ Mark broken executables as viruses (Broken.Executable).

 \fB\-\-block\-encrypted\fR

 Mark encrypted archives as viruses (Encrypted.Zip, Encrypted.RAR).

 .TP 

+\fB\-\-mail\-follow\-urls\fR

+If an email contains URLs ClamAV can download and scan them. \fBWARNING: This option may open your system to a DoS attack. Never use it on loaded servers.\fR

+.TP 

 \fB\-\-max\-files=#n\fR

 Extract first #n files from each archive. This option protects your system against DoS attacks (default: 500)

 .TP 

@@ -1,14 +1,15 @@

 .\" Manual page created by Tomasz Kojm, 20020629

-.TH "sigtool" "1" "July 22, 2004" "Tomasz Kojm" "Clam AntiVirus"

+.TH "sigtool" "1" "August 18, 2004" "Tomasz Kojm" "Clam AntiVirus"

 .SH "NAME"

 .LP 

-sigtool \- signature management tool

+sigtool \- signature and database management tool

 .SH "SYNOPSIS"

 .LP 

 sigtool [options]

 .SH "DESCRIPTION"

 .LP 

-sigtool can be used to generate a virus signature using an external anti\-virus scanner (see the official documentation for license issues!). It can also dump hexadecimal data and build and unpack CVD databases.

+sigtool can be used to generate MD5 checksums, convert data 

+into hexadecimal format, and build/unpack CVD databases. Also it can verify digital signatures of databases and list virus signature names.

 .SH "OPTIONS"

 .LP 

@@ -28,15 +29,8 @@ Write all messages to standard output (stdout), instead of standard error output

 \fB\-\-hex\-dump\fR

 Read data from stdin and write hex string to stdout.

 .TP 

-\fB\-c, \-\-command\fR

-Anti\-virus scanner command with options. Remember about quotes if the argument string contains white characters. Command should contain everything except infected file name.

-Make sure your commercial scanner's license does not disallow sigtool usage !

-.TP 

-\fB\-f, \-\-file\fR

-Infected file name.

-.TP 

-\fB\-s, \-\-string\fR

-Unique string from anti\-virus scanner's output when it detects the virus. In most cases it should be a virus name.

+\fB\-\-md5\fR

+Generate MD5 checksum from stdin.

 .TP 

 \fB\-i, \-\-info\fR

 Print a CVD information and verify MD5 and a digital signature.

@@ -55,11 +49,9 @@ Unpack a local CVD file to a current directory.

 .SH "EXAMPLES"

 .LP 

 .TP 

-(0) Generate hex string from testfile and save it to testfile.hex:

+Generate hex string from testfile and save it to testfile.hex:

 \fBcat testfile | sigtool \-\-hex\-dump > testfile.hex\fR

-.TP 

-(1) Please check clamdoc.pdf and signatures.pdf for more example of usage.

 .SH "CREDITS"

 Please check the full documentation for credits.

 .SH "AUTHOR"

@@ -160,8 +160,14 @@ ScanOLE2

 ## Mail files

 ##

-# Uncomment this option if you are going to scan mail files.

-#ScanMail

+# Enable internal e-mail scanner.

+ScanMail

+

+# If an email contains URLs ClamAV can download and scan them.

+# WARNING: This option may open your system to a DoS attack.

+#	   Never use it on loaded servers.

+#MailFollowURLs

+

 ##

 ## HTML

@@ -171,20 +177,18 @@ ScanOLE2

 # recommended and required to detect popular exploits.

 ScanHTML

+

 ##

 ## Archives

 ##

-

 # Comment this line to disable scanning of the archives.

 ScanArchive

-

 # By default the built-in RAR unpacker is disabled by default because the code

 # terribly leaks, however it's probably a good idea to enable it.

 #ScanRAR

-

 # Options below protect your system against Denial of Service attacks

 # with archive bombs.

@@ -65,6 +65,7 @@ struct cfgstruct *parsecfg(const char *cfgfile, int messages)

 	    {"ScanPE", OPT_NOARG},

 	    {"DetectBrokenExecutables", OPT_NOARG},

 	    {"ScanMail", OPT_NOARG},

+	    {"MailFollowURLs", OPT_NOARG},

 	    {"ScanHTML", OPT_NOARG},

 	    {"ScanOLE2", OPT_NOARG},

 	    {"ScanArchive", OPT_NOARG},

@@ -54,9 +54,7 @@ int main(int argc, char **argv)

 	    {"version", 0, 0, 'V'},

 	    {"tempdir", 1, 0, 0},

 	    {"hex-dump", 0, 0, 0},

-	    {"command", 1, 0, 'c'},

-	    {"string", 1, 0, 's'},

-	    {"file", 1, 0, 'f'},

+	    {"md5", 0, 0, 0},

 	    {"build", 1, 0, 'b'},

 	    {"server", 1, 0, 0},

 	    {"unpack", 1, 0, 'u'},

@@ -16,7 +16,6 @@

  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

  */

-/* some things may need to be tuned here (look at jmp variables) */

 #if HAVE_CONFIG_H

 #include "clamav-config.h"

@@ -67,115 +66,6 @@ int listdir(const char *dirname);

 void listsigs(struct optstruct *opt);

 int cli_rmdirs(const char *dirname); /* libclamav's internal */

-int scanfile(const char *cmd, const char *str, const char *file)

-{

-	FILE *pd;

-	char *command, buffer[LINE];

-

-

-    /* build the command */

-    command = (char *) mcalloc(strlen(cmd) + strlen(file) + 10, sizeof(char));

-    sprintf(command, "%s %s", cmd, file);

-

-    if((pd = popen(command, "r")) == NULL) {

-	mprintf("!popen() failed\n");

-	return 3;

-    }

-

-    while(fgets(buffer, LINE, pd)) {

-	if(strstr(buffer, str)) {

-	    free(command);

-            fclose(pd);

-	    return 1; /* found */

-	}

-    }

-

-    free(command);

-    fclose(pd);

-    return 0; /* substring not found */

-}

-

-char *cut(const char *file, long int start, long int end)

-{

-	char *fname = NULL, buffer[FILEBUFF];

-	int bytes, size, sum;

-	FILE *rd, *wd;

-

-

-    if((rd = fopen(file, "rb")) == NULL) {

-	mprintf("!File %s doesn't exist.\n", file);

-	exit(13);

-    }

-

-    if((fname = cli_gentemp(".")) == NULL) {

-	mprintf("!Can't generate temporary file name.\n");

-	exit(1);

-    }

-

-    if((wd = fopen(fname, "wb")) == NULL) {

-	mprintf("!Can't create temporary file %s\n", fname);

-	exit(14);

-    }

-

-    fseek(rd, start, SEEK_SET);

-

-    size = end - start;

-    sum = 0;

-

-    while((bytes = fread(buffer, 1, FILEBUFF, rd)) > 0) {

-	if(sum + bytes >= size) {

-	    fwrite(buffer, 1, size - sum, wd);

-	    break;

-	} else

-	    fwrite(buffer, 1, bytes, wd);

-

-	sum += bytes;

-    }

-

-    fclose(rd);

-    fclose(wd);

-

-    return fname;

-}

-

-char *change(const char *file, long int x)

-{

-	char *fname = NULL, buffer[FILEBUFF];

-	int bytes, ch;

-	FILE *rd, *wd;

-

-

-    if((rd = fopen(file, "rb")) == NULL) {

-	mprintf("!File %s doesn't exist.\n", file);

-	exit(13);

-    }

-

-    if((fname = cli_gentemp(".")) == NULL) {

-	mprintf("!Can't generate temporary file name.\n");

-	exit(1);

-    }

-

-    if((wd = fopen(fname, "wb+")) == NULL) {

-	mprintf("!Can't create temporary file %s\n", fname);

-	exit(14);

-    }

-

-    while((bytes = fread(buffer, 1, FILEBUFF, rd)) > 0)

-	fwrite(buffer, 1, bytes, wd);

-

-    fclose(rd);

-

-    if(x) { /* don't alter first character in the file */

-	fflush(wd);

-	fseek(wd, x, SEEK_SET);

-	ch = fgetc(wd);

-	fseek(wd, -1, SEEK_CUR);

-	fputc(++ch, wd);

-    }

-

-    fclose(wd);

-    return fname;

-}

 void sigtool(struct optstruct *opt)

 {

@@ -211,6 +101,12 @@ void sigtool(struct optstruct *opt)

 	    free(pt);

 	}

+    } else if(optl(opt, "md5")) {

+

+	char *md5 = cli_md5stream(stdin);

+	mprintf("%s\n", md5);

+	free(md5);

+

     } else if(optc(opt, 'b')) {

 	if(!optl(opt, "server")) {

 	    mprintf("!--server is required in this mode\n");

@@ -236,233 +132,11 @@ void sigtool(struct optstruct *opt)

 	listsigs(opt);

     } else {

-	    int jmp, lastjmp = 0, end, found = 0, exec = 0, pos, filesize,

-		maxsize = 0, ret;

-	    char *c, *s, *f, *tmp, *signame, *bsigname, *f2 = NULL;

-	    FILE *fd, *wd;

-

-	if(!optc(opt, 'c')) {

-	    mprintf("!--command, -c is required in this mode\n");

-	    exit(10);

-	} else if(!optc(opt, 's')) {

-	    mprintf("!--string, -s is required in this mode\n");

-	    exit(10);

-	} else if(!optc(opt, 'f')) {

-	    mprintf("!--file, -f is required in this mode\n");

-	    exit(10);

-	}

-

-	/* these are pointers to corresponding strings in option list */

-	c = getargc(opt, 'c');

-	s = getargc(opt, 's');

-	f = getargc(opt, 'f');

-

-	if(scanfile(c, s, f) != 1) {

-	    mprintf("!String %s not found in scanner's output.\n", s);

-	    mprintf("Please check it and try again.\n");

-	    mprintf("Does the scanner write to stdout ? It has to.\n");

-	    exit(11);

-	}

-

-	/* initial values */

-	filesize = end = fileinfo(f, 1);

-	jmp = end / 5 + 1;

-	/* find signature end */

-	while(1) {

-	    tmp = cut(f, 0, end);

-	    exec++;

-	    ret = scanfile(c, s, tmp);

-	    unlink(tmp);

-	    free(tmp);

-

-	    if(ret == 1) {

-

-		if(end >= jmp) {

-		    mprintf("Detected, decreasing end %d -> %d\n", end, end - jmp);

-		    end -= jmp;

-		} else

-		    end = 0;

-

-	    } else {

-		mprintf("Not detected at %d, moving forward.\n", end);

-		if(jmp == 1) {

-

-		    while(end <= filesize) {

-			tmp = cut(f, 0, end);

-			exec++;

-			if(scanfile(c, s, tmp) == 1) {

-			    mprintf(" *** Signature end found at %d\n", end);

-			    found = 1;

-			    f2 = strdup(tmp); /* remember this file */

-			    free(tmp);

-			    break;

-			} else {

-			    unlink(tmp);

-			    free(tmp);

-			    mprintf("Increasing end %d -> %d\n", end, end + 1);

-			}

-			end++;

-		    }

-

-		    if(found) break;

-		}

-

-		if(jmp)

-		    jmp--;

-		jmp = jmp/2 + 1;

-		end += jmp;

-		if(end > filesize)

-		    end = filesize;

-

-	    }

-

-	}

-

-	/* find signature start */

-	found = 0;

-	jmp = 50;

-	pos = end - jmp;

-

-	while(1) {

-

-	    tmp = change(f2, pos);

-	    if(scanfile(c, s, tmp) != 1) {

-		exec++;

-		unlink(tmp);

-		free(tmp);

-

-		if(pos >= jmp) {

-		    mprintf("Not detected, moving backward %d -> %d\n", pos, pos - jmp);

-		    pos -= jmp;

-		    maxsize += jmp;

-		} else {

-		    mprintf("Not detected, using the beginning of the file.\n");

-		    pos = 0;

-		    break;

-		}

-

-		if(maxsize > MAX_LENGTH) {

-		    mprintf("!Generated signature is too big.\n");

-		    unlink(f2);

-		    free(f2);

-		    exit(1);

-		}

-

-	    } else {

-		mprintf("Detected at %d, moving forward.\n", pos);

-		if(jmp == 1 && lastjmp == 1) {

-		    unlink(tmp);

-		    free(tmp);

-		    while(pos < end) {

-			tmp = change(f2, pos);

-			exec++;

-			ret = scanfile(c, s, tmp);

-			unlink(tmp);

-			free(tmp);

-			if(ret == 1) {

-			    mprintf("Moving forward %d -> %d\n", pos, pos + 1);

-			    pos++;

-

-			    if(end - pos < MIN_LENGTH) {

-				mprintf("!Generated signature is too small.\n");

-				unlink(f2);

-				free(f2);

-				exit(1);

-			    }

-

-			} else {

-			    mprintf(" *** Signature start found at %d\n", pos);

-			    found = 1;

-			    break;

-			}

-		    }

-

-		    if(pos >= end) {

-		        mprintf("!Can't generate a proper signature.\n");

-			unlink(f2);

-			free(f2);

-		        exit(1);

-		    }

-

-		    if(found)

-			break;

-		}

-

-		lastjmp = jmp;

-		if(jmp > 0)

-		    jmp--;

-		jmp = jmp/2 + 1;

-		pos += jmp;

-

-		if(pos >= end - 2 * jmp)

-		    pos = end - 2 * jmp;

-

-		unlink(tmp);

-		free(tmp);

-	    }

-

-	}

-

-	unlink(f2);

-	free(f2);

-	tmp = cut(f, pos, end);

-

-	mprintf("\nThe scanner was executed %d times.\n", exec);

-	mprintf("The signature length is %d (%d hex)\n", end - pos, 2 * (end - pos));

-

-	if(end - pos < MIN_LENGTH) {

-	    mprintf("\nWARNING: THE SIGNATURE IS TOO SMALL (PROBABLY ONLY A PART OF A REAL SIGNATURE).\n");

-	    mprintf("         PLEASE DON'T USE IT.\n\n");

-	}

-

-	if((fd = fopen(tmp, "rb")) == NULL) {

-	    mprintf("!Can't believe. Where is my signature, dude ?\n");

-	    exit(99);

-	}

-

-	signame = (char *) mcalloc(strlen(f) + 10, sizeof(char));

-	sprintf(signame, "%s.sig", f);

-	if(fileinfo(signame, 1) != -1) {

-	    mprintf("File %s exists.\n", signame);

-	    free(signame);

-	    signame = cli_gentemp(".");

-	}

-

-	bsigname = (char *) mcalloc(strlen(f) + 10, sizeof(char));

-	sprintf(bsigname, "%s.bsig", f);

-	if(fileinfo(bsigname, 1) != -1) {

-	    mprintf("File %s exists.\n", bsigname);

-	    free(bsigname);

-	    bsigname = cli_gentemp(".");

-	}

-

-	if((wd = fopen(signame, "wb")) == NULL) {

-	    mprintf("Can't write to %s\n", signame);

-	    unlink(tmp);

-	    free(tmp);

-	    exit(15);

-	}

-

-	mprintf("Saving signature in %s file.\n", signame);

-

-	while((bytes = fread(buffer, 1, FILEBUFF, fd)) > 0) {

-	    pt = cli_str2hex(buffer, bytes);

-	    fwrite(pt, 1, 2 * bytes, wd);

-	    free(pt);

-	}

-

-	mprintf("Saving binary signature in %s file.\n", bsigname);

-	rename(tmp, bsigname);

-

-	fclose(fd);

-	fclose(wd);

-	free(tmp);

-	free(signame);

-	free(bsigname);

+	help();

     }

-    /* free_opt(opt); */

+    free_opt(opt);

 }

 int countlines(const char *filename)

@@ -1040,12 +714,9 @@ void help(void)

     mprintf("    --quiet                                be quiet, output only error messages\n");

     mprintf("    --debug                                enable debug messages\n");

     mprintf("    --stdout                               write to stdout instead of stderr\n");

-    mprintf("                                           (this help is always written to stdout)\n");

     mprintf("    --hex-dump                             convert data from stdin to a hex\n");

     mprintf("                                           string and print it on stdout\n");

-    mprintf("    --command              -c              scanner command string, with options\n");

-    mprintf("    --string               -s              'virus found' string in scan. output\n");

-    mprintf("    --file                 -f              infected file\n");

+    mprintf("    --md5                                  generate MD5 checksum from stdin\n");

     mprintf("    --info=FILE            -i FILE         print database information\n");

     mprintf("    --build=NAME           -b NAME         build a CVD file\n");

     mprintf("    --server=ADDR                          ClamAV Signing Service address\n");