Changeset 191

Timestamp:

Oct 30, 2010, 5:23:18 PM (14 years ago)

Author:

Yuri Dario

Message:

clamav: applied os2 patches.

Location:

clamav/trunk

Files:

• clamd/clamd.c (modified) (3 diffs)
• clamd/scanner.c (modified) (3 diffs)
• clamd/server-th.c (modified) (2 diffs)
• clamd/thrmgr.c (modified) (1 diff)
• clamdscan/client.c (modified) (1 diff)
• clamdtop/Makefile.in (modified) (1 diff)
• clamdtop/clamdtop.c (modified) (1 diff)
• clamscan/manager.c (modified) (2 diffs)
• clamscan/others.c (modified) (2 diffs)
• configure (modified) (1 diff)
• freshclam/dns.c (modified) (1 diff)
• freshclam/execute.c (modified) (2 diffs)
• freshclam/freshclam.c (modified) (3 diffs)
• freshclam/manager.c (modified) (1 diff)
• libclamav/Makefile.in (modified) (3 diffs)
• libclamav/c++/configure (modified) (1 diff)
• libclamav/c++/llvm/configure (modified) (2 diffs)
• libclamav/c++/llvm/lib/System/Mutex.cpp (modified) (1 diff)
• libclamav/c++/llvm/lib/System/Unix/Path.inc (modified) (2 diffs)
• libclamav/c++/llvm/lib/System/Unix/Process.inc (modified) (2 diffs)
• libclamav/chmunpack.c (modified) (2 diffs)
• libclamav/fmap.c (modified) (5 diffs)
• libclamav/fmap.h (modified) (1 diff)
• libclamav/mpool.c (modified) (7 diffs)
• libclamav/others.c (modified) (4 diffs)
• libclamav/others.h (modified) (2 diffs)
• libclamav/others_common.c (modified) (4 diffs)
• libclamav/readdb.c (modified) (1 diff)
• libclamunrar_iface/unrar_iface.h (modified) (1 diff)
• libltdl/loaders/loadlibrary.c (modified) (2 diffs)
• libltdl/ltdl.c (modified) (2 diffs)
• shared/misc.c (modified) (3 diffs)
• shared/optparser.c (modified) (1 diff)
• unit_tests/check_clamd.c (modified) (3 diffs)

clamav/trunk/clamd/clamd.c ¶

@@ -544 +544 @@
             sock_mode = 0777 /* & ~umsk*/; /* conservative default: umask was 0 in clamd < 0.96 */
 
+#ifndef C_OS2
         if(chmod(optget(opts, "LocalSocket")->strarg, sock_mode & 0666)) {
             logg("!Cannot set socket permission to %s\n", optget(opts, "LocalSocketMode")->strarg);
@@ -549 +550 @@
             break;
         }
+#endif
 
         nlsockets++;
@@ -592 +594 @@
     }
 
-#ifndef _WIN32
+#if !defined(_WIN32) && !defined(C_OS2)
     if(nlsockets && localsock) {
         opt = optget(opts, "LocalSocket");

clamav/trunk/clamd/scanner.c ¶

@@ -84 +84 @@
     /* detect disconnected socket, 
      * this should NOT detect half-shutdown sockets (SHUT_WR) */
-    if (send(scandata->conn->sd, &ret, 0, 0) == -1 && errno != EINTR) {
+    if (send(scandata->conn->sd, &ret, 0, 0) == -1 && errno != EINTR
+#ifdef C_OS2
+         && errno != EFAULT // YD length==0 may fail on os2 sockets
+#endif
+                ) {
         logg("$Client disconnected while command was active!\n");
         thrmgr_group_terminate(scandata->conn->group);
@@ -121 +125 @@
             return CL_SUCCESS;
         case warning_skipped_special:
-            if (msg == scandata->toplevel_path)
+            if (!strcmp(msg, scandata->toplevel_path))
                 conn_reply(scandata->conn, msg, "Not supported file type", "ERROR");
             logg("*Not supported file type: %s\n", msg);
@@ -140 +144 @@
 
     if(sb && sb->st_size == 0) { /* empty file */
-        if (msg == scandata->toplevel_path)
+        if (!strcmp(msg, scandata->toplevel_path))
             conn_reply_single(scandata->conn, filename, "Empty file");
         free(filename);

clamav/trunk/clamd/server-th.c ¶

@@ -1069 +1069 @@
         event_wake_recv = CreateEvent(NULL, TRUE, FALSE, NULL);
 #else
+
+#ifdef __KLIBC__
+    // YD libc select() does not work with pipes
+    if (socketpair(AF_UNIX, SOCK_STREAM,0, acceptdata.syncpipe_wake_recv) == -1 ||
+        (socketpair(AF_UNIX, SOCK_STREAM,0, acceptdata.syncpipe_wake_accept) == -1)) {
+
+        logg("!pipe failed\n");
+        exit(-1);
+    }
+#else
     if (pipe(acceptdata.syncpipe_wake_recv) == -1 ||
         (pipe(acceptdata.syncpipe_wake_accept) == -1)) {
@@ -1075 +1085 @@
         exit(-1);
     }
+#endif
+
     syncpipe_wake_recv_w = acceptdata.syncpipe_wake_recv[1];
 

clamav/trunk/clamd/thrmgr.c ¶

@@ -42 +42 @@
 
 /* BSD and HP-UX need a bigger stacksize than the system default */
-#if defined (C_BSD) || defined (C_HPUX) || defined(C_AIX)
+#if defined (C_BSD) || defined (C_HPUX) || defined(C_AIX) || defined(C_OS2)
 #define C_BIGSTACK 1
 #endif

clamav/trunk/clamdscan/client.c ¶

@@ -132 +132 @@
             return NULL;
         }
-#ifdef _WIN32
+#if defined(_WIN32) || defined(C_OS2)
         if(*basepath == '\\') {
             namelen = 2;

clamav/trunk/clamdtop/Makefile.in ¶

@@ -297 +297 @@
 
 @HAVE_CURSES_TRUE@AM_CPPFLAGS = -I$(top_srcdir) @CURSES_CPPFLAGS@
-@HAVE_CURSES_TRUE@clamdtop_LDADD = @CURSES_LIBS@ $(top_builddir)/libclamav/libclamav_internal_utils_nothreads.la
+@HAVE_CURSES_TRUE@clamdtop_LDADD = @CURSES_LIBS@ -ltinfo $(top_builddir)/libclamav/libclamav_internal_utils_nothreads.la
 EXTRA_DIST = clamdtop.c
 all: all-am

clamav/trunk/clamdtop/clamdtop.c ¶

@@ -511 +511 @@
     {
 #else
+
+#ifdef C_OS2
+        if(cli_is_abspath(soname)) {
+#else
         if(cli_is_abspath(soname) || (access(soname, F_OK) == 0)) {
+#endif
                 struct sockaddr_un addr;
                 s = socket(AF_UNIX, SOCK_STREAM, 0);

clamav/trunk/clamscan/manager.c ¶

@@ -118 +118 @@
     }
     info.rblocks += fsize / CL_COUNT_PRECISION;
-#ifndef _WIN32
+#if !defined(_WIN32) && !defined(C_OS2)
     if(geteuid())
         if(checkaccess(filename, NULL, R_OK) != 1) {
@@ -617 +617 @@
                 ret = 2;
             } else {
+#if defined(C_OS2) || defined(_WIN32)
+                // YD skip if 'x:\' pattern is found
+                if (!(strlen(file)==3 && file[1]==':' && file[2]==*PATHSEP))
+#endif
                 for(i = strlen(file) - 1; i > 0; i--) {
                     if(file[i] == *PATHSEP)

clamav/trunk/clamscan/others.c ¶

@@ -86 +86 @@
         int ret = 0, status;
 
+#if !defined(C_CYGWIN) && !defined(C_OS2) && !defined(C_BEOS)
     if(!geteuid()) {
 
@@ -118 +119 @@
         }
 
-    } else {
+    } else 
+#endif
+    {
         if(!access(path, mode))
             ret = 1;

clamav/trunk/configure ¶

@@ -13875 +13875 @@
         if(!data3)
                 return 1;
+#ifdef __KLIBC__
+        lseek(fd,0,SEEK_SET);
+#endif
         if(read (fd, data3, datasize) != datasize)
                 return 1;

clamav/trunk/freshclam/dns.c ¶

@@ -49 +49 @@
         unsigned int cttl, size, txtlen = 0;
 
+#ifdef __KLIBC__
+        static int res_init_done = 0;
+#endif
+
 
     if(ttl)
         *ttl = 0;
+#ifdef __KLIBC__
+    if (res_init_done == 0)
+#endif
     if(res_init() < 0) {
         logg("^res_init failed\n");
         return NULL;
     }
+#ifdef __KLIBC__
+    res_init_done = 1; // call only once per session
+#endif
 
     logg("*Querying %s\n", domain);

clamav/trunk/freshclam/execute.c ¶

@@ -34 +34 @@
 #include "execute.h"
 
+#if defined(C_OS2)
+#include <process.h>
+#define _P_NOWAIT P_NOWAIT
+#endif
+
 #define MAX_CHILDREN 5
 
@@ -53 +58 @@
     }
 
-#ifdef _WIN32
+#if defined(_WIN32) || defined(C_OS2)
     if(spawnlp(_P_NOWAIT, text, text, NULL) == -1) {
         logg("^%s: couldn't execute \"%s\".\n", type, text);

clamav/trunk/freshclam/freshclam.c ¶

@@ -259 +259 @@
         }
 
-#ifndef _WIN32
+#if !defined(_WIN32) && !defined(C_OS2)
         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);
@@ -269 +269 @@
 
 #ifdef HAVE_PWD_H
+#if !defined(C_OS2)
     /* freshclam shouldn't work with root privileges */
     dbowner = optget(opts, "DatabaseOwner")->strarg;
@@ -309 +310 @@
         }
     }
+#endif /* C_OS2 */
 #endif /* HAVE_PWD_H */
 

clamav/trunk/freshclam/manager.c ¶

@@ -1800 +1800 @@
     }
 
-#ifdef _WIN32
+#if defined(_WIN32) || defined(C_OS2)
     if(!access(newdb, R_OK) && unlink(newdb)) {
         logg("!Can't unlink %s. Please fix the problem manually and try again.\n", newdb);

clamav/trunk/libclamav/Makefile.in ¶

@@ -13 +13 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
+
+OS2_LA_NAME=clamav
+OS2_DLL_NAME=clamav
+OS2_DLL_OBJ=$(libclamav_la_OBJECTS:%.lo=.libs/%.o)  .libs/clamav_internal_utils.a .libs/clamav_nocxx.a
+OS2_DLL_LIBS=../libltdl/.libs/ltdlc.a .libs/clamunrar_iface.a .libs/clamunrar.a $(LIBCLAMAV_LIBS) $(LIBS)
 
 @SET_MAKE@
@@ -672 +677 @@
 @MAINTAINER_MODE_FALSE@CLEANFILES = $(COMMON_CLEANFILES)
 @MAINTAINER_MODE_TRUE@CLEANFILES = $(COMMON_CLEANFILES) @srcdir@/jsparse/generated/operators.h @srcdir@/jsparse/generated/keywords.h
-all: $(BUILT_SOURCES)
+all: $(BUILT_SOURCES) $(OS2_DLL_NAME).dll
         $(MAKE) $(AM_MAKEFLAGS) all-recursive
 
@@ -2349 +2354 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
+
+$(OS2_DLL_NAME).dll: lib$(OS2_LA_NAME).la
+        cp .libs/$(OS2_LA_NAME).a .libs/$(OS2_LA_NAME)_s.a
+        echo "LIBRARY $(OS2_DLL_NAME) INITINSTANCE TERMINSTANCE" > $(OS2_DLL_NAME).def
+        echo "DATA MULTIPLE" >> $(OS2_DLL_NAME).def
+        echo "EXPORTS" >> $(OS2_DLL_NAME).def
+        emxexp $(OS2_DLL_OBJ) >> $(OS2_DLL_NAME).def
+        gcc -g -Zbin-files -Zhigh-mem -Zomf -Zdll $(OS2_DLL_NAME).def -o $@ $(OS2_DLL_OBJ) $(OS2_DLL_LIBS) 
+        emximp -o .libs/$(OS2_LA_NAME).a $(OS2_DLL_NAME).def
+        emximp -o .libs/$(OS2_LA_NAME).lib $(OS2_DLL_NAME).def

clamav/trunk/libclamav/c++/configure ¶

@@ -14835 +14835 @@
         i?86|amd64|x86_64|powerpc*)
             case "$target_os" in
-                darwin*|freebsd*|openbsd*|netbsd*|dragonfly*|linux*|solaris*|win32*|mingw*)
+                darwin*|freebsd*|openbsd*|netbsd*|dragonfly*|linux*|solaris*|win32*|mingw*|os2*)
                     { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok ($target_cpu-$target_os)" >&5
 $as_echo "ok ($target_cpu-$target_os)" >&6; }

clamav/trunk/libclamav/c++/llvm/configure ¶

@@ -2806 +2806 @@
     llvm_cv_os_type="Freestanding"
     llvm_cv_platform_type="Unix" ;;
+  *-*-os2*)
+    llvm_cv_link_all_option="-Wl,--whole-archive"
+    llvm_cv_no_link_all_option="-Wl,--no-whole-archive"
+    llvm_cv_os_type="OS/2"
+    llvm_cv_platform_type="Unix" ;;
   *)
     llvm_cv_link_all_option=""
@@ -2856 +2861 @@
   *-unknown-eabi*)
     llvm_cv_target_os_type="Freestanding" ;;
+  *-*-os2*)
+    llvm_cv_target_os_type="OS/2" ;;
   *)
     llvm_cv_target_os_type="Unknown" ;;

clamav/trunk/libclamav/c++/llvm/lib/System/Mutex.cpp ¶

@@ -76 +76 @@
     assert(errorcode == 0);
 
-#if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__)
+#if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__) && !defined(__KLIBC__)
     // Make it a process local mutex
     errorcode = pthread_mutexattr_setpshared(&attr, PTHREAD_PROCESS_PRIVATE);

clamav/trunk/libclamav/c++/llvm/lib/System/Unix/Path.inc ¶

@@ -59 +59 @@
 #ifdef __APPLE__
 #include <mach-o/dyld.h>
+#endif
+
+#ifdef __KLIBC__
+#define INCL_DOS
+#include <os2.h>
 #endif
 
@@ -351 +356 @@
       return Path(std::string(link_path));
   }
+#elif defined(__KLIBC__)
+    static CHAR Buff[2*_MAX_PATH];
+    PPIB        pib;
+    // get executable fullpath
+    DosGetInfoBlocks( NULL, &pib);
+    DosQueryModuleName( pib->pib_hmte, sizeof(Buff), Buff);
+    return Path(std::string(Buff));
 #elif defined(__FreeBSD__)
   char exe_path[PATH_MAX];

clamav/trunk/libclamav/c++/llvm/lib/System/Unix/Process.inc ¶

@@ -214 +214 @@
   unsigned Columns = 0;
 
+#ifdef __KLIBC__
+        {
+            int screendata[2];
+            _scrsize(screendata);
+            Columns = screendata[0];
+        }
+#else
+
 #if defined(HAVE_SYS_IOCTL_H) && defined(HAVE_TERMIOS_H)
   // Try to determine the width of the terminal.
@@ -220 +228 @@
     Columns = ws.ws_col;
 #endif
+
+#endif // __KLIBC__
 
   return Columns;

clamav/trunk/libclamav/chmunpack.c ¶

@@ -572 +572 @@
         lzx_free(stream);
         
-#ifndef _WIN32
+#if !defined(_WIN32) && !defined(C_OS2)
         /* Delete the file */
         if(cli_unlink(filename))
@@ -583 +583 @@
         if ((retval == -1) && (tmpfd >= 0)) {
                 close(tmpfd);
+#if defined(_WIN32) || defined(C_OS2)
+                /* Now delete the file */
+                cli_unlink(filename);
+#endif
         }
         return retval;

clamav/trunk/libclamav/fmap.c ¶

@@ -49 +49 @@
 static inline unsigned int fmap_which_page(fmap_t *m, size_t at);
 
-#ifndef _WIN32
+#if !defined(_WIN32) && !defined(C_OS2)
 /* vvvvv POSIX STUFF BELOW vvvvv */
 
@@ -545 +545 @@
     pages = fmap_align_items(len, pgsz);
     hdrsz = fmap_align_to(sizeof(fmap_t), pgsz);
+    mapsz = pages * pgsz + hdrsz;
 
     if(!(m = (fmap_t *)cli_malloc(sizeof(fmap_t)))) {
@@ -550 +551 @@
         return NULL;
     }
+
+#ifdef _WIN32
     if((m->fh = (HANDLE)_get_osfhandle(fd)) == INVALID_HANDLE_VALUE) {
         cli_errmsg("fmap: cannot get a valid handle for descriptor %d\n", fd);
@@ -566 +569 @@
         return NULL;
     }
+#else
+    m->data = mmap(0, len, PROT_READ, MAP_PRIVATE, fd, 0);
+    if (m == MAP_FAILED) {
+        cli_errmsg("fmap: cannot map file descriptor %d\n", fd);
+        free(m);
+        return NULL;
+    }
+#endif
     m->fd = fd;
     m->dumb = dumb;
@@ -580 +591 @@
 
 void funmap(fmap_t *m) { /* WIN32 */
+#ifdef _WIN32
     UnmapViewOfFile(m->data);
     CloseHandle(m->mh);
+#else
+    munmap(m->data, 0);
+#endif
     free((void *)m);
 }

clamav/trunk/libclamav/fmap.h ¶

@@ -45 +45 @@
     void *data;
 #endif
+#ifdef C_OS2
+    void *data;
+#endif
     uint32_t placeholder_for_bitmap;
 } fmap_t;

clamav/trunk/libclamav/mpool.c ¶

@@ -40 +40 @@
 #endif
 #include <stddef.h>
+
+#if defined(C_OS2)
+#define INCL_DOS
+#define INCL_DOSERRORS
+#include <os2.h>
+#endif
 
 #include "others.h"
@@ -347 +353 @@
   mp.u.mpm.usize = sizeof(struct MPMAP);
   mp.u.mpm.size = sz - sizeof(mp);
-#ifndef _WIN32
+#if defined(C_OS2)
+  if(DosAllocMem(&mpool_p, sz, PAG_READ|PAG_WRITE|PAG_COMMIT|OBJ_ANY) != NO_ERROR)
+    if(DosAllocMem(&mpool_p, sz, PAG_READ|PAG_WRITE|PAG_COMMIT) != NO_ERROR)
+#elif !defined(_WIN32)
   if ((mpool_p = (struct MP *)mmap(NULL, sz, PROT_READ | PROT_WRITE, MAP_PRIVATE|ANONYMOUS_MAP, -1, 0)) == MAP_FAILED)
 #else
@@ -379 +388 @@
     memset(mpm, FREEPOISON, mpmsize);
 #endif
-#ifndef _WIN32
+#if defined(C_OS2)
+    DosFreeMem(mpm);
+#elif !defined(_WIN32)
     munmap((void *)mpm, mpmsize);
 #else
@@ -389 +400 @@
   memset(mp, FREEPOISON, mpmsize + sizeof(*mp));
 #endif
-#ifndef _WIN32
+#if defined(C_OS2)
+    DosFreeMem(mpm);
+#elif !defined(_WIN32)
   munmap((void *)mp, mpmsize + sizeof(*mp));
 #else
@@ -412 +425 @@
             memset((char *)mpm + mused, FREEPOISON, mpm->size - mused);
 #endif
-#ifndef _WIN32
+#if defined(C_OS2)
+            DosSetMem(mpm + mused, mpm->size - mused, PAG_DECOMMIT);
+#elif !defined(_WIN32)
             munmap((char *)mpm + mused, mpm->size - mused);
 #else
@@ -427 +442 @@
         memset((char *)mp + mused, FREEPOISON, mp->u.mpm.size + sizeof(*mp) - mused);
 #endif
-#ifndef _WIN32
+#if defined(C_OS2)
+        DosSetMem(mp + mused, mp->u.mpm.size + sizeof(*mp) - mused, PAG_DECOMMIT);
+#elif !defined(_WIN32)
         munmap((char *)mp + mused, mp->u.mpm.size + sizeof(*mp) - mused);
 #else
@@ -545 +562 @@
   i = align_to_pagesize(mp, MIN_FRAGSIZE);
 
-#ifndef _WIN32
+#if defined(C_OS2)
+  if(DosAllocMem(&mpm, i, PAG_READ|PAG_WRITE|PAG_COMMIT|OBJ_ANY) != NO_ERROR)
+    if(DosAllocMem(&mpm, i, PAG_READ|PAG_WRITE|PAG_COMMIT) != NO_ERROR) {
+#elif !defined(_WIN32)
   if ((mpm = (struct MPMAP *)mmap(NULL, i, PROT_READ | PROT_WRITE, MAP_PRIVATE|ANONYMOUS_MAP, -1, 0)) == MAP_FAILED) {
 #else

clamav/trunk/libclamav/others.c ¶

@@ -70 +70 @@
 #include "bytecode_api_impl.h"
 
+#ifndef C_OS2
 int (*cli_unrar_open)(int fd, const char *dirname, unrar_state_t *state);
 int (*cli_unrar_extract_next_prepare)(unrar_state_t *state, const char *dirname);
 int (*cli_unrar_extract_next)(unrar_state_t *state, const char *dirname);
 void (*cli_unrar_close)(unrar_state_t *state);
+#endif
+
 int have_rar = 0;
 static int is_rar_initd = 0;
@@ -165 +168 @@
     is_rar_initd = 1;
 
+#ifndef C_OS2
     rhandle = lt_dlfind("libclamunrar_iface", "unrar");
     if (!rhandle)
@@ -178 +182 @@
         return;
     }
+#endif // C_OS2
+
     have_rar = 1;
 }
@@ -739 +745 @@
 }
 
-#ifdef  C_WINDOWS
+#if defined(C_WINDOWS) || defined(C_OS2)
 /*
  * Windows doesn't allow you to delete a directory while it is still open

clamav/trunk/libclamav/others.h ¶

@@ -34 +34 @@
 #include <stdio.h>
 #include <stdlib.h>
+#ifdef __KLIBC__
+#include <unistd.h>
+#endif
 #include "cltypes.h"
 
@@ -286 +289 @@
 };
 
+#ifndef __KLIBC__
 extern int (*cli_unrar_open)(int fd, const char *dirname, unrar_state_t *state);
 extern int (*cli_unrar_extract_next_prepare)(unrar_state_t *state, const char *dirname);
 extern int (*cli_unrar_extract_next)(unrar_state_t *state, const char *dirname);
 extern void (*cli_unrar_close)(unrar_state_t *state);
+#endif
 extern int have_rar;
 

clamav/trunk/libclamav/others_common.c ¶

@@ -115 +115 @@
         regex_t reg;
         int match, flags = REG_EXTENDED | REG_NOSUB;
-#ifdef _WIN32
+#if defined(_WIN32) || defined(C_OS2)
     flags |= REG_ICASE;
 #endif
@@ -306 +306 @@
 }
 
+
+#ifdef __KLIBC__
+// it seems that mmap exception handler does not work inside kernel functions,
+// so we temporary trigger page faults before invoking write()
+static int _writen( char* buff, unsigned int count)
+{
+        int i;
+        char ch0 = buff[0];
+        // the last byte can be on a different page
+        buff[0] = buff[count-1];
+        for( i=0; i<count; i+=4096)
+                buff[0] = buff[i];
+        // I need this to fake optimizer, otherwise loop will be removed with -O3
+        buff[0] = ch0;
+        return ch0;
+}
+#endif // __KLIBC__
+
 /* Function: writen
         Try hard to write the specified number of bytes
@@ -318 +336 @@
         todo = count;
         current = (const unsigned char *) buff;
+
+#ifdef __KLIBC__
+        // it seems that mmap exception handler does not work inside kernel functions,
+        // so we temporary trigger page faults before invoking write()
+        retval = _writen( current, count);
+#endif
 
         do {
@@ -382 +406 @@
         const char *tmpdir;
     if(
-#ifdef _WIN32
+#if defined(_WIN32) || defined(C_OS2)
         !(tmpdir = getenv("TEMP")) && !(tmpdir = getenv("TMP"))
 #else

clamav/trunk/libclamav/readdb.c ¶

@@ -2703 +2703 @@
 }
 
+const char *cl_retcfgdir(void)
+{
+    return CONFDIR;
+}
+
 int cl_statinidir(const char *dirname, struct cl_stat *dbstat)
 {

clamav/trunk/libclamunrar_iface/unrar_iface.h ¶

@@ -25 +25 @@
 #endif
 
+#ifdef __KLIBC__
+#define unrar_open cli_unrar_open
+#define unrar_extract_next_prepare cli_unrar_extract_next_prepare
+#define unrar_extract_next cli_unrar_extract_next
+#define unrar_close cli_unrar_close
+#else
 #define unrar_open libclamunrar_iface_LTX_unrar_open
 #define unrar_extract_next_prepare libclamunrar_iface_LTX_unrar_extract_next_prepare
 #define unrar_extract_next libclamunrar_iface_LTX_unrar_extract_next
 #define unrar_close libclamunrar_iface_LTX_unrar_close
+#endif
 
 #ifndef HAVE_ATTRIB_PACKED

clamav/trunk/libltdl/loaders/loadlibrary.c ¶

@@ -32 +32 @@
 #include "lt__private.h"
 #include "lt_dlloader.h"
+
+#ifndef __KLIBC__
 
 #if defined(__CYGWIN__)
@@ -250 +252 @@
   return address;
 }
+
+#endif // __KLIBC__

clamav/trunk/libltdl/ltdl.c ¶

@@ -233 +233 @@
       /* Now open all the preloaded module loaders, so the application
          can use _them_ to lt_dlopen its own modules.  */
+#ifndef __KLIBC__
 #ifdef HAVE_LIBDLLOADER
       if (!errors)
@@ -244 +245 @@
         }
 #endif /* HAVE_LIBDLLOADER */
+#endif // __KLIBC__
     }
 

clamav/trunk/shared/misc.c ¶

@@ -250 +250 @@
 int daemonize(void)
 {
-#ifdef _WIN32
+#if defined(C_OS2)
+    return 0;
+#elif defined(_WIN32)
     fputs("Background mode is not supported on your operating system\n", stderr);
     return -1;
@@ -301 +303 @@
         int match, flags = REG_EXTENDED | REG_NOSUB;
         char fname[513];
-#ifdef _WIN32
+#if defined(_WIN32) || defined(C_OS2)
         flags |= REG_ICASE; /* case insensitive on Windows */
 #endif
@@ -345 +347 @@
 
 int cli_is_abspath(const char *path) {
-#ifdef _WIN32
+#if defined(_WIN32) || defined(C_OS2)
     int len = strlen(path);
-    return (len > 2 && path[0] == '\\' && path[1] == '\\') || (len >= 2 && ((*path >= 'a' && *path <= 'z') || (*path >= 'A' && *path <= 'Z')) && path[1] == ':');
+    return (len > 2 && path[0] == '\\' && path[1] == '\\') 
+#ifdef C_OS2
+        || *path == '/' || *path == '\\'
+#endif
+        || (len >= 2 && ((*path >= 'a' && *path <= 'z') || (*path >= 'A' && *path <= 'Z')) && path[1] == ':');
 #else
     return *path == '/';

clamav/trunk/shared/optparser.c ¶

@@ -788 +788 @@
             for(i = 0; i < (int) strlen(pt) - 1 && (pt[i] == ' ' || pt[i] == '\t'); i++);
             pt += i;
-            for(i = strlen(pt); i >= 1 && (pt[i - 1] == ' ' || pt[i - 1] == '\t' || pt[i - 1] == '\n'); i--);
+            for(i = strlen(pt); i >= 1 && (pt[i - 1] == ' ' || pt[i - 1] == '\t' || pt[i - 1] == '\n' || pt[i - 1] == '\r'); i--);
             if(!i) {
                 if(verbose)

clamav/trunk/unit_tests/check_clamd.c ¶

@@ -51 +51 @@
 #include "libclamav/cltypes.h"
 
+#ifdef __KLIBC__
+#define SHUT_WR 0
+#endif
+
 #ifdef CHECK_HAVE_LOOPS
 
 static int sockd;
-#define SOCKET "clamd-test.socket"
+#define SOCKET "\\socket\\clamd-test.socket"
 static void conn_setup_mayfail(int may)
 {
@@ -398 +402 @@
 static int sendmsg_fd(int sockd, const char *mesg, size_t msg_len, int fd, int singlemsg)
 {
+#ifndef __KLIBC__
     struct msghdr msg;
     struct cmsghdr *cmsg;
@@ -438 +443 @@
 
     return sendmsg(sockd, &msg, 0);
+#endif // __KLIBC__
 }