version 1.42, 2005/10/17 22:04:54 |
version 1.43, 2005/10/17 22:24:18 |
|
|
{ |
{ |
fprintf(stderr, |
fprintf(stderr, |
"usage: ci [-jMNqV] [-d[date]] [-f[rev]] [-kmode] [-l[rev]]\n" |
"usage: ci [-jMNqV] [-d[date]] [-f[rev]] [-kmode] [-l[rev]]\n" |
" [-mmsg] [-nsymbol] [-r[rev]] [-u[rev]] [-wusername]\n" |
" [-mmsg] [-Nsymbol] [-nsymbol] [-r[rev]] [-u[rev]]\n" |
" file ...\n"); |
" [-wusername] file ...\n"); |
} |
} |
|
|
/* |
/* |
|
|
int |
int |
checkin_main(int argc, char **argv) |
checkin_main(int argc, char **argv) |
{ |
{ |
int i, ch, force, lkmode, interactive, rflag, status; |
int i, ch, force, lkmode, interactive, rflag, status, symforce; |
mode_t fmode; |
mode_t fmode; |
time_t date; |
time_t date; |
RCSFILE *file; |
RCSFILE *file; |
|
|
file = NULL; |
file = NULL; |
rcs_msg = username = NULL; |
rcs_msg = username = NULL; |
newrev = NULL; |
newrev = NULL; |
fmode = force = lkmode = verbose = rflag = status = 0; |
fmode = force = lkmode = verbose = rflag = status = symforce = 0; |
interactive = 1; |
interactive = 1; |
|
|
|
|
|
|
case 'm': |
case 'm': |
rcs_msg = rcs_optarg; |
rcs_msg = rcs_optarg; |
interactive = 0; |
interactive = 0; |
cvs_printf("rcs_msg: %s\n", rcs_msg); |
|
break; |
break; |
case 'N': |
case 'N': |
if ((symbol = strdup(rcs_optarg)) == NULL) { |
if ((symbol = strdup(rcs_optarg)) == NULL) { |
|
|
cvs_log(LP_ERR, "invalid symbol `%s'", symbol); |
cvs_log(LP_ERR, "invalid symbol `%s'", symbol); |
exit(1); |
exit(1); |
} |
} |
|
symforce = 1; |
break; |
break; |
case 'n': |
case 'n': |
if ((symbol = strdup(rcs_optarg)) == NULL) { |
if ((symbol = strdup(rcs_optarg)) == NULL) { |
|
|
if (symbol != NULL) { |
if (symbol != NULL) { |
cvs_printf("symbol: %s\n", symbol); |
cvs_printf("symbol: %s\n", symbol); |
int ret = 0; |
int ret = 0; |
|
if (symforce) |
|
rcs_sym_remove(file, symbol); |
if ((ret = rcs_sym_add(file, symbol, newrev) == -1) |
if ((ret = rcs_sym_add(file, symbol, newrev) == -1) |
&& (rcs_errno == RCS_ERR_DUPENT)) { |
&& (rcs_errno == RCS_ERR_DUPENT)) { |
char tmp[16]; |
char tmp[16]; |