Changeset 2906

Timestamp:

Dec 26, 2006, 3:00:06 AM (19 years ago)

Author:

bird

Message:

doing cleanup.

Location:

trunk/libc

Files:

• Makefile.kmk (modified) (6 diffs)
• include/klibc/backend.h (modified) (1 diff)
• include/klibc/logstrict.h (modified) (1 diff)
• include/unistd.h (modified) (1 diff)
• src/kNIX/Makefile.kmk (modified) (3 diffs)
• src/kNIX/b_ioTTYName.c (added)
• src/kNIX/os2/__ttyname.c (deleted)
• src/kNIX/os2/__wait.c (deleted)
• src/kNIX/os2/__waitpid.c (deleted)
• src/kNIX/os2/brk.c (deleted)
• src/kNIX/os2/sbrk.c (deleted)
• src/libc/io/Makefile.kmk (modified) (1 diff)
• src/libc/io/ttyname.c (modified) (1 diff)
• src/libc/io/ttyname_r.c (added)

trunk/libc/Makefile.kmk

@@ -42 +42 @@
 include $(wildcard $(PATH_LIBC_SRC)/Makefile.kmk)
 
-
-#
-# libc.a
-#
-LIBRARIES += libc
-libc_TEMPLATE = libc
-libc_SOURCES = \
+                
+#
+# libc_frontend.a
+#
+LIBRARIES += libc_frontend
+libc_frontend_TEMPLATE = libc
+libc_frontend_SOURCES = \
         $(TARGET_libc_libc) \
         $(TARGET_libc_fbsdlibc) \
         $(TARGET_libc_glibc) \
-        $(TARGET_libc_msun) \
-        $(TARGET_libc_kNIX)
+        $(TARGET_libc_msun)
 libc_SOURCES.os2 = \
         $(TARGET_libc_libsocket) \
@@ -60 +59 @@
 
 ifdef CFG_LIBC_LOGSTRICT_LIBS
-LIBRARIES += libc_l
-libc_l_TEMPLATE = libc.profiled
-libc_l_SOURCES = \
+LIBRARIES += libc_frontend_l
+libc_frontend_l_TEMPLATE = libc.profiled
+libc_frontend_l_SOURCES = \
         $(TARGET_libc_libc_l) \
         $(TARGET_libc_fbsdlibc_l) \
         $(TARGET_libc_glibc_l) \
-        $(TARGET_libc_msun_l) \
-        $(TARGET_libc_kNIX_l)
-libc_l_SOURCES.os2 = \
+        $(TARGET_libc_msun_l)
+libc_frontend_l_SOURCES.os2 = \
         $(TARGET_libc_libsocket_l) \
         $(TARGET_libc_libsyslog_l)
@@ -74 +72 @@
 
 ifdef CFG_LIBC_PROFILED_LIBS
-LIBRARIES += libc_p
-libc_p_TEMPLATE = libc.profiled
-libc_p_SOURCES = \
+LIBRARIES += libc_frontend_p
+libc_frontend_p_TEMPLATE = libc.profiled
+libc_frontend_p_SOURCES = \
         $(TARGET_libc_libc_p) \
         $(TARGET_libc_fbsdlibc_p) \
         $(TARGET_libc_glibc_p) \
-        $(TARGET_libc_msun_p) \
-        $(TARGET_libc_kNIX_p)
-libc_p_SOURCES.os2 = \
+        $(TARGET_libc_msun_p)
+libc_frontend_p_SOURCES.os2 = \
         $(TARGET_libc_libsocket_p) \
         $(TARGET_libc_libsyslog_p)
@@ -91 +88 @@
 # libc_asm.a
 #
-LIBRARIES += libc_asm
-libc_asm_TEMPLATE = libcasm
-libc_asm_SOURCES = \
+LIBRARIES += libc_frontend_asm
+libc_frontend_asm_TEMPLATE = libcasm
+libc_frontend_asm_SOURCES = \
         $(TARGET_libc_libc_asm) \
         $(TARGET_libc_fbsdlibc_asm) \
         $(TARGET_libc_glibc_asm) \
-        $(TARGET_libc_msun_asm) \
-        $(TARGET_libc_kNIX_asm)
+        $(TARGET_libc_msun_asm)
 
 ifdef CFG_LIBC_LOGSTRICT_LIBS
-LIBRARIES += libc_asm_l
-libc_asm_l_TEMPLATE = libcasm.logstrict
-libc_asm_l_SOURCES = \
+LIBRARIES += libc_frontend_asm_l
+libc_frontend_asm_l_TEMPLATE = libcasm.logstrict
+libc_frontend_asm_l_SOURCES = \
         $(TARGET_libc_libc_asm_l) \
         $(TARGET_libc_fbsdlibc_asm_l) \
@@ -112 +108 @@
 
 ifdef CFG_LIBC_PROFILED_LIBS
+LIBRARIES += libc_frontend_asm_p
+libc_frontend_asm_p_TEMPLATE = libcasm.profiled
+libc_frontend_asm_p_SOURCES = \
+        $(TARGET_libc_libc_asm_p) \
+        $(TARGET_libc_fbsdlibc_asm_p) \
+        $(TARGET_libc_glibc_asm_p) \
+        $(TARGET_libc_msun_asm_p)
+endif
+
+
+#
+# libc.a
+#
+LIBRARIES += libc
+libc_TEMPLATE = libc
+libc_SOURCES = \
+        $(TARGET_libc_frontend) \
+        $(TARGET_libc_kNIX)
+libc_SOURCES.nt = $(TARGET_kNIX.nt)
+
+ifdef CFG_LIBC_LOGSTRICT_LIBS
+LIBRARIES += libc_l
+libc_l_TEMPLATE = libc.profiled
+libc_l_SOURCES = \
+        $(TARGET_libc_frontend_l) \
+        $(TARGET_libc_kNIX_l)
+libc_l_SOURCES.nt = $(TARGET_kNIX_l.nt)
+endif
+
+ifdef CFG_LIBC_PROFILED_LIBS
+LIBRARIES += libc_p
+libc_p_TEMPLATE = libc.profiled
+libc_p_SOURCES = \
+        $(TARGET_libc_frontend_p) \
+        $(TARGET_libc_kNIX_p)
+libc_p_SOURCES.nt = $(TARGET_kNIX_p.nt)
+endif
+
+
+#
+# libc_asm.a
+#
+LIBRARIES += libc_asm
+libc_asm_TEMPLATE = libcasm
+libc_asm_SOURCES = \
+        $(TARGET_libc_frontend_asm) \
+        $(TARGET_libc_kNIX_asm)
+
+ifdef CFG_LIBC_LOGSTRICT_LIBS
+LIBRARIES += libc_asm_l
+libc_asm_l_TEMPLATE = libcasm.logstrict
+libc_asm_l_SOURCES = \
+        $(TARGET_libc_frontend_asm_l) \
+        $(TARGET_libc_kNIX_asm_l)
+endif
+
+ifdef CFG_LIBC_PROFILED_LIBS
 LIBRARIES += libc_asm_p
 libc_asm_p_TEMPLATE = libcasm.profiled
 libc_asm_p_SOURCES = \
-        $(TARGET_libc_libc_asm_p) \
-        $(TARGET_libc_fbsdlibc_asm_p) \
-        $(TARGET_libc_glibc_asm_p) \
-        $(TARGET_libc_msun_asm_p) \
+        $(TARGET_libc_frontend_asm_p) \
         $(TARGET_libc_kNIX_asm_p)
 endif
@@ -167 +217 @@
 
 ifdef CFG_LIBC_PROFILED_LIBS
-DLLS.os2 += libc07.profiled
+#DLLS.os2 += libc07.profiled
 libc07.profiled_TEMPLATE = libc.profiled
 libc07.profiled_TOOL = GCC3

trunk/libc/include/klibc/backend.h

@@ -535 +535 @@
  */
 ssize_t __libc_Back_ioDirGetEntries(int fh, void *pvBuf, size_t cbBuf, __off_t *poff);
+
+/**
+ * Get the TTY of a TTY device.
+ *
+ * @returns 0 on success.
+ * @returns Negative error code (errno.h) on failure.
+ *
+ * @param   fh          The file handle.
+ * @param   pszNameBuf  Where to store the name.
+ * @param   cchNameBuf  The size of the name buf.
+ */
+int __libc_Back_ioTTYName(int fh, char *pszNameBuf, size_t cchNameBuf);
 
 /**

trunk/libc/include/klibc/logstrict.h

@@ -169 +169 @@
 /** Macro to log a pointer return and do the return. */
 #define LIBCLOG_RETURN_P(rc)            LIBCLOG_RETURN_MSG((rc), "ret %p\n", (void*)(rc))
+/** Macro to log a string pointer return and do the return. */
+#define LIBCLOG_RETURN_PSZ(psz)         LIBCLOG_RETURN_MSG((psz), "ret %p:{%s}\n", (void*)(psz), (psz))
 
 

trunk/libc/include/unistd.h

@@ -578 +578 @@
 char    *get_current_dir_name(void);
 #endif
-
+int     ttyname_r(int, char *, size_t);
 
 /*

trunk/libc/src/kNIX/Makefile.kmk

@@ -35 +35 @@
 libc_kNIX_SOURCES = \
     $(PATH_LIBC_SRC)/kNIX/b_ioClose.c \
+    $(PATH_LIBC_SRC)/kNIX/b_ioFileSizeSet.c \
     $(PATH_LIBC_SRC)/kNIX/b_ioRead.c \
+    $(PATH_LIBC_SRC)/kNIX/b_ioSeek.c \
+    $(PATH_LIBC_SRC)/kNIX/b_ioTTYName.c \
     $(PATH_LIBC_SRC)/kNIX/b_ioWrite.c \
-    $(PATH_LIBC_SRC)/kNIX/b_ioSeek.c \
-    $(PATH_LIBC_SRC)/kNIX/b_ioFileSizeSet.c \
     $(PATH_LIBC_SRC)/kNIX/b_mmanBrk.c \
     $(PATH_LIBC_SRC)/kNIX/b_mmanSBrk.c \
@@ -55 +56 @@
 
 libc_kNIX_SOURCES.os2 = \
-    $(PATH_LIBC_SRC)/kNIX/os2/brk.c \
     $(PATH_LIBC_SRC)/kNIX/os2/b_dir.c \
     $(PATH_LIBC_SRC)/kNIX/os2/b_fsDirChangeRoot.c \
@@ -150 +150 @@
     $(PATH_LIBC_SRC)/kNIX/os2/resource.c \
     $(PATH_LIBC_SRC)/kNIX/os2/safesems.c \
-    $(PATH_LIBC_SRC)/kNIX/os2/sbrk.c \
     $(PATH_LIBC_SRC)/kNIX/os2/scrsize.c \
     $(PATH_LIBC_SRC)/kNIX/os2/seterrno.c \

trunk/libc/src/libc/io/Makefile.kmk

@@ -125 +125 @@
     $(PATH_LIBC_SRC)/libc/io/truncate.c \
     $(PATH_LIBC_SRC)/libc/io/ttyname.c \
+    $(PATH_LIBC_SRC)/libc/io/ttyname_r.c \
     $(PATH_LIBC_SRC)/libc/io/ungetc.c \
     $(PATH_LIBC_SRC)/libc/io/unlink.c \

trunk/libc/src/libc/io/ttyname.c

@@ -1 @@
-/* ttyname.c (emx+gcc) -- Copyright (c) 1995-1996 by Eberhard Mattes */
+/* $Id: $ */
+/** @file
+ *
+ * kLIBC - ttyname().
+ *
+ * Copyright (c) 2006 knut st. osmundsen <bird-srcspam@anduin.net>
+ *
+ *
+ * This file is part of kLIBC.
+ *
+ * kLIBC is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published
+ * by the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * kLIBC is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with kLIBC; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
 
 #include "libc-alias.h"
 #include <unistd.h>
-#include <emx/syscalls.h>
-#include <InnoTekLIBC/thread.h>
+#include <errno.h>
+#include <klibc/backend.h>
+#include <klibc/thread.h>
+#define __LIBC_LOG_GROUP __LIBC_LOG_GRP_IO
+#include <klibc/logstrict.h>
 
-char *_STD(ttyname) (int handle)
+char *_STD(ttyname)(int fd)
 {
-  __LIBC_PTHREAD pThrd = __libc_threadCurrent ();
+    LIBCLOG_ENTER("fd=%d\n", fd);
+    __LIBC_PTHREAD pThrd = __libc_threadCurrent();
+    int rc = __libc_Back_ioTTYName(fd, pThrd->szTTYNameBuf, sizeof(pThrd->szTTYNameBuf));
+    if (!rc)
+        LIBCLOG_RETURN_PSZ(pThrd->szTTYNameBuf);
+    errno = -rc;
+    LIBCLOG_ERROR_RETURN_P(NULL);
+}
 
-  if (__ttyname (handle, pThrd->szTTYNameBuf, sizeof (pThrd->szTTYNameBuf)) == 0)
-    return pThrd->szTTYNameBuf;
-  else
-    return NULL;
-}