From b3338b6328b7abb86cc2ba8882074ea22d195e98 Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Thu, 29 Oct 2009 12:00:03 -0600 Subject: [PATCH] filenamecat: split into filenamecat-lgpl The concept of filenamecat is simple enough to use in an LGPL manner, even though current clients are GPL for other reasons. At any rate, it is nice to separate mfile_name_concat into its own file so that the linker does not fail without xalloc_die. * modules/filenamecat-lgpl: New module. * modules/filenamecat (Files): Move library-safe files into filenamecat-lgpl. (Depends-on): Add filenamecat-lgpl. (configure.ac): Declare witness. * lib/filenamecat.h (file_name_concat): Only declare when using GPL module. * lib/filenamecat.c (longest_relative_suffix, mfile_name_concat): Move... * lib/filenamecat-lgpl.c: ...into new file. * m4/filenamecat.m4 (gl_FILE_NAME_CONCAT_LGPL): New macro. (gl_FILE_NAME_CONCAT): Use it. * MODULES.html.sh (File system functions): Mention new module. Signed-off-by: Eric Blake --- ChangeLog | 15 +++++++ MODULES.html.sh | 1 + lib/filenamecat-lgpl.c | 88 ++++++++++++++++++++++++++++++++++++++++ lib/filenamecat.c | 65 +---------------------------- lib/filenamecat.h | 5 ++- m4/filenamecat.m4 | 10 ++++- modules/filenamecat | 6 +-- modules/filenamecat-lgpl | 24 +++++++++++ 8 files changed, 145 insertions(+), 69 deletions(-) create mode 100644 lib/filenamecat-lgpl.c create mode 100644 modules/filenamecat-lgpl diff --git a/ChangeLog b/ChangeLog index 47c75be4c6..da7d77f621 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,20 @@ 2009-10-29 Eric Blake + filenamecat: split into filenamecat-lgpl + * modules/filenamecat-lgpl: New module. + * modules/filenamecat (Files): Move library-safe files into + filenamecat-lgpl. + (Depends-on): Add filenamecat-lgpl. + (configure.ac): Declare witness. + * lib/filenamecat.h (file_name_concat): Only declare when using + GPL module. + * lib/filenamecat.c (longest_relative_suffix, mfile_name_concat): + Move... + * lib/filenamecat-lgpl.c: ...into new file. + * m4/filenamecat.m4 (gl_FILE_NAME_CONCAT_LGPL): New macro. + (gl_FILE_NAME_CONCAT): Use it. + * MODULES.html.sh (File system functions): Mention new module. + argp: avoid memory leak * modules/argp (Depends-on): Use dirname-lgpl, not dirname. * lib/argp-namefrob.h (__argp_base_name): Use last_component, not diff --git a/MODULES.html.sh b/MODULES.html.sh index d8677e0ef9..290889075c 100755 --- a/MODULES.html.sh +++ b/MODULES.html.sh @@ -2471,6 +2471,7 @@ func_all_modules () func_module filemode func_module filename func_module filenamecat + func_module filenamecat-lgpl func_module fts func_module fts-lgpl func_module isdir diff --git a/lib/filenamecat-lgpl.c b/lib/filenamecat-lgpl.c new file mode 100644 index 0000000000..b22f0f7845 --- /dev/null +++ b/lib/filenamecat-lgpl.c @@ -0,0 +1,88 @@ +/* Concatenate two arbitrary file names. + + Copyright (C) 1996-2007, 2009 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 . */ + +/* Written by Jim Meyering. */ + +#include + +/* Specification. */ +#include "filenamecat.h" + +#include +#include + +#include "dirname.h" + +#if ! HAVE_MEMPCPY && ! defined mempcpy +# define mempcpy(D, S, N) ((void *) ((char *) memcpy (D, S, N) + (N))) +#endif + +/* Return the longest suffix of F that is a relative file name. + If it has no such suffix, return the empty string. */ + +static char const * +longest_relative_suffix (char const *f) +{ + for (f += FILE_SYSTEM_PREFIX_LEN (f); ISSLASH (*f); f++) + continue; + return f; +} + +/* Concatenate two file name components, DIR and ABASE, in + newly-allocated storage and return the result. + The resulting file name F is such that the commands "ls F" and "(cd + DIR; ls BASE)" refer to the same file, where BASE is ABASE with any + file system prefixes and leading separators removed. + Arrange for a directory separator if necessary between DIR and BASE + in the result, removing any redundant separators. + In any case, if BASE_IN_RESULT is non-NULL, set + *BASE_IN_RESULT to point to the copy of ABASE in the returned + concatenation. However, if ABASE begins with more than one slash, + set *BASE_IN_RESULT to point to the sole corresponding slash that + is copied into the result buffer. + + Return NULL if malloc fails. */ + +char * +mfile_name_concat (char const *dir, char const *abase, char **base_in_result) +{ + 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])); + + char const *base = longest_relative_suffix (abase); + size_t baselen = strlen (base); + + char *p_concat = malloc (dirlen + needs_separator + baselen + 1); + char *p; + + if (p_concat == NULL) + return NULL; + + p = mempcpy (p_concat, dir, dirlen); + *p = DIRECTORY_SEPARATOR; + p += needs_separator; + + if (base_in_result) + *base_in_result = p - IS_ABSOLUTE_FILE_NAME (abase); + + p = mempcpy (p, base, baselen); + *p = '\0'; + + return p_concat; +} diff --git a/lib/filenamecat.c b/lib/filenamecat.c index ef46de209a..eed4a2cd5f 100644 --- a/lib/filenamecat.c +++ b/lib/filenamecat.c @@ -1,6 +1,6 @@ /* Concatenate two arbitrary file names. - Copyright (C) 1996-2007 Free Software Foundation, Inc. + Copyright (C) 1996-2007, 2009 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 @@ -25,70 +25,9 @@ #include #include -#include "dirname.h" #include "xalloc.h" -#if ! HAVE_MEMPCPY && ! defined mempcpy -# define mempcpy(D, S, N) ((void *) ((char *) memcpy (D, S, N) + (N))) -#endif - -/* Return the longest suffix of F that is a relative file name. - If it has no such suffix, return the empty string. */ - -static char const * -longest_relative_suffix (char const *f) -{ - for (f += FILE_SYSTEM_PREFIX_LEN (f); ISSLASH (*f); f++) - continue; - return f; -} - -/* Concatenate two file name components, DIR and ABASE, in - newly-allocated storage and return the result. - The resulting file name F is such that the commands "ls F" and "(cd - DIR; ls BASE)" refer to the same file, where BASE is ABASE with any - file system prefixes and leading separators removed. - Arrange for a directory separator if necessary between DIR and BASE - in the result, removing any redundant separators. - In any case, if BASE_IN_RESULT is non-NULL, set - *BASE_IN_RESULT to point to the copy of ABASE in the returned - concatenation. However, if ABASE begins with more than one slash, - set *BASE_IN_RESULT to point to the sole corresponding slash that - is copied into the result buffer. - - Return NULL if malloc fails. */ - -char * -mfile_name_concat (char const *dir, char const *abase, char **base_in_result) -{ - 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])); - - char const *base = longest_relative_suffix (abase); - size_t baselen = strlen (base); - - char *p_concat = malloc (dirlen + needs_separator + baselen + 1); - char *p; - - if (p_concat == NULL) - return NULL; - - p = mempcpy (p_concat, dir, dirlen); - *p = DIRECTORY_SEPARATOR; - p += needs_separator; - - if (base_in_result) - *base_in_result = p - IS_ABSOLUTE_FILE_NAME (abase); - - p = mempcpy (p, base, baselen); - *p = '\0'; - - return p_concat; -} - -/* Just like mfile_name_concat, above, except, rather than +/* Just like mfile_name_concat (filenamecat-lgpl.c), except, rather than returning NULL upon malloc failure, here, we report the "memory exhausted" condition and exit. */ diff --git a/lib/filenamecat.h b/lib/filenamecat.h index 334c887c77..df5360b18b 100644 --- a/lib/filenamecat.h +++ b/lib/filenamecat.h @@ -1,6 +1,7 @@ /* Concatenate two arbitrary file names. - Copyright (C) 1996, 1997, 2003, 2005, 2007 Free Software Foundation, Inc. + Copyright (C) 1996, 1997, 2003, 2005, 2007, 2009 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 @@ -17,8 +18,10 @@ /* Written by Jim Meyering. */ +#if GNULIB_FILENAMECAT char *file_name_concat (char const *dir, char const *base, char **base_in_result); +#endif char *mfile_name_concat (char const *dir, char const *base, char **base_in_result); diff --git a/m4/filenamecat.m4 b/m4/filenamecat.m4 index 77a3b6afac..c32283ca90 100644 --- a/m4/filenamecat.m4 +++ b/m4/filenamecat.m4 @@ -1,4 +1,4 @@ -# filenamecat.m4 serial 9 +# filenamecat.m4 serial 10 dnl Copyright (C) 2002-2006, 2009 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -6,8 +6,14 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_FILE_NAME_CONCAT], [ + AC_REQUIRE([gl_FILE_NAME_CONCAT_LGPL]) AC_LIBOBJ([filenamecat]) +]) + +AC_DEFUN([gl_FILE_NAME_CONCAT_LGPL], +[ + AC_LIBOBJ([filenamecat-lgpl]) - dnl Prerequisites of lib/filenamecat.c. + dnl Prerequisites of lib/filenamecat-lgpl.c. AC_CHECK_FUNCS_ONCE([mempcpy]) ]) diff --git a/modules/filenamecat b/modules/filenamecat index 3008f3590b..df90c2fb5d 100644 --- a/modules/filenamecat +++ b/modules/filenamecat @@ -2,17 +2,17 @@ Description: Concatenate two arbitrary file names. Files: -lib/filenamecat.h lib/filenamecat.c -m4/dos.m4 m4/filenamecat.m4 Depends-on: -xalloc dirname-lgpl +filenamecat-lgpl +xalloc configure.ac: gl_FILE_NAME_CONCAT +gl_MODULE_INDICATOR([filenamecat]) Makefile.am: diff --git a/modules/filenamecat-lgpl b/modules/filenamecat-lgpl new file mode 100644 index 0000000000..a7449334d2 --- /dev/null +++ b/modules/filenamecat-lgpl @@ -0,0 +1,24 @@ +Description: +Concatenate two arbitrary file names. + +Files: +lib/filenamecat.h +lib/filenamecat-lgpl.c +m4/filenamecat.m4 + +Depends-on: +dirname-lgpl + +configure.ac: +gl_FILE_NAME_CONCAT_LGPL + +Makefile.am: + +Include: +"filenamecat.h" + +License: +GPL + +Maintainer: +Jim Meyering -- 2.30.2