X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Ffileblocks.c;h=d9edae17d22edef33fe0dc31e82458e52505d60d;hb=573dad2ce496fa87dac2e79f37bae62e0be1d2c6;hp=fc9a8eb0087a0139af07f58ded1e533cbbf3b1b9;hpb=044077237d1ebdf19e024b9ff7fe3ca984022d23;p=gnulib.git

diff --git a/lib/fileblocks.c b/lib/fileblocks.c
index fc9a8eb00..d9edae17d 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 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   Copyright (C) 1990, 1997-1999, 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,53 +14,55 @@
    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., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Written by Brian L. Matthews, blm@6sceng.UUCP. */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
 
-#if !defined (HAVE_ST_BLOCKS) && !defined(_POSIX_VERSION)
-# include <sys/types.h>
+#include <config.h>
+
+#include <sys/types.h>
+
+#if HAVE_SYS_PARAM_H
 # include <sys/param.h>
+#endif
+
+#if !HAVE_STRUCT_STAT_ST_BLOCKS && !defined _POSIX_SOURCE && defined BSIZE
+
+# include <unistd.h>
 
 # ifndef NINDIR
-/* Some SysV's, like Irix, seem to lack these.  Hope they're correct. */
-/* Size of a indirect block, in bytes. */
-#  ifndef BSIZE
-#   define BSIZE 1024
+
+#  if defined __DJGPP__
+typedef long daddr_t; /* for disk address */
 #  endif
 
+/* Some SysV's, like Irix, seem to lack this.  Hope it's correct. */
 /* Number of inode pointers per indirect block. */
-#  define NINDIR (BSIZE/sizeof(daddr_t))
+#  define NINDIR (BSIZE / sizeof (daddr_t))
 # 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. */
 
-long
-st_blocks (size)
-     long size;
+off_t
+st_blocks (off_t size)
 {
-  long datablks = (size + 512 - 1) / 512;
-  long indrblks = 0;
+  off_t datablks = size / 512 + (size % 512 != 0);
+  off_t indrblks = 0;
 
   if (datablks > NDIR)
     {
       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;
@@ -66,5 +70,5 @@ st_blocks (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