X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Ffileblocks.c;h=993ec970a276326987d648e790d45317590386bd;hb=b344de996cd51f8a2f2558a3172016b64d99c622;hp=4024d1ef24ff1b690e242862e37720141fe79918;hpb=0632e115747ff96e93330c88f536d7354a7ce507;p=gnulib.git diff --git a/lib/fileblocks.c b/lib/fileblocks.c index 4024d1ef2..993ec970a 100644 --- a/lib/fileblocks.c +++ b/lib/fileblocks.c @@ -1,12 +1,12 @@ /* Convert file size to number of blocks on System V-like machines. - Copyright (C) 1990, 1997, 1998, 1999, 2004, 2005, 2006 Free Software + Copyright (C) 1990, 1997-1999, 2004-2006, 2009-2011 Free Software Foundation, Inc. - This program is free software; you can redistribute it and/or modify + 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 @@ -14,8 +14,7 @@ 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + along with this program. If not, see . */ /* Written by Brian L. Matthews, blm@6sceng.UUCP. */ @@ -43,7 +42,7 @@ typedef long daddr_t; /* for disk address */ # 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. */ @@ -58,12 +57,12 @@ st_blocks (off_t size) 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;