diff options
| author | Joris Vink <joris@cvs.openbsd.org> | 2005-10-11 14:27:28 +0000 |
|---|---|---|
| committer | Joris Vink <joris@cvs.openbsd.org> | 2005-10-11 14:27:28 +0000 |
| commit | 84e663e1f454a9c082c3032e00d80c28b44bfc3d (patch) | |
| tree | a2524fcfa7154facb1e840bd2fccb8637837bc80 /usr.bin | |
| parent | 67a82ff39fac571f096cb13576719e3b4df40d56 (diff) | |
export diff_file variable so it can be set from without diff functions;
ok niallo@
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/cvs/diff.c | 4 | ||||
| -rw-r--r-- | usr.bin/cvs/diff.h | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/usr.bin/cvs/diff.c b/usr.bin/cvs/diff.c index 1b0edf0ee1a..a2eff2b513f 100644 --- a/usr.bin/cvs/diff.c +++ b/usr.bin/cvs/diff.c @@ -1,4 +1,4 @@ -/* $OpenBSD: diff.c,v 1.60 2005/10/08 20:39:49 joris Exp $ */ +/* $OpenBSD: diff.c,v 1.61 2005/10/11 14:27:27 joris Exp $ */ /* * Copyright (C) Caldera International Inc. 2001-2002. * All rights reserved. @@ -221,9 +221,9 @@ static char diffargs[128]; static int aflag, bflag, dflag, iflag, pflag, tflag, Tflag, wflag; static int context; int diff_format = D_NORMAL; +char *diff_file = NULL; static struct stat stb1, stb2; static char *ifdefname, *ignore_pats; -static const char *diff_file; regex_t ignore_re; static int *J; /* will be overlaid on class */ diff --git a/usr.bin/cvs/diff.h b/usr.bin/cvs/diff.h index 4400dae9e61..41fc542a2ca 100644 --- a/usr.bin/cvs/diff.h +++ b/usr.bin/cvs/diff.h @@ -1,4 +1,4 @@ -/* $OpenBSD: diff.h,v 1.2 2005/10/07 23:59:56 niallo Exp $ */ +/* $OpenBSD: diff.h,v 1.3 2005/10/11 14:27:27 joris Exp $ */ /* * Copyright (C) Caldera International Inc. 2001-2002. * All rights reserved. @@ -96,4 +96,5 @@ int cvs_diffreg(const char *, const char *, BUF *out); extern int diff_format; +extern char *diff_file; #endif |