X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsrc%2Fmalware.c;h=a4080d0407d06dc14edaa48e41f2620dbef518fb;hb=14e2dbbf0ec482f9fa5dd5a4fb6f2954a27f21eb;hp=481b46acc2ee4d5971b22b175124003b61d97bb2;hpb=f3ebb786e451da973560f1c9d8cdb151d25108b5;p=user%2Fhenk%2Fcode%2Fexim.git

diff --git a/src/src/malware.c b/src/src/malware.c
index 481b46acc..a4080d040 100644
--- a/src/src/malware.c
+++ b/src/src/malware.c
@@ -302,8 +302,7 @@ const uschar * rerror;
 int roffset;
 const pcre * cre;
 
-cre = pcre_compile(CS re, PCRE_COPT, (const char **)&rerror, &roffset, NULL);
-if (!cre)
+if (!(cre = pcre_compile(CS re, PCRE_COPT, CCSS &rerror, &roffset, NULL)))
   *errstr= string_sprintf("regular expression error in '%s': %s at offset %d",
       re, rerror, roffset);
 return cre;
@@ -317,7 +316,7 @@ int i = pcre_exec(cre, NULL, CS text, Ustrlen(text), 0, 0,
 	      ovector, nelem(ovector));
 uschar * substr = NULL;
 if (i >= 2)				/* Got it */
-  pcre_get_substring(CS text, ovector, i, 1, (const char **) &substr);
+  pcre_get_substring(CS text, ovector, i, 1, CCSS &substr);
 return substr;
 }
 
@@ -655,11 +654,11 @@ if (!malware_ok)
     switch(scanent->conn)
     {
     case MC_TCP:
-      malware_daemon_ctx.sock = ip_tcpsocket(scanner_options, &errstr, 5);	break;
+      malware_daemon_ctx.sock = ip_tcpsocket(scanner_options, &errstr, 5, NULL); break;
     case MC_UNIX:
       malware_daemon_ctx.sock = ip_unixsocket(scanner_options, &errstr);	break;
     case MC_STRM:
-      malware_daemon_ctx.sock = ip_streamsocket(scanner_options, &errstr, 5);	break;
+      malware_daemon_ctx.sock = ip_streamsocket(scanner_options, &errstr, 5, NULL); break;
     default:
       /* compiler quietening */ break;
     }
@@ -792,7 +791,7 @@ if (!malware_ok)
       if (*scanner_options != '/')
 	{
 	/* calc file size */
-	if ((drweb_fd = open(CCS eml_filename, O_RDONLY)) == -1)
+	if ((drweb_fd = exim_open2(CCS eml_filename, O_RDONLY)) == -1)
 	  return m_panic_defer_3(scanent, NULL,
 	    string_sprintf("can't open spool file %s: %s",
 	      eml_filename, strerror(errno)),
@@ -1363,13 +1362,10 @@ badseek:  err = errno;
 	malware_name = US"unknown";
 
 	/* re-open the scanner output file, look for name match */
-	scanner_record = fopen(CS file_name, "rb");
-	while (fgets(CS linebuffer, sizeof(linebuffer), scanner_record))
-	  {
-	  /* try match */
-	  if ((s = m_pcre_exec(cmdline_regex_re, linebuffer)))
+	scanner_record = Ufopen(file_name, "rb");
+	while (Ufgets(linebuffer, sizeof(linebuffer), scanner_record))
+	  if ((s = m_pcre_exec(cmdline_regex_re, linebuffer))) /* try match */
 	    malware_name = s;
-	  }
 	(void)fclose(scanner_record);
 	}
       else /* no virus found */
@@ -1639,7 +1635,7 @@ badseek:  err = errno;
 	      malware_daemon_ctx.sock);
 
 	/* calc file size */
-	if ((clam_fd = open(CS eml_filename, O_RDONLY)) < 0)
+	if ((clam_fd = exim_open2(CS eml_filename, O_RDONLY)) < 0)
 	  {
 	  int err = errno;
 	  return m_panic_defer_3(scanent, NULL,