=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/diff.c,v retrieving revision 1.100 retrieving revision 1.101 diff -c -r1.100 -r1.101 *** src/usr.bin/cvs/diff.c 2006/05/31 07:21:25 1.100 --- src/usr.bin/cvs/diff.c 2006/05/31 22:24:12 1.101 *************** *** 1,4 **** ! /* $OpenBSD: diff.c,v 1.100 2006/05/31 07:21:25 joris Exp $ */ /* * Copyright (c) 2006 Joris Vink * --- 1,4 ---- ! /* $OpenBSD: diff.c,v 1.101 2006/05/31 22:24:12 joris Exp $ */ /* * Copyright (c) 2006 Joris Vink * *************** *** 68,73 **** --- 68,77 ---- 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; *************** *** 252,257 **** --- 256,266 ---- 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; }