X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Ffileblocks.c;h=1a44516f3d0fb2a61af0bab5be00f22a6ae378df;hb=6e93b42a69e7a51b301e7ab383022dd4f59c2081;hp=6a421cf51a2d4c6cd932b8a3d7f7e06caf8b6262;hpb=1cc4ba44c23782d32d4d2986b355e336f5e21335;p=gnulib.git diff --git a/lib/fileblocks.c b/lib/fileblocks.c index 6a421cf51..1a44516f3 100644 --- a/lib/fileblocks.c +++ b/lib/fileblocks.c @@ -1,5 +1,5 @@ /* Convert file size to number of blocks on System V-like machines. - Copyright (C) 1990, 1997 Free Software Foundation, Inc. + Copyright (C) 1990, 1997, 1998 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 @@ -17,22 +17,31 @@ /* Written by Brian L. Matthews, blm@6sceng.UUCP. */ -#ifdef HAVE_CONFIG_H +#if HAVE_CONFIG_H # include #endif -#if !HAVE_ST_BLOCKS && !defined _POSIX_SOURCE && defined BSIZE -# include +#include + +#if HAVE_SYS_PARAM_H # include +#endif + +#if !HAVE_ST_BLOCKS && !defined _POSIX_SOURCE && defined BSIZE # if HAVE_UNISTD_H # include # 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)) +# define NINDIR (BSIZE / sizeof (daddr_t)) # endif /* !NINDIR */ /* Number of direct block addresses in an inode. */ @@ -41,8 +50,7 @@ /* 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;