rewrite of the logmessage code, which allows you to

enter a logmessage into your favorite editor when commiting.

1 files changed, 193 insertions, 0 deletions

diff --git a/usr.bin/cvs/logmsg.c b/usr.bin/cvs/logmsg.c
new file mode 100644
index 00000000000..cc54e899551
--- /dev/null
+++ b/usr.bin/cvs/logmsg.c
@@ -0,0 +1,193 @@
+/*	$OpenBSD: logmsg.c,v 1.30 2007/01/07 02:39:24 joris Exp $	*/
+/*
+ * Copyright (c) 2007 Joris Vink <joris@openbsd.org>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include "includes.h"
+
+#include "cvs.h"
+#include "file.h"
+#include "log.h"
+#include "worklist.h"
+
+#define CVS_LOGMSG_PREFIX		"CVS:"
+#define CVS_LOGMSG_LINE		\
+"----------------------------------------------------------------------"
+
+char *
+cvs_logmsg_read(const char *path)
+{
+	int fd;
+	BUF *bp;
+	FILE *fp;
+	size_t len;
+	struct stat st;
+	char *buf, *lbuf;
+
+	if ((fd = open(path, O_RDONLY)) == -1)
+		fatal("cvs_logmsg_read: open %s", strerror(errno));
+
+	if (fstat(fd, &st) == -1)
+		fatal("cvs_logmsg_read: fstat %s", strerror(errno));
+
+	if (!S_ISREG(st.st_mode))
+		fatal("cvs_logmsg_read: file is not a regular file");
+
+	if ((fp = fdopen(fd, "r")) == NULL)
+		fatal("cvs_logmsg_read: fdopen %s", strerror(errno));
+
+	lbuf = NULL;
+	bp = cvs_buf_alloc(st.st_size, BUF_AUTOEXT);
+	while ((buf = fgetln(fp, &len))) {
+		if (buf[len - 1] == '\n') {
+			buf[len - 1] = '\0';
+		} else {
+			lbuf = xmalloc(len + 1);
+			strlcpy(lbuf, buf, len);
+			buf = lbuf;
+		}
+
+		len = strlen(buf);
+		if (len == 0)
+			continue;
+
+		if (!strncmp(buf, CVS_LOGMSG_PREFIX,
+		    strlen(CVS_LOGMSG_PREFIX)))
+			continue;
+
+		cvs_buf_append(bp, buf, len);
+		cvs_buf_putc(bp, '\n');
+	}
+
+	if (lbuf != NULL)
+		xfree(lbuf);
+
+	(void)fclose(fp);
+	(void)close(fd);
+
+	cvs_buf_putc(bp, '\0');
+	return (cvs_buf_release(bp));
+}
+
+char *
+cvs_logmsg_create(struct cvs_flisthead *added, struct cvs_flisthead *removed,
+	struct cvs_flisthead *modified)
+{
+	FILE *fp;
+	size_t len;
+	int c, fd, argc;
+	struct cvs_filelist *cf;
+	struct stat st1, st2;
+	char *fpath, *logmsg, *argv[4];
+
+	fpath = xmalloc(MAXPATHLEN);
+	len = strlcpy(fpath, cvs_tmpdir, MAXPATHLEN);
+	if (len >= MAXPATHLEN)
+		fatal("cvs_logmsg_create: truncation");
+
+	len = strlcat(fpath, "/cvsXXXXXXXXXX", MAXPATHLEN);
+	if (len >= MAXPATHLEN)
+		fatal("cvs_logmsg_create: truncation");
+
+	if ((fd = mkstemp(fpath)) == NULL)
+		fatal("cvs_logmsg_create: mkstemp %s", strerror(errno));
+
+	if ((fp = fdopen(fd, "w")) == NULL) {
+		(void)unlink(fpath);
+		fatal("cvs_logmsg_create: fdopen %s", strerror(errno));
+	}
+
+	fprintf(fp, "\n%s %s\n%s Enter Log.  Lines beginning with `%s' are "
+	    "removed automatically\n%s\n", CVS_LOGMSG_PREFIX, CVS_LOGMSG_LINE,
+	    CVS_LOGMSG_PREFIX, CVS_LOGMSG_PREFIX, CVS_LOGMSG_PREFIX);
+
+	if (!TAILQ_EMPTY(added)) {
+		fprintf(fp, "%s Added Files:", CVS_LOGMSG_PREFIX);
+		TAILQ_FOREACH(cf, added, flist)
+			fprintf(fp, "\n%s\t%s",
+			    CVS_LOGMSG_PREFIX, cf->file_path);
+		fputs("\n", fp);
+	}
+
+	if (!TAILQ_EMPTY(removed)) {
+		fprintf(fp, "%s Removed Files:", CVS_LOGMSG_PREFIX);
+		TAILQ_FOREACH(cf, removed, flist)
+			fprintf(fp, "\n%s\t%s",
+			    CVS_LOGMSG_PREFIX, cf->file_path);
+		fputs("\n", fp);
+	}
+
+	if (!TAILQ_EMPTY(modified)) {
+		fprintf(fp, "%s Modified Files:", CVS_LOGMSG_PREFIX);
+		TAILQ_FOREACH(cf, modified, flist)
+			fprintf(fp, "\n%s\t%s",
+			    CVS_LOGMSG_PREFIX, cf->file_path);
+		fputs("\n", fp);
+	}
+
+	fprintf(fp, "%s %s\n", CVS_LOGMSG_PREFIX, CVS_LOGMSG_LINE);
+	(void)fflush(fp);
+
+	if (fstat(fd, &st1) == -1) {
+		(void)unlink(fpath);
+		fatal("cvs_logmsg_create: fstat %s", strerror(errno));
+	}
+
+	argc = 0;
+	argv[argc++] = cvs_editor;
+	argv[argc++] = fpath;
+	argv[argc] = NULL;
+
+	logmsg = NULL;
+
+	for (;;) {
+		if (cvs_exec(argc, argv) < 0)
+			break;
+
+		if (fstat(fd, &st2) == -1) {
+			(void)unlink(fpath);
+			fatal("cvs_logmsg_create: fstat %s", strerror(errno));
+		}
+
+		if (st1.st_mtime != st2.st_mtime) {
+			logmsg = cvs_logmsg_read(fpath);
+			break;
+		}
+
+		printf("\nLog message unchanged or not specified\n"
+		    "a)bort, c)ontinue, e(dit)\nAction: (continue) ");
+		(void)fflush(stdout);
+
+		c = getc(stdin);
+		if (c == 'a') {
+			fatal("Aborted by user");
+		} else if (c == '\n' || c == 'c') {
+			logmsg = xstrdup("");
+			break;
+		} else if (c == 'e') {
+			continue;
+		} else {
+			cvs_log(LP_ERR, "invalid input");
+			continue;
+		}
+	}
+
+	(void)fclose(fp);
+	(void)close(fd);
+	(void)unlink(fpath);
+	xfree(fpath);
+
+	return (logmsg);
+}