Module Name: src
Committed By: christos
Date: Fri Feb 19 23:50:55 UTC 2010
Modified Files:
src/external/gpl2/xcvs/dist/src: logmsg.c
Log Message:
make the default action abort for the empty log message; it used to be
continue. requested by joerg.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/gpl2/xcvs/dist/src/logmsg.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl2/xcvs/dist/src/logmsg.c
diff -u src/external/gpl2/xcvs/dist/src/logmsg.c:1.2 src/external/gpl2/xcvs/dist/src/logmsg.c:1.3
--- src/external/gpl2/xcvs/dist/src/logmsg.c:1.2 Wed Apr 8 12:27:51 2009
+++ src/external/gpl2/xcvs/dist/src/logmsg.c Fri Feb 19 18:50:55 2010
@@ -357,7 +357,7 @@
{
(void) printf ("\nLog message unchanged or not specified\n");
(void) printf ("a)bort, c)ontinue, e)dit, !)reuse this message unchanged for remaining dirs\n");
- (void) printf ("Action: (continue) ");
+ (void) printf ("Action: (abort) ");
(void) fflush (stdout);
line_length = getline (&line, &line_chars_allocated, stdin);
if (line_length < 0)
@@ -369,14 +369,14 @@
error (1, 0, "aborting");
}
else if (line_length == 0
- || *line == '\n' || *line == 'c' || *line == 'C')
- break;
- if (*line == 'a' || *line == 'A')
+ || *line == '\n' || *line == 'a' || *line == 'A')
{
if (unlink_file (fname) < 0)
error (0, errno, "warning: cannot remove temp file %s", fname);
error (1, 0, "aborted by user");
}
+ if (*line == 'c' || *line == 'C')
+ break;
if (*line == 'e' || *line == 'E')
goto again;
if (*line == '!')
