From patchwork Wed Dec 9 12:13:26 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Fenkart X-Patchwork-Id: 554685 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id D74011402A8 for ; Thu, 10 Dec 2015 01:35:49 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 81E824B773; Wed, 9 Dec 2015 15:34:54 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id AUp3PK7EY58c; Wed, 9 Dec 2015 15:34:54 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 739574B74E; Wed, 9 Dec 2015 15:34:17 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 6F2704B622 for ; Wed, 9 Dec 2015 13:28:55 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ar8j90WNG-cz for ; Wed, 9 Dec 2015 13:28:55 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail.newtechgroup.ch (mail.newtechgroup.ch [83.144.237.166]) by theia.denx.de (Postfix) with ESMTPS id DCDFD4B68A for ; Wed, 9 Dec 2015 13:28:54 +0100 (CET) Received: from localhost (192.168.1.1) by vsrv-mailch01.newtechgroup.local (192.168.1.208) with Microsoft SMTP Server (TLS) id 15.0.775.38; Wed, 9 Dec 2015 13:13:49 +0100 From: Andreas Fenkart To: Date: Wed, 9 Dec 2015 13:13:26 +0100 Message-ID: <1449663207-3073-7-git-send-email-andreas.fenkart@digitalstrom.com> X-Mailer: git-send-email 2.6.2 In-Reply-To: <1449663207-3073-1-git-send-email-andreas.fenkart@digitalstrom.com> References: <1449663207-3073-1-git-send-email-andreas.fenkart@digitalstrom.com> MIME-Version: 1.0 X-Originating-IP: [192.168.1.1] X-ClientProxiedBy: VSRV-MAILCH01.newtechgroup.local (192.168.1.208) To vsrv-mailch01.newtechgroup.local (192.168.1.208) X-Brightmail-Tracker: H4sIAAAAAAAAC+NgFmpiVWLjYjmwgpFR959URpjBvmnrz7FanHv3ltni+rx9zBZfm4wdmAMYolgz85LyKxJYM2a3/2UquCdace/QE5YGxuMCXYxcHEIC6xglLi/uZe1i5ORgE7CQeHhnCguILSIgIfGr/yojiM0s4CXRerkFLC4s4CDx9uV/JhCbRUBFYvqKU2A2r4C/xMsrEL0SAnISU+63g8U5BQIkDjyfzA5iCwHVvG5YyApRLyhxcuYTFoj5EhIHX7xg7mLkAKrRlejfLg0xJlBi7ttdTBC2u8Ts17eZIWx7iXUvvrGClEsIOEo8+RAKU/J520pWCFtbYvurfVC2jsTyfdPZIWx5iZ9bl0CNrJS4+PgyVDxeounoF6j6UIlLr4+wTWCUmIXk0FlIDl3AyLSKUaGsuKhMNzcxMyc5w8BQLy+1vCQ1OSO9KL+0QC8nPzkxZxMjJH4u7GBsfu1+iFGSg0lJlFfofHqYEF9SfkplRmJxRnxRaU5q8SFGCQ4eJRFeY8mMMCHe4oLE3OLMdJiUDAeHkgSvKUhKsCg1PbUiLTOnJLUIIn2KUVJKnPenBFBSAKQvozQPLneJUVRKmNdVFCjHU5BalJtZAhG/xSjM8ZBJiCUvPy9VCuhEBiDQYHzFKM7BqCTMKweyiCczrwTuhFdA1zEBXfflSjrIdSWJCCmpBkahx9LPyxf+T7lhvTBvzW6G54+kb1tb/tKYKb+kmHne/frKFTf421ZoSdx8ui3x5ZIZf3ov7da7nNMo4mSV3MnzUKXvb+eESfbuHieD6zSNvi13/9IwvzEj08Dk7wKm1+vqVCTlv/aop5zxmrMk/KSY3qekjBlVTdUdIocPzeiSLZGYdbKJz1aJpTgj0VCLuag4EQAHy+bkFQMAAA== X-Mailman-Approved-At: Wed, 09 Dec 2015 15:33:56 +0100 Subject: [U-Boot] [PATCH v3 6/7] tools: env: factor out parse_common_args X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Signed-off-by: Andreas Fenkart --- tools/env/fw_env_main.c | 62 +++++++++++++++++++++++++++++-------------------- 1 file changed, 37 insertions(+), 25 deletions(-) diff --git a/tools/env/fw_env_main.c b/tools/env/fw_env_main.c index daf4688..39c8771 100644 --- a/tools/env/fw_env_main.c +++ b/tools/env/fw_env_main.c @@ -81,7 +81,7 @@ void usage(void) ); } -int parse_printenv_args(int argc, char *argv[]) +static void parse_common_args(int argc, char *argv[]) { int c; @@ -89,13 +89,13 @@ int parse_printenv_args(int argc, char *argv[]) common_args.config_file = CONFIG_FILE; #endif - while ((c = getopt_long (argc, argv, "a:c:ns:h", - long_options, NULL)) != EOF) { + while ((c = getopt_long(argc, argv, ":a:c:h", long_options, NULL)) != + EOF) { switch (c) { case 'a': if (parse_aes_key(optarg, common_args.aes_key)) { fprintf(stderr, "AES key parse error\n"); - return EXIT_FAILURE; + exit(EXIT_FAILURE); } common_args.aes_flag = 1; break; @@ -104,12 +104,37 @@ int parse_printenv_args(int argc, char *argv[]) common_args.config_file = optarg; break; #endif + case 'h': + usage(); + exit(EXIT_SUCCESS); + break; + default: + /* ignore unknown options */ + break; + } + } + + /* Reset getopt for the next pass. */ + opterr = 1; + optind = 1; +} + +int parse_printenv_args(int argc, char *argv[]) +{ + int c; + + parse_common_args(argc, argv); + + while ((c = getopt_long(argc, argv, "a:c:ns:h", long_options, NULL)) != + EOF) { + switch (c) { case 'n': printenv_args.name_suppress = 1; break; + case 'a': + case 'c': case 'h': - usage(); - exit(EXIT_SUCCESS); + /* ignore common options */ break; default: /* '?' */ usage(); @@ -124,31 +149,18 @@ int parse_setenv_args(int argc, char *argv[]) { int c; -#ifdef CONFIG_FILE - common_args.config_file = CONFIG_FILE; -#endif + parse_common_args(argc, argv); - while ((c = getopt_long (argc, argv, "a:c:ns:h", - long_options, NULL)) != EOF) { + while ((c = getopt_long(argc, argv, "a:c:ns:h", long_options, NULL)) != + EOF) { switch (c) { - case 'a': - if (parse_aes_key(optarg, common_args.aes_key)) { - fprintf(stderr, "AES key parse error\n"); - return EXIT_FAILURE; - } - common_args.aes_flag = 1; - break; -#ifdef CONFIG_FILE - case 'c': - common_args.config_file = optarg; - break; -#endif case 's': setenv_args.script_file = optarg; break; + case 'a': + case 'c': case 'h': - usage(); - exit(EXIT_SUCCESS); + /* ignore common options */ break; default: /* '?' */ usage();