Changeset a60e4c5 for patches/readline-5.2-fixes-4.patch

Timestamp:

Dec 19, 2007, 9:35:11 PM (18 years ago)

Author:

Joe Ciccone <jciccone@…>

Branches:

clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

a4357b0

Parents:

a2498b26

Message:

Updated Various branch update patches.

File:

• patches/readline-5.2-fixes-4.patch (moved) (moved from patches/readline-5.2-fixes-3.patch ) (14 diffs)

patches/readline-5.2-fixes-4.patch

@@ -1 +1 @@
 Submitted By: Jim Gifford (jim at linuxfromscratch dot org)
-Date: 2007-09-03
+Date: 12-21-2007
 Initial Package Version: 5.2
-Origin: ftp://ftp.cwru.edu/pub/bash/readline-5.2-patches
-Upstream Status: From Upstream
-Description: Contains patches 001-007 from upstream
- 
+Origin: Upstream
+Upstream Status: Applied
+Description: Contains all upstream patches up to 5.2-012
+
 diff -Naur readline-5.2.orig/complete.c readline-5.2/complete.c
---- readline-5.2.orig/complete.c        2006-07-28 08:35:49.000000000 -0700
-+++ readline-5.2/complete.c     2007-09-03 22:06:46.000000000 -0700
+--- readline-5.2.orig/complete.c        2006-07-28 11:35:49.000000000 -0400
++++ readline-5.2/complete.c     2007-12-21 00:06:28.000000000 -0500
 @@ -428,7 +428,7 @@
         return (1);
@@ -19 +19 @@
         return (2);
 diff -Naur readline-5.2.orig/display.c readline-5.2/display.c
---- readline-5.2.orig/display.c 2006-09-14 11:20:12.000000000 -0700
-+++ readline-5.2/display.c      2007-09-03 22:06:48.000000000 -0700
+--- readline-5.2.orig/display.c 2006-09-14 14:20:12.000000000 -0400
++++ readline-5.2/display.c      2007-12-21 00:06:31.000000000 -0500
+@@ -391,14 +391,14 @@
+       t = ++p;
+       local_prompt = expand_prompt (p, &prompt_visible_length,
+                                       &prompt_last_invisible,
+-                                      (int *)NULL,
++                                      &prompt_invis_chars_first_line,
+                                       &prompt_physical_chars);
+       c = *t; *t = '\0';
+       /* The portion of the prompt string up to and including the
+         final newline is now null-terminated. */
+       local_prompt_prefix = expand_prompt (prompt, &prompt_prefix_length,
+                                                   (int *)NULL,
+-                                                  &prompt_invis_chars_first_line,
++                                                  (int *)NULL,
+                                                   (int *)NULL);
+       *t = c;
+       local_prompt_len = local_prompt ? strlen (local_prompt) : 0;
 @@ -561,6 +561,17 @@
        wrap_offset = prompt_invis_chars_first_line = 0;
@@ -47 +64 @@
  #if defined (HANDLE_MULTIBYTE)   
  #define CHECK_LPOS() \
-@@ -1506,11 +1518,31 @@
+@@ -1036,7 +1048,7 @@
+                tx = _rl_col_width (&visible_line[pos], 0, nleft) - visible_wrap_offset;
+              else
+                tx = nleft;
+-             if (_rl_last_c_pos > tx)
++             if (tx >= 0 && _rl_last_c_pos > tx)
+                {
+                  _rl_backspace (_rl_last_c_pos - tx);  /* XXX */
+                  _rl_last_c_pos = tx;
+@@ -1192,7 +1204,7 @@
+      int current_line, omax, nmax, inv_botlin;
+ {
+   register char *ofd, *ols, *oe, *nfd, *nls, *ne;
+-  int temp, lendiff, wsatend, od, nd;
++  int temp, lendiff, wsatend, od, nd, o_cpos;
+   int current_invis_chars;
+   int col_lendiff, col_temp;
+ #if defined (HANDLE_MULTIBYTE)
+@@ -1453,6 +1465,8 @@
+        _rl_last_c_pos = lendiff;
+     }
+ 
++  o_cpos = _rl_last_c_pos;
++
+   /* When this function returns, _rl_last_c_pos is correct, and an absolute
+      cursor postion in multibyte mode, but a buffer index when not in a
+      multibyte locale. */
+@@ -1462,7 +1476,9 @@
+   /* We need to indicate that the cursor position is correct in the presence of
+      invisible characters in the prompt string.  Let's see if setting this when
+      we make sure we're at the end of the drawn prompt string works. */
+-  if (current_line == 0 && MB_CUR_MAX > 1 && rl_byte_oriented == 0 && _rl_last_c_pos == prompt_physical_chars)
++  if (current_line == 0 && MB_CUR_MAX > 1 && rl_byte_oriented == 0 && 
++      (_rl_last_c_pos > 0 || o_cpos > 0) &&
++      _rl_last_c_pos == prompt_physical_chars)
+     cpos_adjusted = 1;
+ #endif
+ #endif
+@@ -1506,11 +1522,31 @@
      {
        /* Non-zero if we're increasing the number of lines. */
@@ -80 +135 @@
           /* If lendiff > prompt_visible_length and _rl_last_c_pos == 0 and
              _rl_horizontal_scroll_mode == 1, inserting the characters with
-@@ -1586,8 +1618,22 @@
+@@ -1533,11 +1569,16 @@
+            }
+          else
+            {
+-             /* We have horizontal scrolling and we are not inserting at
+-                the end.  We have invisible characters in this line.  This
+-                is a dumb update. */
+              _rl_output_some_chars (nfd, temp);
+              _rl_last_c_pos += col_temp;
++             /* If nfd begins before any invisible characters in the prompt,
++                adjust _rl_last_c_pos to account for wrap_offset and set
++                cpos_adjusted to let the caller know. */
++             if (current_line == 0 && wrap_offset && ((nfd - new) <= prompt_last_invisible))
++               {
++                 _rl_last_c_pos -= wrap_offset;
++                 cpos_adjusted = 1;
++               }
+              return;
+            }
+          /* Copy (new) chars to screen from first diff to last match. */
+@@ -1586,8 +1627,22 @@
           temp = nls - nfd;
           if (temp > 0)
@@ -104 +179 @@
         }
        /* Otherwise, print over the existing material. */
-@@ -1595,8 +1641,20 @@
+@@ -1595,8 +1650,20 @@
         {
           if (temp > 0)
@@ -125 +200 @@
           lendiff = (oe - old) - (ne - new);
           if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
-@@ -1732,7 +1790,10 @@
+@@ -1732,7 +1799,10 @@
    if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
      {
@@ -137 +212 @@
           dpos -= woff;
           /* Since this will be assigned to _rl_last_c_pos at the end (more
-@@ -2380,6 +2441,8 @@
+@@ -2380,6 +2450,8 @@
  
    if (end <= start)
@@ -147 +222 @@
  
 diff -Naur readline-5.2.orig/input.c readline-5.2/input.c
---- readline-5.2.orig/input.c   2006-08-16 12:15:16.000000000 -0700
-+++ readline-5.2/input.c        2007-09-03 22:06:51.000000000 -0700
+--- readline-5.2.orig/input.c   2006-08-16 15:15:16.000000000 -0400
++++ readline-5.2/input.c        2007-12-21 00:06:32.000000000 -0500
 @@ -133,8 +133,11 @@
      return (0);
@@ -162 +237 @@
  
    return (1);
+@@ -151,7 +154,7 @@
+     {
+       pop_index--;
+       if (pop_index < 0)
+-       pop_index = ibuffer_len - 1;
++       pop_index = ibuffer_len;
+       ibuffer[pop_index] = key;
+       return (1);
+     }
 @@ -250,7 +253,8 @@
        while (chars_avail--)
@@ -224 +308 @@
        memset (&ps, 0, sizeof (mbstate_t));
 diff -Naur readline-5.2.orig/isearch.c readline-5.2/isearch.c
---- readline-5.2.orig/isearch.c 2005-12-26 14:18:53.000000000 -0800
-+++ readline-5.2/isearch.c      2007-09-03 22:06:46.000000000 -0700
+--- readline-5.2.orig/isearch.c 2005-12-26 17:18:53.000000000 -0500
++++ readline-5.2/isearch.c      2007-12-21 00:06:28.000000000 -0500
 @@ -327,8 +327,15 @@
    rl_command_func_t *f;
@@ -245 +329 @@
        f = _rl_keymap[c].function;
 diff -Naur readline-5.2.orig/misc.c readline-5.2/misc.c
---- readline-5.2.orig/misc.c    2005-12-26 14:20:46.000000000 -0800
-+++ readline-5.2/misc.c 2007-09-03 22:06:46.000000000 -0700
+--- readline-5.2.orig/misc.c    2005-12-26 17:20:46.000000000 -0500
++++ readline-5.2/misc.c 2007-12-21 00:06:28.000000000 -0500
 @@ -146,6 +146,8 @@
           rl_restore_prompt ();
@@ -257 +341 @@
      }
 diff -Naur readline-5.2.orig/readline.c readline-5.2/readline.c
---- readline-5.2.orig/readline.c        2006-08-16 12:00:36.000000000 -0700
-+++ readline-5.2/readline.c     2007-09-03 22:06:46.000000000 -0700
+--- readline-5.2.orig/readline.c        2006-08-16 15:00:36.000000000 -0400
++++ readline-5.2/readline.c     2007-12-21 00:06:28.000000000 -0500
 @@ -645,6 +645,11 @@
    if ((cxt->flags & KSEQ_DISPATCHED) == 0)
@@ -271 +355 @@
        cxt->flags |= KSEQ_DISPATCHED;
      }
+diff -Naur readline-5.2.orig/support/shobj-conf readline-5.2/support/shobj-conf
+--- readline-5.2.orig/support/shobj-conf        2006-04-11 09:15:43.000000000 -0400
++++ readline-5.2/support/shobj-conf     2007-12-21 00:06:32.000000000 -0500
+@@ -10,7 +10,7 @@
+ # Chet Ramey
+ # chet@po.cwru.edu
+ 
+-# Copyright (C) 1996-2002 Free Software Foundation, Inc.
++# Copyright (C) 1996-2007 Free Software Foundation, Inc.
+ #
+ # This program is free software; you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+@@ -114,7 +114,7 @@
+        SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)$(SHLIB_MINOR)'
+        ;;
+ 
+-freebsd2* | netbsd*)
++freebsd2*)
+        SHOBJ_CFLAGS=-fpic
+        SHOBJ_LD=ld
+        SHOBJ_LDFLAGS='-x -Bshareable'
+@@ -125,7 +125,7 @@
+ 
+ # FreeBSD-3.x ELF
+ freebsd[3-9]*|freebsdelf[3-9]*|freebsdaout[3-9]*|dragonfly*)
+-       SHOBJ_CFLAGS=-fpic
++       SHOBJ_CFLAGS=-fPIC
+        SHOBJ_LD='${CC}'
+ 
+        if [ -x /usr/bin/objformat ] && [ "`/usr/bin/objformat`" = "elf" ]; then
+@@ -142,7 +142,7 @@
+        ;;
+ 
+ # Darwin/MacOS X
+-darwin8*)
++darwin[89]*)
+        SHOBJ_STATUS=supported
+        SHLIB_STATUS=supported
+        
+@@ -153,7 +153,7 @@
+        SHLIB_LIBVERSION='$(SHLIB_MAJOR)$(SHLIB_MINOR).$(SHLIB_LIBSUFF)'
+        SHLIB_LIBSUFF='dylib'
+ 
+-       SHOBJ_LDFLAGS='-undefined dynamic_lookup'
++       SHOBJ_LDFLAGS='-dynamiclib -dynamic -undefined dynamic_lookup -arch_only `/usr/bin/arch`'
+        SHLIB_XLDFLAGS='-dynamiclib -arch_only `/usr/bin/arch` -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v'
+ 
+        SHLIB_LIBS='-lncurses'  # see if -lcurses works on MacOS X 10.1 
+@@ -171,7 +171,7 @@
+        SHLIB_LIBSUFF='dylib'
+ 
+        case "${host_os}" in
+-       darwin[78]*)    SHOBJ_LDFLAGS=''
++       darwin[789]*)   SHOBJ_LDFLAGS=''
+                        SHLIB_XLDFLAGS='-dynamiclib -arch_only `/usr/bin/arch` -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v'
+                        ;;
+        *)              SHOBJ_LDFLAGS='-dynamic'
+@@ -182,7 +182,7 @@
+        SHLIB_LIBS='-lncurses'  # see if -lcurses works on MacOS X 10.1 
+        ;;
+ 
+-openbsd*)
++openbsd*|netbsd*)
+        SHOBJ_CFLAGS=-fPIC
+        SHOBJ_LD='${CC}'
+        SHOBJ_LDFLAGS='-shared'
+@@ -247,7 +247,7 @@
+        SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)'
+        ;;
+ 
+-aix4.[2-9]*-*gcc*)             # lightly tested by jik@cisco.com
++aix4.[2-9]*-*gcc*|aix[5-9].*-*gcc*)            # lightly tested by jik@cisco.com
+        SHOBJ_CFLAGS=-fpic
+        SHOBJ_LD='ld'
+        SHOBJ_LDFLAGS='-bdynamic -bnoentry -bexpall'
+@@ -258,7 +258,7 @@
+        SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)'
+        ;;
+ 
+-aix4.[2-9]*)
++aix4.[2-9]*|aix[5-9].*)
+        SHOBJ_CFLAGS=-K
+        SHOBJ_LD='ld'
+        SHOBJ_LDFLAGS='-bdynamic -bnoentry -bexpall'
+@@ -329,7 +329,7 @@
+        SHOBJ_LD='${CC}'
+        # if you have problems linking here, moving the `-Wl,+h,$@' from
+        # SHLIB_XLDFLAGS to SHOBJ_LDFLAGS has been reported to work
+-       SHOBJ_LDFLAGS='-shared -Wl,-b -Wl,+s'
++       SHOBJ_LDFLAGS='-shared -fpic -Wl,-b -Wl,+s'
+ 
+        SHLIB_XLDFLAGS='-Wl,+h,$@ -Wl,+b,$(libdir)'
+        SHLIB_LIBSUFF='sl'
 diff -Naur readline-5.2.orig/text.c readline-5.2/text.c
---- readline-5.2.orig/text.c    2006-07-28 08:55:27.000000000 -0700
-+++ readline-5.2/text.c 2007-09-03 22:06:46.000000000 -0700
+--- readline-5.2.orig/text.c    2006-07-28 11:55:27.000000000 -0400
++++ readline-5.2/text.c 2007-12-21 00:06:28.000000000 -0500
 @@ -857,6 +857,9 @@
    c = rl_read_key ();
@@ -305 +482 @@
    else
 diff -Naur readline-5.2.orig/vi_mode.c readline-5.2/vi_mode.c
---- readline-5.2.orig/vi_mode.c 2006-07-29 13:42:28.000000000 -0700
-+++ readline-5.2/vi_mode.c      2007-09-03 22:06:46.000000000 -0700
+--- readline-5.2.orig/vi_mode.c 2006-07-29 16:42:28.000000000 -0400
++++ readline-5.2/vi_mode.c      2007-12-21 00:06:28.000000000 -0500
 @@ -886,6 +886,13 @@
    RL_SETSTATE(RL_STATE_MOREINPUT);