mirror of https://github.com/vitalif/e2fsprogs
mke2fs, tune2fs: call proceed_question() from check_plausibility()'s caller
Move the call to proceed_question() from check_plausibility() to its caller. This allows more fine grained control by mke2fs about when it might want to call check_plausibility(). Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>maint-test
parent
83c469bc33
commit
d69f43f56a
|
@ -1749,8 +1749,9 @@ profile_error:
|
|||
if (optind < argc)
|
||||
usage();
|
||||
|
||||
if (!force)
|
||||
check_plausibility(device_name, 0, NULL);
|
||||
if (!check_plausibility(device_name, 0, NULL) && !force)
|
||||
proceed_question();
|
||||
|
||||
check_mount(device_name, force, _("filesystem"));
|
||||
|
||||
/* Determine the size of the device (if possible) */
|
||||
|
@ -2781,9 +2782,9 @@ int main (int argc, char *argv[])
|
|||
if (journal_device) {
|
||||
ext2_filsys jfs;
|
||||
|
||||
if (!force)
|
||||
check_plausibility(journal_device, CHECK_BLOCK_DEV,
|
||||
NULL);
|
||||
if (!check_plausibility(journal_device, CHECK_BLOCK_DEV,
|
||||
NULL) && !force)
|
||||
proceed_question();
|
||||
check_mount(journal_device, force, _("journal"));
|
||||
|
||||
retval = ext2fs_open(journal_device, EXT2_FLAG_RW|
|
||||
|
|
|
@ -673,7 +673,9 @@ static int add_journal(ext2_filsys fs)
|
|||
goto err;
|
||||
}
|
||||
if (journal_device) {
|
||||
check_plausibility(journal_device, CHECK_BLOCK_DEV, NULL);
|
||||
if (!check_plausibility(journal_device, CHECK_BLOCK_DEV,
|
||||
NULL))
|
||||
proceed_question();
|
||||
check_mount(journal_device, 0, _("journal"));
|
||||
#ifdef CONFIG_TESTIO_DEBUG
|
||||
if (getenv("TEST_IO_FLAGS") || getenv("TEST_IO_BLOCK")) {
|
||||
|
|
11
misc/util.c
11
misc/util.c
|
@ -80,7 +80,10 @@ void proceed_question(void)
|
|||
exit(1);
|
||||
}
|
||||
|
||||
void check_plausibility(const char *device, int flags, int *ret_is_dev)
|
||||
/*
|
||||
* return 1 if the device looks plausible
|
||||
*/
|
||||
int check_plausibility(const char *device, int flags, int *ret_is_dev)
|
||||
{
|
||||
int val, is_dev = 0;
|
||||
ext2fs_struct_stat s;
|
||||
|
@ -107,8 +110,7 @@ void check_plausibility(const char *device, int flags, int *ret_is_dev)
|
|||
|
||||
if ((flags & CHECK_BLOCK_DEV) && !is_dev) {
|
||||
printf(_("%s is not a block special device.\n"), device);
|
||||
proceed_question();
|
||||
return;
|
||||
return 0;
|
||||
}
|
||||
|
||||
#ifdef HAVE_LINUX_MAJOR_H
|
||||
|
@ -137,9 +139,10 @@ void check_plausibility(const char *device, int flags, int *ret_is_dev)
|
|||
MINOR(s.st_rdev)%16 == 0))) {
|
||||
printf(_("%s is entire device, not just one partition!\n"),
|
||||
device);
|
||||
proceed_question();
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
return 1;
|
||||
}
|
||||
|
||||
void check_mount(const char *device, int force, const char *type)
|
||||
|
|
|
@ -25,7 +25,7 @@ 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, int flags,
|
||||
extern int check_plausibility(const char *device, int flags,
|
||||
int *ret_is_dev);
|
||||
extern void parse_journal_opts(const char *opts);
|
||||
extern void check_mount(const char *device, int force, const char *type);
|
||||
|
|
Loading…
Reference in New Issue