Changeset 69 for trunk/src/helpers/stringh.c

Timestamp:

May 19, 2001, 3:47:20 PM (24 years ago)

Author:

umoeller

Message:

New folder sorting. Updated folder refresh. Misc other changes.

File:

• trunk/src/helpers/stringh.c (modified) (2 diffs)

trunk/src/helpers/stringh.c

@@ -1115 +1115 @@
  *@@ strhBeautifyTitle:
  *      replaces all line breaks (0xd, 0xa) with spaces.
+ *
+ *@@changed V0.9.12 (2001-05-17) [pr]: multiple line break chars. end up as only 1 space
  */
 
@@ -1120 +1122 @@
 {
     BOOL rc = FALSE;
-    CHAR *p;
-    while ((p = strchr(psz, 0xa)))
-    {
-        *p = ' ';
-        rc = TRUE;
-    }
-    while ((p = strchr(psz, 0xd)))
-    {
-        *p = ' ';
-        rc = TRUE;
-    }
+    CHAR *p = psz;
+
+    while(*p)
+        if (   (*p == '\r')
+            || (*p == '\n')
+           )
+        {
+            rc = TRUE;
+            if (   (p != psz)
+                && (p[-1] == ' ')
+               )
+                memmove(p, p + 1, strlen(p));
+            else
+                *p++ = ' ';
+        }
+        else
+            p++;
+
     return (rc);
 }