Ticket #7968: CDDA_uppercase_string_1.diff

src/add-ons/kernel/file_systems/cdda/cdda.cpp

@@ -237 +237 @@
     if (string == NULL)
         return;
 
-    bool newWord = isalpha(string[0]) || isspace(string[0]);
-    while (string[0]) {
-        if (isalpha(string[0])) {
-            if (newWord) {
-                string[0] = toupper(string[0]);
-                newWord = false;
-            } else
-                string[0] = tolower(string[0]);
-        } else if (string[0] != '\'')
-            newWord = true;
+    int i;
+    char* begin = string;
+    char* running = strtok(string, " ");
+
+    while (running != NULL) {
+        if (strcasecmp(running, "a") == 0           // articles
+            || strcasecmp(running, "an") == 0
+            || strcasecmp(running, "the") == 0
+            || strcasecmp(running, "also") == 0     // conjunctions < 5 letters
+            || strcasecmp(running, "and") == 0
+            || strcasecmp(running, "both") == 0
+            || strcasecmp(running, "but") == 0
+            || strcasecmp(running, "even") == 0
+            || strcasecmp(running, "if") == 0
+            || strcasecmp(running, "nor") == 0
+            || strcasecmp(running, "only") == 0
+            || strcasecmp(running, "or") == 0
+            || strcasecmp(running, "so") == 0
+            || strcasecmp(running, "yet") == 0
+            || strcasecmp(running, "amid") == 0     // prepositions < 5 letters
+            || strcasecmp(running, "as") == 0
+            || strcasecmp(running, "at") == 0
+            || strcasecmp(running, "atop") == 0
+            || strcasecmp(running, "by") == 0
+            || strcasecmp(running, "down") == 0
+            || strcasecmp(running, "for") == 0
+            || strcasecmp(running, "from") == 0
+            || strcasecmp(running, "in") == 0
+            || strcasecmp(running, "into") == 0
+            || strcasecmp(running, "like") == 0
+            || strcasecmp(running, "near") == 0
+            || strcasecmp(running, "next") == 0
+            || strcasecmp(running, "not") == 0
+            || strcasecmp(running, "of") == 0
+            || strcasecmp(running, "off") == 0
+            || strcasecmp(running, "on") == 0
+            || strcasecmp(running, "onto") == 0
+            || strcasecmp(running, "over") == 0
+            || strcasecmp(running, "past") == 0
+            || strcasecmp(running, "per") == 0
+            || strcasecmp(running, "plus") == 0
+            || strcasecmp(running, "sans") == 0
+            || strcasecmp(running, "save") == 0
+            || strcasecmp(running, "than") == 0
+            || strcasecmp(running, "till") == 0
+            || strcasecmp(running, "to") == 0
+            || strcasecmp(running, "up") == 0
+            || strcasecmp(running, "upon") == 0
+            || strcasecmp(running, "on") == 0
+            || strcasecmp(running, "onto") == 0
+            || strcasecmp(running, "unto") == 0
+            || strcasecmp(running, "via") == 0
+            || strcasecmp(running, "vs") == 0
+            || strcasecmp(running, "vs.") == 0
+            || strcasecmp(running, "ye") == 0
+            || strcasecmp(running, "with") == 0) {
+            for (i = 0; running[i] != '\0'; i++) {
+                if (isalpha(running[i]))
+                    running[i] = tolower(running[i]);
+            }
+        } else if (isalpha(running[0]))
+            running[0] = toupper(running[0]);
+
+        memmove(string, running, strlen(running));
+        string += strlen(running);
+        running = strtok(NULL, " ");
+        if (running != NULL) {
+            memmove(string, " ", 1);
+            string++;
+        }
+    }
 
-        string++;
+    *string = '\0'; // end the string
+    string = begin;
+
+    // uppercase the first letter
+    if (isalpha(string[0]))
+        string[0] = toupper(string[0]);
+
+    if (strlen(string) > 1) {
+        // uppercase the first letter of the last word
+        for (i = strlen(string) - 1; i > 0 && !isspace(string[i]); i--) {
+            if (isspace(string[i - 1]) && isalpha(string[i]))
+                string[i] = toupper(string[i]);
+        }
     }
 }