From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 2524444C5C for ; Wed, 14 Dec 2022 17:11:01 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A0BDD68BC50; Wed, 14 Dec 2022 19:10:50 +0200 (EET) Received: from out162-62-57-210.mail.qq.com (out162-62-57-210.mail.qq.com [162.62.57.210]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9266D68AEB3 for ; Wed, 14 Dec 2022 19:10:42 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1671037840; bh=G1oIvDzRw7dd7ySna8tOvkLc3sxBEcVTAIG6B5GrZ2s=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=vvYTkD6XIeBW4MjxzxBEkBEkuX5tLqCjyF7gF+ExYO0Fk8s6IH8NlBcKSErf8mZUs bMVGnLBMTvwHUDtwUBSbIKUzNZbrp3i5nRuf4L9tBufOXbh5vmhHz6lr1RGaSG56Or g2kzn3jyEJq88Gycw/YehvTE/z3OHFguMDiQqj9g= Received: from localhost.localdomain ([113.116.29.217]) by newxmesmtplogicsvrsza12-0.qq.com (NewEsmtp) with SMTP id 2A515E8A; Thu, 15 Dec 2022 01:10:37 +0800 X-QQ-mid: xmsmtpt1671037839tvwvvv8mb Message-ID: X-QQ-XMAILINFO: MVKy59SpMLfU0uDBMWnOCueDarJ8VfKZb1LF6LaaXxihJcLldorioanH9YsWnn Fhdfj26WXS1eHMLllvG+/BdL9NFKLpUQ/RmnWRMPv5sq6JcSpX9pwz8xxiqr6gvSETskp8GKWA2a gFjx8IJI7vG1pOJg3nyhQWYv+3vyNKg7cJVLT6vIz3hltKa181HX/Ze1cZeKyY+Iw0sWUclI8x8c yy2n8tzZRe3ElCu2iYoN7O2GISuvLu/i4hYwXO7wJ3FuFqUHPKV1wNNzcN0MnmRdE1fjim4Op2p1 gSGinJ/K+ujOgOcpNMZEPbTi+++qA5JYKseCoycPf8GELv/t00OWmChgZAwuO35Ntadu9nBudA// se7y62grU0nR+om50VhdwoDMWAlsbCLfEqr9xEvIFk+i7H3myvoS9N58PyQ6De2nB80kPp9iVAlD ZHLDNjcE47/xR6NcrxNdSmRjx/y41ut5wUYgqU13EBvMBomZNfSZbOtTf05QJGdCAkgdDuQ5ECvs H+3e0JOVnwRaDRmV98ad5ZO8p3C4LPD9u6Edk1FB8kQkNLHz1Rd4XIoDwuJZNW2tiMiJ83IVx0oo TxUVI9juImIgXOgFyjnCZkV4TeT+CG1iP5Q0dKWEUeN9wJs0sqMYjifP5xufPpH6+kNBe4rSL2FP jAgo7IFWDGN7VHF2ydyenoA1NqCYYLG+zaT3Xd8xduEXgBTSnVoRI6vbWiVZqHAvrFulsdRQ7zei WXnvmrwrNdwuW+IZU+YQ+U5brfSvt1CM/4EZ8zIOdSa946/x9IPpv1wP+m64SwAP7jjiMq+rAmBl 4H+83uWZJ5xdGLJ08/4Fdi3OJJ0KqR0krlPiNO54QyrWa9V3sp9DF5zY+GV8Cv2dqg5b8BOnv+eB 6nwiz+YD+8+6Wy2YC9r7G34yCmqyqIy5NGVihnj2t7OxndOZoYGeavPNabVCGNOO5Uc8xJV1qbzI bfO2ympUr1BzR4lBpwNE5TBTiuLTT8bgXTr076fk5voEsP9zbsmjiX6DIk6vo+ From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Thu, 15 Dec 2022 01:10:09 +0800 X-OQ-MSGID: <20221214171014.1058709-4-quinkblack@foxmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221214171014.1058709-1-quinkblack@foxmail.com> References: <20221214171014.1058709-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 3/8] avformat/file: dup file descriptor for pipe 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 Cc: Zhao Zhili Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: From: Zhao Zhili --- libavformat/file.c | 44 ++++++++++++++++++++++++++++++++++---------- 1 file changed, 34 insertions(+), 10 deletions(-) diff --git a/libavformat/file.c b/libavformat/file.c index a56be64342..878983a336 100644 --- a/libavformat/file.c +++ b/libavformat/file.c @@ -167,6 +167,36 @@ static int file_check(URLContext *h, int mask) return ret; } +static int fd_dup(URLContext *h, int oldfd) +{ + int newfd; + +#ifdef F_DUPFD_CLOEXEC + newfd = fcntl(oldfd, F_DUPFD_CLOEXEC, 0); +#else + newfd = dup(oldfd); +#endif + if (newfd == -1) + return newfd; + +#if HAVE_FCNTL + if (fcntl(newfd, F_SETFD, FD_CLOEXEC) == -1) + av_log(h, AV_LOG_DEBUG, "Failed to set close on exec\n"); +#endif + +#if HAVE_SETMODE + setmode(newfd, O_BINARY); +#endif + return newfd; +} + +static int file_close(URLContext *h) +{ + FileContext *c = h->priv_data; + int ret = close(c->fd); + return (ret == -1) ? AVERROR(errno) : 0; +} + #if CONFIG_FILE_PROTOCOL static int file_delete(URLContext *h) @@ -263,13 +293,6 @@ static int64_t file_seek(URLContext *h, int64_t pos, int whence) return ret < 0 ? AVERROR(errno) : ret; } -static int file_close(URLContext *h) -{ - FileContext *c = h->priv_data; - int ret = close(c->fd); - return (ret == -1) ? AVERROR(errno) : 0; -} - static int file_open_dir(URLContext *h) { #if HAVE_LSTAT @@ -397,9 +420,9 @@ static int pipe_open(URLContext *h, const char *filename, int flags) c->fd = fd; } -#if HAVE_SETMODE - setmode(c->fd, O_BINARY); -#endif + c->fd = fd_dup(h, c->fd); + if (c->fd == -1) + return AVERROR(errno); h->is_streamed = 1; return 0; } @@ -409,6 +432,7 @@ const URLProtocol ff_pipe_protocol = { .url_open = pipe_open, .url_read = file_read, .url_write = file_write, + .url_close = file_close, .url_get_file_handle = file_get_handle, .url_check = file_check, .priv_data_size = sizeof(FileContext), -- 2.25.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".