argp facility from glibc-20030610.

[gnulib.git] / lib / same.c

diff --git a/lib/same.c b/lib/same.c
index 0e2807a..d41cccc 100644 (file)
--- 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
@@ -47,13 +47,6 @@ extern int errno;
 #include "error.h"
 #include "xalloc.h"
 
-#if ENABLE_NLS
-# include <libintl.h>
-# define _(Text) gettext (Text)
-#else
-# define _(Text) Text
-#endif
-
 #ifndef HAVE_DECL_FREE
 "this configure-time declaration test was not run"
 #endif
@@ -71,37 +64,41 @@ void free ();
 int
 same_name (const char *source, const char *dest)
 {
-  struct stat source_dir_stats;
-  struct stat dest_dir_stats;
-  char *source_dirname, *dest_dirname;
-  char *source_basename, *dest_basename;
-  size_t source_baselen, dest_baselen;
-
-  source_dirname = dir_name (source);
-  dest_dirname = dir_name (dest);
-
-  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);
-
-  if (! SAME_INODE (source_dir_stats, dest_dir_stats))
-    return 0;
-
-  source_basename = base_name (source);
-  dest_basename = base_name (dest);
-  source_baselen = base_len (source_basename);
-  dest_baselen = base_len (dest_basename);
-  return (source_baselen == dest_baselen
-         && memcmp (source_basename, dest_basename, dest_baselen) == 0);
+  return 0;
 }