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.106 and 1.107

version 1.106, 2006/03/05 17:35:24

version 1.107, 2006/03/06 09:41:53

Line 29

#include "rcsprog.h"

#include "diff.h"

#define CI_OPTSTRING "d::f::i::j::k::l::m:M::N:n:qr::s:Tt:u::Vw:x:"

#define DATE_NOW -1

#define DATE_MTIME -2

#define KW_ID "Id"

#define KW_AUTHOR "Author"

#define KW_DATE "Date"

#define KW_STATE "State"

#define KW_REVISION "Revision"

#define KW_TYPE_ID 1

#define KW_TYPE_AUTHOR 2

#define KW_TYPE_DATE 3

#define KW_TYPE_STATE 4

#define KW_TYPE_REVISION 5

#define KW_NUMTOKS_ID 10

#define KW_NUMTOKS_AUTHOR 3

#define KW_NUMTOKS_DATE 4

#define KW_NUMTOKS_STATE 3

#define KW_NUMTOKS_REVISION 3

#define LOG_INIT "Initial revision"

#define KW_TYPE_ID 1

#define LOG_PROMPT "enter log message, terminated with a single '.' " \

#define KW_TYPE_AUTHOR 2

"or end of file:\n>> "

#define KW_TYPE_DATE 3

#define DESC_PROMPT "enter description, terminated with single '.' " \

#define KW_TYPE_STATE 4

"or end of file:\nNOTE: This is NOT the log message!" \

#define KW_TYPE_REVISION 5

"\n>> "

#define KW_NUMTOKS_ID 10

#define KW_NUMTOKS_AUTHOR 3

#define KW_NUMTOKS_DATE 4

#define KW_NUMTOKS_STATE 3

#define KW_NUMTOKS_REVISION 3

extern struct rcs_kw rcs_expkw[];

struct checkin_params {

Line 77

Line 72

static char *checkin_getinput(const char *);

static char *checkin_getlogmsg(RCSNUM *, RCSNUM *);

static int checkin_init(struct checkin_params *);

static int checkin_keywordscan(char *, RCSNUM **, time_t *, char **,

char **);

static int checkin_keywordtype(char *);

static int checkin_mtimedate(struct checkin_params *);

static void checkin_parsekeyword(char *, RCSNUM **, time_t *, char **,

char **);

static int checkin_update(struct checkin_params *);

static void checkin_revert(struct checkin_params *);

Line 91

Line 86

{

fprintf(stderr,

"usage: ci [-MNqTV] [-d[date]] [-f[rev]] [-i[rev]] [-j[rev]]\n"

" [-k[rev]] [-l[rev]] [-M[rev]] [-mmsg] [-Nsymbol]\n"

" [-nsymbol] [-r[rev]] [-sstate] [-tfile|str] [-u[rev]]\n"

" [-wusername] [-xsuffixes] file ...\n");

}

Line 268

Line 263

if (verbose == 1)

printf("%s <-- %s\n", pb.fpath, pb.filename);

if (pb.flags & NEWFILE)

status = checkin_init(&pb);

else

Line 370

Line 365

printf("new revision: %s; previous revision: %s\n", nrev,

prev);

rcs_msg = checkin_getinput(LOG_PROMPT);

rcs_msg = checkin_getinput("enter log message, terminated with a "

"single '.' or end of file:\n>> ");

return (rcs_msg);

}

Line 386

Line 382

{

char *description;

description = checkin_getinput(DESC_PROMPT);

description = checkin_getinput("enter description, terminated with "

"single '.' or end of file:\n"

"NOTE: This is NOT the log message!\n>> ");

return (description);

}

Line 553

Line 551

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");

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

Line 655

Line 653

/* Now add our new revision */

if (rcs_rev_add(pb->file,

(pb->newrev == NULL ? RCS_HEAD_REV : pb->newrev),

(pb->rcs_msg == NULL ? LOG_INIT : pb->rcs_msg),

(pb->rcs_msg == NULL ? "Initial revision" : pb->rcs_msg),

pb->date, pb->author) != 0) {

cvs_log(LP_ERR, "failed to add new revision");

rcs_close(pb->file);

Line 902

Line 900

continue;

}

/* look for any matching keywords */

found = 0;

for (j = 0; j < 10; j++) {

if (!strncmp(c, rcs_expkw[j].kw_str,

strlen(rcs_expkw[j].kw_str))) {

found = 1;

kwstr = rcs_expkw[j].kw_str;

break;

}

/* unknown keyword, continue looking */

if (found == 0) {

c = start;

continue;

}

c += strlen(kwstr);

if (*c != ':' && *c != '$') {

Line 933

Line 931

" too small!");

strlcpy(buf, start, end);

checkin_parsekeyword(buf, rev,

date, author, state);

break;

}

Line 958

Line 956

* This enables us to know what data should be in it.

* Returns type on success, or -1 on failure.

static int

checkin_keywordtype(char *keystring)

{

char *p;

p = keystring;

*p++;

if (strncmp(p, KW_ID, strlen(KW_ID)) == 0)

Line 994

Line 992

char *tokens[10], *p, *datestring;

size_t len = 0;

int i = 0;

/* Parse data out of the expanded keyword */

switch (checkin_keywordtype(keystring)) {

case KW_TYPE_ID:

for ((p = strtok(keystring, " ")); p;

(p = strtok(NULL, " "))) {

if (i < KW_NUMTOKS_ID - 1)

tokens[i++] = p;

}

tokens[i] = NULL;

if (*author != NULL)

xfree(*author);

Line 1029

Line 1028

break;

case KW_TYPE_AUTHOR:

for ((p = strtok(keystring, " ")); p;

(p = strtok(NULL, " "))) {

if (i < KW_NUMTOKS_AUTHOR - 1)

tokens[i++] = p;

}

if (*author != NULL)

xfree(*author);

len = strlen(tokens[1]) + 1;

Line 1041

Line 1040

break;

case KW_TYPE_DATE:

for ((p = strtok(keystring, " ")); p;

(p = strtok(NULL, " "))) {

if (i < KW_NUMTOKS_DATE - 1)

tokens[i++] = p;

}

Line 1056

Line 1055

break;

case KW_TYPE_STATE:

for ((p = strtok(keystring, " ")); p;

(p = strtok(NULL, " "))) {

if (i < KW_NUMTOKS_STATE - 1)

tokens[i++] = p;

}

if (*state != NULL)

xfree(*state);

len = strlen(tokens[1]) + 1;

Line 1071

Line 1070

if (*rev != NULL)

break;

for ((p = strtok(keystring, " ")); p;

(p = strtok(NULL, " "))) {

if (i < KW_NUMTOKS_REVISION - 1)

tokens[i++] = p;

}

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

fatal("could not parse rcsnum");

break;