cat.c32: move from samples to modules; remove debug code

Move cat.c32 from samples to modules, and remove debugging messages.
Real users may want to use this.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>

diff --git a/com32/modules/Makefile b/com32/modules/Makefile
index 44bc1df..56f4402 100644 (file)
--- a/com32/modules/Makefile
+++ b/com32/modules/Makefile
@@ -22,7 +22,7 @@ MODULES         = chain.c32 config.c32 ethersel.c32 dmitest.c32 cpuidtest.c32 \
            disk.c32 pcitest.c32 elf.c32 linux.c32 reboot.c32 pmload.c32 \
            meminfo.c32 sdi.c32 sanboot.c32 ifcpu64.c32 vesainfo.c32 \
            kbdmap.c32 cmd.c32 vpdtest.c32 gpxecmd.c32 ifcpu.c32 \
-           cpuid.c32
+           cpuid.c32 cat.c32
 
 TESTFILES =
 

diff --git a/com32/samples/cat.c b/com32/modules/cat.c
similarity index 64%
rename from com32/samples/cat.c
rename to com32/modules/cat.c
index 3930f74..8df4767 100644 (file)
--- a/com32/samples/cat.c
+++ b/com32/modules/cat.c
@@ -10,20 +10,14 @@ int main(int argc, char *argv[])
 
     openconsole(&dev_stdcon_r, &dev_stdcon_w);
 
-    printf("argv = %p\n", argv);
-    for (i = 0; i <= argc; i++)
-       printf("argv[%d] = %p = \"%s\"\n", i, argv[i], argv[i]);
-
     if (argc < 2) {
        fprintf(stderr, "Usage: cat.c32 filename\n");
        return 1;
     }
 
-    printf("File = %s\n", argv[1]);
-
     f = fopen(argv[1], "r");
     if (!f) {
-       fprintf(stderr, "File name \"%s\" does not exist.\n", argv[1]);
+       fprintf(stderr, "File \"%s\" does not exist.\n", argv[1]);
        return 1;
     }
 

diff --git a/com32/samples/Makefile b/com32/samples/Makefile
index 482769e..bee2b99 100644 (file)
--- a/com32/samples/Makefile
+++ b/com32/samples/Makefile
@@ -17,7 +17,7 @@
 topdir = ../..
 include ../MCONFIG
 
-all:   hello.c32 cat.c32 resolv.c32 serialinfo.c32 \
+all:   hello.c32 resolv.c32 serialinfo.c32 \
        localboot.c32 \
        fancyhello.c32 fancyhello.lnx \
        keytest.c32 keytest.lnx \