X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Ffilename.h;h=c961d3af317fe26a89509a776ede8df597c4a852;hb=53ed71f6a1cc4207b1972b73e4b5e1e830c8119d;hp=1914e9685a17f811305f8a26b3704dcf7e7d3042;hpb=291a9daea4cf8a1f4ab8cc9fa0628f7eac58f1c2;p=gnulib.git diff --git a/lib/filename.h b/lib/filename.h index 1914e9685..c961d3af3 100644 --- a/lib/filename.h +++ b/lib/filename.h @@ -1,5 +1,5 @@ /* Pathname support. - Copyright (C) 2001-2004 Free Software Foundation, Inc. + Copyright (C) 2001-2004, 2007 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 @@ -15,8 +15,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef _PATHNAME_H -#define _PATHNAME_H +#ifndef _FILENAME_H +#define _FILENAME_H #ifdef __cplusplus extern "C" { @@ -47,13 +47,13 @@ extern "C" { # define FILE_SYSTEM_PREFIX_LEN(P) 0 #endif -/* Concatenate a directory pathname, a relative pathname and an optional - suffix. Return a freshly allocated pathname. */ -extern char *concatenated_pathname (const char *directory, +/* Concatenate a directory filename, a relative filename and an optional + suffix. Return a freshly allocated filename. */ +extern char *concatenated_filename (const char *directory, const char *filename, const char *suffix); #ifdef __cplusplus } #endif -#endif /* _PATHNAME_H */ +#endif /* _FILENAME_H */