- * we are either at the end of the string, or the
- * terminator found has been found, so finish up.
- */
- if (!c || brkany (c, brkterm)) {
- *s = '\0';
- broken[i] = NULL;
- return broken;
+ ** scan string, replacing separators with zeroes
+ ** and enter start addresses in "broken".
+ */
+ s = str;
+ for (i = 0;; i++) {
+ /* enlarge pointer array, if necessary */
+ if (i >= len) {
+ len += NUMBROKEN;
+ broken = mh_xrealloc(broken, len * sizeof(*broken));
+ }
+
+ /* handle separators */
+ while ((c=*s) && brksep && strchr(brksep, c)) {
+ *s++ = '\0';
+ }
+
+ /*
+ ** we are either at the end of the string, or the
+ ** terminator found has been found, so finish up.
+ */
+ if (!c || (brkterm && strchr(brkterm, c))) {
+ *s = '\0';
+ broken[i] = NULL;
+ return broken;
+ }
+
+ /* set next start addr and walk over word */
+ broken[i] = s;
+ while ((c = *++s)) {
+ if (brksep && strchr(brksep, c)) {
+ break;
+ }
+ if (brkterm && strchr(brkterm, c)) {
+ break;
+ }
+ }