Mercurial > mxe-octave
annotate src/readline-0-001-fix-crash-when-readline-is-star.patch @ 7220:d3087afece14 default tip @
* src/gdal.mk, src/xcb.mk: disable doxygen docs
author | John Donoghue <john.donoghue@ieee.org> |
---|---|
date | Wed, 22 May 2024 10:31:54 -0400 |
parents | 142471155843 |
children |
rev | line source |
---|---|
6989
5f2c92da4d9c
readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
6545
diff
changeset
|
1 From 7274faabe97ce53d6b464272d7e6ab6c1392837b Mon Sep 17 00:00:00 2001 |
5f2c92da4d9c
readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
6545
diff
changeset
|
2 From: Chet Ramey <chet.ramey@case.edu> |
5f2c92da4d9c
readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
6545
diff
changeset
|
3 Date: Wed, 5 Oct 2022 10:41:16 -0400 |
7042
142471155843
readline: update to 8.2 patch level 10
Markus Mützel <markus.muetzel@gmx.de>
parents:
6989
diff
changeset
|
4 Subject: [PATCH 01/10] Readline-8.2 patch 1: fix crash when readline is |
142471155843
readline: update to 8.2 patch level 10
Markus Mützel <markus.muetzel@gmx.de>
parents:
6989
diff
changeset
|
5 started with an invalid locale specification |
5759
cdcabd2311e1
readline: Add upstream patch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
6 |
6989
5f2c92da4d9c
readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
6545
diff
changeset
|
7 --- |
5f2c92da4d9c
readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
6545
diff
changeset
|
8 nls.c | 4 ++++ |
5f2c92da4d9c
readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
6545
diff
changeset
|
9 patchlevel | 2 +- |
5f2c92da4d9c
readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
6545
diff
changeset
|
10 2 files changed, 5 insertions(+), 1 deletion(-) |
5759
cdcabd2311e1
readline: Add upstream patch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
11 |
6989
5f2c92da4d9c
readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
6545
diff
changeset
|
12 diff --git a/nls.c b/nls.c |
5f2c92da4d9c
readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
6545
diff
changeset
|
13 index 5c6a13b..8c027d6 100644 |
5f2c92da4d9c
readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
6545
diff
changeset
|
14 --- a/nls.c |
5f2c92da4d9c
readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
6545
diff
changeset
|
15 +++ b/nls.c |
5f2c92da4d9c
readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
6545
diff
changeset
|
16 @@ -141,6 +141,10 @@ _rl_init_locale (void) |
5f2c92da4d9c
readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
6545
diff
changeset
|
17 if (lspec == 0) |
6545
a76f513700df
readline: Fix issue with arrow keys in Octave CLI (bug #63400).
Markus Mützel <markus.muetzel@gmx.de>
parents:
6516
diff
changeset
|
18 lspec = ""; |
a76f513700df
readline: Fix issue with arrow keys in Octave CLI (bug #63400).
Markus Mützel <markus.muetzel@gmx.de>
parents:
6516
diff
changeset
|
19 ret = setlocale (LC_CTYPE, lspec); /* ok, since it does not change locale */ |
a76f513700df
readline: Fix issue with arrow keys in Octave CLI (bug #63400).
Markus Mützel <markus.muetzel@gmx.de>
parents:
6516
diff
changeset
|
20 + if (ret == 0 || *ret == 0) |
a76f513700df
readline: Fix issue with arrow keys in Octave CLI (bug #63400).
Markus Mützel <markus.muetzel@gmx.de>
parents:
6516
diff
changeset
|
21 + ret = setlocale (LC_CTYPE, (char *)NULL); |
a76f513700df
readline: Fix issue with arrow keys in Octave CLI (bug #63400).
Markus Mützel <markus.muetzel@gmx.de>
parents:
6516
diff
changeset
|
22 + if (ret == 0 || *ret == 0) |
a76f513700df
readline: Fix issue with arrow keys in Octave CLI (bug #63400).
Markus Mützel <markus.muetzel@gmx.de>
parents:
6516
diff
changeset
|
23 + ret = RL_DEFAULT_LOCALE; |
a76f513700df
readline: Fix issue with arrow keys in Octave CLI (bug #63400).
Markus Mützel <markus.muetzel@gmx.de>
parents:
6516
diff
changeset
|
24 #else |
a76f513700df
readline: Fix issue with arrow keys in Octave CLI (bug #63400).
Markus Mützel <markus.muetzel@gmx.de>
parents:
6516
diff
changeset
|
25 ret = (lspec == 0 || *lspec == 0) ? RL_DEFAULT_LOCALE : lspec; |
6989
5f2c92da4d9c
readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
6545
diff
changeset
|
26 #endif |
5f2c92da4d9c
readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
6545
diff
changeset
|
27 diff --git a/patchlevel b/patchlevel |
5f2c92da4d9c
readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
6545
diff
changeset
|
28 index d8c9df7..fdf4740 100644 |
5f2c92da4d9c
readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
6545
diff
changeset
|
29 --- a/patchlevel |
5f2c92da4d9c
readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
6545
diff
changeset
|
30 +++ b/patchlevel |
5759
cdcabd2311e1
readline: Add upstream patch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
31 @@ -1,3 +1,3 @@ |
cdcabd2311e1
readline: Add upstream patch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
32 # Do not edit -- exists only for use by patch |
cdcabd2311e1
readline: Add upstream patch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
33 |
cdcabd2311e1
readline: Add upstream patch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
34 -0 |
cdcabd2311e1
readline: Add upstream patch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
35 +1 |
6989
5f2c92da4d9c
readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
6545
diff
changeset
|
36 -- |
5f2c92da4d9c
readline: update to 8.1 patch level 7
Markus Mützel <markus.muetzel@gmx.de>
parents:
6545
diff
changeset
|
37 2.38.0.windows.1 |
5759
cdcabd2311e1
readline: Add upstream patch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
38 |