RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 12:47:35 +00:00
Code Issues Activity Actions

dd: Add ability to use k, M, & G suffixes for block sizes

Browse source
This commit is contained in:
bleusakura 2021-05-08 05:03:31 -04:00 • committed by GitHub
parent 0b7e19e2bb
commit 87de32df59
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Userland/Utilities/dd.cpp
View file

@ -22,7 +22,7 @@ const char* usage = "usage:\n"
"options:\n" "options:\n"
"\tif=<file>\tinput file (default: stdin)\n" "\tif=<file>\tinput file (default: stdin)\n"
"\tof=<file>\toutput file (default: stdout)\n" "\tof=<file>\toutput file (default: stdout)\n"
"\tbs=<size>\tblocks size (default: 512)\n" "\tbs=<size>\tblocks size may be followed by multiplicate suffixes: k=1024, M=1024*1024, G=1024*1024*1024 (default: 512)\n"
"\tcount=<size>\t<size> blocks to copy (default: 0 (until end-of-file))\n" "\tcount=<size>\t<size> blocks to copy (default: 0 (until end-of-file))\n"
"\tseek=<size>\tskip <size> blocks at start of output (default: 0)\n" "\tseek=<size>\tskip <size> blocks at start of output (default: 0)\n"
"\tskip=<size>\tskip <size> blocks at start of input (default: 0)\n" "\tskip=<size>\tskip <size> blocks at start of input (default: 0)\n"
@ -74,13 +74,29 @@ static int handle_size_arguments(size_t& numeric_value, const char* argument)
return -1; return -1;
} }
unsigned suffix_multiplier = 1;
switch (value.to_lowercase()[value.length() - 1]) {
case 'k':
suffix_multiplier = KiB;
value = value.substring(0, value.length() - 1);
break;
case 'm':
suffix_multiplier = MiB;
value = value.substring(0, value.length() - 1);
break;
case 'g':
suffix_multiplier = GiB;
value = value.substring(0, value.length() - 1);
break;
}
Optional<unsigned> numeric_optional = value.to_uint(); Optional<unsigned> numeric_optional = value.to_uint();
if (!numeric_optional.has_value()) { if (!numeric_optional.has_value()) {
fprintf(stderr, "Invalid size-value: %s\n", value.characters()); fprintf(stderr, "Invalid size-value: %s\n", value.characters());
return -1; return -1;
} }
numeric_value = numeric_optional.value(); numeric_value = numeric_optional.value() * suffix_multiplier;
if (numeric_value < 1) { if (numeric_value < 1) {
fprintf(stderr, "Invalid size-value: %lu\n", numeric_value); fprintf(stderr, "Invalid size-value: %lu\n", numeric_value);
return -1; return -1;