-#define PUTS(cp, str) {\
- if ((sp = (str))) {\
- while ((c = (unsigned char) *sp) && (iscntrl(c) || isspace(c)))\
- sp++;\
- while((c = (unsigned char) *sp++) && cp < ep)\
- if (!iscntrl(c) && !isspace(c)) \
- *cp++ = c;\
- else {\
- while ((c = (unsigned char) *sp) && (iscntrl(c) || isspace(c)))\
- sp++;\
- *cp++ = ' ';\
- }\
- }\
+static void
+cpstripped (char **dest, char *end, char *str)
+{
+ int prevCtrl = 1; /* This is 1 so we strip out leading spaces */
+ int len;
+#ifdef MULTIBYTE_SUPPORT
+ int char_len;
+ wchar_t wide_char;
+#endif /* MULTIBYTE_SUPPORT */
+
+ if (!str)
+ return;
+
+ len = strlen(str);
+
+#ifdef MULTIBYTE_SUPPORT
+ mbtowc(NULL, NULL, 0); /* Reset shift state */
+#endif /* MULTIBYTE_SUPPORT */
+
+ /*
+ * Process each character at a time; if we have multibyte support
+ * then deal with that here.
+ */
+
+ while (*str != '\0' && len > 0 && *dest < end) {
+#ifdef MULTIBYTE_SUPPORT
+ char_len = mbtowc(&wide_char, str, len);
+
+ if (char_len <= 0 || *dest + char_len > end)
+ break;
+
+ len -= char_len;
+
+ if (iswcntrl(wide_char) || iswspace(wide_char)) {
+ str += char_len;
+#else /* MULTIBYTE_SUPPORT */
+ int c = *str;
+ len--;
+ if (iscntrl(c) || isspace(c)) {
+ str++;
+#endif /* MULTIBYTE_SUPPORT */
+ if (! prevCtrl) {
+ *(*dest)++ = ' ';
+ }
+
+ prevCtrl = 1;
+ continue;