[PATCHv2 2/2] mkfs.jffs2: fix casting of __off64_t
Andy Shevchenko
ext-andriy.shevchenko at nokia.com
Mon Apr 18 04:31:48 EDT 2011
The casting of __off64_t to unsigned long potentially wrong for values higher
than ULONG_MAX. Let's fix that.
Signed-off-by: Andy Shevchenko <ext-andriy.shevchenko at nokia.com>
---
mkfs.jffs2.c | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/mkfs.jffs2.c b/mkfs.jffs2.c
index 7bb9ad1..01db4be 100644
--- a/mkfs.jffs2.c
+++ b/mkfs.jffs2.c
@@ -1232,8 +1232,8 @@ static void recursive_populate_directory(struct filesystem_entry *dir)
} else switch (e->sb.st_mode & S_IFMT) {
case S_IFDIR:
if (verbose) {
- printf("\td %04o %9lu %5d:%-3d %s\n",
- e->sb.st_mode & ~S_IFMT, (unsigned long) e->sb.st_size,
+ printf("\td %04o %llu %5d:%-3d %s\n",
+ e->sb.st_mode & ~S_IFMT, (unsigned long long) e->sb.st_size,
(int) (e->sb.st_uid), (int) (e->sb.st_gid),
e->name);
}
@@ -1242,8 +1242,8 @@ static void recursive_populate_directory(struct filesystem_entry *dir)
break;
case S_IFSOCK:
if (verbose) {
- printf("\ts %04o %9lu %5d:%-3d %s\n",
- e->sb.st_mode & ~S_IFMT, (unsigned long) e->sb.st_size,
+ printf("\ts %04o %llu %5d:%-3d %s\n",
+ e->sb.st_mode & ~S_IFMT, (unsigned long long) e->sb.st_size,
(int) e->sb.st_uid, (int) e->sb.st_gid, e->name);
}
write_pipe(e);
@@ -1251,8 +1251,8 @@ static void recursive_populate_directory(struct filesystem_entry *dir)
break;
case S_IFIFO:
if (verbose) {
- printf("\tp %04o %9lu %5d:%-3d %s\n",
- e->sb.st_mode & ~S_IFMT, (unsigned long) e->sb.st_size,
+ printf("\tp %04o %llu %5d:%-3d %s\n",
+ e->sb.st_mode & ~S_IFMT, (unsigned long long) e->sb.st_size,
(int) e->sb.st_uid, (int) e->sb.st_gid, e->name);
}
write_pipe(e);
@@ -1280,8 +1280,8 @@ static void recursive_populate_directory(struct filesystem_entry *dir)
break;
case S_IFLNK:
if (verbose) {
- printf("\tl %04o %9lu %5d:%-3d %s -> %s\n",
- e->sb.st_mode & ~S_IFMT, (unsigned long) e->sb.st_size,
+ printf("\tl %04o %llu %5d:%-3d %s -> %s\n",
+ e->sb.st_mode & ~S_IFMT, (unsigned long long) e->sb.st_size,
(int) e->sb.st_uid, (int) e->sb.st_gid, e->name,
e->link);
}
@@ -1292,8 +1292,8 @@ static void recursive_populate_directory(struct filesystem_entry *dir)
wrote = write_regular_file(e);
write_xattr_entry(e);
if (verbose) {
- printf("\tf %04o %9lu (%9u) %5d:%-3d %s\n",
- e->sb.st_mode & ~S_IFMT, (unsigned long) e->sb.st_size,
+ printf("\tf %04o %llu (%9u) %5d:%-3d %s\n",
+ e->sb.st_mode & ~S_IFMT, (unsigned long long) e->sb.st_size,
wrote, (int) e->sb.st_uid, (int) e->sb.st_gid, e->name);
}
break;
--
1.6.3.3
More information about the linux-mtd
mailing list