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/diffdir.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/diffdir.c')
| -rw-r--r-- | usr.bin/diff/diffdir.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/usr.bin/diff/diffdir.c b/usr.bin/diff/diffdir.c index d25d4d48491..a60116444ed 100644 --- a/usr.bin/diff/diffdir.c +++ b/usr.bin/diff/diffdir.c @@ -1,4 +1,4 @@ -/* $OpenBSD: diffdir.c,v 1.15 2003/06/27 20:28:13 tedu Exp $ */ +/* $OpenBSD: diffdir.c,v 1.16 2003/07/04 02:54:36 millert Exp $ */ /* * Copyright (C) Caldera International Inc. 2001-2002. @@ -46,6 +46,7 @@ #include <unistd.h> #include "diff.h" +#include "pathnames.h" #if 0 static const char sccsid[] = "@(#)diffdir.c 4.12 (Berkeley) 4/30/89"; @@ -383,9 +384,8 @@ calldiff(char *wantpr) dup(pv[0]); close(pv[0]); close(pv[1]); - execv(pr + 4, prargs); - execv(pr, prargs); - errorx("%s", pr); + execv(_PATH_PR, prargs); + errorx("%s", _PATH_PR); } } pid = fork(); @@ -398,9 +398,8 @@ calldiff(char *wantpr) close(pv[0]); close(pv[1]); } - execv(diff + 4, diffargv); - execv(diff, diffargv); - error("%s", diff); + execv(_PATH_DIFF, diffargv); + error("%s", _PATH_DIFF); } if (wantpr) { close(pv[0]); |