+ prevCtrl = 1;
+ continue;
+ }
+ prevCtrl = 0;
+
+#ifdef MULTIBYTE_SUPPORT
+ if (w >= 0 && remaining >= w) {
+ charstring_push_back_chars (trimmed, altstr ? altstr : sp,
+ char_len, w);
+ remaining -= w;
+ altstr = NULL;
+ }
+ sp += char_len;
+#else
+ charstring_push_back (trimmed, *sp++);
+ remaining--;
+#endif
+ }
+ }
+
+ while (remaining-- > 0) {
+ charstring_push_back(dest, fill);
+ }
+
+ if (rjust) {
+ charstring_append(dest, trimmed);
+ charstring_free(trimmed);
+ }
+}
+
+static void
+cpstripped (charstring_t dest, size_t max, char *str)
+{
+ int prevCtrl = 1; /* This is 1 so we strip out leading spaces */
+ int len;
+#ifdef MULTIBYTE_SUPPORT
+ int char_len, w;
+ wchar_t wide_char;
+ char *altstr = NULL;
+#endif /* MULTIBYTE_SUPPORT */
+
+ if (!str) {
+ return;
+ }
+
+ len = strlen(str);
+
+#ifdef MULTIBYTE_SUPPORT
+ if (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 && max > 0) {
+#ifdef MULTIBYTE_SUPPORT
+ char_len = mbtowc(&wide_char, str, len);
+
+ /*
+ * If mbrtowc() failed, then we have a character that isn't valid
+ * in the current encoding, or len wasn't enough for the whole
+ * multi-byte rune to be read. Replace it with a '?'. We do that by
+ * setting the alstr variable to the value of the replacement string;
+ * altstr is used below when the bytes are copied into the output
+ * buffer.
+ */
+ if (char_len < 0) {
+ altstr = "?";
+ char_len = mbtowc(&wide_char, altstr, 1);
+ }
+
+ if (char_len <= 0) {
+ break;
+ }
+
+ len -= char_len;
+
+ if (iswcntrl(wide_char) || iswspace(wide_char)) {
+ str += char_len;
+#else /* MULTIBYTE_SUPPORT */
+ int c = (unsigned char) *str;
+ len--;
+ if (iscntrl(c) || isspace(c)) {
+ str++;
+#endif /* MULTIBYTE_SUPPORT */
+ if (! prevCtrl) {
+ charstring_push_back (dest, ' ');
+ --max;
+ }
+
+ prevCtrl = 1;
+ continue;
+ }
projects / nmh / blobdiff