From 3f6fe2a88889a1b1d6731dcdadcc20598626a9d7 Mon Sep 17 00:00:00 2001
From: John Schmidt <john.schmidt.h@gmail.com>
Date: Mon, 28 Apr 2014 22:32:26 +0200
Subject: [PATCH] Move `concat_strings` from path.c

---
 src/path.c    | 12 ------------
 src/strings.c | 14 ++++++++++++++
 src/strings.h |  1 +
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/path.c b/src/path.c
index 6e736f1daa..b4d5687e5c 100644
--- a/src/path.c
+++ b/src/path.c
@@ -283,18 +283,6 @@ char_u *concat_fnames(char_u *fname1, char_u *fname2, int sep)
   return dest;
 }
 
-/*
- * Concatenate two strings and return the result in allocated memory.
- */
-char_u *concat_str(char_u *str1, char_u *str2)
-{
-  size_t l = STRLEN(str1);
-  char_u *dest = xmalloc(l + STRLEN(str2) + 1);
-  STRCPY(dest, str1);
-  STRCPY(dest + l, str2);
-  return dest;
-}
-
 /*
  * Add a path separator to a file name, unless it already ends in a path
  * separator.
diff --git a/src/strings.c b/src/strings.c
index f9c4e2f1db..87d5cc37c5 100644
--- a/src/strings.c
+++ b/src/strings.c
@@ -534,3 +534,17 @@ int has_non_ascii(char_u *s)
   return FALSE;
 }
 #endif
+
+/*
+ * Concatenate two strings and return the result in allocated memory.
+ * Returns NULL when out of memory.
+ */
+char_u *concat_str(char_u *str1, char_u *str2)
+{
+  size_t l = STRLEN(str1);
+  char_u *dest = xmalloc(l + STRLEN(str2) + 1);
+  STRCPY(dest, str1);
+  STRCPY(dest + l, str2);
+  return dest;
+}
+
diff --git a/src/strings.h b/src/strings.h
index bd34d870ea..2a4fd19fb9 100644
--- a/src/strings.h
+++ b/src/strings.h
@@ -23,4 +23,5 @@ char_u *vim_strbyte(char_u *string, int c);
 char_u *vim_strrchr(char_u *string, int c);
 int vim_isspace(int x);
 void sort_strings(char_u **files, int count);
+char_u *concat_str(char_u *str1, char_u *str2);
 #endif