Browse code

don't stat

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

aCaB authored on 2009/02/11 21:17:20
Showing 1 changed files
... ...
@@ -370,7 +370,7 @@ int serial_client_scan(const char *file, int scantype, int *infected, int *error
370 370
     cdata.spam = 0;
371 371
     data.data = &cdata;
372 372
 
373
-    ftw = cli_ftw(file, CLI_FTW_STD, maxlevel ? maxlevel : INT_MAX, serial_callback, &data);
373
+    ftw = cli_ftw(file, 0, maxlevel ? maxlevel : INT_MAX, serial_callback, &data);
374 374
     *infected += cdata.infected;
375 375
     *errors += cdata.errors;
376 376
 
... ...
@@ -520,10 +520,12 @@ static int parallel_callback(struct stat *sb, char *filename, const char *path,
520 520
     cid->next = NULL;
521 521
 
522 522
     switch(c->scantype) {
523
+#ifdef HAVE_FD_PASSING
523 524
     case FILDES:
524 525
 	if(send_fdpass(c->sockd, filename))
525 526
 	    return CL_BREAK;
526 527
 	break;
528
+#endif
527 529
     case STREAM:
528 530
 	if(send_stream(c->sockd, filename))
529 531
 	    return CL_BREAK;
... ...
@@ -532,7 +534,7 @@ static int parallel_callback(struct stat *sb, char *filename, const char *path,
532 532
     return CL_SUCCESS;
533 533
 }
534 534
 
535
-/* Non-IDSESSION handler
535
+/* IDSESSION handler
536 536
  * Returns non zero for serious errors, zero otherwise */
537 537
 int parallel_client_scan(const char *file, int scantype, int *infected, int *errors, int maxlevel) {
538 538
     struct cli_ftw_cbdata data;
... ...
@@ -555,7 +557,7 @@ int parallel_client_scan(const char *file, int scantype, int *infected, int *err
555 555
     cdata.ids = NULL;
556 556
     data.data = &cdata;
557 557
 
558
-    ftw = cli_ftw(file, CLI_FTW_STD, maxlevel ? maxlevel : INT_MAX, parallel_callback, &data);
558
+    ftw = cli_ftw(file, 0, maxlevel ? maxlevel : INT_MAX, parallel_callback, &data);
559 559
 
560 560
     if(ftw != CL_SUCCESS && ftw != CL_BREAK) {
561 561
 	*infected += cdata.infected;