diff options
| author | Pádraig Brady <P@draigBrady.com> | 2017-09-19 22:24:39 -0700 |
|---|---|---|
| committer | Pádraig Brady <P@draigBrady.com> | 2017-09-19 22:32:00 -0700 |
| commit | a608f1e781aeaba2cd276d6b15dbdf53e980a23f (patch) | |
| tree | 7e69fe544601c9035be5fe9459ba328331f304ef | |
| parent | maint: fix new syntax check failures from copy restrictions (diff) | |
| download | coreutils-a608f1e781aeaba2cd276d6b15dbdf53e980a23f.tar.gz coreutils-a608f1e781aeaba2cd276d6b15dbdf53e980a23f.zip | |
maint: fix new syntax-check failures from HTTPS adjustments
* cfg.mk [old_NEWS_hash]: update with `make update-NEWS-hash`.
[sc_long_lines]: Avoid flagging (long) URLs in NEWS.
* src/sort.c: Tweak to a shorter line.
* src/tail.c: Likewise.
Introduced in v8.28-4-gbe87d61
| -rw-r--r-- | cfg.mk | 5 | ||||
| -rw-r--r-- | src/sort.c | 2 | ||||
| -rw-r--r-- | src/tail.c | 2 |
3 files changed, 5 insertions, 4 deletions
@@ -48,7 +48,7 @@ export VERBOSE = yes # 4914152 9e export XZ_OPT = -8e -old_NEWS_hash = 0c14d8be06bfd7cc0024b7d39fdd6e1e +old_NEWS_hash = 8c2a749f657a6bd541e8b9c5227fe26f # Add an exemption for sc_makefile_at_at_check. _makefile_at_at_check_exceptions = ' && !/^cu_install_prog/ && !/dynamic-dep/' @@ -320,11 +320,12 @@ sc_prohibit-gl-attributes: $(_sc_search_regexp) # Look for lines longer than 80 characters, except omit: -# - program-generated long lines in diff headers, +# - urls # - the help2man script copied from upstream, # - tests involving long checksum lines, and # - the 'pr' test cases. FILTER_LONG_LINES = \ + \|^[^:]*NEWS:.*https\{,1\}://| d; \ \|^[^:]*man/help2man:| d; \ \|^[^:]*tests/misc/sha[0-9]*sum.*\.pl[-:]| d; \ \|^[^:]*tests/pr/|{ \|^[^:]*tests/pr/pr-tests:| !d; }; diff --git a/src/sort.c b/src/sort.c index e5ef8a72f..8f16ec41d 100644 --- a/src/sort.c +++ b/src/sort.c @@ -3193,7 +3193,7 @@ sequential_sort (struct line *restrict lines, size_t nlines, if (nlines == 2) { /* Declare 'swap' as int, not bool, to work around a bug - <https://lists.gnu.org/archive/html/bug-coreutils/2005-10/msg00086.html> + <https://lists.gnu.org/archive/html/bug-coreutils/2005-10/msg00086.html> in the IBM xlc 6.0.0.0 compiler in 64-bit mode. */ int swap = (0 < compare (&lines[-1], &lines[-2])); if (to_temp) diff --git a/src/tail.c b/src/tail.c index 847c7096f..1c7418d34 100644 --- a/src/tail.c +++ b/src/tail.c @@ -2027,7 +2027,7 @@ tail_file (struct File_spec *f, uintmax_t n_units) { /* Note: we must use read_pos here, not stats.st_size, to avoid a race condition described by Ken Raeburn: - https://lists.gnu.org/archive/html/bug-textutils/2003-05/msg00007.html */ + https://lists.gnu.org/archive/html/bug-textutils/2003-05/msg00007.html */ record_open_fd (f, fd, read_pos, &stats, (is_stdin ? -1 : 1)); f->remote = fremote (fd, pretty_name (f)); } |