Whamcloud - gitweb
git://git.whamcloud.com / tools / e2fsprogs.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
libext2fs: return an error when byte swapping a corrupted dirblock block
[tools/e2fsprogs.git] / e2fsck / unix.c
diff --git a/e2fsck/unix.c b/e2fsck/unix.c
index 4fe5fe4..853eb29 100644 (file)
--- a/e2fsck/unix.c
+++ b/e2fsck/unix.c
@@ -52,6 +52,7 @@ extern int optind;
 #include "e2p/e2p.h"
 #include "uuid/uuid.h"
 #include "support/plausible.h"
+#include "support/devname.h"
 #include "e2fsck.h"
 #include "problem.h"
 #include "jfs_user.h"
@@ -78,7 +79,7 @@ static void usage(e2fsck_t ctx)
                _("Usage: %s [-panyrcdfktvDFV] [-b superblock] [-B blocksize]\n"
                "\t\t[-l|-L bad_blocks_file] [-C fd] [-j external_journal]\n"
                "\t\t[-E extended-options] [-z undo_file] device\n"),
-               ctx->program_name);
+               ctx->program_name ? ctx->program_name : "e2fsck");
 
        fprintf(stderr, "%s", _("\nEmergency help:\n"
                " -p                   Automatic repair (no questions)\n"
@@ -138,7 +139,8 @@ static void show_stats(e2fsck_t     ctx)
                               "%llu/%llu blocks\n"),
                        ctx->device_name, inodes_used, inodes,
                        frag_percent_total / 10, frag_percent_total % 10,
-                       blocks_used, blocks);
+                       (unsigned long long) blocks_used,
+                       (unsigned long long) blocks);
                return;
        }
        profile_get_boolean(ctx->profile, "options", "report_features", 0, 0,
@@ -194,7 +196,8 @@ static void show_stats(e2fsck_t     ctx)
        log_out(ctx, P_("%12llu block used (%2.2f%%, out of %llu)\n",
                        "%12llu blocks used (%2.2f%%, out of %llu)\n",
                   blocks_used),
-               blocks_used, 100.0 * blocks_used / blocks, blocks);
+               (unsigned long long) blocks_used, 100.0 * blocks_used / blocks,
+               (unsigned long long) blocks);
        log_out(ctx, P_("%12u bad block\n", "%12u bad blocks\n",
                        ctx->fs_badblocks_count), ctx->fs_badblocks_count);
        log_out(ctx, P_("%12u large file\n", "%12u large files\n",
@@ -302,7 +305,7 @@ static int is_on_batt(void)
        }
        f = fopen("/proc/apm", "r");
        if (f) {
-               if (fscanf(f, "%s %s %s %x", tmp, tmp, tmp, &acflag) != 4)
+               if (fscanf(f, "%79s %79s %79s %x", tmp, tmp, tmp, &acflag) != 4)
                        acflag = 1;
                fclose(f);
                return (acflag != 1);
@@ -318,7 +321,7 @@ static int is_on_batt(void)
                        f = fopen(fname, "r");
                        if (!f)
                                continue;
-                       if (fscanf(f, "%s %s", tmp2, tmp) != 2)
+                       if (fscanf(f, "%79s %79s", tmp2, tmp) != 2)
                                tmp[0] = 0;
                        fclose(f);
                        if (strncmp(tmp, "off-line", 8) == 0) {
@@ -444,9 +447,9 @@ static void check_if_skip(e2fsck_t ctx)
                ctx->device_name,
                fs->super->s_inodes_count - fs->super->s_free_inodes_count,
                fs->super->s_inodes_count,
-               ext2fs_blocks_count(fs->super) -
+               (unsigned long long) ext2fs_blocks_count(fs->super) -
                ext2fs_free_blocks_count(fs->super),
-               ext2fs_blocks_count(fs->super));
+               (unsigned long long) ext2fs_blocks_count(fs->super));
        next_check = 100000;
        if (fs->super->s_max_mnt_count > 0) {
                next_check = fs->super->s_max_mnt_count - fs->super->s_mnt_count;
@@ -753,6 +756,9 @@ static void parse_extended_opts(e2fsck_t ctx, const char *opts)
                        ctx->options |= E2F_OPT_UNSHARE_BLOCKS;
                        ctx->options |= E2F_OPT_FORCE;
                        continue;
+               } else if (strcmp(token, "check_encoding") == 0) {
+                       ctx->options |= E2F_OPT_CHECK_ENCODING;
+                       continue;
 #ifdef CONFIG_DEVELOPER_FEATURES
                } else if (strcmp(token, "clear_all_uninit_bits") == 0) {
                        ctx->options |= E2F_OPT_CLEAR_UNINIT;
@@ -784,6 +790,7 @@ static void parse_extended_opts(e2fsck_t ctx, const char *opts)
                fputs("\tbmap2extent\n", stderr);
                fputs("\tunshare_blocks\n", stderr);
                fputs("\tfixes_only\n", stderr);
+               fputs("\tcheck_encoding\n", stderr);
                fputc('\n', stderr);
                exit(1);
        }
@@ -817,7 +824,7 @@ static errcode_t PRS(int argc, char *argv[], e2fsck_t *ret_ctx)
 #ifdef CONFIG_JBD_DEBUG
        char            *jbd_debug;
 #endif
-       unsigned long long phys_mem_kb;
+       unsigned long long phys_mem_kb, blk;
 
        retval = e2fsck_allocate_context(&ctx);
        if (retval)
@@ -843,7 +850,7 @@ static errcode_t PRS(int argc, char *argv[], e2fsck_t *ret_ctx)
        if (argc && *argv)
                ctx->program_name = *argv;
        else
-               ctx->program_name = "e2fsck";
+               usage(NULL);
 
        phys_mem_kb = get_memory_size() / 1024;
        ctx->readahead_kb = ~0ULL;
@@ -918,7 +925,8 @@ static errcode_t PRS(int argc, char *argv[], e2fsck_t *ret_ctx)
                        /* What we do by default, anyway! */
                        break;
                case 'b':
-                       res = sscanf(optarg, "%llu", &ctx->use_superblock);
+                       res = sscanf(optarg, "%llu", &blk);
+                       ctx->use_superblock = blk;
                        if (res != 1)
                                goto sscanf_err;
                        ctx->flags |= E2F_FLAG_SB_SPECIFIED;
@@ -932,8 +940,8 @@ static errcode_t PRS(int argc, char *argv[], e2fsck_t *ret_ctx)
                                goto sscanf_err;
                        break;
                case 'j':
-                       ctx->journal_name = blkid_get_devname(ctx->blkid,
-                                                             optarg, NULL);
+                       ctx->journal_name = get_devname(ctx->blkid,
+                                                       optarg, NULL);
                        if (!ctx->journal_name) {
                                com_err(ctx->program_name, 0,
                                        _("Unable to resolve '%s'"),
@@ -1012,7 +1020,7 @@ static errcode_t PRS(int argc, char *argv[], e2fsck_t *ret_ctx)
        ctx->io_options = strchr(argv[optind], '?');
        if (ctx->io_options)
                *ctx->io_options++ = 0;
-       ctx->filesystem_name = blkid_get_devname(ctx->blkid, argv[optind], 0);
+       ctx->filesystem_name = get_devname(ctx->blkid, argv[optind], 0);
        if (!ctx->filesystem_name) {
                com_err(ctx->program_name, 0, _("Unable to resolve '%s'"),
                        argv[optind]);
@@ -1164,25 +1172,32 @@ static errcode_t try_open_fs(e2fsck_t ctx, int flags, io_manager io_ptr,
        errcode_t retval;
 
        *ret_fs = NULL;
-       if (ctx->superblock && ctx->blocksize) {
-               retval = ext2fs_open2(ctx->filesystem_name, ctx->io_options,
-                                     flags, ctx->superblock, ctx->blocksize,
-                                     io_ptr, ret_fs);
-       } else if (ctx->superblock) {
-               int blocksize;
-               for (blocksize = EXT2_MIN_BLOCK_SIZE;
-                    blocksize <= EXT2_MAX_BLOCK_SIZE; blocksize *= 2) {
-                       if (*ret_fs) {
-                               ext2fs_free(*ret_fs);
-                               *ret_fs = NULL;
+
+       if (ctx->superblock) {
+               unsigned long blocksize = ctx->blocksize;
+
+               if (!blocksize) {
+                       for (blocksize = EXT2_MIN_BLOCK_SIZE;
+                            blocksize <= EXT2_MAX_BLOCK_SIZE; blocksize *= 2) {
+
+                               retval = ext2fs_open2(ctx->filesystem_name,
+                                                     ctx->io_options, flags,
+                                                     ctx->superblock, blocksize,
+                                                     unix_io_manager, ret_fs);
+                               if (*ret_fs) {
+                                       ext2fs_free(*ret_fs);
+                                       *ret_fs = NULL;
+                               }
+                               if (!retval)
+                                       break;
                        }
-                       retval = ext2fs_open2(ctx->filesystem_name,
-                                             ctx->io_options, flags,
-                                             ctx->superblock, blocksize,
-                                             io_ptr, ret_fs);
-                       if (!retval)
-                               break;
+                       if (retval)
+                               return retval;
                }
+
+               retval = ext2fs_open2(ctx->filesystem_name, ctx->io_options,
+                                     flags, ctx->superblock, blocksize,
+                                     io_ptr, ret_fs);
        } else
                retval = ext2fs_open2(ctx->filesystem_name, ctx->io_options,
                                      flags, 0, 0, io_ptr, ret_fs);
@@ -1612,7 +1627,8 @@ failure:
                         * so that we are able to recover from more errors
                         * (e.g. some tool messing up some value in the sb).
                         */
-                       if ((retval == EXT2_ET_CORRUPT_SUPERBLOCK) &&
+                       if (((retval == EXT2_ET_CORRUPT_SUPERBLOCK) ||
+                            (retval == EXT2_ET_BAD_DESC_SIZE)) &&
                            !(flags & EXT2_FLAG_IGNORE_SB_ERRORS)) {
                                if (fs)
                                        ext2fs_close_free(&fs);
Mirror of git://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git