Author: ekato
Date: Sat Dec 11 21:51:56 2004
New Revision: 25
Modified:
trunk/configure.ac
trunk/xim/locale.cpp
trunk/xim/util.cpp
trunk/xim/util.h
Log:
* configure.ac : Check strsep().
* xim/locale.cpp (all_locales) : Add sanity check.
* xim/util.h : Add prototype of strsep() for system without it.
* xim/util.cpp (strsep) : New function for system without it.
Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Sat Dec 11 21:51:56 2004
@@ -105,7 +105,7 @@
AC_CHECK_FUNCS([forkpty])
AC_CHECK_FUNCS([cfmakeraw])
AC_CHECK_FUNCS([wcswidth])
-AC_CHECK_FUNCS(getpeereid asprintf vasprintf setenv unsetenv)
+AC_CHECK_FUNCS(getpeereid asprintf vasprintf setenv unsetenv strsep)
GETTEXT_PACKAGE=uim
Modified: trunk/xim/locale.cpp
==============================================================================
--- trunk/xim/locale.cpp (original)
+++ trunk/xim/locale.cpp Sat Dec 11 21:51:56 2004
@@ -359,7 +359,8 @@
free(tmp);
}
// remove trailing ":"
- locales[len - 1] = '\0';
+ if (locales)
+ locales[len - 1] = '\0';
// assign result into the cache
all_locale_names = locales;
Modified: trunk/xim/util.cpp
==============================================================================
--- trunk/xim/util.cpp (original)
+++ trunk/xim/util.cpp Sat Dec 11 21:51:56 2004
@@ -41,6 +41,7 @@
#include <unistd.h>
#include <ctype.h>
#include <stdarg.h>
+#include <string.h>
#include "util.h"
@@ -112,3 +113,71 @@
}
#endif
+#if !defined(HAVE_STRSEP)
+/*
+ * strsep Copyright (c) 1990, 1993
+ * The Regents of the University of California. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+/*
+ * Get next token from string *stringp, where tokens are possibly-empty
+ * strings separated by characters from delim.
+ *
+ * Writes NULs into the string at *stringp to end tokens.
+ * delim need not remain constant from call to call.
+ * On return, *stringp points past the last NUL written (if there might
+ * be further tokens), or is NULL (if there are definitely no more tokens).
+ *
+ * If *stringp is NULL, strsep returns NULL.
+ */
+char *
+strsep(char **stringp, const char *delim)
+{
+ char *s;
+ const char *spanp;
+ int c, sc;
+ char *tok;
+
+ if ((s = *stringp) == NULL)
+ return (NULL);
+ for (tok = s;;) {
+ c = *s++;
+ spanp = delim;
+ do {
+ if ((sc = *spanp++) == c) {
+ if (c == 0)
+ s = NULL;
+ else
+ s[-1] = 0;
+ *stringp = s;
+ return (tok);
+ }
+ } while (sc != 0);
+ }
+ /* NOTREACHED */
+}
+#endif /* !defined(HAVE_STRSEP) */
Modified: trunk/xim/util.h
==============================================================================
--- trunk/xim/util.h (original)
+++ trunk/xim/util.h Sat Dec 11 21:51:56 2004
@@ -54,4 +54,7 @@
int vasprintf(char **ptr, const char *fmt, va_list ap);
#endif
+#ifndef HAVE_STRSEP
+char *strsep(char **stringp, const char *delim);
+#endif
#endif
