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

diff --git a/lib/same.c b/lib/same.c
index af3a95efb..5457f2182 100644
--- a/lib/same.c
+++ b/lib/same.c
@@ -1,7 +1,6 @@
 /* Determine whether two file names refer to the same file.
 
-   Copyright (C) 1997, 1998, 1999, 2000, 2002, 2003, 2004, 2005, 2006 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
    it under the terms of the GNU General Public License as published by
@@ -40,7 +39,6 @@
 #include "dirname.h"
 #include "error.h"
 #include "same-inode.h"
-#include "xalloc.h"
 
 #ifndef MIN
 # define MIN(a, b) ((a) < (b) ? (a) : (b))
@@ -85,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);