Browse code

clamonacc - fix exclude-list command line option; fix typo in help output

Mickey Sola authored on 2019/07/09 04:44:36
Showing 2 changed files
... ...
@@ -287,7 +287,7 @@ void help(void)
287 287
     mprintf("    --log=FILE             -l FILE     Save scanning output to FILE\n");
288 288
     mprintf("    --foreground           -F          Output to foreground and do not daemonize\n");
289 289
     mprintf("    --watch-list=FILE      -w FILE     Watch directories from FILE\n");
290
-    mprintf("    --exclude-list=FILES   -e FILE     Exclude directories from FILE\n");
290
+    mprintf("    --exclude-list=FILE   -e FILE     Exclude directories from FILE\n");
291 291
     mprintf("    --remove                           Remove infected files. Be careful!\n");
292 292
     mprintf("    --move=DIRECTORY                   Move infected files into DIRECTORY\n");
293 293
     mprintf("    --copy=DIRECTORY                   Copy infected files into DIRECTORY\n");
... ...
@@ -407,6 +407,7 @@ void *onas_ddd_th(void *arg) {
407 407
 
408 408
 		include_list = onas_get_opt_list(pt->strarg, &num_indirs, &err);
409 409
 		if (NULL == include_list) {
410
+			logg("!ClamInotif: could not parse include list (%d)\n", err);
410 411
 			return NULL;
411 412
 		}
412 413
 
... ...
@@ -449,12 +450,13 @@ void *onas_ddd_th(void *arg) {
449 449
 
450 450
 		exclude_list = onas_get_opt_list(pt->strarg, &num_exdirs, &err);
451 451
 		if (NULL == exclude_list) {
452
+			logg("!ClamInotif: could not parse exclude list (%d)\n", err);
452 453
 			return NULL;
453 454
 		}
454 455
 
455 456
 		idx = 0;
456 457
 		while (exclude_list[idx] != NULL) {
457
-			if(onas_ht_get(ddd_ht, exclude_list[idx], strlen(exclude_list[idx]), NULL) != CL_SUCCESS) {
458
+			if(onas_ht_get(ddd_ht, exclude_list[idx], strlen(exclude_list[idx]), NULL) == CL_SUCCESS) {
458 459
 				if(onas_ht_rm_hierarchy(ddd_ht, exclude_list[idx], strlen(exclude_list[idx]), 0)){
459 460
 					logg("!ClamInotif: can't exclude '%s'\n", exclude_list[idx]);
460 461
 					return NULL;