Fix mis-merged trackdb_open().

[disorder] / lib / trackname.c

diff --git a/lib/trackname.c b/lib/trackname.c
index 7a891b7e658df5ba21f8e437b361f05e2e7a2bfb..fa40c3b840a567ec722d49d9edd4b4827e55344c 100644 (file)
--- a/lib/trackname.c
+++ b/lib/trackname.c
@@ -1,39 +1,36 @@
 /*
  * This file is part of DisOrder
- * Copyright (C) 2005, 2006 Richard Kettlewell
+ * Copyright (C) 2005, 2006, 2007 Richard Kettlewell
  *
- * This program is free software; you can redistribute it and/or modify
+ * 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
+ * the Free Software Foundation, either version 3 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.
- *
+ * 
+ * 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
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
-#include <config.h>
-#include "types.h"
+/** @file lib/trackname.c
+ * @brief Track name calculation
+ */
+#include "common.h"
 
 #include <pcre.h>
 #include <fnmatch.h>
-#include <string.h>
-#include <assert.h>
 
 #include "trackname.h"
 #include "configuration.h"
 #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,8 +41,18 @@ const char *find_track_root(const char *track) {
        && track[l] == '/')
       break;
   }
-  if(n >= config->collection.n) return 0;
-  return config->collection.s[n].root;
+  if(n < config->collection.n)
+    return &config->collection.s[n];
+  else
+    return 0;
+}
+
+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) {
@@ -99,41 +106,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