From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=3.0 tests=AWL,BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE, SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dcvr.yhbt.net (Postfix) with ESMTPS id 725111F5AE for ; Sun, 5 Jul 2020 19:21:06 +0000 (UTC) Received: from localhost ([::1]:59112 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jsACH-0000uZ-5K for normalperson@yhbt.net; Sun, 05 Jul 2020 15:21:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36270) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jsACB-0000tc-0B for bug-gnulib@gnu.org; Sun, 05 Jul 2020 15:20:59 -0400 Received: from mo4-p00-ob.smtp.rzone.de ([85.215.255.24]:19499) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jsAC4-0001Zd-3V for bug-gnulib@gnu.org; Sun, 05 Jul 2020 15:20:58 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1593976849; s=strato-dkim-0002; d=clisp.org; h=Message-ID:Date:Subject:To:From:X-RZG-CLASS-ID:X-RZG-AUTH:From: Subject:Sender; bh=e9Jm1f1HlOs1ewMFdHpalME1hmnSEsMdEITcLpbyrXk=; b=FkpXRsm3LSJ7cBbHcSIAHVi3P0SRwyJiroeNmpnAScgkE2UB6Edb7LEC9tmAsXHYUD +WlvtArSKh6l8SGRrAxQCrjgY3SAfzhECHrzayxw46glnR0g/3D0KI30SiHWZBXyfD6f SIcpR4p98tO0hM2PZAd6gj3G8FldiccnMqD5mr7z+NJgD5tMSd2kMqf8UzfeSyIMLsMR mlrvFW5Saob8gHmcURqAvcILYiY7cSbWjMf1+OdJXVsis1lu34DEi5JD6SxhZP3j7fTP qXdZ0ADMnassAFJjAlSHmXTGpBA8Sq6zn0vP6xZuk0RgmJ8b2kTpujtCWeBIw9eYQrnH aXow== X-RZG-AUTH: ":Ln4Re0+Ic/6oZXR1YgKryK8brlshOcZlIWs+iCP5vnk6shH+AHjwLuWOH6fzxfs=" X-RZG-CLASS-ID: mo00 Received: from bruno.haible.de by smtp.strato.de (RZmta 46.10.5 DYNA|AUTH) with ESMTPSA id R03d1aw65JKl6Tj (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (curve X9_62_prime256v1 with 256 ECDH bits, eq. 3072 bits RSA)) (Client did not present a certificate); Sun, 5 Jul 2020 21:20:47 +0200 (CEST) From: Bruno Haible To: bug-gnulib@gnu.org Subject: new module 'basename-lgpl' Date: Sun, 05 Jul 2020 21:20:47 +0200 Message-ID: <20976927.cx7dKQx2XA@omega> User-Agent: KMail/5.1.3 (Linux/4.4.0-179-generic; KDE/5.18.0; x86_64; ; ) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="nextPart1636720.Ik5dDNEbkM" Content-Transfer-Encoding: 7Bit Received-SPF: none client-ip=85.215.255.24; envelope-from=bruno@clisp.org; helo=mo4-p00-ob.smtp.rzone.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/05 15:20:49 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_PASS=-0.001, SPF_NONE=0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: bug-gnulib@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Gnulib discussion list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnulib-bounces+normalperson=yhbt.net@gnu.org Sender: "bug-gnulib" This is a multi-part message in MIME format. --nextPart1636720.Ik5dDNEbkM Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" GNU gettext and a couple of gnulib modules need only half of the 'dirname-lgpl' module, namely essentially the 'basename' equivalent function (now called 'last_component'). In order to minimize dependencies, let me split this out into a separate module. So, 'dirname-lgpl' now depends on 'basename-lgpl'. Also, let me enhance the documentation of function 'last_component'. In particular, the documentation should state - what is the return value in case of a trailing slash, - why it is called 'last_component' and not 'basename', - what is the different w.r.t. glibc 'basename'. 2020-07-05 Bruno Haible mkancesdirs: Trim module dependencies. * lib/mkancesdirs.c: Include filename.h instead of dirname.h. * modules/mkancesdirs (Depends-on): Remove dirname-lgpl. Add filename. 2020-07-05 Bruno Haible getprogname: Trim module dependencies. * lib/getprogname.c: Include basename-lgpl.h instead of dirname.h. * modules/getprogname (Depends-on): Remove dirname-lgpl. Add basename-lgpl. 2020-07-05 Bruno Haible filenamecat-lgpl: Trim module dependencies. * lib/filenamecat-lgpl.c: Include basename-lgpl.h, filename.h instead of dirname.h. * modules/filenamecat-lgpl (Depends-on): Remove dirname-lgpl. Add basename-lgpl, filename. 2020-07-05 Bruno Haible backupfile, backup-rename: Trim module dependencies. * lib/backupfile.c: Include basename-lgpl.h instead of dirname.h. * modules/backupfile (Depends-on): Remove dirname-lgpl. Add basename-lgpl. * modules/backup-rename (Depends-on): Likewise. 2020-07-05 Bruno Haible argp: Trim module dependencies. * lib/argp-namefrob.h: Include basename-lgpl.h instead of dirname.h. * modules/argp (Depends-on): Remove dirname-lgpl. Add basename-lgpl. 2020-07-05 Bruno Haible basename-lgpl: New module. * lib/basename-lgpl.h: New file, based on lib/dirname.h and lib/basename-lgpl.c. * lib/basename-lgpl.c: Include basename-lgpl.h, not dirname.h. Include , filename.h. (last_component): Rename a local variable. * lib/dirname.h: Include basename-lgpl.h. (DOUBLE_SLASH_IS_DISTINCT_ROOT): Remove macro. (last_component, base_len): Remove declarations. * modules/basename-lgpl: New file. * modules/dirname-lgpl (Files): Remove lib/basename-lgpl.c. (Depends-on): Add basename-lgpl. Remove double-slash-root. (Makefile.am): Don't compile basename-lgpl.c. * doc/posix-functions/basename.texi: Mention the module 'basename-lgpl', not 'dirname'. 2020-07-05 Bruno Haible dirname, dirname-lgpl: Simplify. * m4/dirname.m4: Remove file. * modules/dirname (configure.ac): Don't invoke gl_DIRNAME. * modules/dirname-lgpl (Files): Remove m4/dirname.m4. (configure.ac): Don't invoke gl_DIRNAME_LGPL. --nextPart1636720.Ik5dDNEbkM Content-Disposition: attachment; filename="0001-dirname-dirname-lgpl-Simplify.patch" Content-Transfer-Encoding: 7Bit Content-Type: text/x-patch; charset="UTF-8"; name="0001-dirname-dirname-lgpl-Simplify.patch" >From dc4b3181b30ece859f68902610f2ce0c613e85d1 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 5 Jul 2020 18:05:31 +0200 Subject: [PATCH 1/7] dirname, dirname-lgpl: Simplify. * m4/dirname.m4: Remove file. * modules/dirname (configure.ac): Don't invoke gl_DIRNAME. * modules/dirname-lgpl (Files): Remove m4/dirname.m4. (configure.ac): Don't invoke gl_DIRNAME_LGPL. --- ChangeLog | 8 ++++++++ m4/dirname.m4 | 19 ------------------- modules/dirname | 1 - modules/dirname-lgpl | 2 -- 4 files changed, 8 insertions(+), 22 deletions(-) delete mode 100644 m4/dirname.m4 diff --git a/ChangeLog b/ChangeLog index 4a4b8bb..b2fe127 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2020-07-05 Bruno Haible + + dirname, dirname-lgpl: Simplify. + * m4/dirname.m4: Remove file. + * modules/dirname (configure.ac): Don't invoke gl_DIRNAME. + * modules/dirname-lgpl (Files): Remove m4/dirname.m4. + (configure.ac): Don't invoke gl_DIRNAME_LGPL. + 2020-07-05 Bernhard Voelker tests: avoid shadowing warning diff --git a/m4/dirname.m4 b/m4/dirname.m4 deleted file mode 100644 index 9995ff3..0000000 --- a/m4/dirname.m4 +++ /dev/null @@ -1,19 +0,0 @@ -#serial 10 -*- autoconf -*- -dnl Copyright (C) 2002-2006, 2009-2020 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -AC_DEFUN([gl_DIRNAME], -[ - AC_REQUIRE([gl_DIRNAME_LGPL]) -]) - -AC_DEFUN([gl_DIRNAME_LGPL], -[ - dnl Prerequisites of lib/dirname.h. - AC_REQUIRE([gl_DOUBLE_SLASH_ROOT]) - - dnl No prerequisites of lib/basename-lgpl.c, lib/dirname-lgpl.c, - dnl lib/stripslash.c. -]) diff --git a/modules/dirname b/modules/dirname index dce323a..e3ffbe0 100644 --- a/modules/dirname +++ b/modules/dirname @@ -12,7 +12,6 @@ xalloc xstrndup configure.ac: -gl_DIRNAME gl_MODULE_INDICATOR([dirname]) Makefile.am: diff --git a/modules/dirname-lgpl b/modules/dirname-lgpl index d6c3efd..b919102 100644 --- a/modules/dirname-lgpl +++ b/modules/dirname-lgpl @@ -6,7 +6,6 @@ lib/dirname.h lib/dirname-lgpl.c lib/basename-lgpl.c lib/stripslash.c -m4/dirname.m4 Depends-on: double-slash-root @@ -15,7 +14,6 @@ malloc-posix stdbool configure.ac: -gl_DIRNAME_LGPL Makefile.am: lib_SOURCES += dirname-lgpl.c basename-lgpl.c stripslash.c -- 2.7.4 --nextPart1636720.Ik5dDNEbkM Content-Disposition: attachment; filename="0002-basename-lgpl-New-module.patch" Content-Transfer-Encoding: 7Bit Content-Type: text/x-patch; charset="UTF-8"; name="0002-basename-lgpl-New-module.patch" >From b32e203eee9c9259996310b6bcf55a13b102348a Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 5 Jul 2020 18:06:13 +0200 Subject: [PATCH 2/7] basename-lgpl: New module. * lib/basename-lgpl.h: New file, based on lib/dirname.h and lib/basename-lgpl.c. * lib/basename-lgpl.c: Include basename-lgpl.h, not dirname.h. Include , filename.h. (last_component): Rename a local variable. * lib/dirname.h: Include basename-lgpl.h. (DOUBLE_SLASH_IS_DISTINCT_ROOT): Remove macro. (last_component, base_len): Remove declarations. * modules/basename-lgpl: New file. * modules/dirname-lgpl (Files): Remove lib/basename-lgpl.c. (Depends-on): Add basename-lgpl. Remove double-slash-root. (Makefile.am): Don't compile basename-lgpl.c. * doc/posix-functions/basename.texi: Mention the module 'basename-lgpl', not 'dirname'. --- ChangeLog | 18 +++++++++ doc/posix-functions/basename.texi | 4 +- lib/basename-lgpl.c | 20 ++++------ lib/basename-lgpl.h | 78 +++++++++++++++++++++++++++++++++++++++ lib/dirname.h | 7 +--- modules/basename-lgpl | 25 +++++++++++++ modules/dirname-lgpl | 5 +-- 7 files changed, 134 insertions(+), 23 deletions(-) create mode 100644 lib/basename-lgpl.h create mode 100644 modules/basename-lgpl diff --git a/ChangeLog b/ChangeLog index b2fe127..1396c94 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,23 @@ 2020-07-05 Bruno Haible + basename-lgpl: New module. + * lib/basename-lgpl.h: New file, based on lib/dirname.h and + lib/basename-lgpl.c. + * lib/basename-lgpl.c: Include basename-lgpl.h, not dirname.h. Include + , filename.h. + (last_component): Rename a local variable. + * lib/dirname.h: Include basename-lgpl.h. + (DOUBLE_SLASH_IS_DISTINCT_ROOT): Remove macro. + (last_component, base_len): Remove declarations. + * modules/basename-lgpl: New file. + * modules/dirname-lgpl (Files): Remove lib/basename-lgpl.c. + (Depends-on): Add basename-lgpl. Remove double-slash-root. + (Makefile.am): Don't compile basename-lgpl.c. + * doc/posix-functions/basename.texi: Mention the module 'basename-lgpl', + not 'dirname'. + +2020-07-05 Bruno Haible + dirname, dirname-lgpl: Simplify. * m4/dirname.m4: Remove file. * modules/dirname (configure.ac): Don't invoke gl_DIRNAME. diff --git a/doc/posix-functions/basename.texi b/doc/posix-functions/basename.texi index e75b510..ebc616e 100644 --- a/doc/posix-functions/basename.texi +++ b/doc/posix-functions/basename.texi @@ -23,5 +23,5 @@ version and the GNU version. names in Windows syntax. @end itemize -The Gnulib module @code{dirname} provides similar API, with function -@code{base_name}, that also works with Windows file names. +The Gnulib module @code{basename-lgpl} provides similar API, with a function +@code{last_component}, that also works with Windows file names. diff --git a/lib/basename-lgpl.c b/lib/basename-lgpl.c index 565469e..6bb28d4 100644 --- a/lib/basename-lgpl.c +++ b/lib/basename-lgpl.c @@ -18,20 +18,20 @@ #include -#include "dirname.h" +/* Specification. */ +#include "basename-lgpl.h" +#include #include -/* Return the address of the last file name component of NAME. If - NAME has no relative file name components because it is a file - system root, return the empty string. */ +#include "filename.h" char * last_component (char const *name) { char const *base = name + FILE_SYSTEM_PREFIX_LEN (name); char const *p; - bool saw_slash = false; + bool last_was_slash = false; while (ISSLASH (*base)) base++; @@ -39,21 +39,17 @@ last_component (char const *name) for (p = base; *p; p++) { if (ISSLASH (*p)) - saw_slash = true; - else if (saw_slash) + last_was_slash = true; + else if (last_was_slash) { base = p; - saw_slash = false; + last_was_slash = false; } } return (char *) base; } -/* Return the length of the basename NAME. Typically NAME is the - value returned by base_name or last_component. Act like strlen - (NAME), except omit all trailing slashes. */ - size_t base_len (char const *name) { diff --git a/lib/basename-lgpl.h b/lib/basename-lgpl.h new file mode 100644 index 0000000..203ec23 --- /dev/null +++ b/lib/basename-lgpl.h @@ -0,0 +1,78 @@ +/* Extract the last component (base name) of a file name. + + Copyright (C) 1998, 2001, 2003-2006, 2009-2020 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 _BASENAME_LGPL_H +#define _BASENAME_LGPL_H + +#include + +#ifndef DOUBLE_SLASH_IS_DISTINCT_ROOT +# define DOUBLE_SLASH_IS_DISTINCT_ROOT 0 +#endif + +#ifdef __cplusplus +extern "C" { +#endif + + +/* Return the address of the last file name component of FILENAME. + If FILENAME has some trailing slash(es), they are considered to be + part of the last component. + If FILENAME has no relative file name components because it is a file + system root, return the empty string. + Examples: + FILENAME RESULT + "foo.c" "foo.c" + "foo/bar.c" "bar.c" + "/foo/bar.c" "bar.c" + "foo/bar/" "bar/" + "foo/bar//" "bar//" + "/" "" + "//" "" + "" "" + The return value is a tail of the given FILENAME; do NOT free() it! */ + +/* This function was traditionally called 'basename', but we avoid this + function name because + * Various platforms have different functions in their libc. + In particular, the glibc basename(), defined in , does + not consider trailing slashes to be part of the component: + FILENAME RESULT + "foo/bar/" "" + "foo/bar//" "" + * The 'basename' command eliminates trailing slashes and for a root + produces a non-empty result: + FILENAME RESULT + "foo/bar/" "bar" + "foo/bar//" "bar" + "/" "/" + "//" "/" + */ +extern char *last_component (char const *filename) _GL_ATTRIBUTE_PURE; + +/* Return the length of the basename FILENAME. + Typically FILENAME is the value returned by base_name or last_component. + Act like strlen (FILENAME), except omit all trailing slashes. */ +extern size_t base_len (char const *filename) _GL_ATTRIBUTE_PURE; + + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif /* _BASENAME_LGPL_H */ diff --git a/lib/dirname.h b/lib/dirname.h index 5379e8e..b2a91fd 100644 --- a/lib/dirname.h +++ b/lib/dirname.h @@ -22,15 +22,12 @@ # include # include # include "filename.h" +# include "basename-lgpl.h" # ifndef DIRECTORY_SEPARATOR # define DIRECTORY_SEPARATOR '/' # endif -# ifndef DOUBLE_SLASH_IS_DISTINCT_ROOT -# define DOUBLE_SLASH_IS_DISTINCT_ROOT 0 -# endif - #ifdef __cplusplus extern "C" { #endif @@ -41,9 +38,7 @@ char *dir_name (char const *file); # endif char *mdir_name (char const *file); -size_t base_len (char const *file) _GL_ATTRIBUTE_PURE; size_t dir_len (char const *file) _GL_ATTRIBUTE_PURE; -char *last_component (char const *file) _GL_ATTRIBUTE_PURE; bool strip_trailing_slashes (char *file); diff --git a/modules/basename-lgpl b/modules/basename-lgpl new file mode 100644 index 0000000..f81898d --- /dev/null +++ b/modules/basename-lgpl @@ -0,0 +1,25 @@ +Description: +Extract the last component (base name) of a file name. + +Files: +lib/basename-lgpl.h +lib/basename-lgpl.c + +Depends-on: +double-slash-root +filename +stdbool + +configure.ac: + +Makefile.am: +lib_SOURCES += basename-lgpl.c + +Include: +"basename-lgpl.h" + +License: +LGPLv2+ + +Maintainer: +all diff --git a/modules/dirname-lgpl b/modules/dirname-lgpl index b919102..b758535 100644 --- a/modules/dirname-lgpl +++ b/modules/dirname-lgpl @@ -4,11 +4,10 @@ Extract specific portions of filenames. Files: lib/dirname.h lib/dirname-lgpl.c -lib/basename-lgpl.c lib/stripslash.c Depends-on: -double-slash-root +basename-lgpl filename malloc-posix stdbool @@ -16,7 +15,7 @@ stdbool configure.ac: Makefile.am: -lib_SOURCES += dirname-lgpl.c basename-lgpl.c stripslash.c +lib_SOURCES += dirname-lgpl.c stripslash.c Include: "dirname.h" -- 2.7.4 --nextPart1636720.Ik5dDNEbkM Content-Disposition: attachment; filename="0003-argp-Trim-module-dependencies.patch" Content-Transfer-Encoding: 7Bit Content-Type: text/x-patch; charset="UTF-8"; name="0003-argp-Trim-module-dependencies.patch" >From aa8369e4a2f1c27a68ff887160e75a23124096a8 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 5 Jul 2020 21:05:21 +0200 Subject: [PATCH 3/7] argp: Trim module dependencies. * lib/argp-namefrob.h: Include basename-lgpl.h instead of dirname.h. * modules/argp (Depends-on): Remove dirname-lgpl. Add basename-lgpl. --- ChangeLog | 6 ++++++ lib/argp-namefrob.h | 2 +- modules/argp | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1396c94..5b31707 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2020-07-05 Bruno Haible + argp: Trim module dependencies. + * lib/argp-namefrob.h: Include basename-lgpl.h instead of dirname.h. + * modules/argp (Depends-on): Remove dirname-lgpl. Add basename-lgpl. + +2020-07-05 Bruno Haible + basename-lgpl: New module. * lib/basename-lgpl.h: New file, based on lib/dirname.h and lib/basename-lgpl.c. diff --git a/lib/argp-namefrob.h b/lib/argp-namefrob.h index 022b880..50c62e9 100644 --- a/lib/argp-namefrob.h +++ b/lib/argp-namefrob.h @@ -146,7 +146,7 @@ #elif defined GNULIB_ARGP_EXTERN_BASENAME extern char *__argp_base_name (const char *arg); #else -# include "dirname.h" +# include "basename-lgpl.h" # define __argp_base_name last_component #endif diff --git a/modules/argp b/modules/argp index 125046a..50fde11 100644 --- a/modules/argp +++ b/modules/argp @@ -24,7 +24,7 @@ m4/argp.m4 Depends-on: alloca -dirname-lgpl +basename-lgpl extern-inline getopt-gnu strchrnul -- 2.7.4 --nextPart1636720.Ik5dDNEbkM Content-Disposition: attachment; filename="0004-backupfile-backup-rename-Trim-module-dependencies.patch" Content-Transfer-Encoding: 7Bit Content-Type: text/x-patch; charset="UTF-8"; name="0004-backupfile-backup-rename-Trim-module-dependencies.patch" >From 6d25d781953cdea433f88087d5b204a652ddbcc6 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 5 Jul 2020 21:07:46 +0200 Subject: [PATCH 4/7] backupfile, backup-rename: Trim module dependencies. * lib/backupfile.c: Include basename-lgpl.h instead of dirname.h. * modules/backupfile (Depends-on): Remove dirname-lgpl. Add basename-lgpl. * modules/backup-rename (Depends-on): Likewise. --- ChangeLog | 8 ++++++++ lib/backupfile.c | 2 +- modules/backup-rename | 2 +- modules/backupfile | 2 +- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5b31707..8e26586 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2020-07-05 Bruno Haible + backupfile, backup-rename: Trim module dependencies. + * lib/backupfile.c: Include basename-lgpl.h instead of dirname.h. + * modules/backupfile (Depends-on): Remove dirname-lgpl. Add + basename-lgpl. + * modules/backup-rename (Depends-on): Likewise. + +2020-07-05 Bruno Haible + argp: Trim module dependencies. * lib/argp-namefrob.h: Include basename-lgpl.h instead of dirname.h. * modules/argp (Depends-on): Remove dirname-lgpl. Add basename-lgpl. diff --git a/lib/backupfile.c b/lib/backupfile.c index 7edd9c3..2a88248 100644 --- a/lib/backupfile.c +++ b/lib/backupfile.c @@ -23,7 +23,7 @@ #include "backup-internal.h" #include "attribute.h" -#include "dirname.h" +#include "basename-lgpl.h" #include "opendirat.h" #include "renameatu.h" #include "xalloc-oversized.h" diff --git a/modules/backup-rename b/modules/backup-rename index 1e29b73..be12c90 100644 --- a/modules/backup-rename +++ b/modules/backup-rename @@ -11,10 +11,10 @@ m4/backupfile.m4 Depends-on: argmatch attribute +basename-lgpl closedir d-ino dirent-safer -dirname-lgpl fcntl memcmp opendirat diff --git a/modules/backupfile b/modules/backupfile index dc46d76..76f223a 100644 --- a/modules/backupfile +++ b/modules/backupfile @@ -11,10 +11,10 @@ m4/backupfile.m4 Depends-on: argmatch attribute +basename-lgpl closedir d-ino dirent-safer -dirname-lgpl fcntl memcmp opendirat -- 2.7.4 --nextPart1636720.Ik5dDNEbkM Content-Disposition: attachment; filename="0005-filenamecat-lgpl-Trim-module-dependencies.patch" Content-Transfer-Encoding: 7Bit Content-Type: text/x-patch; charset="UTF-8"; name="0005-filenamecat-lgpl-Trim-module-dependencies.patch" >From a58748b06ad1e46363a9f797310f58feb0b9c646 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 5 Jul 2020 21:10:11 +0200 Subject: [PATCH 5/7] filenamecat-lgpl: Trim module dependencies. * lib/filenamecat-lgpl.c: Include basename-lgpl.h, filename.h instead of dirname.h. * modules/filenamecat-lgpl (Depends-on): Remove dirname-lgpl. Add basename-lgpl, filename. --- ChangeLog | 8 ++++++++ lib/filenamecat-lgpl.c | 3 ++- modules/filenamecat-lgpl | 3 ++- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8e26586..3dd7a0b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2020-07-05 Bruno Haible + filenamecat-lgpl: Trim module dependencies. + * lib/filenamecat-lgpl.c: Include basename-lgpl.h, filename.h instead of + dirname.h. + * modules/filenamecat-lgpl (Depends-on): Remove dirname-lgpl. Add + basename-lgpl, filename. + +2020-07-05 Bruno Haible + backupfile, backup-rename: Trim module dependencies. * lib/backupfile.c: Include basename-lgpl.h instead of dirname.h. * modules/backupfile (Depends-on): Remove dirname-lgpl. Add diff --git a/lib/filenamecat-lgpl.c b/lib/filenamecat-lgpl.c index d97abfa..7e77d35 100644 --- a/lib/filenamecat-lgpl.c +++ b/lib/filenamecat-lgpl.c @@ -25,7 +25,8 @@ #include #include -#include "dirname.h" +#include "basename-lgpl.h" +#include "filename.h" #if ! HAVE_MEMPCPY && ! defined mempcpy # define mempcpy(D, S, N) ((void *) ((char *) memcpy (D, S, N) + (N))) diff --git a/modules/filenamecat-lgpl b/modules/filenamecat-lgpl index a6bf60b..ffb94ab 100644 --- a/modules/filenamecat-lgpl +++ b/modules/filenamecat-lgpl @@ -8,7 +8,8 @@ m4/filenamecat.m4 Depends-on: c99 -dirname-lgpl +basename-lgpl +filename malloc-posix configure.ac: -- 2.7.4 --nextPart1636720.Ik5dDNEbkM Content-Disposition: attachment; filename="0006-getprogname-Trim-module-dependencies.patch" Content-Transfer-Encoding: 7Bit Content-Type: text/x-patch; charset="UTF-8"; name="0006-getprogname-Trim-module-dependencies.patch" >From 75c37970d9f093ac97c8abd3e0f2e53178c0d08b Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 5 Jul 2020 21:12:33 +0200 Subject: [PATCH 6/7] getprogname: Trim module dependencies. * lib/getprogname.c: Include basename-lgpl.h instead of dirname.h. * modules/getprogname (Depends-on): Remove dirname-lgpl. Add basename-lgpl. --- ChangeLog | 7 +++++++ lib/getprogname.c | 2 +- modules/getprogname | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3dd7a0b..d263215 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2020-07-05 Bruno Haible + getprogname: Trim module dependencies. + * lib/getprogname.c: Include basename-lgpl.h instead of dirname.h. + * modules/getprogname (Depends-on): Remove dirname-lgpl. Add + basename-lgpl. + +2020-07-05 Bruno Haible + filenamecat-lgpl: Trim module dependencies. * lib/filenamecat-lgpl.c: Include basename-lgpl.h, filename.h instead of dirname.h. diff --git a/lib/getprogname.c b/lib/getprogname.c index 377e216..744466e 100644 --- a/lib/getprogname.c +++ b/lib/getprogname.c @@ -51,7 +51,7 @@ # include #endif -#include "dirname.h" +#include "basename-lgpl.h" #ifndef HAVE_GETPROGNAME /* not Mac OS X, FreeBSD, NetBSD, OpenBSD >= 5.4, Cygwin */ char const * diff --git a/modules/getprogname b/modules/getprogname index e8038d8..7cbad31 100644 --- a/modules/getprogname +++ b/modules/getprogname @@ -7,7 +7,7 @@ lib/getprogname.c m4/getprogname.m4 Depends-on: -dirname-lgpl +basename-lgpl extensions open -- 2.7.4 --nextPart1636720.Ik5dDNEbkM Content-Disposition: attachment; filename="0007-mkancesdirs-Trim-module-dependencies.patch" Content-Transfer-Encoding: 7Bit Content-Type: text/x-patch; charset="UTF-8"; name="0007-mkancesdirs-Trim-module-dependencies.patch" >From f7e0abdb75eb57bb21d4b1ca5bb775666e6361ad Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 5 Jul 2020 21:14:05 +0200 Subject: [PATCH 7/7] mkancesdirs: Trim module dependencies. * lib/mkancesdirs.c: Include filename.h instead of dirname.h. * modules/mkancesdirs (Depends-on): Remove dirname-lgpl. Add filename. --- ChangeLog | 6 ++++++ lib/mkancesdirs.c | 2 +- modules/mkancesdirs | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index d263215..4f2cab2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2020-07-05 Bruno Haible + mkancesdirs: Trim module dependencies. + * lib/mkancesdirs.c: Include filename.h instead of dirname.h. + * modules/mkancesdirs (Depends-on): Remove dirname-lgpl. Add filename. + +2020-07-05 Bruno Haible + getprogname: Trim module dependencies. * lib/getprogname.c: Include basename-lgpl.h instead of dirname.h. * modules/getprogname (Depends-on): Remove dirname-lgpl. Add diff --git a/lib/mkancesdirs.c b/lib/mkancesdirs.c index 14646f4..f638a6c 100644 --- a/lib/mkancesdirs.c +++ b/lib/mkancesdirs.c @@ -28,7 +28,7 @@ #include #include -#include "dirname.h" +#include "filename.h" #include "savewd.h" /* Ensure that the ancestor directories of FILE exist, using an diff --git a/modules/mkancesdirs b/modules/mkancesdirs index 7ae1a48..c4cb3db 100644 --- a/modules/mkancesdirs +++ b/modules/mkancesdirs @@ -7,8 +7,8 @@ lib/mkancesdirs.h m4/mkancesdirs.m4 Depends-on: -dirname-lgpl fcntl-h +filename savewd stat-macros sys_stat -- 2.7.4 --nextPart1636720.Ik5dDNEbkM--