Fix mis-merged trackdb_open().

[disorder] / lib / split.c

diff --git a/lib/split.c b/lib/split.c
index dbf7a48f2a89ab8327a739e16ebdae2c649ecba8..d4410dcd6bdfd5edcda2cd9f67ea512224097ffc 100644 (file)
--- a/lib/split.c
+++ b/lib/split.c
@@ -1,28 +1,26 @@
 /*
  * This file is part of DisOrder.
- * Copyright (C) 2004, 2006 Richard Kettlewell
+ * Copyright (C) 2004, 2006-2008 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/split.c
+ * @brief String splitting
+ */
+#include "common.h"
 
 #include <ctype.h>
-#include <string.h>
 #include <errno.h>
 
 #include "mem.h"
@@ -42,6 +40,9 @@ static void no_error_handler(const char attribute((unused)) *msg,
                             void attribute((unused)) *u) {
 }
 
+/* TODO: handle combining characters attached to delimiters in some
+ * sane way (might include reporting an error) */
+
 char **split(const char *p,
             int *np,
             unsigned flags,
@@ -53,7 +54,8 @@ char **split(const char *p,
   size_t l;
   int qc;
 
-  if(!error_handler) error_handler = no_error_handler;
+  if(!error_handler)
+    error_handler = no_error_handler;
   vector_init(&v);
   while(*p && !(*p == '#' && (flags & SPLIT_COMMENTS))) {
     if(space(*p)) {
@@ -110,6 +112,8 @@ char **split(const char *p,
   return v.vec;
 }
 
+/* TODO handle initial combining characters sanely */
+
 const char *quoteutf8(const char *s) {
   size_t len = 3 + strlen(s);
   const char *t;
@@ -166,4 +170,3 @@ c-basic-offset:2
 comment-column:40
 End:
 */
-/* arch-tag:768e4e1bc91d9f45d6beecc9b433992f */