diff options
author | Karel Zak | 2013-06-12 17:09:28 +0200 |
---|---|---|
committer | Karel Zak | 2013-09-16 16:47:01 +0200 |
commit | 950edd1a71d76a9fe6bbc72bba4efcb26cf723b7 (patch) | |
tree | f72bd7be52313595da83c20080306be4bfe5eca9 /fdisks/fdisk.c | |
parent | fdisk: (bsd) use libfdisk for partition number dialog (diff) | |
download | kernel-qcow2-util-linux-950edd1a71d76a9fe6bbc72bba4efcb26cf723b7.tar.gz kernel-qcow2-util-linux-950edd1a71d76a9fe6bbc72bba4efcb26cf723b7.tar.xz kernel-qcow2-util-linux-950edd1a71d76a9fe6bbc72bba4efcb26cf723b7.zip |
fdisk: use libfdisk to ask for partition type
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'fdisks/fdisk.c')
-rw-r--r-- | fdisks/fdisk.c | 30 |
1 files changed, 2 insertions, 28 deletions
diff --git a/fdisks/fdisk.c b/fdisks/fdisk.c index d9c175329..4d804e4be 100644 --- a/fdisks/fdisk.c +++ b/fdisks/fdisk.c @@ -280,33 +280,6 @@ char read_chars(struct fdisk_context *cxt, char *mesg) return *line_ptr; } -struct fdisk_parttype *read_partition_type(struct fdisk_context *cxt) -{ - if (!cxt || !cxt->label || !cxt->label->nparttypes) - return NULL; - - do { - size_t sz; - - if (cxt->label->parttypes[0].typestr) - read_chars(cxt, _("Partition type (type L to list all types): ")); - else - read_chars(cxt, _("Hex code (type L to list all codes): ")); - - sz = strlen(line_ptr); - if (!sz || line_ptr[sz - 1] != '\n' || sz == 1) - continue; - line_ptr[sz - 1] = '\0'; - - if (tolower(*line_ptr) == 'l') - list_partition_types(cxt); - else - return fdisk_parse_parttype(cxt, line_ptr); - } while (1); - - return NULL; -} - /* deprecated in favour of fdisk_ask_number() */ unsigned int read_int_with_suffix(struct fdisk_context *cxt, @@ -453,6 +426,7 @@ read_int(struct fdisk_context *cxt, return read_int_with_suffix(cxt, low, dflt, high, base, mesg, NULL); } + static void toggle_dos_compatibility_flag(struct fdisk_context *cxt) { struct fdisk_label *lb = fdisk_context_get_label(cxt, "dos"); @@ -501,7 +475,7 @@ static void change_partition_type(struct fdisk_context *cxt) printf(_("Partition %zu does not exist yet!\n"), i + 1); else do { - t = read_partition_type(cxt); + t = ask_partition_type(cxt); if (!t) continue; |