Changeset 4e2cf8b in mainline

Timestamp:

2006-03-14T12:14:43Z (19 years ago)

Author:

Josef Cejka <malyzelenyhnus@…>

Branches:

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

Children:

4ba1db5

Parents:

df50cf6

Message:

Userspace printf, stdarg, and some other printf support.

Location:

libc

Files:

• Makefile (modified) (1 diff)
• arch/ia32/include/types.h (modified) (1 diff)
• generic/io/io.c (moved) (moved from libc/generic/io.c ) (2 diffs)
• generic/io/print.c (added)
• include/io/io.h (added)
• include/stdarg.h (added)
• include/stddef.h (added)
• include/stdio.h (modified) (1 diff)

libc/Makefile

@@ -42 +42 @@
 GENERIC_SOURCES = \
         generic/libc.c \
-        generic/io.c
+        generic/io/io.c \
+        generic/io/print.c
 
 ARCH_SOURCES += \

libc/arch/ia32/include/types.h

@@ -34 +34 @@
 typedef signed int ssize_t;
 
+typedef char int8_t;
+typedef short int int16_t;
+typedef int int32_t;
+typedef long long int int64_t;
+
+typedef unsigned char uint8_t;
+typedef unsigned short int uint16_t;
+typedef unsigned int uint32_t;
+typedef unsigned long long int uint64_t;
+
 #endif

libc/generic/io/io.c

@@ -30 +30 @@
 #include <unistd.h>
 #include <stdio.h>
+#include <io/io.h>
 
 static char nl = '\n';
@@ -46 +47 @@
 }
 
+/** Put count chars from buffer to stdout without adding newline
+ * @param buf Buffer with size at least count bytes
+ * @param count 
+ * @return 0 on succes, EOF on fail
+ */
+int putnchars(const char * buf, size_t count)
+{
+        if (write(1, (void * ) buf, count) == count) {
+                        return 0;
+        }
+        
+        return EOF;
+}
+
+/** Same as puts, but does not print newline at end
+ *
+ */
+int putstr(const char * str)
+{
+        size_t count;
+        
+        for (count = 0; str[count] != 0; count++);
+        if (write(1, (void * ) str, count) == count) {
+                        return 0;
+        }
+        
+        return EOF;
+}
+
 ssize_t write(int fd, const void * buf, size_t count)
 {
         return (ssize_t) __SYSCALL3(SYS_IO, (sysarg_t) fd, (sysarg_t) buf, (sysarg_t) count);
 }
+
+

libc/include/stdio.h

@@ -32 +32 @@
 #include <types.h>
 
-#define EOF -1
+#define EOF (-1)
 
 extern int puts(const char * str);
 
+extern int printf(const char *fmt, ...);
+
 #endif