From patchwork Tue Jul 25 06:49:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Mendoza-Jonas X-Patchwork-Id: 793227 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xGplS1gD2z9s0g for ; Tue, 25 Jul 2017 16:50:12 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=mendozajonas.com header.i=@mendozajonas.com header.b="kodGQaE1"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="UpJholLc"; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3xGplS05wyzDqnP for ; Tue, 25 Jul 2017 16:50:12 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=mendozajonas.com header.i=@mendozajonas.com header.b="kodGQaE1"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="UpJholLc"; dkim-atps=neutral X-Original-To: petitboot@lists.ozlabs.org Delivered-To: petitboot@lists.ozlabs.org Received: from new2-smtp.messagingengine.com (new2-smtp.messagingengine.com [66.111.4.224]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3xGpkr0W9XzDqlC for ; Tue, 25 Jul 2017 16:49:40 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=mendozajonas.com header.i=@mendozajonas.com header.b="kodGQaE1"; dkim=pass (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="UpJholLc"; dkim-atps=neutral Received: from compute2.internal (compute2.nyi.internal [10.202.2.42]) by mailnew.nyi.internal (Postfix) with ESMTP id 0CB8213C6; Tue, 25 Jul 2017 02:49:38 -0400 (EDT) Received: from frontend2 ([10.202.2.161]) by compute2.internal (MEProxy); Tue, 25 Jul 2017 02:49:38 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= mendozajonas.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=fm1; bh=Y0CHAKOp54gYXO0ygtFopROykn1fMlTx/L0sS2WIW vQ=; b=kodGQaE1cMOH0GYjRccvmK2N1Q2D5HWSCi+FW32Mew46FdMfzeATW2Who RdXC+imG5HGcELmoEHbUAbztsPL+QQrxH6nkcTP/kfRvcpTjtvfDx1quPIKXYyrd 3quhYw6l3zy+HDJ9OK3HQWay4RtO1PJRiO8HnRhCVXaklS0KCYjCstjOVhHSVfFV KdAgsd6MQcR0FLEGJ1KsiUxcEpUV3cyx9gJTDNHfes4d6Z7wp8zXJeqqfnd2SknC 9DQ/AS0vkeh5fwwBVEp/ng9d2+2pKsmdDJo3Znecg+cRHqLZnHikSnZvcVeNR5Ek n5OCXwM7jAtP/0OTAAd9q/dLPeBIw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=fm1; bh=Y0CHAKOp54gYXO0ygtFopROykn1fMlTx/L0sS2WIW vQ=; b=UpJholLcQqszeVyHr1BUA0eF6vo1fkm8EuG/3gg9dVLKbG/h1iu0jNll0 wRXKcCjEqk4RmQhpFxwUlkoTU57DZ2QqLHk5MKShtOcVXFU2PjAd6bZFkW48ap2Z NgVjQ6Rw+3OKtfUpnqQQpGX7fYKvufz54q+JM/j+dNYZbf5a7lkuHCs4ju3aWIjb X5AvyrYS/mToWbOkPFHwaE1Fj6yPIYj5oT9nxN7mT2PnVI7yv1XhpAInvdZGQDKY nVmeo67xfg878cBaHoGA1AGWefdJIfEsCh2BkURlK5tcqDfiVcrJHyfMkq39ra/M 5xXtGmO2XO9D1/pqKEJkxYDeJQdSA== X-ME-Sender: X-Sasl-enc: NtsAkikSjcOOAPZknY3WIUD5wZQyLFNPBTuF8z7/q0NO 1500965377 Received: from v4.ozlabs.ibm.com (unknown [122.99.82.10]) by mail.messagingengine.com (Postfix) with ESMTPA id 8BAD424038; Tue, 25 Jul 2017 02:49:36 -0400 (EDT) From: Samuel Mendoza-Jonas To: petitboot@lists.ozlabs.org Subject: [PATCH v2 05/12] lib/process: Add raw stdout mode Date: Tue, 25 Jul 2017 16:49:03 +1000 Message-Id: <20170725064910.31478-6-sam@mendozajonas.com> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170725064910.31478-1-sam@mendozajonas.com> References: <20170725064910.31478-1-sam@mendozajonas.com> X-BeenThere: petitboot@lists.ozlabs.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Petitboot bootloader development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Samuel Mendoza-Jonas MIME-Version: 1.0 Errors-To: petitboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Petitboot" Allow process users to set 'raw_stdout', which if set skips redirecting and saving output from processes. Signed-off-by: Samuel Mendoza-Jonas --- lib/process/process.c | 7 +++++-- lib/process/process.h | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/process/process.c b/lib/process/process.c index f7e5b8f..c1606a5 100644 --- a/lib/process/process.c +++ b/lib/process/process.c @@ -114,7 +114,7 @@ static int process_setup_stdout_pipe(struct process_info *procinfo) { int rc; - if (!procinfo->process.keep_stdout) + if (!procinfo->process.keep_stdout || procinfo->process.raw_stdout) return 0; procinfo->stdout_buf_len = 4096; @@ -132,7 +132,7 @@ static int process_setup_stdout_pipe(struct process_info *procinfo) static void process_setup_stdout_parent(struct process_info *procinfo) { - if (!procinfo->process.keep_stdout) + if (!procinfo->process.keep_stdout || procinfo->process.raw_stdout) return; close(procinfo->stdout_pipe[1]); @@ -142,6 +142,9 @@ static void process_setup_stdout_child(struct process_info *procinfo) { int log = fileno(pb_log_get_stream()); + if (procinfo->process.raw_stdout) + return; + if (procinfo->process.keep_stdout) dup2(procinfo->stdout_pipe[1], STDOUT_FILENO); else diff --git a/lib/process/process.h b/lib/process/process.h index f858b0e..4904ffc 100644 --- a/lib/process/process.h +++ b/lib/process/process.h @@ -33,6 +33,7 @@ struct process { const char **argv; bool keep_stdout; bool add_stderr; + bool raw_stdout; process_exit_cb exit_cb; void *data; waiter_cb stdout_cb;