static bool enable_colour = true;
static bool full_filenames_set = false;
static bool full_filenames = false;
+static bool provide_url_set = false;
static bool provide_url = true;
#define FIXED_FORMAT_STRING "%s: test: %s file: %s"
einfo (PARTIAL, "\n");
}
+static inline void
+show_url (uint testnum, const char * filename)
+{
+ if (provide_url)
+ einfo (PARTIAL, "%s: %s: info: For more information visit: %s\n",
+ HARDENED_CHECKER_NAME, filename, tests[testnum].doc_url);
+}
+
static void
fail (annocheck_data * data,
uint testnum,
einfo (PARTIAL, "\n");
- if (provide_url)
- einfo (INFO, "%s: For more information visit: %s",
- filename, tests[testnum].doc_url);
+ show_url (testnum, filename);
}
tests[testnum].state = STATE_FAILED;
einfo (PARTIAL, "\n");
- if (provide_url)
- einfo (INFO, "%s: For more information visit: %s",
- filename, tests[testnum].doc_url);
+ show_url (testnum, filename);
}
if (tests[testnum].state != STATE_FAILED)
full_filenames = BE_VERBOSE ? true : false;
full_filenames_set = true;
}
-
+
+ if (! provide_url_set)
+ {
+ provide_url = BE_VERBOSE ? true : false;
+ provide_url_set = true;
+ }
+
/* Handle mutually exclusive tests. */
if (tests [TEST_BRANCH_PROTECTION].enabled && tests [TEST_NOT_BRANCH_PROTECTION].enabled)
{
if (streq (arg, "provide-urls"))
{
provide_url = true;
+ provide_url_set = true;
return true;
}
if (streq (arg, "no-urls"))
{
provide_url = false;
+ provide_url_set = true;
return true;
}
'--no-urls'
'--provide-urls'
By default when a FAIL or MAYB result is displayed by the HARDENED
- checker a URL to the online version of the relevant section in this
- document is also provided. (Unless the '--fixed-format-messages'
- option has been enabled). The '--no-urls' option disables the
- display of the URLs and the '--provide-urls' re-enables the
- display.
+ checker and '--verbose' is enabled, a URL to the online version of
+ the relevant section in this document is also displayed. (Unless
+ the '--fixed-format-messages' option has been enabled). The
+ '--no-urls' option disables the display of the URLs and the
+ '--provide-urls' re-enables the display (even in non-verbose mode).
\1f
File: annobin.info, Node: Waiving Hardened Results, Prev: Hardened Command Line Options, Up: Hardened
Node: Test warnings\7f76691
Node: Test instrumentation\7f77529
Node: Hardened Command Line Options\7f78282
-Node: Waiving Hardened Results\7f81421
-Node: Notes\7f82805
-Node: Size\7f83441
-Node: Timing\7f85584
-Node: Configure Options\7f86223
-Node: Legacy Scripts\7f88562
-Node: Who Built Me\7f89337
-Node: ABI Checking\7f92097
-Node: Hardening Checks\7f94213
-Node: Checking Archives\7f98299
-Node: GNU FDL\7f100720
+Node: Waiving Hardened Results\7f81477
+Node: Notes\7f82861
+Node: Size\7f83497
+Node: Timing\7f85640
+Node: Configure Options\7f86279
+Node: Legacy Scripts\7f88618
+Node: Who Built Me\7f89393
+Node: ABI Checking\7f92153
+Node: Hardening Checks\7f94269
+Node: Checking Archives\7f98355
+Node: GNU FDL\7f100776
\1f
End Tag Table
@item --no-urls
@itemx --provide-urls
By default when a FAIL or MAYB result is displayed by the
-@var{hardened} checker a URL to the online version of the relevant
-section in this document is also provided. (Unless the
-@option{--fixed-format-messages} option has been enabled). The
-@option{--no-urls} option disables the display of the URLs and the
-@option{--provide-urls} re-enables the display.
+@var{hardened} checker and @option{--verbose} is enabled, a URL to the
+online version of the relevant section in this document is also
+displayed. (Unless the @option{--fixed-format-messages} option has
+been enabled). The @option{--no-urls} option disables the display of
+the URLs and the @option{--provide-urls} re-enables the display (even
+in non-verbose mode).
@end table
#!/bin/bash
version=`grep ANNOBIN_VERSION current/annobin-global.h | cut -f 3 -d ' '`
-release=`echo $version | cut -b1`.`echo $version | cut -b2-3`
+release=`echo $version | cut -b1-2`.`echo $version | cut -b3-4`
rm -fr annobin-$release annobin-gcc-plugin-$release annobin-$release.tar.xz annobin-gcc-plugin-$release.tar.xz