Changeset 80430

Timestamp:

07/12/11 15:01:12 (4 years ago)

Author:

cal@…

Message:

rev-upgrade: Unit test for libmachista and fixes for two regressions in libmachista

Location:

branches/gsoc11-rev-upgrade/base/src/libmachista1.0

Files:

• Makefile (modified) (2 diffs)
• libmachista.c (modified) (4 diffs)
• tests (added)
• tests/libmachista-test.c (added)

branches/gsoc11-rev-upgrade/base/src/libmachista1.0/Makefile

@@ -14 +14 @@
 clean::
         rm -f ${OBJS} ${SHLIB_NAME}
+        rm -f ./tests/libmachista-test
+        rm -rf ./tests/libmachista-test.dSYM
 
 distclean:: clean
@@ -21 +23 @@
         ${INSTALL} -o ${DSTUSR} -g ${DSTGRP} -m 444 ${SHLIB_NAME} ${INSTALLDIR}
 
+test:: tests/libmachista-test
+        ./tests/libmachista-test
+
+tests/libmachista-test: tests/libmachista-test.c libmachista.h libmachista$(SHLIB_SUFFIX)
+        $(CC) $(CFLAGS) -D_POSIX_SOURCE -o $@ -I. -L. -lmachista $<
+

branches/gsoc11-rev-upgrade/base/src/libmachista1.0/libmachista.c

@@ -80 +80 @@
 char *macho_format_dylib_version (uint32_t version) {
     char *result;
-    asprintf(&result, "%"PRIu32".%"PRIu32".%"PRIu32, (version >> 16) & 0xFF, (version >> 8) & 0xFF, version & 0xFF);
+    asprintf(&result, "%"PRIu32".%"PRIu32".%"PRIu32, (version >> 16) & 0xFFFF, (version >> 8) & 0xFF, version & 0xFF);
     return result;
 }
@@ -230 +230 @@
 
             /* 32-bit Mach-O */
-            mat->mat_arch = header->cputype;
+            mat->mat_arch = swap32(header->cputype);
             break;
 
@@ -251 +251 @@
 
             /* 64-bit Macho-O */
-            mat->mat_arch = header->cputype;
+            mat->mat_arch = swap32(header->cputype);
             break;
 
@@ -296 +296 @@
 
     /* Copy the architecture */
-    mat->mat_arch = header->cputype;
+    mat->mat_arch = swap32(header->cputype);
 
     /* Parse the Mach-O load commands */