X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Freadtokens0.c;h=b20cb39f3c8858c4a85b847ff4ff0c323299988a;hb=fa1db0dd22768f09a507674a30beb5b8a87bb35f;hp=494e08d55e3511269d57563120903480958fe8ce;hpb=267a39bafd249d7eb9c37df06dc6defcf41cb343;p=gnulib.git diff --git a/lib/readtokens0.c b/lib/readtokens0.c index 494e08d55..b20cb39f3 100644 --- a/lib/readtokens0.c +++ b/lib/readtokens0.c @@ -1,10 +1,11 @@ /* readtokens0.c -- Read NUL-separated tokens from an input stream. - Copyright (C) 2004 Free Software Foundation, Inc. - This program is free software; you can redistribute it and/or modify + Copyright (C) 2004, 2006, 2009-2013 Free Software Foundation, Inc. + + 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 @@ -12,12 +13,12 @@ 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 . Written by Jim Meyering. */ #include + #include #include "readtokens0.h" @@ -69,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)