libext2fs: always refuse to open a file system with a zero s_desc_size

[tools/e2fsprogs.git] / e2fsck / message.c

diff --git a/e2fsck/message.c b/e2fsck/message.c
index 7fc6569..ba38038 100644 (file)
--- a/e2fsck/message.c
+++ b/e2fsck/message.c
@@ -224,7 +224,7 @@ static void print_time(FILE *f, time_t t)
        static int              do_gmt = -1;
 
 #ifdef __dietlibc__
-               /* The diet libc doesn't respect the TZ environemnt variable */
+               /* The diet libc doesn't respect the TZ environment variable */
                if (do_gmt == -1) {
                        time_str = getenv("TZ");
                        if (!time_str)
@@ -281,10 +281,7 @@ static _INLINE_ void expand_inode_expression(FILE *f, ext2_filsys fs, char ch,
 
        switch (ch) {
        case 's':
-               if (LINUX_S_ISDIR(inode->i_mode))
-                       fprintf(f, "%u", inode->i_size);
-               else
-                       fprintf(f, "%llu", EXT2_I_SIZE(inode));
+               fprintf(f, "%llu", (unsigned long long) EXT2_I_SIZE(inode));
                break;
        case 'S':
                fprintf(f, "%u", large_inode->i_extra_isize);
@@ -310,7 +307,8 @@ static _INLINE_ void expand_inode_expression(FILE *f, ext2_filsys fs, char ch,
                fprintf(f, "%u", inode->i_faddr);
                break;
        case 'f':
-               fprintf(f, "%llu", ext2fs_file_acl_block(fs, inode));
+               fprintf(f, "%llu",
+                       (unsigned long long) ext2fs_file_acl_block(fs, inode));
                break;
        case 'd':
                fprintf(f, "%u", (LINUX_S_ISDIR(inode->i_mode) ?
@@ -465,7 +463,9 @@ static _INLINE_ void expand_percent_expression(FILE *f, ext2_filsys fs,
                fprintf(f, "%*lld", width, (long long) ctx->blkcount);
                break;
        case 'S':
-               fprintf(f, "%llu", get_backup_sb(NULL, fs, NULL, NULL));
+               fprintf(f, "%llu",
+                       (unsigned long long) get_backup_sb(NULL, fs,
+                                                          NULL, NULL));
                break;
        case 's':
                fprintf(f, "%*s", width, ctx->str ? ctx->str : "NULL");
@@ -485,7 +485,7 @@ static _INLINE_ void expand_percent_expression(FILE *f, ext2_filsys fs,
                        m = _("group");
                        break;
                case PRJQUOTA:
-                       m = _("group");
+                       m = _("project");
                        break;
                default:
                        m = _("unknown quota type");