maint: address sc_bindtextdomain, sc_program_name and sc_prohibit_HAVE_MBRTOWC.

	* bootstrap.conf (gnulib_modules): Require progname.
	* src/complain.c, src/getargs.c, src/getargs.h, src/main.c: Use it.
	* cfg.mk (exclude): New.
	Use it.
	Skip lib/main.c for bindtextdomain and set_program_name.
(cherry picked from commit 4d699f44e65d29b4d49cf68d7a3b4bf856eb5d1b)

Conflicts:

	cfg.mk

diff --git a/bootstrap.conf b/bootstrap.conf
index 04a03361522303b6f2994be5fb0fa10647416bb7..f2aca47d14c6b9fb060b3a813ad58a9aa9baba19 100644 (file)
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -22,7 +22,8 @@ gnulib_modules='
   gettext git-version-gen gitlog-to-changelog
   gpl-3.0 hash inttypes isnan javacomp-script
   javaexec-script ldexpl maintainer-makefile malloc-gnu mbschr mbsrchr
-  mbswidth obstack perror pipe-posix quote quotearg realloc-posix
+  mbswidth obstack perror pipe-posix progname
+  quote quotearg realloc-posix
   spawn-pipe stdbool stpcpy strdup-posix strerror strtoul strverscmp
   sysexits
   unistd unistd-safer unlocked-io update-copyright unsetenv verify

diff --git a/cfg.mk b/cfg.mk
index f90f287b618862a64c47518f11abb4c360a2914a..d9221ee5678a94585b513ef457f0b91511fa8c88 100644 (file)
--- a/cfg.mk
+++ b/cfg.mk
@@ -39,9 +39,6 @@ url_dir_list = \
 local-checks-to-skip = \
   changelog-check \
   sc_immutable_NEWS                    \
-  sc_bindtextdomain                    \
-  sc_program_name                      \
-  sc_prohibit_HAVE_MBRTOWC             \
   sc_prohibit_always-defined_macros    \
   sc_prohibit_always_true_header_tests \
   sc_prohibit_atoi_atof                        \
@@ -62,9 +59,13 @@ update-copyright: update-b4-copyright update-package-copyright-year
 update-copyright-env = \
   UPDATE_COPYRIGHT_FORCE=1 UPDATE_COPYRIGHT_USE_INTERVALS=1
 
-exclude_file_name_regexp--sc_prohibit_empty_lines_at_EOF = ^src/parse-gram.[ch]$$
-exclude_file_name_regexp--sc_require_config_h_first = \
-  ^(lib/yyerror|data/(glr|yacc))\.c$$
-exclude_file_name_regexp--sc_space_tab = ^tests/(input|c\+\+)\.at$$
-exclude_file_name_regexp--sc_trailing_blank = ^src/parse-gram.[ch]$$
-exclude_file_name_regexp--sc_unmarked_diagnostics = ^djgpp/
+exclude = $(foreach a,$(1),$(eval exclude_file_name_regexp--sc_$(a)))
+$(call exclude,                                                        \
+  bindtextdomain=^lib/main.c$$                                 \
+  program_name=^lib/main.c$$                                   \
+  prohibit_empty_lines_at_EOF=^src/parse-gram.[ch]$$           \
+  require_config_h_first=^(lib/yyerror|data/(glr|yacc))\.c$$   \
+  space_tab=^tests/(input|c\+\+)\.at$$                         \
+  trailing_blank=^src/parse-gram.[ch]$$                                \
+  unmarked_diagnostics=^djgpp/                                 \
+)

diff --git a/lib/.gitignore b/lib/.gitignore
index 832cab85784a21701ff8becd018f437837744b7b..c1c7c06cd93c0a632480821217f0ee6de7b93a8e 100644 (file)
--- a/lib/.gitignore
+++ b/lib/.gitignore
@@ -264,3 +264,5 @@
 /fpending.c
 /fpending.h
 /sysexits.in.h
+/progname.c
+/progname.h

diff --git a/src/complain.c b/src/complain.c
index b34779107906c52490bcb89e63ebf01d8c36a263..dee3c3bbfed0ef52facee10c4ee36a77609b6731 100644 (file)
--- a/src/complain.c
+++ b/src/complain.c
@@ -23,6 +23,7 @@
 #include "system.h"
 
 #include <stdarg.h>
+#include <progname.h>
 
 #include "complain.h"
 #include "files.h"

diff --git a/src/getargs.c b/src/getargs.c
index 01cf8109e7b907b55ebb86586125f4c9fe21e964..1185e40944a157013c0720c0e10bdd0b3c09ae0c 100644 (file)
--- a/src/getargs.c
+++ b/src/getargs.c
@@ -40,6 +40,8 @@
 # undef HACK_FOR___GNU_LIBRARY___PROTOTYPE
 #endif
 
+#include <progname.h>
+
 #include "complain.h"
 #include "files.h"
 #include "getargs.h"
@@ -79,8 +81,6 @@ int language_prio = default_prio;
 struct bison_language const *language = &valid_languages[0];
 const char *include = NULL;
 
-char *program_name;
-
 
 /** Decode an option's set of keys.
  *

diff --git a/src/getargs.h b/src/getargs.h
index dc727e83dd29a777ca6de93ea7469aeb27b97d64..22538cf3ee17bfe5b129c66d260cb0ae753a4ec3 100644 (file)
--- a/src/getargs.h
+++ b/src/getargs.h
@@ -23,7 +23,6 @@
 
 #include "location.h"
 
-extern char *program_name;
 enum { command_line_prio, grammar_prio, default_prio };
 
 /* flags set by % directives */

diff --git a/src/main.c b/src/main.c
index 3dbac3a9a92928861f267461c8b369d29a67c1f5..fdb26ac69973fa2cbf476204d544d09b05ee3365 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -24,6 +24,7 @@
 #include <bitset_stats.h>
 #include <bitset.h>
 #include <configmake.h>
+#include <progname.h>
 #include <quotearg.h>
 #include <timevar.h>
 
@@ -57,7 +58,7 @@
 int
 main (int argc, char *argv[])
 {
-  program_name = argv[0];
+  set_program_name (argv[0]);
   setlocale (LC_ALL, "");
   (void) bindtextdomain (PACKAGE, LOCALEDIR);
   (void) bindtextdomain ("bison-runtime", LOCALEDIR);