The nil UUID is special form of UUID that is specified to have all 128 bits set to zero. Reference: https://tools.ietf.org/html/rfc4122#section-4.1.7 Signed-off-by: Sami Kerola <kerolasa@xxxxxx> --- misc-utils/uuidparse.c | 5 ++++- tests/expected/uuid/uuidparse | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/misc-utils/uuidparse.c b/misc-utils/uuidparse.c index 49225ae2c..5fa34b23d 100644 --- a/misc-utils/uuidparse.c +++ b/misc-utils/uuidparse.c @@ -195,7 +195,10 @@ static void fill_table_row(struct libscols_table *tb, char const *const uuid) } switch (type) { case 0: - str = xstrdup(_("nil")); + if (strspn(uuid, "0-") == 36) + str = xstrdup(_("nil")); + else + str = xstrdup(_("unknown")); break; case 1: str = xstrdup(_("time-based")); diff --git a/tests/expected/uuid/uuidparse b/tests/expected/uuid/uuidparse index 7fc64bcd2..c4959be8d 100644 --- a/tests/expected/uuid/uuidparse +++ b/tests/expected/uuid/uuidparse @@ -6,20 +6,20 @@ UUID VARIANT TYPE TIME 00000000-0000-4000-0000-000000000000 NCS random 00000000-0000-5000-0000-000000000000 NCS sha1-based 00000000-0000-6000-0000-000000000000 NCS unknown -00000000-0000-0000-8000-000000000000 DCE nil +00000000-0000-0000-8000-000000000000 DCE unknown 00000000-0000-2000-8000-000000000000 DCE DCE 00000000-0000-3000-8000-000000000000 DCE name-based 00000000-0000-4000-8000-000000000000 DCE random 00000000-0000-5000-8000-000000000000 DCE sha1-based 00000000-0000-6000-8000-000000000000 DCE unknown -00000000-0000-0000-d000-000000000000 Microsoft nil +00000000-0000-0000-d000-000000000000 Microsoft unknown 00000000-0000-1000-d000-000000000000 Microsoft time-based 00000000-0000-2000-d000-000000000000 Microsoft DCE 00000000-0000-3000-d000-000000000000 Microsoft name-based 00000000-0000-4000-d000-000000000000 Microsoft random 00000000-0000-5000-d000-000000000000 Microsoft sha1-based 00000000-0000-6000-d000-000000000000 Microsoft unknown -00000000-0000-0000-f000-000000000000 other nil +00000000-0000-0000-f000-000000000000 other unknown 00000000-0000-1000-f000-000000000000 other time-based 00000000-0000-2000-f000-000000000000 other DCE 00000000-0000-3000-f000-000000000000 other name-based -- 2.13.3 -- To unsubscribe from this list: send the line "unsubscribe util-linux" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
