Changeset 1737bfb in mainline for uspace/lib/c/generic/str.c

Timestamp:

2011-10-29T17:02:30Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

45bf63c, e8ab32f

Parents:

b50bf6c2

git-author:

Maurizio Lombardi <m.lombardi85@…> (2011-10-29 17:02:30)

git-committer:

Jakub Jermar <jakub@…> (2011-10-29 17:02:30)

Message:

cp improvements
(Thanks to Maurizio Lombardi)

• Support for the -r flag (recursive directory copying) and the -f flag

(force copying even if the destination file already exists) has been
added.

File:

• uspace/lib/c/generic/str.c (modified) (1 diff)

uspace/lib/c/generic/str.c

@@ -839 +839 @@
         
         return NULL;
+}
+
+/** Removes specified trailing characters from a string.
+ *
+ * @param str String to remove from.
+ * @param ch  Character to remove.
+ */
+void str_rtrim(char *str, wchar_t ch)
+{
+        size_t off = 0;
+        size_t pos = 0;
+        wchar_t c;
+        bool update_last_chunk = true;
+        char *last_chunk = NULL;
+
+        while ((c = str_decode(str, &off, STR_NO_LIMIT))) {
+                if (c != ch) {
+                        update_last_chunk = true;
+                        last_chunk = NULL;
+                } else if (update_last_chunk) {
+                        update_last_chunk = false;
+                        last_chunk = (str + pos);
+                }
+                pos = off;
+        }
+
+        if (last_chunk)
+                *last_chunk = '\0';
+}
+
+/** Removes specified leading characters from a string.
+ *
+ * @param str String to remove from.
+ * @param ch  Character to remove.
+ */
+void str_ltrim(char *str, wchar_t ch)
+{
+        wchar_t acc;
+        size_t off = 0;
+        size_t pos = 0;
+        size_t str_sz = str_size(str);
+
+        while ((acc = str_decode(str, &off, STR_NO_LIMIT)) != 0) {
+                if (acc != ch)
+                        break;
+                else
+                        pos = off;
+        }
+
+        if (pos > 0) {
+                memmove(str, &str[pos], str_sz - pos);
+                pos = str_sz - pos;
+                str[str_sz - pos] = '\0';
+        }
 }