diff options
Diffstat (limited to 'lib/readtokens0.c')
| -rw-r--r-- | lib/readtokens0.c | 39 |
1 files changed, 19 insertions, 20 deletions
diff --git a/lib/readtokens0.c b/lib/readtokens0.c index b60fd5a..89a15e4 100644 --- a/lib/readtokens0.c +++ b/lib/readtokens0.c @@ -1,11 +1,11 @@ /* readtokens0.c -- Read NUL-separated tokens from an input stream. - Copyright (C) 2004, 2006 Free Software Foundation, Inc. + Copyright (C) 2004, 2006, 2009-2016 Free Software Foundation, Inc. - This program is free software; you can redistribute it and/or modify + This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) - any later version. + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -13,8 +13,7 @@ GNU 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + along with this program. If not, see <http://www.gnu.org/licenses/>. Written by Jim Meyering. */ @@ -71,23 +70,23 @@ readtokens0 (FILE *in, struct Tokens *t) { int c = fgetc (in); if (c == EOF) - { - size_t len = obstack_object_size (&t->o_data); - /* If the current object has nonzero length, then there - was no NUL byte at EOF -- or maybe there was an error, - in which case, we need to append a NUL byte to our buffer. */ - if (len) - { - obstack_1grow (&t->o_data, '\0'); - save_token (t); - } - - break; - } + { + size_t len = obstack_object_size (&t->o_data); + /* If the current object has nonzero length, then there + was no NUL byte at EOF -- or maybe there was an error, + in which case, we need to append a NUL byte to our buffer. */ + if (len) + { + obstack_1grow (&t->o_data, '\0'); + save_token (t); + } + + break; + } obstack_1grow (&t->o_data, c); if (c == '\0') - save_token (t); + save_token (t); } /* Add a NULL pointer at the end, in case the caller (like du) |