bug-bash
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Bash 5.1: --disable-multibyte build fix


From: Marc Aurèle La France
Subject: Bash 5.1: --disable-multibyte build fix
Date: Mon, 1 Feb 2021 16:15:16 -0700 (MST)
User-agent: Alpine 2.20 (LNX 67 2015-01-07)

Mostly typos.

Please Reply-To-All.

Thanks.

Marc.

--
--- bash-5.1/lib/glob/glob.c
+++ devel-5.1/lib/glob/glob.c
@@ -119,10 +119,10 @@ void udequote_pathname PARAMS((char *));
 #if HANDLE_MULTIBYTE
 void wcdequote_pathname PARAMS((wchar_t *));
 static void wdequote_pathname PARAMS((char *));
+static void dequote_pathname PARAMS((char *));
 #else
 #  define dequote_pathname udequote_pathname
 #endif
-static void dequote_pathname PARAMS((char *));
 static int glob_testdir PARAMS((char *, int));
 static char **glob_dir_to_array PARAMS((char *, char **, int));

--- bash-5.1/locale.c
+++ devel-5.1/locale.c
@@ -91,7 +91,7 @@ set_default_locale ()
 #if defined (HANDLE_MULTIBYTE)
   locale_shiftstates = mblen ((char *)NULL, 0);
 #else
-  local_shiftstates = 0;
+  locale_shiftstates = 0;
 #endif
 }

@@ -117,7 +117,7 @@ set_default_locale_vars ()
 #    if defined (HANDLE_MULTIBYTE)
       locale_shiftstates = mblen ((char *)NULL, 0);
 #    else
-      local_shiftstates = 0;
+      locale_shiftstates = 0;
 #    endif

       u32reset ();
@@ -226,7 +226,7 @@ set_locale_var (var, value)
 #  if defined (HANDLE_MULTIBYTE)
       locale_shiftstates = mblen ((char *)NULL, 0);
 #  else
-      local_shiftstates = 0;
+      locale_shiftstates = 0;
 #  endif
       u32reset ();
       return r;
@@ -250,7 +250,7 @@ set_locale_var (var, value)
 #if defined (HANDLE_MULTIBYTE)
          locale_shiftstates = mblen ((char *)NULL, 0);
 #else
-         local_shiftstates = 0;
+         locale_shiftstates = 0;
 #endif
          u32reset ();
        }
@@ -391,7 +391,7 @@ reset_locale_vars ()
 #  if defined (HANDLE_MULTIBYTE)
   locale_shiftstates = mblen ((char *)NULL, 0);
 #  else
-  local_shiftstates = 0;
+  locale_shiftstates = 0;
 #  endif
   u32reset ();
 #endif




reply via email to

[Prev in Thread] Current Thread [Next in Thread]