projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
SCNX* macros don't exist.
[gnulib.git]
/
lib
/
same.c
diff --git
a/lib/same.c
b/lib/same.c
index
f018c62
..
e267ba4
100644
(file)
--- a/
lib/same.c
+++ b/
lib/same.c
@@
-1,6
+1,6
@@
/* Determine whether two file names refer to the same file.
/* 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
Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
@@
-15,19
+15,17
@@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software Foundation,
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., 5
9 Temple Place - Suite 330, Boston, MA 02111-1307
, USA. */
+ Inc., 5
1 Franklin Street, Fifth Floor, Boston, MA 02110-1301
, USA. */
/* written by Jim Meyering */
/* written by Jim Meyering */
-#if HAVE_CONFIG_H
+#if
def
HAVE_CONFIG_H
# include <config.h>
#endif
#include <stdbool.h>
#include <stdio.h>
# include <config.h>
#endif
#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>
#include <stdlib.h>
#include <sys/types.h>
#include <sys/stat.h>
@@
-44,16
+42,13
@@
#include "same.h"
#include "dirname.h"
#include "error.h"
#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
#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. */
/* Return nonzero if SOURCE and DEST point to the same name in the same
directory. */
@@
-61,8
+56,8
@@
bool
same_name (const char *source, const char *dest)
{
/* Compare the basenames. */
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 =
size_t source_baselen = base_len (source_basename);
size_t dest_baselen = base_len (dest_basename);
bool identical_basenames =
@@
-72,7
+67,7
@@
same_name (const char *source, const char *dest)
bool same = false;
#if ! _POSIX_NO_TRUNC && HAVE_PATHCONF && defined _PC_NAME_MAX
bool same = false;
#if ! _POSIX_NO_TRUNC && HAVE_PATHCONF && defined _PC_NAME_MAX
- /* This implementation silently truncates
pathname component
s. If
+ /* This implementation silently truncates
components of file name
s. 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;
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;