From bd005db58f70b94ea727d5bc9c8ae09d1f392e53 Mon Sep 17 00:00:00 2001 From: Heng Li Date: Sun, 18 Mar 2012 14:31:45 -0400 Subject: [PATCH] updated the alphanum comparison function --- bam_sort.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/bam_sort.c b/bam_sort.c index e3a6c47..2c2b83d 100644 --- a/bam_sort.c +++ b/bam_sort.c @@ -10,24 +10,28 @@ static int g_is_by_qname = 0; -static inline int strnum_cmp(const char *a, const char *b) +static int strnum_cmp(const char *_a, const char *_b) { - char *pa, *pb; - pa = (char*)a; pb = (char*)b; + const unsigned char *a = (const unsigned char*)_a, *b = (const unsigned char*)_b; + const unsigned char *pa = a, *pb = b; while (*pa && *pb) { if (isdigit(*pa) && isdigit(*pb)) { - long ai, bi; - ai = strtol(pa, &pa, 10); - bi = strtol(pb, &pb, 10); - if (ai != bi) return aibi? 1 : 0; + while (*pa == '0') ++pa; + while (*pb == '0') ++pb; + while (isdigit(*pa) && isdigit(*pb) && *pa == *pb) ++pa, ++pb; + if (isdigit(*pa) && isdigit(*pb)) { + int i = 0; + while (isdigit(pa[i]) && isdigit(pb[i])) ++i; + return isdigit(pa[i])? 1 : isdigit(pb[i])? -1 : (int)*pa - (int)*pb; + } else if (isdigit(*pa)) return 1; + else if (isdigit(*pb)) return -1; + else if (pa - a != pb - b) return pa - a < pb - b? 1 : -1; } else { - if (*pa != *pb) break; + if (*pa != *pb) return (int)*pa - (int)*pb; ++pa; ++pb; } } - if (*pa == *pb) - return (pa-a) < (pb-b)? -1 : (pa-a) > (pb-b)? 1 : 0; - return *pa<*pb? -1 : *pa>*pb? 1 : 0; + return *pa? 1 : *pb? -1 : 0; } #define HEAP_EMPTY 0xffffffffffffffffull -- 2.39.2