diff options
Diffstat (limited to 'locale/programs/linereader.c')
| -rw-r--r-- | locale/programs/linereader.c | 32 |
1 files changed, 20 insertions, 12 deletions
diff --git a/locale/programs/linereader.c b/locale/programs/linereader.c index 6587f7305b..233799a87d 100644 --- a/locale/programs/linereader.c +++ b/locale/programs/linereader.c @@ -1,19 +1,21 @@ -/* Copyright (C) 1996-2005, 2006 Free Software Foundation, Inc. +/* Copyright (C) 1996-2001, 2002, 2003, 2004 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@gnu.org>, 1996. - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License version 2 as - published by the Free Software Foundation. + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + The GNU C Library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ #ifdef HAVE_CONFIG_H # include <config.h> @@ -214,6 +216,12 @@ lr_token (struct linereader *lr, const struct charmap_t *charmap, } while (isspace (ch)); + if (ch == EOF) + { + lr->token.tok = tok_eof; + return &lr->token; + }; + if (ch != lr->comment_char) break; @@ -339,8 +347,8 @@ get_toplvl_escape (struct linereader *lr) /* This is supposed to be a numeric value. We return the numerical value and the number of bytes. */ size_t start_idx = lr->idx - 1; - unsigned char *bytes = lr->token.val.charcode.bytes; - size_t nbytes = 0; + char *bytes = lr->token.val.charcode.bytes; + int nbytes = 0; int ch; do |