Merge pull request #1253 from ACSimon33/getenv_s

Improve getenv usage

Author: langou

BLAS/SRC/CMakeLists.txt

@@ -129,7 +129,7 @@ if(BUILD_INDEX64_EXT_API)
   set_target_properties(${BLASLIB}_64_obj PROPERTIES POSITION_INDEPENDENT_CODE ON)
   #Add _64 suffix to all Fortran functions via macros
   foreach(F IN LISTS SOURCES_64_F)
-    if(CMAKE_Fortran_COMPILER_ID STREQUAL "NAG")
+    if(CMAKE_Fortran_COMPILER_ID STREQUAL "NAG" OR CMAKE_Fortran_COMPILER_ID MATCHES "Intel")
       set_source_files_properties(${F} PROPERTIES COMPILE_FLAGS "-fpp")
     else()
       set_source_files_properties(${F} PROPERTIES COMPILE_FLAGS "-cpp")

LAPACKE/src/lapacke_nancheck.c

@@ -32,28 +32,83 @@
 
 #include "lapacke_utils.h"
 
+#include <stdlib.h>
+#include <string.h>
+
 static int nancheck_flag = -1;
 
 void LAPACKE_set_nancheck( int flag )
 {
     nancheck_flag = ( flag ) ? 1 : 0;
 }
 
+typedef struct {
+    int found;
+    char *value;
+} lapacke_env_var;
+
+static inline lapacke_env_var LAPACKE_getenv(const char *var_name)
+{
+    size_t var_length = 0;
+
+    /* Get the length of the environment variable value */
+#if defined(_WIN32)
+    errno_t result = getenv_s( &var_length, NULL, 0, var_name );
+    if ( result != 0 || var_length == 0 ) {
+        return (lapacke_env_var){ 0, NULL };
+    }
+#else
+    const char *env = getenv( var_name );
+    if ( env == NULL ) {
+        return (lapacke_env_var){ 0, NULL };
+    }
+    var_length = strlen( env ) + 1;
+#endif
+
+    /* Allocate memory for the environment variable value */
+    char *value = (char *)LAPACKE_malloc( var_length );
+    if ( value == NULL ) {
+        return (lapacke_env_var){ 0, NULL };
+    }
+
+    /* Get the value of the environment variable */
+#if defined(_WIN32)
+    result = getenv_s( &var_length, value, var_length, var_name );
+    if ( result != 0 ) {
+        LAPACKE_free( value );
+        return (lapacke_env_var){ 0, NULL };
+    }
+#else
+    memcpy( value, env, var_length );
+#endif
+
+    return (lapacke_env_var){ 1, value };
+}
+
+static inline void LAPACKE_freenv(lapacke_env_var *var)
+{
+    if ( var->found && var->value != NULL ) {
+        LAPACKE_free( var->value );
+    }
+    var->found = 0;
+    var->value = NULL;
+}
+
 int LAPACKE_get_nancheck( )
 {
-    char* env;
     if ( nancheck_flag != -1 ) {
         return nancheck_flag;
     }
 
     /* Check environment variable, once and only once */
-    env = getenv( "LAPACKE_NANCHECK" );
-    if ( !env ) {
+    lapacke_env_var lapacke_nancheck = LAPACKE_getenv( "LAPACKE_NANCHECK" );
+    if ( !lapacke_nancheck.found ) {
         /* By default, NaN checking is enabled */
         nancheck_flag = 1;
     } else {
-        nancheck_flag = atoi( env ) ? 1 : 0;
+        nancheck_flag = atoi( lapacke_nancheck.value ) ? 1 : 0;
     }
 
+    LAPACKE_freenv( &lapacke_nancheck );
     return nancheck_flag;
 }