From patchwork Thu Jul 13 10:55:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 42638 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6da1:b0:131:a7d0:bc6d with SMTP id gl33csp2822470pzb; Thu, 13 Jul 2023 03:58:28 -0700 (PDT) X-Google-Smtp-Source: APBJJlFWtp1CjH6W3e6GgQZDAO1o/z3HL9FFdiDQnAE85kuP0VyJIJKEebE+B7hRUtQGs3SFQo+w X-Received: by 2002:a17:907:2d23:b0:993:22a2:9234 with SMTP id gs35-20020a1709072d2300b0099322a29234mr7303576ejc.31.1689245908476; Thu, 13 Jul 2023 03:58:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689245908; cv=none; d=google.com; s=arc-20160816; b=VsGVf8CsHl4TJD55EfGVUY+K8FN1Sp8wLoONR5NAWeFiOPxY9SnNMFeco2QDMWwRWi cTYLQ6QdRdb8BiQwwRCLPynISV13ewn6kk4YQ1YKpB62bqoWZiOpzKMkLl+cPu1u6Hf6 o9SUzaAc8vIWH1ZvASO0YVxEtIv6uDx4QW9CaNt7mv4G4XOsOEXNMSSqw3gyoALqwIMe 490MhL3xzv7jVdB3kHGVHb/NHD0ld3y3Xz7W0WWeEV0lahAFJmDQrM3EgrLfH/kK4Jk1 gNkukJxc4jWG1sj6AFKJREGuuZJrOVXCZ3vpagPn5bNchRssvrYiLMuQ83ipjrQ4fiSq kgQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:delivered-to; bh=HVlYKzYF6GM7eVVN6uq4Vv/KMIUapfy8LMSnM8DJoOg=; fh=8ZF2QtiKOjBtyn9wuO2cMeZaLsE4aq02Bq77gGK61E8=; b=aWXX49EReskqQhLtZ3s7PBNKWOXKih0dqrgLHUXzhKCuAtzLTBfY4hhrU3bDpS9x09 2GifD0MYXcwtsDDzdBqOdvnYiKQFVvY1z/xjtd1lzTm5zmHFV19LH12jSbXQPf7wap5P d81TH3z4QraLN47Zt8vF/gblCK1o/+xN6y+NUOycymRHdLYdvtVzjKLKTVfbFs66f40n nnMqPmWbFxxB8nVfobpm0ea7xRrXOrpmkYIfLfJVb2nWgJRNyvQsnZVZCu9DLapJoOon H5zoTu3MxXwSTld+6hHcUyZGYzNYQCVt8KxXSu5+WBNNEg1CtXweZAxR8JXQyRfumLwn d6cg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id y2-20020a170906448200b00991df86ac0fsi6814010ejo.290.2023.07.13.03.58.28; Thu, 13 Jul 2023 03:58:28 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 44AAF68C691; Thu, 13 Jul 2023 13:57:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 76CEA68C32F for ; Thu, 13 Jul 2023 13:57:44 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 3D67E240591 for ; Thu, 13 Jul 2023 12:57:44 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id sg3kq2qKx5hH for ; Thu, 13 Jul 2023 12:57:43 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id 6D5ED2404F5 for ; Thu, 13 Jul 2023 12:57:41 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 36C253A128F for ; Thu, 13 Jul 2023 12:57:35 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Thu, 13 Jul 2023 12:55:26 +0200 Message-Id: <20230713105553.21052-6-anton@khirnov.net> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230713105553.21052-1-anton@khirnov.net> References: <20230713105553.21052-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 06/33] fftools/ffmpeg: return errors from assert_file_overwrite() instead of aborting X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: gHjpp2CENOoU --- fftools/ffmpeg.h | 2 +- fftools/ffmpeg_demux.c | 4 +++- fftools/ffmpeg_mux_init.c | 11 ++++++++--- fftools/ffmpeg_opt.c | 12 +++++++----- 4 files changed, 19 insertions(+), 10 deletions(-) diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index 3201163a4f..30020cd0f8 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -700,7 +700,7 @@ void show_usage(void); void remove_avoptions(AVDictionary **a, AVDictionary *b); void assert_avoptions(AVDictionary *m); -void assert_file_overwrite(const char *filename); +int assert_file_overwrite(const char *filename); char *file_read(const char *filename); AVDictionary *strip_specifiers(const AVDictionary *dict); const AVCodec *find_codec_or_die(void *logctx, const char *name, diff --git a/fftools/ffmpeg_demux.c b/fftools/ffmpeg_demux.c index ab99daf9f8..bc915178ec 100644 --- a/fftools/ffmpeg_demux.c +++ b/fftools/ffmpeg_demux.c @@ -1277,7 +1277,9 @@ static int dump_attachment(InputStream *ist, const char *filename) return AVERROR(EINVAL); } - assert_file_overwrite(filename); + ret = assert_file_overwrite(filename); + if (ret < 0) + return ret; if ((ret = avio_open2(&out, filename, AVIO_FLAG_WRITE, &int_cb, NULL)) < 0) { av_log(ist, AV_LOG_FATAL, "Could not open file %s for writing.\n", diff --git a/fftools/ffmpeg_mux_init.c b/fftools/ffmpeg_mux_init.c index 8a3e7b98cf..4d40ceda05 100644 --- a/fftools/ffmpeg_mux_init.c +++ b/fftools/ffmpeg_mux_init.c @@ -2442,7 +2442,9 @@ int of_open(const OptionsContext *o, const char *filename) if (!(oc->oformat->flags & AVFMT_NOFILE)) { /* test if it already exists to avoid losing precious files */ - assert_file_overwrite(filename); + err = assert_file_overwrite(filename); + if (err < 0) + return err; /* open the file */ if ((err = avio_open2(&oc->pb, filename, AVIO_FLAG_WRITE, @@ -2452,8 +2454,11 @@ int of_open(const OptionsContext *o, const char *filename) filename, av_err2str(err)); return err; } - } else if (strcmp(oc->oformat->name, "image2")==0 && !av_filename_number_test(filename)) - assert_file_overwrite(filename); + } else if (strcmp(oc->oformat->name, "image2")==0 && !av_filename_number_test(filename)) { + err = assert_file_overwrite(filename); + if (err < 0) + return err; + } if (o->mux_preload) { av_dict_set_int(&mux->opts, "preload", o->mux_preload*AV_TIME_BASE, 0); diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c index 7f22b22604..300f042660 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -652,13 +652,13 @@ const AVCodec *find_codec_or_die(void *logctx, const char *name, return codec; } -void assert_file_overwrite(const char *filename) +int assert_file_overwrite(const char *filename) { const char *proto_name = avio_find_protocol_name(filename); if (file_overwrite && no_file_overwrite) { fprintf(stderr, "Error, both -y and -n supplied. Exiting.\n"); - exit_program(1); + return AVERROR(EINVAL); } if (!file_overwrite) { @@ -670,13 +670,13 @@ void assert_file_overwrite(const char *filename) signal(SIGINT, SIG_DFL); if (!read_yesno()) { av_log(NULL, AV_LOG_FATAL, "Not overwriting - exiting\n"); - exit_program(1); + return AVERROR_EXIT; } term_init(); } else { av_log(NULL, AV_LOG_FATAL, "File '%s' already exists. Exiting.\n", filename); - exit_program(1); + return AVERROR_EXIT; } } } @@ -689,10 +689,12 @@ void assert_file_overwrite(const char *filename) if (!strcmp(filename, file->ctx->url)) { av_log(NULL, AV_LOG_FATAL, "Output %s same as Input #%d - exiting\n", filename, i); av_log(NULL, AV_LOG_WARNING, "FFmpeg cannot edit existing files in-place.\n"); - exit_program(1); + return AVERROR(EINVAL); } } } + + return 0; } /* read file contents into a string */