diff options
| author |   millert <millert@openbsd.org> | 2003-07-04 02:54:36 +0000 |
|---|---|---|
| committer | millert <millert@openbsd.org> | 2003-07-04 02:54:36 +0000 |
| commit | c5b7f86462e55194e79a600d3e99fe008702f530 (patch) | |
| tree | 85d4466eb5428b0be03387606edc6a59a5e1190f /usr.bin/diff/diffreg.c | |
| parent | no more thailand. joel knight via nick@ (diff) | |
| download | wireguard-openbsd-c5b7f86462e55194e79a600d3e99fe008702f530.tar.xz wireguard-openbsd-c5b7f86462e55194e79a600d3e99fe008702f530.zip | |
Some cosmetic fixes:
o get rid of now-unused tempfile variable
o move inifdef into diffreg.c (only used there)
o correct a comment
o use _PATH_DIFF, _PATH_DIFFH and _PATH_PR instead of variables set to them
o get rid of hack to look for pr and diff in /bin
Diffstat (limited to 'usr.bin/diff/diffreg.c')
| -rw-r--r-- | usr.bin/diff/diffreg.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/usr.bin/diff/diffreg.c b/usr.bin/diff/diffreg.c index 5bf38dfe11a..4472ae00aad 100644 --- a/usr.bin/diff/diffreg.c +++ b/usr.bin/diff/diffreg.c @@ -1,4 +1,4 @@ -/* $OpenBSD: diffreg.c,v 1.24 2003/07/02 18:54:13 millert Exp $ */ +/* $OpenBSD: diffreg.c,v 1.25 2003/07/04 02:54:36 millert Exp $ */ /* * Copyright (C) Caldera International Inc. 2001-2002. @@ -134,6 +134,7 @@ int len[2]; struct line *sfile[2]; /* shortened by pruning common prefix and suffix */ int slen[2]; int pref, suff; /* length of prefix and suffix */ +int inifdef; /* whether or not we are in a #ifdef block */ int *class; /* will be overlaid on file[0] */ int *member; /* will be overlaid on file[1] */ int *klist; /* will be overlaid on file[0] after class */ @@ -231,8 +232,8 @@ diffreg(void) if (hflag) { diffargv[0] = "diffh"; - execv(diffh, diffargv); - error("%s", diffh); + execv(_PATH_DIFFH, diffargv); + error("%s", _PATH_DIFFH); } chrtran = (iflag ? cup2low : clow2low); if (strcmp(file1, "-") == 0 && strcmp(file2, "-") == 0) |