fix memccpy() in tool.c, thanks khindenburg

jcupitt · jcupitt · commit 74454e179b6b · 2014-06-23T11:22:45.000+01:00
see macports ticket 41174
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,6 @@
+started 7.38.4 23/6/14
+- fix memccpy() in tool.c, thanks khindenburg
+
 started 7.38.3 16/5/14
 - fix tiny timeout error
 
diff --git a/configure.ac b/configure.ac
@@ -1,6 +1,6 @@
 # Process this file with autoconf to produce a configure script.
 
-AC_INIT([nip2], [7.38.3])
+AC_INIT([nip2], [7.38.4])
 # foreign stops complaints about a missing README (we use README.md instead)
 # and missing INSTALL (the standard Gnu INSTALL is not very useful)
 AM_INIT_AUTOMAKE([-Wall foreign])
@@ -16,7 +16,7 @@ dnl
 
 m4_define([nip_major_version], [7])
 m4_define([nip_minor_version], [38])
-m4_define([nip_micro_version], [3])
+m4_define([nip_micro_version], [4])
 m4_define([nip_version],
           [nip_major_version.nip_minor_version.nip_micro_version])
 
diff --git a/src/tool.c b/src/tool.c
@@ -412,18 +412,20 @@ toolitem_set_name( Toolitem *toolitem, PElement *root )
 		result ) {
 		if( class_get_member_string( root, 
 			MEMBER_LABEL, value, MAX_NAME ) ) {
+			char *p, *q;
+
 			/* Save the i18n-ed version.
 			 */
 			IM_SETSTR( toolitem->label, _( value ) );
 
 			/* Strip underscores (they mark mnemonics). Can't use
-			 * strrcpy(), we have overlapping blocks.
+			 * strrcpy() or memccpy(), we have overlapping blocks.
 			 */
 			im_strncpy( value, toolitem->label, MAX_NAME );
-			for( i = 0; value[i]; i++ )
-				if( value[i] == '_' )
-					memccpy( value + i, value + i + 1,
-						0, MAX_NAME - i );
+			for( p = q = value; *p; p++ )
+				if( *p != '_' )
+					*q++ = *p;
+			*q = '\0';
 			IM_SETSTR( toolitem->name, value );
 		}
 
