cleanup CRTL code

Author: jmalak

bld/clib/environ/c/_findenv.c

@@ -89,10 +89,12 @@ static int __F_NAME(findenv,wfindenv)( const CHAR_TYPE *name, int delete_var )
                     lib_free( *envp );
                 }
 #endif
+                /* shift string array entries */
                 for( tmp_envp = envp; *tmp_envp != NULL; tmp_envp++ ) {
                     *tmp_envp = *(tmp_envp + 1);
                 }
 #ifndef __WIDECHAR__
+                /* shift flag array entries */
                 envm = (char *)tmp_envp;
                 while( len-- > 0 ) {
                     *envm++ = *_RWD_env_mask++;
@@ -116,7 +118,8 @@ static int __F_NAME(findenv,wfindenv)( const CHAR_TYPE *name, int delete_var )
             }
         }
     }
-    return( __F_NAME(_RWD_environ,_RWD_wenviron) - envp );  /* not found */
+    /* not found */
+    return( __F_NAME(_RWD_environ,_RWD_wenviron) - envp );
 }
 
 int __F_NAME(__findenvadd,__wfindenvadd)( const CHAR_TYPE *env_string )

bld/clib/environ/c/_setenv.c

@@ -67,7 +67,7 @@ static int __F_NAME(addenv,waddenv)( int index, const CHAR_TYPE *name, const CHA
     envp = __F_NAME(_RWD_environ,_RWD_wenviron);
     len = __F_NAME(strlen,wcslen)( name );
     old_val = _RWD_env_mask[index] ? envp[index] : NULL;
-    env_str = lib_realloc( (void *)old_val, ( len + __F_NAME(strlen,wcslen)( newvalue ) + 2 ) * sizeof( CHAR_TYPE ) );
+    env_str = lib_realloc( old_val, ( len + 1 + __F_NAME(strlen,wcslen)( newvalue ) + 1 ) * sizeof( CHAR_TYPE ) );
     if( env_str == NULL )
         return( -1 );
     memcpy( env_str, name, len * sizeof( CHAR_TYPE ) );

bld/clib/environ/c/environ.c

@@ -2,6 +2,7 @@
 *
 *                            Open Watcom Project
 *
+* Copyright (c) 2002-2021 The Open Watcom Contributors. All Rights Reserved.
 *    Portions Copyright (c) 1983-2002 Sybase, Inc. All Rights Reserved.
 *
 *  ========================================================================
@@ -35,9 +36,10 @@
 #include "rtinit.h"
 #include "_environ.h"
 
-_WCRTDATA char ** _WCDATA environ;      /* pointer to environment table */
-_WCRTDATA wchar_t ** _WCDATA _wenviron; /* pointer to wide char environment */
-char * _WCNEAR __env_mask;              /* ptr to char array of flags */
+
+_WCRTDATA char      ** _WCDATA environ;     /* pointer to environment table */
+_WCRTDATA wchar_t   ** _WCDATA _wenviron;   /* pointer to wide char environment */
+char                * _WCNEAR __env_mask;   /* ptr to char array of flags */
 
 AXI( __setenvp, INIT_PRIORITY_LIBRARY )
 

bld/clib/environ/c/setenvp.c

@@ -104,11 +104,12 @@ void __setenvp( void )
     while( *argep != NULL )
         argep++;
     count = argep - _Envptr;
-    argep = lib_malloc( ENVARR_SIZE( count ) );
-    memcpy( argep, _Envptr, ( count + 1 ) * sizeof( char * ) );
-    _RWD_environ = argep;
-    _RWD_env_mask = (char *)&argep[count + 1];
-    memset( _RWD_env_mask, 0, count );
+    _RWD_environ = lib_malloc( ENVARR_SIZE( count ) );
+    if( _RWD_environ != NULL ) {
+        _RWD_env_mask = (char *)&_RWD_environ[count + 1];
+        memcpy( _RWD_environ, _Envptr, ( count + 1 ) * sizeof( char * ) );
+        memset( _RWD_env_mask, 0, count );
+    }
 #else
   #if defined(__WINDOWS_386__) || defined(__DOS_386__)
     char    _WCFAR *startp;

bld/clib/intel/c/p5prof.c

@@ -36,6 +36,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <stddef.h>
+#include <limits.h>
 #include "rtinit.h"
 #include "p5prof.h"
 #include "pathgrp2.h"

bld/clib/intel/c/p5prof2.c

@@ -36,6 +36,7 @@
 #include <string.h>
 #include <stdio.h>
 #include <stddef.h>
+#include <limits.h>
 #include <unistd.h>
 #include <sys/stat.h>
 #ifdef __NT__

bld/clib/intel/c/profilog.c

@@ -2,7 +2,7 @@
 *
 *                            Open Watcom Project
 *
-* Copyright (c) 2002-2020 The Open Watcom Contributors. All Rights Reserved.
+* Copyright (c) 2002-2021 The Open Watcom Contributors. All Rights Reserved.
 *    Portions Copyright (c) 1983-2002 Sybase, Inc. All Rights Reserved.
 *
 *  ========================================================================
@@ -34,6 +34,7 @@
 #include "widechar.h"
 #include <stdlib.h>
 #include <stdio.h>
+#include <limits.h>
 #include <unistd.h>
 #include "rtinit.h"
 #include "p5prof.h"

bld/clib/startup/c/cmainqnx.c

@@ -2,7 +2,7 @@
 *
 *                            Open Watcom Project
 *
-* Copyright (c) 2002-2019 The Open Watcom Contributors. All Rights Reserved.
+* Copyright (c) 2002-2021 The Open Watcom Contributors. All Rights Reserved.
 *    Portions Copyright (c) 1983-2002 Sybase, Inc. All Rights Reserved.
 *
 *  ========================================================================
@@ -52,6 +52,7 @@
 #include "rtdata.h"
 #include "fltsupp.h"
 #include "slibqnx.h"
+#include "_environ.h"
 
 
 #if defined( _M_I86 )
@@ -77,10 +78,10 @@ char    **_argv;                            /* argument vector */
 
 pid_t                   _my_pid;        /* some sort of POSIX dodad */
 struct  _proc_spawn     *__cmd;         /* address of spawn msg */
-char                    *__near __env_mask;
 int (__far * (__far *__f))();           /* Shared library jump table    */
 extern  void __user_init( void );
 #define __user_init() ((int(__far *)(void)) __f[1])()
+
 #endif
 
 static void _WCI86FAR __null_FPE_rtn( int fpe_type )