ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

sfdisk: fix --bytes 

Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
Karel Zak 2015-01-19 12:26:37 +01:00
parent 4a79a8f177
commit 8de07279bb
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
disk-utils/sfdisk.c
View File

@ -1364,7 +1364,7 @@ static void __attribute__ ((__noreturn__)) usage(FILE *out)
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
const char *outarg = NULL; const char *outarg = NULL;
int rc = -EINVAL, c, longidx = -1; int rc = -EINVAL, c, longidx = -1, bytes = 0;
struct sfdisk _sf = { struct sfdisk _sf = {
.partno = -1, .partno = -1,
.interactive = isatty(STDIN_FILENO) ? 1 : 0, .interactive = isatty(STDIN_FILENO) ? 1 : 0,
@ -1425,8 +1425,6 @@ int main(int argc, char *argv[])
textdomain(PACKAGE); textdomain(PACKAGE);
atexit(close_stdout); atexit(close_stdout);
sfdisk_init(sf);
while ((c = getopt_long(argc, argv, "aAbcdfghlLo:O:nN:qsTu:vVX:Y:", while ((c = getopt_long(argc, argv, "aAbcdfghlLo:O:nN:qsTu:vVX:Y:",
longopts, &longidx)) != -1) { longopts, &longidx)) != -1) {
switch(c) { switch(c) {
@ -1523,13 +1521,17 @@ int main(int argc, char *argv[])
sf->noreread = 1; sf->noreread = 1;
break; break;
case OPT_BYTES: case OPT_BYTES:
fdisk_set_size_unit(sf->cxt, FDISK_SIZEUNIT_BYTES); bytes = 1;
break; break;
default: default:
usage(stderr); usage(stderr);
} }
} }
sfdisk_init(sf);
if (bytes)
fdisk_set_size_unit(sf->cxt, FDISK_SIZEUNIT_BYTES);
if (outarg) if (outarg)
init_fields(NULL, outarg, NULL); init_fields(NULL, outarg, NULL);