From: Laurent Mazet <mazet@softndesign.org>
Date: Tue, 15 Apr 2025 18:59:12 +0000 (+0200)
Subject: full adaptation to c99
X-Git-Url: https://secure.softndesign.org/git/?a=commitdiff_plain;p=hexdump.git

full adaptation to c99
---

diff --git a/getcomments.pl b/getcomments.pl
deleted file mode 100755
index 47edf67..0000000
--- a/getcomments.pl
+++ /dev/null
@@ -1,85 +0,0 @@
-#!/usr/bin/perl
-
-use strict;
-
-# default value
-my $format = "%";
-my $pattern = "";
-
-# help message
-sub usage() {
-
-  print <<EOF;
-usage: getcomments [-f string] [-h] [-p regex] file...
- -f|--format string: format string for output printing [%]
- -h|--help: help message
- -p|--pattern regex: pattern matching on block []
-
- Extract C/C++ block of comments
-
-Example: getcomments.pl -p='test:\\s' -f='./%' random.c
-EOF
-
-  exit 1;
-}
-
-usage() if ($#ARGV < 0);
-
-# process argument
-foreach my $arg (@ARGV) {
-  use vars qw/$caif $caip $naif $naip/;
-
-  # analyse format argument
-  ($caif, $_) = ($arg =~ /^(-f|--format)=(.*)/);
-  ($caif, $_) = (1, $arg) if ($naif);
-  next if ($naif = ($arg =~ /^(-f|--format)$/));
-  if ($caif) { $format = $_; next }
-
-  # check for help message
-  usage() if ($arg =~ /^(-h|--help)$/);
-
-  # analyse pattern argument
-  ($caip, $_) = ($arg =~ /^(-p|--pattern)=(.*)/);
-  ($caip, $_) = (1, $arg) if ($naip);
-  next if ($naip = ($arg =~ /^(-p|--pattern)$/));
-  if ($caip) { $pattern = $_; next }
-
-  # no more argument, only file
-  my $filename = $arg;
-
-  # open file
-  if (!open (IN, "<", $filename)) {
-    print "Can not open $filename\n";
-  }
-
-  # init table of comments
-  my @comments;
-  $#comments = -1;
-
-  # read all the file
-  while ($_ .= <IN>) {
-    my $cmt;
-
-    # process c++ comments
-    ($cmt, $_) = m{//\s*(.*?)\s*$()} if (m{//} && !m{/\*.*//});
-
-    # process standard c comments
-    ($cmt, $_) = m{^.*?/\*\s*(.*?)\s*\*/(.*)}s if (m{/\*.*\*/}s);
-
-    push(@comments, $cmt) if ($cmt);
-
-    # empty buffer if no comment is present
-    undef($_) if (!m{/[/*]});
-  }
-
-  # close file
-  close (IN);
-
-  # display comment blocks
-  foreach my $block (@comments) {
-    if (($block) = ($block =~ /$pattern(.*)/s)) {
-      ($_ = $format) =~ s/%/$block/gs;
-      print "$_\n";
-    }
-  }
-}
diff --git a/hexdump.c b/hexdump.c
index 0281444..318371b 100644
--- a/hexdump.c
+++ b/hexdump.c
@@ -83,17 +83,15 @@ unsigned int getnbdigits (unsigned long int l) {
 /* print a line */
 
 void printline (char *buffer, int nb, unsigned long int addr) {
-    int i;
-
     printf ("0x%0*lx:", nbdigits, addr);
-    for (i = 0; i < nb; i++) {
+    for (int i = 0; i < nb; i++) {
         printf (" %02x", (unsigned char)buffer[i]);
     }
-    for (i = nb; i < nbcols; i++) {
+    for (int i = nb; i < nbcols; i++) {
         printf ("   ");
     }
     printf ("  ");
-    for (i = 0; i < nb; i++) {
+    for (int i = 0; i < nb; i++) {
         char c = buffer[i];
         printf ("%c", (c > 31) && (c < 127) ? c : '.');
     }
@@ -221,7 +219,7 @@ int hexdump (int len) {
     char *pt = buffer;
 
     int nb = 0;
-    while (!feof (fin)) {
+    while ((fin) && (!feof (fin))) {
         int nbtoread = BUFFERSIZE - (pt - buffer);
         if ((len > 0) && (nbtoread > len)) {
             nbtoread = len;
@@ -526,13 +524,10 @@ int main (int argc, char *argv[])
     }
 
     /* check input */
-    fin = stdin;
-    if (input) {
-        fin = fopen (input, "rb");
-        if (!fin) {
-            VERBOSE (ERROR, fprintf (stderr, "error: can't open file '%s'\n", input));
-            return 1;
-        }
+    fin = (input) ? fopen (input, "rb") : stdin;
+    if (!fin) {
+        VERBOSE (ERROR, fprintf (stderr, "error: can't open file '%s'\n", input));
+        return 1;
     }
 
     /* check output */
@@ -550,7 +545,15 @@ int main (int argc, char *argv[])
     /* get file size */
     if (fin != stdin) {
         fseek (fin, 0 , SEEK_END);
-        unsigned long int filesize = ftell (fin);
+        long int filesize = ftell (fin);
+        if (filesize == -1) {
+            VERBOSE (ERROR, fprintf (stderr, "error: can't read file '%s'\n", input));
+            fclose (fin);
+            if (fout) {
+                fclose (fout);
+            }
+            return 1;
+        }
         fseek (fin, 0 , SEEK_SET);
         nbdigits = getnbdigits (filesize);
     }
@@ -659,7 +662,9 @@ int main (int argc, char *argv[])
                         break;
 
                     case 'd':
-                        fseek (fin, length, SEEK_CUR);
+                        if (fin) {
+                            fseek (fin, length, SEEK_CUR);
+                        }
                         break;
 
                     case 'p':
@@ -676,7 +681,7 @@ int main (int argc, char *argv[])
                     if (rc == 0) {
                         rc = searchseq (&seq);
                         if (rc == 0) {
-                            fseek (fin, offset, SEEK_CUR);
+                            if (fin) fseek (fin, offset, SEEK_CUR);
                             rc = gethexaseq (&seq, commands, &commands);
                             commands++;
                             if (rc == 0) {
diff --git a/makefile b/makefile
index 069dcba..09ecb8b 100644
--- a/makefile
+++ b/makefile
@@ -2,8 +2,10 @@
 
 CC = gcc
 
-INCLUDES = -I../debug -D__MEMORY_ALLOCATION__
+#INCLUDES = -I../debug -D__MEMORY_ALLOCATION__
+INCLUDES =
 OFLAGS  = -O4 -Os
+#OFLAGS  = -O0
 #OFLAGS  = -O4 -ffast-math -finline-functions
 #OFLAGS  = -O4 -finline-functions
 #OFLAGS += -mtune=pentium3 -mmmx -msse -msse2 -m3dnow
@@ -12,16 +14,30 @@ OFLAGS  = -O4 -Os
 CFLAGS += -W -Wall -Wextra -g
 #CFLAGS += -std=c99 -D_XOPEN_SOURCE=500
 CFLAGS += $(OFLAGS) $(INCLUDES) $(OPTIONS)
-LDFLAGS += -g $(OPTIONS)
-
-ifeq ($(OS),Windows_NT)
+LDFLAGS += -g $(LDOPTS) $(OPTIONS)
+
+LDOPT = linker
+MV = mv
+ifneq (, $(findstring linux, $(MAKE_HOST)))
+# Linux
+else ifneq (, $(findstring mingw, $(MAKE_HOST)))
+# Windows MinGw
+CFLAGS += -DWIN32
 #LDLIBS += -lws2_32
+LDOPT = winlnk
+else ifneq (, $(findstring cygwin, $(MAKE_HOST)))
+CFLAGS += -DWIN32
+# Windows CygWin
+LDOPT = winlnk
+else ifneq (, $(findstring msdos, $(MAKE_HOST)))
+# MSDOS
+LDOPT = doslnk
+MV = move
 endif
 
 # Targets
 
-ALLEXE  =
-ALLEXE += hexdump
+ALLEXE  = $(shell for f in *.c; do grep -q '/\*\slinker:' $$f && echo $${f/.c}; done)
 
 SHELL = bash
 
@@ -42,18 +58,26 @@ INSTALL = test -d `dirname $(2)` || $(call MKDIR, `dirname $(2)`) && cp -pa $(1)
 
 VALID = $(call TITLE, $(1)) && $(2) && $(call PASS, SUCCESS) || { $(call FAIL, FAILED); test; }
 
+GETCOMMENTS = awk '/\/\*\s*$(1):/,/\*\// { sub(/.*\/\*\s*$(1):/, ""); sub (/\s*\*\/.*/, ""); print } /\/\/\s*$(1):/ {sub (/.*\/\/\s*$(1):/, ""); print }' $(2)
+#GETCOMMENTS = perl -- getcomments.pl -p='$(1):\s' -f='%' $(2)
+
 ## Generic rules
 
 all: depends
 	$(MAKE) $(ALLEXE:%=%.exe)
 
+analyze:
+	make purge
+	scan-build make
+	#scan-build -stats make
+
 count:
 	wc $(wildcard *.c *.h) $(MAKEFILE_LIST)
 
 clean:
 	$(call TITLE, "Cleaning")
 	touch clean
-	rm -f clean $(wildcard *.d *.ld *.log *.o *.test *~ .exec_* gmon.out)
+	rm -f clean $(wildcard *.d *.ld *.log *.o *.test *~ .exec_* gmon.out _)
 	$(call PASS, SUCCESS)
 
 depends: $(patsubst %.c, %.d, $(wildcard *.c)) $(patsubst %, %.ld, $(ALLEXE))
@@ -70,7 +94,8 @@ purge: clean
 	rm -f purge $(ALLEXE:%=%.exe)
 	$(call PASS, SUCCESS)
 
-valgrinds: all
+valgrinds:
+	$(MAKE) all
 	$(MAKE) $(addprefix valgrind_,$(ALLEXE))
 
 wipe: purge
@@ -79,7 +104,9 @@ wipe: purge
 	rm -f wipe $(wildcard *.gcda *.gcno *.gcov *.glog)
 	$(call PASS, SUCCESS)
 
-tests: all
+tests:
+	-rm -f $(ALLEXE)
+	$(MAKE) all
 	$(MAKE) $(addprefix test_,$(ALLEXE))
 
 ## Main rules
@@ -89,13 +116,14 @@ include $(wildcard *.ld)
 
 gcov_%:
 	$(MAKE) purge
-	OPTIONS="-coverage -O0" $(MAKE)
+	$(MAKE) depends
+	OPTIONS="-coverage -O0" $(MAKE) ${@:gcov_%=%}.exe
 	$(MAKE) test_$(@:gcov_%=%)
 	gcov `sed -e 's/\.exe:/.c/;s/\.o/.c/g' $(@:gcov_%=%.ld)`
 	touch gcov
 	rm -f gcov $(wildcard *.gcda *.gcno)
 	$(MAKE) purge
-	grep '#####' *.c.gcov || true
+	grep '^ *#####' *.c.gcov || true
 
 gprof_%:
 	$(MAKE) purge
@@ -118,9 +146,9 @@ gprof_%:
 
 %.test: %.c
 	$(call TITLE, "Building $@")
-#	awk '/\/\* *test:.*\*\// { sub(/^.*\/\* *test: */, ""); sub(/ *\*\/.*$$/, ""); print }' $< > $@
-	perl -- getcomments.pl -p='test:\s' -f='%' $< > $@
+	$(call GETCOMMENTS,test, $<) > $@
 	$(call PASS, SUCCESS)
+	-rm -f _
 
 test_%: %.test %.exe
 	IFS=$$'\n'; RC=0; \
@@ -129,6 +157,7 @@ test_%: %.test %.exe
 	  eval $$test; \
 	  [ $$? -eq 0 ] && echo -e "\033[1;32mSUCCESS\033[0;0m" \
 	                || { echo -e "\033[1;31mFAILED\033[0;0m"; RC=1; }; \
+	  test "$$RC" = 1 -a "$(STOP)" = 1 && break; \
 	done; \
 	test "$$RC" -ne 1
 
@@ -140,29 +169,29 @@ valgrind_%: %.exe
 %.d: %.c
 	$(call TITLE, "Building $@")
 	$(CC) $(INCLUDES) -MM $< -o $@~
-	echo ${<:.c=.o}: $(shell perl -- getcomments.pl -p='depend:\s' -f='%' $<) >> $@~
-	mv $@~ $@
+	echo ${<:.c=.o}: $(shell $(call GETCOMMENTS,depends, $<)) >> $@~
+	$(MV) $@~ $@
 	$(call PASS, SUCCESS)
 
 %.ld: %.c
 	$(call TITLE, "Building $@")
-	echo ${<:.c=.exe}: $(shell perl -- getcomments.pl -p='linker:\s' -f='%' $< | awk '{for (i=1;i<=NF;i++) if ($$(i) ~ /.o$$/) printf " %s", $$(i)}') > $@
+	echo ${<:.c=.exe}: $(shell $(call GETCOMMENTS,$(LDOPT), $<) | awk '{for (i=1;i<=NF;i++) if ($$(i) ~ /.o$$/) printf " %s", $$(i)}') > $@
 	$(call PASS, SUCCESS)
 
 %.o: %.c
 	$(call TITLE, "Building $@")
-	$(CC) $(CFLAGS) $(INCLUDES) $(shell perl -- getcomments.pl -p='cflags:\s' -f='%' $<) -c $< -o $@
+	$(CC) $(CFLAGS) $(INCLUDES) $(shell $(call GETCOMMENTS,cflags, $<)) -c $< -o $@
 	$(call PASS, SUCCESS)
 
 
 %.exe: %.o %.d
 	$(call TITLE, "Building $@")
-	$(CC) $(LDFLAGS) $< $(shell perl -- getcomments.pl -p='linker:\s' -f='%' ${<:.o=.c}) $(LDLIBS) -o $@
+	$(CC) $(LDFLAGS) $< $(shell $(call GETCOMMENTS,$(LDOPT), ${<:.o=.c})) $(LDLIBS) -o $@
 	$(call PASS, SUCCESS)
 
 ## Phony
 
-.PHONY: all clean count depends gcovs purge tests
+.PHONY: all analyze clean count depends gcovs purge tests
 
 ## Precious