X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Ffilenamecat.c;h=ef46de209a5b4e039e7d5403e5590c1e76824a88;hb=17ef7533a2d2a52e7d12448a76ffb06efeb3f47b;hp=3baf183dd53c0356ee25eaded1d25c3c6bdaf0bb;hpb=de546cfa0da62fb1e5a43040a4a34da55021af9b;p=gnulib.git

diff --git a/lib/filenamecat.c b/lib/filenamecat.c
index 3baf183dd..ef46de209 100644
--- a/lib/filenamecat.c
+++ b/lib/filenamecat.c
@@ -2,10 +2,10 @@
 
    Copyright (C) 1996-2007 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -13,8 +13,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Written by Jim Meyering.  */
 
@@ -101,41 +100,3 @@ file_name_concat (char const *dir, char const *abase, char **base_in_result)
     xalloc_die ();
   return p;
 }
-
-#ifdef TEST_FILE_NAME_CONCAT
-# include <stdlib.h>
-# include <stdio.h>
-int
-main ()
-{
-  static char const *const tests[][3] =
-    {
-      {"a", "b",   "a/b"},
-      {"a/", "b",  "a/b"},
-      {"a/", "/b", "a/b"},
-      {"a", "/b",  "a/b"},
-
-      {"/", "b",  "/b"},
-      {"/", "/b", "/b"},
-      {"/", "/",  "/"},
-      {"a", "/",  "a/"},   /* this might deserve a diagnostic */
-      {"/a", "/", "/a/"},  /* this might deserve a diagnostic */
-      {"a", "//b",  "a/b"},
-      {"", "a", "a"},  /* this might deserve a diagnostic */
-    };
-  size_t i;
-  bool fail = false;
-  for (i = 0; i < sizeof tests / sizeof tests[0]; i++)
-    {
-      char *base_in_result;
-      char const *const *t = tests[i];
-      char *res = file_name_concat (t[0], t[1], &base_in_result);
-      if (strcmp (res, t[2]) != 0)
-	{
-	  printf ("got %s, expected %s\n", res, t[2]);
-	  fail = true;
-	}
-    }
-  exit (fail ? EXIT_FAILURE : EXIT_SUCCESS);
-}
-#endif