2 files changed, 6 insertions, 4 deletions
diff --git a/locale/programs/linereader.c b/locale/programs/linereader.c
index 5dba62f..9a61428 100644
--- a/locale/programs/linereader.c
+++ b/locale/programs/linereader.c
@@ -528,7 +528,7 @@ get_ident (struct linereader *lr)
   ADDC (lr->buf[lr->idx - 1]);
 
   while (!isspace ((ch = lr_getc (lr))) && ch != '"' && ch != ';'
-	 && ch != '<' && ch != ',')
+	 && ch != '<' && ch != ',' && ch != EOF)
     {
       if (ch == lr->escape_char)
 	{
@@ -542,7 +542,7 @@ get_ident (struct linereader *lr)
       ADDC (ch);
     }
 
-  lr_ungetn (lr, 1);
+  lr_ungetc (lr, ch);
 
   kw = lr->hash_fct (buf, bufact);
 
diff --git a/locale/programs/linereader.h b/locale/programs/linereader.h
index 94802fc..27ea124 100644
--- a/locale/programs/linereader.h
+++ b/locale/programs/linereader.h
@@ -123,7 +123,8 @@ lr_ungetc (struct linereader *lr, int ch)
   if (lr->idx == 0)
     return -1;
 
-  lr->buf[--lr->idx] = ch;
+  if (ch != EOF)
+    lr->buf[--lr->idx] = ch;
   return 0;
 }
 
@@ -154,7 +155,8 @@ lr_ignore_rest (struct linereader *lr, int verbose)
 	else
 	  ++lr->idx;
 
-      if (lr->buf[lr->idx] != '\n' &&lr->buf[lr->idx] != lr->comment_char)
+      if (lr->buf[lr->idx] != '\n' && ! feof (lr->fp)
+	  && lr->buf[lr->idx] != lr->comment_char)
 	lr_error (lr, _("trailing garbage at end of line"));
     }