X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Ffileblocks.c;h=993ec970a276326987d648e790d45317590386bd;hb=5bf4ad0bfa91baa20e4f39f47bfb8b4dd00df720;hp=2c944307d700b7ca050c729515354ce5d089e28f;hpb=89f2b4892655a929a506eff123c9126a88e2c8eb;p=gnulib.git

diff --git a/lib/fileblocks.c b/lib/fileblocks.c
index 2c944307d..993ec970a 100644
--- a/lib/fileblocks.c
+++ b/lib/fileblocks.c
@@ -1,10 +1,12 @@
 /* Convert file size to number of blocks on System V-like machines.
-   Copyright (C) 1990, 1997, 1998, 1999 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   Copyright (C) 1990, 1997-1999, 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
-   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,14 +14,11 @@
    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 Brian L. Matthews, blm@6sceng.UUCP. */
-
-#if HAVE_CONFIG_H
-# include <config.h>
-#endif
+
+#include <config.h>
 
 #include <sys/types.h>
 
@@ -29,13 +28,11 @@
 
 #if !HAVE_STRUCT_STAT_ST_BLOCKS && !defined _POSIX_SOURCE && defined BSIZE
 
-# if HAVE_UNISTD_H
-#  include <unistd.h>
-# endif
+# include <unistd.h>
 
 # ifndef NINDIR
 
-#  if defined (__DJGPP__)
+#  if defined __DJGPP__
 typedef long daddr_t; /* for disk address */
 #  endif
 
@@ -45,7 +42,7 @@ typedef long daddr_t; /* for disk address */
 # endif /* !NINDIR */
 
 /* Number of direct block addresses in an inode. */
-# define NDIR	10
+# define NDIR   10
 
 /* Return the number of 512-byte blocks in a file of SIZE bytes. */
 
@@ -60,12 +57,12 @@ st_blocks (off_t size)
       indrblks = (datablks - NDIR - 1) / NINDIR + 1;
 
       if (datablks > NDIR + NINDIR)
-	{
-	  indrblks += (datablks - NDIR - NINDIR - 1) / (NINDIR * NINDIR) + 1;
+        {
+          indrblks += (datablks - NDIR - NINDIR - 1) / (NINDIR * NINDIR) + 1;
 
-	  if (datablks > NDIR + NINDIR + NINDIR * NINDIR)
-	    indrblks++;
-	}
+          if (datablks > NDIR + NINDIR + NINDIR * NINDIR)
+            indrblks++;
+        }
     }
 
   return datablks + indrblks;
@@ -73,5 +70,5 @@ st_blocks (off_t size)
 #else
 /* This declaration is solely to ensure that after preprocessing
    this file is never empty.  */
-extern int textutils_fileblocks_unused;
+typedef int textutils_fileblocks_unused;
 #endif