diff options
| author |   joris <joris@openbsd.org> | 2006-05-31 22:24:12 +0000 |
|---|---|---|
| committer | joris <joris@openbsd.org> | 2006-05-31 22:24:12 +0000 |
| commit | 261cb0dab3ac3e0a8f4de08c5fd8617f9753dde9 (patch) | |
| tree | 2602b274a7a2a332133d4e4373631c6477be2fd7 /usr.bin/cvs/diff.c | |
| parent | byteswap the ioc_status field so we can respond to scsi things properly on (diff) | |
| download | wireguard-openbsd-261cb0dab3ac3e0a8f4de08c5fd8617f9753dde9.tar.xz wireguard-openbsd-261cb0dab3ac3e0a8f4de08c5fd8617f9753dde9.zip | |
support -p flag for diff, makes dlg@ feel all warm
and fuzzie inside.
Diffstat (limited to 'usr.bin/cvs/diff.c')
| -rw-r--r-- | usr.bin/cvs/diff.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/usr.bin/cvs/diff.c b/usr.bin/cvs/diff.c index b3bfa5e67c8..30683f2f7dd 100644 --- a/usr.bin/cvs/diff.c +++ b/usr.bin/cvs/diff.c @@ -1,4 +1,4 @@ -/* $OpenBSD: diff.c,v 1.100 2006/05/31 07:21:25 joris Exp $ */ +/* $OpenBSD: diff.c,v 1.101 2006/05/31 22:24:12 joris Exp $ */ /* * Copyright (c) 2006 Joris Vink <joris@openbsd.org> * @@ -68,6 +68,10 @@ cvs_diff(int argc, char **argv) strlcat(diffargs, " -N", sizeof(diffargs)); Nflag = 1; break; + case 'p': + strlcat(diffargs, " -p", sizeof(diffargs)); + diff_pflag = 1; + break; case 'r': if (rev1 == NULL) { rev1 = optarg; @@ -253,5 +257,10 @@ cvs_diff_local(struct cvs_file *cf) cvs_diffreg(p1, p2, NULL); cvs_worklist_run(&temp_files, cvs_worklist_unlink); + if (diff_rev1 != NULL && diff_rev1 != cf->file_ent->ce_rev) + rcsnum_free(diff_rev1); + if (diff_rev2 != NULL && diff_rev2 != cf->file_rcsrev) + rcsnum_free(diff_rev2); + diff_rev1 = diff_rev2 = NULL; } |