X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Ffileblocks.c;h=8d4f41c24ea7e9f2e4ca042c2f73b654843a1c0c;hb=45a14d0fe450d6b70c404cc9ae6aca4f31054896;hp=31425c162225bf34fa97326ab2dc6f8520a2405c;hpb=cd192cd5f380907de3a96cb6c955701215ce8026;p=gnulib.git

diff --git a/lib/fileblocks.c b/lib/fileblocks.c
index 31425c162..8d4f41c24 100644
--- a/lib/fileblocks.c
+++ b/lib/fileblocks.c
@@ -1,5 +1,6 @@
 /* Convert file size to number of blocks on System V-like machines.
-   Copyright (C) 1990 Free Software Foundation, Inc.
+
+   Copyright (C) 1990, 1997, 1998, 1999, 2004 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
@@ -12,41 +13,48 @@
    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, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Brian L. Matthews, blm@6sceng.UUCP. */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include <config.h>
 #endif
 
-#if !defined (HAVE_ST_BLOCKS) && !defined(_POSIX_VERSION)
 #include <sys/types.h>
-#include <sys/param.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 HAVE_SYS_PARAM_H
+# include <sys/param.h>
 #endif
 
+#if !HAVE_STRUCT_STAT_ST_BLOCKS && !defined _POSIX_SOURCE && defined BSIZE
+
+# if HAVE_UNISTD_H
+#  include <unistd.h>
+# endif
+
+# ifndef NINDIR
+
+#  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))
-#endif /* !NINDIR */
+#  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)
     {
@@ -66,5 +74,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