From patchwork Sun Dec 1 14:00:42 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 16513 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 E35294474B2 for ; Sun, 1 Dec 2019 16:08:17 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C5A2868AF41; Sun, 1 Dec 2019 16:08:17 +0200 (EET) 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 66A2768AE14 for ; Sun, 1 Dec 2019 16:08:11 +0200 (EET) Received: by mail-pl1-f196.google.com with SMTP id bb5so15077110plb.4 for ; Sun, 01 Dec 2019 06:08:11 -0800 (PST) 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=66QLGuRfMHURifBV9PSXSzUvmYc+6A1Tjb0TNN+WErQ=; b=f2PBD/HHYbblZHSZEO5Wc3qXzR/1PFNIR4Y1ZictJ9wkUH+J0VLriHTzbxwoT7K6/G G/O5XcUZkAUSOIbDXBSywH6OZ3zqKZvbR1ul/LKmFaiFOlnvjx3o/C0L0TPm0ux4vuxO I/5+XQDqIIR1mzF8pbu9Zcn1P/ZFtr4CITksVCQjbHft7b1zn8BLxnPxZuDS/sWcHUB3 CJ/pgS4l9vcLuYda/dNuq2Rq93RSj/vbVCG5cnXp0x2Ea2BihTLAS9VfvpXen8WoSq3t zqte8gv7WkCMEH35I9Gx7Sr3v6qu1CU30qrQUfUB1x1stz2tLijy3WPZtXaTGMWlG8th o3NQ== 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=66QLGuRfMHURifBV9PSXSzUvmYc+6A1Tjb0TNN+WErQ=; b=bcZqoq/oC4zN0FdrbOwesk3YK9XQ3upFHxMPiAJMOCZW5fwZCgdwAZRewRPzGT5XGU DWUErd9OazzZXXj+W+FWm9T5XGsBvmQCTmM3WeUDZYAqo5vYDK2uMrckLrdJC5pcand/ Zeddi3OJ/qczSx1YCgMfdUkW3lLo/jYfc3lzrRjruDkYt42EUQbLClz2gEuVe49Q4pXl ITtTEQjefIP6GfzkjDi8aCte/O/99zFYEnAFoudp2RJ9z07EWOZqwxwGt6Go3gjUkncF QWHs/y1xmvn6IZPClAlilshuS8Qun/laZCBREdVJFVXpcJPleWthxPHRG9fY5GBoI5Pk YZ/w== X-Gm-Message-State: APjAAAXLQpdmYjhhhC0007/HI01WpKVeKMiMHl7Nre/O3s/avOOgClwg sJYyLkQwTePngvNNYF7c1GVNUG+A X-Google-Smtp-Source: APXvYqygaSozLUscoXVcXElwZU72j5COvXWXhM8gCO0S32AwwHMPpBOomxz+5EQv3neGbzfz5/6Shg== X-Received: by 2002:a17:90a:b301:: with SMTP id d1mr23508521pjr.20.1575208868016; Sun, 01 Dec 2019 06:01:08 -0800 (PST) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id d1sm6782901pfo.31.2019.12.01.06.01.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 01 Dec 2019 06:01:07 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Sun, 1 Dec 2019 22:00:42 +0800 Message-Id: <20191201140042.26305-2-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20191201140042.26305-1-lance.lmwang@gmail.com> References: <20191108153904.30142-1-lance.lmwang@gmail.com> <20191201140042.26305-1-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v2 2/2] avformat/utils: simplify the ff_mkdir_p with SEPARATOR 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 --- libavformat/utils.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/libavformat/utils.c b/libavformat/utils.c index 579e6d6..993e6d2 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -4843,12 +4843,17 @@ void av_url_split(char *proto, int proto_size, } } +#if HAVE_DOS_PATHS +#define SEPARATOR '\\' +#else +#define SEPARATOR '/' +#endif + int ff_mkdir_p(const char *path) { int ret = 0; char *temp = av_strdup(path); char *pos = temp; - char tmp_ch = '\0'; if (!path || !temp) { return -1; @@ -4856,19 +4861,18 @@ int ff_mkdir_p(const char *path) if (*temp == '.') pos++; - if (*temp == '/' || *temp == '\\') + if (*temp == SEPARATOR) pos++; for ( ; *pos != '\0'; ++pos) { - if (*pos == '/' || *pos == '\\') { - tmp_ch = *pos; + if (*pos == SEPARATOR) { *pos = '\0'; ret = mkdir(temp, 0755); - *pos = tmp_ch; + *pos = SEPARATOR; } } - if ((*(pos - 1) != '/') || (*(pos - 1) != '\\')) { + if (*(pos - 1) != SEPARATOR) { ret = mkdir(temp, 0755); }