diff options
Diffstat (limited to 'contrib/cvs/src/checkin.c')
| -rw-r--r-- | contrib/cvs/src/checkin.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/contrib/cvs/src/checkin.c b/contrib/cvs/src/checkin.c index 938b71742d2d..06d431ff0b89 100644 --- a/contrib/cvs/src/checkin.c +++ b/contrib/cvs/src/checkin.c @@ -1,6 +1,11 @@ /* - * Copyright (c) 1992, Brian Berliner and Jeff Polk - * Copyright (c) 1989-1992, Brian Berliner + * Copyright (C) 1986-2005 The Free Software Foundation, Inc. + * + * Portions Copyright (C) 1998-2005 Derek Price, Ximbiot <http://ximbiot.com>, + * and others. + * + * Portions Copyright (C) 1992, Brian Berliner and Jeff Polk + * Portions Copyright (C) 1989-1992, Brian Berliner * * You may distribute under the terms of the GNU General Public License as * specified in the README file that comes with the CVS source distribution. @@ -60,7 +65,7 @@ Checkin (type, finfo, rev, tag, options, message) */ assert (finfo->rcs != NULL); - switch (RCS_checkin (finfo->rcs, finfo->file, message, rev, + switch (RCS_checkin (finfo->rcs, finfo->file, message, rev, 0, RCS_FLAGS_KEEPFILE)) { case 0: /* everything normal */ @@ -74,7 +79,8 @@ Checkin (type, finfo, rev, tag, options, message) changes is if the file contains RCS keywords. So we if we are not expanding RCS keywords, we are done. */ - if (strcmp (options, "-V4") == 0) /* upgrade to V5 now */ + if (options != NULL + && strcmp (options, "-V4") == 0) /* upgrade to V5 now */ options[0] = '\0'; /* FIXME: If PreservePermissions is on, RCS_cmp_file is |