Changeset 2917

Timestamp:

Dec 28, 2006, 5:06:32 PM (19 years ago)

Author:

bird

Message:

cleanup in progress (dinner time)

Location:

trunk/libc

Files:

• include/io.h (modified) (1 diff)
• include/klibc/backend.h (modified) (1 diff)
• src/kNIX/Makefile.kmk (modified) (2 diffs)
• src/kNIX/b_fhImport.c (added)
• src/kNIX/kNIX.h (modified) (1 diff)
• src/kNIX/os2/__imphandle.c (deleted)
• src/libc/io/Makefile.kmk (modified) (1 diff)
• src/libc/io/_imphandle.c (moved) (moved from trunk/libc/src/libc/io/_imphand.c ) (1 diff)

trunk/libc/include/io.h

@@ -107 +107 @@
 int      _ftruncate(int, off_t);
 #endif
-int _imphandle (int);
+int _imphandle (__uintptr_t);
 int _ioctl (int, unsigned long request, ...);
 int _isatty (int);

trunk/libc/include/klibc/backend.h

@@ -161 +161 @@
 
 
+/** @defgroup __libc_Back_fs   kLIBC Backend - File Handle
+ * @{ */
+
+/**
+ * Imports a standard file/pipe/that-kind-of-thing handle.
+ *
+ * @returns kLIBC file descriptor number on success.
+ * @returns -1 and errno on failure.
+ *
+ * @param   hNative     The native handle value.
+ * @param   fh          The requested file handle. -1 if any will do.
+ */
+int __libc_Back_fhImport(intptr_t hNative, int fh);
+
+/** @} */
+
+
+
 /** @defgroup __libc_Back_fs   LIBC Backend - File System
  * @{ */

trunk/libc/src/kNIX/Makefile.kmk

@@ -35 +35 @@
 libc_kNIX_INCS = $(PATH_LIBC_SRC)/kNIX
 libc_kNIX_SOURCES = \
+    $(PATH_LIBC_SRC)/kNIX/b_fhImport.c \
     $(PATH_LIBC_SRC)/kNIX/b_fsPathResolve.c \
     $(PATH_LIBC_SRC)/kNIX/b_fsSymlinkModeSet.c \
@@ -170 +171 @@
     $(PATH_LIBC_SRC)/kNIX/os2/__dup.c \
     $(PATH_LIBC_SRC)/kNIX/os2/__dup2.c \
-    $(PATH_LIBC_SRC)/kNIX/os2/__imphandle.c \
     $(PATH_LIBC_SRC)/kNIX/os2/__init.c \
     $(PATH_LIBC_SRC)/kNIX/os2/__initdll.c \

trunk/libc/src/kNIX/kNIX.h

@@ -234 +234 @@
 /** @} */
 
+
+/** @name File Handles
+ * @{
+ */
+int __libc_FHImportFile(uintptr_t hNative, int fh, __LIBC_PFH *ppFH);
+/** @} */
+
+
 /** @name ??
  * @{

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

@@ -149 +149 @@
     $(PATH_LIBC_SRC)/libc/io/_fsetmod.c \
     $(PATH_LIBC_SRC)/libc/io/_fsopen.c \
-    $(PATH_LIBC_SRC)/libc/io/_imphand.c \
+    $(PATH_LIBC_SRC)/libc/io/_imphandle.c \
     $(PATH_LIBC_SRC)/libc/io/_input.c \
     $(PATH_LIBC_SRC)/libc/io/_isterm.c \

trunk/libc/src/libc/io/_imphandle.c

@@ -1 @@
-/* _imphand.c (emx+gcc) -- Copyright (c) 1994-1996 by Eberhard Mattes */
+/* $Id: $ */
+/** @file
+ *
+ * kNIX - _imphandle().
+ *
+ * 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 <io.h>
-#include <emx/syscalls.h>
+#include <errno.h>
+#include <klibc/backend.h>
+#define __LIBC_LOG_GROUP __LIBC_LOG_GRP_IO
+#include <klibc/logstrict.h>
 
-int _imphandle (int handle)
+/**
+ * Imports a standard file/pipe/that-kind-of-thing handle.
+ *
+ * @returns kLIBC file descriptor number on success.
+ * @returns -1 and errno on failure.
+ *
+ * @param   hHandle     The handle value.
+ */
+int _imphandle(__uintptr_t hHandle)
 {
-    return __imphandle(handle);
+    LIBCLOG_ENTER("hHandle=%td (%#tx)\n", hHandle, hHandle);
+    int rc = __libc_Back_fhImport(hHandle, -1);
+    if (rc >= 0)
+        LIBCLOG_RETURN_INT(rc);
+    errno = -rc;
+    LIBCLOG_ERROR_RETURN_INT(-1);
 }
+