projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fflush, stat: no 'static inline'
[gnulib.git]
/
lib
/
fileblocks.c
diff --git
a/lib/fileblocks.c
b/lib/fileblocks.c
index
8d4f41c
..
d9edae1
100644
(file)
--- a/
lib/fileblocks.c
+++ b/
lib/fileblocks.c
@@
-1,11
+1,12
@@
/* Convert file size to number of blocks on System V-like machines.
/* Convert file size to number of blocks on System V-like machines.
- Copyright (C) 1990, 1997, 1998, 1999, 2004 Free Software Foundation, Inc.
+ Copyright (C) 1990, 1997-1999, 2004-2006, 2009-2012 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
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
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-13,14
+14,11
@@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
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 <http://www.gnu.org/licenses/>. */
/* Written by Brian L. Matthews, blm@6sceng.UUCP. */
/* Written by Brian L. Matthews, blm@6sceng.UUCP. */
-
\f
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+
+#include <config.h>
#include <sys/types.h>
#include <sys/types.h>
@@
-30,13
+28,11
@@
#if !HAVE_STRUCT_STAT_ST_BLOCKS && !defined _POSIX_SOURCE && defined BSIZE
#if !HAVE_STRUCT_STAT_ST_BLOCKS && !defined _POSIX_SOURCE && defined BSIZE
-# if HAVE_UNISTD_H
-# include <unistd.h>
-# endif
+# include <unistd.h>
# ifndef NINDIR
# ifndef NINDIR
-# if defined
(__DJGPP__)
+# if defined
__DJGPP__
typedef long daddr_t; /* for disk address */
# endif
typedef long daddr_t; /* for disk address */
# endif
@@
-46,7
+42,7
@@
typedef long daddr_t; /* for disk address */
# endif /* !NINDIR */
/* Number of direct block addresses in an inode. */
# 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. */
/* Return the number of 512-byte blocks in a file of SIZE bytes. */
@@
-61,12
+57,12
@@
st_blocks (off_t size)
indrblks = (datablks - NDIR - 1) / NINDIR + 1;
if (datablks > NDIR + NINDIR)
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;
}
return datablks + indrblks;