Zoulos: add varargs, add HP indirection, etc.

diff --git a/src/print.c b/src/print.c
index ab8a26234fb7aaad035ed602bdc924061d0c7a7f..205b9bee0ca1606e160679b42c4da1946ac834b8 100644 (file)
--- a/src/print.c
+++ b/src/print.c
@@ -26,79 +26,105 @@
  */
 
 #include <stdio.h>
-#include <stdlib.h>
 #include <errno.h>
+#include <string.h>
+#if __STDC__
+# include <stdarg.h>
+#else
+# include <varargs.h>
+#endif
+#include <stdlib.h>
+#include <unistd.h>
 #include "file.h"
 
-#ifndef        lint
-static char *moduleid = 
-       "@(#)$Header: /home/glen/git/file/cvs/file/src/print.c,v 1.12 1992/05/22 17:52:34 ian Exp $";
-#endif /* lint */
-
-#define MAXSTR         500
-
-extern char *progname;
-extern char *magicfile;
-extern int debug, nmagic;      /* number of valid magic[]s */
-extern void showstr();
+#ifndef lint
+static char *moduleid =
+       "@(#)$Header: /home/glen/git/file/cvs/file/src/print.c,v 1.13 1992/09/08 14:59:31 ian Exp $";
+#endif  /* lint */
 
 void
 mdump(m)
 struct magic *m;
 {
-       (void) printf("%d\t%d\t%d\t%s%c\t",
-               m->contflag,
+       static char *offs[] = {  "absolute", "offset", 
+                                "indirect", "indirect-offset" };
+       static char *typ[] = {   "invalid", "byte", "short", "invalid",
+                                "long", "string", "date" };
+       (void) fprintf(stderr, "[%s,%d,%s,%s%c,",
+               (m->flag >= 0 && m->flag < 4 ? offs[m->flag]: "*bad*"),
                m->offset,
-               m->type,
+               (m->type >= 0 && m->type < 7 ? 
+                               typ[(unsigned char) m->type] : "*bad*"),
                m->reln & MASK ? "&" : "",
-               m->reln & ~MASK,
-               0);
-       if (m->reln & MASK)
-               (void) printf("%d",m->mask);
-       (void) putchar('\t');
+               m->reln & ~MASK);
+       if (m->flag & INDIR)
+           (void) fprintf(stderr, "(%s,%d)",
+               (m->in.type >= 0 && 
+               m->in.type < 6 ? typ[(unsigned char) m->in.type] : "*bad*"),
+               m->in.offset);
+
        if (m->type == STRING)
                showstr(m->value.s);
        else
-               (void) printf("%d",m->value.l);
-       (void) printf("\t%s", m->desc);
-       (void) putchar('\n');
+               (void) fprintf(stderr, "%d",m->value.l);
+       (void) fprintf(stderr, ",%s", m->desc);
+       (void) fputs("]\n", stderr);
 }
 
 /*
  * error - print best error message possible and exit
  */
-/*ARGSUSED1*/
 /*VARARGS*/
 void
-error(s1, s2)
-char *s1, *s2;
+#if __STDC__
+error(const char *f, ...)
+#else
+error(va_alist)
+       va_dcl
+#endif
 {
-       warning(s1, s2);
+       va_list va;
+#if __STDC__
+       va_start(va, f);
+#else
+       const char *f;
+       va_start(va);
+       f = va_arg(va, const char *);
+#endif
+       /* cuz we use stdout for most, stderr here */
+       (void) fflush(stdout); 
+
+       if (progname != NULL) 
+               (void) fprintf(stderr, "%s: ", progname);
+       (void) vfprintf(stderr, f, va);
+       va_end(va);
        exit(1);
 }
 
-/*ARGSUSED1*/
 /*VARARGS*/
 void
-warning(f, a)
-char *f, *a;
+#if __STDC__
+magwarn(const char *f, ...)
+#else
+magwarn(va_alist)
+       va_dcl
+#endif
 {
-       extern int errno, sys_nerr;
-       extern char *sys_errlist[];
-       int myerrno;
-
-       myerrno = errno;
-
+       va_list va;
+#if __STDC__
+       va_start(va, f);
+#else
+       const char *f;
+       va_start(va);
+       f = va_arg(va, const char *);
+#endif
        /* cuz we use stdout for most, stderr here */
        (void) fflush(stdout); 
 
-       if (progname != NULL) {
-               (void) fputs(progname, stderr);
-               (void) putc(':', stderr);
-               (void) putc(' ', stderr);
-       }
-       (void) fprintf(stderr, f, a);
-       if (myerrno > 0 && myerrno < sys_nerr)
-               (void) fprintf(stderr, " (%s)", sys_errlist[myerrno]);
-       putc('\n', stderr);
+       if (progname != NULL) 
+               (void) fprintf(stderr, "%s: %s, %d: ", 
+                              progname, magicfile, lineno);
+       (void) vfprintf(stderr, f, va);
+       va_end(va);
+       fputc('\n', stderr);
 }