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

Timestamp:

Nov 28, 1999, 6:22:27 PM (26 years ago)

Author:

sandervl

Message:

Jens Weissner's changes

File:

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

trunk/src/crtdll/crtdll.cpp

@@ -1 @@
-/* $Id: crtdll.cpp,v 1.10 1999-10-09 13:32:25 sandervl Exp $ */
+/* $Id: crtdll.cpp,v 1.11 1999-11-28 17:22:26 sandervl Exp $ */
 
 /*
@@ -548 +548 @@
  *           CRTDLL__cabs   (CRTDLL.48)
  */
-double CDECL CRTDLL__cabs(struct complex * z)
-{
-  dprintf(("CRTDLL: _cabs not implemented\n"));
-  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-  return FALSE;
+double CDECL CRTDLL__cabs(struct _complex z)
+{
+  dprintf(("CRTDLL: _cabs\n"));
+  return sqrt( z.x*z.x + z.y*z.y );
 }
 
@@ -710 +709 @@
  *                  _cprintf    (CRTDLL.63)
  */
-INT CDECL CRTDLL__cprintf( char *s, ... )
-{
-  dprintf(("CRTDLL: _cprintf not implemented.\n"));
-  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-  return FALSE;
+INT CDECL CRTDLL__cprintf( char *fmt, ... )
+{
+  dprintf(("CRTDLL: _cprintf.\n"));
+
+  int     cnt;
+  char    buf[ 2048 ];          /* this is buggy, because buffer might be too small. */
+  va_list ap;
+  
+  va_start(ap, fmt);
+  cnt = vsprintf(buf, fmt, ap);
+  va_end(ap);
+  
+  _cputs(buf);
+  return cnt;
 }
 
@@ -844 +852 @@
 int CDECL CRTDLL__execl(const char* szPath, const char* szArgv0, ...)
 {
-  dprintf(("CRTDLL: _execl not implemented.\n"));
-  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-  return FALSE;
+  dprintf(("CRTDLL: _execl\n"));
+
+  char *szArg[100];
+  const char *a;
+  int i = 0;
+  va_list l = 0;
+  va_start(l,szArgv0);
+  do {
+        a = va_arg(l,const char *);
+        szArg[i++] = (char *)a;
+  } while ( a != NULL && i < 100 );
+
+  return _spawnve(P_OVERLAY, (char*)szPath, szArg, _environ);
 }
 
@@ -864 +882 @@
  *           CRTDLL__execlp   (CRTDLL.81)
  */
-int CDECL CRTDLL__execlp( char *s1, char *s2, ...)
-{
-  dprintf(("CRTDLL: _execlp not implemented.\n"));
-  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-  return FALSE;
+int CDECL CRTDLL__execlp( char *szPath, char *szArgv0, ...)
+{
+  dprintf(("CRTDLL: _execlp\n"));
+  char *szArg[100];
+  const char *a;
+  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 );
+  return _spawnvpe(P_OVERLAY, szPath,szArg, _environ);
 }
 
@@ -1168 +1194 @@
  *                  _fpreset     (CRTDLL.107)
  */
-INT CDECL CRTDLL__fpreset(void)
+void CDECL CRTDLL__fpreset(void)
 {
   dprintf(("CRTDLL: _fpreset not implemented.\n"));
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-  return FALSE;
 }
 
@@ -1775 +1800 @@
 int CDECL CRTDLL__ismbcsymbol( unsigned int c )
 {
-  dprintf(("CRTDLL: _ismbcsymbol\n"));
+  dprintf(("CRTDLL: _ismbcsymbol not implemented.\n"));
   if ((c & 0xFF00) != 0) {
         // true multibyte character
@@ -1888 +1913 @@
  *                  _lfind     (CRTDLL.170)
  */
-void * CDECL CRTDLL__lfind(const void *v1, const void *v2, unsigned int *i1, unsigned int i2,
-        int (CDECL *i3)(const void *v3, const void *v4))
-{
-  dprintf(("CRTDLL: _lfind not implemented.\n"));
-  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-  return FALSE;
-//  return (_lfind(v1,v2,i1,i2,i3(v3,v4)));
+void * CDECL CRTDLL__lfind(const void *key, const void *base, size_t *nelp,
+         size_t width, int (*compar)(const void *, const void *))
+{
+  dprintf(("CRTDLL: _lfind\n"));
+  char *char_base = (char *)base;
+  int i;
+  for(i=0;i<*nelp;i++) {
+        if ( compar(key,char_base) == 0)
+                return char_base;
+        char_base += width;
+  }
+  return NULL;
 }
 
@@ -1962 +1992 @@
  *                  _lsearch   (CRTDLL.177)
  */
-void * CDECL CRTDLL__lsearch(const void *v1, void  *v2, unsigned int *i1, unsigned int i2,
-        int (CDECL *i3)(const void *v3, const void *v4))
+void * CDECL CRTDLL__lsearch(const void *key, void *base, size_t *nelp, size_t width,
+         int (*compar)(const void *, const void *))
 {
   dprintf(("CRTDLL: _lsearch not implemented.\n"));
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
   return FALSE;
-//  return (_lsearch(v1,v2,i1,i2,i3(v3,v4)));
 }
 
@@ -3148 +3177 @@
 double CDECL CRTDLL__nextafter( double x, double y )
 {
-  dprintf(("CRTDLL: _nextafter not implemented.\n"));
-  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-  return FALSE;
+  dprintf(("CRTDLL: _nextafter\n"));
+  if ( x == y)
+        return x;
+  if ( CRTDLL__isnan(x) || CRTDLL__isnan(y) )
+        return x;
+
+  return x;
 }
 
@@ -3475 +3508 @@
  *           CRTDLL__spawnl      (CRTDLL.269)
  */
-int CDECL CRTDLL__spawnl( int i, char *s1, char *s2, ... )
-{
-  dprintf(("CRTDLL: _spawnl not implemented.\n"));
-  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-  return FALSE;
+int CDECL CRTDLL__spawnl(int nMode, const char* szPath, const char* szArgv0,...)
+{
+  dprintf(("CRTDLL: _spawnl\n"));
+  char *szArg[100];
+  const char *a;
+  int i = 0;
+  va_list l = 0;
+  va_start(l,szArgv0);
+  do {
+        a = va_arg(l,const char *);
+        szArg[i++] = (char *)a;
+  } while ( a != NULL && i < 100 );
+  
+  return _spawnve(nMode, (char*)szPath, szArg, _environ);
 }
 
@@ -3497 +3539 @@
  *           CRTDLL__spawnlp     (CRTDLL.271)
  */
-int CDECL CRTDLL__spawnlp( int i, char *s1, char *s2, ... )
-{
-  dprintf(("CRTDLL: _spawnlp not implemented.\n"));
-  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-  return FALSE;
+int CDECL CRTDLL__spawnlp(int nMode, const char* szPath, const char* szArgv0, ...)
+{
+  dprintf(("CRTDLL: _spawnlp\n"));
+  char *szArg[100];
+  const char *a;
+  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 );
+  return _spawnvpe(nMode, (char*)szPath,szArg, _environ);
 }
 
@@ -3889 +3939 @@
   {
       int size = (wcslen((const wchar_t*)str) + 1) * sizeof(WCHAR);
-// FIXME     ret = CRTDLL_malloc( size );
+// FIXME      ret = CRTDLL_malloc( size );
       if (ret) memcpy( ret, str, size );
   }
@@ -4434 +4484 @@
  *                  fwprintf      (CRTDLL.382)
  */
-int CDECL CRTDLL_fwprintf( FILE *strm, const wchar_t *format, ... )
+int CDECL CRTDLL_fwprintf( FILE *iop, const wchar_t *fmt, ... )
 {
   dprintf(("CRTDLL: fwprintf not implemented.\n"));
@@ -4523 +4573 @@
 INT CDECL CRTDLL_is_wctype(wint_t wc, wctype_t wctypeFlags)
 {
-        dprintf(("CRTDLL: is_wctype not implemented.\n"));
-        return 0;
+        dprintf(("CRTDLL: is_wctype\n"));
+        return ((CRTDLL_pwctype_dll[(unsigned char)(wc & 0xFF)]&wctypeFlags) == wctypeFlags );
 }
 
@@ -4817 +4867 @@
 int CDECL CRTDLL_printf( const char *format, ... )
 {
-    dprintf(("CRTDLL: printf not implemented.\n"));
-    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-    return FALSE;
+  dprintf(("CRTDLL: printf not implemented.\n"));
+  va_list arg;
+  int done;
+
+  va_start (arg, format);
+  done = vprintf (format, arg);
+  va_end (arg);
+  return done;
 }