From be6c2737cca8fa0f8e41e836e0cb843bc9138035 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Tue, 2 Sep 2008 00:36:28 +0200 Subject: [PATCH] Split module 'filename' into 'filename' and 'concat-filename'. --- ChangeLog | 11 +++++++++++ NEWS | 5 +++++ lib/concat-filename.c | 7 ++++--- lib/concat-filename.h | 35 +++++++++++++++++++++++++++++++++++ lib/filename.h | 8 ++------ modules/concat-filename | 27 +++++++++++++++++++++++++++ modules/filename | 9 ++------- 7 files changed, 86 insertions(+), 16 deletions(-) create mode 100644 lib/concat-filename.h create mode 100644 modules/concat-filename diff --git a/ChangeLog b/ChangeLog index f741e0afe..cf0e63812 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2008-09-01 Bruno Haible + + Split module 'filename' into 'filename' and 'concat-filename'. + * modules/filename: Keep only lib/filename.h. + (License): Change to LGPLv2+. + * modules/concat-filename: New file, extracted from modules/filename. + * lib/filename.h (concatenated_filename): Remove declaration. + * lib/concat-filename.h: New file, extracted from lib/filename.h. + * lib/concat-filename.c: Include concat-filename.h. + * NEWS: Mention the change. + 2008-09-01 Simon Josefsson * lib/bitrotate.h (rotl8, rotr8): Add. diff --git a/NEWS b/NEWS index ae550ba15..4a01c1f2a 100644 --- a/NEWS +++ b/NEWS @@ -6,6 +6,11 @@ User visible incompatible changes Date Modules Changes +2008-09-01 filename The module does not define the function + concatenated_filename any more. To get this + function, use module 'concat-filename' and the + include file "concat-filename.h". + 2008-08-31 havelib On Solaris, when searching for 64-bit mode libraries the directory $prefix/lib is now ignored. Instead the directory $prefix/lib/64 is searched. diff --git a/lib/concat-filename.c b/lib/concat-filename.c index 26c52f979..94532d074 100644 --- a/lib/concat-filename.c +++ b/lib/concat-filename.c @@ -1,5 +1,5 @@ -/* Construct a full pathname from a directory and a filename. - Copyright (C) 2001-2004, 2006-2007 Free Software Foundation, Inc. +/* Construct a full filename from a directory and a relative filename. + Copyright (C) 2001-2004, 2006-2008 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 the @@ -19,10 +19,11 @@ #include /* Specification. */ -#include "filename.h" +#include "concat-filename.h" #include +#include "filename.h" #include "xalloc.h" /* Concatenate a directory filename, a relative filename and an optional diff --git a/lib/concat-filename.h b/lib/concat-filename.h new file mode 100644 index 000000000..d7dafb0ec --- /dev/null +++ b/lib/concat-filename.h @@ -0,0 +1,35 @@ +/* Construct a full filename from a directory and a relative filename. + Copyright (C) 2001-2004, 2007-2008 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 + 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 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + 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, see . */ + +#ifndef _CONCAT_FILENAME_H +#define _CONCAT_FILENAME_H + +#ifdef __cplusplus +extern "C" { +#endif + + +/* 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 /* _CONCAT_FILENAME_H */ diff --git a/lib/filename.h b/lib/filename.h index 3bcf66ff9..439689e19 100644 --- a/lib/filename.h +++ b/lib/filename.h @@ -1,5 +1,5 @@ -/* Pathname support. - Copyright (C) 2001-2004, 2007 Free Software Foundation, Inc. +/* Basic filename support macros. + Copyright (C) 2001-2004, 2007-2008 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 @@ -46,10 +46,6 @@ extern "C" { # define FILE_SYSTEM_PREFIX_LEN(P) 0 #endif -/* 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 } diff --git a/modules/concat-filename b/modules/concat-filename new file mode 100644 index 000000000..4aade3897 --- /dev/null +++ b/modules/concat-filename @@ -0,0 +1,27 @@ +Description: +Construct a full filename by concatenating a directory name, a relative +filename, and a suffix. + +Files: +lib/concat-filename.h +lib/concat-filename.c + +Depends-on: +filename +xalloc +stpcpy + +configure.ac: + +Makefile.am: +lib_SOURCES += concat-filename.c + +Include: +"concat-filename.h" + +License: +GPL + +Maintainer: +Bruno Haible + diff --git a/modules/filename b/modules/filename index 169eb098a..0f7607fa2 100644 --- a/modules/filename +++ b/modules/filename @@ -1,25 +1,20 @@ Description: -Construct a full filename by concatenating a directory name, a relative -filename, and a suffix. +Basic filename support macros. Files: lib/filename.h -lib/concat-filename.c Depends-on: -xalloc -stpcpy configure.ac: Makefile.am: -lib_SOURCES += concat-filename.c Include: "filename.h" License: -GPL +LGPLv2+ Maintainer: Bruno Haible -- 2.11.0