From: Jim Meyering <jim@meyering.net>
Date: Sun, 26 Mar 2006 12:16:11 +0000 (+0000)
Subject: (file_name_concat): s/base_name/last_component/
X-Git-Tag: v6.0~551
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cb916337dce4d713ab5946ab4825b3b159579455;p=thirdparty%2Fcoreutils.git

(file_name_concat): s/base_name/last_component/
---

diff --git a/lib/filenamecat.c b/lib/filenamecat.c
index f947346303..399d7db317 100644
--- a/lib/filenamecat.c
+++ b/lib/filenamecat.c
@@ -1,7 +1,7 @@
 /* Concatenate two arbitrary file names.
 
-   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free
-   Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+   2005, 2006 Free Software Foundation, Inc.
 
    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
@@ -64,7 +64,7 @@ longest_relative_suffix (char const *f)
 char *
 file_name_concat (char const *dir, char const *abase, char **base_in_result)
 {
-  char const *dirbase = base_name (dir);
+  char const *dirbase = last_component (dir);
   size_t dirbaselen = base_len (dirbase);
   size_t dirlen = dirbase - dir + dirbaselen;
   size_t needs_separator = (dirbaselen && ! ISSLASH (dirbase[dirbaselen - 1]));