projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
2007-02-05 Paolo Bonzini <bonzini@gnu.org>
[gnulib.git]
/
lib
/
filenamecat.c
diff --git
a/lib/filenamecat.c
b/lib/filenamecat.c
index
f947346
..
bccffb2
100644
(file)
--- a/
lib/filenamecat.c
+++ b/
lib/filenamecat.c
@@
-1,7
+1,7
@@
/* Concatenate two arbitrary file names.
/* Concatenate two arbitrary file names.
- Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
2005 Free
- Software Foundation, Inc.
+ Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+
2005, 2006 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
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
@@
-19,9
+19,7
@@
/* Written by Jim Meyering. */
/* Written by Jim Meyering. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
/* Specification. */
#include "filenamecat.h"
/* Specification. */
#include "filenamecat.h"
@@
-64,7
+62,7
@@
longest_relative_suffix (char const *f)
char *
file_name_concat (char const *dir, char const *abase, char **base_in_result)
{
char *
file_name_concat (char const *dir, char const *abase, char **base_in_result)
{
- char const *dirbase =
base_name
(dir);
+ char const *dirbase =
last_component
(dir);
size_t dirbaselen = base_len (dirbase);
size_t dirlen = dirbase - dir + dirbaselen;
size_t needs_separator = (dirbaselen && ! ISSLASH (dirbase[dirbaselen - 1]));
size_t dirbaselen = base_len (dirbase);
size_t dirlen = dirbase - dir + dirbaselen;
size_t needs_separator = (dirbaselen && ! ISSLASH (dirbase[dirbaselen - 1]));