X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Ffileblocks.c;h=822935af93030a78d5c2dc44a225b75995da3990;hb=671c9011cb6944a63f0d15f60252c31bf0ee8e9b;hp=e94d903b0326b1f880fae8c11ba867d6a1404b1c;hpb=4ba0abaf65e1efb2b5808bb3b222b2fb48b32635;p=gnulib.git
diff --git a/lib/fileblocks.c b/lib/fileblocks.c
index e94d903b0..822935af9 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 Free Software Foundation, Inc.
- This program is free software; you can redistribute it and/or modify
+ Copyright (C) 1990, 1997, 1998, 1999, 2004, 2005, 2006 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 . */
/* Written by Brian L. Matthews, blm@6sceng.UUCP. */
-
-#ifdef HAVE_CONFIG_H
-# include
-#endif
+
+#include
#include
@@ -27,15 +26,13 @@
# include
#endif
-#if !HAVE_ST_BLOCKS && !defined _POSIX_SOURCE && defined BSIZE
+#if !HAVE_STRUCT_STAT_ST_BLOCKS && !defined _POSIX_SOURCE && defined BSIZE
-# if HAVE_UNISTD_H
-# include
-# endif
+# include
# ifndef NINDIR
-# if defined (__DJGPP__)
+# if defined __DJGPP__
typedef long daddr_t; /* for disk address */
# endif
@@ -50,8 +47,7 @@ typedef long daddr_t; /* for disk address */
/* Return the number of 512-byte blocks in a file of SIZE bytes. */
off_t
-st_blocks (size)
- off_t size;
+st_blocks (off_t size)
{
off_t datablks = size / 512 + (size % 512 != 0);
off_t indrblks = 0;
@@ -74,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