1 files changed, 28 insertions, 47 deletions

diff --git a/libgfortran/intrinsics/link.c b/libgfortran/intrinsics/link.c
index 2018c62..c6084a1 100644
--- a/libgfortran/intrinsics/link.c
+++ b/libgfortran/intrinsics/link.c
@@ -2,7 +2,7 @@
    Copyright (C) 2005-2014 Free Software Foundation, Inc.
    Contributed by François-Xavier Coudert <coudert@clipper.ens.fr>
 
-This file is part of the GNU Fortran 95 runtime library (libgfortran).
+This file is part of the GNU Fortran runtime library (libgfortran).
 
 Libgfortran is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public
@@ -37,36 +37,39 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
    INTEGER, INTENT(OUT), OPTIONAL :: STATUS  */
 
 #ifdef HAVE_LINK
-extern void link_i4_sub (char *, char *, GFC_INTEGER_4 *, gfc_charlen_type,
-	                 gfc_charlen_type);
-iexport_proto(link_i4_sub);
 
-void
-link_i4_sub (char *path1, char *path2, GFC_INTEGER_4 *status,
-             gfc_charlen_type path1_len, gfc_charlen_type path2_len)
+static int
+link_internal (char *path1, char *path2, gfc_charlen_type path1_len,
+	       gfc_charlen_type path2_len)
 {
   int val;
   char *str1, *str2;
 
-  /* Trim trailing spaces from paths.  */
-  while (path1_len > 0 && path1[path1_len - 1] == ' ')
-    path1_len--;
-  while (path2_len > 0 && path2[path2_len - 1] == ' ')
-    path2_len--;
-
   /* Make a null terminated copy of the strings.  */
-  str1 = gfc_alloca (path1_len + 1);
-  memcpy (str1, path1, path1_len);
-  str1[path1_len] = '\0';
-
-  str2 = gfc_alloca (path2_len + 1);
-  memcpy (str2, path2, path2_len);
-  str2[path2_len] = '\0';
+  str1 = fc_strdup (path1, path1_len);
+  str2 = fc_strdup (path2, path2_len);
 
   val = link (str1, str2);
 
+  free (str1);
+  free (str2);
+
+  return ((val == 0) ? 0 : errno);
+}
+
+
+extern void link_i4_sub (char *, char *, GFC_INTEGER_4 *, gfc_charlen_type,
+	                 gfc_charlen_type);
+iexport_proto(link_i4_sub);
+
+void
+link_i4_sub (char *path1, char *path2, GFC_INTEGER_4 *status,
+             gfc_charlen_type path1_len, gfc_charlen_type path2_len)
+{
+  int val = link_internal (path1, path2, path1_len, path2_len);
+
   if (status != NULL)
-    *status = (val == 0) ? 0 : errno;
+    *status = val;
 }
 iexport(link_i4_sub);
 
@@ -78,28 +81,10 @@ void
 link_i8_sub (char *path1, char *path2, GFC_INTEGER_8 *status,
              gfc_charlen_type path1_len, gfc_charlen_type path2_len)
 {
-  int val;
-  char *str1, *str2;
-
-  /* Trim trailing spaces from paths.  */
-  while (path1_len > 0 && path1[path1_len - 1] == ' ')
-    path1_len--;
-  while (path2_len > 0 && path2[path2_len - 1] == ' ')
-    path2_len--;
-
-  /* Make a null terminated copy of the strings.  */
-  str1 = gfc_alloca (path1_len + 1);
-  memcpy (str1, path1, path1_len);
-  str1[path1_len] = '\0';
-
-  str2 = gfc_alloca (path2_len + 1);
-  memcpy (str2, path2, path2_len);
-  str2[path2_len] = '\0';
-
-  val = link (str1, str2);
+  int val = link_internal (path1, path2, path1_len, path2_len);
 
   if (status != NULL)
-    *status = (val == 0) ? 0 : errno;
+    *status = val;
 }
 iexport(link_i8_sub);
 
@@ -111,9 +96,7 @@ GFC_INTEGER_4
 link_i4 (char *path1, char *path2, gfc_charlen_type path1_len,
          gfc_charlen_type path2_len)
 {
-  GFC_INTEGER_4 val;
-  link_i4_sub (path1, path2, &val, path1_len, path2_len);
-  return val;
+  return link_internal (path1, path2, path1_len, path2_len);
 }
 
 extern GFC_INTEGER_8 link_i8 (char *, char *, gfc_charlen_type,
@@ -124,8 +107,6 @@ GFC_INTEGER_8
 link_i8 (char *path1, char *path2, gfc_charlen_type path1_len,
 	 gfc_charlen_type path2_len)
 {
-  GFC_INTEGER_8 val;
-  link_i8_sub (path1, path2, &val, path1_len, path2_len);
-  return val;
+  return link_internal (path1, path2, path1_len, path2_len);
 }
 #endif