Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/gpl2/xcvs/dist/src make the default action abort fo...



details:   https://anonhg.NetBSD.org/src/rev/8d4c9081c2b4
branches:  trunk
changeset: 752218:8d4c9081c2b4
user:      christos <christos%NetBSD.org@localhost>
date:      Fri Feb 19 23:50:55 2010 +0000

description:
make the default action abort for the empty log message; it used to be
continue. requested by joerg.

diffstat:

 external/gpl2/xcvs/dist/src/logmsg.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (30 lines):

diff -r 0211ca78c483 -r 8d4c9081c2b4 external/gpl2/xcvs/dist/src/logmsg.c
--- a/external/gpl2/xcvs/dist/src/logmsg.c      Fri Feb 19 23:03:02 2010 +0000
+++ b/external/gpl2/xcvs/dist/src/logmsg.c      Fri Feb 19 23:50:55 2010 +0000
@@ -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 == '!')



Home | Main Index | Thread Index | Old Index