1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
|
/* $OpenBSD: logmsg.c,v 1.44 2007/09/04 17:57:41 tobias 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 <sys/stat.h>
#include <sys/types.h>
#include <sys/wait.h>
#include <errno.h>
#include <fcntl.h>
#include <paths.h>
#include <signal.h>
#include <string.h>
#include <unistd.h>
#include "cvs.h"
#define CVS_LOGMSG_PREFIX "CVS:"
#define CVS_LOGMSG_LINE \
"----------------------------------------------------------------------"
int cvs_logmsg_edit(const char *);
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);
memcpy(lbuf, buf, len);
lbuf[len] = '\0';
buf = lbuf;
}
len = strlen(buf);
if (!strncmp(buf, CVS_LOGMSG_PREFIX,
sizeof(CVS_LOGMSG_PREFIX) - 1))
continue;
cvs_buf_append(bp, buf, len);
cvs_buf_putc(bp, '\n');
}
if (lbuf != NULL)
xfree(lbuf);
(void)fclose(fp);
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;
int c, fd, saved_errno;
struct cvs_filelist *cf;
struct stat st1, st2;
char *fpath, *logmsg;
(void)xasprintf(&fpath, "%s/cvsXXXXXXXXXX", cvs_tmpdir);
if ((fd = mkstemp(fpath)) == NULL)
fatal("cvs_logmsg_create: mkstemp %s", strerror(errno));
cvs_worklist_add(fpath, &temp_files);
if ((fp = fdopen(fd, "w")) == NULL) {
saved_errno = errno;
(void)unlink(fpath);
fatal("cvs_logmsg_create: fdopen %s", strerror(saved_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 (added != NULL && !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 (removed != NULL && !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 (modified != NULL && !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) {
saved_errno = errno;
(void)unlink(fpath);
fatal("cvs_logmsg_create: fstat %s", strerror(saved_errno));
}
logmsg = NULL;
for (;;) {
if (cvs_logmsg_edit(fpath) == -1)
break;
if (fstat(fd, &st2) == -1) {
saved_errno = errno;
(void)unlink(fpath);
fatal("cvs_logmsg_create: fstat %s",
strerror(saved_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 == EOF || 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)unlink(fpath);
xfree(fpath);
return (logmsg);
}
/*
* Execute an editor on the specified pathname, which is interpreted
* from the shell. This means flags may be included.
*
* Returns -1 on error, or the exit value on success.
*/
int
cvs_logmsg_edit(const char *pathname)
{
char *argp[] = {"sh", "-c", NULL, NULL}, *p;
sig_t sighup, sigint, sigquit;
pid_t pid;
int saved_errno, st;
(void)xasprintf(&p, "%s %s", cvs_editor, pathname);
argp[2] = p;
sighup = signal(SIGHUP, SIG_IGN);
sigint = signal(SIGINT, SIG_IGN);
sigquit = signal(SIGQUIT, SIG_IGN);
if ((pid = fork()) == -1)
goto fail;
if (pid == 0) {
execv(_PATH_BSHELL, argp);
_exit(127);
}
while (waitpid(pid, &st, 0) == -1)
if (errno != EINTR)
goto fail;
xfree(p);
(void)signal(SIGHUP, sighup);
(void)signal(SIGINT, sigint);
(void)signal(SIGQUIT, sigquit);
if (!WIFEXITED(st)) {
errno = EINTR;
return (-1);
}
return (WEXITSTATUS(st));
fail:
saved_errno = errno;
(void)signal(SIGHUP, sighup);
(void)signal(SIGINT, sigint);
(void)signal(SIGQUIT, sigquit);
xfree(p);
errno = saved_errno;
return (-1);
}
|
