-
- /* enlarge pointer array, if necessary */
- if (i >= len) {
- len += NUMBROKEN;
- broken = mh_xrealloc (broken, (size_t) (len * sizeof(*broken)));
- }
-
- while (brkany (c = *s, brksep))
- *s++ = '\0';
-
- /*
- ** 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;
- }
-
- /* set next start addr */
- broken[i] = s;
-
- while ((c = *++s) && !brkany (c, brksep) && !brkany (c, brkterm))
- ; /* empty body */
- }
-
- return broken; /* NOT REACHED */
-}
-
-
-/*
-** If the character is in the string,
-** return 1, else return 0.
-*/
-
-static int
-brkany (char c, char *str)
-{
- char *s;
-
- if (str) {
- for (s = str; *s; s++)
- if (c == *s)
- return 1;
+ /* 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;
+ }
+ }