mirror of
git://git.musl-libc.org/musl
synced 2025-03-06 20:48:29 +01:00
fix strverscmp comparison of digit sequence with non-digits
the rule that longest digit sequence not beginning with a zero is greater only applies when both sequences being compared are non-degenerate. this is spelled out explicitly in the man page, which may be deemed authoritative for this nonstandard function: "If one or both of these is empty, then return what strcmp(3) would have returned..." we were wrongly treating any sequence of digits not beginning with a zero as greater than a non-digit in the other string.
This commit is contained in:
parent
ad5dcd398b
commit
b50eb8c36c
1 changed files with 3 additions and 3 deletions
|
@ -18,9 +18,9 @@ int strverscmp(const char *l0, const char *r0)
|
|||
else if (c!='0') z=0;
|
||||
}
|
||||
|
||||
if (l[dp]!='0' && r[dp]!='0') {
|
||||
/* If we're not looking at a digit sequence that began
|
||||
* with a zero, longest digit string is greater. */
|
||||
if (l[dp]-'1'<9U && r[dp]-'1'<9U) {
|
||||
/* If we're looking at non-degenerate digit sequences starting
|
||||
* with nonzero digits, longest digit string is greater. */
|
||||
for (j=i; isdigit(l[j]); j++)
|
||||
if (!isdigit(r[j])) return 1;
|
||||
if (isdigit(r[j])) return -1;
|
||||
|
|
Loading…
Add table
Reference in a new issue