vim: src/misc1.c comparison

updated for version 7.0041

comparison

equal deleted inserted replaced

-:f6e567606d47
+:2201ea50555e
 	{
 	    vim_setenv((char_u *)"VIMRUNTIME", p);
 	    didset_vimruntime = TRUE;
 #ifdef FEAT_GETTEXT
 	    {
-		char_u	*buf = alloc((unsigned int)STRLEN(p) + 6);
+		char_u	*buf = concat_str(p, (char_u *)"/lang");
 		if (buf != NULL)
 		{
-		    STRCPY(buf, p);
-		    STRCAT(buf, "/lang");
 		    bindtextdomain(VIMPACKAGE, (char *)buf);
 		    vim_free(buf);
 		}
 	    }
 #endif
 	    add_pathsep(dest);
 	STRCAT(dest, fname2);
 }
 return dest;
 }
+#if defined(FEAT_EVAL) || defined(FEAT_GETTEXT) || defined(PROTO)
+/*
+* Concatenate two strings and return the result in allocated memory.
+* Returns NULL when out of memory.
+*/
+char_u  *
+concat_str(str1, str2)
+char_u  *str1;
+char_u  *str2;
+{
+char_u  *dest;
+size_t  l = STRLEN(str1);
+dest = alloc((unsigned)(l + STRLEN(str2) + 1L));
+if (dest != NULL)
+{
+	STRCPY(dest, str1);
+	STRCPY(dest + l, str2);
+}
+return dest;
+}
+#endif
 /*
 * Add a path separator to a file name, unless it already ends in a path
 * separator.
 */

Mercurial > vim