From c5b7f86462e55194e79a600d3e99fe008702f530 Mon Sep 17 00:00:00 2001 From: millert Date: Fri, 4 Jul 2003 02:54:36 +0000 Subject: 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 --- usr.bin/diff/diff.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'usr.bin/diff/diff.c') diff --git a/usr.bin/diff/diff.c b/usr.bin/diff/diff.c index 4abc8821cbb..1c5998fab0c 100644 --- a/usr.bin/diff/diff.c +++ b/usr.bin/diff/diff.c @@ -1,4 +1,4 @@ -/* $OpenBSD: diff.c,v 1.18 2003/06/27 17:08:45 david Exp $ */ +/* $OpenBSD: diff.c,v 1.19 2003/07/04 02:54:36 millert Exp $ */ /* * Copyright (C) Caldera International Inc. 2001-2002. @@ -63,31 +63,25 @@ int lflag; /* long output format with header */ int rflag; /* recursively trace directories */ int sflag; /* announce files which are same */ char *start; /* do file only if name >= this */ -/* Variables for -D D_IFDEF option. */ +/* Variable for -D D_IFDEF option. */ char *ifdefname; /* What we will print for #ifdef/#endif */ -int inifdef; /* Variables for -c and -u context option. */ int context; /* lines of context to be printed */ /* State for exit status. */ int status; int anychange; -char *tempfile; /* used when comparing against std input */ /* Variables for diffdir. */ char **diffargv; /* option list to pass to recursive diffs */ /* * Input file names. - * With diffdir, file1 and file2 are allocated BUFSIZ space, - * and padded with a '/', and then efile0 and efile1 point after + * With diffdir, file1 and file2 are allocated MAXPATHLEN space, + * and padded with a '/', and then efile1 and efile2 point after * the '/'. */ char *file1, *file2, *efile1, *efile2; struct stat stb1, stb2; -const char *diff = _PATH_DIFF; -const char *diffh = _PATH_DIFFH; -const char *pr = _PATH_PR; - __dead void usage(void); int -- cgit v1.2.3-59-g8ed1b