From patchwork Fri Mar 6 02:10:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Jakubiak X-Patchwork-Id: 1539 Return-Path: Delivered-To: patchwork@archlinux.org Received: from apollo.archlinux.org (localhost [127.0.0.1]) by apollo.archlinux.org (Postfix) with ESMTP id 3B96E1774A934 for ; Fri, 6 Mar 2020 02:12:47 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on apollo.archlinux.org X-Spam-Level: X-Spam-Status: No, score=-0.1 required=5.0 tests=DKIM_ADSP_CUSTOM_MED=0.001, DKIM_INVALID=1,DKIM_SIGNED=0.1,FREEMAIL_FROM=0.5,MAILING_LIST_MULTI=-1, RCVD_IN_DNSWL_LOW=-0.7,SPF_HELO_NONE=0.001,T_DMARC_POLICY_NONE=0.01, T_DMARC_SIMPLE_DKIM=0.01 autolearn=ham autolearn_force=no version=3.4.4 X-Spam-BL-Results: [127.0.9.1] Received: from orion.archlinux.org (orion.archlinux.org [IPv6:2a01:4f8:160:6087::1]) by apollo.archlinux.org (Postfix) with ESMTPS for ; Fri, 6 Mar 2020 02:12:47 +0000 (UTC) Received: from orion.archlinux.org (localhost [127.0.0.1]) by orion.archlinux.org (Postfix) with ESMTP id 0FB1419B5B9105; Fri, 6 Mar 2020 02:12:41 +0000 (UTC) Received: from luna.archlinux.org (luna.archlinux.org [IPv6:2a01:4f8:160:3033::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: luna) by orion.archlinux.org (Postfix) with ESMTPSA id D391D19B5B9101; Fri, 6 Mar 2020 02:12:40 +0000 (UTC) Authentication-Results: orion.archlinux.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=bN8KNAx/ Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id CA75A29D03; Fri, 6 Mar 2020 02:12:40 +0000 (UTC) Authentication-Results: luna.archlinux.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=bN8KNAx/ Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id DDDFA29D02 for ; Fri, 6 Mar 2020 02:12:37 +0000 (UTC) Received: from mail-ed1-x541.google.com (mail-ed1-x541.google.com [IPv6:2a00:1450:4864:20::541]) by luna.archlinux.org (Postfix) with ESMTPS for ; Fri, 6 Mar 2020 02:12:37 +0000 (UTC) Received: by mail-ed1-x541.google.com with SMTP id g19so598567eds.11 for ; Thu, 05 Mar 2020 18:12:37 -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=juroBUVBXXftleLe9SwkHXt//uEvF5O7B3yC+4fvg3A=; b=bN8KNAx/Fl0WAX0sF2Bf7KdNJa6ECT1bIyfsje0yqB93Txh7nUkkvet7Y5vMQk/CHh PwHn9ae8ww6Yy1yjBwTdfIWf5NlNka7lbrgrtl6M44WeMnmBNEIvlcBHspeNOITne/98 t1FgTj5mW31lBI7MIaTqNyUFMq3J6sJ4UcMpS3I8cGxcF1CzTz+LCLcMDu17CmEoo7Qg 4UfpAvXRCoKIKKv3L6thGtiGLaLklgvVPfAOoSTFgHgrIFFe9rp8wB7+P1cRHebAq94R c5mKAyzHYu68v7fuxl4CVaMVA2Z7KWHo08oru54PuSemoCPO4zDdAkkFamGzEaDsjukz 8UVw== 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=juroBUVBXXftleLe9SwkHXt//uEvF5O7B3yC+4fvg3A=; b=TRforYHlByNvALXDXTTM7bB3c4pLSeU3yEHs+eO7U1vQXA7ooVaOoMpYphtoJPD/Sr nRKRnT9Warfrg1bz9S3aJFyXyZEHFq4s9c3ugA2dUns3bPmnrTRgeoxCJMUH+l1aaeir m9j861U34jOpi0aG0eUz959HBvlKzFp+N2Fc0xRrQvlPY8qLlL4iWTkYRMVlwlft7quW ejjKtA236/uoSrAo1YcbOqrT0qWcn41B7Tajt6aAwMfHeNUrnf3HNweriIzGuBVCUhz6 dtgVmEXg2Its38Vtmfx0rt5O+LsuJ8qZTUXMUwDVGAaEY4m1tZZugA3wy3YSfQrPJ1qX MScg== X-Gm-Message-State: ANhLgQ0tzcFyLPm5LfLH8syDjurUJyJ0BopUFgX61D2Xyvmr5joOS2YH X5WPRtySWH4lH4ghBc1d0U2b6y3rI7o= X-Google-Smtp-Source: ADFU+vvNcD4tBPmwizUpQ5+uATWpO1a4+6/IpZ6H9V95l0b1Ii/gpsOXINsgtyN2vUyvSu3beH/LxQ== X-Received: by 2002:a17:906:90c6:: with SMTP id v6mr823377ejw.222.1583460754429; Thu, 05 Mar 2020 18:12:34 -0800 (PST) Received: from localhost ([185.165.241.36]) by smtp.gmail.com with ESMTPSA id g13sm1059616ejx.23.2020.03.05.18.12.33 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 05 Mar 2020 18:12:33 -0800 (PST) From: Sebastian Jakubiak To: pacman-contrib@lists.archlinux.org Subject: [PATCH] pactree: Improve command line validation Date: Fri, 6 Mar 2020 03:10:37 +0100 Message-Id: <20200306021037.66811-1-jakseb.dev@gmail.com> X-Mailer: git-send-email 2.25.0 MIME-Version: 1.0 X-BeenThere: pacman-contrib@lists.archlinux.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion list for pacman-contrib development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: pacman-contrib-bounces@lists.archlinux.org Sender: "pacman-contrib" Exit with non-zero status when the command line specifies more than one package or an unknown option. Fixes FS#64589. Signed-off-by: Sebastian Jakubiak --- If I may, I would like to use this occasion to suggest a feature: the ability to process multiple packages by pactree. I am sending a patch for that in reply to this email. src/pactree.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pactree.c b/src/pactree.c index 5bc0032..9f074fe 100644 --- a/src/pactree.c +++ b/src/pactree.c @@ -346,7 +346,6 @@ static int parse_options(int argc, char *argv[]) version(); cleanup(0); case 'h': - case '?': usage(); cleanup(0); default: @@ -355,7 +354,8 @@ static int parse_options(int argc, char *argv[]) } } - if(!argv[optind]) { + if(!argv[optind] || argv[optind + 1]) { + usage(); return 1; }