From eb35031079afa9219e6607671e75a4ebb5c7ec96 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Tue, 17 May 2022 12:09:20 +0100 Subject: [PATCH] 10.73: Annocheck: Fix handling of command line options that take arguments --- annobin-global.h | 2 +- annocheck/annocheck.c | 12 ++++++------ annocheck/libannocheck.h | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/annobin-global.h b/annobin-global.h index 70f8f5e..152718b 100644 --- a/annobin-global.h +++ b/annobin-global.h @@ -23,7 +23,7 @@ extern "C" { NB/ Keep this value in sync with libannochck_version defined in annocheck/libannocheck.h. */ -#define ANNOBIN_VERSION 1072 +#define ANNOBIN_VERSION 1073 /* The version of the annotation specification supported. */ #define SPEC_VERSION 3 diff --git a/annocheck/annocheck.c b/annocheck/annocheck.c index fdc4667..193c61c 100644 --- a/annocheck/annocheck.c +++ b/annocheck/annocheck.c @@ -1848,9 +1848,9 @@ usage (void) #endif einfo (INFO, "The following options are internal to the scanner and not expected to be supplied by the user:"); - einfo (INFO, " -p | --prefix= [Include in the output description]"); - einfo (INFO, " -t | --tmpdir= [Absolute pathname of a temporary directory used to pass data between iterations]"); - einfo (INFO, " -l | --level= [Recursion level of the scanner]"); + einfo (INFO, " -p | --prefix= [Include in the output description]"); + einfo (INFO, " -t | --tmpdir= [Absolute pathname of a temporary directory used to pass data between iterations]"); + einfo (INFO, " -l | --level= [Recursion level of the scanner]"); einfo (INFO, "Tools have their own options:"); einfo (INFO, " --enable- [Turn on ][By default the hardened tool is enabled]"); @@ -2090,7 +2090,7 @@ process_command_line (uint argc, const char * argv[]) break; case 'p': - if (streq (arg, "p") || streq (arg, "prefix")) + if (streq (arg, "p") || const_strneq (arg, "prefix")) { save_arg (orig_arg); parameter = strchr (arg, '='); @@ -2110,7 +2110,7 @@ process_command_line (uint argc, const char * argv[]) break; case 'l': - if (streq (arg, "l") || streq (arg, "level")) + if (streq (arg, "l") || const_strneq (arg, "level")) { parameter = strchr (arg, '='); if (parameter == NULL) @@ -2133,7 +2133,7 @@ process_command_line (uint argc, const char * argv[]) break; case 't': - if (streq (arg, "t") || streq (arg, "tmpdir")) + if (streq (arg, "t") || const_strneq (arg, "tmpdir")) { parameter = strchr (arg, '='); if (parameter == NULL) diff --git a/annocheck/libannocheck.h b/annocheck/libannocheck.h index 9b674a5..60ce433 100644 --- a/annocheck/libannocheck.h +++ b/annocheck/libannocheck.h @@ -18,7 +18,7 @@ extern "C" { /* NB/ Keep this value in sync with ANNOBIN_VERSION defined in annobin-global.h. */ -const unsigned int libannocheck_version = 1072; +const unsigned int libannocheck_version = 1073; typedef enum libannocheck_error { -- 2.43.5