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

 #ifdef C_LINUX

     procdev = 0;

-    if(STAT("/proc", &sb) != -1 && !sb.st_size)

+    if(CLAMSTAT("/proc", &sb) != -1 && !sb.st_size)

 	procdev = sb.st_dev;

 #endif

@@ -92,7 +92,7 @@ int localserver(const struct optstruct *opts)

 		    close(sockfd);

 		    return -1;

 		}

-	    } else if(STAT(server.sun_path, &foo) != -1) {

+	    } else if(CLAMSTAT(server.sun_path, &foo) != -1) {

 		logg("!LOCAL: Socket file %s exists. Either remove it, or configure a different one.\n", server.sun_path);

 		close(sockfd);

 		return -1;

@@ -876,7 +876,7 @@ fan_checkowner (int pid, const struct optstruct *opts)

         return 0;

     snprintf (path, sizeof (path), "/proc/%u", pid);

-    if (STAT (path, &sb) == 0)

+    if (CLAMSTAT (path, &sb) == 0)

     {

         while (opt)

         {

@@ -325,7 +325,7 @@ int scan_pathchk(const char *path, struct cli_ftw_cbdata *data)

     }

     if(!optget(scandata->opts, "CrossFilesystems")->enabled) {

-	if(STAT(path, &statbuf) == 0) {

+	if(CLAMSTAT(path, &statbuf) == 0) {

 	    if(statbuf.st_dev != scandata->dev) {

 		if(scandata->type != TYPE_MULTISCAN)

 		    conn_reply_single(scandata->conn, path, "Excluded (another filesystem)");

@@ -236,7 +236,7 @@ int command(client_conn_t *conn, int *virus)

 	    int multiscan, max, alive;

 	    /* use MULTISCAN only for directories (bb #1869) */

-	    if (STAT(conn->filename, &sb) == 0 &&

+	    if (CLAMSTAT(conn->filename, &sb) == 0 &&

 		!S_ISDIR(sb.st_mode)) {

 		thrmgr_setactivetask(NULL, "CONTSCAN");

 		type = TYPE_CONTSCAN;

@@ -384,7 +384,7 @@ int command(client_conn_t *conn, int *virus)

 	 flags |= CLI_FTW_FOLLOW_FILE_SYMLINK;

      if(!optget(opts, "CrossFilesystems")->enabled)

-	 if(STAT(conn->filename, &sb) == 0)

+	 if(CLAMSTAT(conn->filename, &sb) == 0)

 	     scandata.dev = sb.st_dev;

      ret = cli_ftw(conn->filename, flags,  maxdirrec ? maxdirrec : INT_MAX, scan_callback, &data, scan_pathchk);

@@ -296,7 +296,7 @@ int dsresult(int sockd, int scantype, const char *filename, int *printok, int *e

 	    logg("STDIN: noreply from clamd\n.");

 	    return -1;

 	}

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

+        if(CLAMSTAT(filename, &sb) == -1) {

 	    logg("~%s: stat() failed with %s, clamd may not be responding\n",

 		 filename, strerror(errno));

 	    return -1;

@@ -249,7 +249,7 @@ static void scanfile(const char *filename, struct cl_engine *engine, const struc

     }

     /* argh, don't scan /proc files */

-    if(STAT(filename, &sb) != -1) {

+    if(CLAMSTAT(filename, &sb) != -1) {

 #ifdef C_LINUX

 	if(procdev && sb.st_dev == procdev) {

 	    if(!printinfected)

@@ -412,7 +412,7 @@ static void scandirs(const char *dirname, struct cl_engine *engine, const struct

 			    if(dirlnk != 2 && filelnk != 2) {

 				if(!printinfected)

 				    logg("%s: Symbolic link\n", fname);

-			    } else if(STAT(fname, &sb) != -1) {

+			    } else if(CLAMSTAT(fname, &sb) != -1) {

 				if(S_ISREG(sb.st_mode) && filelnk == 2) {

 				    scanfile(fname, engine, opts, options);

 				} else if(S_ISDIR(sb.st_mode) && dirlnk == 2) {

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

 #ifdef C_LINUX

     procdev = (dev_t) 0;

-    if(STAT("/proc", &sb) != -1 && !sb.st_size)

+    if(CLAMSTAT("/proc", &sb) != -1 && !sb.st_size)

 	procdev = sb.st_dev;

 #endif

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

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

 	    ret = 2;

 	} else {

-	    STAT(cwd, &sb);

+	    CLAMSTAT(cwd, &sb);

 	    scandirs(cwd, engine, opts, options, 1, sb.st_dev);

 	}

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

 		    if(dirlnk == 0 && filelnk == 0) {

 			if(!printinfected)

 			    logg("%s: Symbolic link\n", file);

-		    } else if(STAT(file, &sb) != -1) {

+		    } else if(CLAMSTAT(file, &sb) != -1) {

 			if(S_ISREG(sb.st_mode) && filelnk) {

 			    scanfile(file, engine, opts, options);

 			} else if(S_ISDIR(sb.st_mode) && dirlnk) {

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

     if (optget (opts, "HTTPProxyPassword")->enabled)

     {

-        if (STAT (cfgfile, &statbuf) == -1)

+        if (CLAMSTAT (cfgfile, &statbuf) == -1)

         {

             logg ("^Can't stat %s (critical error)\n", cfgfile);

             optfree (opts);

@@ -2621,7 +2621,7 @@ updatecustomdb (const char *url, int *signo, const struct optstruct *opts,

         rtimeout = optget (opts, "ReceiveTimeout")->numarg;

         *mtime = 0;

-        if (STAT (dbname, &sb) != -1)

+        if (CLAMSTAT (dbname, &sb) != -1)

             Rfc2822DateTime (mtime, sb.st_mtime);

         newfile = cli_gentemp (updtmpdir);

@@ -29,14 +29,14 @@

 #include <unistd.h>

 #define STATBUF struct stat64

-#define STAT stat64

+#define CLAMSTAT stat64

 #define LSTAT lstat64

 #define FSTAT fstat64

 #define safe_open(a, b) open(a, b|O_LARGEFILE)

 #else

 #define STATBUF struct stat

-#define STAT stat

+#define CLAMSTAT stat

 #define LSTAT lstat

 #define FSTAT fstat

 /* Nothing is safe in windows, not even open, safe_open defined under /win32 */

@@ -2813,7 +2813,7 @@ rfc1341(message *m, const char *dir)

 	} else if(errno == EEXIST) {

 		STATBUF statb;

-		if(STAT(pdir, &statb) < 0) {

+		if(CLAMSTAT(pdir, &statb) < 0) {

 			char err[128];

 			cli_errmsg("Partial directory %s: %s\n", pdir,

 				cli_strerror(errno, err, sizeof(err)));

@@ -903,7 +903,7 @@ cli_rmdirs(const char *name)

 	char err[128];

-    if(STAT(name, &statb) < 0) {

+    if(CLAMSTAT(name, &statb) < 0) {

 	cli_warnmsg("cli_rmdirs: Can't locate %s: %s\n", name, cli_strerror(errno, err, sizeof(err)));

 	return -1;

     }

@@ -974,7 +974,7 @@ int cli_rmdirs(const char *dirname)

     chmod(dirname, 0700);

     if((dd = opendir(dirname)) != NULL) {

-	while(STAT(dirname, &maind) != -1) {

+	while(CLAMSTAT(dirname, &maind) != -1) {

 	    if(!rmdir(dirname)) break;

 	    if(errno != ENOTEMPTY && errno != EEXIST && errno != EBADF) {

 		cli_errmsg("cli_rmdirs: Can't remove temporary directory %s: %s\n", dirname, cli_strerror(errno, err, sizeof(err)));

@@ -520,7 +520,7 @@ static int get_filetype(const char *fname, int flags, int need_stat,

     }

     if (need_stat) {

-	if (STAT(fname, statbuf) == -1)

+	if (CLAMSTAT(fname, statbuf) == -1)

 	    return -1;

 	stated = 1;

     }

@@ -2908,7 +2908,7 @@ int cl_load(const char *path, struct cl_engine *engine, unsigned int *signo, uns

 	return CL_EARG;

     }

-    if(STAT(path, &sb) == -1) {

+    if(CLAMSTAT(path, &sb) == -1) {

         cli_errmsg("cl_load(): Can't get status of %s\n", path);

         return CL_ESTAT;

     }

@@ -3028,7 +3028,7 @@ int cl_statinidir(const char *dirname, struct cl_stat *dbstat)

 		strcpy(dbstat->statdname[dbstat->entries - 1], dent->d_name);

 #endif

-		STAT(fname, &dbstat->stattab[dbstat->entries - 1]);

+		CLAMSTAT(fname, &dbstat->stattab[dbstat->entries - 1]);

 		free(fname);

 	    }

 	}

@@ -3083,7 +3083,7 @@ int cl_statchkdir(const struct cl_stat *dbstat)

 		}

 		sprintf(fname, "%s"PATHSEP"%s", dbstat->dir, dent->d_name);

-		STAT(fname, &sb);

+		CLAMSTAT(fname, &sb);

 		free(fname);

 		found = 0;

@@ -3433,7 +3433,7 @@ int cl_countsigs(const char *path, unsigned int countoptions, unsigned int *sigs

     if(!sigs)

 	return CL_ENULLARG;

-    if(STAT(path, &sb) == -1) {

+    if(CLAMSTAT(path, &sb) == -1) {

 	cli_errmsg("cl_countsigs: Can't stat %s\n", path);

 	return CL_ESTAT;

     }

@@ -123,7 +123,7 @@ static void action_remove(const char *filename) {

 static int isdir(void) {

     STATBUF sb;

-    if(STAT(actarget, &sb) || !S_ISDIR(sb.st_mode)) {

+    if(CLAMSTAT(actarget, &sb) || !S_ISDIR(sb.st_mode)) {

 	logg("!'%s' doesn't exist or is not a directory\n", actarget);

 	return 0;

     }

@@ -261,7 +261,7 @@ static int logg_open(void)

     if(logg_file)

         if(logg_size > 0)

-            if(STAT(logg_file, &sb) != -1)

+            if(CLAMSTAT(logg_file, &sb) != -1)

                 if(sb.st_size > logg_size)

 	                if (rename_logg(&sb))

                         return -1;

@@ -172,7 +172,7 @@ static int hashsig(const struct optstruct *opts, unsigned int mdb, int type)

     if(opts->filename) {

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

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

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

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

 		perror("hashsig");

 		return -1;

@@ -523,7 +523,7 @@ static int script2cdiff(const char *script, const char *builder, const struct op

 	int bytes;

-    if(STAT(script, &sb) == -1) {

+    if(CLAMSTAT(script, &sb) == -1) {

 	mprintf("!script2diff: Can't stat file %s\n", script);

 	return -1;

     }

@@ -669,7 +669,7 @@ static int build(const struct optstruct *opts)

     if(optget(opts, "datadir")->active)

 	localdbdir = optget(opts, "datadir")->strarg;

-    if(STAT("COPYING", &foo) == -1) {

+    if(CLAMSTAT("COPYING", &foo) == -1) {

 	mprintf("!build: COPYING file not found in current working directory.\n");

 	return -1;

     }

@@ -1439,7 +1439,7 @@ static int listsigs(const struct optstruct *opts, int mode)

 	name = optget(opts, "list-sigs")->strarg;

 	if(access(name, R_OK) && localdbdir)

 	    name = localdbdir;

-	if(STAT(name, &sb) == -1) {

+	if(CLAMSTAT(name, &sb) == -1) {

 	    mprintf("--list-sigs: Can't get status of %s\n", name);

 	    return -1;

 	}

@@ -1832,7 +1832,7 @@ static int dircopy(const char *src, const char *dest)

 	char spath[512], dpath[512];

-    if(STAT(dest, &sb) == -1) {

+    if(CLAMSTAT(dest, &sb) == -1) {

 	if(mkdir(dest, 0755)) {

 	    /* mprintf("!dircopy: Can't create temporary directory %s\n", dest); */

 	    return -1;

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

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

 	    ret = -1;

 	} else {

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

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

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

 		ret = -1;

 	    } else {

@@ -350,7 +350,7 @@ static size_t prepare_instream(char *buf, size_t off, size_t buflen)

     STATBUF stbuf;

     int fd, nread;

     uint32_t chunk;

-    fail_unless_fmt(STAT(SCANFILE, &stbuf) != -1, "stat failed for %s: %s", SCANFILE, strerror(errno));

+    fail_unless_fmt(CLAMSTAT(SCANFILE, &stbuf) != -1, "stat failed for %s: %s", SCANFILE, strerror(errno));

     fd = open(SCANFILE, O_RDONLY);

     fail_unless_fmt(fd != -1, "open failed: %s\n", strerror(errno));