From e307c6fe62e96d106ddbd24392faca6e3aac0676 Mon Sep 17 00:00:00 2001 Message-Id: From: Mark Wooding Date: Sun, 27 Apr 2008 13:22:23 +0100 Subject: [PATCH] Simple test for compare_path_raw(). It's moved into a separate source file since the test program doens't have the config pointer. Organization: Straylight/Edgeware From: Richard Kettlewell --- lib/Makefile.am | 5 +-- lib/t-trackname.c | 48 ++++++++++++++++++++++++++++ lib/test.c | 1 + lib/test.h | 1 + lib/trackname.c | 40 ------------------------ lib/trackorder.c | 79 +++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 132 insertions(+), 42 deletions(-) create mode 100644 lib/t-trackname.c create mode 100644 lib/trackorder.c diff --git a/lib/Makefile.am b/lib/Makefile.am index 000ec0b..91a2bf1 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -75,7 +75,7 @@ libdisorder_a_SOURCES=charset.c charset.h \ table.c table.h \ timeval.h \ $(TRACKDB) trackdb.h trackdb-int.h \ - trackname.c trackname.h \ + trackname.c trackorder.c trackname.h \ url.h url.c \ user.h user.c \ unicode.h unicode.c \ @@ -119,7 +119,8 @@ test_SOURCES=test.c memgc.c test.h t-addr.c t-basen.c t-cache.c \ t-casefold.c t-cookies.c t-filepart.c t-hash.c t-heap.c \ t-hex.c t-kvp.c t-mime.c t-printf.c t-regsub.c t-selection.c \ t-signame.c t-sink.c t-split.c t-unicode.c t-url.c t-utf8.c \ - t-words.c t-wstat.c t-bits.c t-vector.c t-syscalls.c + t-words.c t-wstat.c t-bits.c t-vector.c t-syscalls.c \ + t-trackname.c test_LDADD=libdisorder.a $(LIBPCRE) $(LIBICONV) $(LIBGC) test_DEPENDENCIES=libdisorder.a diff --git a/lib/t-trackname.c b/lib/t-trackname.c new file mode 100644 index 0000000..23674ed --- /dev/null +++ b/lib/t-trackname.c @@ -0,0 +1,48 @@ +/* + * This file is part of DisOrder. + * Copyright (C) 2008 Richard Kettlewell + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + */ +#include "test.h" +#include "trackname.h" + +#define CHECK_PATH_ORDER(A,B,EXPECTED) do { \ + const unsigned char a[] = A, b[] = B; \ + insist(compare_path_raw(a, (sizeof a) - 1, \ + b, (sizeof b) - 1) == (EXPECTED)); \ + insist(compare_path_raw(b, (sizeof b) - 1, \ + a, (sizeof a) - 1) == -(EXPECTED)); \ +} while(0) + +void test_trackname(void) { + printf("test_trackname\n"); + CHECK_PATH_ORDER("/a/b", "/aa/", -1); + CHECK_PATH_ORDER("/a/b", "/a", 1); + CHECK_PATH_ORDER("/ab", "/a", 1); + CHECK_PATH_ORDER("/ab", "/aa", 1); + CHECK_PATH_ORDER("/aa", "/aa", 0); + CHECK_PATH_ORDER("/", "/", 0); +} + +/* +Local Variables: +c-basic-offset:2 +comment-column:40 +fill-column:79 +indent-tabs-mode:nil +End: +*/ diff --git a/lib/test.c b/lib/test.c index d18aa34..0682979 100644 --- a/lib/test.c +++ b/lib/test.c @@ -161,6 +161,7 @@ int main(void) { test_bits(); test_vector(); test_syscalls(); + test_trackname(); fprintf(stderr, "%lld errors out of %lld tests\n", errors, tests); return !!errors; } diff --git a/lib/test.h b/lib/test.h index dafdfb5..4fbde0b 100644 --- a/lib/test.h +++ b/lib/test.h @@ -156,6 +156,7 @@ void test_wstat(void); void test_bits(void); void test_vector(void); void test_syscalls(void); +void test_trackname(void); #endif /* TEST_H */ diff --git a/lib/trackname.c b/lib/trackname.c index bb07e64..0aef934 100644 --- a/lib/trackname.c +++ b/lib/trackname.c @@ -109,46 +109,6 @@ const char *trackname_transform(const char *type, return subject; } -int compare_tracks(const char *sa, const char *sb, - const char *da, const char *db, - const char *ta, const char *tb) { - int c; - - if((c = strcmp(utf8_casefold_canon(sa, strlen(sa), 0), - utf8_casefold_canon(sb, strlen(sb), 0)))) - return c; - if((c = strcmp(sa, sb))) return c; - if((c = strcmp(utf8_casefold_canon(da, strlen(da), 0), - utf8_casefold_canon(db, strlen(db), 0)))) - return c; - if((c = strcmp(da, db))) return c; - return compare_path(ta, tb); -} - -int compare_path_raw(const unsigned char *ap, size_t an, - const unsigned char *bp, size_t bn) { - /* Don't change this function! The database sort order depends on it */ - while(an > 0 && bn > 0) { - if(*ap == *bp) { - ap++; - bp++; - an--; - bn--; - } else if(*ap == '/') { - return -1; /* /a/b < /aa/ */ - } else if(*bp == '/') { - return 1; /* /aa > /a/b */ - } else - return *ap - *bp; - } - if(an > 0) - return 1; /* /a/b > /a and /ab > /a */ - else if(bn > 0) - return -1; /* /a < /ab and /a < /a/b */ - else - return 0; -} - /* Local Variables: c-basic-offset:2 diff --git a/lib/trackorder.c b/lib/trackorder.c new file mode 100644 index 0000000..a61b89c --- /dev/null +++ b/lib/trackorder.c @@ -0,0 +1,79 @@ +/* + * This file is part of DisOrder + * Copyright (C) 2005, 2006, 2007 Richard Kettlewell + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + */ + +#include +#include "types.h" + +#include +#include +#include +#include + +#include "trackname.h" +#include "log.h" +#include "unicode.h" + +int compare_tracks(const char *sa, const char *sb, + const char *da, const char *db, + const char *ta, const char *tb) { + int c; + + if((c = strcmp(utf8_casefold_canon(sa, strlen(sa), 0), + utf8_casefold_canon(sb, strlen(sb), 0)))) + return c; + if((c = strcmp(sa, sb))) return c; + if((c = strcmp(utf8_casefold_canon(da, strlen(da), 0), + utf8_casefold_canon(db, strlen(db), 0)))) + return c; + if((c = strcmp(da, db))) return c; + return compare_path(ta, tb); +} + +int compare_path_raw(const unsigned char *ap, size_t an, + const unsigned char *bp, size_t bn) { + /* Don't change this function! The database sort order depends on it */ + while(an > 0 && bn > 0) { + if(*ap == *bp) { + ap++; + bp++; + an--; + bn--; + } else if(*ap == '/') { + return -1; /* /a/b < /aa/ */ + } else if(*bp == '/') { + return 1; /* /aa > /a/b */ + } else + return *ap - *bp; + } + if(an > 0) + return 1; /* /a/b > /a and /ab > /a */ + else if(bn > 0) + return -1; /* /a < /ab and /a < /a/b */ + else + return 0; +} + +/* +Local Variables: +c-basic-offset:2 +comment-column:40 +fill-column:79 +End: +*/ -- [mdw]