diff options
| author | Jean-Francois Brousseau <jfb@cvs.openbsd.org> | 2004-08-04 12:41:59 +0000 |
|---|---|---|
| committer | Jean-Francois Brousseau <jfb@cvs.openbsd.org> | 2004-08-04 12:41:59 +0000 |
| commit | 7b2fb843c94a611433afc555d72887fdc7f2ad0a (patch) | |
| tree | 294d9abf0e8da7fe07738329791123a3b93099b5 /usr.bin/cvs | |
| parent | aaba58424f05f62923f0ac8b0e38a931f61d9414 (diff) | |
Handler for the `Argument' and `Argumentx' requests
Diffstat (limited to 'usr.bin/cvs')
| -rw-r--r-- | usr.bin/cvs/req.c | 56 |
1 files changed, 53 insertions, 3 deletions
diff --git a/usr.bin/cvs/req.c b/usr.bin/cvs/req.c index e6c53b294c2..54c03caa1ce 100644 --- a/usr.bin/cvs/req.c +++ b/usr.bin/cvs/req.c @@ -1,4 +1,4 @@ -/* $OpenBSD: req.c,v 1.1 2004/08/03 04:58:45 jfb Exp $ */ +/* $OpenBSD: req.c,v 1.2 2004/08/04 12:41:58 jfb Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -57,6 +57,7 @@ extern int cvs_readonly; static int cvs_req_root (int, char *); static int cvs_req_directory (int, char *); +static int cvs_req_argument (int, char *); static int cvs_req_version (int, char *); @@ -83,8 +84,8 @@ struct cvs_reqhdlr { { NULL }, { NULL }, { NULL }, - { NULL }, /* 20 */ - { NULL }, + { cvs_req_argument }, /* 20 */ + { cvs_req_argument }, { NULL }, { NULL }, { NULL }, @@ -138,6 +139,17 @@ struct cvs_reqhdlr { /* + * Argument array built by `Argument' and `Argumentx' requests. + */ + +static char *cvs_req_args[CVS_PROTO_MAXARG]; +static int cvs_req_nargs = 0; + + + + + +/* * cvs_req_handle() * * Generic request handler dispatcher. The handler expects the first line @@ -190,6 +202,44 @@ cvs_req_directory(int reqid, char *line) static int +cvs_req_argument(int reqid, char *line) +{ + char *nap; + + if (cvs_req_nargs == CVS_PROTO_MAXARG) { + cvs_log(LP_ERR, "too many arguments"); + return (-1); + } + + if (reqid == CVS_REQ_ARGUMENT) { + cvs_req_args[cvs_req_nargs] = strdup(line); + if (cvs_req_args[cvs_req_nargs] == NULL) { + cvs_log(LP_ERRNO, "failed to copy argument"); + return (-1); + } + cvs_req_nargs++; + } + else if (reqid == CVS_REQ_ARGUMENTX) { + if (cvs_req_nargs == 0) + cvs_log(LP_WARN, "no argument to append to"); + else { + asprintf(&nap, "%s%s", cvs_req_args[cvs_req_nargs - 1], + line); + if (nap == NULL) { + cvs_log(LP_ERRNO, + "failed to append to argument"); + return (-1); + } + free(cvs_req_args[cvs_req_nargs - 1]); + cvs_req_args[cvs_req_nargs - 1] = nap; + } + } + + return (0); +} + + +static int cvs_req_version(int reqid, char *line) { cvs_printf("%s\n", CVS_VERSION); |