6 files changed, 12 insertions, 12 deletions
diff --git a/gcc/fortran/module.cc b/gcc/fortran/module.cc
index 281b1b1..85aa153 100644
--- a/gcc/fortran/module.cc
+++ b/gcc/fortran/module.cc
@@ -1095,8 +1095,9 @@ gzopen_included_file_1 (const char *name, gfc_directorylist *list,
       if (module && !p->use_for_modules)
        continue;
 
-      fullname = (char *) alloca(strlen (p->path) + strlen (name) + 1);
+      fullname = (char *) alloca(strlen (p->path) + strlen (name) + 2);
       strcpy (fullname, p->path);
+      strcat (fullname, "/");
       strcat (fullname, name);
 
       f = gzopen (fullname, "r");
diff --git a/gcc/fortran/scanner.cc b/gcc/fortran/scanner.cc
index b52282b..2dff251 100644
--- a/gcc/fortran/scanner.cc
+++ b/gcc/fortran/scanner.cc
@@ -409,9 +409,7 @@ add_path_to_list (gfc_directorylist **list, const char *path,
     *list = dir;
   dir->use_for_modules = use_for_modules;
   dir->warn = warn;
-  dir->path = XCNEWVEC (char, strlen (p) + 2);
-  strcpy (dir->path, p);
-  strcat (dir->path, "/");	/* make '/' last character */
+  dir->path = xstrdup (p);
 }
 
 /* defer_warn is set to true while parsing the commandline.  */
@@ -476,8 +474,9 @@ open_included_file (const char *name, gfc_directorylist *list,
       if (module && !p->use_for_modules)
 	continue;
 
-      fullname = (char *) alloca(strlen (p->path) + strlen (name) + 1);
+      fullname = (char *) alloca(strlen (p->path) + strlen (name) + 2);
       strcpy (fullname, p->path);
+      strcat (fullname, "/");
       strcat (fullname, name);
 
       f = gfc_open_file (fullname);
diff --git a/gcc/testsuite/gfortran.dg/include_14.f90 b/gcc/testsuite/gfortran.dg/include_14.f90
index 8110e49..39acf69 100644
--- a/gcc/testsuite/gfortran.dg/include_14.f90
+++ b/gcc/testsuite/gfortran.dg/include_14.f90
@@ -1,6 +1,6 @@
 ! { dg-additional-options "-cpp -idirafter /fdaf/ -I bar -J foo/bar" }
 end
 ! default: warn for -I and -J but ignore other options.
-! { dg-warning "Nonexistent include directory 'bar/'" "" { target *-*-* } 0 }
-! { dg-warning "Nonexistent include directory 'foo/bar/'" "" { target *-*-* } 0 }
+! { dg-warning "Nonexistent include directory 'bar'" "" { target *-*-* } 0 }
+! { dg-warning "Nonexistent include directory 'foo/bar'" "" { target *-*-* } 0 }
 
diff --git a/gcc/testsuite/gfortran.dg/include_17.f90 b/gcc/testsuite/gfortran.dg/include_17.f90
index 0667759..f09b22f 100644
--- a/gcc/testsuite/gfortran.dg/include_17.f90
+++ b/gcc/testsuite/gfortran.dg/include_17.f90
@@ -1,6 +1,6 @@
 ! { dg-do compile }
 ! { dg-options "-I foo-bar -J foo/bar" }
 end 
-! { dg-warning "Nonexistent include directory 'foo-bar/'" "" { target *-*-* } 0 }
-! { dg-warning "Nonexistent include directory 'foo/bar/'" "" { target *-*-* } 0 }
+! { dg-warning "Nonexistent include directory 'foo-bar'" "" { target *-*-* } 0 }
+! { dg-warning "Nonexistent include directory 'foo/bar'" "" { target *-*-* } 0 }
 
diff --git a/gcc/testsuite/gfortran.dg/include_18.f90 b/gcc/testsuite/gfortran.dg/include_18.f90
index b74a585..7ca0e48 100644
--- a/gcc/testsuite/gfortran.dg/include_18.f90
+++ b/gcc/testsuite/gfortran.dg/include_18.f90
@@ -1,5 +1,5 @@
 ! { dg-do compile }
 ! { dg-options "-I nothere -J neither/here -Wmissing-include-dirs" }
 end 
-! { dg-warning "Nonexistent include directory 'nothere/'" "" { target *-*-* } 0 }
-! { dg-warning "Nonexistent include directory 'neither/here/'" "" { target *-*-* } 0 }
+! { dg-warning "Nonexistent include directory 'nothere'" "" { target *-*-* } 0 }
+! { dg-warning "Nonexistent include directory 'neither/here'" "" { target *-*-* } 0 }
diff --git a/gcc/testsuite/gfortran.dg/include_6.f90 b/gcc/testsuite/gfortran.dg/include_6.f90
index 3e3be1b..2cea473 100644
--- a/gcc/testsuite/gfortran.dg/include_6.f90
+++ b/gcc/testsuite/gfortran.dg/include_6.f90
@@ -1,6 +1,6 @@
 ! { dg-do compile }
 ! { dg-options "-I gfortran.log" }
-! { dg-warning "Include directory 'gfortran.log/': Not a directory" "" { target *-*-* } 0 }
+! { dg-error "'gfortran.log' is not a directory" "" { target *-*-* } 0 }
 ! { dg-prune-output "compilation terminated." }
 end