X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=misc%2Futil.c;h=dcd2f0a7872c343252a73be3654e619ac11a87d0;hb=33b0356c353feaef32fdcf300d39d2d2ef08ef1f;hp=a08a8dd65f7cbcd284b44ddeada39cd990a11e98;hpb=2fa8f37ffff4687228d9f204062f2d27b0e5b919;p=tools%2Fe2fsprogs.git diff --git a/misc/util.c b/misc/util.c index a08a8dd..dcd2f0a 100644 --- a/misc/util.c +++ b/misc/util.c @@ -1,6 +1,6 @@ /* * util.c --- helper functions used by tune2fs and mke2fs - * + * * Copyright 1995, 1996, 1997, 1998, 1999, 2000 by Theodore Ts'o. * * %Begin-Header% @@ -9,29 +9,47 @@ * %End-Header% */ +#ifndef _LARGEFILE_SOURCE #define _LARGEFILE_SOURCE +#endif +#ifndef _LARGEFILE64_SOURCE #define _LARGEFILE64_SOURCE +#endif +#include "config.h" +#include +#include +#include #include #include #ifdef HAVE_ERRNO_H #include #endif +#if HAVE_UNISTD_H +#include +#endif #ifdef HAVE_LINUX_MAJOR_H #include #endif +#include #ifdef HAVE_SYS_STAT_H #include #endif +#ifdef HAVE_UNISTD_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 "support/nls-enable.h" #include "blkid/blkid.h" #include "util.h" +char *journal_location_string = NULL; + #ifndef HAVE_STRCASECMP int strcasecmp (char *s1, char *s2) { @@ -62,82 +80,42 @@ char *get_progname(char *argv_zero) return cp+1; } -void proceed_question(void) +static jmp_buf alarm_env; + +static void alarm_signal(int signal EXT2FS_ATTR((unused))) +{ + longjmp(alarm_env, 1); +} + +void proceed_question(int delay) { char buf[256]; const char *short_yes = _("yY"); + const char *english_yes = "yY"; fflush(stdout); fflush(stderr); - fputs(_("Proceed anyway? (y,n) "), stdout); + if (delay > 0) { + if (setjmp(alarm_env)) { + signal(SIGALRM, SIG_IGN); + printf("%s", _("\n")); + return; + } + signal(SIGALRM, alarm_signal); + printf(_("Proceed anyway (or wait %d seconds to proceed) ? (y,N) "), + delay); + alarm(delay); + } else + fputs(_("Proceed anyway? (y,N) "), stdout); buf[0] = 0; - fgets(buf, sizeof(buf), stdin); - if (strchr(short_yes, buf[0]) == 0) - exit(1); -} - -void check_plausibility(const char *device) -{ - int val; -#ifdef HAVE_OPEN64 - struct stat64 s; - - val = stat64(device, &s); -#else - struct stat s; - - val = stat(device, &s); -#endif - - 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); + if (!fgets(buf, sizeof(buf), stdin) || + strchr(_("nN"), buf[0]) || + !(strchr(short_yes, buf[0]) || + strchr(english_yes, buf[0]))) { + putc('\n', stdout); 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 + signal(SIGALRM, SIG_IGN); } void check_mount(const char *device, int force, const char *type) @@ -154,7 +132,7 @@ void check_mount(const char *device, int force, const char *type) } if (mount_flags & EXT2_MF_MOUNTED) { fprintf(stderr, _("%s is mounted; "), device); - if (force) { + if (force >= 2) { fputs(_("mke2fs forced anyway. Hope /etc/mtab is " "incorrect.\n"), stderr); return; @@ -166,7 +144,7 @@ void check_mount(const char *device, int force, const char *type) if (mount_flags & EXT2_MF_BUSY) { fprintf(stderr, _("%s is apparently in use by the system; "), device); - if (force) { + if (force >= 2) { fputs(_("mke2fs forced anyway.\n"), stderr); return; } @@ -194,7 +172,7 @@ void parse_journal_opts(const char *opts) if (p) { *p = 0; next = p+1; - } + } arg = strchr(token, '='); if (arg) { *arg = 0; @@ -207,6 +185,10 @@ void parse_journal_opts(const char *opts) 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; } @@ -218,6 +200,12 @@ void parse_journal_opts(const char *opts) journal_size = strtoul(arg, &p, 0); if (*p) journal_usage++; + } else if (!strcmp(token, "location")) { + if (!arg) { + journal_usage++; + continue; + } + journal_location_string = strdup(arg); } else if (strcmp(token, "v1_superblock") == 0) { journal_flags |= EXT2_MKJOURNAL_V1_SUPER; continue; @@ -231,70 +219,77 @@ void parse_journal_opts(const char *opts) "\tis set off by an equals ('=') sign.\n\n" "Valid journal options are:\n" "\tsize=\n" - "\tdevice=\n\n" + "\tdevice=\n" + "\tlocation=\n\n" "The journal size must be between " - "1024 and 102400 filesystem blocks.\n\n"), stderr); + "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. */ -int figure_journal_size(int size, ext2_filsys fs) +unsigned int figure_journal_size(int size, ext2_filsys fs) { - blk_t j_blocks; + int j_blocks; - if (fs->super->s_blocks_count < 2048) { + 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) { + + if (size > 0) { j_blocks = size * 1024 / (fs->blocksize / 1024); - if (j_blocks < 1024 || j_blocks > 102400) { + if (j_blocks < 1024 || j_blocks > 10240000) { fprintf(stderr, _("\nThe requested journal " "size is %d blocks; it must be\n" - "between 1024 and 102400 blocks. " + "between 1024 and 10240000 blocks. " "Aborting.\n"), j_blocks); exit(1); } - if (j_blocks > fs->super->s_free_blocks_count) { + 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; } - - if (fs->super->s_blocks_count < 32768) - j_blocks = 1024; - else if (fs->super->s_blocks_count < 256*1024) - j_blocks = 4096; - else if (fs->super->s_blocks_count < 512*1024) - j_blocks = 8192; - else if (fs->super->s_blocks_count < 1024*1024) - j_blocks = 16384; - else - j_blocks = 32768; - - return j_blocks; } -void print_check_message(ext2_filsys fs) +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"), - fs->super->s_max_mnt_count, - (double)fs->super->s_checkinterval / (3600 * 24)); + 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: node: %.*s, device: %.*s, updated: %s", + EXT2_LEN_STR(mmp->mmp_nodename), + EXT2_LEN_STR(mmp->mmp_bdevname), ctime(&t)); + } }