(lr_token): Return EOF token at EOF.

(get_toplvl_escape): Correctly terminate loop at EOF.

diff --git a/locale/programs/linereader.c b/locale/programs/linereader.c
index edb5a51f5c1ae8575bce614c6570151724a09b9c..5283bd4ffa66297ca74261c64b919723e44e204f 100644 (file)
--- a/locale/programs/linereader.c
+++ b/locale/programs/linereader.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1996.
 
@@ -160,6 +160,12 @@ lr_token (struct linereader *lr, const struct charset_t *charset)
        {
          ch = lr_getc (lr);
 
+         if (ch == EOF)
+           {
+             lr->token.tok = tok_eof;
+             return &lr->token;
+           };
+
          if (ch == '\n')
            {
              lr->token.tok = tok_eol;
@@ -284,7 +290,7 @@ get_toplvl_escape (struct linereader *lr)
        esc_error:
          lr->token.val.str.start = &lr->buf[start_idx];
 
-         while (ch != EOF || !isspace (ch))
+         while (ch != EOF && !isspace (ch))
            ch = lr_getc (lr);
          lr->token.val.str.len = lr->idx - start_idx;