X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/eb525fcd474c7c30e98e0764698a6fac33eb10ce..0e2b222fc14b8f890fab644118cf0f43abbe450a:/lib/trackname.c

diff --git a/lib/trackname.c b/lib/trackname.c
index 93c7b3e..0aef934 100644
--- a/lib/trackname.c
+++ b/lib/trackname.c
@@ -31,9 +31,9 @@
 #include "regsub.h"
 #include "log.h"
 #include "filepart.h"
-#include "words.h"
+#include "unicode.h"
 
-const char *find_track_root(const char *track) {
+const struct collection *find_track_collection(const char *track) {
   int n;
   size_t l, tl = strlen(track);
 
@@ -44,11 +44,18 @@ const char *find_track_root(const char *track) {
        && track[l] == '/')
       break;
   }
-  if(n >= config->collection.n) {
-    error(0, "found track in no collection '%s'", track);
+  if(n < config->collection.n)
+    return &config->collection.s[n];
+  else
     return 0;
-  }
-  return config->collection.s[n].root;
+}
+
+const char *find_track_root(const char *track) {
+  const struct collection *c = find_track_collection(track);
+  if(c)
+    return c->root;
+  error(0, "found track in no collection '%s'", track);
+  return 0;
 }
 
 const char *track_rootless(const char *track) {
@@ -102,41 +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(casefold(sa), casefold(sb)))) return c;
-  if((c = strcmp(sa, sb))) return c;
-  if((c = strcmp(casefold(da), casefold(db)))) 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) {
-  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