From patchwork Thu Nov 29 18:18:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Semashev X-Patchwork-Id: 11234 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 7340D44D195 for ; Thu, 29 Nov 2018 20:18:23 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 21DC8689B96; Thu, 29 Nov 2018 20:18:24 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f196.google.com (mail-lj1-f196.google.com [209.85.208.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 95CFB6897BF for ; Thu, 29 Nov 2018 20:18:17 +0200 (EET) Received: by mail-lj1-f196.google.com with SMTP id v15-v6so2587953ljh.13 for ; Thu, 29 Nov 2018 10:18:23 -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 :mime-version:content-transfer-encoding; bh=xWmfZlPJydhkZ9+V39qfQKVMEkLxU2DIFEYXZccHKOs=; b=irqs4jLKyV9QkrrUMZBHzU10Sg9BfX8YtiUFoOhyeYE4gtI1zEjAfu/lskGeZ4MvdE hjzbXgHbWYbylqfVwl5FX/TW5Fm55EjNs9pf+PrMlHXvCZcsVRaaJ7H1F3AB/pYe3Qco GDqcCv0T+zOuQf4oIjThL6ZlxiHBMPRvLTEs4yrZg7E6V5KKMEje6tJz+QOBB4rC/vju 9folkwuHam8uzGzOEnHwGwN8jMpjb3vXOCPEnWLKs6SdgmhQT3lQkiWVjjEJHBGTWU+q xYrV1f7lsC98xCKphB9LNPVAIVTb1um01tCmDxjPTpplJwkRcxBqZrj90nOk9mEylqQw RUpA== 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:mime-version:content-transfer-encoding; bh=xWmfZlPJydhkZ9+V39qfQKVMEkLxU2DIFEYXZccHKOs=; b=KMqwy0Owr9GWr7rtfh335YHBE46uopkiLiGYE8dPETV6oCxqpX/Is7EPUiCwzwlFWN adBk/uIo8jkRLWIPkLmNOmhB94eVv/ainuU9K/QKNFYNrtl/nDt52z/l+rdApmkujUYv ZVAcsjn4ioiHRLBFPJyHqeF1OWsPrdodwwHuZUEL+h+vgDHyQkk51FUnH41RPq393tOA 2utSwtE/AvNIjdswiSFnCr7uRA7nuG2pDGIMXvgH5hyysgApGtO3Pda10hz7u+uV5Ozy 3JcgHhq3/XmVs6J73n/+Yz47rr0qVD6Re3az3/qJkodrAz2gtMOkJG4aCotqnGmU5WzD PdMA== X-Gm-Message-State: AA+aEWZUUFj8m2t+awe5wNoZO8yLobH7Twpstc9nEy/yW4K/kfJxjJYF z+iTAqUxYYLGUMusZKLyDoeYhOfD X-Google-Smtp-Source: AFSGD/WTtLnzsdFlH8Dy01w0FCKSpyKModWnHjcfAVItOdwW50VKih/oz7KrLBY1Apijf7Lswq7xCQ== X-Received: by 2002:a2e:8007:: with SMTP id j7-v6mr1867436ljg.22.1543515502674; Thu, 29 Nov 2018 10:18:22 -0800 (PST) Received: from localhost.localdomain (broadband-37-110-31-10.ip.moscow.rt.ru. [37.110.31.10]) by smtp.gmail.com with ESMTPSA id i75sm428010lfb.58.2018.11.29.10.18.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 29 Nov 2018 10:18:22 -0800 (PST) From: Andrey Semashev To: ffmpeg-devel@ffmpeg.org Date: Thu, 29 Nov 2018 21:18:18 +0300 Message-Id: <20181129181818.13295-2-andrey.semashev@gmail.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181129181818.13295-1-andrey.semashev@gmail.com> References: <20181129181818.13295-1-andrey.semashev@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] lavf/dashenc: Use avpriv_io_delete to delete files. 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: Andrey Semashev Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This fixes incorrect handling of file URIs (i.e. when the filename starts with "file:", possibly followed by URI authority). --- libavformat/dashenc.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c index 6ce70e0076..426dc91bcc 100644 --- a/libavformat/dashenc.c +++ b/libavformat/dashenc.c @@ -25,6 +25,7 @@ #include #endif +#include "libavutil/error.h" #include "libavutil/avassert.h" #include "libavutil/avutil.h" #include "libavutil/avstring.h" @@ -1326,8 +1327,13 @@ static void dashenc_delete_file(AVFormatContext *s, char *filename) { av_dict_free(&http_opts); ff_format_io_close(s, &out); - } else if (unlink(filename) < 0) { - av_log(s, AV_LOG_ERROR, "failed to delete %s: %s\n", filename, strerror(errno)); + } else { + int res = avpriv_io_delete(filename); + if (res < 0) { + char errbuf[AV_ERROR_MAX_STRING_SIZE]; + av_strerror(res, errbuf, sizeof(errbuf)); + av_log(s, (res == AVERROR(ENOENT) ? AV_LOG_WARNING : AV_LOG_ERROR), "failed to delete %s: %s\n", filename, errbuf); + } } }