As a first step, I'm splitting module 'filename' into 'filename' and
'concat-filename'.
Module 'filename' is later to be unified with parts of lib/dirname.h.
Module 'concat-filename' is meant as a simple mechanism for constructing
filenames.
Committed as follows:
2008-09-01 Bruno Haible <[EMAIL PROTECTED]>
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.
======================== modules/concat-filename ========================
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
========================= lib/concat-filename.h =========================
/* 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 <http://www.gnu.org/licenses/>. */
#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 */
=========================================================================
*** modules/filename.orig 2008-09-02 00:33:25.000000000 +0200
--- modules/filename 2008-09-02 00:24:33.000000000 +0200
***************
*** 1,25 ****
Description:
! Construct a full filename by concatenating a directory name, a relative
! filename, and a suffix.
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
Maintainer:
Bruno Haible
--- 1,20 ----
Description:
! Basic filename support macros.
Files:
lib/filename.h
Depends-on:
configure.ac:
Makefile.am:
Include:
"filename.h"
License:
! LGPLv2+
Maintainer:
Bruno Haible
*** lib/filename.h.orig 2008-09-02 00:33:25.000000000 +0200
--- lib/filename.h 2008-09-02 00:25:32.000000000 +0200
***************
*** 1,5 ****
! /* Pathname support.
! 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
--- 1,5 ----
! /* 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,55 ****
# 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
}
--- 46,51 ----
*** lib/concat-filename.c.orig 2008-09-02 00:33:25.000000000 +0200
--- lib/concat-filename.c 2008-09-02 00:27:24.000000000 +0200
***************
*** 1,5 ****
! /* Construct a full pathname from a directory and a filename.
! Copyright (C) 2001-2004, 2006-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 the
--- 1,5 ----
! /* 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,28 ****
#include <config.h>
/* Specification. */
! #include "filename.h"
#include <string.h>
#include "xalloc.h"
/* Concatenate a directory filename, a relative filename and an optional
--- 19,29 ----
#include <config.h>
/* Specification. */
! #include "concat-filename.h"
#include <string.h>
+ #include "filename.h"
#include "xalloc.h"
/* Concatenate a directory filename, a relative filename and an optional
*** NEWS.orig 2008-09-02 00:33:25.000000000 +0200
--- NEWS 2008-09-02 00:32:30.000000000 +0200
***************
*** 6,11 ****
--- 6,16 ----
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.
