From: NeilBrown <neilb@suse.de>
Date: Tue, 10 Mar 2009 05:28:22 +0000 (+1100)
Subject: mdopen:  be more careful when adding digit to names.
X-Git-Tag: mdadm-3.0-devel3~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=add394f39e16445a7975bd00fea69ed2bda05b70;p=thirdparty%2Fmdadm.git

mdopen:  be more careful when adding digit to names.

If we need to add digits to a name to make it unique, but don't have
to add '_', we need to avoid adding a digit immediately after a digit.
So if the last character of the name is a digit, add the '_' anyway.

Signed-off-by: NeilBrown <neilb@suse.de>
---

diff --git a/mdopen.c b/mdopen.c
index b4d7bdc0..5d478f5b 100644
--- a/mdopen.c
+++ b/mdopen.c
@@ -291,7 +291,7 @@ int create_mddev(char *dev, char *name, int autof, int trustworthy,
 		}
 		cnlen = strlen(cname);
 		while (conflict) {
-			if (trustworthy == METADATA)
+			if (trustworthy == METADATA && !isdigit(cname[cnlen-1]))
 				sprintf(cname+cnlen, "%d", unum);
 			else
 				/* add _%d to FOREIGN array that don't