@@ -1,3 +1,8 @@

+Sat Jan  8 02:25:58 CET 2005 (tk)

+---------------------------------

+  * libclamav: Fix cli_writeint32 alignment problem on SPARC (reported by

+	       Andy Fiddaman <clam*fiddaman.net>)

+

 Fri Jan  7 13:50:52 GMT 2005 (njh)

 ----------------------------------

   * libclamav/mbox.c:	Fix to "content-type: application" which could cause

@@ -530,18 +530,23 @@ int32_t cli_readint32(const char *buff)

 #if WORDS_BIGENDIAN == 0

     ret = *(int32_t *) buff;

 #else

-	int32_t shift, i = 0;

-

-    ret = 0;

-    for(shift = 0; shift < 32; shift += 8) {

-      ret |= (buff[i] & 0xff ) << shift;

-      i++;

-    }

+    ret = buff[0] & 0xff;

+    ret |= (buff[1] & 0xff) << 8;

+    ret |= (buff[2] & 0xff) << 16;

+    ret |= (buff[3] & 0xff) << 24;

 #endif

     return ret;

 }

+void cli_writeint32(char *offset, uint32_t value)

+{

+    offset[0] = value & 0xff;

+    offset[1] = (value & 0xff00) >> 8;

+    offset[2] = (value & 0xff0000) >> 16;

+    offset[3] = (value & 0xff000000) >> 24;

+}

+

 int cli_memstr(const char *haystack, int hs, const char *needle, int ns)

 {

 	const char *pt, *hay;

@@ -35,6 +35,7 @@ char *cli_md5file(const char *filename);

 int cli_readn(int fd, void *buff, unsigned int count);

 int cli_writen(int fd, void *buff, unsigned int count);

 int32_t cli_readint32(const char *buff);

+void cli_writeint32(char *offset, uint32_t value);

 char *cli_gentemp(const char *dir);

 unsigned int cli_rndnum(unsigned int max);

 int cli_memstr(const char *haystack, int hs, const char *needle, int ns);

@@ -59,8 +59,6 @@ static inline uint16_t EC16(uint16_t v)

 }

 #endif

-#define cli_writeint32(offset,value) *(uint32_t *)(offset) = EC32(value)

-

 struct IMAGE_PE_HEADER {

     uint32_t Signature;

     /* FILE HEADER */

@@ -68,17 +68,6 @@

 \x63\x6C\x61\x6D\x61\x76\x2E\x6E\x65\x74\x0D\x0A\x24\x00\x00\x00\

 "

-#if WORDS_BIGENDIAN == 0

-#define EC32(v) (v)

-#else

-static inline uint32_t EC32(uint32_t v)

-{

-    return ((v >> 24) | ((v & 0x00FF0000) >> 8) | ((v & 0x0000FF00) << 8) | (v << 24));

-}

-#endif

-

-#define cli_writeint32(offset,value) *(uint32_t *)(offset) = EC32(value)

-

 /* PE from UPX */

 int pefromupx (char *src, char *dst, int *dsize, uint32_t ep, uint32_t upx0, uint32_t upx1, uint32_t magic)