util: change git-ver to only use a version tag to describe git version

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

diff --git a/e2fsck/e2fsck.c b/e2fsck/e2fsck.c
index e0f449e..1e295e3 100644 (file)
--- a/e2fsck/e2fsck.c
+++ b/e2fsck/e2fsck.c
@@ -37,7 +37,7 @@ errcode_t e2fsck_allocate_context(e2fsck_t *ret)
 
        time_env = getenv("E2FSCK_TIME");
        if (time_env)
-               context->now = strtoul(time_env, NULL, 0);
+               context->now = (time_t) strtoull(time_env, NULL, 0);
        else {
                context->now = time(0);
                if (context->now < 1262322000) /* January 1 2010 */
@@ -75,6 +75,10 @@ errcode_t e2fsck_reset_context(e2fsck_t ctx)
                ext2fs_free_block_bitmap(ctx->block_found_map);
                ctx->block_found_map = 0;
        }
+       if (ctx->inode_casefold_map) {
+               ext2fs_free_block_bitmap(ctx->inode_casefold_map);
+               ctx->inode_casefold_map = 0;
+       }
        if (ctx->inode_link_info) {
                ext2fs_free_icount(ctx->inode_link_info);
                ctx->inode_link_info = 0;
@@ -98,9 +102,17 @@ errcode_t e2fsck_reset_context(e2fsck_t ctx)
                ea_refcount_free(ctx->refcount_extra);
                ctx->refcount_extra = 0;
        }
-       if (ctx->ea_block_quota) {
-               ea_refcount_free(ctx->ea_block_quota);
-               ctx->ea_block_quota = 0;
+       if (ctx->ea_block_quota_blocks) {
+               ea_refcount_free(ctx->ea_block_quota_blocks);
+               ctx->ea_block_quota_blocks = 0;
+       }
+       if (ctx->ea_block_quota_inodes) {
+               ea_refcount_free(ctx->ea_block_quota_inodes);
+               ctx->ea_block_quota_inodes = 0;
+       }
+       if (ctx->ea_inode_refs) {
+               ea_refcount_free(ctx->ea_inode_refs);
+               ctx->ea_inode_refs = 0;
        }
        if (ctx->block_dup_map) {
                ext2fs_free_block_bitmap(ctx->block_dup_map);
@@ -130,6 +142,7 @@ errcode_t e2fsck_reset_context(e2fsck_t ctx)
                ext2fs_u32_list_free(ctx->dirs_to_hash);
                ctx->dirs_to_hash = 0;
        }
+       destroy_encrypted_file_info(ctx);
 
        /*
         * Clear the array of invalid meta-data flags
@@ -146,9 +159,9 @@ errcode_t e2fsck_reset_context(e2fsck_t ctx)
                ext2fs_free_mem(&ctx->invalid_inode_table_flag);
                ctx->invalid_inode_table_flag = 0;
        }
-       if (ctx->encrypted_dirs) {
-               ext2fs_u32_list_free(ctx->encrypted_dirs);
-               ctx->encrypted_dirs = 0;
+       if (ctx->casefolded_dirs) {
+               ext2fs_u32_list_free(ctx->casefolded_dirs);
+               ctx->casefolded_dirs = 0;
        }
        if (ctx->inode_count) {
                ext2fs_free_icount(ctx->inode_count);
@@ -173,6 +186,7 @@ errcode_t e2fsck_reset_context(e2fsck_t ctx)
        ctx->fs_fragmented = 0;
        ctx->fs_fragmented_dir = 0;
        ctx->large_files = 0;
+       ctx->large_dirs = 0;
 
        for (i=0; i < MAX_EXTENT_DEPTH_COUNT; i++)
                ctx->extent_depth_count[i] = 0;
@@ -207,6 +221,13 @@ void e2fsck_free_context(e2fsck_t ctx)
        if (ctx->logf)
                fclose(ctx->logf);
 
+       if (ctx->problem_log_fn)
+               free(ctx->problem_log_fn);
+
+       if (ctx->problem_logf) {
+               fputs("</problem_log>\n", ctx->problem_logf);
+               fclose(ctx->problem_logf);
+       }
        ext2fs_free_mem(&ctx);
 }