src/usr.bin/rcs/ci.c - diff

Return to ci.c CVS log

Up to [local] / src / usr.bin / rcs

Diff for /src/usr.bin/rcs/ci.c between version 1.159 and 1.160

version 1.159, 2006/04/25 07:57:10

version 1.160, 2006/04/25 13:36:35

Line 121

if (rcs_optarg == NULL)

pb.date = DATE_MTIME;

else if ((pb.date = cvs_date_parse(rcs_optarg)) <= 0)

fatal("invalid date");

errx(1, "invalid date");

break;

case 'f':

rcs_setrevstr(&rev_str, rcs_optarg);

Line 156

case 'm':

pb.rcs_msg = rcs_optarg;

if (pb.rcs_msg == NULL)

fatal("missing message for -m option");

errx(1, "missing message for -m option");

pb.flags &= ~INTERACTIVE;

break;

case 'N':

Line 167

xfree(pb.symbol);

pb.symbol = xstrdup(rcs_optarg);

if (rcs_sym_check(pb.symbol) != 1)

fatal("invalid symbol `%s'", pb.symbol);

errx(1, "invalid symbol `%s'", pb.symbol);

break;

case 'q':

pb.flags |= QUIET;

Line 179

case 's':

pb.state = rcs_optarg;

if (rcs_state_check(pb.state) < 0)

fatal("invalid state `%s'", pb.state);

errx(1, "invalid state `%s'", pb.state);

break;

case 'T':

pb.flags |= PRESERVETIME;

Line 227

}

if ((pb.username = getlogin()) == NULL)

fatal("getlogin failed");

err(1, "getlogin");

for (i = 0; i < argc; i++) {

pb.filename = argv[i];

if ((workfile_fd = open(pb.filename, O_RDONLY)) == -1)

fatal("%s: %s", pb.filename, strerror(errno));

err(1, "%s", pb.filename);

* Test for existence of ,v file. If we are expected to

Line 277

pb.file = rcs_open(pb.fpath, pb.openflags, pb.fmode);

if (pb.file == NULL)

fatal("failed to open rcsfile '%s'", pb.fpath);

errx(1, "failed to open rcsfile '%s'", pb.fpath);

if (pb.flags & DESCRIPTION)

rcs_set_description(pb.file, pb.description);

Line 289

if (rev_str != NULL)

if ((pb.newrev = rcs_getrevnum(rev_str, pb.file)) ==

NULL)

fatal("invalid revision: %s", rev_str);

errx(1, "invalid revision: %s", rev_str);

if (!(pb.flags & NEWFILE))

pb.flags |= CI_SKIPDESC;

Line 492

t_head = localtime(&head_date);

strftime(dbuf2, sizeof(dbuf2), fmt, t_head);

fatal("%s: Date %s preceeds %s in revision %s.",

errx(1, "%s: Date %s preceeds %s in revision %s.",

pb->file->rf_path, dbuf1, dbuf2,

rcsnum_tostr(pb->frev, numb2, sizeof(numb2)));

}

Line 528

/* Current head revision gets the RCS patch as rd_text */

if (rcs_deltatext_set(pb->file, pb->frev, pb->deltatext) == -1)

fatal("failed to set new rd_text for head rev");

errx(1, "failed to set new rd_text for head rev");

/* Now add our new revision */

if (rcs_rev_add(pb->file,

Line 544

if (pb->newrev != NULL) {

if (rcs_head_set(pb->file, pb->newrev) < 0)

fatal("rcs_head_set failed");

errx(1, "rcs_head_set failed");

} else

pb->newrev = pb->file->rf_head;

/* New head revision has to contain entire file; */

if (rcs_deltatext_set(pb->file, pb->frev, filec) == -1)

fatal("failed to set new head revision");

errx(1, "failed to set new head revision");

/* Attach a symbolic name to this revision if specified. */

if (pb->symbol != NULL &&

Line 563

/* Maintain RCSFILE permissions */

if (fstat(workfile_fd, &st) == -1)

fatal("%s: %s", pb->filename, strerror(errno));

err(1, "%s", pb->filename);

/* Strip all the write bits */

pb->file->rf_mode = st.st_mode &

Line 674

if (pb->newrev != NULL) {

if (rcs_head_set(pb->file, pb->newrev) < 0)

fatal("rcs_head_set failed");

errx(1, "rcs_head_set failed");

} else

pb->newrev = pb->file->rf_head;

Line 695

/* Inherit RCSFILE permissions from file being checked in */

if (fstat(workfile_fd, &st) == -1)

fatal("%s: %s", pb->filename, strerror(errno));

err(1, "%s", pb->filename);

/* Strip all the write bits */

pb->file->rf_mode = st.st_mode &

Line 821

struct stat sb;

if (fstat(workfile_fd, &sb) == -1)

fatal("%s: %s", pb->filename, strerror(errno));

err(1, "%s", pb->filename);

pb->date = (time_t)sb.st_mtimespec.tv_sec;

}

Line 886

if (*c == '$') {

end = c - start + 2;

if (end >= sizeof(buf))

fatal("keyword buffer"

errx(1, "keyword buffer"

" too small!");

strlcpy(buf, start, end);

checkin_parsekeyword(buf, rev,

Line 968

/* only parse revision if one is not already set */

if (*rev == NULL) {

if ((*rev = rcsnum_parse(tokens[2])) == NULL)

fatal("could not parse rcsnum");

errx(1, "could not parse rcsnum");

}

*author = xstrdup(tokens[5]);

*state = xstrdup(tokens[6]);

Line 978

strlcat(datestring, " ", len);

strlcat(datestring, tokens[4], len);

if ((*date = cvs_date_parse(datestring)) <= 0)

fatal("could not parse date\n");

errx(1, "could not parse date");

xfree(datestring);

break;

case KW_TYPE_AUTHOR:

Line 1003

strlcat(datestring, " ", len);

strlcat(datestring, tokens[2], len);

if ((*date = cvs_date_parse(datestring)) <= 0)

fatal("could not parse date\n");

errx(1, "could not parse date");

xfree(datestring);

break;

case KW_TYPE_STATE:

Line 1026

tokens[i++] = p;

}

if ((*rev = rcsnum_parse(tokens[1])) == NULL)

fatal("could not parse rcsnum");

errx(1, "could not parse rcsnum");

break;

}