Changeset 1517

Timestamp:

Sep 19, 2004, 5:53:31 PM (21 years ago)

Author:

bird

Message:

Fixing warnings. -Znofork

Location:

trunk/src/emx

Files:

• CompileOne.sh (added)
• Makefile (modified) (1 diff, 1 prop)
• gnu/termcap/config.h (modified) (1 diff, 1 prop)
• gnu/termcap/termcap.c (modified) (12 diffs, 1 prop)
• gnu/termcap/termcap.h (deleted)
• gnu/termcap/tparam.c (modified) (5 diffs, 1 prop)
• include/InnoTekLIBC/backend.h (modified) (2 diffs, 1 prop)
• include/error.h (modified) (2 diffs, 1 prop)
• include/os2thunk.h (modified) (2 diffs, 1 prop)
• include/string.h (modified) (4 diffs, 1 prop)
• include/sys/cdefs.h (modified) (1 diff, 1 prop)
• include/sys/ioccom.h (modified) (1 diff, 1 prop)
• include/unistd.h (modified) (1 diff, 1 prop)
• src/emximp/emximp.c (modified) (2 diffs, 1 prop)
• src/emxomf/emxaout.c (modified) (2 diffs, 1 prop)
• src/emxomf/listomf.c (modified) (1 diff, 1 prop)
• src/emxomf/stabshll.c (modified) (5 diffs, 1 prop)
• src/emxomf/weakld.c (modified) (6 diffs, 1 prop)
• src/include/libc-alias.h (modified) (1 diff, 1 prop)
• src/innidmdll/innidmdll.c (modified) (2 diffs, 1 prop)
• src/lib/alias/alias.smak (modified) (1 diff, 1 prop)
• src/lib/conv/atod.c (modified) (2 diffs, 1 prop)
• src/lib/conv/dtoa.c (modified) (1 diff, 1 prop)
• src/lib/conv/smalatod.c (modified) (1 diff, 1 prop)
• src/lib/io/_newstre.c (modified) (1 diff, 1 prop)
• src/lib/lgpl/string/strverscmp.c (modified) (1 diff, 1 prop)
• src/lib/libc.def (modified) (2 diffs, 1 prop)
• src/lib/libc.smak (modified) (4 diffs, 1 prop)
• src/lib/mbyte/wctomb.c (modified) (1 diff, 1 prop)
• src/lib/misc/chroot.c (added)
• src/lib/misc/getdtablesize.c (added)
• src/lib/misc/gnubasename.c (deleted)
• src/lib/process/beginthr.c (modified) (2 diffs, 1 prop)
• src/lib/process/execvp.c (modified) (1 diff, 1 prop)
• src/lib/process/execvpe.c (modified) (1 diff, 1 prop)
• src/lib/startup/386/crt0.s (modified) (2 diffs, 1 prop)
• src/lib/startup/386/dll0.s (modified) (2 diffs, 1 prop)
• src/lib/startup/startup.smak (modified) (2 diffs, 1 prop)
• src/lib/sys/DosEx.c (modified) (1 diff, 1 prop)
• src/lib/sys/__fcntl.c (modified) (1 diff, 1 prop)
• src/lib/sys/__read.c (modified) (1 diff, 1 prop)
• src/lib/sys/__utimes.c (modified) (1 diff, 1 prop)
• src/lib/sys/__write.c (modified) (1 diff, 1 prop)
• src/lib/sys/b_fsChRoot.c (added)
• src/lib/sys/filehandles.c (modified) (5 diffs, 1 prop)
• src/lib/sys/largefileio.c (modified) (2 diffs, 1 prop)
• src/lib/sys/libcfork.c (modified) (3 diffs, 1 prop)
• src/lib/sys/logstrict.c (modified) (1 diff, 1 prop)
• src/lib/sys/sharedpm.c (modified) (10 diffs, 1 prop)
• src/lib/sys/tcpipver.c (modified) (1 diff, 1 prop)
• src/lib/sys/timebomb.c (added)
• src/lib/sys/usleep.c (modified) (3 diffs, 1 prop)
• src/libsocket/getpeername.c (modified) (1 diff, 1 prop)
• src/libsocket/getsockname.c (modified) (1 diff, 1 prop)
• src/libsocket/getsockopt.c (modified) (1 diff, 1 prop)
• src/libsocket/recvfrom.c (modified) (1 diff, 1 prop)
• src/libsocket/sendto.c (modified) (1 diff, 1 prop)

trunk/src/emx/Makefile

@@ -91 +91 @@
 
 # The C compiler
-CC = gcc -c -Zmt -fmessage-length=0
+CC = gcc -c -Zmt -fmessage-length=0 -DTIMEBOMB=1
 # The C compiler flags
 ifndef NO_LOCAL_HEADERS

trunk/src/emx/gnu/termcap/config.h

@@ -4 +4 @@
 #include <string.h>
 #include <io.h>
+#include <gnu/termcap.h>
 
 #define EMX
-#define TERMCAP_FILE    "/emx/etc/termcap.dat"
+#define TERMCAP_FILE    "/@unixroot/etc/termcap.dat"
 #define HAVE_STRING_H
 #define STDC_HEADERS

trunk/src/emx/gnu/termcap/termcap.c

@@ -122 +122 @@
 static char *term_entry;
 
-static char *tgetst1 ();
+static char *tgetst1 (const char *ptr, char **area);
+
 
 /* Search entry BP for capability CAP.
@@ -128 +129 @@
    0 if not found.  */
 
-static char *
+static const char *
 find_capability (bp, cap)
-     register char *bp, *cap;
+     register const char *bp, *cap;
 {
   for (; *bp; bp++)
@@ -142 +143 @@
 int
 tgetnum (cap)
-     char *cap;
-{
-  register char *ptr = find_capability (term_entry, cap);
+     const char *cap;
+{
+  register const char *ptr = find_capability (term_entry, cap);
   if (!ptr || ptr[-1] != '#')
     return -1;
@@ -152 +153 @@
 int
 tgetflag (cap)
-     char *cap;
-{
-  register char *ptr = find_capability (term_entry, cap);
+     const char *cap;
+{
+  register const char *ptr = find_capability (term_entry, cap);
   return ptr && ptr[-1] == ':';
 }
@@ -165 +166 @@
 char *
 tgetstr (cap, area)
-     char *cap;
+     const char *cap;
      char **area;
 {
-  register char *ptr = find_capability (term_entry, cap);
+  register const char *ptr = find_capability (term_entry, cap);
   if (!ptr || (ptr[-1] != '=' && ptr[-1] != '~'))
     return NULL;
@@ -193 +194 @@
 static char *
 tgetst1 (ptr, area)
-     char *ptr;
+     const char *ptr;
      char **area;
 {
-  register char *p, *r;
+  register const char *p;
+  register char *r;
   register int c;
   register int size;
@@ -286 +288 @@
 void
 tputs (str, nlines, outfun)
-     register char *str;
+     register const char *str;
      int nlines;
      register int (*outfun) ();
@@ -361 +363 @@
 /* Forward declarations of static functions.  */
 
-static int scan_file ();
-static char *gobble_line ();
-static int compare_contin ();
-static int name_match ();
+static int scan_file (char *str, int fd, struct buffer *bufp);
+static char *gobble_line (int fd, struct buffer *bufp, char *append_end);
+static int compare_contin (const char *str1, const char *str2);
+static int name_match (char *line, char *name);
 
 #ifdef EMX
@@ -426 +428 @@
 int
 tgetent (bp, name)
-     char *bp, *name;
+     char *bp; const char *name;
 {
   register char *termcap_name;
@@ -436 +438 @@
   int malloc_size = 0;
   register int c;
-  char *tcenv;                  /* TERMCAP value, if it contains :tc=.  */
+  char *tcenv = NULL;           /* TERMCAP value, if it contains :tc=.  */
   char *indirect = NULL;        /* Terminal type in :tc= in TERMCAP value.  */
   int filep;
@@ -513 +515 @@
   /* Add 1 to size to ensure room for terminating null.  */
   buf.beg = (char *) xmalloc (buf.size + 1);
-  term = indirect ? indirect : name;
+  term = indirect ? indirect : (char *)name;
 
   if (!bp)
@@ -647 +649 @@
 static int
 compare_contin (str1, str2)
-     register char *str1, *str2;
+     register const char *str1, *str2;
 {
   register int c1, c2;

trunk/src/emx/gnu/termcap/tparam.c

@@ -19 +19 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
+#include <stdarg.h>
 #else /* not HAVE_CONFIG_H */
 
@@ -85 +86 @@
    The fourth and following args to tparam serve as the parameter values.  */
 
-static char *tparam1 ();
+static char *tparam1 (const char *string, char *outstring, int len, char *up, char *left, int *argp);
 
 /* VARARGS 2 */
 char *
-tparam (string, outstring, len, arg0, arg1, arg2, arg3)
-     char *string;
-     char *outstring;
-     int len;
-     int arg0, arg1, arg2, arg3;
-{
-  int arg[4];
-
-  arg[0] = arg0;
-  arg[1] = arg1;
-  arg[2] = arg2;
-  arg[3] = arg3;
-  return tparam1 (string, outstring, len, NULL, NULL, arg);
+tparam (const char *string, char *outstring, int len, ...)
+{
+  int args[4];
+  va_list arg;
+  va_start (arg, len);
+  args[0] = va_arg (arg, int);
+  args[1] = va_arg (arg, int);
+  args[2] = va_arg (arg, int);
+  args[3] = va_arg (arg, int);
+  va_end (arg);
+  return tparam1 (string, outstring, len, NULL, NULL, args);
 }
 
@@ -111 +110 @@
 char *
 tgoto (cm, hpos, vpos)
-     char *cm;
+     const char *cm;
      int hpos, vpos;
 {
@@ -124 +123 @@
 static char *
 tparam1 (string, outstring, len, up, left, argp)
-     char *string;
+     const char *string;
      char *outstring;
      int len;
@@ -131 +130 @@
 {
   register int c;
-  register char *p = string;
+  register const char *p = string;
   register char *op = outstring;
   char *outend;

trunk/src/emx/include/InnoTekLIBC/backend.h

@@ -129 +129 @@
  * @returns -1 and errno on failure.
  * @param   paStatFs    Where to to store the statistics.
- * @parma   cStatFS     Number of structures the array pointed to by paStatFs can hold.
+ * @param   cStatFS     Number of structures the array pointed to by paStatFs can hold.
  * @param   fFlags      Flags, currently ignored.
  */
@@ -140 +140 @@
  */
 void __libc_Back_fsSync(void);
+
+/**
+ * Sets or change the unixroot of the current process.
+ *
+ * @returns 0 on success.
+ * @returns -1 and errno on failure.
+ * @param   pszNewRoot  The new root.
+ */
+int __libc_Back_fsChRoot(const char *pszNewRoot);
 
 /** @} */

trunk/src/emx/include/error.h

@@ -2 +2 @@
 /** @file
  * GLIBC v2.3.2
+ *
+ * @changed bird: shut up -Wundef.
  */
 
@@ -29 +31 @@
 #ifndef __attribute__
 /* This feature is available in gcc versions 2.5 and later.  */
-# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || __STRICT_ANSI__
+# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || (defined(__STRICT_ANSI__) && __STRICT_ANSI__) /* bird: shut up -Wundef */
 #  define __attribute__(Spec) /* empty */
 # endif

trunk/src/emx/include/os2thunk.h

@@ -16 +16 @@
 void *_libc_16to32 (_far16ptr ptr);
 
+typedef union _thunk_u
+{
+    void *pv;
+    unsigned short *pus;
+    unsigned long *pul;
+} _thunk_t;
+
 unsigned long _libc_thunk1 (void *args, void *fun);
 
 #define _THUNK_PASCAL_PROLOG(SIZE) \
-  ({ char _tb[(SIZE)+4]; void *_tp = _tb + sizeof (_tb); \
+  __extension__ ({ char _tb[(SIZE)+4]; _thunk_t _tu; _tu.pv  = _tb + sizeof (_tb); \
        *(unsigned long *)_tb = (SIZE);
 #define _THUNK_PASCAL_CHAR(ARG)     _THUNK_PASCAL_SHORT (ARG)
-#define _THUNK_PASCAL_SHORT(ARG)    (*--((unsigned short *)_tp) = (ARG))
-#define _THUNK_PASCAL_LONG(ARG)     (*--((unsigned long *)_tp) = (ARG))
+#define _THUNK_PASCAL_SHORT(ARG)    (*--_tu.pus = (ARG))
+#define _THUNK_PASCAL_LONG(ARG)     (*--_tu.pul = (ARG))
 #define _THUNK_PASCAL_FLAT(ARG)     _THUNK_PASCAL_LONG (_libc_32to16 (ARG))
 #define _THUNK_PASCAL_FAR16(ARG)    _THUNK_PASCAL_LONG (ARG)
@@ -31 +38 @@
 
 #define _THUNK_C_PROLOG(SIZE) \
-  ({ char _tb[(SIZE)+4]; void *_tp = _tb + sizeof (unsigned long); \
+  __extension__ ({ char _tb[(SIZE)+4]; _thunk_t _tu; _tu.pv = _tb + sizeof (unsigned long); \
        *(unsigned long *)_tb = (SIZE);
 #define _THUNK_C_CHAR(ARG)     _THUNK_C_SHORT (ARG)
-#define _THUNK_C_SHORT(ARG)    (*((unsigned short *)_tp)++ = (ARG))
-#define _THUNK_C_LONG(ARG)     (*((unsigned long *)_tp)++ = (ARG))
+#define _THUNK_C_SHORT(ARG)    (*_tu.pus++ = (ARG))
+#define _THUNK_C_LONG(ARG)     (*_tu.pul++ = (ARG))
 #define _THUNK_C_FLAT(ARG)     _THUNK_C_LONG (_libc_32to16 (ARG))
 #define _THUNK_C_FAR16(ARG)    _THUNK_C_LONG (ARG)

trunk/src/emx/include/string.h

@@ -98 +98 @@
 size_t   strlen(const char *);
 #if __BSD_VISIBLE
-/** @todo void   strmode(int, char *); */
+void     strmode(int, char *);
 #endif
 char    *strncat(char * __restrict, const char * __restrict, size_t);
@@ -116 +116 @@
 char    *strtok(char * __restrict, const char * __restrict);
 #if __POSIX_VISIBLE >= 199506 || __XSI_VISIBLE >= 500
-/**@todo char   *strtok_r(char *, const char *, char **); */
+char    *strtok_r(char *, const char *, char **);
 #endif
 size_t   strxfrm(char * __restrict, const char * __restrict, size_t);
@@ -138 +138 @@
 char *  strset(char *, int);
 char *  strupr(char *);
-/* bird: Are we sure we actually want this stuff _here_ ? */
-extern char *__gnu_basename (const char *);
-#ifndef _LIBGEN_H
-#define basename __gnu_basename
-#endif
 #endif
 
@@ -168 +163 @@
 /* bird: GNU stuff - start */
 #ifdef __USE_GNU
+char    *basename(const char *);
 size_t   strnlen(const char *, size_t);
 void    *mempcpy(void *, const void *, size_t);
 char    *strndup(const char *, size_t);
 void    *memrchr(const void *, int, size_t);
+#define  memrchr(pach, ch, cch)     _memrchr(pach, ch, cch)
+int      strverscmp(const char *, const char *);
 
 size_t   __strnlen(const char *, size_t);
 void    *__mempcpy(void *, const void *, size_t);
 char    *__strndup(const char *, size_t);
+void    *_memrchr(const void *, int, size_t);
 void    *__memrchr(const void *, int, size_t);
-void    *_memrchr(const void *, int, size_t);
-
-#define memrchr(pach, ch, cch)    _memrchr(pach, ch, cch)
-#define __memrchr(pach, ch, cch)  _memrchr(pach, ch, cch)
+#define  __memrchr(pach, ch, cch)   _memrchr(pach, ch, cch)
+int      __strverscmp(const char *, const char *);
 
 #endif

trunk/src/emx/include/sys/cdefs.h

@@ -171 +171 @@
  */
 #if !(__GNUC__ == 2 && __GNUC_MINOR__ == 95)
-#if __STDC_VERSION__ < 199901
+#if !defined(__STDC_VERSION__) || __STDC_VERSION__ < 199901 /* bird: check if not defined. (-pedantic) */
 #define __restrict
 #else

trunk/src/emx/include/sys/ioccom.h

@@ -83 +83 @@
  */
 int         TCPCALL os2_ioctl __P((int, int, char *, int));
+/** Wrapper around the ioctl() interface of OS/2 BSD 4.3. */
+int         TCPCALL so_ioctl __P((int, unsigned long, ...));
 #else
-/** The v41+ BSD socket ioctl interface.
- * @remark sys based libc have separeate handle spaces for sockets and files
- *         therefore this socket specific call.
- */
+/** The v41+ BSD socket ioctl interface. */
 int         TCPCALL so_ioctl __P((int, unsigned long, ...));
 /** The v41+ OS/2 specific socket ioctl interface. */

trunk/src/emx/include/unistd.h

@@ -307 +307 @@
 #if __XSI_VISIBLE <= 500 || __BSD_VISIBLE
 int      brk(const void *);
-/** @todo int    chroot(const char *); */
-/** @todo int    getdtablesize(void); */
+int      chroot(const char *);
+int      getdtablesize(void);
 int      getpagesize(void) __pure2;
 char    *getpass(const char *);

trunk/src/emx/src/emximp/emximp.c

@@ -181 +181 @@
 
 
+#if 0 /* not used */
 static void *xrealloc (void *p, size_t n)
 {
@@ -190 +191 @@
   return q;
 }
+#endif
 
 

trunk/src/emx/src/emxomf/emxaout.c

@@ -244 +244 @@
 }
 
-
+#if 0 /* not used */
 /* Display a warning message on stderr (and do not quit).  This
    function is invoked like printf(): FMT is a printf-style format
@@ -258 +258 @@
   fputc ('\n', stderr);
 }
-
+#endif
 
 /* Display some hints on using this program, then quit. */

trunk/src/emx/src/emxomf/listomf.c

@@ -404 +404 @@
         {
           if (foff)
-            printf ("%*s%08lx %03lx:", indent, "",
+            printf ("%*s%08lx %03x:", indent, "",
                     rec_pos + rec_idx - 1 + sizeof (struct omf_rec),
                     rec_idx - 1 + sizeof (struct omf_rec));

trunk/src/emx/src/emxomf/stabshll.c

@@ -1558 +1558 @@
  * @returns NULL if not found.
  * @param   pszString   String to search.
- * @param   chType      Type we're parsing. Use '\0' if unknown or it 
+ * @param   chType      Type we're parsing. Use '\0' if unknown or it
  *                      should be ignored
  * @remark  Still a bad hack this.
@@ -1573 +1573 @@
 #else
 static const char *nextcolon2(const char *pszString, char chType)
-#endif 
+#endif
 {
     const char *pszColon;
@@ -1624 +1624 @@
                     /* hack: continue on ">::" (but not on "operator...") */
                     if (    chType != 'x'
-                        &&  psz[1] == ':' 
+                        &&  psz[1] == ':'
                         &&  psz > pszString && psz[-1] == '>'
-                            ) 
+                            )
                     {
                         psz++;
@@ -3788 +3788 @@
   if (name != NULL)
     {
-      int cch;
-      if (type != SST_tag2 && (cch = strlen(name)) > 250)
-          type = SST_tag2;
-
-      sst_start (type);
-      buffer_word (&sst, index);
-      if (type == SST_tag2)
-        buffer_enc (&sst, name);
+      size_t cch;
+      if (type == SST_tag2 || (cch = strlen(name)) > 250)
+       {
+          sst_start (SST_tag2);
+          buffer_word (&sst, index);
+          buffer_enc (&sst, name);
+        }
       else
         {
@@ -3802 +3801 @@
           achName[cch] = '\0';
 
+          sst_start (type);
+          buffer_word (&sst, index);
           buffer_nstr (&sst, achName);
         }
-        sst_end ();
+      sst_end ();
     }
 }

trunk/src/emx/src/emxomf/weakld.c

@@ -79 +79 @@
          : symCompareTrucated(pWld, pSym, _pszName, _cchName) )                     \
       )
-      
+
 /** Compares a existing symbol with a potential symbol. */
 #define SYM_EQUAL2(pWld, pSym, _pszName, _fFlags, _uHash, _cchName, _pfn) \
@@ -273 +273 @@
          */
         WLDSF_WEAKALIASDONE = 0x8000,
-        
+
         /** Internal flag which indicates that the symbol have been
          * truncated by emxomf. */
         WLDSF_TRUNCATED = 0x10000,
-         
+
     }                   fFlags;
 
@@ -1259 +1259 @@
 
 /**
- * Internal worker for SYM_EQUAL() 
+ * Internal worker for SYM_EQUAL()
  *
  * Compares truncated symbols. The hash for these symbols matches and at least
@@ -1671 +1671 @@
 {
     PWLDSYM     pSym;                   /* The symbol. */
-    unsigned    uHash;                  /* The symbol name hash. */
+    unsigned    uHash = 0;              /* The symbol name hash. */
     const char *pszName;                /* The symbol name in the string pool */
     int         cchNameWeak = 0;        /* Indicator and length of the weak name. (0 if not weak) */
@@ -1697 +1697 @@
             if ((fFlags & WLDSF_TYPEMASK) == WLDSF_WKEXT)
                 fFlags = (fFlags & ~WLDSF_TYPEMASK) | WLDSF_UNDEF;
-            
+
             if (cchName <= 200)
                 break;
@@ -1888 +1888 @@
             }
         }
-        
+
         /*
          * Maintain list of truncated aliases.
          */
-        if (    !SYM_IS_DEFINED(fFlags) 
+        if (    !SYM_IS_DEFINED(fFlags)
             && ((fFlags & WLDSF_TRUNCATED) || (pSym->fFlags & WLDSF_TRUNCATED)))
         {

trunk/src/emx/src/include/libc-alias.h

@@ -35 +35 @@
 #include "libc-std.h"
 
-/* We don't need the basename -> __std_basename mapping, but we'll
-   get errors when including string.h... */
-#undef basename
+#ifdef TIMEBOMB
+asm(".stabs  \"___libc_timebomb\",1,0,0,0");
+#endif
+
 
 #endif /* __LIBC_ALIAS_H__ */

trunk/src/emx/src/innidmdll/innidmdll.c

@@ -49 +49 @@
 #endif
 
+
+unsigned long _System InitDemangleID32(const char * psInitParms);
+unsigned long _System DemangleID32(const char * psMangledName, char * pszPrototype, unsigned long cchPrototype);
 
 
@@ -135 +138 @@
 }
 
-

trunk/src/emx/src/lib/alias/alias.smak

@@ -25 +25 @@
         memrchr                 _memrchr \
         __memrchr               _memrchr \
-        strnlen                 __strnlen
+        strnlen                 __strnlen \
+        __xpg_basename  _std_basename
 
 

trunk/src/emx/src/lib/conv/atod.c

@@ -409 +409 @@
       if (neg)
         mant |= 0x80000000ULL;
-      *p_result = *(float *)&mant;
+      *p_result = *(float *)(void *)&mant;
       break;
-      
+
     case 53:
       /* Clear the integer bit. */
@@ -419 +419 @@
       if (neg)
         mant |= 0x8000000000000000ULL;
-      *p_result = *(double *)&mant;
+      *p_result = *(double *)(void *)&mant;
       break;
 

trunk/src/emx/src/lib/conv/dtoa.c

@@ -45 +45 @@
   _BI_INIT (r); _BI_INIT (s); _BI_INIT (m); _BI_INIT (tmp);
 
-  bits = (const struct long_double_bits *)&x;
+  bits = (const struct long_double_bits *)(void *)&x;
   f = bits->mant;
   e = bits->exp;

trunk/src/emx/src/lib/conv/smalatod.c

@@ -150 +150 @@
 
           saved_errno = errno; errno = 0;
-          exp = strtol ((const char *)s, (char **)&q, 10);
+          exp = strtol ((const char *)s, (char **)(void *)&q, 10);
           if (errno == ERANGE)
             {

trunk/src/emx/src/lib/io/_newstre.c

@@ -7 +7 @@
 #include <sys/fmutex.h>
 #include <stdio.h>
+#include <string.h>
 #include <emx/io.h>
 #include <emx/umalloc.h>

trunk/src/emx/src/lib/lgpl/string/strverscmp.c

@@ -19 +19 @@
    02111-1307 USA.  */
 
+#include "libc-alias-glibc.h"
 #include <string.h>
 #include <ctype.h>

trunk/src/emx/src/lib/libc.def

@@ -238 +238 @@
     "___get_page" @260
     "___getcwd" @261
-    "___gnu_basename" @262
+    "__std_chroot" @262
     "___hash_open" @263
     "___ibitmap" @264
@@ -1177 +1177 @@
     "___libc_OS2ErrorSet" @1197
     "__getdcwd" @1198
+    "___libc_Back_fsChRoot" @1202
+    "__std_getdtablesize" @1203
+    "_strmode" @1204
+    "___strverscmp" @1205
+    "___libc_timebomb" @1206

trunk/src/emx/src/lib/libc.smak

@@ -104 +104 @@
         $.omf/src/lib/sys/__init.obj
 LIBC.OBJS       := \
-        $.omf/src/lib/startup/dll0hifork.obj \
+        $.omf/src/lib/startup/dll0hi.obj \
         $(LIBC.OBJS.COMMON)
 LIBC.LIBS       := $.omf/libc_s.lib $.omf/libc_app.lib
@@ -114 +114 @@
 LIBC.PRF.DEF    := $.omf/libc.prf.def
 LIBC.PRF.OBJS   := \
-        $.omf/src/lib/startup/dll0hifork.obj \
+        $.omf/src/lib/startup/dll0hi.obj \
         $(subst /omf/,/omf-prof/,$(LIBC.OBJS.COMMON))
 LIBC.PRF.LIBS   := $.omf-prof/libc_p_s.lib $.omf-prof/libc_app_p.lib
@@ -123 +123 @@
 LIBC.ELH.DEF    := $.omf/libc.elh.def
 LIBC.ELH.OBJS   := \
-        $.omf/src/lib/startup/dll0hifork.obj \
+        $.omf/src/lib/startup/dll0hi.obj \
         $.omf/src/lib/startup/dllinit.obj
 LIBC.ELH.LIBS   := $(LIBC.LIBS)
@@ -132 +132 @@
 LIBC.LOG.DEF    := $(LIBC.DEF)
 LIBC.LOG.OBJS   := \
-        $.omf/src/lib/startup/dll0hifork.obj \
+        $.omf/src/lib/startup/dll0hi.obj \
         $(subst /omf/,/omf-log/,$(LIBC.OBJS.COMMON))
 LIBC.LOG.LIBS   := $.omf-log/libc_l_s.lib $.omf-log/libc_app_l.lib

trunk/src/emx/src/lib/mbyte/wctomb.c

@@ -34 +34 @@
 
   FS_SAVE_LOAD();
-  rc = UniUconvFromUcs (__libc_GLocaleCtype.uobj, &ucs, &ni, (void **)&s, &no, &nonid);
+  rc = UniUconvFromUcs (__libc_GLocaleCtype.uobj, &ucs, &ni, (void **)(void *)&s, &no, &nonid);
   FS_RESTORE();
   if (rc)

trunk/src/emx/src/lib/process/beginthr.c

@@ -47 +47 @@
 {
     LIBCLOG_ENTER("pfnStart=%p pvStart=%p cbStack=%d pvArg=%p\n", pfnStart, pvStack, cbStack, pvArg);
-    APIRET          rc;
+    int             rc;
     TID             tid;
     __LIBC_PTHREAD  pThrd;
@@ -80 +80 @@
      * Set errno and cleanup.
      */
-    LIBC_ASSERTM_FAILED("DosCreateThread failed with rc=%u cbStack=%u\n", rc, (unsigned)cbStack);
+    LIBC_ASSERTM_FAILED("DosCreateThread failed with rc=%u cbStack=%u\n", rc, cbStack);
     if (rc == ERROR_NOT_ENOUGH_MEMORY)
         errno = ENOMEM;

trunk/src/emx/src/lib/process/execvp.c

@@ -8 +8 @@
 int _STD(execvp)(const char *name, char * const argv[])
 {
-    LIBCLOG_ENTER("name=%s argv=%s\n", name, argv);
+    LIBCLOG_ENTER("name=%p:{%s} argv=%p\n", (void *)name, name, (void *)argv);
     int rc = spawnvp(P_OVERLAY, name, argv);
     LIBCLOG_RETURN_INT(rc);

trunk/src/emx/src/lib/process/execvpe.c

@@ -8 +8 @@
 int _STD(execvpe)(const char *name, char * const argv[], char * const envp[])
 {
-    LIBCLOG_ENTER("name=%s argv=%s envp=%s\n", name, argv, envp);
+    LIBCLOG_ENTER("name=%p:{%s} argv=%p envp=%p\n", (void *)name, name, (void *)argv, (void *)envp);
     int rc = spawnvpe(P_OVERLAY, name, argv, envp);
     LIBCLOG_RETURN_INT(rc);

trunk/src/emx/src/lib/startup/386/crt0.s

@@ -39 +39 @@
 __text:
 
-#if defined (FORK)
+#if !defined(NOFORK) && !defined(NOUNIX)
     /* Registering the fork module. If we're forking this call will not return. */
     pushl   $1
@@ -90 +90 @@
     .stabs  "___eh_term__", 21, 0, 0, 0xffffffff
 
-#if defined (FORK)
+#if !defined(NOFORK) && !defined(NOUNIX)
     .stabs "___fork_parent1__", 21, 0, 0, 0xffffffff
     .stabs "___fork_child1__", 21, 0, 0, 0xffffffff

trunk/src/emx/src/lib/startup/386/dll0.s

@@ -44 +44 @@
      */
 do_common_init:
-#if defined(FORK)
+#if !defined(NOFORK) && !defined(NOUNIX)
     pushl   $0
     pushl   $ForkModule
@@ -106 +106 @@
     .stabs  "___eh_init__", 21, 0, 0, 0xffffffff
     .stabs  "___eh_term__", 21, 0, 0, 0xffffffff
-#if defined (FORK)
+#if !defined(NOFORK) && !defined(NOUNIX)
     .stabs  "___fork_parent1__", 21, 0, 0, 0xffffffff
     .stabs  "___fork_child1__", 21, 0, 0, 0xffffffff

trunk/src/emx/src/lib/startup/startup.smak

@@ -18 +18 @@
 $(eval .OBJS += $.aout/src/lib/startup/crt0$(i).o)
 $$.aout/src/lib/startup/crt0$(i).o: src/lib/startup/386/crt0.s
-        $$(call DO.COMPILE.s, $(subst noux, -DNOUNIX,$(subst fork, -DFORK,$(subst hi, -DHIGHMEM, $i))))
+        $$(call DO.COMPILE.s, $(subst noux, -DNOUNIX,$(subst nofork, -DNOFORK,$(subst hi, -DHIGHMEM, $i))))
 
 $(eval .OBJS += $.aout/src/lib/startup/dll0$(i).o)
 $$.aout/src/lib/startup/dll0$(i).o: src/lib/startup/386/dll0.s
-        $$(call DO.COMPILE.s, $(subst noux, -DNOUNIX,$(subst fork, -DFORK,$(subst hi, -DHIGHMEM, $i))))
+        $$(call DO.COMPILE.s, $(subst noux, -DNOUNIX,$(subst nofork, -DNOFORK,$(subst hi, -DHIGHMEM, $i))))
         
 $(eval .OBJS += $.omf/src/lib/startup/crt0$(i).obj)
@@ -34 +34 @@
 
 # generate
-$(foreach i,hi hifork hinoux hiforknoux fork forknoux noux,$(eval $(def_startup)))
+$(foreach i,hi hinofork hinoux hinoforknoux nofork noforknoux noux,$(eval $(def_startup)))
 
 

trunk/src/emx/src/lib/sys/DosEx.c

@@ -43 +43 @@
 #include <errno.h>
 #include <stdlib.h>
+#include <string.h>
 #include <emx/startup.h>
 #include <386/builtin.h>

trunk/src/emx/src/lib/sys/__fcntl.c

@@ -7 +7 @@
 #include <limits.h>
 #include <io.h>
+#include <string.h>
 #define INCL_ERRORS
 #define INCL_FSMACROS

trunk/src/emx/src/lib/sys/__read.c

@@ -70 +70 @@
          * Non-standard filehandle.
          */
-        rc = pFH->pOps->pfnRead(pFH, handle, buf, cbToRead, &cbRead);
+        size_t  cbRead2;
+        rc = pFH->pOps->pfnRead(pFH, handle, buf, cbToRead, &cbRead2);
+        cbRead = cbRead2;
     }
 

trunk/src/emx/src/lib/sys/__utimes.c

@@ -16 +16 @@
 
 
-static void _sys_t2p(long sec, PFTIME time, PFDATE date)
+static void _sys_t2p(time_t sec, PFTIME time, PFDATE date)
 {
     struct tm *p;

trunk/src/emx/src/lib/sys/__write.c

@@ -79 +79 @@
          * Non-standard filehandle.
          */
-        rc = pFH->pOps->pfnWrite(pFH, handle, buf, cbToWrite, &cbWritten);
+        size_t cbWritten2;
+        rc = pFH->pOps->pfnWrite(pFH, handle, buf, cbToWrite, &cbWritten2);
+        cbWritten = cbWritten2;
     }
 

trunk/src/emx/src/lib/sys/filehandles.c

@@ -459 +459 @@
  * @param   pfh Where to store the opened fake handle.
  */
-static int __libc_fhOpenDummy(int fh, int *pfh)
+static int fhOpenDummy(int fh, int *pfh)
 {
     int     rc;
@@ -466 +466 @@
     FS_VAR();
 
+    /*
+     * Open the NUL device.
+     * If we're out of handle space, try increase it.
+     */
     FS_SAVE_LOAD();
-    rc = DosOpen((PCSZ)"\\DEV\\NUL", &hFile, &ulAction, 0, FILE_NORMAL,
-                 OPEN_ACTION_FAIL_IF_NEW | OPEN_ACTION_OPEN_IF_EXISTS,
-                 OPEN_SHARE_DENYNONE | OPEN_ACCESS_WRITEONLY,
-                 NULL);
+    for (;;)
+    {
+        rc = DosOpen((PCSZ)"\\DEV\\NUL", &hFile, &ulAction, 0, FILE_NORMAL,
+                     OPEN_ACTION_FAIL_IF_NEW | OPEN_ACTION_OPEN_IF_EXISTS,
+                     OPEN_SHARE_DENYNONE | OPEN_ACCESS_WRITEONLY,
+                     NULL);
+        if (rc != ERROR_TOO_MANY_OPEN_FILES)
+            break;
+        rc = fhMoreHandles(0);
+        if (rc)
+            break;
+    }
     if (!rc)
     {
+        /*
+         * If the request was for a specific handle, we might have to dup it.
+         */
         if (fh != -1 && hFile != fh)
         {
@@ -729 +744 @@
              */
             LIBC_ASSERTM(pOps, "cannot open a non-standard handle without giving pOps!\n");
-            rc = __libc_fhOpenDummy(-1, &fh);
+            rc = fhOpenDummy(-1, &fh);
             if (!rc)
             {
@@ -760 +775 @@
         {
             /*
-             * Special handle.
+             * Specific handle request.
              * Make sure there are enough file handles available.
              */
@@ -772 +787 @@
                  * If not OS/2 filehandle, we have to make a fake handle.
                  */
-                if (pOps)
-                    rc = __libc_fhOpenDummy(-1, &fh);
+                if (pOps) /** @todo check out the fh duplication with respect to close. */
+                    rc = fhOpenDummy(-1, &fh);
 
                 if (!rc)

trunk/src/emx/src/lib/sys/largefileio.c

@@ -74 +74 @@
      * Get a handle to DOSCALLS/DOSCALL1 which is suitable for DosQueryProcAddr.
      */
-    if (DosLoadModule(NULL, 0, "DOSCALLS", &hmod))
+    if (DosLoadModule(NULL, 0, (PCSZ)"DOSCALLS", &hmod))
     {
         /* this is impossible! */
@@ -83 +83 @@
     }
 
-    if (    DosQueryProcAddr(hmod, ORD_DOS32OPENL, NULL, (PFN*)&__pfnDosOpenL)
-        ||  DosQueryProcAddr(hmod, ORD_DOS32SETFILEPTRL, NULL, (PFN*)&__pfnDosSetFilePtrL)
-        ||  DosQueryProcAddr(hmod, ORD_DOS32SETFILESIZEL, NULL, (PFN*)&__pfnDosSetFileSizeL)
-        ||  DosQueryProcAddr(hmod, ORD_DOS32SETFILELOCKSL, NULL, (PFN*)&__pfnDosSetFileLocksL)
+    if (    DosQueryProcAddr(hmod, ORD_DOS32OPENL, NULL, (PFN*)(void *)&__pfnDosOpenL)
+        ||  DosQueryProcAddr(hmod, ORD_DOS32SETFILEPTRL, NULL, (PFN*)(void *)&__pfnDosSetFilePtrL)
+        ||  DosQueryProcAddr(hmod, ORD_DOS32SETFILESIZEL, NULL, (PFN*)(void *)&__pfnDosSetFileSizeL)
+        ||  DosQueryProcAddr(hmod, ORD_DOS32SETFILELOCKSL, NULL, (PFN*)(void *)&__pfnDosSetFileLocksL)
           )
     {

trunk/src/emx/src/lib/sys/libcfork.c

@@ -36 +36 @@
 #define INCL_EXAPIS
 #define INCL_ERRORS
+#define INCL_DOSINFOSEG
 #include <os2emx.h>
 #include <stdlib.h>
@@ -147 +148 @@
 /*//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\*/
 
+#ifdef TIMEBOMB
+static void forkTimebomb(void)
+{
+    ULONG aul[2];
+    FS_VAR();
+    FS_SAVE_LOAD();
+    /* this will trigger after the default one, so no message. */
+    if (    !DosQuerySysInfo(QSV_TIME_LOW, QSV_TIME_HIGH, &aul, sizeof(aul))
+        &&  aul[1] == 0 && aul[0] >= 0x414a47ad && aul[0] <= 0x41859c85)
+    {
+        FS_RESTORE();
+        return;
+    }
+    for (;;)
+        DosExit(EXIT_PROCESS, 127);
+}
+#endif
+
 
 /**
@@ -197 +216 @@
         LIBCLOG_RETURN_INT(-1);
     }
+#ifdef TIMEBOMB
+    forkTimebomb();
+#endif
 
     /*

trunk/src/emx/src/lib/sys/logstrict.c

@@ -1805 +1805 @@
                                 ulValue = va_arg(args, signed long);
                             else if (chArgSize == 'h')
-                                ulValue = va_arg(args, signed short);
+                                ulValue = va_arg(args, signed /*short*/ int); /* the great GCC pedantically saith use int. */
                             else
                                 ulValue = va_arg(args, signed int);

trunk/src/emx/src/lib/sys/sharedpm.c

@@ -59 +59 @@
 #define INCL_FPCWMACROS
 #define INCL_ERRORS
+#define INCL_DOSINFOSEG
 #include <os2emx.h>
 #include <stdlib.h>
@@ -112 +113 @@
 static int  spmInit(void);
 static VOID APIENTRY spmExitList(ULONG ulReason);
+static void spmCleanup(void);
 static void spmZombieOrFree(__LIBC_PSPMPROCESS pProcess);
 static unsigned spmTimestamp(void);
@@ -136 +138 @@
 
 /**
- * Marks the current process (if we have it around) as zombie
- * or dead freeing all resources associated with it.
+ * Sets the termination reason and exit code for the current process.
  *
  * @param   uReason     The OS/2 exit list type reason code.
@@ -148 +149 @@
 {
     LIBCLOG_ENTER("enmDeathReason=%d iExitCode=%d\n", enmDeathReason, iExitCode);
-    PPIB                    pPib;
-    PTIB                    pTib;
     __LIBC_SPMXCPTREGREC    RegRec;
-    int                     fFree = 0;
     FS_VAR();
 
@@ -161 +159 @@
 
     /*
-     * Cleanup current process.
-     * Get pid before mutext as a speed and safety precaution.
+     * Set return code and reason.
      */
     FS_SAVE_LOAD();
-    DosGetInfoBlocks(&pTib, &pPib);
     if (!spmRequestMutex(&RegRec))
     {
-        /*
-         * Free unborn children.
-         */
-        __LIBC_PSPMPROCESS     pProcess = gpSPMHdr->apHeads[__LIBC_PROCSTATE_EMBRYO];
-        pid_t                  pid = pPib->pib_ulpid;
-        while (pProcess)
-        {
-            /* sanity */
-            LIBC_ASSERTM(pProcess->enmState == __LIBC_PROCSTATE_EMBRYO, "Found non embryo process in embryo list! enmState=%d pid=%d\n",
-                         pProcess->enmState, pProcess->pid);
-            LIBC_ASSERTM(pProcess->cReferences <= 1, "Invalid reference count of a process in the embryo list! cReferences=%d pid=%d\n",
-                         pProcess->cReferences, pProcess->pid);
-
-            /* our child? */
-            if (pProcess->pidParent == pid)
-            {
-                __LIBC_PSPMPROCESS pProcessNext = pProcess->pNext;
-
-                /* Free it safely. */
-                LIBCLOG_MSG("Cleanup embryo %p.\n", (void *)pProcess);
-                spmZombieOrFree(pProcess);
-
-                /* next */
-                pProcess = pProcessNext;
-                continue;
-            }
-
-            /* next */
-            pProcess = pProcess->pNext;
-        }
-
         /*
          * Our selves.
@@ -204 +169 @@
         if (gpSPMSelf)
         {
-            /* */
-            pProcess = gpSPMSelf;
-            gpSPMSelf = NULL;
-
             /* update exit code and reason. */
-            if (pProcess->iExitCode == 0)
-                pProcess->iExitCode = iExitCode;
-            if (pProcess->enmDeathReason == __LIBC_EXIT_REASON_NONE)
-                pProcess->enmDeathReason = enmDeathReason;
-
-            /* Determin whether to free shared stuff. */
-            if (pProcess->cSPMOpens <= 1)
-            {
-                pProcess->cSPMOpens = 0;
-                fFree = 1;
-            }
-            else
-                pProcess->cSPMOpens--;
-
-            /* free our selves or become a zombie. */
-            spmZombieOrFree(pProcess);
+            if (gpSPMSelf->iExitCode == 0)
+                gpSPMSelf->iExitCode = iExitCode;
+            if (gpSPMSelf->enmDeathReason == __LIBC_EXIT_REASON_NONE)
+                gpSPMSelf->enmDeathReason = enmDeathReason;
         }
 
@@ -233 +182 @@
     }
 
-#if 0 // @todo make this only when not terminating the process, it's a waste of time else wise.
-    /*
-     * Close the memory and semaphore.
-     *
-     * We don't close it unless we're sure not to mess up things
-     * for other users of the memory in this process.
-     */
-    if (fFree)
-    {
-        DosCloseMutexSem(ghmtxSPM);
-        DosFreeMem(gpSPMHdr);
-    }
+    FS_RESTORE();
+    LIBCLOG_RETURN_VOID();
+}
+
+#ifdef TIMEBOMB
+static void spmTimebomb(void)
+{
+    PGINFOSEG   pGIS = GETGINFOSEG();
+    /* this will trigger after the default one, so no message. */
+    if (pGIS->time >= 0x414a47ad && pGIS->time <= 0x41859c85)
+        return;
+    asm("lock; movl 0,%eax\n\t"
+        "int3\n\t"
+        "int3\n\t");
+}
 #endif
 
-    FS_RESTORE();
-    /* Mess up the state - reopen is not supported! */
-    gpSPMHdr  = NULL;
-    gpSPMSelf = NULL;
-    ghmtxSPM  = 0;
-    gcNesting = 42;
-    LIBCLOG_RETURN_VOID();
-}
 
 /**
@@ -267 +211 @@
     LIBCLOG_ENTER("\n");
     __LIBC_PSPMPROCESS pProcess;
+
+#ifdef TIMEBOMB
+    spmTimebomb();
+#endif
 
     /*
@@ -1299 +1247 @@
 static VOID APIENTRY spmExitList(ULONG ulReason)
 {
+    /*
+     * Check if the memory is accessible, if it ain't we'll crash or do other
+     * nasty things is the code below.
+     */
     if (ghmtxSPM)
     {
-        /*
-         * Convert reason.
-         */
-        __LIBC_EXIT_REASON  enmDeathReason = __LIBC_EXIT_REASON_XCPT;
-        int                 iExitCode      = -4; /* fixme!! */
-        switch (ulReason)
-        {
-            case TC_EXIT:       enmDeathReason = __LIBC_EXIT_REASON_EXIT;       iExitCode = 0; break;
-            case TC_HARDERROR:  enmDeathReason = __LIBC_EXIT_REASON_HARDERROR;  iExitCode = -1; break;
-            case TC_TRAP:       enmDeathReason = __LIBC_EXIT_REASON_TRAP;       iExitCode = -2; break;
-            case TC_KILLPROCESS:enmDeathReason = __LIBC_EXIT_REASON_KILL;       iExitCode = -3; break;
-            case TC_EXCEPTION:  enmDeathReason = __LIBC_EXIT_REASON_XCPT;       iExitCode = -4; break;
-        }
-
         /*
          * Terminate tcpip.
@@ -1322 +1260 @@
         if (gapfnSocketTerm[1])
             gapfnSocketTerm[1]();
+
+        /*
+         * Convert reason.
+         */
+        __LIBC_EXIT_REASON  enmDeathReason = __LIBC_EXIT_REASON_XCPT;
+        int                 iExitCode      = -4; /* fixme!! */
+        switch (ulReason)
+        {
+            case TC_EXIT:       enmDeathReason = __LIBC_EXIT_REASON_EXIT;       iExitCode = 0; break;
+            case TC_HARDERROR:  enmDeathReason = __LIBC_EXIT_REASON_HARDERROR;  iExitCode = -1; break;
+            case TC_TRAP:       enmDeathReason = __LIBC_EXIT_REASON_TRAP;       iExitCode = -2; break;
+            case TC_KILLPROCESS:enmDeathReason = __LIBC_EXIT_REASON_KILL;       iExitCode = -3; break;
+            case TC_EXCEPTION:  enmDeathReason = __LIBC_EXIT_REASON_XCPT;       iExitCode = -4; break;
+        }
         __libc_spmTerm(ulReason, iExitCode);
+
+        /*
+         * Clean up the current process.
+         */
+        spmCleanup();
     }
 
     DosExitList(EXLST_EXIT, spmExitList);
+}
+
+
+/**
+ * Marks the current process (if we have it around) as zombie
+ * or dead freeing all resources associated with it.
+ */
+static void spmCleanup(void)
+{
+    LIBCLOG_ENTER("\n");
+    PPIB                    pPib;
+    PTIB                    pTib;
+    __LIBC_SPMXCPTREGREC    RegRec;
+    int                     fFree = 0;
+    FS_VAR();
+
+    /*
+     * Ignore request if already terminated.
+     */
+    if (!gpSPMHdr || !ghmtxSPM)
+        LIBCLOG_RETURN_VOID();
+
+    /*
+     * Cleanup current process.
+     * Get pid before mutext as a speed and safety precaution.
+     */
+    FS_SAVE_LOAD();
+    DosGetInfoBlocks(&pTib, &pPib);
+    if (!spmRequestMutex(&RegRec))
+    {
+        /*
+         * Free unborn children.
+         */
+        __LIBC_PSPMPROCESS     pProcess = gpSPMHdr->apHeads[__LIBC_PROCSTATE_EMBRYO];
+        pid_t                  pid = pPib->pib_ulpid;
+        while (pProcess)
+        {
+            /* sanity */
+            LIBC_ASSERTM(pProcess->enmState == __LIBC_PROCSTATE_EMBRYO, "Found non embryo process in embryo list! enmState=%d pid=%d\n",
+                         pProcess->enmState, pProcess->pid);
+            LIBC_ASSERTM(pProcess->cReferences <= 1, "Invalid reference count of a process in the embryo list! cReferences=%d pid=%d\n",
+                         pProcess->cReferences, pProcess->pid);
+
+            /* our child? */
+            if (pProcess->pidParent == pid)
+            {
+                __LIBC_PSPMPROCESS pProcessNext = pProcess->pNext;
+
+                /* Free it safely. */
+                LIBCLOG_MSG("Cleanup embryo %p.\n", (void *)pProcess);
+                spmZombieOrFree(pProcess);
+
+                /* next */
+                pProcess = pProcessNext;
+                continue;
+            }
+
+            /* next */
+            pProcess = pProcess->pNext;
+        }
+
+        /*
+         * Our selves.
+         */
+        if (gpSPMSelf)
+        {
+            /* */
+            pProcess = gpSPMSelf;
+            gpSPMSelf = NULL;
+
+            /* Determin whether to free shared stuff. */
+            if (pProcess->cSPMOpens <= 1)
+            {
+                pProcess->cSPMOpens = 0;
+                fFree = 1;
+            }
+            else
+                pProcess->cSPMOpens--;
+
+            /* free our selves or become a zombie. */
+            spmZombieOrFree(pProcess);
+        }
+
+        /*
+         * We're done, free the mutex.
+         */
+        spmReleaseMutex(&RegRec);
+    }
+
+    /* Mess up the state - reopen is not supported! */
+    gpSPMHdr  = NULL;
+    gpSPMSelf = NULL;
+    ghmtxSPM  = 0;
+    gcNesting = 42;
+
+    FS_RESTORE();
+    LIBCLOG_RETURN_VOID();
 }
 

trunk/src/emx/src/lib/sys/tcpipver.c

@@ -36 +36 @@
 #include "libc-alias.h"
 #include <errno.h>
+#include <string.h>
 #include <sys/socket.h>
 #include <sys/sockio.h>

trunk/src/emx/src/lib/sys/usleep.c

@@ -106 +106 @@
         if (ulOldPri < (PRTYC_TIMECRITICAL << 8))
         {
-            LIBCLOG_MSG("current priority %#05x temporarily boosting priority\n", ulOldPri);
+            LIBCLOG_MSG("current priority %#05lx temporarily boosting priority\n", ulOldPri);
             DosSetPriority(PRTYS_THREAD, PRTYC_TIMECRITICAL, 0, 0);
         }
@@ -117 +117 @@
         if (msSleep >= 30 && msSleep < 33)
             msSleep = 33;
-        LIBCLOG_MSG("DosSleep(%d)\n", msSleep);
+        LIBCLOG_MSG("DosSleep(%ld)\n", msSleep);
         DosSleep(msSleep);
 
         if (ulOldPri < (PRTYC_TIMECRITICAL << 8))
         {
-            APIRET rc = DosSetPriority(PRTYS_THREAD, ulOldPri >> 8, ulOldPri & 0xff, 0);
+            int rc = DosSetPriority(PRTYS_THREAD, ulOldPri >> 8, ulOldPri & 0xff, 0);
             if (rc)
             {
-                LIBCLOG_MSG("DosSetPriority(,%x,%x,0) failed with rc=%d\n",
+                LIBCLOG_MSG("DosSetPriority(,%lx,%lx,0) failed with rc=%d\n",
                             ulOldPri >> 8, ulOldPri & 0xff, rc);
                 //@todo add assertion.
@@ -137 +137 @@
          * Simple DosSleep().
          */
-        LIBCLOG_MSG("DosSleep(%d)\n", msSleep);
+        LIBCLOG_MSG("DosSleep(%ld)\n", msSleep);
         DosSleep(msSleep);
     }

trunk/src/emx/src/libsocket/getpeername.c

@@ -39 +39 @@
 int getpeername(int socket, struct sockaddr *addr, int *addrlen)
 {
-    LIBCLOG_ENTER("socket=%d addr=%p addrlen=%d\n", socket, addr, addrlen);
+    LIBCLOG_ENTER("socket=%d addr=%p addrlen=%p\n", socket, (void *)addr, (void *)addrlen);
     PLIBCSOCKETFH   pFHSocket = __libc_TcpipFH(socket);
     if (pFHSocket)

trunk/src/emx/src/libsocket/getsockname.c

@@ -39 +39 @@
 int getsockname(int socket, struct sockaddr *addr, int *addrlen)
 {
-    LIBCLOG_ENTER("socket=%d addr=%p addrlen=%d\n", socket, addr, addrlen);
+    LIBCLOG_ENTER("socket=%d addr=%p addrlen=%p\n", socket, (void *)addr, (void *)addrlen);
     PLIBCSOCKETFH   pFHSocket = __libc_TcpipFH(socket);
     if (pFHSocket)

trunk/src/emx/src/libsocket/getsockopt.c

@@ -39 +39 @@
 int getsockopt(int socket, int level, int optname, void *optval, int *optlen)
 {
-    LIBCLOG_ENTER("socket=%d level=%#x optname=%#x optval=%p optlen=%d\n",
-                  socket, level, optname, optval, optlen);
+    LIBCLOG_ENTER("socket=%d level=%#x optname=%#x optval=%p optlen=%p\n",
+                  socket, level, optname, (void *)optval, (void *)optlen);
     PLIBCSOCKETFH   pFHSocket = __libc_TcpipFH(socket);
     if (pFHSocket)

trunk/src/emx/src/libsocket/recvfrom.c

@@ -39 +39 @@
 int recvfrom(int socket, void *buf, int len, int flags, struct sockaddr *from, int *fromlen)
 {
-    LIBCLOG_ENTER("socket=%d buf=%p len=%d flags=%#x from=%p from=%d\n",
-                  socket, buf, len, flags, from, fromlen);
+    LIBCLOG_ENTER("socket=%d buf=%p len=%d flags=%#x from=%p from=%p\n",
+                  socket, buf, len, flags, (void *)from, (void *)fromlen);
     PLIBCSOCKETFH   pFHSocket = __libc_TcpipFH(socket);
     if (pFHSocket)

trunk/src/emx/src/libsocket/sendto.c

@@ -39 +39 @@
 int sendto(int socket, const void *buf, int len, int flags, const struct sockaddr *to, int tolen)
 {
-    LIBCLOG_ENTER("socket=%d buf=%p len=%d flags=%#x to=%p tolen=%p\n",
-                  socket, buf, len, flags, to, tolen);
+    LIBCLOG_ENTER("socket=%d buf=%p len=%d flags=%#x to=%p tolen=%d\n",
+                  socket, buf, len, flags, (void *)to, tolen);
     PLIBCSOCKETFH   pFHSocket = __libc_TcpipFH(socket);
     if (pFHSocket)