From patchwork Wed Oct 9 08:28:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 15596 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id C551C44AA64 for ; Wed, 9 Oct 2019 11:28:46 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B49B9688191; Wed, 9 Oct 2019 11:28:46 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f196.google.com (mail-pl1-f196.google.com [209.85.214.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E469A688154 for ; Wed, 9 Oct 2019 11:28:39 +0300 (EEST) Received: by mail-pl1-f196.google.com with SMTP id j11so704518plk.3 for ; Wed, 09 Oct 2019 01:28:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=PgnCebvMB+OdLm6dsUbRx9XSTKKGGAjDehQjhMAmn3E=; b=BdU8Js8fr1I062RPsSRsym1NI+k6eqlA6M2RfiBtoWZdZiDyIAcCVttL9rgJbFAiou fgMLTma3XfML9LQ8GCOgws0T/FdA34IjtoMg7vOeV9dIxp0mzPwZHQkEC6pt9wBqzQdV 8/OdNPFMsxTpK4Hoj5YMZ5xU11eJ2vGtgZgFjTJLJBBfXDLd23uDC19ZCFr+Ot6pMukf bf4mS8JETE8Vc7Mpjc/CxyV0DlkGe0/+FFc8Vv3EB537w1diE2Ca1OYsqHrlJaBrW8d3 oKJv/vZGLRDOhxrKm9GlRKLLp6I/l8RissXfPe4CTMVIFjB9Yzy1kPC738abezUBEeBM wJ4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=PgnCebvMB+OdLm6dsUbRx9XSTKKGGAjDehQjhMAmn3E=; b=UhNE9f1hsUdfcABF2FW15V6x3Yr3lz16GnuI/uVHSwS3cPLszogmlBdrZhP6+W9Fsq A4ElHiGDXw9bwQGx2jgPgYZIgH50LjyfcRupEdbuocKvfktgqQZlYnh4/jMuXndvENjV zpCRALzg6e2whmSdoMneTA//YjV+w4RbACs8CJBDwLGXz/3/Qo3xdkMRxbMwPUQy1X6c hLCfPjmevWl2VuCKIr0NlzUdo+Co46P1GxCV3Ekh/pgv3/sSqqcfgwR2cUNVaaZ0tj9l ANcVWGIh5uMB1jIHptV4+MAFN7eVbVHF7//KRXubZiufJwMRX2GnTsEtE2apOlnB9fPa Wd+Q== X-Gm-Message-State: APjAAAXoDZAZD4LPVbDHJO37pXr07g/YGBo6jt8Yf6FHkyRllKSsWVRO 5sjS+38l50CiP2Fz5DIC9q4CH0xQ X-Google-Smtp-Source: APXvYqyCqt5Xprk7kgEA0w+QoLp8umaGgSEiwwM3eM39V9tPc41lf8WnWpcx/QMDsrwOGnuzA7ZTBw== X-Received: by 2002:a17:902:5ac6:: with SMTP id g6mr1927432plm.113.1570609717885; Wed, 09 Oct 2019 01:28:37 -0700 (PDT) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id q76sm2977483pfc.86.2019.10.09.01.28.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 09 Oct 2019 01:28:37 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Wed, 9 Oct 2019 16:28:26 +0800 Message-Id: <20191009082826.31858-2-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20191009082826.31858-1-lance.lmwang@gmail.com> References: <20191009082826.31858-1-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v1 2/2] avutil/avstring: replace with system interface if dirname and basename functions are detected X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Signed-off-by: Limin Wang --- configure | 4 ++++ libavutil/avstring.c | 13 ++++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 8413826f9e..5296a4cc93 100755 --- a/configure +++ b/configure @@ -2188,6 +2188,8 @@ SYSTEM_FUNCS=" clock_gettime closesocket CommandLineToArgvW + dirname + basename fcntl getaddrinfo gethrtime @@ -5980,6 +5982,8 @@ check_func access check_func_headers stdlib.h arc4random check_lib clock_gettime time.h clock_gettime || check_lib clock_gettime time.h clock_gettime -lrt check_func fcntl +check_func_headers libgen.h dirname +check_func_headers libgen.h basename check_func fork check_func gethrtime check_func getopt diff --git a/libavutil/avstring.c b/libavutil/avstring.c index 76a13ba3b5..2c57a40a8d 100644 --- a/libavutil/avstring.c +++ b/libavutil/avstring.c @@ -19,12 +19,15 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" #include #include #include #include +#if defined(HAVE_DIRNAME) || defined(HAVE_BASENAME) +#include +#endif -#include "config.h" #include "common.h" #include "mem.h" #include "avassert.h" @@ -257,6 +260,9 @@ char *av_strireplace(const char *str, const char *from, const char *to) const char *av_basename(const char *path) { +#if HAVE_BASENAME + return basename((char*)path); +#else char *p; if (!path || *path == '\0') @@ -274,10 +280,14 @@ const char *av_basename(const char *path) return path; return p + 1; +#endif } const char *av_dirname(char *path) { +#if HAVE_DIRNAME + return dirname((char*)path); +#else char *p = path ? strrchr(path, '/') : NULL; #if HAVE_DOS_PATHS @@ -295,6 +305,7 @@ const char *av_dirname(char *path) *p = '\0'; return path; +#endif } char *av_append_path_component(const char *path, const char *component)