From d377698f96e3aa8cedaef5fd10c15de2bc614a7b Mon Sep 17 00:00:00 2001 From: Steve Kondik Date: Tue, 10 Nov 2015 14:16:20 +0100 Subject: e2fsprogs: Rework build configuration Change-Id: I8d6137a9c22b165e79e19ab3997cabf182bba363 --- e2fsck/Android.mk | 12 +-- misc/Android.mk | 81 +------------- misc/util.c | 304 ---------------------------------------------------- misc/util.h | 312 +++++++++++++++++++++++++++++++++++++++++++++++++++--- 4 files changed, 303 insertions(+), 406 deletions(-) delete mode 100644 misc/util.c diff --git a/e2fsck/Android.mk b/e2fsck/Android.mk index 01bca062..e553cc50 100644 --- a/e2fsck/Android.mk +++ b/e2fsck/Android.mk @@ -167,17 +167,11 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(e2fsck_src_files) LOCAL_C_INCLUDES := $(e2fsck_c_includes) -LOCAL_CFLAGS := $(e2fsck_cflags) +LOCAL_CFLAGS := $(e2fsck_cflags) -Dmain=e2fsck_main LOCAL_STATIC_LIBRARIES := $(e2fsck_system_shared_libraries) $(e2fsck_shared_libraries) libext2fs -LOCAL_MODULE := recovery_e2fsck -LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLES -LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/sbin -LOCAL_UNSTRIPPED_PATH := $(PRODUCT_OUT)/symbols/recovery -LOCAL_MODULE_STEM := e2fsck -LOCAL_FORCE_STATIC_EXECUTABLE := true -LOCAL_PACK_MODULE_RELOCATIONS := false +LOCAL_MODULE := libe2fsck_static LOCAL_MODULE_TAGS := optional -include $(BUILD_EXECUTABLE) +include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) diff --git a/misc/Android.mk b/misc/Android.mk index e70591d7..3cba7c45 100644 --- a/misc/Android.mk +++ b/misc/Android.mk @@ -4,7 +4,6 @@ LOCAL_PATH := $(call my-dir) # Build mke2fs mke2fs_src_files := \ mke2fs.c \ - util.c \ default_profile.c mke2fs_c_includes := \ @@ -69,35 +68,10 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(mke2fs_src_files) LOCAL_C_INCLUDES := $(mke2fs_c_includes) -LOCAL_CFLAGS := $(mke2fs_cflags) $(mke2fs_cflags_linux) -LOCAL_STATIC_LIBRARIES := $(mke2fs_shared_libraries) -LOCAL_STATIC_LIBRARIES += $(mke2fs_system_shared_libraries) libext2fs -LOCAL_MODULE := recovery_mke2fs +LOCAL_CFLAGS := $(mke2fs_cflags) $(mke2fs_cflags_linux) -Dmain=mke2fs_main +LOCAL_MODULE := libmke2fs_static LOCAL_MODULE_TAGS := eng -LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLES -LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/sbin -LOCAL_UNSTRIPPED_PATH := $(PRODUCT_OUT)/symbols/recovery -LOCAL_MODULE_STEM := mke2fs -LOCAL_FORCE_STATIC_EXECUTABLE := true -LOCAL_PACK_MODULE_RELOCATIONS := false -include $(BUILD_EXECUTABLE) - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := $(mke2fs_src_files) -LOCAL_C_INCLUDES := $(mke2fs_c_includes) -LOCAL_CFLAGS := $(mke2fs_cflags) $(mke2fs_cflags_linux) -LOCAL_STATIC_LIBRARIES := $(mke2fs_shared_libraries) -LOCAL_STATIC_LIBRARIES += $(mke2fs_system_shared_libraries) libext2fs -LOCAL_MODULE := utility_mke2fs -LOCAL_MODULE_TAGS := eng -LOCAL_MODULE_CLASS := UTILITY_EXECUTABLES -LOCAL_MODULE_PATH := $(PRODUCT_OUT)/utilities -LOCAL_UNSTRIPPED_PATH := $(PRODUCT_OUT)/symbols/utilities -LOCAL_MODULE_STEM := mke2fs -LOCAL_FORCE_STATIC_EXECUTABLE := true -LOCAL_PACK_MODULE_RELOCATIONS := false -include $(BUILD_EXECUTABLE) +include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) @@ -120,7 +94,6 @@ include $(BUILD_HOST_EXECUTABLE) # tune2fs_src_files := \ tune2fs.c \ - util.c tune2fs_c_includes := \ external/e2fsprogs/lib \ @@ -193,59 +166,13 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(tune2fs_src_files) LOCAL_C_INCLUDES := $(tune2fs_c_includes) -LOCAL_CFLAGS := $(tune2fs_cflags) -LOCAL_STATIC_LIBRARIES := $(tune2fs_static_libraries) $(tune2fs_system_static_libraries) -LOCAL_FORCE_STATIC_EXECUTABLE := true -LOCAL_MODULE := tune2fs_static -LOCAL_MODULE_TAGS := optional - -include $(BUILD_EXECUTABLE) - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := $(tune2fs_src_files) -LOCAL_C_INCLUDES := $(tune2fs_c_includes) -LOCAL_CFLAGS := $(tune2fs_cflags) -DBUILD_AS_LIB -LOCAL_STATIC_LIBRARIES := $(tune2fs_static_libraries) $(tune2fs_system_static_libraries) +LOCAL_CFLAGS := $(tune2fs_cflags) -Dmain="tune2fs_main" LOCAL_MODULE := libtune2fs LOCAL_MODULE_TAGS := optional - include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) -LOCAL_SRC_FILES := $(tune2fs_src_files) -LOCAL_C_INCLUDES := $(tune2fs_c_includes) -LOCAL_CFLAGS := $(tune2fs_cflags) -LOCAL_STATIC_LIBRARIES := $(tune2fs_shared_libraries) $(tune2fs_system_shared_libraries) libext2fs -LOCAL_MODULE := utility_tune2fs -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := UTILITY_EXECUTABLES -LOCAL_MODULE_PATH := $(PRODUCT_OUT)/utilities -LOCAL_UNSTRIPPED_PATH := $(PRODUCT_OUT)/symbols/utilities -LOCAL_MODULE_STEM := tune2fs -LOCAL_FORCE_STATIC_EXECUTABLE := true -LOCAL_PACK_MODULE_RELOCATIONS := false -include $(BUILD_EXECUTABLE) - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := $(tune2fs_src_files) -LOCAL_C_INCLUDES := $(tune2fs_c_includes) -LOCAL_CFLAGS := $(tune2fs_cflags) -LOCAL_STATIC_LIBRARIES := $(tune2fs_shared_libraries) $(tune2fs_system_shared_libraries) libext2fs -LOCAL_MODULE := recovery_tune2fs -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLES -LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/sbin -LOCAL_UNSTRIPPED_PATH := $(PRODUCT_OUT)/symbols/recovery -LOCAL_MODULE_STEM := tune2fs -LOCAL_FORCE_STATIC_EXECUTABLE := true -LOCAL_PACK_MODULE_RELOCATIONS := false -include $(BUILD_EXECUTABLE) - -include $(CLEAR_VARS) - LOCAL_SRC_FILES := $(tune2fs_src_files) LOCAL_C_INCLUDES := $(tune2fs_c_includes) LOCAL_CFLAGS := $(tune2fs_cflags) diff --git a/misc/util.c b/misc/util.c deleted file mode 100644 index e62cc7fd..00000000 --- a/misc/util.c +++ /dev/null @@ -1,304 +0,0 @@ -/* - * util.c --- helper functions used by tune2fs and mke2fs - * - * Copyright 1995, 1996, 1997, 1998, 1999, 2000 by Theodore Ts'o. - * - * %Begin-Header% - * This file may be redistributed under the terms of the GNU Public - * License. - * %End-Header% - */ - -#define _LARGEFILE_SOURCE -#define _LARGEFILE64_SOURCE - -#include -#include -#ifdef HAVE_ERRNO_H -#include -#endif -#ifdef HAVE_LINUX_MAJOR_H -#include -#endif -#ifdef HAVE_SYS_STAT_H -#include -#endif -#include - -#include "et/com_err.h" -#include "e2p/e2p.h" -#include "ext2fs/ext2_fs.h" -#include "ext2fs/ext2fs.h" -#include "nls-enable.h" -#include "blkid/blkid.h" -#include "util.h" - -#ifndef HAVE_STRCASECMP -int strcasecmp (char *s1, char *s2) -{ - while (*s1 && *s2) { - int ch1 = *s1++, ch2 = *s2++; - if (isupper (ch1)) - ch1 = tolower (ch1); - if (isupper (ch2)) - ch2 = tolower (ch2); - if (ch1 != ch2) - return ch1 - ch2; - } - return *s1 ? 1 : *s2 ? -1 : 0; -} -#endif - -/* - * Given argv[0], return the program name. - */ -char *get_progname(char *argv_zero) -{ - char *cp; - - cp = strrchr(argv_zero, '/'); - if (!cp ) - return argv_zero; - else - return cp+1; -} - -void proceed_question(void) -{ - char buf[256]; - const char *short_yes = _("yY"); - - fflush(stdout); - fflush(stderr); - fputs(_("Proceed anyway? (y,n) "), stdout); - buf[0] = 0; - if (!fgets(buf, sizeof(buf), stdin) || - strchr(short_yes, buf[0]) == 0) - exit(1); -} - -void check_plausibility(const char *device) -{ - int val; - ext2fs_struct_stat s; - - val = ext2fs_stat(device, &s); - - if(val == -1) { - fprintf(stderr, _("Could not stat %s --- %s\n"), - device, error_message(errno)); - if (errno == ENOENT) - fputs(_("\nThe device apparently does not exist; " - "did you specify it correctly?\n"), stderr); - exit(1); - } -#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) - /* On FreeBSD, all disk devices are character specials */ - if (!S_ISBLK(s.st_mode) && !S_ISCHR(s.st_mode)) -#else - if (!S_ISBLK(s.st_mode)) -#endif - { - printf(_("%s is not a block special device.\n"), device); - proceed_question(); - return; - } - -#ifdef HAVE_LINUX_MAJOR_H -#ifndef MAJOR -#define MAJOR(dev) ((dev)>>8) -#define MINOR(dev) ((dev) & 0xff) -#endif -#ifndef SCSI_BLK_MAJOR -#ifdef SCSI_DISK0_MAJOR -#ifdef SCSI_DISK8_MAJOR -#define SCSI_DISK_MAJOR(M) ((M) == SCSI_DISK0_MAJOR || \ - ((M) >= SCSI_DISK1_MAJOR && (M) <= SCSI_DISK7_MAJOR) || \ - ((M) >= SCSI_DISK8_MAJOR && (M) <= SCSI_DISK15_MAJOR)) -#else -#define SCSI_DISK_MAJOR(M) ((M) == SCSI_DISK0_MAJOR || \ - ((M) >= SCSI_DISK1_MAJOR && (M) <= SCSI_DISK7_MAJOR)) -#endif /* defined(SCSI_DISK8_MAJOR) */ -#define SCSI_BLK_MAJOR(M) (SCSI_DISK_MAJOR((M)) || (M) == SCSI_CDROM_MAJOR) -#else -#define SCSI_BLK_MAJOR(M) ((M) == SCSI_DISK_MAJOR || (M) == SCSI_CDROM_MAJOR) -#endif /* defined(SCSI_DISK0_MAJOR) */ -#endif /* defined(SCSI_BLK_MAJOR) */ - if (((MAJOR(s.st_rdev) == HD_MAJOR && - MINOR(s.st_rdev)%64 == 0) || - (SCSI_BLK_MAJOR(MAJOR(s.st_rdev)) && - MINOR(s.st_rdev)%16 == 0))) { - printf(_("%s is entire device, not just one partition!\n"), - device); - proceed_question(); - } -#endif -} - -void check_mount(const char *device, int force, const char *type) -{ - errcode_t retval; - int mount_flags; - - retval = ext2fs_check_if_mounted(device, &mount_flags); - if (retval) { - com_err("ext2fs_check_if_mount", retval, - _("while determining whether %s is mounted."), - device); - return; - } - if (mount_flags & EXT2_MF_MOUNTED) { - fprintf(stderr, _("%s is mounted; "), device); - if (force >= 2) { - fputs(_("mke2fs forced anyway. Hope /etc/mtab is " - "incorrect.\n"), stderr); - return; - } - abort_mke2fs: - fprintf(stderr, _("will not make a %s here!\n"), type); - exit(1); - } - if (mount_flags & EXT2_MF_BUSY) { - fprintf(stderr, _("%s is apparently in use by the system; "), - device); - if (force >= 2) { - fputs(_("mke2fs forced anyway.\n"), stderr); - return; - } - goto abort_mke2fs; - } -} - -void parse_journal_opts(const char *opts) -{ - char *buf, *token, *next, *p, *arg; - int len; - int journal_usage = 0; - - len = strlen(opts); - buf = malloc(len+1); - if (!buf) { - fputs(_("Couldn't allocate memory to parse journal " - "options!\n"), stderr); - exit(1); - } - strcpy(buf, opts); - for (token = buf; token && *token; token = next) { - p = strchr(token, ','); - next = 0; - if (p) { - *p = 0; - next = p+1; - } - arg = strchr(token, '='); - if (arg) { - *arg = 0; - arg++; - } -#if 0 - printf("Journal option=%s, argument=%s\n", token, - arg ? arg : "NONE"); -#endif - if (strcmp(token, "device") == 0) { - journal_device = blkid_get_devname(NULL, arg, NULL); - if (!journal_device) { - if (arg) - fprintf(stderr, _("\nCould not find " - "journal device matching %s\n"), - arg); - journal_usage++; - continue; - } - } else if (strcmp(token, "size") == 0) { - if (!arg) { - journal_usage++; - continue; - } - journal_size = strtoul(arg, &p, 0); - if (*p) - journal_usage++; - } else if (strcmp(token, "v1_superblock") == 0) { - journal_flags |= EXT2_MKJOURNAL_V1_SUPER; - continue; - } else - journal_usage++; - } - if (journal_usage) { - fputs(_("\nBad journal options specified.\n\n" - "Journal options are separated by commas, " - "and may take an argument which\n" - "\tis set off by an equals ('=') sign.\n\n" - "Valid journal options are:\n" - "\tsize=\n" - "\tdevice=\n\n" - "The journal size must be between " - "1024 and 10240000 filesystem blocks.\n\n"), stderr); - free(buf); - exit(1); - } - free(buf); -} - -/* - * Determine the number of journal blocks to use, either via - * user-specified # of megabytes, or via some intelligently selected - * defaults. - * - * Find a reasonable journal file size (in blocks) given the number of blocks - * in the filesystem. For very small filesystems, it is not reasonable to - * have a journal that fills more than half of the filesystem. - */ -unsigned int figure_journal_size(int size, ext2_filsys fs) -{ - int j_blocks; - - j_blocks = ext2fs_default_journal_size(ext2fs_blocks_count(fs->super)); - if (j_blocks < 0) { - fputs(_("\nFilesystem too small for a journal\n"), stderr); - return 0; - } - - if (size > 0) { - j_blocks = size * 1024 / (fs->blocksize / 1024); - if (j_blocks < 1024 || j_blocks > 10240000) { - fprintf(stderr, _("\nThe requested journal " - "size is %d blocks; it must be\n" - "between 1024 and 10240000 blocks. " - "Aborting.\n"), - j_blocks); - exit(1); - } - if ((unsigned) j_blocks > ext2fs_free_blocks_count(fs->super) / 2) { - fputs(_("\nJournal size too big for filesystem.\n"), - stderr); - exit(1); - } - } - return j_blocks; -} - -void print_check_message(int mnt, unsigned int check) -{ - if (mnt < 0) - mnt = 0; - if (!mnt && !check) - return; - printf(_("This filesystem will be automatically " - "checked every %d mounts or\n" - "%g days, whichever comes first. " - "Use tune2fs -c or -i to override.\n"), - mnt, ((double) check) / (3600 * 24)); -} - -void dump_mmp_msg(struct mmp_struct *mmp, const char *msg) -{ - - if (msg) - printf("MMP check failed: %s\n", msg); - if (mmp) { - time_t t = mmp->mmp_time; - - printf("MMP error info: last update: %s node: %s device: %s\n", - ctime(&t), mmp->mmp_nodename, mmp->mmp_bdevname); - } -} diff --git a/misc/util.h b/misc/util.h index f872c38c..bee52124 100644 --- a/misc/util.h +++ b/misc/util.h @@ -1,8 +1,7 @@ /* - * util.h --- header file defining prototypes for helper functions - * used by tune2fs and mke2fs + * util.c --- helper functions used by tune2fs and mke2fs * - * Copyright 2000 by Theodore Ts'o. + * Copyright 1995, 1996, 1997, 1998, 1999, 2000 by Theodore Ts'o. * * %Begin-Header% * This file may be redistributed under the terms of the GNU Public @@ -10,18 +9,299 @@ * %End-Header% */ -extern int journal_size; -extern int journal_flags; -extern char *journal_device; +#define _LARGEFILE_SOURCE +#define _LARGEFILE64_SOURCE + +#include +#include +#ifdef HAVE_ERRNO_H +#include +#endif +#ifdef HAVE_LINUX_MAJOR_H +#include +#endif +#ifdef HAVE_SYS_STAT_H +#include +#endif +#include + +#include "et/com_err.h" +#include "e2p/e2p.h" +#include "ext2fs/ext2_fs.h" +#include "ext2fs/ext2fs.h" +#include "nls-enable.h" +#include "blkid/blkid.h" + +extern int journal_size; +extern int journal_flags; +extern char *journal_device; #ifndef HAVE_STRCASECMP -extern int strcasecmp (char *s1, char *s2); -#endif -extern char *get_progname(char *argv_zero); -extern void proceed_question(void); -extern void check_plausibility(const char *device); -extern void parse_journal_opts(const char *opts); -extern void check_mount(const char *device, int force, const char *type); -extern unsigned int figure_journal_size(int size, ext2_filsys fs); -extern void print_check_message(int, unsigned int); -extern void dump_mmp_msg(struct mmp_struct *mmp, const char *msg); +int strcasecmp (char *s1, char *s2) +{ + while (*s1 && *s2) { + int ch1 = *s1++, ch2 = *s2++; + if (isupper (ch1)) + ch1 = tolower (ch1); + if (isupper (ch2)) + ch2 = tolower (ch2); + if (ch1 != ch2) + return ch1 - ch2; + } + return *s1 ? 1 : *s2 ? -1 : 0; +} +#endif + +/* + * Given argv[0], return the program name. + */ +static inline char *get_progname(char *argv_zero) +{ + char *cp; + + cp = strrchr(argv_zero, '/'); + if (!cp ) + return argv_zero; + else + return cp+1; +} + +static inline void proceed_question(void) +{ + char buf[256]; + const char *short_yes = _("yY"); + + fflush(stdout); + fflush(stderr); + fputs(_("Proceed anyway? (y,n) "), stdout); + buf[0] = 0; + if (!fgets(buf, sizeof(buf), stdin) || + strchr(short_yes, buf[0]) == 0) + exit(1); +} + +static inline void check_plausibility(const char *device) +{ + int val; + ext2fs_struct_stat s; + + val = ext2fs_stat(device, &s); + + if(val == -1) { + fprintf(stderr, _("Could not stat %s --- %s\n"), + device, error_message(errno)); + if (errno == ENOENT) + fputs(_("\nThe device apparently does not exist; " + "did you specify it correctly?\n"), stderr); + exit(1); + } +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) + /* On FreeBSD, all disk devices are character specials */ + if (!S_ISBLK(s.st_mode) && !S_ISCHR(s.st_mode)) +#else + if (!S_ISBLK(s.st_mode)) +#endif + { + printf(_("%s is not a block special device.\n"), device); + proceed_question(); + return; + } + +#ifdef HAVE_LINUX_MAJOR_H +#ifndef MAJOR +#define MAJOR(dev) ((dev)>>8) +#define MINOR(dev) ((dev) & 0xff) +#endif +#ifndef SCSI_BLK_MAJOR +#ifdef SCSI_DISK0_MAJOR +#ifdef SCSI_DISK8_MAJOR +#define SCSI_DISK_MAJOR(M) ((M) == SCSI_DISK0_MAJOR || \ + ((M) >= SCSI_DISK1_MAJOR && (M) <= SCSI_DISK7_MAJOR) || \ + ((M) >= SCSI_DISK8_MAJOR && (M) <= SCSI_DISK15_MAJOR)) +#else +#define SCSI_DISK_MAJOR(M) ((M) == SCSI_DISK0_MAJOR || \ + ((M) >= SCSI_DISK1_MAJOR && (M) <= SCSI_DISK7_MAJOR)) +#endif /* defined(SCSI_DISK8_MAJOR) */ +#define SCSI_BLK_MAJOR(M) (SCSI_DISK_MAJOR((M)) || (M) == SCSI_CDROM_MAJOR) +#else +#define SCSI_BLK_MAJOR(M) ((M) == SCSI_DISK_MAJOR || (M) == SCSI_CDROM_MAJOR) +#endif /* defined(SCSI_DISK0_MAJOR) */ +#endif /* defined(SCSI_BLK_MAJOR) */ + if (((MAJOR(s.st_rdev) == HD_MAJOR && + MINOR(s.st_rdev)%64 == 0) || + (SCSI_BLK_MAJOR(MAJOR(s.st_rdev)) && + MINOR(s.st_rdev)%16 == 0))) { + printf(_("%s is entire device, not just one partition!\n"), + device); + proceed_question(); + } +#endif +} + +static inline void check_mount(const char *device, int force, const char *type) +{ + errcode_t retval; + int mount_flags; + + retval = ext2fs_check_if_mounted(device, &mount_flags); + if (retval) { + com_err("ext2fs_check_if_mount", retval, + _("while determining whether %s is mounted."), + device); + return; + } + if (mount_flags & EXT2_MF_MOUNTED) { + fprintf(stderr, _("%s is mounted; "), device); + if (force >= 2) { + fputs(_("mke2fs forced anyway. Hope /etc/mtab is " + "incorrect.\n"), stderr); + return; + } + abort_mke2fs: + fprintf(stderr, _("will not make a %s here!\n"), type); + exit(1); + } + if (mount_flags & EXT2_MF_BUSY) { + fprintf(stderr, _("%s is apparently in use by the system; "), + device); + if (force >= 2) { + fputs(_("mke2fs forced anyway.\n"), stderr); + return; + } + goto abort_mke2fs; + } +} + +static inline void parse_journal_opts(const char *opts) +{ + char *buf, *token, *next, *p, *arg; + int len; + int journal_usage = 0; + + len = strlen(opts); + buf = malloc(len+1); + if (!buf) { + fputs(_("Couldn't allocate memory to parse journal " + "options!\n"), stderr); + exit(1); + } + strcpy(buf, opts); + for (token = buf; token && *token; token = next) { + p = strchr(token, ','); + next = 0; + if (p) { + *p = 0; + next = p+1; + } + arg = strchr(token, '='); + if (arg) { + *arg = 0; + arg++; + } +#if 0 + printf("Journal option=%s, argument=%s\n", token, + arg ? arg : "NONE"); +#endif + if (strcmp(token, "device") == 0) { + journal_device = blkid_get_devname(NULL, arg, NULL); + if (!journal_device) { + if (arg) + fprintf(stderr, _("\nCould not find " + "journal device matching %s\n"), + arg); + journal_usage++; + continue; + } + } else if (strcmp(token, "size") == 0) { + if (!arg) { + journal_usage++; + continue; + } + journal_size = strtoul(arg, &p, 0); + if (*p) + journal_usage++; + } else if (strcmp(token, "v1_superblock") == 0) { + journal_flags |= EXT2_MKJOURNAL_V1_SUPER; + continue; + } else + journal_usage++; + } + if (journal_usage) { + fputs(_("\nBad journal options specified.\n\n" + "Journal options are separated by commas, " + "and may take an argument which\n" + "\tis set off by an equals ('=') sign.\n\n" + "Valid journal options are:\n" + "\tsize=\n" + "\tdevice=\n\n" + "The journal size must be between " + "1024 and 10240000 filesystem blocks.\n\n"), stderr); + free(buf); + exit(1); + } + free(buf); +} + +/* + * Determine the number of journal blocks to use, either via + * user-specified # of megabytes, or via some intelligently selected + * defaults. + * + * Find a reasonable journal file size (in blocks) given the number of blocks + * in the filesystem. For very small filesystems, it is not reasonable to + * have a journal that fills more than half of the filesystem. + */ +static inline unsigned int figure_journal_size(int size, ext2_filsys fs) +{ + int j_blocks; + + j_blocks = ext2fs_default_journal_size(ext2fs_blocks_count(fs->super)); + if (j_blocks < 0) { + fputs(_("\nFilesystem too small for a journal\n"), stderr); + return 0; + } + + if (size > 0) { + j_blocks = size * 1024 / (fs->blocksize / 1024); + if (j_blocks < 1024 || j_blocks > 10240000) { + fprintf(stderr, _("\nThe requested journal " + "size is %d blocks; it must be\n" + "between 1024 and 10240000 blocks. " + "Aborting.\n"), + j_blocks); + exit(1); + } + if ((unsigned) j_blocks > ext2fs_free_blocks_count(fs->super) / 2) { + fputs(_("\nJournal size too big for filesystem.\n"), + stderr); + exit(1); + } + } + return j_blocks; +} + +static inline void print_check_message(int mnt, unsigned int check) +{ + if (mnt < 0) + mnt = 0; + if (!mnt && !check) + return; + printf(_("This filesystem will be automatically " + "checked every %d mounts or\n" + "%g days, whichever comes first. " + "Use tune2fs -c or -i to override.\n"), + mnt, ((double) check) / (3600 * 24)); +} + +static inline void dump_mmp_msg(struct mmp_struct *mmp, const char *msg) +{ + + if (msg) + printf("MMP check failed: %s\n", msg); + if (mmp) { + time_t t = mmp->mmp_time; + + printf("MMP error info: last update: %s node: %s device: %s\n", + ctime(&t), mmp->mmp_nodename, mmp->mmp_bdevname); + } +} -- cgit v1.2.3