fixes for Solaris and other OSes which does not have strndup, thanks to George Sageev

1 files changed, 14 insertions, 3 deletions

diff --git a/libxklavier/xklavier_config.c b/libxklavier/xklavier_config.c
index c36a76e..1c33131 100644
--- a/libxklavier/xklavier_config.c
+++ b/libxklavier/xklavier_config.c
@@ -335,13 +335,24 @@ void _XklConfigRecSplitByComma( char ***array,
     while( ( npc = strchr( pc, ',' ) ) != NULL )
     {
       int len = npc - pc;
-      *ppc = ( char * ) strndup( pc, len );
+      //*ppc = ( char * ) strndup( pc, len );
+      *ppc = ( char * ) malloc( len + 1 );
+      if ( *ppc != NULL )
+      {
+        strncpy( *ppc, pc, len );
+        (*ppc)[len] = '\0';
+      }
+
       ppc++;
       pc = npc + 1;
     }
 
-    len = npc - pc;
-    *ppc = ( char * ) strndup( pc, len );
+    //len = npc - pc;
+    len = strlen( pc );
+    //*ppc = ( char * ) strndup( pc, len );
+    *ppc = ( char * ) malloc( len + 1 );
+    if ( *ppc != NULL )
+      strcpy( *ppc, pc );
   }
 }