From: Jim Meyering <jim@meyering.net>
Date: Sun, 26 Mar 2006 12:06:45 +0000 (+0000)
Subject: (target_directory_operand, install_file_in_dir): Use new last_component, in place... 
X-Git-Tag: v6.0~564
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9c3afb4a64da15ccbd24ad76bb29469428eb37d2;p=thirdparty%2Fcoreutils.git

(target_directory_operand, install_file_in_dir): Use new last_component, in place of base_name.
---

diff --git a/src/install.c b/src/install.c
index a5ada14796..2f4e66ef48 100644
--- a/src/install.c
+++ b/src/install.c
@@ -167,7 +167,7 @@ cp_option_init (struct cp_options *x)
 static bool
 target_directory_operand (char const *file)
 {
-  char const *b = base_name (file);
+  char const *b = last_component (file);
   size_t blen = strlen (b);
   bool looks_like_a_dir = (blen == 0 || ISSLASH (b[blen - 1]));
   struct stat st;
@@ -463,7 +463,7 @@ static bool
 install_file_in_dir (const char *from, const char *to_dir,
 		     const struct cp_options *x)
 {
-  const char *from_base = base_name (from);
+  const char *from_base = last_component (from);
   char *to = file_name_concat (to_dir, from_base, NULL);
   bool ret = install_file_in_file (from, to, x);
   free (to);