diff options
| author |   tobias <tobias@openbsd.org> | 2008-02-09 12:27:31 +0000 |
|---|---|---|
| committer | tobias <tobias@openbsd.org> | 2008-02-09 12:27:31 +0000 |
| commit | bc6ad1fb3d6d0dbae09eeabb8e135ee03fb0bb47 (patch) | |
| tree | 71fe601ccb4e01f8a095edcba3e6ed276e5a2806 /usr.bin/cvs/diff.c | |
| parent | Get in proper support for checkout/update -A when it comes to keyword (diff) | |
| download | wireguard-openbsd-bc6ad1fb3d6d0dbae09eeabb8e135ee03fb0bb47.tar.xz wireguard-openbsd-bc6ad1fb3d6d0dbae09eeabb8e135ee03fb0bb47.zip | |
If run as server, (r)diff should properly write (r)diff into header
instead of "server".
OK joris@
Diffstat (limited to 'usr.bin/cvs/diff.c')
| -rw-r--r-- | usr.bin/cvs/diff.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.bin/cvs/diff.c b/usr.bin/cvs/diff.c index bc476e14066..2e3b196bf10 100644 --- a/usr.bin/cvs/diff.c +++ b/usr.bin/cvs/diff.c @@ -1,4 +1,4 @@ -/* $OpenBSD: diff.c,v 1.127 2008/02/04 21:25:32 tobias Exp $ */ +/* $OpenBSD: diff.c,v 1.128 2008/02/09 12:27:31 tobias Exp $ */ /* * Copyright (c) 2006 Joris Vink <joris@openbsd.org> * @@ -65,7 +65,8 @@ cvs_diff(int argc, char **argv) struct cvs_recursion cr; flags = CR_RECURSE_DIRS; - strlcpy(diffargs, argv[0], sizeof(diffargs)); + strlcpy(diffargs, cvs_cmdop == CVS_OP_DIFF ? "diff" : "rdiff", + sizeof(diffargs)); while ((ch = getopt(argc, argv, cvs_cmdop == CVS_OP_DIFF ? cvs_cmd_diff.cmd_opts : cvs_cmd_rdiff.cmd_opts)) != -1) { |