projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Copy --version support from gnulib-tool to posix-modules.
[gnulib.git]
/
lib
/
same.c
diff --git
a/lib/same.c
b/lib/same.c
index
f9e707d
..
af3a95e
100644
(file)
--- a/
lib/same.c
+++ b/
lib/same.c
@@
-1,12
+1,12
@@
/* 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, 2005 Free
+ Copyright (C) 1997, 1998, 1999, 2000, 2002, 2003, 2004, 2005
, 2006
Free
Software Foundation, Inc.
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
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
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
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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
/* written by Jim Meyering */
/* written by Jim Meyering */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
#include <stdbool.h>
#include <stdio.h>
#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
+39,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
+53,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 =