maint: avoid syntax-check failures

* Makefile.am (gen-ChangeLog): Replace 8 spaces by a tab to avoid
sc_makefile_TAB_only_indentation failure.
* po/POTFILES.in: Remove some entries to let sc_po_check pass.
While at it, sort the entries.
* find/print.c (do_fprintf): Remove stray semicolon to let
sc_prohibit_double_semicolon pass.
* find/util.c (digest_mode): Likewise.
* bootstrap.conf: Change comment to let sc_prohibit_doubled_word pass.
* build-aux/git-log-fix: Remove empty lines at EOF to let
sc_prohibit_empty_lines_at_EOF pass.
* find/testsuite/Makefile.am: Likewise.
* find/testsuite/sv-34079.sh: Likewise.
* find/testsuite/test_inode.sh: Likewise.
* locate/testsuite/locate.gnu/slocate.exp: Likewise.
* lib/buildcmd.c: Remove unused include of openat header to let
sc_prohibit_openat_without_use pass.
* lib/listfile.c: Likewise.
* find/util.c: Remove unused include of 'verify.h' to let
sc_prohibit_verify_without_use pass.
* xargs/xargs.c: Likewise.
* find/parser.c (insert_regex): Mark error diagnostic for translation;
found by 'make sc_unmarked_diagnostics'.
* cfg.mk (exclude_file_name_regexp--sc_prohibit_strncpy): Exempt the
2 remaining sources using the possibly dangerous strncpy function
from the syntax-check.
This commit is contained in:
Bernhard Voelker 2015-12-27 22:57:47 +01:00 committed by James Youngman
parent 07968e17e4
commit 852e4225af
15 changed files with 11 additions and 46 deletions

View File

@ -44,7 +44,7 @@ gen-ChangeLog:
&& cat $(top_srcdir)/ChangeLog-2013 ; \
} > $(distdir)/cl-t \
&& { rm -f $(distdir)/ChangeLog \
&& mv $(distdir)/cl-t $(distdir)/ChangeLog; } \
&& mv $(distdir)/cl-t $(distdir)/ChangeLog; } \
else \
echo "WARNING: $@: cannot generate ChangeLog since" >&2 && \
echo "$(top_srcdir) has no .git subdirectory" >&2 ; \

View File

@ -187,7 +187,7 @@ m4_base=gl/m4
# 'libgnulib' is mentioned in various 'Makefile.am' files.
gnulib_name=libgnulib
# PO files are checked-in in findutils, don't auto-update.
# PO files are committed to findutils, don't auto-update.
SKIP_PO=t

View File

@ -46,4 +46,3 @@ s,(find),* $1,
1d6d1afa52f40ad7c776e3ff0d4415409377e6fb
s/Mark/* po\/POTFILES.in: mark/;
s/(translation)/$1./

3
cfg.mk
View File

@ -46,6 +46,9 @@ exclude_file_name_regexp--sc_prohibit_doubled_word = \
exclude_file_name_regexp--sc_program_name = \
^lib/test_splitstring\.c$$
# Suppress syntax-check failure regarding possibly evil strncpy use for now.
exclude_file_name_regexp--sc_prohibit_strncpy = ^(find/print.c|lib/buildcmd.c)$$
# sc_texinfo_acronym: perms.texi from coreutils uses @acronym{GNU}.
exclude_file_name_regexp--sc_texinfo_acronym = doc/perm\.texi

View File

@ -2124,7 +2124,8 @@ insert_regex (char **argv,
error_message = re_compile_pattern (rx, strlen (rx), re);
if (error_message)
error (EXIT_FAILURE, 0, "failed to compile regular expression '%s': %s",
error (EXIT_FAILURE, 0,
_("failed to compile regular expression '%s': %s"),
rx, error_message);
our_pred->est_success_rate = estimate_pattern_match_rate (rx, 1);
return true;

View File

@ -1132,7 +1132,7 @@ do_fprintf (struct format_val *dest,
case 'S': /* sparseness */
/* UNTRUSTED, probably unexploitable */
checked_fprintf (dest, segment->text, file_sparseness (stat_buf));;
checked_fprintf (dest, segment->text, file_sparseness (stat_buf));
break;
case 't': /* mtime in `ctime' format */

View File

@ -281,5 +281,3 @@ configured-testfiles.txt: Makefile
checklists: configured-testfiles.txt Makefile
$(PYTHON) $(srcdir)/checklists.py configured-testfiles.txt $(srcdir) config find.gnu find.posix

View File

@ -76,4 +76,3 @@ else
echo "${testname} was not run because" '${RUN_VERY_EXPENSIVE_TESTS}' \
"is unset."
fi

View File

@ -60,6 +60,3 @@ if tmpfile=$(mktemp); then
fi
rm -f "${tmpfile}"
fi

View File

@ -38,7 +38,6 @@
#include "quotearg.h"
#include "save-cwd.h"
#include "timespec.h"
#include "verify.h"
#include "xalloc.h"
/* find headers. */
@ -728,7 +727,7 @@ digest_mode (mode_t *mode,
if (leaf)
{
state.have_stat = false;
state.have_type = false;;
state.have_type = false;
state.type = 0;
}
else

View File

@ -24,7 +24,6 @@
#include <error.h>
#include <limits.h>
#include <locale.h>
#include <openat.h>
#include <stdbool.h>
#include <stdlib.h>
#include <string.h>

View File

@ -24,7 +24,6 @@
#include <fcntl.h>
#include <grp.h>
#include <locale.h>
#include <openat.h>
#include <pwd.h>
#include <stdio.h>
#include <stdlib.h>

View File

@ -6,4 +6,3 @@ exec touch $tmp/subdia
exec mkdir $tmp/subdir
exec touch $tmp/subdir/fred
locate_start p "--changecwd=. --output=$tmp/locatedb --dbformat=slocate --localpaths=$tmp/subdi*" "--database=$tmp/locatedb -e subdi 2>/dev/null" {}

View File

@ -7,50 +7,23 @@
#Package source files
find/exec.c
find/oldfind.c
find/finddata.c
find/fstype.c
find/ftsfind.c
find/oldfind.c
find/parser.c
find/pred.c
find/print.c
find/tree.c
find/util.c
gl/lib/argmatch.c
gl/lib/closein.c
gl/lib/closeout.c
gl/lib/error.c
gl/lib/fnmatch_loop.c
gl/lib/getopt.c
gl/lib/openat-die.c
gl/lib/parse-datetime.c
gl/lib/quotearg.c
gl/lib/rpmatch.c
gl/lib/strftime.c
gl/lib/version-etc.c
gl/lib/xalloc-die.c
gl/lib/xstrtol-error.c
lib/buildcmd.c
lib/fdleak.c
lib/findutils-version.c
lib/buildcmd.c
lib/dircallback.c
lib/extendbuf.c
lib/fdleak.c
lib/findutils-version.c
lib/forcefindlib.c
lib/listfile.c
lib/printquoted.c
lib/qmark.c
lib/regexprops.c
lib/regextype.c
lib/safe-atoi.c
lib/splitstring.c
lib/test_splitstring.c
lib/waitpid.c
locate/bigram.c
locate/code.c
locate/frcode.c
locate/locate.c
locate/word_io.c
xargs/xargs.c
xargs/xargs.c

View File

@ -60,7 +60,6 @@
#include "progname.h"
#include "quotearg.h"
#include "safe-read.h"
#include "verify.h"
#include "xalloc.h"
/* find headers. */