X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Freadtokens0.c;h=26feaf762e7739ecc3ad624850c477caf07d47db;hb=e0e8128146064983909c9756c02e2f8cd3fb9e12;hp=ccd2860c0729a222c62d61d74afdd4c21f078482;hpb=57fdfd3f8ec62b105c53bcdf6f127c35c7fe7391;p=gnulib.git diff --git a/lib/readtokens0.c b/lib/readtokens0.c index ccd2860c0..26feaf762 100644 --- a/lib/readtokens0.c +++ b/lib/readtokens0.c @@ -1,6 +1,6 @@ /* readtokens0.c -- Read NUL-separated tokens from an input stream. - Copyright (C) 2004, 2006 Free Software Foundation, Inc. + Copyright (C) 2004, 2006, 2009-2011 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 @@ -70,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)