Changeset 4482bc7 in mainline

Timestamp:

2009-04-14T19:21:25Z (15 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

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

Children:

6700ee2

Parents:

732bb0c

Message:

strcat() → str_append().

Location:

uspace/lib/libc

Files:

• generic/string.c (modified) (2 diffs)
• generic/vfs/vfs.c (modified) (1 diff)
• include/string.h (modified) (2 diffs)

uspace/lib/libc/generic/string.c

@@ -530 +530 @@
 }
 
+/** Append one string to another.
+ *
+ * Append source string @a src to string in destination buffer @a dest.
+ * Size of the destination buffer is @a dest. If the size of the output buffer
+ * is at least one byte, the output string will always be well-formed, i.e.
+ * null-terminated and containing only complete characters.
+ *
+ * @param dst   Destination buffer.
+ * @param count Size of the destination buffer.
+ * @param src   Source string.
+ */
+void str_append(char *dest, size_t size, const char *src)
+{
+        size_t dstr_size;
+
+        dstr_size = str_size(dest);
+        str_cpy(dest + dstr_size, size - dstr_size, src);
+}
+
 /** Copy NULL-terminated wide string to string
  *
@@ -821 +840 @@
 }
 
-char *strcat(char *dest, const char *src)
-{
-        char *orig = dest;
-        while (*dest++)
-                ;
-        --dest;
-        while ((*dest++ = *src++))
-                ;
-        return orig;
-}
-
 char *str_dup(const char *src)
 {

uspace/lib/libc/generic/vfs/vfs.c

@@ -88 +88 @@
                 ncwd_path_nc[0] = '\0';
         }
-        strcat(ncwd_path_nc, path);
+        str_append(ncwd_path_nc, cwd_size + 1 + size + 1, path);
         ncwd_path = canonify(ncwd_path_nc, retlen);
         if (!ncwd_path) {

uspace/lib/libc/include/string.h

@@ -72 +72 @@
 extern void str_cpy(char *dest, size_t size, const char *src);
 extern void str_ncpy(char *dest, size_t size, const char *src, size_t n);
+extern void str_append(char *dest, size_t size, const char *src);
 
 extern void wstr_nstr(char *dst, const wchar_t *src, size_t size);
@@ -89 +90 @@
 extern int stricmp(const char *, const char *);
 
-extern char *strcat(char *, const char *);
-
 extern long int strtol(const char *, char **, int);
 extern unsigned long strtoul(const char *, char **, int);