X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fsame.c;h=5457f2182f47ad193427e36861f647e823b635c6;hb=43593319b31e6b0175b8eec4433bac744959822d;hp=89ee47dd09c2f496ed8ca41587ce4f6f550ed843;hpb=359c0a71713e606f440d40f55a43c77349df2aaa;p=gnulib.git

diff --git a/lib/same.c b/lib/same.c
index 89ee47dd0..5457f2182 100644
--- a/lib/same.c
+++ b/lib/same.c
@@ -1,12 +1,11 @@
 /* Determine whether two file names refer to the same file.
 
-   Copyright (C) 1997, 1998, 1999, 2000, 2002, 2003, 2004, 2005 Free
-   Software Foundation, Inc.
+   Copyright (C) 1997-2000, 2002-2006, 2009-2013 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
@@ -14,20 +13,15 @@
    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 */
 
-#if HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <stdbool.h>
 #include <stdio.h>
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include <unistd.h>
 #include <stdlib.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -44,16 +38,12 @@
 #include "same.h"
 #include "dirname.h"
 #include "error.h"
-#include "xalloc.h"
+#include "same-inode.h"
 
 #ifndef MIN
 # define MIN(a, b) ((a) < (b) ? (a) : (b))
 #endif
 
-#define SAME_INODE(Stat_buf_1, Stat_buf_2) \
-  ((Stat_buf_1).st_ino == (Stat_buf_2).st_ino \
-   && (Stat_buf_1).st_dev == (Stat_buf_2).st_dev)
-
 /* Return nonzero if SOURCE and DEST point to the same name in the same
    directory.  */
 
@@ -61,8 +51,8 @@ bool
 same_name (const char *source, const char *dest)
 {
   /* Compare the basenames.  */
-  char const *source_basename = base_name (source);
-  char const *dest_basename = base_name (dest);
+  char const *source_basename = last_component (source);
+  char const *dest_basename = last_component (dest);
   size_t source_baselen = base_len (source_basename);
   size_t dest_baselen = base_len (dest_basename);
   bool identical_basenames =
@@ -93,36 +83,36 @@ same_name (const char *source, const char *dest)
       dest_dirname = dir_name (dest);
 
       if (stat (source_dirname, &source_dir_stats))
-	{
-	  /* Shouldn't happen.  */
-	  error (1, errno, "%s", source_dirname);
-	}
+        {
+          /* Shouldn't happen.  */
+          error (1, errno, "%s", source_dirname);
+        }
 
       if (stat (dest_dirname, &dest_dir_stats))
-	{
-	  /* Shouldn't happen.  */
-	  error (1, errno, "%s", dest_dirname);
-	}
+        {
+          /* Shouldn't happen.  */
+          error (1, errno, "%s", dest_dirname);
+        }
 
       same = SAME_INODE (source_dir_stats, dest_dir_stats);
 
 #if ! _POSIX_NO_TRUNC && HAVE_PATHCONF && defined _PC_NAME_MAX
       if (same && ! identical_basenames)
-	{
-	  long name_max = (errno = 0, pathconf (dest_dirname, _PC_NAME_MAX));
-	  if (name_max < 0)
-	    {
-	      if (errno)
-		{
-		  /* Shouldn't happen.  */
-		  error (1, errno, "%s", dest_dirname);
-		}
-	      same = false;
-	    }
-	  else
-	    same = (name_max <= min_baselen
-		    && memcmp (source_basename, dest_basename, name_max) == 0);
-	}
+        {
+          long name_max = (errno = 0, pathconf (dest_dirname, _PC_NAME_MAX));
+          if (name_max < 0)
+            {
+              if (errno)
+                {
+                  /* Shouldn't happen.  */
+                  error (1, errno, "%s", dest_dirname);
+                }
+              same = false;
+            }
+          else
+            same = (name_max <= min_baselen
+                    && memcmp (source_basename, dest_basename, name_max) == 0);
+        }
 #endif
 
       free (source_dirname);