search for: temp_typ

...if (STREQ (lines[row], "")) { + end = row; + break; + } + + if (end == 0) { + reply_with_error ("parted output has no blank after end of table"); + return NULL; + } + + /* Now parse the lines. */ + size_t i; + int64_t temp_int64; + int part_num; + char temp_type[16]; + for (i = 0, row = start; row < end; ++i, ++row) { + if (sscanf (lines[row], "%d%" SCNi64 "B%" SCNi64 "B%" SCNi64 "B" "%s", + &part_num, + &temp_int64, + &temp_int64, +...

...if (STREQ (lines[row], "")) { + end = row; + break; + } + + if (end == 0) { + reply_with_error ("parted output has no blank after end of table"); + return NULL; + } + + /* Now parse the lines. */ + size_t i; + int64_t temp_int64; + int part_num; + char temp_type[16] = {'\0'}; + for (i = 0, row = start; row < end; ++i, ++row) { + if (STREQ (parttype, "gpt")) { + memcpy (temp_type, "primary", strlen("primary")); + if (sscanf (lines[row], "%d%" SCNi64 "B%" SCNi64 "B%" SCNi6...

...if (STREQ (lines[row], "")) { - end = row; - break; - } - - if (end == 0) { - reply_with_error ("parted output has no blank after end of table"); - return NULL; - } - - /* Now parse the lines. */ - size_t i; - int64_t temp_int64; - int part_num; - char temp_type[16] = {'\0'}; - for (i = 0, row = start; row < end; ++i, ++row) { - if (STREQ (parttype, "gpt")) { - memcpy (temp_type, "primary", strlen ("primary")); - if (sscanf (lines[row], "%d%" SCNi64 "B%" SCNi64 "B%" SCNi...

...break; > + } > + > + if (end == 0) { > + reply_with_error ("parted output has no blank after end of table"); > + return NULL; > + } > + > + /* Now parse the lines. */ > + size_t i; > + int64_t temp_int64; > + int part_num; > + char temp_type[16]; > + for (i = 0, row = start; row < end; ++i, ++row) { > + if (sscanf (lines[row], "%d%" SCNi64 "B%" SCNi64 "B%" SCNi64 "B" "%s", > + &part_num, > + &temp_int64, > + &a...

Chen Hanxiao (2): parted: introduce enum for whether parted has option -m New API: part_get_part_type for showing partition type daemon/parted.c | 136 ++++++++++++++++++++++++++++++++++++++++++++++----- generator/actions.ml | 18 +++++++ src/MAX_PROC_NR | 2 +- 3 files changed, 143 insertions(+), 13 deletions(-) -- 2.1.0

...e node. */ if (STREQ (fstype, "gfs") || STREQ (fstype, "gfs2")) { diff --git a/daemon/parted.c b/daemon/parted.c index cb6c486..b7f560c 100644 --- a/daemon/parted.c +++ b/daemon/parted.c @@ -1092,7 +1092,7 @@ do_part_get_mbr_part_type (const char *device, int partnum) char temp_type[16] = {'\0'}; for (i = 0, row = start; row < end; ++i, ++row) { if (STREQ (parttype, "gpt")) { - memcpy (temp_type, "primary", strlen("primary")); + memcpy (temp_type, "primary", strlen ("primary")); if (sscanf...

...nd == 0) { > > + reply_with_error ("parted output has no blank after end of table"); > > + return NULL; > > + } > > + > > + /* Now parse the lines. */ > > + size_t i; > > + int64_t temp_int64; > > + int part_num; > > + char temp_type[16]; > > + for (i = 0, row = start; row < end; ++i, ++row) { > > + if (sscanf (lines[row], "%d%" SCNi64 "B%" SCNi64 "B%" SCNi64 "B" "%s", > > + &part_num, > > + &temp_int64, >...

Initial discussion is here: https://www.redhat.com/archives/libguestfs/2018-January/msg00188.html. v2 was posted here: https://www.redhat.com/archives/libguestfs/2018-January/msg00246.html. v3 comparing to v2 is just a rebase with slightly changed commits comments.

...if (STREQ (lines[row], "")) { - end = row; - break; - } - - if (end == 0) { - reply_with_error ("parted output has no blank after end of table"); - return NULL; - } - - /* Now parse the lines. */ - size_t i; - int64_t temp_int64; - int part_num; - char temp_type[16] = {'\0'}; - for (i = 0, row = start; row < end; ++i, ++row) { - if (STREQ (parttype, "gpt")) { - memcpy (temp_type, "primary", strlen ("primary")); - if (sscanf (lines[row], "%d%" SCNi64 "B%" SCNi64 "B%" SCNi...

This patch series: 1. Addresses comments from last review: part_get_mbr_part_type doesn't break original implementation in C. 2. Rebased on top of master and little bit refactored for readability. Mykola Ivanets (1): tests: md: Test guestfish list-filesystems command skips partitioned md devices. Nikolay Ivanets (2): daemon: Reimplement 'part_get_mbr_part_type' API in

...MBR partitions only (as noted in documentation and as function name suggests). This might be how it's documented, but the implementation has a nod towards gpt: > - for (i = 0, row = start; row < end; ++i, ++row) { > - if (STREQ (parttype, "gpt")) { > - memcpy (temp_type, "primary", strlen ("primary")); whereas the replacement deliberately breaks this case: > + failwithf "part_get_mbr_part_type can only be used on MBR Partitions" This change is too fundamental to go in just before the stable release (1.38). I'm going to...

This patch series: 1. Addresses comments from v5 series review 2. Large commit is splitted to more granular commits for better code review. Mykola Ivanets (6): daemon: Changing the way that we detect if a device contains partitions. daemon: list-filesystems: Ignore partitioned MD devices. tests: list-filesystems command ignores partitioned MD devices. daemon: list-filesystems: Change

...in documentation and as function name suggests). > > This might be how it's documented, but the implementation has a nod > towards gpt: > >> - for (i = 0, row = start; row < end; ++i, ++row) { >> - if (STREQ (parttype, "gpt")) { >> - memcpy (temp_type, "primary", strlen ("primary")); > > whereas the replacement deliberately breaks this case: > >> + failwithf "part_get_mbr_part_type can only be used on MBR Partitions" > > This change is too fundamental to go in just before the stable release...

...ot;malloc"); return -1; diff --git a/daemon/parted.c b/daemon/parted.c index b7f560c..fab3423 100644 --- a/daemon/parted.c +++ b/daemon/parted.c @@ -1094,42 +1094,42 @@ do_part_get_mbr_part_type (const char *device, int partnum) if (STREQ (parttype, "gpt")) { memcpy (temp_type, "primary", strlen ("primary")); if (sscanf (lines[row], "%d%" SCNi64 "B%" SCNi64 "B%" SCNi64 "B", - &part_num, - &temp_int64, - &temp_int64, - &temp_int64) !=...

Result of earlier copy and paste. --- align/scan.c | 35 ++++++++++--------- cat/cat.c | 39 +++++++++++---------- cat/filesystems.c | 69 +++++++++++++++++++------------------- cat/log.c | 35 ++++++++++--------- cat/ls.c | 61 +++++++++++++++++---------------- df/main.c | 43 ++++++++++++------------ diff/diff.c | 67