Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

misc cleanup.

Browse Source 
converted to use err() and warn().
This commit is contained in:
jtc 1994-12-20 15:54:03 +00:00
parent 6b300e59b8
commit b0101ccb47
1 changed files with 13 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
usr.bin/unvis/unvis.c
View File

@ -41,30 +41,29 @@ static char copyright[] =
#if 0 #if 0
static char sccsid[] = "@(#)unvis.c 8.1 (Berkeley) 6/6/93"; static char sccsid[] = "@(#)unvis.c 8.1 (Berkeley) 6/6/93";
#endif #endif
static char rcsid[] = "$Id: unvis.c,v 1.3 1994/12/06 07:36:10 jtc Exp $"; static char rcsid[] = "$Id: unvis.c,v 1.4 1994/12/20 15:54:03 jtc Exp $";
#endif /* not lint */ #endif /* not lint */
#include <stdio.h> #include <stdio.h>
#include <stdlib.h>
#include <err.h>
#include <vis.h> #include <vis.h>
char *Program; void process __P((FILE *fp, const char *filename));
#define usage() fprintf(stderr, "usage: %s %s\n", Program, USAGE)
#define USAGE "[file...]"
int
main(argc, argv) main(argc, argv)
int argc;
char *argv[]; char *argv[];
{ {
FILE *fp; FILE *fp;
extern char *optarg;
extern int optind;
int ch; int ch;
Program = argv[0];
while ((ch = getopt(argc, argv, "")) != EOF) while ((ch = getopt(argc, argv, "")) != EOF)
switch((char)ch) { switch((char)ch) {
case '?': case '?':
default: default:
usage(); (void) fprintf(stderr, "usage: unvis [file...]\n");
exit(1); exit(1);
} }
argc -= optind; argc -= optind;
@ -75,7 +74,7 @@ main(argc, argv)
if ((fp=fopen(*argv, "r")) != NULL) if ((fp=fopen(*argv, "r")) != NULL)
process(fp, *argv); process(fp, *argv);
else else
syserror("%s", *argv); warn("%s", *argv);
argv++; argv++;
} }
else else
@ -83,9 +82,10 @@ main(argc, argv)
exit(0); exit(0);
} }
void
process(fp, filename) process(fp, filename)
FILE *fp; FILE *fp;
char *filename; const char *filename;
{ {
register int offset = 0, c, ret; register int offset = 0, c, ret;
int state = 0; int state = 0;
@ -102,49 +102,17 @@ process(fp, filename)
putchar(outc); putchar(outc);
goto again; goto again;
case UNVIS_SYNBAD: case UNVIS_SYNBAD:
error("%s: offset: %d: can't decode", filename, offset); warnx("%s: offset: %d: can't decode", filename, offset);
state = 0; state = 0;
break; break;
case 0: case 0:
case UNVIS_NOCHAR: case UNVIS_NOCHAR:
break; break;
default: default:
error("bad return value (%d), can't happen", ret); errx(1, "bad return value (%d), can't happen", ret);
exit(1); /* NOTREACHED */
} }
} }
if (unvis(&outc, (char)0, &state, UNVIS_END) == UNVIS_VALID) if (unvis(&outc, (char)0, &state, UNVIS_END) == UNVIS_VALID)
putchar(outc); putchar(outc);
} }
#include <varargs.h>
error(va_alist)
va_dcl
{
char *fmt;
va_list ap;
extern errno;
fprintf(stderr, "%s: ", Program);
va_start(ap);
fmt = va_arg(ap, char *);
(void) vfprintf(stderr, fmt, ap);
va_end(ap);
fprintf(stderr, "\n");
}
syserror(va_alist)
va_dcl
{
char *fmt;
va_list ap;
extern errno;
fprintf(stderr, "%s: ", Program);
va_start(ap);
fmt = va_arg(ap, char *);
(void) vfprintf(stderr, fmt, ap);
va_end(ap);
fprintf(stderr, ": %s\n", strerror(errno));
}