1 files changed, 22 insertions, 198 deletions

diff --git a/locale/programs/record-status.h b/locale/programs/record-status.h
index b6bc58cddc..345f7f4b37 100644
--- a/locale/programs/record-status.h
+++ b/locale/programs/record-status.h
@@ -18,210 +18,34 @@
 #ifndef _RECORD_STATUS_H
 #define _RECORD_STATUS_H 1
 
-#include <stdlib.h>
-#include <stdarg.h>
-#include <error.h>
-#include <locale.h>
-#include <string.h>
-
-/* We tentatively define all of the global data we use:
-   * recorded_warning_count: Number of warnings counted.
-   * recorded_error_count: Number of errors counted.
-   * be_quiet: Should all calls be silent?
-   * verbose: Should verbose messages be printed?  */
-int recorded_warning_count;
-int recorded_error_count;
-int be_quiet;
-int verbose;
-
-/* Saved locale state.  */
+#include <stdio.h>
+#include <stdbool.h>
+
+/* Error, warning and verbose count and control.  */
+extern int recorded_warning_count;
+extern int recorded_error_count;
+extern int be_quiet;
+extern int verbose;
+extern bool warn_ascii;
+extern bool warn_int_curr_symbol;
+
+/* Record verbose, warnings, or errors... */
+void record_verbose (FILE *stream, const char *format, ...);
+void record_warning (const char *format, ...);
+void record_error (int status, int errnum, const char *format, ...);
+void record_error_at_line (int status, int errnum,
+			   const char *filename, unsigned int linenum,
+			   const char *format, ...);
+
+/* Locale related functionality for custom error functions.  */
 struct locale_state
 {
    /* The current in-use locale.  */
    char *cur_locale;
 };
 
-/* Alter the current locale to match the locale configured by the
-   user, and return the previous saved state.  */
-static struct locale_state
-push_locale (void)
-{
-  int saved_errno;
-  const char *orig;
-  char *copy = NULL;
-
-  saved_errno = errno;
-
-  orig = setlocale (LC_CTYPE, NULL);
-  if (orig == NULL)
-    error (0, 0, "failed to read locale!");
-
-  if (setlocale (LC_CTYPE, "") == NULL)
-    error (0, 0, "failed to set locale!");
-
-  errno = saved_errno;
-
-  if (orig != NULL)
-    copy = strdup (orig);
-
-  /* We will return either a valid locale or NULL if we failed
-     to save the locale.  */
-  return (struct locale_state) { .cur_locale = copy };
-}
-
-/* Use the saved state to restore the locale.  */
-static void
-pop_locale (struct locale_state ls)
-{
-  const char *set = NULL;
-  /* We might have failed to save the locale, so only attempt to
-     restore a validly saved non-NULL locale.  */
-  if (ls.cur_locale != NULL)
-    {
-      set = setlocale (LC_CTYPE, ls.cur_locale);
-      if (set == NULL)
-	error (0, 0, "failed to restore %s locale!", ls.cur_locale);
-
-      free (ls.cur_locale);
-    }
-}
-
-/* Wrapper to print verbose informative messages.
-   Verbose messages are only printed if --verbose
-   is in effect and --quiet is not.  */
-static void
-__attribute__ ((__format__ (__printf__, 2, 3), nonnull (1, 2), unused))
-record_verbose (FILE *stream, const char *format, ...)
-{
-  char *str;
-  va_list arg;
-
-  if (!verbose)
-    return;
-
-  if (!be_quiet)
-    {
-      struct locale_state ls;
-      int ret;
-
-      va_start (arg, format);
-      ls = push_locale ();
-
-      ret = vasprintf (&str, format, arg);
-      if (ret == -1)
-	abort ();
-
-      pop_locale (ls);
-      va_end (arg);
-
-      fprintf (stream, "%s\n", str);
-
-      free (str);
-    }
-}
-
-/* Wrapper to print warning messages.  We keep track of how
-   many were called because this effects our exit code.
-   Nothing is printed if --quiet is in effect, but warnings
-   are always counted.  */
-static void
-__attribute__ ((__format__ (__printf__, 1, 2), nonnull (1), unused))
-record_warning (const char *format, ...)
-{
-  char *str;
-  va_list arg;
-
-  recorded_warning_count++;
-
-  if (!be_quiet)
-    {
-      struct locale_state ls;
-      int ret;
-
-      va_start (arg, format);
-      ls = push_locale ();
-
-      ret = vasprintf (&str, format, arg);
-      if (ret == -1)
-	abort ();
-
-      pop_locale (ls);
-      va_end (arg);
-
-      fprintf (stderr, "%s\n", str);
-
-      free (str);
-    }
-}
-
-/* Wrapper to print error messages.  We keep track of how
-   many were called because this effects our exit code.
-   Nothing is printed if --quiet is in effect, but errors
-   are always counted, and fatal errors always exit the
-   program.  */
-static void
-__attribute__ ((__format__ (__printf__, 3, 4), nonnull (3), unused))
-record_error (int status, int errnum, const char *format, ...)
-{
-  char *str;
-  va_list arg;
-
-  recorded_error_count++;
-
-  /* The existing behaviour is that even if you use --quiet, a fatal
-     error is always printed and terminates the process.  */
-  if (!be_quiet || status != 0)
-    {
-      struct locale_state ls;
-      int ret;
-
-      va_start (arg, format);
-      ls = push_locale ();
-
-      ret = vasprintf (&str, format, arg);
-      if (ret == -1)
-        abort ();
-
-      pop_locale (ls);
-      va_end (arg);
-
-      error (status, errnum, "%s", str);
-
-      free (str);
-    }
-}
-/* ... likewise for error_at_line.  */
-static void
-__attribute__ ((__format__ (__printf__, 5, 6), nonnull (3, 5), unused))
-record_error_at_line (int status, int errnum, const char *filename,
-		      unsigned int linenum, const char *format, ...)
-{
-  char *str;
-  va_list arg;
-
-  recorded_error_count++;
-
-  /* The existing behaviour is that even if you use --quiet, a fatal
-     error is always printed and terminates the process.  */
-  if (!be_quiet || status != 0)
-    {
-      struct locale_state ls;
-      int ret;
-
-      va_start (arg, format);
-      ls = push_locale ();
-
-      ret = vasprintf (&str, format, arg);
-      if (ret == -1)
-        abort ();
-
-      pop_locale (ls);
-      va_end (arg);
-
-      error_at_line (status, errnum, filename, linenum, "%s", str);
+struct locale_state push_locale (void);
+void pop_locale (struct locale_state ls);
 
-      free (str);
-    }
-}
 
 #endif