From 67ef7017798092fcf67d58f89870da0eca0f1c76 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Fri, 19 Mar 2010 18:26:09 +0100 Subject: [PATCH] virDiskNameToIndex: ignore trailing digits * src/util/util.c (virDiskNameToIndex): Accept sda1, and map it to "sda". I.e., accept and ignore any string of trailing digits. --- src/util/util.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/util/util.c b/src/util/util.c index 119f0cd024..1188e5f5e8 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -2260,8 +2260,9 @@ const char *virEnumToString(const char *const*types, return types[type]; } -/* Translates a device name of the form (regex) "[fhv]d[a-z]+" into - * the corresponding index (e.g. sda => 0, hdz => 25, vdaa => 26) +/* Translates a device name of the form (regex) /^[fhv]d[a-z]+[0-9]*$/ + * into the corresponding index (e.g. sda => 0, hdz => 25, vdaa => 26) + * Note that any trailing string of digits is simply ignored. * @param name The name of the device * @return name's index, or -1 on failure */ @@ -2285,12 +2286,17 @@ int virDiskNameToIndex(const char *name) { idx = (idx + (i < 1 ? 0 : 1)) * 26; if (!c_islower(*ptr)) - return -1; + break; idx += *ptr - 'a'; ptr++; } + /* Count the trailing digits. */ + size_t n_digits = strspn(ptr, "0123456789"); + if (ptr[n_digits] != '\0') + return -1; + return idx; } -- 2.47.2