X-Git-Url: https://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Freadtokens0.c;h=1d8dde7c0b9a58297de604620331cc3da4b986fe;hb=81e2fe40473d40b254dea9484525c343d896a439;hp=b46ba8f8544893c10eb93c230ae059646b1eeec0;hpb=ae8bdaa0cca3a49e5cba2b6db567f5990022188d;p=gnulib.git

diff --git a/lib/readtokens0.c b/lib/readtokens0.c
index b46ba8f85..1d8dde7c0 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-2012 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Written by Jim Meyering. */
 
 #include <config.h>
+
 #include <stdlib.h>
 
 #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)