Changeset 1900 for trunk/src/crtdll/crtdll.cpp

Timestamp:

Nov 30, 1999, 9:42:10 PM (26 years ago)

Author:

sandervl

Message:

JW's update

File:

• trunk/src/crtdll/crtdll.cpp (modified) (14 diffs)

trunk/src/crtdll/crtdll.cpp

@@ -1 @@
-/* $Id: crtdll.cpp,v 1.13 1999-11-30 20:19:52 sandervl Exp $ */
+/* $Id: crtdll.cpp,v 1.14 1999-11-30 20:42:10 sandervl Exp $ */
 
 /*
@@ -24 +24 @@
 #include <ctype.h>
 #include <setjmp.h>
+#include <ntddk.h>
 #include <debugtools.h>
 
@@ -48 +49 @@
 #include "crtinc.h"
 #include "ieee.h"
-#include <ntddk.h>
 
 DEFAULT_DEBUG_CHANNEL(crtdll)
@@ -335 +335 @@
         CRTDLL_argv_dll = xargv;
         *argv           = xargv;
+        CRTDLL_environ_dll = *environ = GetEnvironmentStringsA();
         dprintf(("CRTDLL: GetMainArgs end\n"));
-        CRTDLL_environ_dll = *environ = GetEnvironmentStringsA();
         return 0;
 }
@@ -652 +652 @@
  *                  CRTDLL__commit    (CRTDLL.58)
  */
-int CDECL CRTDLL__commit( int handle )
-{
-  dprintf(("CRTDLL: _commit not implemented.\n"));
-//  if (! FlushFileBuffers(_get_osfhandle(_fd)) ) {
-//      __set_errno(EBADF);
-//      return -1;
-//  }
+int CDECL CRTDLL__commit( int _fd )
+{
+  dprintf(("CRTDLL: _commit\n"));
+  if (! FlushFileBuffers((HFILE)CRTDLL__get_osfhandle(_fd)) ) {
+        __set_errno(EBADF);
+        return -1;
+  }
   return 0;
 }
@@ -863 +863 @@
  *           CRTDLL__execle   (CRTDLL.80)
  */
-int CDECL CRTDLL__execle( char *s1, char *s2, ...)
-{
-  dprintf(("CRTDLL: _execle not implemented.\n"));
-  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-  return FALSE;
+int CDECL CRTDLL__execle(char *path, char *szArgv0, ...)
+{
+  dprintf(("CRTDLL: _execle not correct implemented.\n"));
+  char *szArg[100];
+  const char *a;
+  char *ptr;
+  int i = 0;
+  va_list l = 0;
+  va_start(l,szArgv0);
+  do {
+        a = (const char *)va_arg(l,const char *);
+        szArg[i++] = (char *)a;
+  } while ( a != NULL && i < 100 );
+
+
+// szArg0 is passed and not environment if there is only one parameter;
+
+  if ( i >=2 ) {
+        ptr = szArg[i-2];
+        szArg[i-2] = NULL;
+  }
+  else
+        ptr = NULL;
+
+  return _spawnve(P_OVERLAY, path, szArg, (char**)ptr);
 }
 
@@ -893 +913 @@
  *           CRTDLL__execlpe   (CRTDLL.82)
  */
-int CDECL CRTDLL__execlpe( char *s1, char *s2, ...)
-{
-  dprintf(("CRTDLL: _execlpe not implemented.\n"));
-  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-  return FALSE;
+int CDECL CRTDLL__execlpe( char *path, char *szArgv0, ...)
+{
+  dprintf(("CRTDLL: _execlpe not correct implemented.\n"));
+  char *szArg[100];
+  const char *a;
+  char *ptr;
+  int i = 0;
+  va_list l = 0;
+  va_start(l,szArgv0);
+  do {
+        a = (const char *)va_arg(l,const char *);
+        szArg[i++] = (char *)a;
+  } while ( a != NULL && i < 100 );
+
+
+// szArg0 is passed and not environment if there is only one parameter;
+
+  if ( i >=2 ) {
+        ptr = szArg[i-2];
+        szArg[i-2] = NULL;
+  }
+  else
+        ptr = NULL;
+  return spawnvpe(P_OVERLAY, path, szArg, (char**)ptr);
 }
 
@@ -1239 +1278 @@
  *                  _ftime        (CRTDLL.112)
  */
-int CDECL CRTDLL__ftime( struct timeb *timeptr )
+int CDECL CRTDLL__ftime( struct timeb *timebuf )
 {
   dprintf(("CRTDLL: _ftime not implemented.\n"));
@@ -1281 +1320 @@
  *                  _get_osfhandle     (CRTDLL.117)
  */
-long CDECL CRTDLL__get_osfhandle( int posixhandle )
-{
-  dprintf(("CRTDLL: _get_osfhandle not implemented.\n"));
-  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-  return FALSE;
+void* CDECL CRTDLL__get_osfhandle( int fileno )
+{
+  dprintf(("CRTDLL: _get_osfhandle\n"));
+  return filehnd(fileno);
 }
 
@@ -2017 +2055 @@
  *                  _matherr    (CRTDLL.181)
  */
-#if (__IBMCPP__ > 300)
-#define exception _exception
-#endif
-
 double CDECL CRTDLL__matherr( struct exception * excep )
 {
@@ -3520 +3554 @@
  *           CRTDLL__spawnle     (CRTDLL.270)
  */
-int CDECL CRTDLL__spawnle( int i, char *s1, char *s2, ... )
-{
-  dprintf(("CRTDLL: _spawnle not implemented.\n"));
-  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-  return FALSE;
+int CDECL CRTDLL__spawnle( int mode, char *path, char **szArgv0, ... )
+{
+  dprintf(("CRTDLL: _spawnle not correct implemented.\n"));
+  char *szArg[100];
+  char *a;
+  char *ptr;
+  int i = 0;
+  va_list l = 0;
+  va_start(l,szArgv0);
+  do {
+        a = (char*)va_arg(l,const char *);
+        szArg[i++] = (char *)a;
+  } while ( a != NULL && i < 100 );
+
+
+// szArg0 is passed and not environment if there is only one parameter;
+
+  if ( i >=2 ) {
+        ptr = szArg[i-2];
+        szArg[i-2] = NULL;
+  }
+  else
+        ptr = NULL;
+
+  return _spawnve(mode, path, szArg, (char**)ptr);
 }
 
@@ -3550 +3604 @@
  *           CRTDLL__spawnlpe    (CRTDLL.272)
  */
-int CDECL CRTDLL__spawnlpe( int i, char *s1, char *s2, ... )
-{
-  dprintf(("CRTDLL: _spawnlpe not implemented.\n"));
-  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-  return FALSE;
+int CDECL CRTDLL__spawnlpe( int mode, char *path, char *szArgv0, ... )
+{
+  dprintf(("CRTDLL: _spawnlpe not correct implemented.\n"));
+  char *szArg[100];
+  const char *a;
+  char *ptr;
+  int i = 0;
+  va_list l = 0;
+  va_start(l,szArgv0);
+  do {
+        a = (char *)va_arg(l,const char *);
+        szArg[i++] = (char *)a;
+  } while ( a != NULL && i < 100 );
+
+
+// szArg0 is passed and not environment if there is only one parameter;
+
+  if ( i >=2 ) {
+        ptr = szArg[i-2];
+        szArg[i-2] = NULL;
+  }
+  else
+        ptr = NULL;
+
+  return _spawnvpe(mode, path, szArg, (char**)ptr);
 }
 
@@ -4859 +4933 @@
 int CDECL CRTDLL_printf( const char *format, ... )
 {
-  dprintf(("CRTDLL: printf not implemented.\n"));
+  dprintf(("CRTDLL: printf\n"));
   va_list arg;
   int done;
@@ -5374 +5448 @@
         return ( x->exponent == 0x7ff  && ( x->mantissah == 0 && x->mantissal == 0 ));  
 }
+
+
+/*********************************************************************
+ *                  _filehnd    (INTERNAL-#6)
+ */
+void* filehnd(int fileno)
+{
+        if ( fileno < 0 )
+                return (void *)-1;
+#define STD_AUX_HANDLE 3
+#define STD_PRINTER_HANDLE 4
+
+        switch(fileno)
+        {
+        case 0:
+                return (void*)GetStdHandle(STD_INPUT_HANDLE);
+        case 1:
+                return (void*)GetStdHandle(STD_OUTPUT_HANDLE);
+        case 2:
+                return (void*)GetStdHandle(STD_ERROR_HANDLE);
+        case 3:
+                return (void*)GetStdHandle(STD_AUX_HANDLE);
+        case 4:
+                return (void*)GetStdHandle(STD_PRINTER_HANDLE);
+        default:
+                break;
+        }
+                
+        if ( fileno >= maxfno )
+                return (void *)-1;
+
+        if ( fileno_modes[fileno].fd == -1 )
+                return (void *)-1;
+        return (void*)fileno_modes[fileno].hFile;
+}