From patchwork Thu Oct 14 15:46:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Babic X-Patchwork-Id: 1540977 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.a=rsa-sha256 header.s=20210112 header.b=O58CcCSE; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:4864:20::13b; helo=mail-lf1-x13b.google.com; envelope-from=swupdate+bncbcxploxj6ikrbznbugfqmgqe46htx5q@googlegroups.com; receiver=) Received: from mail-lf1-x13b.google.com (mail-lf1-x13b.google.com [IPv6:2a00:1450:4864:20::13b]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HVYfy6CNBz9sfG for ; Fri, 15 Oct 2021 02:46:49 +1100 (AEDT) Received: by mail-lf1-x13b.google.com with SMTP id z29-20020a195e5d000000b003fd437f0e07sf4606732lfi.20 for ; Thu, 14 Oct 2021 08:46:49 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1634226405; cv=pass; d=google.com; s=arc-20160816; b=hFC5COxJHiLT4PqyENA0LmdwR+qEVRu828NDPonASggqB3uhtLVSzPmgD2zI0ruhBf 7STBm9MGUQjx+H6W2zMpneubYv5hF1//nnih4/TLkaLxl/DwIQzbCqpbVTbgleRLjp1R B3SKax1/fk6Ym1iVTw1lh8JGVMuRFnUElYEdzoxyLV/8V150ttWAxsxkwl9U/gad+v3Q Col3j7opC4auIZLrHjKI3N5Lh8+Bc8kU6u7Guzy+yB2omXxQ4JkiL+G2mM1HWpqfgyW2 zWjMmPAv0WyzsJ5Oi13KrMLl/sMNXCgjaW6K5PwiM5pHDzg/R/YAg3WF1eTCrN6NedhV OTLg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:message-id:date :subject:cc:to:from:sender:dkim-signature; bh=7dU7ZhnMkSJjXQ/S/pXf6roCdwKxvBEuRd10A51lSOM=; b=CPTtl6pbFJgSPL9JtXQr+WnqgJSvb2ho2PFg6ZpFZHLTCMlgFKOfxDXnT61oZ4XOuJ b1ycT0di/DOZ1kWHrkQ1mXjmfSJrf6HKzmBH1h1kmo+jnVMFHFiVQzJCOOoVn0C7NuVD jtioMhwDYT3V0rKmC1ZQuF5aCRzUYSkMJKVXmlDwXfYvTjbbXilvLakvBGzbrgMpfIyf rDIU8eZY2bv7/GmLxB0RM1iSsq09ugUVuWv1BSRU4ovk65CfV7hmP5KIkYSMjXYV18er gXokzqXpfRFjm57o3ZWD9EVwKAUyGHsNHQGnn2Bfl2+xNnURewspwAYlnt/e3wCUjc8l VucA== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=neutral (google.com: 212.18.0.9 is neither permitted nor denied by domain of sbabic@denx.de) smtp.mailfrom=sbabic@denx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:mime-version :x-original-sender:x-original-authentication-results:precedence :mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=7dU7ZhnMkSJjXQ/S/pXf6roCdwKxvBEuRd10A51lSOM=; b=O58CcCSExjQkYgj4Rd3A3UkzUd0I9zLMOFXa6jw+5VP6/g4qhtU+QKcpXTFPP9jhOo kZwUaCrGSl39hu8cYYAMJcv67zNiD6s4FSFqqOOqCFNBLTkxcIQ92urT3XrgpwnHV7zd Mz6oNSrHkCiV6vp9JmnwEKw2qe7a17PR4xBBZ//IZMFgTaXn9YQSo61CAWopPml6oBt1 AiIgTaz+mQCSd0Y0SbMNFOICx1GJG470K90nK68yotRbQIj1Ao5Ty89bCkQz0SmDrmyk w+7f3nCMJNx4irglUba96lM6pSrwcm4rHQywl93noPEH8tJo9JZtzN9qQnfz4xjdPlkY 0J/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=sender:x-gm-message-state:from:to:cc:subject:date:message-id :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:x-spam-checked-in-group:list-post :list-help:list-archive:list-subscribe:list-unsubscribe; bh=7dU7ZhnMkSJjXQ/S/pXf6roCdwKxvBEuRd10A51lSOM=; b=cvTJSWbGTsKODUP1VRjEaxacvtxa2NGH4qtVCOnEf55M1Gly4CLKZEyPwyeEKQ2MUz 4baaCEEvqyIBZnTB+ERnc+xb+zbeQ564OnxC9DeiTxFIyDRXDOeyRD7bMQq5f0ROQcu7 wA33RVU/kznPdZ8mzNWcMArq+DZgsURdknWR3afzAyoYs6hsfCHagDxO8c564XLNmOUw SuniWHyZ2AAhAgwi661p4jfzMfUAfQbGAAvPMnYoW6JPv/9b+DE7pSQ5+NpkrAR0FiSI ANn3HA+y/Z28BpWjG7EXBWDEMI9FjFPvBa+y13mqbmhzZT3hnXyhcrbtKkm3dG+3RMWC LGdA== Sender: swupdate@googlegroups.com X-Gm-Message-State: AOAM530d9jYqrkgvW5371Kss4ZutmRb/2DYEyrwbg78iDvK5XvKPB+q8 y0ebkSLe9O+poDwUCnxAK40= X-Google-Smtp-Source: ABdhPJyzjlqnPNFXhOYTjHOVyu4PBoI3875PUvBH09H6um27FF0Y/gfUg+C+ZiVpfJ3pfNuU3e2rbQ== X-Received: by 2002:a2e:b8c3:: with SMTP id s3mr6866608ljp.44.1634226405725; Thu, 14 Oct 2021 08:46:45 -0700 (PDT) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a2e:760d:: with SMTP id r13ls1164162ljc.0.gmail; Thu, 14 Oct 2021 08:46:44 -0700 (PDT) X-Received: by 2002:a2e:7401:: with SMTP id p1mr6664935ljc.531.1634226404753; Thu, 14 Oct 2021 08:46:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1634226404; cv=none; d=google.com; s=arc-20160816; b=AgPBlJFWqKCDeu8zom7OCwYor9+LzGDS3+HMXC/KjI5rZQVCOaCuwCr5w8JhKIzW8m gnZ0iSxLQhHZs0mc2t4Bgndh8thh3J4O5JALtzXC8E4bytTBctI9TUWgnqs/YWz2dACc b0PlNm3zGCm6E9y9Y62JJ6gwmzfLcPOr9RJqbF99ZLpWtl7JhOBJ2OqDq22kEhUVUinD m98m0IXbVXzigag6c66YCKLQgU7fnhtXJpcYlontWR/4Ogik64CXbDNGKSUtvIlpobNB F2ztq/eSt5RGKFAGrlj0gsl3LdVIh5EtwWMMpRfHNXNfHDHYI56secHBsZGsxl7EW4NM uh4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from; bh=S2akEK6NbrsvM4fr9KvGvbZMO8KDLdeEV1nDzLLH0sA=; b=gnqA8+4fADJOIisZrbZO2VATecuAg3SX4NYZup4K0LaFO4xUOXSpBsrom+HBD1f82Z WvtdLwudexUQe4YpRPP6/5S88smkm+6/mc0ELvUGXu2HrVypPRGjnx4rRFT+xz+qanFH yv8StqZ3KYVGrcPJYo4GVebkuiVk9xd0XSyuARjwD0Qzch4lvclziXOwWTLGPxEfYwDT Deg5HkIY+KrrO+3qCuWsnwy4GcVuBAFboLa3eRU1HIl2IhbtbX2uYRRcBy2/iEWAcOS2 J5gQYIOty+FBtxcrYclkd6pQX+Zt1a7hepyntgusVxq/TY8Jk+NWqlrwYiXGi7tXvQt1 W2tQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=neutral (google.com: 212.18.0.9 is neither permitted nor denied by domain of sbabic@denx.de) smtp.mailfrom=sbabic@denx.de Received: from mail-out.m-online.net (mail-out.m-online.net. [212.18.0.9]) by gmr-mx.google.com with ESMTPS id m18si192593ljg.7.2021.10.14.08.46.44 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 Oct 2021 08:46:44 -0700 (PDT) Received-SPF: neutral (google.com: 212.18.0.9 is neither permitted nor denied by domain of sbabic@denx.de) client-ip=212.18.0.9; Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 4HVYfr13T9z1qwyB; Thu, 14 Oct 2021 17:46:44 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 4HVYfr0vqRz1qqkG; Thu, 14 Oct 2021 17:46:44 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id CZq9FwFx5XqX; Thu, 14 Oct 2021 17:46:43 +0200 (CEST) Received: from babic.homelinux.org (host-88-217-136-221.customer.m-online.net [88.217.136.221]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS; Thu, 14 Oct 2021 17:46:43 +0200 (CEST) Received: from localhost (mail.babic.homelinux.org [127.0.0.1]) by babic.homelinux.org (Postfix) with ESMTP id EDB6F45407A7; Thu, 14 Oct 2021 17:46:42 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at babic.homelinux.org Received: from babic.homelinux.org ([IPv6:::1]) by localhost (mail.babic.homelinux.org [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id 8os8yuB44Ulu; Thu, 14 Oct 2021 17:46:39 +0200 (CEST) Received: from paperino.fritz.box (paperino.fritz.box [192.168.178.48]) by babic.homelinux.org (Postfix) with ESMTP id 5C7F3454034C; Thu, 14 Oct 2021 17:46:39 +0200 (CEST) From: Stefano Babic To: swupdate@googlegroups.com Cc: Stefano Babic Subject: [swupdate] [PATCH 1/3] cosmetic: sort entries in getopt list Date: Thu, 14 Oct 2021 17:46:35 +0200 Message-Id: <20211014154637.2674613-1-sbabic@denx.de> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Original-Sender: sbabic@denx.de X-Original-Authentication-Results: gmr-mx.google.com; spf=neutral (google.com: 212.18.0.9 is neither permitted nor denied by domain of sbabic@denx.de) smtp.mailfrom=sbabic@denx.de Precedence: list Mailing-list: list swupdate@googlegroups.com; contact swupdate+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: swupdate@googlegroups.com X-Google-Group-Id: 605343134186 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , Signed-off-by: Stefano Babic --- core/swupdate.c | 52 ++++++++++++++++++++++++------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/core/swupdate.c b/core/swupdate.c index a31aeb1..3ad18e2 100644 --- a/core/swupdate.c +++ b/core/swupdate.c @@ -69,21 +69,21 @@ struct flash_description *get_flash_info(void) { #endif static struct option long_options[] = { - {"verbose", no_argument, NULL, 'v'}, - {"version", no_argument, NULL, '0'}, - {"image", required_argument, NULL, 'i'}, - {"file", required_argument, NULL, 'f'}, - {"loglevel", required_argument, NULL, 'l'}, - {"syslog", no_argument, NULL, 'L' }, - {"select", required_argument, NULL, 'e'}, {"accepted-select", required_argument, NULL, 'q'}, - {"output", required_argument, NULL, 'o'}, +#ifdef CONFIG_UBIATTACH + {"blacklist", required_argument, NULL, 'b'}, +#endif + {"check", no_argument, NULL, 'c'}, +#ifdef CONFIG_DOWNLOAD + {"download", required_argument, NULL, 'd'}, +#endif {"dry-run", no_argument, NULL, 'n'}, - {"no-downgrading", required_argument, NULL, 'N'}, - {"no-reinstalling", required_argument, NULL, 'R'}, - {"max-version", required_argument, NULL, '3'}, - {"no-transaction-marker", no_argument, NULL, 'M'}, - {"no-state-marker", no_argument, NULL, 'm'}, + {"file", required_argument, NULL, 'f'}, + {"help", no_argument, NULL, 'h'}, +#ifdef CONFIG_HW_COMPATIBILITY + {"hwrevision", required_argument, NULL, 'H'}, +#endif + {"image", required_argument, NULL, 'i'}, #ifdef CONFIG_SIGNED_IMAGES {"key", required_argument, NULL, 'k'}, {"ca-path", required_argument, NULL, 'k'}, @@ -93,25 +93,25 @@ static struct option long_options[] = { #ifdef CONFIG_ENCRYPTED_IMAGES {"key-aes", required_argument, NULL, 'K'}, #endif -#ifdef CONFIG_UBIATTACH - {"blacklist", required_argument, NULL, 'b'}, -#endif - {"help", no_argument, NULL, 'h'}, -#ifdef CONFIG_HW_COMPATIBILITY - {"hwrevision", required_argument, NULL, 'H'}, -#endif -#ifdef CONFIG_DOWNLOAD - {"download", required_argument, NULL, 'd'}, -#endif + {"loglevel", required_argument, NULL, 'l'}, + {"max-version", required_argument, NULL, '3'}, + {"no-downgrading", required_argument, NULL, 'N'}, + {"no-reinstalling", required_argument, NULL, 'R'}, + {"no-state-marker", no_argument, NULL, 'm'}, + {"no-transaction-marker", no_argument, NULL, 'M'}, + {"output", required_argument, NULL, 'o'}, + {"preupdate", required_argument, NULL, 'P'}, + {"postupdate", required_argument, NULL, 'p'}, + {"select", required_argument, NULL, 'e'}, #ifdef CONFIG_SURICATTA {"suricatta", required_argument, NULL, 'u'}, #endif + {"syslog", no_argument, NULL, 'L' }, + {"verbose", no_argument, NULL, 'v'}, + {"version", no_argument, NULL, '0'}, #ifdef CONFIG_WEBSERVER {"webserver", required_argument, NULL, 'w'}, #endif - {"check", no_argument, NULL, 'c'}, - {"postupdate", required_argument, NULL, 'p'}, - {"preupdate", required_argument, NULL, 'P'}, {NULL, 0, NULL, 0} };