The -I flag is documented but not implemented. This fixes that and
also honors the -I flag from ci/co when prompting as per GNU rcs.
- todd
Index: usr.bin/rcs/ci.c
===================================================================
RCS file: /cvs/src/usr.bin/rcs/ci.c,v
retrieving revision 1.223
diff -u -p -u -r1.223 ci.c
--- usr.bin/rcs/ci.c 2 Nov 2015 16:45:21 -0000 1.223
+++ usr.bin/rcs/ci.c 3 Jul 2016 13:18:14 -0000
@@ -279,7 +279,7 @@ checkin_main(int argc, char **argv)
errx(1, "failed to open rcsfile `%s'", pb.fpath);
if ((pb.flags & DESCRIPTION) &&
- rcs_set_description(pb.file, pb.description) == -1)
+ rcs_set_description(pb.file, pb.description, pb.flags) ==
-1)
err(1, "%s", pb.filename);
if (!(pb.flags & QUIET))
@@ -406,7 +406,7 @@ checkin_getlogmsg(RCSNUM *rev, RCSNUM *r
(void)fprintf(stderr, "new revision: %s; "
"previous revision: %s\n", nrev, prev);
- rcs_msg = rcs_prompt(prompt);
+ rcs_msg = rcs_prompt(prompt, flags);
return (rcs_msg);
}
@@ -621,7 +621,7 @@ checkin_init(struct checkin_params *pb)
/* Get description from user */
if (pb->description == NULL &&
- rcs_set_description(pb->file, NULL) == -1) {
+ rcs_set_description(pb->file, NULL, pb->flags) == -1) {
warn("%s", pb->filename);
return (-1);
}
Index: usr.bin/rcs/rcsprog.c
===================================================================
RCS file: /cvs/src/usr.bin/rcs/rcsprog.c,v
retrieving revision 1.160
diff -u -p -u -r1.160 rcsprog.c
--- usr.bin/rcs/rcsprog.c 29 Dec 2015 19:12:56 -0000 1.160
+++ usr.bin/rcs/rcsprog.c 3 Jul 2016 13:17:32 -0000
@@ -35,7 +35,7 @@
#include "rcsprog.h"
-#define RCSPROG_OPTSTRING "A:a:b::c:e::ik:Ll::m:Mn:N:o:qt::TUu::Vx::z::"
+#define RCSPROG_OPTSTRING "A:a:b::c:e::Iik:Ll::m:Mn:N:o:qt::TUu::Vx::z::"
const char rcs_version[] = "OpenRCS 4.5";
@@ -222,6 +222,9 @@ rcs_main(int argc, char **argv)
elist = rcs_optarg;
rcsflags |= RCSPROG_EFLAG;
break;
+ case 'I':
+ rcsflags |= INTERACTIVE;
+ break;
case 'i':
flags |= RCS_CREATE;
break;
@@ -324,14 +327,14 @@ rcs_main(int argc, char **argv)
}
if (rcsflags & DESCRIPTION) {
- if (rcs_set_description(file, descfile) == -1) {
+ if (rcs_set_description(file, descfile, rcsflags) ==
-1) {
warn("%s", descfile);
rcs_close(file);
continue;
}
}
else if (flags & RCS_CREATE) {
- if (rcs_set_description(file, NULL) == -1) {
+ if (rcs_set_description(file, NULL, rcsflags) == -1) {
warn("stdin");
rcs_close(file);
continue;
Index: usr.bin/rcs/rcsutil.c
===================================================================
RCS file: /cvs/src/usr.bin/rcs/rcsutil.c,v
retrieving revision 1.44
diff -u -p -u -r1.44 rcsutil.c
--- usr.bin/rcs/rcsutil.c 13 Jun 2015 20:15:21 -0000 1.44
+++ usr.bin/rcs/rcsutil.c 3 Jul 2016 13:15:50 -0000
@@ -330,16 +330,19 @@ rcs_getrevnum(const char *rev_str, RCSFI
* Returns the string's pointer.
*/
char *
-rcs_prompt(const char *prompt)
+rcs_prompt(const char *prompt, int flags)
{
BUF *bp;
size_t len;
char *buf;
+ if (!(flags & INTERACTIVE) && isatty(STDIN_FILENO))
+ flags |= INTERACTIVE;
+
bp = buf_alloc(0);
- if (isatty(STDIN_FILENO))
+ if (flags & INTERACTIVE)
(void)fprintf(stderr, "%s", prompt);
- if (isatty(STDIN_FILENO))
+ if (flags & INTERACTIVE)
(void)fprintf(stderr, ">> ");
clearerr(stdin);
while ((buf = fgetln(stdin, &len)) != NULL) {
@@ -349,7 +352,7 @@ rcs_prompt(const char *prompt)
else
buf_append(bp, buf, len);
- if (isatty(STDIN_FILENO))
+ if (flags & INTERACTIVE)
(void)fprintf(stderr, ">> ");
}
buf_putc(bp, '\0');
@@ -438,7 +441,7 @@ rcs_rev_select(RCSFILE *file, const char
* Returns 0 on success, -1 on failure, setting errno.
*/
int
-rcs_set_description(RCSFILE *file, const char *in)
+rcs_set_description(RCSFILE *file, const char *in, int flags)
{
BUF *bp;
char *content;
@@ -458,7 +461,7 @@ rcs_set_description(RCSFILE *file, const
content = xstrdup(in + 1);
/* Get description from stdin. */
else
- content = rcs_prompt(prompt);
+ content = rcs_prompt(prompt, flags);
rcs_desc_set(file, content);
free(content);
Index: usr.bin/rcs/rcsutil.h
===================================================================
RCS file: /cvs/src/usr.bin/rcs/rcsutil.h,v
retrieving revision 1.14
diff -u -p -u -r1.14 rcsutil.h
--- usr.bin/rcs/rcsutil.h 23 Jul 2010 08:31:19 -0000 1.14
+++ usr.bin/rcs/rcsutil.h 3 Jul 2016 13:17:06 -0000
@@ -54,9 +54,9 @@ void rcs_set_mtime(RCSFILE *, time_t)
int rcs_choosefile(const char *, char *, size_t);
time_t rcs_get_mtime(RCSFILE *);
RCSNUM *rcs_getrevnum(const char *, RCSFILE *);
-char *rcs_prompt(const char *);
+char *rcs_prompt(const char *, int);
u_int rcs_rev_select(RCSFILE *, const char *);
-int rcs_set_description(RCSFILE *, const char *);
+int rcs_set_description(RCSFILE *, const char *, int);
void rcs_setrevstr(char **, char *);
void rcs_setrevstr2(char **, char **, char *);
BUF *rcs_patchfile(u_char *, size_t, u_char *, size_t,
