lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

libata: glob_match for ata_device_blacklist (v2)

Browse Source 
Replace rudimentry pattern matching with more capable shell-style globbing.
This will enable shrinking ata_device_blacklist[] table in subsequent patches,
and helps with future editions to the table, such as matching only the end
of a firmware revision string etc..

Signed-off-by: Mark Lord <mlord@pobox.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
This commit is contained in:
Mark Lord
2010-07-01 18:16:14 -04:00
committed by Jeff Garzik
parent da10a2002c
commit bce036cea1
1 changed files with 56 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
drivers/ata/libata-core.c
View File

@@ -4326,27 +4326,63 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = {
{ } { }
}; };
static int strn_pattern_cmp(const char *patt, const char *name, int wildchar) /**
{ * glob_match - match a text string against a glob-style pattern
const char *p; * @text: the string to be examined
int len; * @pattern: the glob-style pattern to be matched against
*
/* * Either/both of text and pattern can be empty strings.
* check for trailing wildcard: *\0 *
* Match text against a glob-style pattern, with wildcards and simple sets:
*
* ? matches any single character.
* * matches any run of characters.
* [xyz] matches a single character from the set: x, y, or z.
*
* Note: hyphenated ranges [0-9] are _not_ supported here.
* The special characters ?, [, or *, can be matched using a set, eg. [*]
*
* Example patterns: "SD1?", "SD1[012345]", "*R0", SD*1?[012]*xx"
*
* This function uses one level of recursion per '*' in pattern.
* Since it calls _nothing_ else, and has _no_ explicit local variables,
* this will not cause stack problems for any reasonable use here.
*
* RETURNS:
* 0 on match, 1 otherwise.
*/ */
p = strchr(patt, wildchar); static int glob_match (const char *text, const char *pattern)
if (p && ((*(p + 1)) == 0)) {
len = p - patt; do {
else { /* Match single character or a '?' wildcard */
len = strlen(name); if (*text == *pattern || *pattern == '?') {
if (!len) { if (!*pattern++)
if (!*patt) return 0; /* End of both strings: match */
return 0; } else {
return -1; /* Match single char against a '[' bracketed ']' pattern set */
} if (!*text || *pattern != '[')
break; /* Not a pattern set */
while (*++pattern && *pattern != ']' && *text != *pattern);
if (!*pattern || *pattern == ']')
return 1; /* No match */
while (*pattern && *pattern++ != ']');
} }
} while (*++text && *pattern);
return strncmp(patt, name, len); /* Match any run of chars against a '*' wildcard */
if (*pattern == '*') {
if (!*++pattern)
return 0; /* Match: avoid recursion at end of pattern */
/* Loop to handle additional pattern chars after the wildcard */
while (*text) {
if (glob_match(text, pattern) == 0)
return 0; /* Remainder matched */
++text; /* Absorb (match) this char and try again */
}
}
if (!*text && !*pattern)
return 0; /* End of both strings: match */
return 1; /* No match */
} }
static unsigned long ata_dev_blacklisted(const struct ata_device *dev) static unsigned long ata_dev_blacklisted(const struct ata_device *dev)
@@ -4359,10 +4395,10 @@ static unsigned long ata_dev_blacklisted(const struct ata_device *dev)
ata_id_c_string(dev->id, model_rev, ATA_ID_FW_REV, sizeof(model_rev)); ata_id_c_string(dev->id, model_rev, ATA_ID_FW_REV, sizeof(model_rev));
while (ad->model_num) { while (ad->model_num) {
if (!strn_pattern_cmp(ad->model_num, model_num, '*')) { if (!glob_match(model_num, ad->model_num)) {
if (ad->model_rev == NULL) if (ad->model_rev == NULL)
return ad->horkage; return ad->horkage;
if (!strn_pattern_cmp(ad->model_rev, model_rev, '*')) if (!glob_match(model_rev, ad->model_rev))
return ad->horkage; return ad->horkage;
} }
ad++; ad++;