X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fsame.c;h=af3a95efb7db4d2a644ef4f71f66799f51526884;hb=d93391bffb3c76c651161b5b8c199c358bc6256a;hp=f018c62b6b33d7b8dd35c53b402e13a6977b92aa;hpb=f3b23269e922ab27aaa589ec79f24593338c421c;p=gnulib.git
diff --git a/lib/same.c b/lib/same.c
index f018c62b6..af3a95efb 100644
--- a/lib/same.c
+++ b/lib/same.c
@@ -1,12 +1,12 @@
/* Determine whether two file names refer to the same file.
- Copyright (C) 1997, 1998, 1999, 2000, 2002, 2003, 2004 Free
+ Copyright (C) 1997, 1998, 1999, 2000, 2002, 2003, 2004, 2005, 2006 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 +14,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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ along with this program. If not, see . */
/* written by Jim Meyering */
-#if HAVE_CONFIG_H
-# include
-#endif
+#include
#include
#include
-#ifdef HAVE_UNISTD_H
-# include
-#endif
+#include
#include
#include
#include
@@ -44,16 +39,13 @@
#include "same.h"
#include "dirname.h"
#include "error.h"
+#include "same-inode.h"
#include "xalloc.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 +53,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 =
@@ -72,7 +64,7 @@ same_name (const char *source, const char *dest)
bool same = false;
#if ! _POSIX_NO_TRUNC && HAVE_PATHCONF && defined _PC_NAME_MAX
- /* This implementation silently truncates pathname components. If
+ /* This implementation silently truncates components of file names. If
the base names might be truncated, check whether the truncated
base names are the same, while checking the directories. */
size_t slen_max = HAVE_LONG_FILE_NAMES ? 255 : _POSIX_NAME_MAX;