diff options
| author | Ray Lai <ray@cvs.openbsd.org> | 2007-05-25 22:36:48 +0000 |
|---|---|---|
| committer | Ray Lai <ray@cvs.openbsd.org> | 2007-05-25 22:36:48 +0000 |
| commit | cf6b0419225c37055a1411362f764ffe042bfe5e (patch) | |
| tree | e6a9e80e6cdb6c03cc70b859032b4749ddcac9c7 /usr.bin | |
| parent | d7385fc81fcd93b223c4b499d702324af9298c7f (diff) | |
Call fatal() if we are missing an argument. From Tobias Stoeckmann.
OK niallo@.
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/cvs/client.c | 36 |
1 files changed, 34 insertions, 2 deletions
diff --git a/usr.bin/cvs/client.c b/usr.bin/cvs/client.c index 3008aeafe5e..6151b8d340a 100644 --- a/usr.bin/cvs/client.c +++ b/usr.bin/cvs/client.c @@ -1,4 +1,4 @@ -/* $OpenBSD: client.c,v 1.61 2007/05/17 03:26:33 ray Exp $ */ +/* $OpenBSD: client.c,v 1.62 2007/05/25 22:36:47 ray Exp $ */ /* * Copyright (c) 2006 Joris Vink <joris@openbsd.org> * @@ -525,7 +525,9 @@ cvs_client_validreq(char *data) char *sp, *ep; struct cvs_req *req; - sp = data; + if ((sp = data) == NULL) + fatal("Missing argument for Valid-requests"); + do { if ((ep = strchr(sp, ' ')) != NULL) *ep = '\0'; @@ -551,12 +553,18 @@ cvs_client_validreq(char *data) void cvs_client_e(char *data) { + if (data == NULL) + fatal("Missing argument for E"); + cvs_printf("%s\n", data); } void cvs_client_m(char *data) { + if (data == NULL) + fatal("Missing argument for M"); + cvs_printf("%s\n", data); } @@ -568,6 +576,9 @@ cvs_client_checkedin(char *data) char *dir, *e, entry[CVS_ENT_MAXLINELEN], rev[16], timebuf[64]; char sticky[16]; + if (data == NULL) + fatal("Missing argument for Checked-in"); + dir = cvs_remote_input(); e = cvs_remote_input(); xfree(dir); @@ -610,6 +621,9 @@ cvs_client_updated(char *data) char timebuf[32], repo[MAXPATHLEN], *rpath, entry[CVS_ENT_MAXLINELEN]; char *en, *mode, revbuf[32], *len, *fpath, *wdir; + if (data == NULL) + fatal("Missing argument for Updated"); + client_check_directory(data); rpath = cvs_remote_input(); @@ -689,6 +703,9 @@ cvs_client_merged(char *data) char timebuf[32], *repo, *rpath, *entry, *mode; char *len, *fpath, *wdir; + if (data == NULL) + fatal("Missing argument for Merged"); + client_check_directory(data); rpath = cvs_remote_input(); @@ -762,6 +779,9 @@ cvs_client_remove_entry(char *data) CVSENTRIES *entlist; char *filename, *rpath; + if (data == NULL) + fatal("Missing argument for Remove-entry"); + rpath = cvs_remote_input(); if ((filename = strrchr(rpath, '/')) == NULL) fatal("bad rpath in cvs_client_remove_entry: %s", rpath); @@ -783,6 +803,9 @@ cvs_client_set_static_directory(char *data) if (cvs_cmdop == CVS_OP_EXPORT) return; + if (data == NULL) + fatal("Missing argument for Set-static-directory"); + STRIP_SLASH(data); dir = cvs_remote_input(); @@ -806,6 +829,9 @@ cvs_client_clear_static_directory(char *data) if (cvs_cmdop == CVS_OP_EXPORT) return; + if (data == NULL) + fatal("Missing argument for Clear-static-directory"); + STRIP_SLASH(data); dir = cvs_remote_input(); @@ -826,6 +852,9 @@ cvs_client_set_sticky(char *data) if (cvs_cmdop == CVS_OP_EXPORT) return; + if (data == NULL) + fatal("Missing argument for Set-sticky"); + STRIP_SLASH(data); dir = cvs_remote_input(); @@ -853,6 +882,9 @@ cvs_client_clear_sticky(char *data) if (cvs_cmdop == CVS_OP_EXPORT) return; + if (data == NULL) + fatal("Missing argument for Clear-sticky"); + STRIP_SLASH(data); dir = cvs_remote_input(); |