From 48e0ba6d23bdc0fcad1b620cb410bb0a57684edc Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Thu, 29 Oct 2009 10:43:31 -0600 Subject: dirname: split into dirname-lgpl dirname.h is proving quite useful from multiple LGPL modules, given the number of trailing slash bugs fixed in syscalls; only the calls to xalloc_die need to remain GPL. * modules/dirname-lgpl: New module. * modules/dirname (Files): Move library-safe files into dirname-lgpl. (Depends-on): Add dirname-lgpl. (configure.ac): Declare witness. * modules/double-slash-root (License): Relax license. * lib/dirname.h (base_name, dir_name): Only declare when using GPL module. * lib/dirname.c (dir_len, mdir_name): Move... * lib/dirname-lgpl.c: ...into new file. * lib/basename.c (last_component, base_len): Move... * lib/basename-lgpl.c: ...into new file. * m4/dirname.m4 (gl_DIRNAME_LGPL): New macro. (gl_DIRNAME): Use it. * MODULES.html.sh (Enhancements for POSIX:2008 functions): Mention new module. * modules/dirname-tests (Depends-on): Add progname. * tests/test-dirname.c (program_name): Delete. Signed-off-by: Eric Blake --- modules/dirname | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'modules/dirname') diff --git a/modules/dirname b/modules/dirname index 7c405c2855..888c8bad48 100644 --- a/modules/dirname +++ b/modules/dirname @@ -2,21 +2,18 @@ Description: Extract specific portions of filenames. Files: -lib/dirname.h lib/dirname.c lib/basename.c lib/stripslash.c -m4/dirname.m4 -m4/dos.m4 Depends-on: -double-slash-root -stdbool +dirname-lgpl xalloc xstrndup configure.ac: gl_DIRNAME +gl_MODULE_INDICATOR([dirname]) Makefile.am: @@ -27,4 +24,4 @@ License: GPL Maintainer: -Jim Meyering +Jim Meyering, Eric Blake -- cgit v1.2.1