Eliminating the getopt disgrace.
This commit is contained in:
53
cmp.c
53
cmp.c
@@ -7,51 +7,60 @@
|
||||
|
||||
enum { Same = 0, Diff = 1, Error = 2 };
|
||||
|
||||
static void
|
||||
usage(void)
|
||||
{
|
||||
enprintf(Error, "usage: %s [-ls] file1 file2\n", argv0);
|
||||
exit(1);
|
||||
}
|
||||
|
||||
int
|
||||
main(int argc, char *argv[])
|
||||
{
|
||||
bool lflag = false;
|
||||
bool sflag = false;
|
||||
bool same = true;
|
||||
char c;
|
||||
int b[2], i;
|
||||
long line = 1, n = 1;
|
||||
FILE *fp[2];
|
||||
|
||||
if((c = getopt(argc, argv, "ls")) != -1)
|
||||
switch(c) {
|
||||
case 'l':
|
||||
lflag = true;
|
||||
break;
|
||||
case 's':
|
||||
sflag = true;
|
||||
break;
|
||||
default:
|
||||
exit(Error);
|
||||
}
|
||||
if(optind != argc-2)
|
||||
enprintf(Error, "usage: %s [-ls] file1 file2\n", argv[0]);
|
||||
for(i = 0; i < 2; i++)
|
||||
if(!(fp[i] = fopen(argv[optind+i], "r")))
|
||||
enprintf(Error, "fopen %s:", argv[optind+i]);
|
||||
for(n = 1; ((b[0] = getc(fp[0])) != EOF) | ((b[1] = getc(fp[1])) != EOF); n++) {
|
||||
ARGBEGIN {
|
||||
case 'l':
|
||||
lflag = true;
|
||||
break;
|
||||
case 's':
|
||||
sflag = true;
|
||||
break;
|
||||
default:
|
||||
usage();
|
||||
} ARGEND;
|
||||
|
||||
if(argc < 2)
|
||||
usage();
|
||||
|
||||
for(i = 0; i < 2; i++) {
|
||||
if(!(fp[i] = fopen(argv[i], "r")))
|
||||
enprintf(Error, "fopen %s:", argv[i]);
|
||||
}
|
||||
for(n = 1; ((b[0] = getc(fp[0])) != EOF) \
|
||||
| ((b[1] = getc(fp[1])) != EOF); n++) {
|
||||
if(b[0] == '\n')
|
||||
line++;
|
||||
if(b[0] == b[1])
|
||||
continue;
|
||||
for(i = 0; i < 2; i++)
|
||||
if(b[i] == EOF)
|
||||
enprintf(Diff, "cmp: EOF on %s\n", argv[optind+i]);
|
||||
enprintf(Diff, "cmp: EOF on %s\n", argv[i]);
|
||||
if(!lflag) {
|
||||
if(!sflag)
|
||||
printf("%s %s differ: char %ld, line %ld\n",
|
||||
argv[optind], argv[optind+1], n, line);
|
||||
argv[0], argv[1], n, line);
|
||||
exit(Diff);
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
printf("%4ld %3o %3o\n", n, b[0], b[1]);
|
||||
same = false;
|
||||
}
|
||||
}
|
||||
return same ? Same : Diff;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user