1.5.14: replace endianness-check.sh to endianness.c

Author: zvezdochiot

.gitignore

@@ -1,5 +1,4 @@
 opuscomment
 tests/
-endianness.c
 *.o
 nls/*/opuscomment.cat

src/Makefile

@@ -11,9 +11,9 @@ CFLAGS=-D_POSIX_C_SOURCE=200809L -DNLS
 LDFLAGS=-logg -lm -lpthread
 SRCS=put-tags.c parse-tags.c read.c read-flac.c ocutil.c retrieve-tags.c select-codec.c
 SRCP=opuspic2tag.c picture.c
-CONFSRCS=endianness.c error.c main.c
+CONFSRCS=endianness.c error.c opuscomment.c
 HEADERS=global.h ocutil.h limit.h error.h iconv-impl.h
-ERRORDEFS=errordef/opus.tab errordef/main.tab
+ERRORDEFS=errordef/opus.tab errordef/opuscomment.tab
 OBJS=$(SRCS:.c=.o) $(CONFSRCS:.c=.o)
 OBJP=$(SRCP:.c=.o)
 RM = rm -f
@@ -35,14 +35,11 @@ opuspic2tag: $(OBJP)
 $(SRCS): $(HEADERS)
 	@touch $@
 
-endianness.c: endianness-check.sh
-	./$< > $@
-
 error.c: $(ERRORDEFS) $(HEADERS)
 	@touch $@
 
-main.c: $(HEADERS) version.h
+opuscomment.c: $(HEADERS) version.h
 	@touch $@
 
 clean:
-	$(RM) endianness.c opuscomment opuspic2tag $(OBJS) $(OBJP) 2>/dev/null || :
+	$(RM) opuscomment opuspic2tag $(OBJS) $(OBJP) 2>/dev/null || :

src/endianness-check.sh

@@ -0,0 +1,79 @@
+#include <stdint.h>
+int endian_test()
+{
+    uint32_t sample = {0x01020304};
+    uint8_t *test = (uint8_t *)&sample;
+    if (test[0] == 4)
+        return -1;
+    else if (test[0] == 1)
+        return 1;
+    else
+        return 0;
+}
+
+uint16_t oi16(uint16_t i)
+{
+    int et = endian_test();
+    if (et == -1)
+        return i;
+    else if (et == 1)
+        return (i << 8 | i >> 8);
+    else
+    {
+        uint8_t *val = (uint8_t *)&i;
+        uint8_t out[2];
+        out[0] = val[0];
+        out[1] = val[1];
+        return *(uint16_t*)out;
+    }
+}
+uint32_t oi32(uint32_t i)
+{
+    int et = endian_test();
+    if (et == -1)
+        return i;
+    else if (et == 1)
+        return (i << 24
+               | (i & (255ULL << 8)) << 8
+               | (i & (255ULL << 16)) >> 8
+               | i >> 24);
+    else
+    {
+        uint8_t *val = (uint8_t *)&i;
+        uint8_t out[4];
+        out[0] = val[0];
+        out[1] = val[1];
+        out[2] = val[2];
+        out[3] = val[3];
+        return *(uint32_t*)out;
+    }
+}
+uint64_t oi64(uint64_t i)
+{
+    int et = endian_test();
+    if (et == -1)
+        return i;
+    else if (et == 1)
+        return (i << 56
+               | (i & (255ULL << 8)) << 40
+               | (i & (255ULL << 16)) >> 24
+               | (i & (255ULL << 24)) >> 8
+               | (i & (255ULL << 32)) >> 8
+               | (i & (255ULL << 40)) >> 24
+               | (i & (255ULL << 48)) >> 40
+               | i >> 56);
+    else
+    {
+        uint8_t *val = (uint8_t *)&i;
+        uint8_t out[8];
+        out[0] = val[0];
+        out[1] = val[1];
+        out[2] = val[2];
+        out[3] = val[3];
+        out[4] = val[4];
+        out[5] = val[5];
+        out[6] = val[6];
+        out[7] = val[7];
+        return *(uint64_t*)out;
+    }
+}

src/endianness.c

@@ -14,7 +14,7 @@ noreturn void mainerror(int e, ...) {
 	errorprefix();
 	char const *msg[] = {
 #define LIST(I, E, S) S,
-#include "errordef/main.tab"
+#include "errordef/opuscomment.tab"
 #undef LIST
 	};
 	vfprintf(stderr, catgets(catd, 2, e, msg[e]), ap);

src/error.c

@@ -16,7 +16,7 @@ enum err_opus_ {
 
 enum err_main_ {
 #define LIST(I, E, S) err_main_##E = I,
-#include "errordef/main.tab"
+#include "errordef/opuscomment.tab"
 #undef LIST
 };