X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fsame.c;h=d41cccc46138da457f92b690d127f882791ebf0d;hb=46e647a11e9d46474f478faade784c8fee57d148;hp=cdf6452b23bc9caeead4ba04870d1aab8f760372;hpb=d9f6701eb53b2c5ded7ca2fdd14093c941a6a803;p=gnulib.git

diff --git a/lib/same.c b/lib/same.c
index cdf6452b2..d41cccc46 100644
--- a/lib/same.c
+++ b/lib/same.c
@@ -1,5 +1,5 @@
 /* Determine whether two file names refer to the same file.
-   Copyright (C) 1997-2000 Free Software Foundation, Inc.
+   Copyright (C) 1997-2000, 2002-2003 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
@@ -36,28 +36,24 @@
 extern int errno;
 #endif
 
-#include "same.h"
-#include "dirname.h"
-#include "error.h"
-
-#if ENABLE_NLS
-# include <libintl.h>
-# define _(Text) gettext (Text)
+#if HAVE_STRING_H
+# include <string.h>
 #else
-# define _(Text) Text
+# include <strings.h>
 #endif
 
-#define STREQ(a, b) (strcmp ((a), (b)) == 0)
+#include "same.h"
+#include "dirname.h"
+#include "error.h"
+#include "xalloc.h"
 
 #ifndef HAVE_DECL_FREE
-'this configure-time declaration test was not run'
+"this configure-time declaration test was not run"
 #endif
 #if !HAVE_DECL_FREE
 void free ();
 #endif
 
-char *base_name PARAMS ((char const *));
-
 #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)
@@ -68,30 +64,41 @@ char *base_name PARAMS ((char const *));
 int
 same_name (const char *source, const char *dest)
 {
-  struct stat source_dir_stats;
-  struct stat dest_dir_stats;
-  char *source_dirname, *dest_dirname;
-
-  source_dirname = dir_name (source);
-  dest_dirname = dir_name (dest);
-  if (source_dirname == NULL || dest_dirname == NULL)
-    error (1, 0, _("virtual memory exhausted"));
-
-  if (stat (source_dirname, &source_dir_stats))
+  /* Compare the basenames.  */
+  char const *source_basename = base_name (source);
+  char const *dest_basename = base_name (dest);
+  size_t source_baselen = base_len (source_basename);
+  size_t dest_baselen = base_len (dest_basename);
+
+  if (source_baselen == dest_baselen
+      && memcmp (source_basename, dest_basename, dest_baselen) == 0)
     {
-      /* Shouldn't happen.  */
-      error (1, errno, "%s", source_dirname);
+      struct stat source_dir_stats;
+      struct stat dest_dir_stats;
+      char *source_dirname, *dest_dirname;
+
+      /* Compare the parent directories (via the device and inode numbers).  */
+      source_dirname = dir_name (source);
+      dest_dirname = dir_name (dest);
+
+      if (stat (source_dirname, &source_dir_stats))
+	{
+	  /* 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);
+	}
+
+      free (source_dirname);
+      free (dest_dirname);
+
+      if (SAME_INODE (source_dir_stats, dest_dir_stats))
+	return 1;
     }
 
-  if (stat (dest_dirname, &dest_dir_stats))
-    {
-      /* Shouldn't happen.  */
-      error (1, errno, "%s", dest_dirname);
-    }
-
-  free (source_dirname);
-  free (dest_dirname);
-
-  return (SAME_INODE (source_dir_stats, dest_dir_stats)
-	  && STREQ (base_name (source), base_name (dest)));
+  return 0;
 }