Fix bug in handling of backslashed double-quotes inside single-quoted strings.

diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index 43b2b4b031a795d169b478fc92362751446da56e..3c77098231e970165df3ef50e1e5046300ef135e 100644 (file)
--- a/gettext-tools/src/ChangeLog
+++ b/gettext-tools/src/ChangeLog
@@ -1,3 +1,8 @@
+2003-12-14  Bruno Haible  <bruno@clisp.org>
+
+       * x-sh.c (phase2_getc): Call phase1_ungetc instead of phase2_ungetc:
+       The next phase2_getc invocation must return QUOTED('"'), not '"'.
+
 2003-12-14  Bruno Haible  <bruno@clisp.org>
 
        * x-c.c (phase7_getc): Remove dead code.

diff --git a/gettext-tools/src/x-sh.c b/gettext-tools/src/x-sh.c
index de634065e4ca46f664158a436b4d5757b23a7f65..9efbb6dedc324e0c2defb33aa3c45d1c6636ecd4 100644 (file)
--- a/gettext-tools/src/x-sh.c
+++ b/gettext-tools/src/x-sh.c
@@ -586,7 +586,7 @@ phase2_getc ()
            {
              if (count > open_doublequotes_mask)
                {
-                 phase2_ungetc (c);
+                 phase1_ungetc (c);
                  return '\\';
                }
              else