open-dsi
/
clamav
mirror of https://github.com/Cisco-Talos/clamav
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

drop support for Cygwin (due to broken ClamAV builds)

Browse Source 
git-svn: trunk@4143
0.95
Tomasz Kojm 18 years ago
parent 3e9d8b3ec2
commit 6670d61d4b
15 changed files with 24 additions and 69 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 4
      ChangeLog
  2. 2
      clamav-milter/clamav-milter.c
  3. 2
      clamd/scanner.c
  4. 4
      clamdscan/client.c
  5. 2
      clamscan/manager.c
  6. 27
      configure
  7. 15
      configure.in
  8. 6
      freshclam/freshclam.c
  9. 4
      freshclam/manager.c
  10. 2
      libclamav/blob.c
  11. 7
      libclamav/mbox.c
  12. 2
      libclamav/others.c
  13. 6
      libclamav/readdb.c
  14. 4
      libclamav/scanners.c
  15. 6
      shared/misc.c

4
ChangeLog
Unescape View File

@ -1,3 +1,7 @@
Mon Aug 25 23:52:04 CEST 2008 (tk)
----------------------------------
* drop support for Cygwin (due to broken ClamAV builds)
Mon Aug 25 22:17:03 CEST 2008 (tk) Mon Aug 25 22:17:03 CEST 2008 (tk)
---------------------------------- ----------------------------------
* man/freshclam.1.in: fix typo (bb#1147) * man/freshclam.1.in: fix typo (bb#1147)

2
clamav-milter/clamav-milter.c
Unescape View File

@ -5114,7 +5114,7 @@ qfile(struct privdata *privdata, const char *sendmailId, const char *virusname)
#ifdef C_DARWIN #ifdef C_DARWIN
*ptr &= '\177'; *ptr &= '\177';
#endif #endif
#if defined(MSDOS) || defined(C_CYGWIN) || defined(C_WINDOWS) || defined(C_OS2) #if defined(MSDOS) || defined(C_WINDOWS) || defined(C_OS2)
if(strchr("/*?<>|\\\"+=,;:\t ", *ptr)) if(strchr("/*?<>|\\\"+=,;:\t ", *ptr))
#else #else
if(*ptr == '/') if(*ptr == '/')

2
clamd/scanner.c
Unescape View File

@ -157,7 +157,7 @@ static int dirscan(const char *dirname, const char **virname, unsigned long int
return 1; return 1;
} }
#if (!defined(C_INTERIX)) && (!defined(C_WINDOWS)) && (!defined(C_CYGWIN)) #if (!defined(C_INTERIX)) && (!defined(C_WINDOWS))
if(dent->d_ino) if(dent->d_ino)
#endif #endif
{ {

4
clamdscan/client.c
Unescape View File

@ -249,15 +249,11 @@ static char *abpath(const char *filename)
return NULL; return NULL;
} else { } else {
fullpath = malloc(PATH_MAX + strlen(filename) + 10); fullpath = malloc(PATH_MAX + strlen(filename) + 10);
#ifdef C_CYGWIN
sprintf(fullpath, "%s", filename);
#else
if(!getcwd(cwd, PATH_MAX)) { if(!getcwd(cwd, PATH_MAX)) {
logg("^Can't get absolute pathname of current working directory.\n"); logg("^Can't get absolute pathname of current working directory.\n");
return NULL; return NULL;
} }
sprintf(fullpath, "%s/%s", cwd, filename); sprintf(fullpath, "%s/%s", cwd, filename);
#endif
} }
return fullpath; return fullpath;

2
clamscan/manager.c
Unescape View File

@ -235,7 +235,7 @@ static int scandirs(const char *dirname, struct cl_engine *engine, const struct
if((dd = opendir(dirname)) != NULL) { if((dd = opendir(dirname)) != NULL) {
while((dent = readdir(dd))) { while((dent = readdir(dd))) {
#if !defined(C_INTERIX) && !defined(C_WINDOWS) && !defined(C_CYGWIN) #if !defined(C_INTERIX) && !defined(C_WINDOWS)
if(dent->d_ino) if(dent->d_ino)
#endif #endif
{ {

27
configure vendored
Unescape View File

@ -16819,33 +16819,6 @@ _ACEOF
fi fi
fi fi
;; ;;
cygwin*)
cat >>confdefs.h <<\_ACEOF
#define C_CYGWIN 1
_ACEOF
if test "$test_clamav" = "yes"; then
if test ! -r /etc/passwd; then
test_clamav="no"
fi
fi
if test "$have_pthreads" = "yes"; then
THREAD_LIBS="-lpthread"
TH_SAFE="-thread-safe"
cat >>confdefs.h <<\_ACEOF
#define CL_THREAD_SAFE 1
_ACEOF
cat >>confdefs.h <<\_ACEOF
#define _REENTRANT 1
_ACEOF
fi
use_gethostbyname_r="no"
;;
solaris*) solaris*)
FRESHCLAM_LIBS="$FRESHCLAM_LIBS -lresolv" FRESHCLAM_LIBS="$FRESHCLAM_LIBS -lresolv"
if test "$have_pthreads" = "yes"; then if test "$have_pthreads" = "yes"; then

15
configure.in
Unescape View File

@ -756,21 +756,6 @@ kfreebsd*-gnu)
fi fi
fi fi
;; ;;
cygwin*)
AC_DEFINE([C_CYGWIN],1,[os is cygwin])
if test "$test_clamav" = "yes"; then
if test ! -r /etc/passwd; then
test_clamav="no"
fi
fi
if test "$have_pthreads" = "yes"; then
THREAD_LIBS="-lpthread"
TH_SAFE="-thread-safe"
AC_DEFINE([CL_THREAD_SAFE],1,[thread safe])
AC_DEFINE([_REENTRANT],1,[thread safe])
fi
use_gethostbyname_r="no"
;;
solaris*) solaris*)
FRESHCLAM_LIBS="$FRESHCLAM_LIBS -lresolv" FRESHCLAM_LIBS="$FRESHCLAM_LIBS -lresolv"
if test "$have_pthreads" = "yes"; then if test "$have_pthreads" = "yes"; then

6
freshclam/freshclam.c
Unescape View File

@ -200,7 +200,7 @@ int main(int argc, char **argv)
struct sigaction sigact; struct sigaction sigact;
struct sigaction oldact; struct sigaction oldact;
#endif #endif
#if !defined(C_CYGWIN) && !defined(C_OS2) && !defined(C_WINDOWS) #if !defined(C_OS2) && !defined(C_WINDOWS)
char *unpuser; char *unpuser;
struct passwd *user; struct passwd *user;
#endif #endif
@ -296,7 +296,7 @@ int main(int argc, char **argv)
return 56; return 56;
} }
#if !defined(C_CYGWIN) && !defined(C_WINDOWS) #ifndef C_WINDOWS
if(statbuf.st_mode & (S_IRGRP | S_IWGRP | S_IXGRP | S_IROTH | S_IWOTH | S_IXOTH)) { if(statbuf.st_mode & (S_IRGRP | S_IWGRP | S_IXGRP | S_IROTH | S_IWOTH | S_IXOTH)) {
logg("^Insecure permissions (for HTTPProxyPassword): %s must have no more than 0700 permissions.\n", cfgfile); logg("^Insecure permissions (for HTTPProxyPassword): %s must have no more than 0700 permissions.\n", cfgfile);
opt_free(opt); opt_free(opt);
@ -306,7 +306,7 @@ int main(int argc, char **argv)
#endif #endif
} }
#if !defined(C_CYGWIN) && !defined(C_OS2) && !defined(C_WINDOWS) #if !defined(C_OS2) && !defined(C_WINDOWS)
/* freshclam shouldn't work with root privileges */ /* freshclam shouldn't work with root privileges */
if(opt_check(opt, "user")) if(opt_check(opt, "user"))
unpuser = opt_arg(opt, "user"); unpuser = opt_arg(opt, "user");

4
freshclam/manager.c
Unescape View File

@ -212,7 +212,6 @@ static int wwwconnect(const char *server, const char *proxy, int pport, char *ip
hostpt = proxy; hostpt = proxy;
if(!(port = pport)) { if(!(port = pport)) {
#ifndef C_CYGWIN
const struct servent *webcache = getservbyname("webcache", "TCP"); const struct servent *webcache = getservbyname("webcache", "TCP");
if(webcache) if(webcache)
@ -222,9 +221,6 @@ static int wwwconnect(const char *server, const char *proxy, int pport, char *ip
#ifndef C_WINDOWS #ifndef C_WINDOWS
endservent(); endservent();
#endif
#else
port = 8080;
#endif #endif
} }

2
libclamav/blob.c
Unescape View File

@ -699,7 +699,7 @@ sanitiseName(char *name)
* I don't know if spaces are legal in OS/2. * I don't know if spaces are legal in OS/2.
*/ */
if(strchr("%/*?<>|\\\"+=,;:\t ~", *name)) if(strchr("%/*?<>|\\\"+=,;:\t ~", *name))
#elif defined(C_CYGWIN) || defined(C_WINDOWS) #elif defined(C_WINDOWS)
if(strchr("%/*?<>|\\\"+=,;:\t~", *name)) if(strchr("%/*?<>|\\\"+=,;:\t~", *name))
#else #else
if(*name == '/') if(*name == '/')

7
libclamav/mbox.c
Unescape View File

@ -87,7 +87,7 @@ static char const rcsid[] = "$Id: mbox.c,v 1.381 2007/02/15 12:26:44 njh Exp $";
#ifdef CL_DEBUG #ifdef CL_DEBUG
#if defined(C_LINUX) || defined(C_CYGWIN) #if defined(C_LINUX)
#include <features.h> #include <features.h>
#endif #endif
@ -3715,12 +3715,14 @@ rfc1341(message *m, const char *dir)
if(id == NULL) if(id == NULL)
return -1; return -1;
/* do we need this for C_WINDOWS?
#ifdef C_CYGWIN #ifdef C_CYGWIN
if((tmpdir = getenv("TEMP")) == (char *)NULL) if((tmpdir = getenv("TEMP")) == (char *)NULL)
if((tmpdir = getenv("TMP")) == (char *)NULL) if((tmpdir = getenv("TMP")) == (char *)NULL)
if((tmpdir = getenv("TMPDIR")) == (char *)NULL) if((tmpdir = getenv("TMPDIR")) == (char *)NULL)
tmpdir = "C:\\"; tmpdir = "C:\\";
#else #else
*/
if((tmpdir = getenv("TMPDIR")) == (char *)NULL) if((tmpdir = getenv("TMPDIR")) == (char *)NULL)
if((tmpdir = getenv("TMP")) == (char *)NULL) if((tmpdir = getenv("TMP")) == (char *)NULL)
if((tmpdir = getenv("TEMP")) == (char *)NULL) if((tmpdir = getenv("TEMP")) == (char *)NULL)
@ -3728,7 +3730,6 @@ rfc1341(message *m, const char *dir)
tmpdir = P_tmpdir; tmpdir = P_tmpdir;
#else #else
tmpdir = "/tmp"; tmpdir = "/tmp";
#endif
#endif #endif
snprintf(pdir, sizeof(pdir) - 1, "%s/clamav-partial", tmpdir); snprintf(pdir, sizeof(pdir) - 1, "%s/clamav-partial", tmpdir);
@ -3853,7 +3854,7 @@ rfc1341(message *m, const char *dir)
int nblanks; int nblanks;
struct stat statb; struct stat statb;
const char *dentry_idpart; const char *dentry_idpart;
#if !defined (C_CYGWIN) && !defined(C_WINDOWS) #ifndef C_WINDOWS
if(dent->d_ino == 0) if(dent->d_ino == 0)
continue; continue;
#endif #endif

2
libclamav/others.c
Unescape View File

@ -672,7 +672,7 @@ int cli_rmdirs(const char *dirname)
#else #else
while((dent = readdir(dd))) { while((dent = readdir(dd))) {
#endif #endif
#if (!defined(C_CYGWIN)) && (!defined(C_INTERIX)) && (!defined(C_WINDOWS)) #if (!defined(C_INTERIX)) && (!defined(C_WINDOWS))
if(dent->d_ino) if(dent->d_ino)
#endif #endif
{ {

6
libclamav/readdb.c
Unescape View File

@ -1822,7 +1822,7 @@ static int cli_loaddbdir(const char *dirname, struct cl_engine **engine, unsigne
#else #else
while((dent = readdir(dd))) { while((dent = readdir(dd))) {
#endif #endif
#if (!defined(C_INTERIX)) && (!defined(C_WINDOWS)) && (!defined(C_CYGWIN)) #if (!defined(C_INTERIX)) && (!defined(C_WINDOWS))
if(dent->d_ino) if(dent->d_ino)
#endif #endif
{ {
@ -1938,7 +1938,7 @@ int cl_statinidir(const char *dirname, struct cl_stat *dbstat)
#else #else
while((dent = readdir(dd))) { while((dent = readdir(dd))) {
#endif #endif
#if (!defined(C_INTERIX)) && (!defined(C_WINDOWS)) && (!defined(C_CYGWIN)) #if (!defined(C_INTERIX)) && (!defined(C_WINDOWS))
if(dent->d_ino) if(dent->d_ino)
#endif #endif
{ {
@ -2021,7 +2021,7 @@ int cl_statchkdir(const struct cl_stat *dbstat)
#else #else
while((dent = readdir(dd))) { while((dent = readdir(dd))) {
#endif #endif
#if (!defined(C_INTERIX)) && (!defined(C_WINDOWS)) && (!defined(C_CYGWIN)) #if (!defined(C_INTERIX)) && (!defined(C_WINDOWS))
if(dent->d_ino) if(dent->d_ino)
#endif #endif
{ {

4
libclamav/scanners.c
Unescape View File

@ -131,7 +131,7 @@ static int cli_scandir(const char *dirname, cli_ctx *ctx, cli_file_t container)
#else #else
while((dent = readdir(dd))) { while((dent = readdir(dd))) {
#endif #endif
#if (!defined(C_CYGWIN)) && (!defined(C_INTERIX)) && (!defined(C_WINDOWS)) #if (!defined(C_INTERIX)) && (!defined(C_WINDOWS))
if(dent->d_ino) if(dent->d_ino)
#endif #endif
{ {
@ -894,7 +894,7 @@ static int cli_vba_scandir(const char *dirname, cli_ctx *ctx, struct uniq *U)
#else #else
while((dent = readdir(dd))) { while((dent = readdir(dd))) {
#endif #endif
#if (!defined(C_CYGWIN)) && (!defined(C_INTERIX)) && (!defined(C_WINDOWS)) #if (!defined(C_INTERIX)) && (!defined(C_WINDOWS))
if(dent->d_ino) if(dent->d_ino)
#endif #endif
{ {

6
shared/misc.c
Unescape View File

@ -239,7 +239,7 @@ int dircopy(const char *src, const char *dest)
} }
while((dent = readdir(dd))) { while((dent = readdir(dd))) {
#if (!defined(C_CYGWIN)) && (!defined(C_INTERIX)) && (!defined(C_WINDOWS)) #if (!defined(C_INTERIX)) && (!defined(C_WINDOWS))
if(dent->d_ino) if(dent->d_ino)
#endif #endif
{ {
@ -341,7 +341,7 @@ int match_regex(const char *filename, const char *pattern)
regex_t reg; regex_t reg;
int match, flags = REG_EXTENDED | REG_NOSUB; int match, flags = REG_EXTENDED | REG_NOSUB;
char fname[513]; char fname[513];
#if defined(C_CYGWIN) || defined(C_OS2) || defined(C_WINDOWS) #if defined(C_OS2) || defined(C_WINDOWS)
size_t len; size_t len;
flags |= REG_ICASE; /* case insensitive on Windows */ flags |= REG_ICASE; /* case insensitive on Windows */
@ -349,7 +349,7 @@ int match_regex(const char *filename, const char *pattern)
if(cli_regcomp(&reg, pattern, flags) != 0) if(cli_regcomp(&reg, pattern, flags) != 0)
return 2; return 2;
#if !defined(C_CYGWIN) && !defined(C_OS2) && !defined(C_WINDOWS) #if !defined(C_OS2) && !defined(C_WINDOWS)
if(pattern[strlen(pattern) - 1] == '/') { if(pattern[strlen(pattern) - 1] == '/') {
snprintf(fname, 511, "%s/", filename); snprintf(fname, 511, "%s/", filename);
fname[512] = 0; fname[512] = 0;

Write Preview
Loading…
Cancel
Save