src/usr.bin/cvs/trigger.c - diff

Return to trigger.c CVS log

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

Diff for /src/usr.bin/cvs/trigger.c between version 1.8 and 1.9

version 1.8, 2008/06/10 04:01:41

version 1.9, 2008/06/10 04:38:46

Line 185

{

int expanded = 0;

char argbuf[2] = { '\0', '\0' };

char *allowed_args, *default_args, *args, *p, *q = NULL;

char *allowed_args, *default_args, *args, *file, *p, *q = NULL;

size_t pos;

BUF *buf;

Line 193

case CVS_TRIGGER_COMMITINFO:

allowed_args = "prsS{}";

default_args = " %p/%r %S";

file = CVS_PATH_COMMITINFO;

break;

case CVS_TRIGGER_LOGINFO:

allowed_args = "prsSvVt{}";

default_args = NULL;

file = CVS_PATH_LOGINFO;

break;

case CVS_TRIGGER_VERIFYMSG:

allowed_args = "l";

default_args = " %l";

file = CVS_PATH_VERIFYMSG;

break;

case CVS_TRIGGER_TAGINFO:

allowed_args = "btoprsSvV{}";

default_args = " %t %o %p/%r %{sv}";

file = CVS_PATH_TAGINFO;

break;

default:

return (NULL);

Line 235

Line 239

case '\0':

goto bad;

case '{':

/* XXX do we realy have to check for { in there? */

if (strchr(allowed_args, '{') == NULL)

goto bad;

pos = strcspn(++p, "}");

Line 273

Line 276

bad:

if (q != NULL)

xfree(q);

cvs_log(LP_NOTICE, "CVSROOT: malformed line %s", cmd);

cvs_log(LP_NOTICE, "%s contains malformed command '%s'", file, cmd);

cvs_buf_free(buf);

return (NULL);

}