diff options
author | Eric Blake <ebb9@byu.net> | 2009-10-29 10:43:31 -0600 |
---|---|---|
committer | Eric Blake <ebb9@byu.net> | 2009-10-29 18:39:33 -0600 |
commit | 48e0ba6d23bdc0fcad1b620cb410bb0a57684edc (patch) | |
tree | c5dc36d03176a8b66bf1c381ac1edf510318b7ab /modules | |
parent | 9c0937366b05d759689eed9525a1e18b669aacc6 (diff) | |
download | gnulib-48e0ba6d23bdc0fcad1b620cb410bb0a57684edc.tar.gz |
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 <ebb9@byu.net>
Diffstat (limited to 'modules')
-rw-r--r-- | modules/dirname | 9 | ||||
-rw-r--r-- | modules/dirname-lgpl | 29 | ||||
-rw-r--r-- | modules/dirname-tests | 1 | ||||
-rw-r--r-- | modules/double-slash-root | 2 |
4 files changed, 34 insertions, 7 deletions
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 diff --git a/modules/dirname-lgpl b/modules/dirname-lgpl new file mode 100644 index 0000000000..38f779abde --- /dev/null +++ b/modules/dirname-lgpl @@ -0,0 +1,29 @@ +Description: +Extract specific portions of filenames. + +Files: +lib/dirname.h +lib/dirname-lgpl.c +lib/basename-lgpl.c +lib/stripslash.c +m4/dirname.m4 +m4/dos.m4 + +Depends-on: +double-slash-root +malloc-posix +stdbool + +configure.ac: +gl_DIRNAME_LGPL + +Makefile.am: + +Include: +"dirname.h" + +License: +LGPLv2+ + +Maintainer: +Jim Meyering, Eric Blake diff --git a/modules/dirname-tests b/modules/dirname-tests index e2e86e658f..49eeb596dd 100644 --- a/modules/dirname-tests +++ b/modules/dirname-tests @@ -2,6 +2,7 @@ Files: tests/test-dirname.c Depends-on: +progname strdup configure.ac: diff --git a/modules/double-slash-root b/modules/double-slash-root index 6b809d067c..af78f2681c 100644 --- a/modules/double-slash-root +++ b/modules/double-slash-root @@ -14,7 +14,7 @@ Makefile.am: Include: License: -LGPL +LGPLv2+ Maintainer: Eric Blake, Paul Eggert, Jim Meyering |