Making the "AT_EXIT" hack look a bit less like a copy-and-paste

[freeglut] / src / freeglut_input_devices.c

diff --git a/src/freeglut_input_devices.c b/src/freeglut_input_devices.c
index 1734a42..0e3dc8d 100755 (executable)
--- a/src/freeglut_input_devices.c
+++ b/src/freeglut_input_devices.c
@@ -136,10 +136,19 @@ int fgInputDeviceDetect( void )
  */
 void fgInitialiseInputDevices ( void )
 {
-    const char *dial_device=NULL;
     if( !fgState.InputDevsInitialised )
     {
+      /* will return true for VC8 (VC2005) and higher */
+#if TARGET_HOST_MS_WINDOWS && ( _MSC_VER >= 1400 )
+        char *dial_device=NULL;
+        size_t sLen;
+        errno_t err = _dupenv_s( &dial_device, &sLen, "GLUT_DIALS_SERIAL" );
+        if (err)
+            fgError("Error getting GLUT_DIALS_SERIAL environment variable");
+#else
+        const char *dial_device=NULL;
         dial_device = getenv ( "GLUT_DIALS_SERIAL" );
+#endif
 #if TARGET_HOST_MS_WINDOWS
         if (!dial_device){
             static char devname[256];
@@ -156,6 +165,10 @@ void fgInitialiseInputDevices ( void )
 #endif
         if ( !dial_device ) return;
         if ( !( dialbox_port = serial_open ( dial_device ) ) ) return;
+      /* will return true for VC8 (VC2005) and higher */
+#if TARGET_HOST_MS_WINDOWS && ( _MSC_VER >= 1400 )
+        free ( dial_device );  dial_device = NULL;  /* dupenv_s allocates a string that we must free */
+#endif
         serial_putchar(dialbox_port,DIAL_INITIALIZE);
         glutTimerFunc ( 10, poll_dials, 0 );
         fgState.InputDevsInitialised = GL_TRUE;