diff options
| author | peter <peter@FreeBSD.org> | 2002-09-02 05:50:28 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 2002-09-02 05:50:28 +0000 |
| commit | cf46dfb750863d760d19b9858b0a336b158275da (patch) | |
| tree | 8440832ece5130fad994f5f3489b01676ab1ca4a /contrib/cvs/src/patch.c | |
| parent | 92c0df1bed708821e09e92931a5309cd3abd82fb (diff) | |
| download | FreeBSD-src-cf46dfb750863d760d19b9858b0a336b158275da.zip FreeBSD-src-cf46dfb750863d760d19b9858b0a336b158275da.tar.gz | |
Import cvs-1.11.2 onto vendor branch
Obtained from: http://www.cvshome.org/
Diffstat (limited to 'contrib/cvs/src/patch.c')
| -rw-r--r-- | contrib/cvs/src/patch.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/contrib/cvs/src/patch.c b/contrib/cvs/src/patch.c index 5a20877..8852f3d 100644 --- a/contrib/cvs/src/patch.c +++ b/contrib/cvs/src/patch.c @@ -28,7 +28,6 @@ static int patch_proc PROTO((int argc, char **argv, char *xwhere, static int force_tag_match = 1; static int patch_short = 0; static int toptwo_diffs = 0; -static int local = 0; static char *options = NULL; static char *rev1 = NULL; static int rev1_validated = 0; @@ -65,6 +64,7 @@ patch (argc, argv) char **argv; { register int i; + int local = 0; int c; int err = 0; DBM *db; @@ -343,19 +343,19 @@ patch_proc (argc, argv, xwhere, mwhere, mfile, shorten, local_specified, if (rev1 != NULL && !rev1_validated) { - tag_check_valid (rev1, argc - 1, argv + 1, local, 0, NULL); + tag_check_valid (rev1, argc - 1, argv + 1, local_specified, 0, NULL); rev1_validated = 1; } if (rev2 != NULL && !rev2_validated) { - tag_check_valid (rev2, argc - 1, argv + 1, local, 0, NULL); + tag_check_valid (rev2, argc - 1, argv + 1, local_specified, 0, NULL); rev2_validated = 1; } /* start the recursion processor */ err = start_recursion (patch_fileproc, (FILESDONEPROC) NULL, patch_dirproc, (DIRLEAVEPROC) NULL, NULL, - argc - 1, argv + 1, local, + argc - 1, argv + 1, local_specified, which, 0, 1, where, 1); free (where); @@ -432,7 +432,7 @@ patch_fileproc (callerdat, finfo) if (!date1) date1 = xmalloc (MAXDATELEN); *date1 = '\0'; - if (RCS_getrevtime (rcsfile, vers_head, date1, 1) == -1) + if (RCS_getrevtime (rcsfile, vers_head, date1, 1) == (time_t)-1) { if (!really_quiet) error (0, 0, "cannot find date in rcs file %s revision %s", |
