On Wed, Jun 04, 2014 at 10:59:08AM +0200, Michal Privoznik wrote:
In the past we had some issues where setlocale() was called without
corresponding include of locale.h. While on some systems this may
work, on others the compilation failed. We should have a syntax-check
rule for that to prevent this from happening again.
Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com>
---
cfg.mk | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/cfg.mk b/cfg.mk
index 9e8fcec..36395c6 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -929,6 +929,15 @@ sc_prohibit_mixed_case_abbreviations:
halt='Use PCI, USB, SCSI, not Pci, Usb, Scsi' \
$(_sc_search_regexp)
+# Require #include <locale.h> in all files that call setlocale()
+sc_require_locale_h:
+ @for i in $$($(VC_LIST_EXCEPT) | grep '\.[chx]$$'); do \
+ if test -z "$$(grep setlocale $$i)" ; then continue; fi; \
Why not:
if ! grep -q setlocale $$i; then continue; fi
? It shouldn't be any bashism and I think it works everywhere. I just
tried it in dash and it works. And if I may nitpick, you can also
s/setlocale/\bsetlocale(/.
+ if test -z "$$(grep 'include <locale.h>'
$$i)" ; then \
The same here. '# *include...' for the maximum bonus ;)
+ echo '$(ME): missing locale.h include in' $$i 1>&2;
exit 1; \
+ fi; \
+ done;
+
# We don't use this feature of maint.mk.
prev_version_file = /dev/null
ACK with the changes mentioned.
Martin