From: Jim Meyering Date: Mon, 2 Jun 2008 15:48:11 +0000 (+0200) Subject: each file with a "main" must also declare program_name X-Git-Tag: v7.0~212 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=77b1bfc85cdf4ec01094ee31c8c85e2a83dea466;p=thirdparty%2Fcoreutils.git each file with a "main" must also declare program_name * maint.mk (sc_program_name): New rule. * .x-sc_program_name: New file. * Makefile.am (EXTRA_DIST): Add .x-sc_program_name. --- diff --git a/.x-sc_program_name b/.x-sc_program_name new file mode 100644 index 0000000000..eb4855f59a --- /dev/null +++ b/.x-sc_program_name @@ -0,0 +1,2 @@ +gl/lib/randint.c +lib/euidaccess-stat.c diff --git a/Makefile.am b/Makefile.am index 14f777ecb6..8c99923bc5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -22,7 +22,9 @@ EXTRA_DIST = cfg.mk maint.mk \ .vg-suppressions \ .x-po-check \ .x-sc_GPL_version \ - .x-sc_file_system .x-sc_obsolete_symbols \ + .x-sc_file_system \ + .x-sc_obsolete_symbols \ + .x-sc_program_name \ .x-sc_prohibit_atoi_atof \ .x-sc_prohibit_strcmp \ .x-sc_require_config_h \ diff --git a/maint.mk b/maint.mk index 91e26a4959..25551a84ac 100644 --- a/maint.mk +++ b/maint.mk @@ -341,6 +341,18 @@ sc_system_h_headers: .re-list 1>&2; exit 1; } || :; \ fi +# Ensure that each .c file containing a "main" function also +# declares "char *program_name", with or without "const". +sc_program_name: + @if $(VC_LIST_EXCEPT) | grep '\.c$$' > /dev/null; then \ + files=$$(grep -l '^main *(' $$($(VC_LIST_EXCEPT) | grep '\.c$$')); \ + grep -EL '^(char const|(const )?char) \*program_name;' $$files \ + | grep . && \ + { echo '$(ME): the above files do not declare program_name' \ + 1>&2; exit 1; } || :; \ + else :; \ + fi + # Require that the final line of each test-lib.sh-using test be this one: # (exit $fail); exit $fail # Note: this test requires GNU grep's --label= option.