diff options
| author | Rasmus Lerdorf <rasmus@php.net> | 2009-08-07 17:14:19 +0000 |
|---|---|---|
| committer | Rasmus Lerdorf <rasmus@php.net> | 2009-08-07 17:14:19 +0000 |
| commit | 934a9037c82b594d2c253f2bc0abda7310eab7ab (patch) | |
| tree | 23bebbeec58c57898f32cba6f60dd68bd02a08a0 | |
| parent | d5fd4ecc48c0a834adff2cd5757513528a5a5bc7 (diff) | |
| download | php-git-934a9037c82b594d2c253f2bc0abda7310eab7ab.tar.gz | |
Only skip leading 0's - fixes a test I broke a while ago
| -rw-r--r-- | ext/standard/strnatcmp.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/ext/standard/strnatcmp.c b/ext/standard/strnatcmp.c index c3a8a82010..3a0e1ec5df 100644 --- a/ext/standard/strnatcmp.c +++ b/ext/standard/strnatcmp.c @@ -105,7 +105,7 @@ PHPAPI int strnatcmp_ex(char const *a, size_t a_len, char const *b, size_t b_len char const *ap, *bp; char const *aend = a + a_len, *bend = b + b_len; - int fractional, result; + int fractional, result, leading = true; if (a_len == 0 || b_len == 0) return a_len - b_len; @@ -116,11 +116,15 @@ PHPAPI int strnatcmp_ex(char const *a, size_t a_len, char const *b, size_t b_len ca = *ap; cb = *bp; /* skip over leading spaces or zeros */ - while (isspace((int)(unsigned char)ca) || (ca == '0' && (ap+1 < aend) && !ispunct(*(ap+1)))) + while (leading && (isspace((int)(unsigned char)ca) || (ca == '0' && (ap+1 < aend) && !ispunct(*(ap+1))))) { ca = *++ap; + } - while (isspace((int)(unsigned char)cb) || (cb == '0' && (bp+1 < bend) && !ispunct(*(bp+1)))) + while (leading && (isspace((int)(unsigned char)cb) || (cb == '0' && (bp+1 < bend) && !ispunct(*(bp+1))))) { cb = *++bp; + } + + leading = false; /* process run of digits */ if (isdigit((int)(unsigned char)ca) && isdigit((int)(unsigned char)cb)) { |