From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 10753 invoked by alias); 4 May 2017 09:27:44 -0000 Mailing-List: contact elfutils-devel-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Post: List-Help: List-Subscribe: Sender: elfutils-devel-owner@sourceware.org Received: (qmail 10668 invoked by uid 89); 4 May 2017 09:27:42 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Checked: by ClamAV 0.99.2 on sourceware.org X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.6 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,RCVD_IN_DNSWL_NONE,SPF_HELO_PASS,SPF_PASS autolearn=ham version=3.3.2 spammy= X-Spam-Status: No, score=-25.6 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,RCVD_IN_DNSWL_NONE,SPF_HELO_PASS,SPF_PASS autolearn=ham version=3.3.2 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on sourceware.org X-Spam-Level: X-HELO: EUR01-DB5-obe.outbound.protection.outlook.com Received: from mail-db5eur01on0139.outbound.protection.outlook.com (HELO EUR01-DB5-obe.outbound.protection.outlook.com) (104.47.2.139) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 04 May 2017 09:27:40 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qtcompany.onmicrosoft.com; s=selector1-qt-io; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=SqPS8ZvKMkN5MtsnLg36R7Vz0Z0nlpi38ug5ZSap9nY=; b=HiHWTieB0afyT/0kS2IF0gxo+fHMjXhFnn4qfI6O6u2LZn3yXmQFOsC0XVT2eSlFNrP3iTWHn69qEMi3AY6XvpFRZ8vbvXl8BK/3R5LBsFAs4Z9hm7z/IaOIX6UyZI5cYyG1mp3fFTSCyhjaFtEX60EmPTODqfGh07NiKqCv/BA= Authentication-Results: sourceware.org; dkim=none (message not signed) header.d=none;sourceware.org; dmarc=none action=none header.from=qt.io; Received: from [10.9.78.56] (62.220.2.194) by DB4PR02MB237.eurprd02.prod.outlook.com (2a01:111:e400:289f::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1075.11; Thu, 4 May 2017 09:27:39 +0000 From: Ulf Hermann Subject: [PATCH] Check for existence of GNU-style basename() To: Message-ID: <4e14efa4-7eb7-0a5e-cf3c-36c18592cccf@qt.io> Date: Thu, 04 May 2017 09:50:00 -0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.8.0 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-Originating-IP: [62.220.2.194] X-ClientProxiedBy: HE1PR05CA0037.eurprd05.prod.outlook.com (2a01:111:e400:51f9::47) To DB4PR02MB237.eurprd02.prod.outlook.com (2a01:111:e400:289f::11) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d550a3c5-8725-4ad8-7941-08d492cfcf39 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(201703131423075)(201703031133081);SRVR:DB4PR02MB237; X-Microsoft-Exchange-Diagnostics: 1;DB4PR02MB237;3:Vw1CR1SZsrnOUlqODjCFu3xWbhkRnUB7R4WGGFQSSN1Ix/glZ9Ig0dv0VHrmtQpcJOpPcmEuI1MH4Zv7n9429ZRt+eWzI1ZP2Yr+QgE+5ySZBnO+C5Vzgy5NtqBbzzdEG6XuNWk3nIfD4I3uzPd478pegFddD9iTvBnB97uq60jl0n2oxr1Vg1RRBPeuk/YVpT+3WGiqfQnmMP8O5CTQiHCasPmpcZtdyKYSTTlmKUuFJtOCg93mi2Z8Ige1IxWqE3l0cTxrtcnPwFQy8Vv8WLVVOdp2P8hvEzg+VYKKTufgxluU8DRvyLAhbQ6RRQRVTfUVX30oHf6Bh0I5KrB22Q==;25:gYSH9Nago22r05lf4JMuve6pP7bJhzZ4XrrQkgU59IY5riYfPGKEg6xARSqzccWAXfJCgp0MfWKy9AfWxZSdKif6PUHBdQwMhA5cD085mdIQssOFDTAPASB0aJvR+qkRuu/zk9JXHW5NJ9URPtEDSXjM6gHSacuyjoaAp9A2eVBLmzYHIbYPhxSEvpqVwEYz/FRjhB+3Wy7kpw/c0HqX1nnZmwZNPFxNgBbfLMLgNmSKvaQ6v+ZX4dMHA8rvyJ72njmrlhQa86OmxknrSk3yqwIjHUL0GONJnJgQrfF9aCFR/Rvyap9bQTQ2B+CqD0qQMY7Je6A12MDQN/zVzkt2euVlRsOoNFghZczezsEFa6XS2Z++abvRrFVpfm9SqW6ba0Qkqkgqm6PM3HPiAu7dvsEeosKc2a+SaT+piqc5X9KbcAx8XnPHljple6rD0zpM6AdXkFN1PN5nrW7t/o4EU+W5XB+VVMSo4j5Y4P3KsmY= X-Microsoft-Exchange-Diagnostics: 1;DB4PR02MB237;31:iGRqr5sQ2m/QefxsjF+UNwdD6R+eajId8CLFjktKKUDRpAETd7sZjVqrqhLu27t4eRlyFe715hTqVZKNeJ5zDy5ATNihAafoZ/RE93TRDTqIkloGLZUexirBWDrgGJCFZwIXIMO4AKNRQeuOawW3qcT5e7UDi1ax2+9Snxpu9ewKokMKJCpJB3+zcz5/wKBLqMaLka04Kc6lFU6vASTc6QUxNpMKATo2u6+0ob4fHQ5D647X6/eRk4U+t8FTe6BmwUmmxXgoccm3O0vbsCkzewtUFgzXfkfMiOHsxAyXUXo=;20:dOXSq8C2kfYb6woWMNS4RQyXHdQLtxnA2Pb7SUFevggWoqq1Hy9PtpDRQ8l6AP5ZQ/c3k2uO6d7wxYfyTzzEQcSlozSnTDgsqTm3UhsF17viEGSzZYRqUeJY831PYCu5xsevSRuU7Fy54645N72lQwSMv+NUpZXcBJufqwdfAG2m/FTmSEwOPFgE7GwmT06rtPLMKCwpWDFqtzaAVQNFLNuJoaMpcJhRi6gUrs2mIqoIr2vAw+tgbr7K4Pm6BDOK X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(250305191791016)(22074186197030); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6040450)(601004)(2401047)(5005006)(8121501046)(10201501046)(3002001)(93006095)(93001095)(6041248)(20161123564025)(20161123560025)(20161123558100)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123562025)(20161123555025)(6072148);SRVR:DB4PR02MB237;BCL:0;PCL:0;RULEID:;SRVR:DB4PR02MB237; X-Microsoft-Exchange-Diagnostics: 1;DB4PR02MB237;4:Fg9fNge/iszsKPhutBcWL2cGNF+Zzm+1aI+YRR/1/a37y7zLpi8+UNQxK7c4G6uB0PLimDPTYg+NJCm4AyxixmSceC3xKAt4OAt2q8kXozJYuWYquQhUhMATfs3ianTm4R8oh9SSmCkFC2c8uXsH7JCzEcxhUs+eEgrFYgEYe9zFVMUkEikt1GdCKlKajUGclNFTOqHdmVdgOG38DSIJy02w2UTJyctQ4pA52+URwz52opLFbtxtA3Aelxhw9qV7Kb6Qt+fIUvBQ1szgt6LbVI7m9lAcqjEfzFFq07isxpIda1G4ccjwc8ZP3xxUkDj9Mmp8MzgJxWdBVuqQ+i/MCKcvWstO4EPOOpJELyGq6GkzCRv7oZs4EpCLyBn/fyNDLvxvU8cDdfSrYZZTht7sGGI++YI2DGkFlaO7e9H+qNtru653ZYsNesWHdvmWxCZ3LBdvRPOBz8dq6gspFasdZtEKKy72b5GYWSgWsaaqEbwCzrJ8QUsMLKthwlXxnfcwWpOmQfsmN/FXM/QW+mbYrkmNtrvOh87QDDZvJf1ViixLZecjfsIW+txJk1m0OyVe1h8bfSS4+RDgWBXXTYpNtAJfY3bGhPpLXygM1rMFK+8skVn14thqKOAgutHy14V5D/Ct2Wct/oxA5tVlwdAHMuFwof56qGU78jR6/aYM1lwgHZOgvTRV72RFF7ZHoNdivwifkmvzyN/pT7yndO0z5YPIK+LP0JL3J/a2KQZ6FJLUzESwIazeOWW34tAKJtE+V9NbwVgypEOc3BNZuS8AI0Lr6SkUyJLeJq6RKVMX7Aadc7OOgoiYWfpcvRUlbwOC0Wws02mSWyrMTuHf7w9V/XWWArzf+CO2RCvTlyXKgbQ= X-Forefront-PRVS: 02973C87BC X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(4630300001)(6049001)(6009001)(39400400002)(39840400002)(39450400003)(39410400002)(377424004)(66066001)(47776003)(110136004)(478600001)(38730400002)(33646002)(86362001)(31696002)(31686004)(2351001)(305945005)(7736002)(4001350100001)(53936002)(6306002)(5660300001)(189998001)(42186005)(6916009)(6666003)(54356999)(50986999)(6116002)(230700001)(3846002)(64126003)(81166006)(2906002)(74482002)(77096006)(23676002)(6486002)(25786009)(50466002)(8676002)(36756003)(83506001)(65826007);DIR:OUT;SFP:1102;SCL:1;SRVR:DB4PR02MB237;H:[10.9.78.56];FPR:;SPF:None;MLV:sfv;LANG:en; X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtEQjRQUjAyTUIyMzc7MjM6cGM5Mmp2bW1FdTRhczQyZFhraUFnTTAwaTRW?= =?utf-8?B?ekVtT1pNMjJMbWZnTE0yOTBrZkdjVHptdTF2Q1FuS0wvUDJ5MmgyMGFLNUdN?= =?utf-8?B?MGdiSmtLaHpVNnNiV3diMldjMmhYVy8yTkYwcGd5Sk1VVHJiVkFPV1hndTJM?= =?utf-8?B?eVlQSWc0SDJlYTV5VUx4eUpUdXduTTBRYTQrN0hhZUNOSG0yUSs1K2sxOU5S?= =?utf-8?B?ZkY1TVRuSTdzS2c4UTBpNWFuajhCc1dNR3grZ3NFaXJPaGhvcUs3eCtxaytQ?= =?utf-8?B?QktFWEt3NnQvek1KWXJVTDRUc3NhSkh0b2hQb1NuQUJtQTJsYWE0Z3FTamIx?= =?utf-8?B?QmYwN2hPQkVrdlNTTTBZQ1hvcVc0N0pzUWUyMGtPckpTS2lQLzJZcEJRdUdD?= =?utf-8?B?d0I1NVdVOTNxMEZtSEtPckc2VGRacTF4Y1NwZ1djRk44T2l3akFONklTZTRE?= =?utf-8?B?M1FDUElMdmFLNFZORkxxbmtmc1RlZGdkcGF1Zi8rdVNEaUtUZ2tvZUxBcnRh?= =?utf-8?B?OExGSFZ0d0cySmtuYWwvZHBSYVZPK3lQZVdPQ2RBMGJ3TFh6MWZjL3FLa3ZE?= =?utf-8?B?Uk55NTN6Tm9qS2pqNHZ2bjZudkZodlFEV0wwMXdrdVMvQ1ZzeTU1aWhFc0lJ?= =?utf-8?B?Uis4RVFJOThyVCt6NmhqUmx6VDF4M0UvM0k5ZHZvTFpOS0t5NTgyOEJrblRz?= =?utf-8?B?cjdjRUVTczBweVVQQmhSRjJlenJJRk9OUVdRcTVnUjQveTl0alZHQ0F6Q0ZX?= =?utf-8?B?NWhUUGVtbEhvYXlZa28zQjM5VUgxV01SOUZ0WnN1dWlSZFZVSGJDenUyYW9T?= =?utf-8?B?VmloVFd5S0V3Uk1FditKRFMrRzVhNXlTZWlzQkF6WUNBK2VydWp5WW5VSm5m?= =?utf-8?B?VkhqL2p3Y3dYK09jbXE3b0hONE93dTNmVzhvWkRaMHlSN2ZiSVZOd0hJKzZG?= =?utf-8?B?ZEo5MGgwNEJzaGtuV29SdVRGbzBhYURSeDFnNUZITDZuR0ZyNUZWRDZiVGhU?= =?utf-8?B?YzViTVNBNVZoVXIydm5vQlhZZHc5UmFrRk5QUEsrOGk2YzlqcjlWTnAwaXZj?= =?utf-8?B?dmdMbjNTWW9ISEVjNUU5SzJ6ZFo5QVlkRnlRVElwYTY4UEczQncrYzdwdlcz?= =?utf-8?B?S0tSUnlBVERJciswR3pFU08zZy9tOUFMYXpoYmsvQmNKeFQ3blVnNHNRZElY?= =?utf-8?B?TXkvWWJDdlJnTUJkbEtsaVVuZVYrZWJFbmhiWWZ6S1RRV3lodmhUZUxzYzc5?= =?utf-8?B?Ly9YL2IxNlNRSXl3R3kxa3NvYWxQN0RzSVlYMEZVQWJrMjE5c2hIWGc5d1gr?= =?utf-8?B?MHRGUENJaDEyNmxXaHVZUkQ2U0hrN3pJRmgvQTlBek9uU25rcXJuam9GRENM?= =?utf-8?B?Qk83MnYwM3l4RGVsaGQwS05QMlgwY2I0Z2U4UytOOVNwczFIRWZkekM2dkZj?= =?utf-8?B?aGFJeEEwRXFrOGxaeWdlM2pzVXZyK3NWa2NtSU1mOHlleHZIR3ArTDNrclNy?= =?utf-8?Q?IVxRxgkSR5IzeF0LzS8Jz4tv/u52WJIu6rOHLGA9LrZtc?= X-Microsoft-Exchange-Diagnostics: 1;DB4PR02MB237;6:fbmPKsqaY4JqojsBlu9MVnr0p4bH1rzPgPBsbEES0iDYO2gg75pDAxHP2lz3uh5hVXYIoja6OWWwx8a+Y5ezkTCRRty3OQQJNkxeGACWiNLBXWLJxnv+MsI/AyiybQNfd07LI7lfvmu/Zp2r4+1oBfnNjPnMroBYzHf13/f+U+F6GFxIw9l9SzbaYZKWubpAWmiiMYrR3erEoNj8q4mzIJexSXU2D4MUtEgLl3Wc+amDYvClN4lszBD7F9ye7Pki//WLfzmIM2mklafs6JN03J5nFYB9KxDTkB1Rj0ZFqzPycSapKnrNQ0qT/SLM00RrRgLkc8vmNyz5qjtrtD7nB1pwzZzFXeRW0dkKm5JY52ZYyS0aT6nS3N3xKuqvLexxUJy2/AZbt5xVJsiHf9a9ow5X6FqrBX+d0P6D9kvtKFIym6GpFexahWmDGD7ZwxxRw/BunDuIj7Op7zyUceFwiMXT78xzX6DRSKbqH4zxEeU5OkG6Xtyh9K5kj6E8RQIzauCwJMR5cP7okGKpYcAfBA==;5:KFoGMf1zrJcGUHKGGvjeFRYYtsCLxGfTtLMTu4N8Yy+fVQe3YVEEZzPDsgZiutcbBBl2WYUv1VQdkdfZs2o7bl79w7Ugpn4BzBdr8HRcemkIGRLT1jN4pK7LnF/Q38eKwb+KjJu2T+F4zUkyIBGS8w==;24:V48QJaaRzGBxVwpVE7jUDVrHXXWcof8J8WgwbZIvUJaM6BlmwO8AlAbtVjtiirLrwZ1qs/A5IbuHn9IK3GxpHZ2yV+xYU8/UE3wR472Sqfo= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;DB4PR02MB237;7:JiWIOwckx8MA6yj7x8iBWQa7iyHpuBKQoTK9xaO8Ybos+dzbeZ2hIKr0D3cIzozzd/VRFiuCQeD7+VAkZYEtYp/aKdZBJt9zRsXHI7NXyEfJw9otfSmIP0m5vLgsR8s+5053GcwFeVW0V5eWlGJdVQ+lYOIQ0f1Cvva9bvLZX2jWAn1LhkTcd5yvrpP87jI9HxOrkxvD9+vDNJ46/mtHzDUPdtB1wyw0eemc4sVasPh9fHQpoVmJx+t3TnlskNEkcy9u2qxgtv0GQVwnysBdqBPbcG/yg9E5wIQmMZyErDJDWcemARzU3Mr0Rybl71g9hFgAm0pV97nbv8Ozy6EKVA== X-OriginatorOrg: qt.io X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 May 2017 09:27:39.5649 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB4PR02MB237 X-IsSubscribed: yes X-SW-Source: 2017-q2/txt/msg00162.txt.bz2 If it doesn't exist, add an implementation to libgnu.a and config.h. Signed-off-by: Ulf Hermann --- ChangeLog | 4 ++++ configure.ac | 16 +++++++++++++++ libgnu/ChangeLog | 6 ++++++ libgnu/Makefile.am | 6 +++++- libgnu/basename-gnu.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 85 insertions(+), 1 deletion(-) create mode 100644 libgnu/ChangeLog create mode 100644 libgnu/basename-gnu.c diff --git a/ChangeLog b/ChangeLog index 29013e8..aa0759c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -36,6 +36,10 @@ * .gitignore: Add fillfile and peel_type tests. +2017-04-21 Ulf Hermann + + * configure.ac: Add check for GNU-style basename. + 2017-02-15 Ulf Hermann * configure.ac: Add check for mempcpy. diff --git a/configure.ac b/configure.ac index 0432bb1..bfdc53f 100644 --- a/configure.ac +++ b/configure.ac @@ -440,6 +440,22 @@ AC_SUBST([zip_LIBS]) AC_CHECK_DECLS([powerof2],[],[],[#include ]) +AC_CHECK_DECLS([basename],[],[], + [#define _GNU_SOURCE + #include ]) +AM_CONDITIONAL(HAVE_BASENAME, [test "x$ac_cv_have_decl_basename" = "xyes"]) + +if test "x$ac_cv_have_decl_basename" != "xyes"; then + AC_DEFINE([USE_REPLACEMENT_BASENAME], [1], [Use hand-rolled basename() replacement.]) +fi +AH_VERBATIM([USE_REPLACEMENT_BASENAME], + [/* Define basename() here if it is not available from a system header. */ +#undef USE_REPLACEMENT_BASENAME +#ifdef USE_REPLACEMENT_BASENAME +char *basename(const char *path); +#endif +]) + AC_CHECK_LIB([stdc++], [__cxa_demangle], [dnl AC_DEFINE([USE_DEMANGLE], [1], [Defined if demangling is enabled])]) AM_CONDITIONAL(DEMANGLE, test "x$ac_cv_lib_stdcpp___cxa_demangle" = "xyes") diff --git a/libgnu/ChangeLog b/libgnu/ChangeLog new file mode 100644 index 0000000..3394de6 --- /dev/null +++ b/libgnu/ChangeLog @@ -0,0 +1,6 @@ +2017-05-04 Ulf Hermann + + * Makefile.am: If GNU basename is unavailable add our own + implementation. + * basename-gnu.c: New file. + diff --git a/libgnu/Makefile.am b/libgnu/Makefile.am index 1c8e6b8..32c9aa7 100644 --- a/libgnu/Makefile.am +++ b/libgnu/Makefile.am @@ -36,7 +36,7 @@ MOSTLYCLEANFILES = MOSTLYCLEANDIRS = BUILT_SOURCES = EXTRA_DIST = endian.in.h byteswap.in.h sys_mman.win32.h mman_win32.c sysconf_win32.c ar.in.h features.in.h \ - stdio_ext.in.h fts.in.h + stdio_ext.in.h fts.in.h basename-gnu.c CLEANFILES = SUFFIXES = @@ -104,3 +104,7 @@ if USE_WIN32_SYSCONF libgnu_a_SOURCES += sysconf_win32.c endif endif + +if !HAVE_BASENAME +libgnu_a_SOURCES += basename-gnu.c +endif diff --git a/libgnu/basename-gnu.c b/libgnu/basename-gnu.c new file mode 100644 index 0000000..7feee81 --- /dev/null +++ b/libgnu/basename-gnu.c @@ -0,0 +1,54 @@ +/* Implementation of GNU-style basename() + Copyright (C) 2017 The Qt Company Ltd. + This file is part of elfutils. + + This file is free software; you can redistribute it and/or modify + it under the terms of either + + * the GNU Lesser General Public License as published by the Free + Software Foundation; either version 3 of the License, or (at + your option) any later version + + or + + * the GNU General Public License as published by the Free + Software Foundation; either version 2 of the License, or (at + your option) any later version + + or both in parallel, as here. + + elfutils 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 copies of the GNU General Public License and + the GNU Lesser General Public License along with this program. If + not, see . */ + +#ifdef HAVE_CONFIG_H +# include +#endif + +#include "dosname.h" +#include + +/* On windows, file names with ':' in them are invalid, so we don't have to + add a special case for them. If we get an invalid path as input, we may + return a nonsensical path as output. This assumption allows us to use the + simple strrpos() equivalent below, without any allocation. */ + +char * +basename (const char *name) +{ + size_t prefix = FILE_SYSTEM_PREFIX_LEN(name); + size_t length = strlen(name); + + while (length > prefix) { + --length; + if (ISSLASH(name[length])) + return (char *)name + length + 1; + } + + return (char *)name + prefix; +} -- 2.1.4