+2007-10-18 Colin Watson <cjwatson@debian.org> (tiny change)
+ Bruno Haible <bruno@clisp.org>
+
+ * lib/trim.c: Include config.h unconditionally. Include trim.h always.
+ Include ctype.h always. Include stdlib.h, not mbuiter.h, for MB_CUR_MAX.
+ * modules/trim (Depends-on): Add mbchar.
+ (configure.ac): Add gl_FUNC_MBRTOWC.
+ (Makefile.am): Augment lib_SOURCES.
+
2007-10-17 Paul Eggert <eggert@cs.ucla.edu>
Modify glob.c to use fstatat and dirfd, to simplify it.
/* Removes leading and/or trailing whitespaces
- Copyright (C) 2006 Free Software Foundation, Inc.
+ Copyright (C) 2006-2007 Free Software Foundation, Inc.
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
/* Written by Davide Angelocola <davide.angelocola@gmail.com> */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
+
+/* Specification. */
+#include "trim.h"
+
+#include <ctype.h>
#if HAVE_MBRTOWC
# include <stddef.h>
+# include <stdlib.h>
# include "mbchar.h"
# include "mbiter.h"
-# include "mbuiter.h" /* FIXME: for MB_CUR_MAX */
-#else
-# include <ctype.h>
#endif
#include "xalloc.h"
-#include "trim.h"
char *
trim2(const char *s, int how)
if (how != TRIM_LEADING)
{
int state = 0;
- char *r;
+ char *r; /* used only while state = 2 */
mbi_init (i, d, strlen (d));