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

+Mon Jan 19 21:01:33 CET 2009 (tk)

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

+ * shared/optparser.c: improve cmdline args handling

+

 Mon Jan 19 15:38:39 CET 2009 (tk)

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

  * libclamav/dlp.c: fix CC detection and chksumming (bb#1264)

@@ -82,9 +82,12 @@ int main(int argc, char **argv) {

 	optfree(opts);

 	return 0;

     }

-	

-    if(opts->filename)

-	mprintf("^Ignoring option %s\n", opts->filename);

+

+    if(opts->filename) {

+	int x;

+	for(x = 0; opts->filename[x]; x++)

+	    mprintf("^Ignoring option %s\n", opts->filename[x]);

+    }

     if(optget(opts, "version")->enabled) {

 	printf("clamav-milter %s\n", get_version());

@@ -406,7 +406,7 @@ int client(const struct optstruct *opts, int *infected)

 	scantype = "MULTISCAN";

     /* parse argument list */

-    if(opts->filename == NULL || strlen(opts->filename) == 0) {

+    if(opts->filename == NULL) {

 	/* scan current directory */

 	if(!getcwd(cwd, PATH_MAX)) {

 	    logg("^Can't get absolute pathname of current working directory.\n");

@@ -423,7 +423,7 @@ int client(const struct optstruct *opts, int *infected)

 	close(sockd);

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

+    } else if(!strcmp(opts->filename[0], "-")) { /* scan data from stdin */

         int is_unix;

 	if((sockd = dconnect(opts, &is_unix)) < 0)

 	    return 2;

@@ -458,19 +458,16 @@ int client(const struct optstruct *opts, int *infected)

     } else {

 	int x;

-	char *thefilename;

-	for (x = 0; (thefilename = cli_strtok(opts->filename, x, "\t")) != NULL; x++) {

-	    fullpath = thefilename;

-

+	for (x = 0; opts->filename[x] && (fullpath = strdup(opts->filename[x])); x++) {

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

 		logg("^Can't access file %s\n", fullpath);

 		perror(fullpath);

 		errors++;

 	    } else {

 		if(strcmp(fullpath, "/") && (strlen(fullpath) < 2 || (fullpath[0] != '/' && fullpath[0] != '\\' && fullpath[1] != ':'))) {

-		    fullpath = abpath(thefilename);

-		    free(thefilename);

-

+		    char *pt = abpath(fullpath);

+		    free(fullpath);

+		    fullpath = pt;

 		    if(!fullpath) {

 			logg("^Can't determine absolute path.\n");

 			return 2;

@@ -496,7 +493,6 @@ int client(const struct optstruct *opts, int *infected)

 			errors++;

 		}

 	    }

-

 	    free(fullpath);

 	}

     }

@@ -608,8 +608,7 @@ int scanmanager(const struct optstruct *opts)

 #endif

     /* check filetype */

-    if(opts->filename == NULL || strlen(opts->filename) == 0) {

-

+    if(opts->filename == NULL) {

 	/* we need full path for some reasons (eg. archive handling) */

 	if(!getcwd(cwd, sizeof(cwd))) {

 	    logg("!Can't get absolute pathname of current working directory\n");

@@ -617,11 +616,11 @@ int scanmanager(const struct optstruct *opts)

 	} else

 	    ret = scandirs(cwd, engine, opts, options, 1);

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

+    } else if(!strcmp(opts->filename[0], "-")) { /* read data from stdin */

 	ret = scanstdin(engine, opts, options);

     } else {

-	for (x = 0; (file = cli_strtok(opts->filename, x, "\t")) != NULL; x++) {

+	for (x = 0; opts->filename[x] && (file = strdup(opts->filename[x])); x++) {

 	    if((fmodeint = fileinfo(file, 2)) == -1) {

 		logg("^Can't access file %s\n", file);

 		perror(file);

@@ -578,9 +578,13 @@ static int optaddarg(struct optstruct *opts, const char *name, const char *strar

 void optfree(struct optstruct *opts)

 {

     	struct optstruct *h, *a;

+	int i;

-    if(opts && opts->filename)

+    if(opts && opts->filename) {

+	for(i = 0; opts->filename[i]; i++)

+	    free(opts->filename[i]);

 	free(opts->filename);

+    }

     while(opts) {

 	a = opts->nextarg;

@@ -924,24 +928,19 @@ struct optstruct *optparse(const char *cfgfile, int argc, char **argv, int verbo

     }

     if(!cfgfile && (optind < argc)) {

-        lc = 0;

-

-	/* count length of non-option arguments */

-	for(i = optind; i < argc; i++)

-	    lc += strlen(argv[i]);

-

-	lc += argc - optind + 1;

-	opts->filename = (char *) calloc(lc, sizeof(char));

+	opts->filename = (char **) calloc(argc - optind + 1, sizeof(char *));

 	if(!opts->filename) {

 	    fprintf(stderr, "ERROR: optparse: calloc failed\n");

 	    optfree(opts);

 	    return NULL;

 	}

-

         for(i = optind; i < argc; i++) {

-	    strncat(opts->filename, argv[i], strlen(argv[i]));

-	    if(i != argc - 1)

-		strncat(opts->filename, "\t", 1);

+	    opts->filename[i - optind] = strdup(argv[i]);

+	    if(!opts->filename[i - optind]) {

+		fprintf(stderr, "ERROR: optparse: strdup failed\n");

+		optfree(opts);

+		return NULL;

+	    }

 	}

     }

@@ -42,7 +42,7 @@ struct optstruct {

     struct optstruct *nextarg;

     struct optstruct *next;

-    char *filename; /* cmdline */

+    char **filename; /* cmdline */

 };

 const struct optstruct *optget(const struct optstruct *opts, const char *name);

@@ -119,34 +119,31 @@ static int hexdump(void)

 static int md5sig(const struct optstruct *opts, unsigned int mdb)

 {

-	char *md5, *filename;

+	char *md5;

 	unsigned int i;

 	struct stat sb;

     if(opts->filename) {

-	for(i = 0; (filename = cli_strtok(opts->filename, i, "\t")); i++) {

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

-		mprintf("!md5sig: Can't access file %s\n", filename);

+	for(i = 0; opts->filename[i]; i++) {

+	    if(stat(opts->filename[i], &sb) == -1) {

+		mprintf("!md5sig: Can't access file %s\n", opts->filename[i]);

 		perror("md5sig");

-		free(filename);

 		return -1;

 	    } else {

 		if((sb.st_mode & S_IFMT) == S_IFREG) {

-		    if((md5 = cli_md5file(filename))) {

+		    if((md5 = cli_md5file(opts->filename[i]))) {

 			if(mdb)

-			    mprintf("%u:%s:%s\n", (unsigned int) sb.st_size, md5, filename);

+			    mprintf("%u:%s:%s\n", (unsigned int) sb.st_size, md5, opts->filename[i]);

 			else

-			    mprintf("%s:%u:%s\n", md5, (unsigned int) sb.st_size, filename);

+			    mprintf("%s:%u:%s\n", md5, (unsigned int) sb.st_size, opts->filename[i]);

 			free(md5);

 		    } else {

-			mprintf("!md5sig: Can't generate MD5 checksum for %s\n", filename);

-			free(filename);

+			mprintf("!md5sig: Can't generate MD5 checksum for %s\n", opts->filename[i]);

 			return -1;

 		    }

 		}

 	    }

-	    free(filename);

 	}

     } else { /* stream */

@@ -589,8 +586,8 @@ static int build(const struct optstruct *opts)

     /* try to read cvd header of current database */

     if(opts->filename) {

-	if(cli_strbcasestr(opts->filename, ".cvd") || cli_strbcasestr(opts->filename, ".cld")) {

-	    strncpy(olddb, opts->filename, sizeof(olddb));

+	if(cli_strbcasestr(opts->filename[0], ".cvd") || cli_strbcasestr(opts->filename[0], ".cld")) {

+	    strncpy(olddb, opts->filename[0], sizeof(olddb));

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

 	} else {

 	    mprintf("!build: Not a CVD/CLD file\n");

@@ -1611,8 +1608,8 @@ static int makediff(const struct optstruct *opts)

 	return -1;

     }

-    if(!(cvd = cl_cvdhead(opts->filename))) {

-	mprintf("!makediff: Can't read CVD header from %s\n", opts->filename);

+    if(!(cvd = cl_cvdhead(opts->filename[0]))) {

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

 	return -1;

     }

     newver = cvd->version;

@@ -1665,8 +1662,8 @@ static int makediff(const struct optstruct *opts)

 	return -1;

     }

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

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

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

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

 	cli_rmdirs(odir);

 	cli_rmdirs(ndir);

 	free(odir);

@@ -1674,7 +1671,7 @@ static int makediff(const struct optstruct *opts)

 	return -1;

     }

-    if(strstr(opts->filename, "main"))

+    if(strstr(opts->filename[0], "main"))

 	snprintf(name, sizeof(name), "main-%u.script", newver);

     else

 	snprintf(name, sizeof(name), "daily-%u.script", newver);

@@ -1801,14 +1798,14 @@ int main(int argc, char **argv)

 	    mprintf("!--verify-cdiff requires two arguments\n");

 	    ret = -1;

 	} else {

-	    if(stat(opts->filename, &sb) == -1) {

-		mprintf("--verify-cdiff: Can't get status of %s\n", opts->filename);

+	    if(stat(opts->filename[0], &sb) == -1) {

+		mprintf("--verify-cdiff: Can't get status of %s\n", opts->filename[0]);

 		ret = -1;

 	    } else {

 		if(S_ISDIR(sb.st_mode))

-		    ret = verifydiff(optget(opts, "verify-cdiff")->strarg, NULL, opts->filename);

+		    ret = verifydiff(optget(opts, "verify-cdiff")->strarg, NULL, opts->filename[0]);

 		else

-		    ret = verifydiff(optget(opts, "verify-cdiff")->strarg, opts->filename, NULL);

+		    ret = verifydiff(optget(opts, "verify-cdiff")->strarg, opts->filename[0], NULL);

 	    }

 	}

     } else