X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/460b9539a7c15580e41a71bbc0f47ae776238915..b0b15b7ced28b3c6ddfcd4b0a7e46ee6432a243c:/lib/split.c diff --git a/lib/split.c b/lib/split.c index dbf7a48..90036d4 100644 --- a/lib/split.c +++ b/lib/split.c @@ -1,6 +1,6 @@ /* * 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 * it under the terms of the GNU General Public License as published by @@ -18,11 +18,9 @@ * USA */ -#include -#include "types.h" +#include "common.h" #include -#include #include #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 */