erofs-utils: fsck: fix issues related to --extract=X
A message that is not in the archive (sent off-list or not yet received): YfC7rIs7%[email protected]
PATCH 1/1 erofs-utils: fsck: fix issues related to --extract=X
From: Igor Eisberg <[email protected]>
* Added tar-like default behaviors for --[no-]preserve options:
normal user - uses user's owner ID + umask on perms by default; root user - preserve original owner IDs + perms by default; and add appropriate error message when used without --extract=X.
* "--[no-]same-owner" and "--[no-]same-permissions" were renamed to "--[no-]preserve-owner" and "--[no-]preserve-perms" to better represent what these options do, the word "same" is ambiguous and tells nothing to the user ("same" to what?).
* Added "--[no-]preserve" as shortcuts for both options in one.
* Fixed option descriptions as they had typos and were too ambiguous ("extract information" to where? separate file?).
* Added --force option to allow extracting directly to root path.
--- fsck/main.c | 104 ++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 77 insertions(+), 27 deletions(-)
fsck/main.c +77 -27
@@ -18,15 +18,21 @@static int erofsfsck_check_inode (erofs_nid_t pnid,erofs_nid_t nid);struct erofsfsck_cfg { +bool superuser; +mode_t umask;bool corrupted; +u64 physical_blocks; +u64 logical_blocks;bool print_comp_ratio;bool check_decomp;char *extract_path;size_t extract_pos; -bool overwrite, preserve_owner, preserve_perms; -mode_t umask; -u64 physical_blocks; -u64 logical_blocks; +bool force; +bool overwrite; +bool preserve_owner; +bool preserve_perms; +bool no_preserve_owner; +bool no_preserve_perms; };static struct erofsfsck_cfg fsckcfg;
@@ -34,11 +40,14 @@ static struct option long_options[] = { {"help", no_argument, 0, 1}, {"extract", optional_argument, 0, 2}, {"device", required_argument, 0, 3}, - {"no-same-owner", no_argument, 0, 4}, - {"no-same-permissions", no_argument, 0, 5}, - {"same-owner", no_argument, 0, 6}, - {"same-permissions", no_argument, 0, 7}, - {"overwrite", no_argument, 0, 8}, + {"force", no_argument, 0, 4}, + {"overwrite", no_argument, 0, 5}, + {"preserve", no_argument, 0, 6}, + {"preserve-owner", no_argument, 0, 7}, + {"preserve-perms", no_argument, 0, 8}, + {"no-preserve", no_argument, 0, 9}, + {"no-preserve-owner", no_argument, 0, 10}, + {"no-preserve-perms", no_argument, 0, 11}, {0, 0, 0, 0}, };
@@ -66,11 +75,16 @@ static void usage(void)" --extract[=X] check if all files are well encoded, optionally extract to X\n" " --help display this help and exit\n" "\nExtraction options (--extract=X is required):\n" -" --no-same-owner extract files as yourself\n" -" --no-same-permissions apply the user's umask when extracting permission\n" -" --same-permissions extract information about file permissions\n" -" --same-owner extract files about the file ownerships\n" -" --overwrite if file already exists then overwrite\n" +" --force allow extracting to root\n" +" --overwrite overwrite files that already exist\n" +" --preserve extract with the same ownership and permissions as on the filesystem\n" +" (default for superuser)\n" +" --preserve-owner extract with the same ownership as on the filesystem\n" +" --preserve-perms extract with the same permissions as on the filesystem\n" +" --no-preserve extract as yourself and apply user's umask on permissions\n" +" (default for ordinary users)\n" +" --no-preserve-owner extract as yourself\n" +" --no-preserve-perms apply user's umask when extracting permissions\n" "\nSupported algorithms are: ", stderr);print_available_decompressors (stderr,", " ); }
@@ -121,6 +135,9 @@ static int erofsfsck_parse_options_cfg(int argc, char **argv)return -ENOMEM ;strncpy (fsckcfg.extract_path, optarg, len); fsckcfg.extract_path[len] ='\0' ; +/* if path is root, start writing from position 0 */ +if (len ==1 && fsckcfg.extract_path[0 ] =='/' ) + len =0 ; fsckcfg.extract_pos = len; }break ;
@@ -131,33 +148,62 @@ static int erofsfsck_parse_options_cfg(int argc, char **argv) ++sbi.extra_devices;break ;case 4 : - fsckcfg.preserve_owner = false; + fsckcfg.force = true;break ;case 5 : - fsckcfg.preserve_perms = false; + fsckcfg.overwrite = true;break ;case 6 : fsckcfg.preserve_owner = true; + fsckcfg.preserve_perms = true; + fsckcfg.no_preserve_owner = false; + fsckcfg.no_preserve_perms = false;break ;case 7 : - fsckcfg.preserve_perms = true; + fsckcfg.preserve_owner = true; + fsckcfg.no_preserve_owner = false;break ;case 8 : - fsckcfg.overwrite = true; + fsckcfg.preserve_perms = true; + fsckcfg.no_preserve_perms = false; +break ; +case 9 : + fsckcfg.no_preserve_owner = true; + fsckcfg.no_preserve_perms = true; + fsckcfg.preserve_owner = false; + fsckcfg.preserve_perms = false; +break ; +case 10 : + fsckcfg.no_preserve_owner = true; + fsckcfg.preserve_owner = false; +break ; +case 11 : + fsckcfg.no_preserve_perms = true; + fsckcfg.preserve_perms = false;break ;default :return -EINVAL ; } } +if (fsckcfg.extract_path) { +if (!fsckcfg.extract_pos && !fsckcfg.force) { +erofs_err ("--extract=/ must be used together with --force" ); +return -EINVAL ; + } + }else { +if (fsckcfg.force) +erofs_err ("--force must be used together with --extract=X" ); +if (fsckcfg.overwrite) +erofs_err ("--overwrite must be used together with --extract=X" ); +if (fsckcfg.preserve_owner || fsckcfg.preserve_perms || + fsckcfg.no_preserve_owner || fsckcfg.no_preserve_perms) +erofs_err ("--[no-]preserve[-owner/-perms] must be used together with --extract=X" ); + } +if (optind >= argc)return -EINVAL ; -if (!fsckcfg.extract_path) -if (fsckcfg.overwrite || fsckcfg.preserve_owner || - fsckcfg.preserve_perms) -return -EINVAL ; - cfg.c_img_path =strdup (argv[optind++]);if (!cfg.c_img_path)return -ENOMEM ;
@@ -680,13 +726,19 @@ int main(int argc, char **argv)erofs_init_configure (); + fsckcfg.superuser =geteuid () ==0 ; + fsckcfg.umask =umask (0 ); fsckcfg.corrupted = false; + fsckcfg.logical_blocks =0 ; + fsckcfg.physical_blocks =0 ; fsckcfg.print_comp_ratio = false; fsckcfg.check_decomp = false; fsckcfg.extract_path =NULL ; fsckcfg.extract_pos =0 ; - fsckcfg.logical_blocks =0 ; - fsckcfg.physical_blocks =0 ; + fsckcfg.force = false; + fsckcfg.overwrite = false; + fsckcfg.preserve_owner = fsckcfg.superuser; + fsckcfg.preserve_perms = fsckcfg.superuser; err =erofsfsck_parse_options_cfg (argc, argv);if (err) {
@@ -695,8 +747,6 @@ int main(int argc, char **argv) goto exit; } - fsckcfg.umask =umask (0 ); - err =dev_open_ro (cfg.c_img_path);if (err) {erofs_err ("failed to open image file" );
Signature · 1 line
2.30.2
Hi Igor,
Quoted 37 lines · Igor Ostapenko
From: Igor Eisberg <[email protected]>
* Added tar-like default behaviors for --[no-]preserve options:
normal user - uses user's owner ID + umask on perms by default; root user - preserve original owner IDs + perms by default; and add appropriate error message when used without --extract=X.
* "--[no-]same-owner" and "--[no-]same-permissions" were renamed to "--[no-]preserve-owner" and "--[no-]preserve-perms" to better represent what these options do, the word "same" is ambiguous and tells nothing to the user ("same" to what?).
* Added "--[no-]preserve" as shortcuts for both options in one.
* Fixed option descriptions as they had typos and were too ambiguous ("extract information" to where? separate file?).
* Added --force option to allow extracting directly to root path.Signed-off-by Igor Ostapenko <[email protected]>--- fsck/main.c | 104 ++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 77 insertions(+), 27 deletions(-)fsck/main.c +4
-0@@ -18,15 +18,21 @@static int erofsfsck_check_inode (erofs_nid_t pnid,erofs_nid_t nid);struct erofsfsck_cfg { +bool superuser; +mode_t umask;bool corrupted; +u64 physical_blocks; +u64 logical_blocks;bool print_comp_ratio;bool check_decomp;char *extract_path;size_t extract_pos;
fsck/main.c line 35
Quoted 10 lines
fsck/main.c +6
-4-bool overwrite, preserve_owner, preserve_perms; -mode_t umask; -u64 physical_blocks; -u64 logical_blocks; +bool force; +bool overwrite; +bool preserve_owner; +bool preserve_perms; +bool no_preserve_owner; +bool no_preserve_perms;
Thanks for the patch, just a minor comment.
How about moving no_preserve_owner, no_preserve_perms to erofsfsck_parse_options_cfg as local varibles instead?
Otherwise looks good to me.
Thanks,
Gao Xiang
Quoted 160 lines
fsck/main.c +67
-23};static struct erofsfsck_cfg fsckcfg;@@ -34,11 +40,14 @@ static struct option long_options[] = { {"help", no_argument, 0, 1}, {"extract", optional_argument, 0, 2}, {"device", required_argument, 0, 3}, - {"no-same-owner", no_argument, 0, 4}, - {"no-same-permissions", no_argument, 0, 5}, - {"same-owner", no_argument, 0, 6}, - {"same-permissions", no_argument, 0, 7}, - {"overwrite", no_argument, 0, 8}, + {"force", no_argument, 0, 4}, + {"overwrite", no_argument, 0, 5}, + {"preserve", no_argument, 0, 6}, + {"preserve-owner", no_argument, 0, 7}, + {"preserve-perms", no_argument, 0, 8}, + {"no-preserve", no_argument, 0, 9}, + {"no-preserve-owner", no_argument, 0, 10}, + {"no-preserve-perms", no_argument, 0, 11}, {0, 0, 0, 0}, };@@ -66,11 +75,16 @@ static void usage(void)" --extract[=X] check if all files are well encoded, optionally extract to X\n" " --help display this help and exit\n" "\nExtraction options (--extract=X is required):\n" -" --no-same-owner extract files as yourself\n" -" --no-same-permissions apply the user's umask when extracting permission\n" -" --same-permissions extract information about file permissions\n" -" --same-owner extract files about the file ownerships\n" -" --overwrite if file already exists then overwrite\n" +" --force allow extracting to root\n" +" --overwrite overwrite files that already exist\n" +" --preserve extract with the same ownership and permissions as on the filesystem\n" +" (default for superuser)\n" +" --preserve-owner extract with the same ownership as on the filesystem\n" +" --preserve-perms extract with the same permissions as on the filesystem\n" +" --no-preserve extract as yourself and apply user's umask on permissions\n" +" (default for ordinary users)\n" +" --no-preserve-owner extract as yourself\n" +" --no-preserve-perms apply user's umask when extracting permissions\n" "\nSupported algorithms are: ", stderr);print_available_decompressors (stderr,", " ); }@@ -121,6 +135,9 @@ static int erofsfsck_parse_options_cfg(int argc, char **argv)return -ENOMEM ;strncpy (fsckcfg.extract_path, optarg, len); fsckcfg.extract_path[len] ='\0' ; +/* if path is root, start writing from position 0 */ +if (len ==1 && fsckcfg.extract_path[0 ] =='/' ) + len =0 ; fsckcfg.extract_pos = len; }break ;@@ -131,33 +148,62 @@ static int erofsfsck_parse_options_cfg(int argc, char **argv) ++sbi.extra_devices;break ;case 4 : - fsckcfg.preserve_owner = false; + fsckcfg.force = true;break ;case 5 : - fsckcfg.preserve_perms = false; + fsckcfg.overwrite = true;break ;case 6 : fsckcfg.preserve_owner = true; + fsckcfg.preserve_perms = true; + fsckcfg.no_preserve_owner = false; + fsckcfg.no_preserve_perms = false;break ;case 7 : - fsckcfg.preserve_perms = true; + fsckcfg.preserve_owner = true; + fsckcfg.no_preserve_owner = false;break ;case 8 : - fsckcfg.overwrite = true; + fsckcfg.preserve_perms = true; + fsckcfg.no_preserve_perms = false; +break ; +case 9 : + fsckcfg.no_preserve_owner = true; + fsckcfg.no_preserve_perms = true; + fsckcfg.preserve_owner = false; + fsckcfg.preserve_perms = false; +break ; +case 10 : + fsckcfg.no_preserve_owner = true; + fsckcfg.preserve_owner = false; +break ; +case 11 : + fsckcfg.no_preserve_perms = true; + fsckcfg.preserve_perms = false;break ;default :return -EINVAL ; } } +if (fsckcfg.extract_path) { +if (!fsckcfg.extract_pos && !fsckcfg.force) { +erofs_err ("--extract=/ must be used together with --force" ); +return -EINVAL ; + } + }else { +if (fsckcfg.force) +erofs_err ("--force must be used together with --extract=X" ); +if (fsckcfg.overwrite) +erofs_err ("--overwrite must be used together with --extract=X" ); +if (fsckcfg.preserve_owner || fsckcfg.preserve_perms || + fsckcfg.no_preserve_owner || fsckcfg.no_preserve_perms) +erofs_err ("--[no-]preserve[-owner/-perms] must be used together with --extract=X" ); + } +if (optind >= argc)return -EINVAL ; -if (!fsckcfg.extract_path) -if (fsckcfg.overwrite || fsckcfg.preserve_owner || - fsckcfg.preserve_perms) -return -EINVAL ; - cfg.c_img_path =strdup (argv[optind++]);if (!cfg.c_img_path)return -ENOMEM ;@@ -680,13 +726,19 @@ int main(int argc, char **argv)erofs_init_configure (); + fsckcfg.superuser =geteuid () ==0 ; + fsckcfg.umask =umask (0 ); fsckcfg.corrupted = false; + fsckcfg.logical_blocks =0 ; + fsckcfg.physical_blocks =0 ; fsckcfg.print_comp_ratio = false; fsckcfg.check_decomp = false; fsckcfg.extract_path =NULL ; fsckcfg.extract_pos =0 ; - fsckcfg.logical_blocks =0 ; - fsckcfg.physical_blocks =0 ; + fsckcfg.force = false; + fsckcfg.overwrite = false; + fsckcfg.preserve_owner = fsckcfg.superuser; + fsckcfg.preserve_perms = fsckcfg.superuser; err =erofsfsck_parse_options_cfg (argc, argv);if (err) {@@ -695,8 +747,6 @@ int main(int argc, char **argv) goto exit; } - fsckcfg.umask =umask (0 ); - err =dev_open_ro (cfg.c_img_path);if (err) {erofs_err ("failed to open image file" );Signature · 1 line
2.30.2
PATCH 1/1 erofs-utils: fsck: fix issues related to --extract=X
From: Igor Eisberg <[email protected]>
* Moved no_preserve_owner/no_preserve_perms to local scope.
* Added missing return -EINVAL.
--- fsck/main.c | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-)
fsck/main.c +18 -17
@@ -31,8 +31,6 @@ struct erofsfsck_cfg {bool overwrite;bool preserve_owner;bool preserve_perms; -bool no_preserve_owner; -bool no_preserve_perms; };static struct erofsfsck_cfg fsckcfg;
@@ -97,6 +95,7 @@ static void erofsfsck_print_version(void)static int erofsfsck_parse_options_cfg (int argc,char **argv) {int opt, ret; +bool no_preserve_owner = false, no_preserve_perms = false;while ((opt =getopt_long (argc, argv,"Vd:p" , long_options,NULL )) !=-1 ) {
@@ -154,32 +153,28 @@ static int erofsfsck_parse_options_cfg(int argc, char **argv) fsckcfg.overwrite = true;break ;case 6 : - fsckcfg.preserve_owner = true; - fsckcfg.preserve_perms = true; - fsckcfg.no_preserve_owner = false; - fsckcfg.no_preserve_perms = false; + fsckcfg.preserve_owner = fsckcfg.preserve_perms = true; + no_preserve_owner = no_preserve_perms = false;break ;case 7 : fsckcfg.preserve_owner = true; - fsckcfg.no_preserve_owner = false; + no_preserve_owner = false;break ;case 8 : fsckcfg.preserve_perms = true; - fsckcfg.no_preserve_perms = false; + no_preserve_perms = false;break ;case 9 : - fsckcfg.no_preserve_owner = true; - fsckcfg.no_preserve_perms = true; - fsckcfg.preserve_owner = false; - fsckcfg.preserve_perms = false; + fsckcfg.preserve_owner = fsckcfg.preserve_perms = false; + no_preserve_owner = no_preserve_perms = true;break ;case 10 : - fsckcfg.no_preserve_owner = true; fsckcfg.preserve_owner = false; + no_preserve_owner = true;break ;case 11 : - fsckcfg.no_preserve_perms = true; fsckcfg.preserve_perms = false; + no_preserve_perms = true;break ;default :return -EINVAL ;
@@ -192,13 +187,19 @@ static int erofsfsck_parse_options_cfg(int argc, char **argv)return -EINVAL ; } }else { -if (fsckcfg.force) +if (fsckcfg.force) {erofs_err ("--force must be used together with --extract=X" ); -if (fsckcfg.overwrite) +return -EINVAL ; + } +if (fsckcfg.overwrite) {erofs_err ("--overwrite must be used together with --extract=X" ); +return -EINVAL ; + }if (fsckcfg.preserve_owner || fsckcfg.preserve_perms || - fsckcfg.no_preserve_owner || fsckcfg.no_preserve_perms) + fsckcfg.no_preserve_owner || fsckcfg.no_preserve_perms) {erofs_err ("--[no-]preserve[-owner/-perms] must be used together with --extract=X" ); +return -EINVAL ; + } }if (optind >= argc)
Signature · 1 line
2.30.2
PATCH 1/1 erofs-utils: fsck: fix issues related to --extract=X
In reply to Gao XiangFrom: Igor Eisberg <[email protected]>
Fix compile
--- fsck/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fsck/main.c +1 -1
@@ -196,7 +196,7 @@ static int erofsfsck_parse_options_cfg(int argc, char **argv)return -EINVAL ; }if (fsckcfg.preserve_owner || fsckcfg.preserve_perms || - fsckcfg.no_preserve_owner || fsckcfg.no_preserve_perms) { + no_preserve_owner || no_preserve_perms) {erofs_err ("--[no-]preserve[-owner/-perms] must be used together with --extract=X" );return -EINVAL ; }
Signature · 1 line
2.30.2
Quoted 5 lines · Igor Ostapenko
From: Igor Eisberg <[email protected]>
Fix compile
Signed-off-by Igor Ostapenko <[email protected]>
Many thanks, I will fold these two patches into the first one for applying.
Thanks,
Gao Xiang
Quoted 19 lines
--- fsck/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)fsck/main.c +1
-1@@ -196,7 +196,7 @@ static int erofsfsck_parse_options_cfg(int argc, char **argv)return -EINVAL ; }if (fsckcfg.preserve_owner || fsckcfg.preserve_perms || - fsckcfg.no_preserve_owner || fsckcfg.no_preserve_perms) { + no_preserve_owner || no_preserve_perms) {erofs_err ("--[no-]preserve[-owner/-perms] must be used together with --extract=X" );return -EINVAL ; }Signature · 1 line
2.30.2
PATCH 1/1 erofs-utils: fsck: fix issues related to --extract=X
In reply to Gao XiangFrom: Igor Eisberg <[email protected]>
Fix "--[no-]preserve[-owner/-perms] must be used..." error always thrown for superuser when fsck used without --extract=X, due to default values for preserve_owner/preserve_perms being already pre-set to true, as if the --preserve option was explicitly given by the user.
--- fsck/main.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-)
fsck/main.c +8 -9
@@ -95,7 +95,7 @@ static void erofsfsck_print_version(void)static int erofsfsck_parse_options_cfg (int argc,char **argv) {int opt, ret; -bool no_preserve_owner = false, no_preserve_perms = false; +bool has_opt_preserve = false;while ((opt =getopt_long (argc, argv,"Vd:p" , long_options,NULL )) !=-1 ) {
@@ -154,27 +154,27 @@ static int erofsfsck_parse_options_cfg(int argc, char **argv)break ;case 6 : fsckcfg.preserve_owner = fsckcfg.preserve_perms = true; - no_preserve_owner = no_preserve_perms = false; + has_opt_preserve = true;break ;case 7 : fsckcfg.preserve_owner = true; - no_preserve_owner = false; + has_opt_preserve = true;break ;case 8 : fsckcfg.preserve_perms = true; - no_preserve_perms = false; + has_opt_preserve = true;break ;case 9 : fsckcfg.preserve_owner = fsckcfg.preserve_perms = false; - no_preserve_owner = no_preserve_perms = true; + has_opt_preserve = true;break ;case 10 : fsckcfg.preserve_owner = false; - no_preserve_owner = true; + has_opt_preserve = true;break ;case 11 : fsckcfg.preserve_perms = false; - no_preserve_perms = true; + has_opt_preserve = true;break ;default :return -EINVAL ;
@@ -195,8 +195,7 @@ static int erofsfsck_parse_options_cfg(int argc, char **argv)erofs_err ("--overwrite must be used together with --extract=X" );return -EINVAL ; } -if (fsckcfg.preserve_owner || fsckcfg.preserve_perms || - no_preserve_owner || no_preserve_perms) { +if (has_opt_preserve) {erofs_err ("--[no-]preserve[-owner/-perms] must be used together with --extract=X" );return -EINVAL ; }
Signature · 1 line
2.30.2
Quoted 8 lines · Igor Ostapenko
From: Igor Eisberg <[email protected]>
Fix "--[no-]preserve[-owner/-perms] must be used..." error always thrown for superuser when fsck used without --extract=X, due to default values for preserve_owner/preserve_perms being already pre-set to true, as if the --preserve option was explicitly given by the user.
Signed-off-by Igor Ostapenko <[email protected]>
Folded, thanks.