Browse code

small fixes

git-svn-id: file:///var/lib/svn/clamav-devel/trunk/clamav-devel@302 77e5149b-7576-45b1-b177-96237e5ba77b

Tomasz Kojm authored on 2004/02/18 12:15:05
Showing 6 changed files
... ...
@@ -1,3 +1,14 @@
1
+Wed Feb 18 04:09:56 CET 2004 (tk)
2
+---------------------------------
3
+  * clamd: temporarily disabled strerror_r (due to a compilation problem on
4
+	   Solaris reported by Nigel)
5
+
6
+Tue Feb 17 23:43:22 CET 2004 (tk)
7
+---------------------------------
8
+  * configure: fixed in_port_t detection on OpenBSD (problem reported by Nigel)
9
+  * clamdscan: fixed problem with /cygdrive/ on Cygwin (thanks to Andrey
10
+	       Cherezov <andrey*cherezov.koenig.su>)
11
+
1 12
 Tue Feb 17 20:49:23 GMT 2004 (njh)
2 13
 ----------------------------------
3 14
   * libclamav: Added a new bounce delimeter
... ...
@@ -81,7 +81,7 @@ dnl there is now a CREATE_PREFIX_TARGET_H in this file as a shorthand for
81 81
 dnl PREFIX_CONFIG_H from a target.h file, however w/o the target.h ever created
82 82
 dnl (the prefix is a bit different, since we add an extra -target- and -host-)
83 83
 dnl 
84
-dnl @version: $Id: aclocal.m4,v 1.19 2004/02/14 09:32:34 kojm Exp $
84
+dnl @version: $Id: aclocal.m4,v 1.20 2004/02/18 03:15:05 kojm Exp $
85 85
 dnl @author Guido Draheim <guidod@gmx.de>                 STATUS: used often
86 86
 
87 87
 AC_DEFUN([AC_CREATE_TARGET_H],
... ...
@@ -4041,7 +4041,7 @@ dnl      AC_COMPILE_CHECK_SIZEOF(ptrdiff_t, $headers)
4041 4041
 dnl      AC_COMPILE_CHECK_SIZEOF(off_t, $headers)
4042 4042
 dnl
4043 4043
 dnl @author Kaveh Ghazi <ghazi@caip.rutgers.edu>
4044
-dnl @version $Id: aclocal.m4,v 1.19 2004/02/14 09:32:34 kojm Exp $
4044
+dnl @version $Id: aclocal.m4,v 1.20 2004/02/18 03:15:05 kojm Exp $
4045 4045
 dnl
4046 4046
 AC_DEFUN([AC_COMPILE_CHECK_SIZEOF],
4047 4047
 [changequote(<<, >>)dnl
... ...
@@ -380,7 +380,8 @@ int acceptloop_th(int socketd, struct cl_node *root, const struct cfgstruct *cop
380 380
     for(;;) {				
381 381
 	new_sd = accept(socketd, NULL, NULL);
382 382
 	if((new_sd == -1) && (errno != EINTR)) {
383
-	    logg("!accept() failed: %s", strerror_r(errno, buff, BUFFSIZE));
383
+	    logg("!accept() failed\n");
384
+	    /* logg("!accept() failed: %s", strerror_r(errno, buff, BUFFSIZE)); */
384 385
 	    /* very bad - need to exit or restart */
385 386
 	    continue;
386 387
 	}
... ...
@@ -216,7 +216,11 @@ int client(const struct optstruct *opt)
216 216
 	    return 2;
217 217
 	} else {
218 218
 	    file = mcalloc(200 + strlen(opt->filename) + 10, sizeof(char));
219
+#ifdef C_CYGWIN
220
+	    sprintf(file, "%s", opt->filename);
221
+#else
219 222
 	    sprintf(file, "%s/%s", cwd, opt->filename);
223
+#endif
220 224
 	}
221 225
     }
222 226
 
... ...
@@ -9565,6 +9565,7 @@ else
9565 9565
 #line $LINENO "configure"
9566 9566
 #include "confdefs.h"
9567 9567
 #include <netinet/in.h>
9568
+#include <sys/types.h>
9568 9569
 int main(int argc, char **argv) { in_port_t pt; pt = 0; return pt; }
9569 9570
 _ACEOF
9570 9571
 rm -f conftest$ac_exeext
... ...
@@ -235,6 +235,7 @@ fi
235 235
 
236 236
 # check for in_port_t definition
237 237
 AC_TRY_RUN([#include <netinet/in.h>
238
+#include <sys/types.h>
238 239
 int main(int argc, char **argv) { in_port_t pt; pt = 0; return pt; }],
239 240
 AC_DEFINE(HAVE_IN_PORT_T,1,[in_port_t is defined]), AC_MSG_RESULT(in_port_t is not defined))
240 241