* rename-dest-slash.c (has_trailing_slash): Use

FILE_SYSTEM_PREFIX_LEN, for non-POSIX systems.
(rpl_rename_dest_slash): Perform the cheaper trailing slash
test before testing whether SRC is a directory.
Suggestions from Bruno Haible.

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 8a113060569659ac71be4af1d0b45ca466bac815..fe690cd73594bbd09d47a22da871b26997ac5b14 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,5 +1,11 @@
 2006-09-15  Jim Meyering  <jim@meyering.net>
 
+       * rename-dest-slash.c (has_trailing_slash): Use
+       FILE_SYSTEM_PREFIX_LEN, for non-POSIX systems.
+       (rpl_rename_dest_slash): Perform the cheaper trailing slash
+       test before testing whether SRC is a directory.
+       Suggestions from Bruno Haible.
+
        Avoid a warning about an unused variable.
        * regex_internal.c (re_dfa_add_node): Move declaration of "type"
        into the #ifdef block where it's used.

diff --git a/lib/rename-dest-slash.c b/lib/rename-dest-slash.c
index 4e79de41a635647e263ec3833a72a299c88e5753..2c73f06d23b242f54f64ec089a4e7f455754e22a 100644 (file)
--- a/lib/rename-dest-slash.c
+++ b/lib/rename-dest-slash.c
@@ -42,7 +42,7 @@ static inline bool
 has_trailing_slash (char const *file, size_t len)
 {
   /* Don't count "/" as having a trailing slash.  */
-  if (len <= 1)
+  if (len <= FILE_SYSTEM_PREFIX_LEN (file) + 1)
     return false;
 
   char last = file[len - 1];
@@ -64,6 +64,11 @@ rpl_rename_dest_slash (char const *src, char const *dst)
   if (ret_val == 0 || errno != ENOENT)
     return ret_val;
 
+  /* Don't call rename again if there are no trailing slashes.  */
+  d_len = strlen (dst);
+  if ( ! has_trailing_slash (dst, d_len))
+    return ret_val;
+
   {
     /* Fail now, unless SRC is a directory.  */
     struct stat sb;
@@ -71,11 +76,6 @@ rpl_rename_dest_slash (char const *src, char const *dst)
       return ret_val;
   }
 
-  /* Don't call rename again if there are no trailing slashes.  */
-  d_len = strlen (dst);
-  if ( ! has_trailing_slash (dst, d_len))
-    return ret_val;
-
   {
     char *dst_temp;
     dst_temp = xmemdup (dst, d_len + 1);