Changes in uspace/lib/posix/string.c [ec18957a:4f4b4e7] in mainline

File:

• uspace/lib/posix/string.c (modified) (10 diffs)

uspace/lib/posix/string.c

@@ -36 +36 @@
 #define LIBPOSIX_INTERNAL
 
-#include "internal/common.h"
 #include "string.h"
 
-#include "assert.h"
-#include "errno.h"
-#include "limits.h"
-#include "stdlib.h"
-#include "signal.h"
-
-#include "libc/str_error.h"
+#include <assert.h>
+#include <str_error.h>
+#include <stdlib.h>
+#include <errno.h>
+
+/**
+ * Defined for convenience. Returns pointer to the terminating nul character.
+ *
+ * @param s
+ * @return
+ */
+static char *strzero(const char *s)
+{
+        while (*s != '\0') {
+                s++;
+        }
+
+        return (char *) s;
+}
 
 /**
@@ -172 +183 @@
         assert(src != NULL);
 
-        posix_strcpy(posix_strchr(dest, '\0'), src);
+        posix_strcpy(strzero(dest), src);
         return dest;
 }
@@ -188 +199 @@
         assert(src != NULL);
 
-        char *zeroptr = posix_strncpy(posix_strchr(dest, '\0'), src, n);
+        char *zeroptr = posix_strncpy(strzero(dest), src, n);
         /* strncpy doesn't append the nul terminator, so we do it here */
         zeroptr[n] = '\0';
@@ -229 +240 @@
 char *posix_strdup(const char *s)
 {
-        return posix_strndup(s, SIZE_MAX);
+        // FIXME: SIZE_MAX doesn't work
+        return posix_strndup(s, STR_NO_LIMIT);
 }
 
@@ -348 +360 @@
         assert(s != NULL);
         
-        char *res = gnu_strchrnul(s, c);
-        return (*res == c) ? res : NULL;
+        /* special handling for the case that zero is searched for */
+        if (c == '\0') {
+                return strzero(s);
+        }
+        
+        /* otherwise just loop through the string until found */
+        while (*s != (char) c) {
+                if (*s == '\0') {
+                        return NULL;
+                }
+
+                s++;
+        }
+        
+        return (char *) s;
 }
 
@@ -362 +387 @@
         assert(s != NULL);
         
-        const char *ptr = posix_strchr(s, '\0');
+        const char *ptr = strzero(s);
         
         /* the same as in strchr, except it loops in reverse direction */
@@ -374 +399 @@
 
         return (char *) ptr;
-}
-
-char *gnu_strchrnul(const char *s, int c)
-{
-        assert(s != NULL);
-        
-        while (*s != c && *s != '\0') {
-                s++;
-        }
-        
-        return (char *) s;
 }
 
@@ -510 +524 @@
 char *posix_strerror(int errnum)
 {
-        /* Uses function from libc, we just have to negate errno
-         * (POSIX uses positive errorcodes, HelenOS has negative).
+        /* uses function from libc, we just have to negate errno
+         * (POSIX uses positive errorcodes, HelenOS has negative)
          */
-        // FIXME: not all POSIX error codes are in libc
-        return (char *) str_error(-posix_abs(errnum));
+        return (char *) str_error(-errnum);
 }
 
@@ -549 +562 @@
         assert(s != NULL);
         
-        return (size_t) (posix_strchr(s, '\0') - s);
+        return (size_t) (strzero(s) - s);
 }
 
@@ -572 +585 @@
 }
 
-/**
- *
- * @param signum
- * @return
- */
-char *posix_strsignal(int signum)
-{
-        static const char *const sigstrings[] = {
-                [SIGABRT] = "SIGABRT (Process abort signal)",
-                [SIGALRM] = "SIGALRM (Alarm clock)",
-                [SIGBUS] = "SIGBUS (Access to an undefined portion of a memory object)",
-                [SIGCHLD] = "SIGCHLD (Child process terminated, stopped, or continued)",
-                [SIGCONT] = "SIGCONT (Continue executing, if stopped)",
-                [SIGFPE] = "SIGFPE (Erroneous arithmetic operation)",
-                [SIGHUP] = "SIGHUP (Hangup)",
-                [SIGILL] = "SIGILL (Illegal instruction)",
-                [SIGINT] = "SIGINT (Terminal interrupt signal)",
-                [SIGKILL] = "SIGKILL (Kill process)",
-                [SIGPIPE] = "SIGPIPE (Write on a pipe with no one to read it)",
-                [SIGQUIT] = "SIGQUIT (Terminal quit signal)",
-                [SIGSEGV] = "SIGSEGV (Invalid memory reference)",
-                [SIGSTOP] = "SIGSTOP (Stop executing)",
-                [SIGTERM] = "SIGTERM (Termination signal)",
-                [SIGTSTP] = "SIGTSTP (Terminal stop signal)",
-                [SIGTTIN] = "SIGTTIN (Background process attempting read)",
-                [SIGTTOU] = "SIGTTOU (Background process attempting write)",
-                [SIGUSR1] = "SIGUSR1 (User-defined signal 1)",
-                [SIGUSR2] = "SIGUSR2 (User-defined signal 2)",
-                [SIGPOLL] = "SIGPOLL (Pollable event)",
-                [SIGPROF] = "SIGPROF (Profiling timer expired)",
-                [SIGSYS] = "SIGSYS (Bad system call)",
-                [SIGTRAP] = "SIGTRAP (Trace/breakpoint trap)",
-                [SIGURG] = "SIGURG (High bandwidth data is available at a socket)",
-                [SIGVTALRM] = "SIGVTALRM (Virtual timer expired)",
-                [SIGXCPU] = "SIGXCPU (CPU time limit exceeded)",
-                [SIGXFSZ] = "SIGXFSZ (File size limit exceeded)"
-        };
-
-        if (signum <= _TOP_SIGNAL) {
-                return (char *) sigstrings[signum];
-        }
-
-        return (char *) "ERROR, Invalid signal number";
-}
-
 /** @}
  */