Changeset 5c5117c in mainline

Timestamp:

2011-06-20T02:42:01Z (13 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

79506d6

Parents:

f3a605be (diff), b4d6252 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge libposix changes.

Location:

uspace/lib/posix

Files:

• Makefile (modified) (1 diff)
• fcntl.c (modified) (1 diff)
• float.h (added)
• fnmatch.c (modified) (1 diff)
• getopt.c (modified) (1 diff)
• internal/common.h (moved) (moved from uspace/lib/posix/common.h )
• inttypes.h (added)
• limits.h (added)
• math.h (added)
• stddef.h (added)
• stdint.h (added)
• stdio.c (modified) (1 diff)
• stdlib.c (modified) (4 diffs)
• stdlib/strtold.c (added)
• string.h (modified) (2 diffs)
• strings.c (modified) (3 diffs)
• sys/stat.c (modified) (1 diff)
• sys/stat.h (modified) (2 diffs)
• sys/types.h (modified) (2 diffs)
• time.c (modified) (1 diff)
• unistd.c (modified) (1 diff)
• unistd.h (modified) (2 diffs)

uspace/lib/posix/Makefile

@@ -43 +43 @@
         stdio.c \
         stdlib.c \
+        stdlib/strtold.c \
         string.c \
         strings.c \

uspace/lib/posix/fcntl.c

@@ -35 +35 @@
 #define LIBPOSIX_INTERNAL
 
-#include "common.h"
+#include "internal/common.h"
 #include "fcntl.h"
 

uspace/lib/posix/fnmatch.c

@@ -35 +35 @@
 #define LIBPOSIX_INTERNAL
 
-#include "common.h"
+#include "internal/common.h"
 #include "fnmatch.h"
 

uspace/lib/posix/getopt.c

@@ -35 +35 @@
 #define LIBPOSIX_INTERNAL
 
-#include "common.h"
+#include "internal/common.h"
 #include "getopt.h"
 

uspace/lib/posix/stdio.c

@@ -39 +39 @@
 #include <errno.h>
 
-#include "common.h"
+#include "internal/common.h"
 #include "stdio.h"
 #include "string.h"

uspace/lib/posix/stdlib.c

@@ -37 +37 @@
 
 #include "stdlib.h"
-#include "common.h"
+#include "internal/common.h"
 
 /**
@@ -77 +77 @@
 
 /**
- * 
+ * Converts a string representation of a floating-point number to
+ * its native representation. See posix_strtold().
+ *
  * @param nptr
  * @param endptr
@@ -84 +86 @@
 float posix_strtof(const char *restrict nptr, char **restrict endptr)
 {
-        // TODO
-        not_implemented();
+        return (float) posix_strtold(nptr, endptr);
 }
 
 /**
- * 
+ * Converts a string representation of a floating-point number to
+ * its native representation. See posix_strtold().
+ *
  * @param nptr
  * @param endptr
@@ -96 +99 @@
 double posix_strtod(const char *restrict nptr, char **restrict endptr)
 {
-        // TODO
-        not_implemented();
-}
-
-/**
- * 
- * @param nptr
- * @param endptr
- * @return
- */
-long double posix_strtold(const char *restrict nptr, char **restrict endptr)
-{
-        // TODO
-        not_implemented();
+        return (double) posix_strtold(nptr, endptr);
 }
 

uspace/lib/posix/string.h

@@ -102 +102 @@
 extern size_t posix_strnlen(const char *s, size_t n);
 
+/* Legacy declarations */
+extern int posix_ffs(int i);
+
 #ifndef LIBPOSIX_INTERNAL
         #define strcpy posix_strcpy
@@ -134 +137 @@
         #define strlen posix_strlen
         #define strnlen posix_strnlen
+
+        #define ffs posix_ffs
 #endif
 

uspace/lib/posix/strings.c

@@ -36 +36 @@
 #define LIBPOSIX_INTERNAL
 
-#include "common.h"
+#include "internal/common.h"
 #include "strings.h"
 #include "string.h"
+#include "ctype.h"
 
 /**
@@ -59 +60 @@
 int posix_strcasecmp(const char *s1, const char *s2)
 {
-        // TODO
-        not_implemented();
+        return posix_strncasecmp(s1, s2, STR_NO_LIMIT);
 }
 
@@ -72 +72 @@
 int posix_strncasecmp(const char *s1, const char *s2, size_t n)
 {
-        // TODO
-        not_implemented();
+        for (size_t i = 0; i < n; ++i) {
+                int cmp = tolower(s1[i]) - tolower(s2[i]);
+                if (cmp != 0) {
+                        return cmp;
+                }
+                
+                if (s1[i] == 0) {
+                        return 0;
+                }
+        }
+        
+        return 0;
 }
 

uspace/lib/posix/sys/stat.c

@@ -37 +37 @@
 
 #include "stat.h"
-#include "../common.h"
+#include "../internal/common.h"
 #include <mem.h>
 

uspace/lib/posix/sys/stat.h

@@ -40 +40 @@
 #include "types.h"
 #include "../time.h"
+#include <ipc/devmap.h>
+#include <task.h>
+
+typedef devmap_handle_t posix_dev_t;
+typedef task_id_t posix_pid_t;
 
 /* values are the same as on Linux */
@@ -134 +139 @@
 
 #ifndef LIBPOSIX_INTERNAL
+        #define dev_t posix_dev_t
+        #define pid_t posix_pid_t
         #define fstat posix_fstat
         #define lstat posix_lstat

uspace/lib/posix/sys/types.h

@@ -38 +38 @@
 
 #include "../libc/sys/types.h"
-#include <ipc/devmap.h>
-#include <task.h>
 
-typedef task_id_t posix_pid_t;
-typedef devmap_handle_t posix_dev_t;
 typedef unsigned int posix_ino_t;
 typedef unsigned int posix_nlink_t;
@@ -52 +48 @@
 
 #ifndef LIBPOSIX_INTERNAL
-        #define pid_t posix_pid_t
-        #define dev_t posix_dev_t
+        #define ino_t posix_ino_t
         #define nlink_t posix_nlink_t
         #define uid_t posix_uid_t

uspace/lib/posix/time.c

@@ -36 +36 @@
 #define LIBPOSIX_INTERNAL
 
-#include "common.h"
+#include "internal/common.h"
 #include "time.h"
 

uspace/lib/posix/unistd.c

@@ -36 +36 @@
 #define LIBPOSIX_INTERNAL
 
-#include "common.h"
+#include "internal/common.h"
 #include "unistd.h"
+
+/* Array of environment variable strings (NAME=VALUE). */
+char **environ = NULL;
 
 /**

uspace/lib/posix/unistd.h

@@ -48 +48 @@
 extern int getopt(int, char * const [], const char *);
 
+/* Environmental Variables */
+extern char **posix_environ;
+
 /* Identifying Terminals */
 extern int posix_isatty(int fd);
@@ -85 +88 @@
 
 #ifndef LIBPOSIX_INTERNAL
+        #define environ posix_environ
+
         #define isatty posix_isatty