Changeset 10005 for trunk/src/msvcrt/process.c

Timestamp:

Apr 10, 2003, 12:28:07 PM (22 years ago)

Author:

sandervl

Message:

PF: MSVCRT update

File:

• trunk/src/msvcrt/process.c (modified) (19 diffs)

trunk/src/msvcrt/process.c

@@ -28 +28 @@
 #ifdef __WIN32OS2__
 #include <emxheader.h>
+#include <string.h>
 #else
 #include "config.h"
@@ -203 +204 @@
  *              _cwait (MSVCRT.@)
  */
-int _cwait(int *status, int pid, int action)
+int MSVCRT__cwait(int *status, int pid, int action)
 {
   HANDLE hPid = (HANDLE)pid;
@@ -225 +226 @@
   {
     *MSVCRT__errno() =  MSVCRT_ECHILD;
-    *__doserrno() = doserrno;
+    *MSVCRT_doserrno() = doserrno;
   }
   else
@@ -239 +240 @@
  * or double-quotes.
  */
-int _execl(const char* name, const char* arg0, ...)
+int MSVCRT__execl(const char* name, const char* arg0, ...)
 {
   va_list ap;
@@ -261 +262 @@
  * or double-quotes.
  */
-int _execlp(const char* name, const char* arg0, ...)
+int MSVCRT__execlp(const char* name, const char* arg0, ...)
 {
   va_list ap;
@@ -268 +269 @@
   char fullname[MAX_PATH];
 
-  _searchenv(name, "PATH", fullname);
+  MSVCRT__searchenv(name, "PATH", fullname);
 
   va_start(ap, arg0);
@@ -286 +287 @@
  * or double-quotes.
  */
-int _execv(const char* name, char* const* argv)
-{
-  return _spawnve(_P_OVERLAY, name, (const char* const*) argv, NULL);
+int MSVCRT__execv(const char* name, char* const* argv)
+{
+  return MSVCRT__spawnve(_P_OVERLAY, name, (const char* const*) argv, NULL);
 }
 
@@ -297 +298 @@
  * or double-quotes.
  */
-int _execve(const char* name, char* const* argv, const char* const* envv)
-{
-  return _spawnve(_P_OVERLAY, name, (const char* const*) argv, envv);
+int MSVCRT__execve(const char* name, char* const* argv, const char* const* envv)
+{
+  return MSVCRT__spawnve(_P_OVERLAY, name, (const char* const*) argv, envv);
 }
 
@@ -308 +309 @@
  * or double-quotes.
  */
-int _execvpe(const char* name, char* const* argv, const char* const* envv)
+int MSVCRT__execvpe(const char* name, char* const* argv, const char* const* envv)
 {
   char fullname[MAX_PATH];
 
-  _searchenv(name, "PATH", fullname);
-  return _spawnve(_P_OVERLAY, fullname[0] ? fullname : name,
+  MSVCRT__searchenv(name, "PATH", fullname);
+  return MSVCRT__spawnve(_P_OVERLAY, fullname[0] ? fullname : name,
                   (const char* const*) argv, envv);
 }
@@ -323 +324 @@
  * or double-quotes.
  */
-int _execvp(const char* name, char* const* argv)
-{
-  return _execvpe(name, argv, NULL);
+int MSVCRT__execvp(const char* name, char* const* argv)
+{
+  return MSVCRT__execvpe(name, argv, NULL);
 }
 
@@ -334 +335 @@
  * or double-quotes.
  */
-int _spawnl(int flags, const char* name, const char* arg0, ...)
+int MSVCRT__spawnl(int flags, const char* name, const char* arg0, ...)
 {
   va_list ap;
@@ -356 +357 @@
  * or double-quotes.
  */
-int _spawnlp(int flags, const char* name, const char* arg0, ...)
+int MSVCRT__spawnlp(int flags, const char* name, const char* arg0, ...)
 {
   va_list ap;
@@ -363 +364 @@
   char fullname[MAX_PATH];
 
-  _searchenv(name, "PATH", fullname);
+  MSVCRT__searchenv(name, "PATH", fullname);
 
   va_start(ap, arg0);
@@ -381 +382 @@
  * or double-quotes.
  */
-int _spawnve(int flags, const char* name, const char* const* argv,
+int MSVCRT__spawnve(int flags, const char* name, const char* const* argv,
                             const char* const* envv)
 {
@@ -409 +410 @@
  * or double-quotes.
  */
-int _spawnv(int flags, const char* name, const char* const* argv)
-{
-  return _spawnve(flags, name, argv, NULL);
+int MSVCRT__spawnv(int flags, const char* name, const char* const* argv)
+{
+  return MSVCRT__spawnve(flags, name, argv, NULL);
 }
 
@@ -420 +421 @@
  * or double-quotes.
  */
-int _spawnvpe(int flags, const char* name, const char* const* argv,
+int MSVCRT__spawnvpe(int flags, const char* name, const char* const* argv,
                             const char* const* envv)
 {
   char fullname[MAX_PATH];
-  _searchenv(name, "PATH", fullname);
-  return _spawnve(flags, fullname[0] ? fullname : name, argv, envv);
+  MSVCRT__searchenv(name, "PATH", fullname);
+  return MSVCRT__spawnve(flags, fullname[0] ? fullname : name, argv, envv);
 }
 
@@ -434 +435 @@
  * or double-quotes.
  */
-int _spawnvp(int flags, const char* name, const char* const* argv)
-{
-  return _spawnvpe(flags, name, argv, NULL);
+int MSVCRT__spawnvp(int flags, const char* name, const char* const* argv)
+{
+  return MSVCRT__spawnvpe(flags, name, argv, NULL);
 }
 
@@ -448 +449 @@
 
     /* Make a writable copy for CreateProcess */
-    cmdcopy=_strdup(cmd);
+    cmdcopy= MSVCRT__strdup(cmd);
     /* FIXME: should probably launch cmd interpreter in COMSPEC */
     res=msvcrt_spawn(_P_WAIT, NULL, cmdcopy, NULL);
@@ -477 +478 @@
   }
 }
+
+/*********************************************************************
+ *              _getdllprocaddr (MSVCRT.@)
+ */
+void *_getdllprocaddr(int dll, const char *name, int ordinal)
+{
+    if (name)
+    {
+        if (ordinal != -1) return NULL;
+        return GetProcAddress( (HMODULE)dll, name );
+    }
+    if (HIWORD(ordinal)) return NULL;
+    return GetProcAddress( (HMODULE)dll, (LPCSTR)(ULONG_PTR)ordinal );
+}