From patchwork Mon Nov 30 23:09:19 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Etienne Champetier X-Patchwork-Id: 550549 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (arrakis.dune.hu [78.24.191.176]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id B9F1B1401B5 for ; Tue, 1 Dec 2015 10:11:56 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=UnKuKwJj; dkim-atps=neutral Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 2A90C28C731; Tue, 1 Dec 2015 00:10:11 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID autolearn=unavailable version=3.3.2 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 7A1F028BDBF for ; Tue, 1 Dec 2015 00:09:35 +0100 (CET) X-policyd-weight: using cached result; rate: -8.5 Received: from mail-wm0-f47.google.com (mail-wm0-f47.google.com [74.125.82.47]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Tue, 1 Dec 2015 00:09:35 +0100 (CET) Received: by wmec201 with SMTP id c201so179826405wme.0 for ; Mon, 30 Nov 2015 15:09:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=HedcjBdtYWQyDxFsJ3/VTtVEhjtx2gut3SUUKPj3KMw=; b=UnKuKwJj49vIfihYrfGYSN5QCU9AoayT2MivwjyVnaPaVQET8fzWyyeT8RuzzG5/fF NC/oksF7u5wQ2yRv64eGRb7Hh1QVF3n9efxZe5taSdgOfWdebRN03z9AcB+cVczrHAZp Y2wj+ncSkV0kVN8XSfXv9X6gQRV/2yd5GlPIMguVnWw3SnFU17S67QA64SUzjetSZ70Q NaOtMk2XGXmoXxp/sQsX2mIfT6DiZKbRdCHPb8/BslwtsR+jaumToVRcYronGKpyM5qr qyMspUlqUZ+PlaZYH9Grjd7G1CawF+Z9Iamzir5cm1vY28TSXaFIkB6pWXl4JFpY0QOX vTZA== X-Received: by 10.194.118.74 with SMTP id kk10mr15754385wjb.5.1448924978691; Mon, 30 Nov 2015 15:09:38 -0800 (PST) Received: from ubuntu1404.lxcnattst (ns623510.ovh.net. [5.135.134.9]) by smtp.gmail.com with ESMTPSA id pn6sm48769372wjb.15.2015.11.30.15.09.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 30 Nov 2015 15:09:37 -0800 (PST) From: Etienne CHAMPETIER To: OpenWrt Development List Date: Mon, 30 Nov 2015 23:09:19 +0000 Message-Id: <1448924967-63976-2-git-send-email-champetier.etienne@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1448924967-63976-1-git-send-email-champetier.etienne@gmail.com> References: <1448924967-63976-1-git-send-email-champetier.etienne@gmail.com> Subject: [OpenWrt-Devel] [PATCH procd 1/9] ujail: fixup code style // -> /* */ X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" Signed-off-by: Etienne CHAMPETIER --- jail/jail.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jail/jail.c b/jail/jail.c index 4297f71..5c995e5 100644 --- a/jail/jail.c +++ b/jail/jail.c @@ -237,7 +237,7 @@ static int exec_jail(void) INFO("exec-ing %s\n", *opts.jail_argv); execve(*opts.jail_argv, opts.jail_argv, envp); - //we get there only if execve fails + /* we get there only if execve fails */ ERROR("failed to execve %s: %s\n", *opts.jail_argv, strerror(errno)); exit(EXIT_FAILURE); } @@ -344,7 +344,7 @@ int main(int argc, char **argv) } } - //no param found + /* no param found */ if (argc - optind < 1) { usage(); return EXIT_FAILURE; @@ -384,7 +384,7 @@ int main(int argc, char **argv) } if (jail_process.pid > 0) { - //parent process + /* parent process */ uloop_process_add(&jail_process); uloop_run(); uloop_done(); @@ -394,7 +394,7 @@ int main(int argc, char **argv) waitpid(jail_process.pid, NULL, 0); } } else if (jail_process.pid == 0) { - //fork child process + /* fork child process */ return exec_jail(); } else { ERROR("failed to clone/fork: %s\n", strerror(errno));