From patchwork Fri Nov 30 09:03:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Semashev X-Patchwork-Id: 11237 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 DB8BD44CC4A for ; Fri, 30 Nov 2018 11:03:51 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8037D68A216; Fri, 30 Nov 2018 11:03:52 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f181.google.com (mail-lj1-f181.google.com [209.85.208.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BE21668980D for ; Fri, 30 Nov 2018 11:03:45 +0200 (EET) Received: by mail-lj1-f181.google.com with SMTP id u6-v6so4328663ljd.1 for ; Fri, 30 Nov 2018 01:03:52 -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:mime-version :content-transfer-encoding; bh=+9JEj6h8/VUC0ZWONLwDX7OLbxtl0ARwfvPm3SHNyFo=; b=iz5LM9R+noZnL+HTZZRtx+y0v734XUhCdKBTNr5neq8X3Re09vLwmNQwb27rX1gZEU OtjHM6RDQAxvKedw2hcqg7/3VIzyNZd4GdvktAI55j/xa8h4Uep7Sxof1ekDUHM+Ghf4 2LQGLNuXS7OpbYafb2Dv4s7FFevo0E/ABEE1pfRlB4MAVh4sSzqDAHVMHQ1cYF63L6cK R5ir87dxN/bpGqcvNGI9NraFmKr27Y4+YD5QjgIeuJCyc9KT3No6X1/hN9kWsOgZy9zw D134uejjfenBSRNbTMj17wr2bx/fpMX8MKnlsRzdRwsAOExlJqyXvvMdQc+kJsojIBh7 6lLw== 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:mime-version :content-transfer-encoding; bh=+9JEj6h8/VUC0ZWONLwDX7OLbxtl0ARwfvPm3SHNyFo=; b=gHUivAJE/Gf7jMxo28e9NRzOZW/ccz7iOmLZLB72uv7rFgYPjbFr6cqstA24kPGaLQ lRrM0mgt4EY0V8t/ZVzndvwOmjy1/hG52zaysyBUeF7eNuXG0dFfss+9raF3S59b3btA aU26K9ZYnIxpIvLxBFKToE9A+IFa+1PtYx5VXH342BxFFSSomPa2s4zlDgjavSd98F5j ByaYEMjoslIWd/WFzoTZXnM9BKne5nwXdS/lDOjoYWlTbS5+USi2x5oLAYzileHj6r7w UTxUQZu1FUXJ7rRGNAdC9rcmp/zjLK5rwWvPTB5DovTK9I0twWjRZEjgnSIX8GyofH4o 81nw== X-Gm-Message-State: AA+aEWbJgKgVDWNxBHawMIkcBJ6Us6is/ZBzCpPzTHZ7TBh5Ro9ntICS +Vu35HibLnZXzMfO7j3PWHIioz07 X-Google-Smtp-Source: AFSGD/UEyh2dpvLRy8PLSxqaaydO8b2VFmp3O6rnMBamuBgyW/+N8bedLhf0pBfy95DCVXTM6gYryQ== X-Received: by 2002:a2e:6a13:: with SMTP id f19-v6mr3589695ljc.41.1543568630894; Fri, 30 Nov 2018 01:03:50 -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 x204sm699639lfa.5.2018.11.30.01.03.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 30 Nov 2018 01:03:50 -0800 (PST) From: Andrey Semashev To: ffmpeg-devel@ffmpeg.org Date: Fri, 30 Nov 2018 12:03:45 +0300 Message-Id: <20181130090345.27615-1-andrey.semashev@gmail.com> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2] 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 pseudo-URIs (i.e. when the filename starts with "file:"). --- libavformat/dashenc.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c index 6ce70e0076..412d7c8a21 100644 --- a/libavformat/dashenc.c +++ b/libavformat/dashenc.c @@ -1326,8 +1326,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); + } } }