X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Ffileblocks.c;h=8d4f41c24ea7e9f2e4ca042c2f73b654843a1c0c;hb=45a14d0fe450d6b70c404cc9ae6aca4f31054896;hp=0c182d8e0223818514acef009b2238c8145ae047;hpb=67f394c1d2be473276ccd5e071f986511a13e212;p=gnulib.git diff --git a/lib/fileblocks.c b/lib/fileblocks.c index 0c182d8e0..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, 1997, 1998 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 @@ -13,11 +14,11 @@ 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. */ + Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ /* Written by Brian L. Matthews, blm@6sceng.UUCP. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif @@ -27,7 +28,7 @@ # 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 @@ -50,8 +51,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 +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