diff options
| author | Jean-Francois Brousseau <jfb@cvs.openbsd.org> | 2005-01-13 18:47:32 +0000 |
|---|---|---|
| committer | Jean-Francois Brousseau <jfb@cvs.openbsd.org> | 2005-01-13 18:47:32 +0000 |
| commit | 505c87f30d2175a2a9559c79f201525e81e1a400 (patch) | |
| tree | 789bca433fd7a31687b152477905b5246ef34d5f | |
| parent | b29bac2a3324a0d53a17542cd9e922da954451ea (diff) | |
more widespread use of cvs_msg, and free it when we are done
diff by Joris Vink and me
| -rw-r--r-- | usr.bin/cvs/commit.c | 24 | ||||
| -rw-r--r-- | usr.bin/cvs/cvs.c | 4 | ||||
| -rw-r--r-- | usr.bin/cvs/import.c | 8 |
3 files changed, 23 insertions, 13 deletions
diff --git a/usr.bin/cvs/commit.c b/usr.bin/cvs/commit.c index 34f99a63a50..5835335dea8 100644 --- a/usr.bin/cvs/commit.c +++ b/usr.bin/cvs/commit.c @@ -1,4 +1,4 @@ -/* $OpenBSD: commit.c,v 1.13 2004/12/21 18:32:10 jfb Exp $ */ +/* $OpenBSD: commit.c,v 1.14 2005/01/13 18:47:31 jfb Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -57,13 +57,12 @@ int cvs_commit(int argc, char **argv) { int i, ch, flags; - char *msg, *mfile; + char *mfile; struct cvs_flist cl; struct cvsroot *root; flags = CF_RECURSE|CF_IGNORE|CF_SORT; mfile = NULL; - msg = NULL; TAILQ_INIT(&cl); while ((ch = getopt(argc, argv, "F:flm:Rr:")) != -1) { @@ -79,7 +78,11 @@ cvs_commit(int argc, char **argv) flags &= ~CF_RECURSE; break; case 'm': - msg = optarg; + cvs_msg = strdup(optarg); + if (cvs_msg == NULL) { + cvs_log(LP_ERRNO, "failed to copy message"); + return (EX_DATAERR); + } break; case 'R': flags |= CF_RECURSE; @@ -89,12 +92,12 @@ cvs_commit(int argc, char **argv) } } - if ((msg != NULL) && (mfile != NULL)) { + if ((cvs_msg != NULL) && (mfile != NULL)) { cvs_log(LP_ERR, "the -F and -m flags are mutually exclusive"); return (EX_USAGE); } - if ((mfile != NULL) && (msg = cvs_logmsg_open(mfile)) == NULL) + if ((mfile != NULL) && (cvs_msg = cvs_logmsg_open(mfile)) == NULL) return (EX_DATAERR); argc -= optind; @@ -112,9 +115,10 @@ cvs_commit(int argc, char **argv) if (TAILQ_EMPTY(&cl)) return (0); - if (msg == NULL) { - msg = cvs_logmsg_get(CVS_FILE_NAME(cvs_files), NULL, &cl, NULL); - if (msg == NULL) + if (cvs_msg == NULL) { + cvs_msg = cvs_logmsg_get(CVS_FILE_NAME(cvs_files), + NULL, &cl, NULL); + if (cvs_msg == NULL) return (1); } @@ -127,7 +131,7 @@ cvs_commit(int argc, char **argv) return (EX_USAGE); } if ((root->cr_method != CVS_METHOD_LOCAL) && - ((cvs_connect(root) < 0) || (cvs_logmsg_send(root, msg) < 0))) + ((cvs_connect(root) < 0) || (cvs_logmsg_send(root, cvs_msg) < 0))) return (EX_PROTOCOL); cvs_file_examine(cvs_files, cvs_commit_file, &cl); diff --git a/usr.bin/cvs/cvs.c b/usr.bin/cvs/cvs.c index c9ef8cf5d6c..5b28ea2d86b 100644 --- a/usr.bin/cvs/cvs.c +++ b/usr.bin/cvs/cvs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cvs.c,v 1.32 2005/01/13 16:32:46 jfb Exp $ */ +/* $OpenBSD: cvs.c,v 1.33 2005/01/13 18:47:31 jfb Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -432,6 +432,8 @@ main(int argc, char **argv) if (cvs_files != NULL) cvs_file_free(cvs_files); + if (cvs_msg != NULL) + free(cvs_msg); return (ret); } diff --git a/usr.bin/cvs/import.c b/usr.bin/cvs/import.c index 411db5f05ee..3f0949c979f 100644 --- a/usr.bin/cvs/import.c +++ b/usr.bin/cvs/import.c @@ -1,4 +1,4 @@ -/* $OpenBSD: import.c,v 1.3 2005/01/06 19:56:38 jfb Exp $ */ +/* $OpenBSD: import.c,v 1.4 2005/01/13 18:47:31 jfb Exp $ */ /* * Copyright (c) 2004 Joris Vink <amni@pandora.be> * All rights reserved. @@ -90,7 +90,11 @@ cvs_import(int argc, char **argv) case 'k': break; case 'm': - cvs_msg = optarg; + cvs_msg = strdup(optarg); + if (cvs_msg == NULL) { + cvs_log(LP_ERRNO, "failed to copy message"); + return (EX_DATAERR); + } break; default: return (EX_USAGE); |