* Merge branch 'master' of github.com:djcb/mu

This commit is contained in:
djcb
2014-05-13 23:03:08 -07:00

View File

@ -1056,15 +1056,19 @@ mu_str_remove_ctrl_in_place (char *str)
if (!iscntrl(*cur)) if (!iscntrl(*cur))
continue; continue;
/* control char detected... */ if (isspace(*cur)) {
gstr = g_string_sized_new (strlen (str)); /* squash special white space into a simple space */
for (cur = str; *cur; ++cur) *cur = ' ';
if (!iscntrl (*cur)) } else {
g_string_append_c (gstr, *cur); /* remove other control characters */
memcpy (str, gstr->str, gstr->len); /* fits */ gstr = g_string_sized_new (strlen (str));
g_string_free (gstr, TRUE); for (cur = str; *cur; ++cur)
if (!iscntrl (*cur))
break; g_string_append_c (gstr, *cur);
memcpy (str, gstr->str, gstr->len); /* fits */
g_string_free (gstr, TRUE);
break;
}
} }
return str; return str;