From patchwork Wed Oct 23 15:55:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 15922 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 F139B4481F2 for ; Wed, 23 Oct 2019 18:55:38 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DCE3568AFEE; Wed, 23 Oct 2019 18:55:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f194.google.com (mail-pl1-f194.google.com [209.85.214.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BCACC68AF79 for ; Wed, 23 Oct 2019 18:55:29 +0300 (EEST) Received: by mail-pl1-f194.google.com with SMTP id w8so10285859plq.5 for ; Wed, 23 Oct 2019 08:55:29 -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=qkZCSABdJS2NL0TOKxApkwrLYuROANu8QQREdLSuTk4=; b=qBoNmf8BTAYvo3DlTXjphz1+UyPvIAyB0misC6lMLuovGzQoIUL9DmYFcm9ggPym81 FncWxT28wAtubT6F8eJ4+qJdMxn5YoHofCjjWWqWaxhdPMhp89C1uIYsJuqIMqHNS937 PKMoB8ORpTr9dd1yolgx6BFf6Hyxs+IEHH3I7lXv6C0mQxswSJYhl4GQ6GAsui5XPqEG sKoGR2D8omKKWRGWkiAcQtK7CE1CECBUSBrSoit+8LBHOeMc9IWQFZ5sXerFgkaEV6Lq /H5anjlUrohiX8/H2H4qjsOr/g6EWMYEd/sSO0MJnNTCTaeQoUYbNXhRhZaDgAorp5Fe YDeA== 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=qkZCSABdJS2NL0TOKxApkwrLYuROANu8QQREdLSuTk4=; b=Jaq7b0anwZ5NKJMZCun+n1w+kcLW7UGrM7nZdMX/kKI/tTqrjRJcQZd8T8yoqyLHhs eq0nOwGDxxHuXwt9L7aaNlSbs+bVk8J4akIVQpcYql1WqQFdLQNI3nxkmwZxqEyLAwMZ wUWlE8zDG04wZpo6jke3f7yqjArnfzGCrnMhBN8jeUDa7TaF+IJ00cvIHkng/dewKQeO amJFUSarpcs2csGjfgQ8VaUxYkCm4WiqjOVjfPNT1pjz54NaUqiUffBFSYB1V8hOaPnK 7wpCgU3nKqqbP6g9BBoQZGz7EPeMEsr50wAKYowBY8K7oDVCglAGfh9Zxd06APgJro0w dSkA== X-Gm-Message-State: APjAAAVYD2wakAxCZSby8WhdIvqG/jh5oQs1xhxJXz4DBYE7Q7ba2cSK z5Bw6qUO1UbkoK7eY05iEeW1lizILH0= X-Google-Smtp-Source: APXvYqzerKOVduG2PzKbaK71QdtQPEX+PM/ADivDSv3kULLpL20jAhQABhFjRCvf8IwxavtavdFIEQ== X-Received: by 2002:a17:902:b48f:: with SMTP id y15mr8058045plr.143.1571846127802; Wed, 23 Oct 2019 08:55:27 -0700 (PDT) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id x139sm27225107pgx.92.2019.10.23.08.55.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 23 Oct 2019 08:55:27 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Wed, 23 Oct 2019 23:55:17 +0800 Message-Id: <20191023155517.335-3-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20191023155517.335-1-lance.lmwang@gmail.com> References: <20191009013707.31249-1-lance.lmwang@gmail.com> <20191023155517.335-1-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v3 3/3] 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 8413826..5296a4c 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 76a13ba..66654fb 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(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)