Make mspack/system.h private, move useful macros to mspack/macros.h

Author: kyz

cabextract/mspack/macros.h

@@ -0,0 +1 @@
+../../libmspack/mspack/macros.h

cabextract/src/cabinfo.c

@@ -24,10 +24,16 @@
 #include <string.h>
 #include <sys/types.h>
 
-/* include <system.h> from libmspack for LD and EndGetI?? macros */
-#include <mspack/system.h>
-/* include <cab.h> from libmspack for cab structure offsets */
-#include <mspack/cab.h>
+/* include some headers from the cut-down copy of libmspack
+ * - mspack.h for MSCAB_ATTRIB_?? defines
+ * - macros.h for LD and EndGetI?? macros
+ * - cab.h for cab structure offsets
+ * cabinfo does not use the system-wide <mspack.h> nor does it
+ * link with any libmspack functions. It's a standalone program.
+ */
+#include "mspack/mspack.h"
+#include "mspack/macros.h"
+#include "mspack/cab.h"
 
 #if HAVE_FSEEKO
 # define FSEEK fseeko

libmspack/ChangeLog

@@ -1,3 +1,8 @@
+2020-04-13  Stuart Caie <[email protected]>
+
+	* macros.h: new header for the D(), LD/LU and EndGet???() macros.
+	Use this instead of system.h.
+
 2020-01-08  Stuart Caie <[email protected]>
 
 	* lzxd_decompress(): do not apply the E8 transformation on the

libmspack/examples/cabrip.c

@@ -6,7 +6,7 @@
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <mspack.h>
-#include <system.h>
+#include "mspack/macros.h"
 
 #if HAVE_FSEEKO
 # define fseek fseeko

libmspack/mspack/macros.h

@@ -0,0 +1,64 @@
+/* This file is part of libmspack.
+ * (C) 2003-2020 Stuart Caie.
+ *
+ * libmspack is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License (LGPL) version 2.1
+ *
+ * For further details, see the file COPYING.LIB distributed with libmspack
+ */
+
+#ifndef MSPACK_MACROS_H
+#define MSPACK_MACROS_H 1
+
+/* define LD and LU as printf-format for signed and unsigned long offsets */
+#if HAVE_INTTYPES_H
+# include <inttypes.h>
+#else
+# define PRId64 "lld"
+# define PRIu64 "llu"
+# define PRId32 "ld"
+# define PRIu32 "lu"
+#endif
+
+#if SIZEOF_OFF_T >= 8
+# define LD PRId64
+# define LU PRIu64
+#else
+# define LD PRId32
+# define LU PRIu32
+#endif
+
+/* endian-neutral reading of little-endian data */
+#define __egi32(a,n) (((unsigned int) ((unsigned char *)(a))[n+3] << 24) | \
+                      ((unsigned int) ((unsigned char *)(a))[n+2] << 16) | \
+                      ((unsigned int) ((unsigned char *)(a))[n+1] <<  8) | \
+                      ((unsigned int) ((unsigned char *)(a))[n]))
+#define EndGetI64(a) (((unsigned long long int) __egi32(a,4) << 32) | __egi32(a,0))
+#define EndGetI32(a) __egi32(a,0)
+#define EndGetI16(a) ((((a)[1])<<8)|((a)[0]))
+
+/* endian-neutral reading of big-endian data */
+#define EndGetM32(a) (((unsigned int) ((unsigned char *)(a))[0] << 24) | \
+                      ((unsigned int) ((unsigned char *)(a))[1] << 16) | \
+                      ((unsigned int) ((unsigned char *)(a))[2] <<  8) | \
+                      ((unsigned int) ((unsigned char *)(a))[3]))
+#define EndGetM16(a) ((((a)[0])<<8)|((a)[1]))
+
+/* D(("formatstring", args)) prints debug messages if DEBUG defined */
+#if DEBUG
+ /* http://gcc.gnu.org/onlinedocs/gcc/Function-Names.html */
+# if __STDC_VERSION__ < 199901L
+#  if __GNUC__ >= 2
+#   define __func__ __FUNCTION__
+#  else
+#   define __func__ "<unknown>"
+#  endif
+# endif
+# include <stdio.h>
+# define D(x) do { printf("%s:%d (%s) ",__FILE__, __LINE__, __func__); \
+                   printf x ; fputc('\n', stdout); fflush(stdout);} while (0);
+#else
+# define D(x)
+#endif
+
+#endif

libmspack/mspack/system.h

@@ -18,8 +18,8 @@ extern "C" {
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
-
 #include <mspack.h>
+#include <macros.h>
 
 /* assume <string.h> exists */
 #include <string.h>
@@ -31,71 +31,23 @@ extern "C" {
 # undef read
 #endif
 
-/* Old GCCs don't have __func__, but __FUNCTION__:
- * http://gcc.gnu.org/onlinedocs/gcc/Function-Names.html
- */
-#if __STDC_VERSION__ < 199901L
-# if __GNUC__ >= 2
-#  define __func__ __FUNCTION__
-# else
-#  define __func__ "<unknown>"
-# endif
-#endif
-
-#if DEBUG
-# include <stdio.h>
-# define D(x) do { printf("%s:%d (%s) ",__FILE__, __LINE__, __func__); \
-                   printf x ; fputc('\n', stdout); fflush(stdout);} while (0);
-#else
-# define D(x)
-#endif
-
 /* CAB supports searching through files over 4GB in size, and the CHM file
  * format actively uses 64-bit offsets. These can only be fully supported
  * if the system the code runs on supports large files. If not, the library
  * will work as normal using only 32-bit arithmetic, but if an offset
  * greater than 2GB is detected, an error message indicating the library
  * can't support the file should be printed.
  */
-#if HAVE_INTTYPES_H
-# include <inttypes.h>
-#else
-# define PRId64 "lld"
-# define PRIu64 "llu"
-# define PRId32 "ld"
-# define PRIu32 "lu"
-#endif
-
 #include <limits.h>
 #if ((defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS >= 64) || \
      (defined(FILESIZEBITS)      && FILESIZEBITS      >= 64) || \
      defined(_LARGEFILE_SOURCE) || defined(_LARGEFILE64_SOURCE) || \
      SIZEOF_OFF_T >= 8)
 # define LARGEFILE_SUPPORT 1
-# define LD PRId64
-# define LU PRIu64
 #else
 extern const char *largefile_msg;
-# define LD PRId32
-# define LU PRIu32
 #endif
 
-/* endian-neutral reading of little-endian data */
-#define __egi32(a,n) (((unsigned int) ((unsigned char *)(a))[n+3] << 24) | \
-                      ((unsigned int) ((unsigned char *)(a))[n+2] << 16) | \
-                      ((unsigned int) ((unsigned char *)(a))[n+1] <<  8) | \
-                      ((unsigned int) ((unsigned char *)(a))[n]))
-#define EndGetI64(a) (((unsigned long long int) __egi32(a,4) << 32) | __egi32(a,0))
-#define EndGetI32(a) __egi32(a,0)
-#define EndGetI16(a) ((((a)[1])<<8)|((a)[0]))
-
-/* endian-neutral reading of big-endian data */
-#define EndGetM32(a) (((unsigned int) ((unsigned char *)(a))[0] << 24) | \
-                      ((unsigned int) ((unsigned char *)(a))[1] << 16) | \
-                      ((unsigned int) ((unsigned char *)(a))[2] <<  8) | \
-                      ((unsigned int) ((unsigned char *)(a))[3]))
-#define EndGetM16(a) ((((a)[0])<<8)|((a)[1]))
-
 extern struct mspack_system *mspack_default_system;
 
 /* returns the length of a file opened for reading */

libmspack/test/cabd_test.c

@@ -8,7 +8,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <mspack.h>
-#include <system.h>
 
 #define __tf3(x) #x
 #define __tf2(x) __tf3(x)

libmspack/test/chmd_find.c

@@ -8,9 +8,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include <mspack.h>
-
+#include "mspack/macros.h"
 #include <error.h>
-#include <system.h>
 
 void find(struct mschm_decompressor *chmd, struct mschmd_header *chm,
           char *archive, char *filename, struct mschmd_file *compare)

libmspack/test/chmd_test.c

@@ -10,7 +10,6 @@
 #include <unistd.h>
 
 #include <mspack.h>
-#include <system.h>
 
 #define __tf3(x) #x
 #define __tf2(x) __tf3(x)

libmspack/test/chminfo.c

@@ -8,7 +8,7 @@
 #include <string.h>
 
 #include <mspack.h>
-#include <system.h>
+#include "mspack/macros.h"
 
 #define FILENAME ".chminfo-temp"
 

libmspack/test/kwajd_test.c

@@ -8,7 +8,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <mspack.h>
-#include <system.h>
 
 #define __tf3(x) #x
 #define __tf2(x) __tf3(x)