From 6045cae71a438a752980a395f03717a13cc22179 Mon Sep 17 00:00:00 2001 From: peter Date: Thu, 15 Apr 2004 01:01:56 +0000 Subject: Import cvs-1.11.15 --- contrib/cvs/src/annotate.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'contrib/cvs/src/annotate.c') diff --git a/contrib/cvs/src/annotate.c b/contrib/cvs/src/annotate.c index 2e3cb89..8bf330f 100644 --- a/contrib/cvs/src/annotate.c +++ b/contrib/cvs/src/annotate.c @@ -54,7 +54,7 @@ annotate (argc, argv) int err = 0; int c; - is_rannotate = (strcmp(command_name, "rannotate") == 0); + is_rannotate = (strcmp(cvs_cmd_name, "rannotate") == 0); if (argc == -1) usage (annotate_usage); @@ -224,14 +224,12 @@ rannotate_proc (argc, argv, xwhere, mwhere, mfile, shorten, local, mname, msg) free (repository); return (1); } - free (repository); /* End section which is identical to patch_proc. */ if (force_tag_match && tag != NULL) which = W_REPOS | W_ATTIC; else which = W_REPOS; - repository = NULL; } else { @@ -249,7 +247,11 @@ rannotate_proc (argc, argv, xwhere, mwhere, mfile, shorten, local, mname, msg) err = start_recursion (annotate_fileproc, (FILESDONEPROC) NULL, (DIRENTPROC) NULL, (DIRLEAVEPROC) NULL, NULL, argc - 1, argv + 1, local, which, 0, CVS_LOCK_READ, - where, 1); + where, 1, repository); + if ( which & W_REPOS ) + free ( repository ); + if ( where != NULL ) + free (where); return err; } -- cgit v1.1