Virgin import of GNU Readline 5.1
This commit is contained in:
parent
1708dd06c1
commit
7a7865ca93
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/vendor/libreadline/dist/; revision=157184
@ -808,3 +808,113 @@ examples/rl-fgets.c
|
|||||||
- new example from Harold Levy that wraps fgets replacement functions
|
- new example from Harold Levy that wraps fgets replacement functions
|
||||||
that call readline in a shared library that can be interposed with
|
that call readline in a shared library that can be interposed with
|
||||||
LD_PRELOAD
|
LD_PRELOAD
|
||||||
|
|
||||||
|
7/27
|
||||||
|
----
|
||||||
|
[readline-5.0 released]
|
||||||
|
|
||||||
|
11/15
|
||||||
|
-----
|
||||||
|
examples/rlfe/{ChangeLog,Makefile.in,README,config.h.in,configure,configure.in,extern.h,os.h,pty.c,rlfe.c,screen.h}
|
||||||
|
- new version of rlfe, rlfe-0.4, from Per Bothner; now a standalone
|
||||||
|
application
|
||||||
|
|
||||||
|
11/16
|
||||||
|
-----
|
||||||
|
shlib/Makefile.in
|
||||||
|
- substitute TERMCAP_LIB in from configure
|
||||||
|
|
||||||
|
configure.in
|
||||||
|
- if SHLIB_LIBS doesn't include a termcap library (curses, ncurses,
|
||||||
|
termcap, termlib), append the value of $TERMCAP_LIB to it
|
||||||
|
|
||||||
|
11/30
|
||||||
|
-----
|
||||||
|
configure.in
|
||||||
|
- take out change from 11/16; it doesn't work for some systems (e.g.,
|
||||||
|
SunOS 4.x and Solaris 2.6)
|
||||||
|
- add support for --enable-purify configure argument
|
||||||
|
- pass TERMCAP_LIB in environment when calling shobj-conf
|
||||||
|
|
||||||
|
examples/Makefile.in
|
||||||
|
- add support for building examples with purify
|
||||||
|
|
||||||
|
1/23/2005
|
||||||
|
---------
|
||||||
|
configure.in
|
||||||
|
- set BUILD_DIR to contain backslashes to escape any spaces in the
|
||||||
|
directory name -- this is what make will accept in targets and
|
||||||
|
prerequisites, so it's better than trying to use double quotes
|
||||||
|
|
||||||
|
2/25
|
||||||
|
----
|
||||||
|
configure.in
|
||||||
|
- change check for sys/ptem.h to include sys/stream.h if present, to
|
||||||
|
avoid the `present but cannot be compiled' messages on Solaris and
|
||||||
|
SVR4.2 (does anyone still use SVR4.2?)
|
||||||
|
|
||||||
|
5/7
|
||||||
|
---
|
||||||
|
configure.in
|
||||||
|
- add cross-compiling support from the bash configure.in, which cygwin
|
||||||
|
and mingw have apparently adopted
|
||||||
|
- add check for pwd.h, fcntl.h
|
||||||
|
- add checks for fcntl, kill system calls
|
||||||
|
- add checks for getpw{ent,nam,uid} C library functions
|
||||||
|
- pass a compile-time option through to Makefiles if cross-compiling
|
||||||
|
|
||||||
|
config.h.in
|
||||||
|
- add HAVE_PWD_H for <pwd.h>, HAVE_FCNTL_H for <fcntl.h>
|
||||||
|
- add HAVE_FCNTL, HAVE_KILL for respective system calls
|
||||||
|
- add HAVE_GETPW{ENT,NAM,UID} for passwd functions
|
||||||
|
|
||||||
|
Makefile.in,shlib/Makefile.in
|
||||||
|
- @CROSS_COMPILE@ is substituted into DEFS (equal to -DCROSS_COMPILING
|
||||||
|
if bash is being cross-compiled)
|
||||||
|
|
||||||
|
8/2
|
||||||
|
---
|
||||||
|
examples/Makefile.in
|
||||||
|
- use $(READLINE_LIB) instead of -lreadline to get around MacOS X 10.4's
|
||||||
|
preference for (incompatible) shared libraries over static libraries
|
||||||
|
in the load path
|
||||||
|
|
||||||
|
8/11
|
||||||
|
----
|
||||||
|
support/shobj-conf
|
||||||
|
- new variable: SHLIB_LIBPREF, prefix for shared library name (defaults
|
||||||
|
to `lib'
|
||||||
|
- new variable: SHLIB_DLLVERSION, used on Cygwin to set the library
|
||||||
|
version number
|
||||||
|
- new variable: SHLIB_DOT, separator character between library name and
|
||||||
|
suffix and version information (defaults to `.')
|
||||||
|
- new stanza for cygwin to generate windows-compatible dll
|
||||||
|
|
||||||
|
support/shlib-install
|
||||||
|
- add new option `-b bindir' for systems like cygwin/windows that
|
||||||
|
require it
|
||||||
|
- new stanza for cygwin that installs a dll into $bindir and an implied
|
||||||
|
link library into $libdir
|
||||||
|
|
||||||
|
configure.in
|
||||||
|
- substitute new variables from shobj-conf
|
||||||
|
|
||||||
|
shlib/Makefile.in
|
||||||
|
- substitute bindir, SHLIB_DOT, SHLIB_LIBPREF, SHLIB_DLLVERSION from
|
||||||
|
configure
|
||||||
|
- pass `-b $(bindir)' to shlib-install for install and uninstall targets
|
||||||
|
- library names now use $SHLIB_LIBPREF and $SHLIB_DOT
|
||||||
|
|
||||||
|
INSTALL,README
|
||||||
|
- document new SHLIB_DOT, SHLIB_LIBPREF, and SHLIB_DLLVERSION variables
|
||||||
|
|
||||||
|
10/4
|
||||||
|
----
|
||||||
|
[readline-5.1-beta1 frozen]
|
||||||
|
|
||||||
|
12/1
|
||||||
|
----
|
||||||
|
configure.in
|
||||||
|
- changed release status to `release'
|
||||||
|
|
||||||
|
[readline-5.1 frozen]
|
||||||
|
@ -1,3 +1,132 @@
|
|||||||
|
This document details the changes between this version, readline-5.1,
|
||||||
|
and the previous version, readline-5.0.
|
||||||
|
|
||||||
|
1. Changes to Readline
|
||||||
|
|
||||||
|
a. Fixed a bug that caused multiliine prompts to be wrapped and displayed
|
||||||
|
incorrectly.
|
||||||
|
|
||||||
|
b. Fixed a bug that caused ^P/^N in emacs mode to fail to display the current
|
||||||
|
line correctly.
|
||||||
|
|
||||||
|
c. Fixed a problem in computing the number of invisible characters on the first
|
||||||
|
line of a prompt whose length exceeds the screen width.
|
||||||
|
|
||||||
|
d. Fixed vi-mode searching so that failure preserves the current line rather
|
||||||
|
than the last line in the history list.
|
||||||
|
|
||||||
|
e. Fixed the vi-mode `~' command (change-case) to have the correct behavior at
|
||||||
|
end-of-line when manipulating multibyte characters.
|
||||||
|
|
||||||
|
f. Fixed the vi-mode `r' command (change-char) to have the correct behavior at
|
||||||
|
end-of-line when manipulating multibyte characters.
|
||||||
|
|
||||||
|
g. Fixed multiple bugs in the redisplay of multibyte characters: displaying
|
||||||
|
prompts longer than the screen width containing multibyte characters,
|
||||||
|
|
||||||
|
h. Fix the calculation of the number of physical characters in the prompt
|
||||||
|
string when it contains multibyte characters.
|
||||||
|
|
||||||
|
i. A non-zero value for the `rl_complete_suppress_append' variable now causes
|
||||||
|
no `/' to be appended to a directory name.
|
||||||
|
|
||||||
|
j. Fixed forward-word and backward-word to work when words contained
|
||||||
|
multibyte characters.
|
||||||
|
|
||||||
|
k. Fixed a bug in finding the delimiter of a `?' substring when performing
|
||||||
|
history expansion in a locale that supports multibyte characters.
|
||||||
|
|
||||||
|
l. Fixed a memory leak caused by not freeing the timestamp in a history entry.
|
||||||
|
|
||||||
|
m. Fixed a bug that caused "\M-x" style key bindings to not obey the setting
|
||||||
|
of the `convert-meta' variable.
|
||||||
|
|
||||||
|
n. Fixed saving and restoring primary prompt when prompting for incremental
|
||||||
|
and non-incremental searches; search prompts now display multibyte
|
||||||
|
characters correctly.
|
||||||
|
|
||||||
|
o. Fixed a bug that caused keys originally bound to self-insert but shadowed
|
||||||
|
by a multi-character key sequence to not be inserted.
|
||||||
|
|
||||||
|
p. Fixed code so rl_prep_term_function and rl_deprep_term_function aren't
|
||||||
|
dereferenced if NULL (matching the documentation).
|
||||||
|
|
||||||
|
q. Extensive changes to readline to add enough state so that commands
|
||||||
|
requiring additional characters (searches, multi-key sequences, numeric
|
||||||
|
arguments, commands requiring an additional specifier character like
|
||||||
|
vi-mode change-char, etc.) work without synchronously waiting for
|
||||||
|
additional input.
|
||||||
|
|
||||||
|
r. Lots of changes so readline builds and runs on MinGW.
|
||||||
|
|
||||||
|
s. Readline no longer tries to modify the terminal settings when running in
|
||||||
|
callback mode.
|
||||||
|
|
||||||
|
t. The Readline display code no longer sets the location of the last invisible
|
||||||
|
character in the prompt if the \[\] sequence is empty.
|
||||||
|
|
||||||
|
u. The `change-case' command now correctly changes the case of multibyte
|
||||||
|
characters.
|
||||||
|
|
||||||
|
v. Changes to the shared library construction scripts to deal with Windows
|
||||||
|
DLL naming conventions for Cygwin.
|
||||||
|
|
||||||
|
w. Fixed the redisplay code to avoid core dumps resulting from a poorly-timed
|
||||||
|
SIGWINCH.
|
||||||
|
|
||||||
|
x. Fixed the non-incremental search code in vi mode to dispose of any current
|
||||||
|
undo list when copying a line from the history into the current editing
|
||||||
|
buffer.
|
||||||
|
|
||||||
|
y. Fixed a bug that caused reversing the incremental search direction to
|
||||||
|
not work correctly.
|
||||||
|
|
||||||
|
z. Fixed the vi-mode `U' command to only undo up to the first time insert mode
|
||||||
|
was entered, as Posix specifies.
|
||||||
|
|
||||||
|
aa. Fixed a bug in the vi-mode `r' command that left the cursor in the wrong
|
||||||
|
place.
|
||||||
|
|
||||||
|
bb. Fixed a redisplay bug caused by moving the cursor vertically to a line
|
||||||
|
with invisible characters in the prompt in a multibyte locale.
|
||||||
|
|
||||||
|
cc. Fixed a bug that could cause the terminal special chars to be bound in the
|
||||||
|
wrong keymap in vi mode.
|
||||||
|
|
||||||
|
2. New Features in Readline
|
||||||
|
|
||||||
|
a. The key sequence sent by the keypad `delete' key is now automatically
|
||||||
|
bound to delete-char.
|
||||||
|
|
||||||
|
b. A negative argument to menu-complete now cycles backward through the
|
||||||
|
completion list.
|
||||||
|
|
||||||
|
c. A new bindable readline variable: bind-tty-special-chars. If non-zero,
|
||||||
|
readline will bind the terminal special characters to their readline
|
||||||
|
equivalents when it's called (on by default).
|
||||||
|
|
||||||
|
d. New bindable command: vi-rubout. Saves deleted text for possible
|
||||||
|
reinsertion, as with any vi-mode `text modification' command; `X' is bound
|
||||||
|
to this in vi command mode.
|
||||||
|
|
||||||
|
e. If the rl_completion_query_items is set to a value < 0, readline never
|
||||||
|
asks the user whether or not to view the possible completions.
|
||||||
|
|
||||||
|
f. The `C-w' binding in incremental search now understands multibyte
|
||||||
|
characters.
|
||||||
|
|
||||||
|
g. New application-callable auxiliary function, rl_variable_value, returns
|
||||||
|
a string corresponding to a readline variable's value.
|
||||||
|
|
||||||
|
h. When parsing inputrc files and variable binding commands, the parser
|
||||||
|
strips trailing whitespace from values assigned to boolean variables
|
||||||
|
before checking them.
|
||||||
|
|
||||||
|
i. A new external application-controllable variable that allows the LINES
|
||||||
|
and COLUMNS environment variables to set the window size regardless of
|
||||||
|
what the kernel returns.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------------
|
||||||
This document details the changes between this version, readline-5.0,
|
This document details the changes between this version, readline-5.0,
|
||||||
and the previous version, readline-4.3.
|
and the previous version, readline-4.3.
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
Basic Installation
|
Basic Installation
|
||||||
==================
|
==================
|
||||||
|
|
||||||
These are installation instructions for Readline-5.0.
|
These are installation instructions for Readline-5.1.
|
||||||
|
|
||||||
The simplest way to compile readline is:
|
The simplest way to compile readline is:
|
||||||
|
|
||||||
@ -238,6 +238,9 @@ SHLIB_XLDFLAGS Additional flags to pass to SHOBJ_LD for shared library
|
|||||||
SHLIB_LIBS Any additional libraries that shared libraries should be
|
SHLIB_LIBS Any additional libraries that shared libraries should be
|
||||||
linked against when they are created.
|
linked against when they are created.
|
||||||
|
|
||||||
|
SHLIB_LIBPREF The prefix to use when generating the filename of the shared
|
||||||
|
library. The default is `lib'; Cygwin uses `cyg'.
|
||||||
|
|
||||||
SHLIB_LIBSUFF The suffix to add to `libreadline' and `libhistory' when
|
SHLIB_LIBSUFF The suffix to add to `libreadline' and `libhistory' when
|
||||||
generating the filename of the shared library. Many systems
|
generating the filename of the shared library. Many systems
|
||||||
use `so'; HP-UX uses `sl'.
|
use `so'; HP-UX uses `sl'.
|
||||||
@ -254,6 +257,17 @@ SHLIB_LIBVERSION The string to append to the filename to indicate the version
|
|||||||
numbers; use `$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)' on those systems.
|
numbers; use `$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)' on those systems.
|
||||||
Other Unix versions use different schemes.
|
Other Unix versions use different schemes.
|
||||||
|
|
||||||
|
SHLIB_DLLVERSION The version number for shared libraries that determines API
|
||||||
|
compatibility between readline versions and the underlying
|
||||||
|
system. Used only on Cygwin. Defaults to $SHLIB_MAJOR, but
|
||||||
|
can be overridden at configuration time by defining DLLVERSION
|
||||||
|
in the environment.
|
||||||
|
|
||||||
|
SHLIB_DOT The character used to separate the name of the shared library
|
||||||
|
from the suffix and version information. The default is `.';
|
||||||
|
systems like Cygwin which don't separate version information
|
||||||
|
from the library name should set this to the empty string.
|
||||||
|
|
||||||
SHLIB_STATUS Set this to `supported' when you have defined the other
|
SHLIB_STATUS Set this to `supported' when you have defined the other
|
||||||
necessary variables. Make uses this to determine whether
|
necessary variables. Make uses this to determine whether
|
||||||
or not shared library creation should be attempted. If
|
or not shared library creation should be attempted. If
|
||||||
|
@ -3,6 +3,7 @@
|
|||||||
#
|
#
|
||||||
doc d
|
doc d
|
||||||
examples d
|
examples d
|
||||||
|
examples/rlfe d
|
||||||
support d
|
support d
|
||||||
shlib d
|
shlib d
|
||||||
COPYING f
|
COPYING f
|
||||||
@ -106,12 +107,23 @@ examples/manexamp.c f
|
|||||||
examples/readlinebuf.h f
|
examples/readlinebuf.h f
|
||||||
examples/rl-fgets.c f
|
examples/rl-fgets.c f
|
||||||
examples/rlcat.c f
|
examples/rlcat.c f
|
||||||
examples/rlfe.c f
|
|
||||||
examples/rltest.c f
|
examples/rltest.c f
|
||||||
examples/rl.c f
|
examples/rl.c f
|
||||||
|
examples/rlptytest.c f
|
||||||
examples/rlversion.c f
|
examples/rlversion.c f
|
||||||
examples/histexamp.c f
|
examples/histexamp.c f
|
||||||
examples/Inputrc f
|
examples/Inputrc f
|
||||||
|
examples/rlfe/ChangeLog f
|
||||||
|
examples/rlfe/Makefile.in f
|
||||||
|
examples/rlfe/README f
|
||||||
|
examples/rlfe/config.h.in f
|
||||||
|
examples/rlfe/configure f
|
||||||
|
examples/rlfe/configure.in f
|
||||||
|
examples/rlfe/extern.h f
|
||||||
|
examples/rlfe/os.h f
|
||||||
|
examples/rlfe/pty.c f
|
||||||
|
examples/rlfe/rlfe.c f
|
||||||
|
examples/rlfe/screen.h f
|
||||||
# formatted documentation, from MANIFEST.doc
|
# formatted documentation, from MANIFEST.doc
|
||||||
doc/readline.ps f
|
doc/readline.ps f
|
||||||
doc/history.ps f
|
doc/history.ps f
|
||||||
|
@ -43,6 +43,8 @@ RM = rm -f
|
|||||||
CP = cp
|
CP = cp
|
||||||
MV = mv
|
MV = mv
|
||||||
|
|
||||||
|
PURIFY = @PURIFY@
|
||||||
|
|
||||||
@SET_MAKE@
|
@SET_MAKE@
|
||||||
SHELL = @MAKE_SHELL@
|
SHELL = @MAKE_SHELL@
|
||||||
|
|
||||||
@ -71,7 +73,7 @@ CFLAGS = @CFLAGS@
|
|||||||
LOCAL_CFLAGS = @LOCAL_CFLAGS@ -DRL_LIBRARY_VERSION='"$(RL_LIBRARY_VERSION)"'
|
LOCAL_CFLAGS = @LOCAL_CFLAGS@ -DRL_LIBRARY_VERSION='"$(RL_LIBRARY_VERSION)"'
|
||||||
CPPFLAGS = @CPPFLAGS@
|
CPPFLAGS = @CPPFLAGS@
|
||||||
|
|
||||||
DEFS = @DEFS@
|
DEFS = @DEFS@ @CROSS_COMPILE@
|
||||||
LOCAL_DEFS = @LOCAL_DEFS@
|
LOCAL_DEFS = @LOCAL_DEFS@
|
||||||
|
|
||||||
TERMCAP_LIB = @TERMCAP_LIB@
|
TERMCAP_LIB = @TERMCAP_LIB@
|
||||||
|
@ -1,55 +1,32 @@
|
|||||||
This is a terse description of the new features added to readline-5.0 since
|
This is a terse description of the new features added to readline-5.1 since
|
||||||
the release of readline-4.3.
|
the release of readline-5.0.
|
||||||
|
|
||||||
1. New Features in Readline
|
1. New Features in Readline
|
||||||
|
|
||||||
a. History expansion has a new `a' modifier equivalent to the `g' modifier
|
a. The key sequence sent by the keypad `delete' key is now automatically
|
||||||
for compatibility with the BSD csh.
|
bound to delete-char.
|
||||||
|
|
||||||
b. History expansion has a new `G' modifier equivalent to the BSD csh `g'
|
b. A negative argument to menu-complete now cycles backward through the
|
||||||
modifier, which performs a substitution once per word.
|
completion list.
|
||||||
|
|
||||||
c. All non-incremental search operations may now undo the operation of
|
c. A new bindable readline variable: bind-tty-special-chars. If non-zero,
|
||||||
replacing the current line with the history line.
|
readline will bind the terminal special characters to their readline
|
||||||
|
equivalents when it's called (on by default).
|
||||||
|
|
||||||
d. The text inserted by an `a' command in vi mode can be reinserted with
|
d. New bindable command: vi-rubout. Saves deleted text for possible
|
||||||
`.'.
|
reinsertion, as with any vi-mode `text modification' command; `X' is bound
|
||||||
|
to this in vi command mode.
|
||||||
|
|
||||||
e. New bindable variable, `show-all-if-unmodified'. If set, the readline
|
e. If the rl_completion_query_items is set to a value < 0, readline never
|
||||||
completer will list possible completions immediately if there is more
|
asks the user whether or not to view the possible completions.
|
||||||
than one completion and partial completion cannot be performed.
|
|
||||||
|
|
||||||
f. There is a new application-callable `free_history_entry()' function.
|
f. New application-callable auxiliary function, rl_variable_value, returns
|
||||||
|
a string corresponding to a readline variable's value.
|
||||||
|
|
||||||
g. History list entries now contain timestamp information; the history file
|
g. When parsing inputrc files and variable binding commands, the parser
|
||||||
functions know how to read and write timestamp information associated
|
strips trailing whitespace from values assigned to boolean variables
|
||||||
with each entry.
|
before checking them.
|
||||||
|
|
||||||
h. Four new key binding functions have been added:
|
h. A new external application-controllable variable that allows the LINES
|
||||||
|
and COLUMNS environment variables to set the window size regardless of
|
||||||
rl_bind_key_if_unbound()
|
what the kernel returns.
|
||||||
rl_bind_key_if_unbound_in_map()
|
|
||||||
rl_bind_keyseq_if_unbound()
|
|
||||||
rl_bind_keyseq_if_unbound_in_map()
|
|
||||||
|
|
||||||
i. New application variable, rl_completion_quote_character, set to any
|
|
||||||
quote character readline finds before it calls the application completion
|
|
||||||
function.
|
|
||||||
|
|
||||||
j. New application variable, rl_completion_suppress_quote, settable by an
|
|
||||||
application completion function. If set to non-zero, readline does not
|
|
||||||
attempt to append a closing quote to a completed word.
|
|
||||||
|
|
||||||
k. New application variable, rl_completion_found_quote, set to a non-zero
|
|
||||||
value if readline determines that the word to be completed is quoted.
|
|
||||||
Set before readline calls any application completion function.
|
|
||||||
|
|
||||||
l. New function hook, rl_completion_word_break_hook, called when readline
|
|
||||||
needs to break a line into words when completion is attempted. Allows
|
|
||||||
the word break characters to vary based on position in the line.
|
|
||||||
|
|
||||||
m. New bindable command: unix-filename-rubout. Does the same thing as
|
|
||||||
unix-word-rubout, but adds `/' to the set of word delimiters.
|
|
||||||
|
|
||||||
n. When listing completions, directories have a `/' appended if the
|
|
||||||
`mark-directories' option has been enabled.
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
Introduction
|
Introduction
|
||||||
============
|
============
|
||||||
|
|
||||||
This is the Gnu Readline library, version 5.0.
|
This is the Gnu Readline library, version 5.1.
|
||||||
|
|
||||||
The Readline library provides a set of functions for use by applications
|
The Readline library provides a set of functions for use by applications
|
||||||
that allow users to edit command lines as they are typed in. Both
|
that allow users to edit command lines as they are typed in. Both
|
||||||
@ -102,6 +102,9 @@ SHLIB_XLDFLAGS Additional flags to pass to SHOBJ_LD for shared library
|
|||||||
SHLIB_LIBS Any additional libraries that shared libraries should be
|
SHLIB_LIBS Any additional libraries that shared libraries should be
|
||||||
linked against when they are created.
|
linked against when they are created.
|
||||||
|
|
||||||
|
SHLIB_LIBPREF The prefix to use when generating the filename of the shared
|
||||||
|
library. The default is `lib'; Cygwin uses `cyg'.
|
||||||
|
|
||||||
SHLIB_LIBSUFF The suffix to add to `libreadline' and `libhistory' when
|
SHLIB_LIBSUFF The suffix to add to `libreadline' and `libhistory' when
|
||||||
generating the filename of the shared library. Many systems
|
generating the filename of the shared library. Many systems
|
||||||
use `so'; HP-UX uses `sl'.
|
use `so'; HP-UX uses `sl'.
|
||||||
@ -118,6 +121,17 @@ SHLIB_LIBVERSION The string to append to the filename to indicate the version
|
|||||||
numbers; use `$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)' on those systems.
|
numbers; use `$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)' on those systems.
|
||||||
Other Unix versions use different schemes.
|
Other Unix versions use different schemes.
|
||||||
|
|
||||||
|
SHLIB_DLLVERSION The version number for shared libraries that determines API
|
||||||
|
compatibility between readline versions and the underlying
|
||||||
|
system. Used only on Cygwin. Defaults to $SHLIB_MAJOR, but
|
||||||
|
can be overridden at configuration time by defining DLLVERSION
|
||||||
|
in the environment.
|
||||||
|
|
||||||
|
SHLIB_DOT The character used to separate the name of the shared library
|
||||||
|
from the suffix and version information. The default is `.';
|
||||||
|
systems like Cygwin which don't separate version information
|
||||||
|
from the library name should set this to the empty string.
|
||||||
|
|
||||||
SHLIB_STATUS Set this to `supported' when you have defined the other
|
SHLIB_STATUS Set this to `supported' when you have defined the other
|
||||||
necessary variables. Make uses this to determine whether
|
necessary variables. Make uses this to determine whether
|
||||||
or not shared library creation should be attempted.
|
or not shared library creation should be attempted.
|
||||||
|
48
contrib/libreadline/aclocal.m4
vendored
48
contrib/libreadline/aclocal.m4
vendored
@ -1541,7 +1541,14 @@ AC_DEFUN(BASH_CHECK_DEV_FD,
|
|||||||
[AC_MSG_CHECKING(whether /dev/fd is available)
|
[AC_MSG_CHECKING(whether /dev/fd is available)
|
||||||
AC_CACHE_VAL(bash_cv_dev_fd,
|
AC_CACHE_VAL(bash_cv_dev_fd,
|
||||||
[if test -d /dev/fd && test -r /dev/fd/0 < /dev/null; then
|
[if test -d /dev/fd && test -r /dev/fd/0 < /dev/null; then
|
||||||
|
# check for systems like FreeBSD 5 that only provide /dev/fd/[012]
|
||||||
|
exec 3<&0
|
||||||
|
if test -r /dev/fd/3; then
|
||||||
bash_cv_dev_fd=standard
|
bash_cv_dev_fd=standard
|
||||||
|
else
|
||||||
|
bash_cv_dev_fd=absent
|
||||||
|
fi
|
||||||
|
exec 3<&-
|
||||||
elif test -d /proc/self/fd && test -r /proc/self/fd/0 < /dev/null; then
|
elif test -d /proc/self/fd && test -r /proc/self/fd/0 < /dev/null; then
|
||||||
bash_cv_dev_fd=whacky
|
bash_cv_dev_fd=whacky
|
||||||
else
|
else
|
||||||
@ -1733,11 +1740,17 @@ AC_CACHE_VAL(ac_cv_rl_version,
|
|||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <readline/readline.h>
|
#include <readline/readline.h>
|
||||||
|
|
||||||
|
extern int rl_gnu_readline_p;
|
||||||
|
|
||||||
main()
|
main()
|
||||||
{
|
{
|
||||||
FILE *fp;
|
FILE *fp;
|
||||||
fp = fopen("conftest.rlv", "w");
|
fp = fopen("conftest.rlv", "w");
|
||||||
if (fp == 0) exit(1);
|
if (fp == 0)
|
||||||
|
exit(1);
|
||||||
|
if (rl_gnu_readline_p != 1)
|
||||||
|
fprintf(fp, "0.0\n");
|
||||||
|
else
|
||||||
fprintf(fp, "%s\n", rl_library_version ? rl_library_version : "0.0");
|
fprintf(fp, "%s\n", rl_library_version ? rl_library_version : "0.0");
|
||||||
fclose(fp);
|
fclose(fp);
|
||||||
exit(0);
|
exit(0);
|
||||||
@ -1852,6 +1865,39 @@ AC_DEFINE(CTYPE_NON_ASCII)
|
|||||||
fi
|
fi
|
||||||
])
|
])
|
||||||
|
|
||||||
|
AC_DEFUN(BASH_CHECK_WCONTINUED,
|
||||||
|
[
|
||||||
|
AC_MSG_CHECKING(whether WCONTINUED flag to waitpid is unavailable or available but broken)
|
||||||
|
AC_CACHE_VAL(bash_cv_wcontinued_broken,
|
||||||
|
[AC_TRY_RUN([
|
||||||
|
#include <sys/types.h>
|
||||||
|
#include <sys/wait.h>
|
||||||
|
#include <unistd.h>
|
||||||
|
#include <errno.h>
|
||||||
|
|
||||||
|
#ifndef errno
|
||||||
|
extern int errno;
|
||||||
|
#endif
|
||||||
|
main()
|
||||||
|
{
|
||||||
|
int x;
|
||||||
|
|
||||||
|
x = waitpid(-1, (int *)0, WNOHANG|WCONTINUED);
|
||||||
|
if (x == -1 && errno == EINVAL)
|
||||||
|
exit (1);
|
||||||
|
else
|
||||||
|
exit (0);
|
||||||
|
}
|
||||||
|
], bash_cv_wcontinued_broken=no,bash_cv_wcontinued_broken=yes,
|
||||||
|
[AC_MSG_WARN(cannot check WCONTINUED if cross compiling -- defaulting to no)
|
||||||
|
bash_cv_wcontinued_broken=no]
|
||||||
|
)])
|
||||||
|
AC_MSG_RESULT($bash_cv_wcontinued_broken)
|
||||||
|
if test $bash_cv_wcontinued_broken = yes; then
|
||||||
|
AC_DEFINE(WCONTINUED_BROKEN)
|
||||||
|
fi
|
||||||
|
])
|
||||||
|
|
||||||
dnl
|
dnl
|
||||||
dnl tests added for bashdb
|
dnl tests added for bashdb
|
||||||
dnl
|
dnl
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/* bind.c -- key binding and startup file support for the readline library. */
|
/* bind.c -- key binding and startup file support for the readline library. */
|
||||||
|
|
||||||
/* Copyright (C) 1987, 1989, 1992 Free Software Foundation, Inc.
|
/* Copyright (C) 1987-2005 Free Software Foundation, Inc.
|
||||||
|
|
||||||
This file is part of the GNU Readline Library, a library for
|
This file is part of the GNU Readline Library, a library for
|
||||||
reading lines of text with interactive input and history editing.
|
reading lines of text with interactive input and history editing.
|
||||||
@ -77,6 +77,9 @@ static char *_rl_read_file PARAMS((char *, size_t *));
|
|||||||
static void _rl_init_file_error PARAMS((const char *));
|
static void _rl_init_file_error PARAMS((const char *));
|
||||||
static int _rl_read_init_file PARAMS((const char *, int));
|
static int _rl_read_init_file PARAMS((const char *, int));
|
||||||
static int glean_key_from_name PARAMS((char *));
|
static int glean_key_from_name PARAMS((char *));
|
||||||
|
static int find_boolean_var PARAMS((const char *));
|
||||||
|
|
||||||
|
static char *_rl_get_string_variable_value PARAMS((const char *));
|
||||||
static int substring_member_of_array PARAMS((char *, const char **));
|
static int substring_member_of_array PARAMS((char *, const char **));
|
||||||
|
|
||||||
static int currently_reading_init_file;
|
static int currently_reading_init_file;
|
||||||
@ -341,7 +344,7 @@ rl_generic_bind (type, keyseq, data, map)
|
|||||||
k.function = 0;
|
k.function = 0;
|
||||||
|
|
||||||
/* If no keys to bind to, exit right away. */
|
/* If no keys to bind to, exit right away. */
|
||||||
if (!keyseq || !*keyseq)
|
if (keyseq == 0 || *keyseq == 0)
|
||||||
{
|
{
|
||||||
if (type == ISMACR)
|
if (type == ISMACR)
|
||||||
free (data);
|
free (data);
|
||||||
@ -369,7 +372,7 @@ rl_generic_bind (type, keyseq, data, map)
|
|||||||
if (ic < 0 || ic >= KEYMAP_SIZE)
|
if (ic < 0 || ic >= KEYMAP_SIZE)
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
if (_rl_convert_meta_chars_to_ascii && META_CHAR (ic))
|
if (META_CHAR (ic) && _rl_convert_meta_chars_to_ascii)
|
||||||
{
|
{
|
||||||
ic = UNMETA (ic);
|
ic = UNMETA (ic);
|
||||||
if (map[ESC].type == ISKMAP)
|
if (map[ESC].type == ISKMAP)
|
||||||
@ -460,7 +463,14 @@ rl_translate_keyseq (seq, array, len)
|
|||||||
else if (c == 'M')
|
else if (c == 'M')
|
||||||
{
|
{
|
||||||
i++;
|
i++;
|
||||||
|
/* XXX - should obey convert-meta setting? */
|
||||||
|
if (_rl_convert_meta_chars_to_ascii && _rl_keymap[ESC].type == ISKMAP)
|
||||||
array[l++] = ESC; /* ESC is meta-prefix */
|
array[l++] = ESC; /* ESC is meta-prefix */
|
||||||
|
else
|
||||||
|
{
|
||||||
|
i++;
|
||||||
|
array[l++] = META (seq[i]);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else if (c == 'C')
|
else if (c == 'C')
|
||||||
{
|
{
|
||||||
@ -1185,9 +1195,9 @@ rl_parse_and_bind (string)
|
|||||||
/* If this is a command to set a variable, then do that. */
|
/* If this is a command to set a variable, then do that. */
|
||||||
if (_rl_stricmp (string, "set") == 0)
|
if (_rl_stricmp (string, "set") == 0)
|
||||||
{
|
{
|
||||||
char *var = string + i;
|
char *var, *value, *e;
|
||||||
char *value;
|
|
||||||
|
|
||||||
|
var = string + i;
|
||||||
/* Make VAR point to start of variable name. */
|
/* Make VAR point to start of variable name. */
|
||||||
while (*var && whitespace (*var)) var++;
|
while (*var && whitespace (*var)) var++;
|
||||||
|
|
||||||
@ -1198,6 +1208,20 @@ rl_parse_and_bind (string)
|
|||||||
*value++ = '\0';
|
*value++ = '\0';
|
||||||
while (*value && whitespace (*value)) value++;
|
while (*value && whitespace (*value)) value++;
|
||||||
|
|
||||||
|
/* Strip trailing whitespace from values to boolean variables. Temp
|
||||||
|
fix until I get a real quoted-string parser here. */
|
||||||
|
i = find_boolean_var (var);
|
||||||
|
if (i >= 0)
|
||||||
|
{
|
||||||
|
/* remove trailing whitespace */
|
||||||
|
e = value + strlen (value) - 1;
|
||||||
|
while (e >= value && whitespace (*e))
|
||||||
|
e--;
|
||||||
|
e++; /* skip back to whitespace or EOS */
|
||||||
|
if (*e && e >= value)
|
||||||
|
*e = '\0';
|
||||||
|
}
|
||||||
|
|
||||||
rl_variable_bind (var, value);
|
rl_variable_bind (var, value);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@ -1218,8 +1242,9 @@ rl_parse_and_bind (string)
|
|||||||
the quoted string delimiter, like the shell. */
|
the quoted string delimiter, like the shell. */
|
||||||
if (*funname == '\'' || *funname == '"')
|
if (*funname == '\'' || *funname == '"')
|
||||||
{
|
{
|
||||||
int delimiter = string[i++], passc;
|
int delimiter, passc;
|
||||||
|
|
||||||
|
delimiter = string[i++];
|
||||||
for (passc = 0; c = string[i]; i++)
|
for (passc = 0; c = string[i]; i++)
|
||||||
{
|
{
|
||||||
if (passc)
|
if (passc)
|
||||||
@ -1355,6 +1380,7 @@ static struct {
|
|||||||
int *value;
|
int *value;
|
||||||
int flags;
|
int flags;
|
||||||
} boolean_varlist [] = {
|
} boolean_varlist [] = {
|
||||||
|
{ "bind-tty-special-chars", &_rl_bind_stty_chars, 0 },
|
||||||
{ "blink-matching-paren", &rl_blink_matching_paren, V_SPECIAL },
|
{ "blink-matching-paren", &rl_blink_matching_paren, V_SPECIAL },
|
||||||
{ "byte-oriented", &rl_byte_oriented, 0 },
|
{ "byte-oriented", &rl_byte_oriented, 0 },
|
||||||
{ "completion-ignore-case", &_rl_completion_case_fold, 0 },
|
{ "completion-ignore-case", &_rl_completion_case_fold, 0 },
|
||||||
@ -1468,13 +1494,34 @@ find_string_var (name)
|
|||||||
values result in 0 (false). */
|
values result in 0 (false). */
|
||||||
static int
|
static int
|
||||||
bool_to_int (value)
|
bool_to_int (value)
|
||||||
char *value;
|
const char *value;
|
||||||
{
|
{
|
||||||
return (value == 0 || *value == '\0' ||
|
return (value == 0 || *value == '\0' ||
|
||||||
(_rl_stricmp (value, "on") == 0) ||
|
(_rl_stricmp (value, "on") == 0) ||
|
||||||
(value[0] == '1' && value[1] == '\0'));
|
(value[0] == '1' && value[1] == '\0'));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
char *
|
||||||
|
rl_variable_value (name)
|
||||||
|
const char *name;
|
||||||
|
{
|
||||||
|
register int i;
|
||||||
|
int v;
|
||||||
|
char *ret;
|
||||||
|
|
||||||
|
/* Check for simple variables first. */
|
||||||
|
i = find_boolean_var (name);
|
||||||
|
if (i >= 0)
|
||||||
|
return (*boolean_varlist[i].value ? "on" : "off");
|
||||||
|
|
||||||
|
i = find_string_var (name);
|
||||||
|
if (i >= 0)
|
||||||
|
return (_rl_get_string_variable_value (string_varlist[i].name));
|
||||||
|
|
||||||
|
/* Unknown variable names return NULL. */
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
int
|
int
|
||||||
rl_variable_bind (name, value)
|
rl_variable_bind (name, value)
|
||||||
const char *name, *value;
|
const char *name, *value;
|
||||||
@ -2117,12 +2164,68 @@ rl_dump_macros (count, key)
|
|||||||
return (0);
|
return (0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static char *
|
||||||
|
_rl_get_string_variable_value (name)
|
||||||
|
const char *name;
|
||||||
|
{
|
||||||
|
static char numbuf[32];
|
||||||
|
char *ret;
|
||||||
|
int n;
|
||||||
|
|
||||||
|
if (_rl_stricmp (name, "bell-style") == 0)
|
||||||
|
{
|
||||||
|
switch (_rl_bell_preference)
|
||||||
|
{
|
||||||
|
case NO_BELL:
|
||||||
|
return "none";
|
||||||
|
case VISIBLE_BELL:
|
||||||
|
return "visible";
|
||||||
|
case AUDIBLE_BELL:
|
||||||
|
default:
|
||||||
|
return "audible";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else if (_rl_stricmp (name, "comment-begin") == 0)
|
||||||
|
return (_rl_comment_begin ? _rl_comment_begin : RL_COMMENT_BEGIN_DEFAULT);
|
||||||
|
else if (_rl_stricmp (name, "completion-query-items") == 0)
|
||||||
|
{
|
||||||
|
sprintf (numbuf, "%d", rl_completion_query_items);
|
||||||
|
return (numbuf);
|
||||||
|
}
|
||||||
|
else if (_rl_stricmp (name, "editing-mode") == 0)
|
||||||
|
return (rl_get_keymap_name_from_edit_mode ());
|
||||||
|
else if (_rl_stricmp (name, "isearch-terminators") == 0)
|
||||||
|
{
|
||||||
|
if (_rl_isearch_terminators == 0)
|
||||||
|
return 0;
|
||||||
|
ret = _rl_untranslate_macro_value (_rl_isearch_terminators);
|
||||||
|
if (ret)
|
||||||
|
{
|
||||||
|
strncpy (numbuf, ret, sizeof (numbuf) - 1);
|
||||||
|
free (ret);
|
||||||
|
numbuf[sizeof(numbuf) - 1] = '\0';
|
||||||
|
}
|
||||||
|
else
|
||||||
|
numbuf[0] = '\0';
|
||||||
|
return numbuf;
|
||||||
|
}
|
||||||
|
else if (_rl_stricmp (name, "keymap") == 0)
|
||||||
|
{
|
||||||
|
ret = rl_get_keymap_name (_rl_keymap);
|
||||||
|
if (ret == 0)
|
||||||
|
ret = rl_get_keymap_name_from_edit_mode ();
|
||||||
|
return (ret ? ret : "none");
|
||||||
|
}
|
||||||
|
else
|
||||||
|
return (0);
|
||||||
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
rl_variable_dumper (print_readably)
|
rl_variable_dumper (print_readably)
|
||||||
int print_readably;
|
int print_readably;
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
const char *kname;
|
char *v;
|
||||||
|
|
||||||
for (i = 0; boolean_varlist[i].name; i++)
|
for (i = 0; boolean_varlist[i].name; i++)
|
||||||
{
|
{
|
||||||
@ -2134,63 +2237,16 @@ rl_variable_dumper (print_readably)
|
|||||||
*boolean_varlist[i].value ? "on" : "off");
|
*boolean_varlist[i].value ? "on" : "off");
|
||||||
}
|
}
|
||||||
|
|
||||||
/* bell-style */
|
for (i = 0; string_varlist[i].name; i++)
|
||||||
switch (_rl_bell_preference)
|
|
||||||
{
|
{
|
||||||
case NO_BELL:
|
v = _rl_get_string_variable_value (string_varlist[i].name);
|
||||||
kname = "none"; break;
|
if (v == 0) /* _rl_isearch_terminators can be NULL */
|
||||||
case VISIBLE_BELL:
|
continue;
|
||||||
kname = "visible"; break;
|
if (print_readably)
|
||||||
case AUDIBLE_BELL:
|
fprintf (rl_outstream, "set %s %s\n", string_varlist[i].name, v);
|
||||||
default:
|
else
|
||||||
kname = "audible"; break;
|
fprintf (rl_outstream, "%s is set to `%s'\n", string_varlist[i].name, v);
|
||||||
}
|
}
|
||||||
if (print_readably)
|
|
||||||
fprintf (rl_outstream, "set bell-style %s\n", kname);
|
|
||||||
else
|
|
||||||
fprintf (rl_outstream, "bell-style is set to `%s'\n", kname);
|
|
||||||
|
|
||||||
/* comment-begin */
|
|
||||||
if (print_readably)
|
|
||||||
fprintf (rl_outstream, "set comment-begin %s\n", _rl_comment_begin ? _rl_comment_begin : RL_COMMENT_BEGIN_DEFAULT);
|
|
||||||
else
|
|
||||||
fprintf (rl_outstream, "comment-begin is set to `%s'\n", _rl_comment_begin ? _rl_comment_begin : RL_COMMENT_BEGIN_DEFAULT);
|
|
||||||
|
|
||||||
/* completion-query-items */
|
|
||||||
if (print_readably)
|
|
||||||
fprintf (rl_outstream, "set completion-query-items %d\n", rl_completion_query_items);
|
|
||||||
else
|
|
||||||
fprintf (rl_outstream, "completion-query-items is set to `%d'\n", rl_completion_query_items);
|
|
||||||
|
|
||||||
/* editing-mode */
|
|
||||||
if (print_readably)
|
|
||||||
fprintf (rl_outstream, "set editing-mode %s\n", (rl_editing_mode == emacs_mode) ? "emacs" : "vi");
|
|
||||||
else
|
|
||||||
fprintf (rl_outstream, "editing-mode is set to `%s'\n", (rl_editing_mode == emacs_mode) ? "emacs" : "vi");
|
|
||||||
|
|
||||||
/* isearch-terminators */
|
|
||||||
if (_rl_isearch_terminators)
|
|
||||||
{
|
|
||||||
char *disp;
|
|
||||||
|
|
||||||
disp = _rl_untranslate_macro_value (_rl_isearch_terminators);
|
|
||||||
|
|
||||||
if (print_readably)
|
|
||||||
fprintf (rl_outstream, "set isearch-terminators \"%s\"\n", disp);
|
|
||||||
else
|
|
||||||
fprintf (rl_outstream, "isearch-terminators is set to \"%s\"\n", disp);
|
|
||||||
|
|
||||||
free (disp);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* keymap */
|
|
||||||
kname = rl_get_keymap_name (_rl_keymap);
|
|
||||||
if (kname == 0)
|
|
||||||
kname = rl_get_keymap_name_from_edit_mode ();
|
|
||||||
if (print_readably)
|
|
||||||
fprintf (rl_outstream, "set keymap %s\n", kname ? kname : "none");
|
|
||||||
else
|
|
||||||
fprintf (rl_outstream, "keymap is set to `%s'\n", kname ? kname : "none");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Print all of the current variables and their values to
|
/* Print all of the current variables and their values to
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/* callback.c -- functions to use readline as an X `callback' mechanism. */
|
/* callback.c -- functions to use readline as an X `callback' mechanism. */
|
||||||
|
|
||||||
/* Copyright (C) 1987, 1989, 1992 Free Software Foundation, Inc.
|
/* Copyright (C) 1987-2005 Free Software Foundation, Inc.
|
||||||
|
|
||||||
This file is part of the GNU Readline Library, a library for
|
This file is part of the GNU Readline Library, a library for
|
||||||
reading lines of text with interactive input and history editing.
|
reading lines of text with interactive input and history editing.
|
||||||
@ -44,6 +44,11 @@
|
|||||||
#include "readline.h"
|
#include "readline.h"
|
||||||
#include "rlprivate.h"
|
#include "rlprivate.h"
|
||||||
|
|
||||||
|
/* Private data for callback registration functions. See comments in
|
||||||
|
rl_callback_read_char for more details. */
|
||||||
|
_rl_callback_func_t *_rl_callback_func = 0;
|
||||||
|
_rl_callback_generic_arg *_rl_callback_data = 0;
|
||||||
|
|
||||||
/* **************************************************************** */
|
/* **************************************************************** */
|
||||||
/* */
|
/* */
|
||||||
/* Callback Readline Functions */
|
/* Callback Readline Functions */
|
||||||
@ -72,6 +77,7 @@ _rl_callback_newline ()
|
|||||||
{
|
{
|
||||||
in_handler = 1;
|
in_handler = 1;
|
||||||
|
|
||||||
|
if (rl_prep_term_function)
|
||||||
(*rl_prep_term_function) (_rl_meta_flag);
|
(*rl_prep_term_function) (_rl_meta_flag);
|
||||||
|
|
||||||
#if defined (HANDLE_SIGNALS)
|
#if defined (HANDLE_SIGNALS)
|
||||||
@ -89,6 +95,7 @@ rl_callback_handler_install (prompt, linefunc)
|
|||||||
rl_vcpfunc_t *linefunc;
|
rl_vcpfunc_t *linefunc;
|
||||||
{
|
{
|
||||||
rl_set_prompt (prompt);
|
rl_set_prompt (prompt);
|
||||||
|
RL_SETSTATE (RL_STATE_CALLBACK);
|
||||||
rl_linefunc = linefunc;
|
rl_linefunc = linefunc;
|
||||||
_rl_callback_newline ();
|
_rl_callback_newline ();
|
||||||
}
|
}
|
||||||
@ -98,7 +105,8 @@ void
|
|||||||
rl_callback_read_char ()
|
rl_callback_read_char ()
|
||||||
{
|
{
|
||||||
char *line;
|
char *line;
|
||||||
int eof;
|
int eof, jcode;
|
||||||
|
static procenv_t olevel;
|
||||||
|
|
||||||
if (rl_linefunc == NULL)
|
if (rl_linefunc == NULL)
|
||||||
{
|
{
|
||||||
@ -106,8 +114,80 @@ rl_callback_read_char ()
|
|||||||
abort ();
|
abort ();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
memcpy ((void *)olevel, (void *)readline_top_level, sizeof (procenv_t));
|
||||||
|
jcode = setjmp (readline_top_level);
|
||||||
|
if (jcode)
|
||||||
|
{
|
||||||
|
(*rl_redisplay_function) ();
|
||||||
|
_rl_want_redisplay = 0;
|
||||||
|
memcpy ((void *)readline_top_level, (void *)olevel, sizeof (procenv_t));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (RL_ISSTATE (RL_STATE_ISEARCH))
|
||||||
|
{
|
||||||
|
eof = _rl_isearch_callback (_rl_iscxt);
|
||||||
|
if (eof == 0 && (RL_ISSTATE (RL_STATE_ISEARCH) == 0) && RL_ISSTATE (RL_STATE_INPUTPENDING))
|
||||||
|
rl_callback_read_char ();
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
else if (RL_ISSTATE (RL_STATE_NSEARCH))
|
||||||
|
{
|
||||||
|
eof = _rl_nsearch_callback (_rl_nscxt);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
else if (RL_ISSTATE (RL_STATE_NUMERICARG))
|
||||||
|
{
|
||||||
|
eof = _rl_arg_callback (_rl_argcxt);
|
||||||
|
if (eof == 0 && (RL_ISSTATE (RL_STATE_NUMERICARG) == 0) && RL_ISSTATE (RL_STATE_INPUTPENDING))
|
||||||
|
rl_callback_read_char ();
|
||||||
|
/* XXX - this should handle _rl_last_command_was_kill better */
|
||||||
|
else if (RL_ISSTATE (RL_STATE_NUMERICARG) == 0)
|
||||||
|
_rl_internal_char_cleanup ();
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
else if (RL_ISSTATE (RL_STATE_MULTIKEY))
|
||||||
|
{
|
||||||
|
eof = _rl_dispatch_callback (_rl_kscxt); /* For now */
|
||||||
|
while ((eof == -1 || eof == -2) && RL_ISSTATE (RL_STATE_MULTIKEY) && _rl_kscxt && (_rl_kscxt->flags & KSEQ_DISPATCHED))
|
||||||
|
eof = _rl_dispatch_callback (_rl_kscxt);
|
||||||
|
if (RL_ISSTATE (RL_STATE_MULTIKEY) == 0)
|
||||||
|
{
|
||||||
|
_rl_internal_char_cleanup ();
|
||||||
|
_rl_want_redisplay = 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else if (_rl_callback_func)
|
||||||
|
{
|
||||||
|
/* This allows functions that simply need to read an additional character
|
||||||
|
(like quoted-insert) to register a function to be called when input is
|
||||||
|
available. _rl_callback_data is simply a pointer to a struct that has
|
||||||
|
the argument count originally passed to the registering function and
|
||||||
|
space for any additional parameters. */
|
||||||
|
eof = (*_rl_callback_func) (_rl_callback_data);
|
||||||
|
/* If the function `deregisters' itself, make sure the data is cleaned
|
||||||
|
up. */
|
||||||
|
if (_rl_callback_func == 0)
|
||||||
|
{
|
||||||
|
if (_rl_callback_data)
|
||||||
|
{
|
||||||
|
_rl_callback_data_dispose (_rl_callback_data);
|
||||||
|
_rl_callback_data = 0;
|
||||||
|
}
|
||||||
|
_rl_internal_char_cleanup ();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
eof = readline_internal_char ();
|
eof = readline_internal_char ();
|
||||||
|
|
||||||
|
if (rl_done == 0 && _rl_want_redisplay)
|
||||||
|
{
|
||||||
|
(*rl_redisplay_function) ();
|
||||||
|
_rl_want_redisplay = 0;
|
||||||
|
}
|
||||||
|
|
||||||
/* We loop in case some function has pushed input back with rl_execute_next. */
|
/* We loop in case some function has pushed input back with rl_execute_next. */
|
||||||
for (;;)
|
for (;;)
|
||||||
{
|
{
|
||||||
@ -115,6 +195,7 @@ rl_callback_read_char ()
|
|||||||
{
|
{
|
||||||
line = readline_internal_teardown (eof);
|
line = readline_internal_teardown (eof);
|
||||||
|
|
||||||
|
if (rl_deprep_term_function)
|
||||||
(*rl_deprep_term_function) ();
|
(*rl_deprep_term_function) ();
|
||||||
#if defined (HANDLE_SIGNALS)
|
#if defined (HANDLE_SIGNALS)
|
||||||
rl_clear_signals ();
|
rl_clear_signals ();
|
||||||
@ -131,7 +212,7 @@ rl_callback_read_char ()
|
|||||||
if (in_handler == 0 && rl_linefunc)
|
if (in_handler == 0 && rl_linefunc)
|
||||||
_rl_callback_newline ();
|
_rl_callback_newline ();
|
||||||
}
|
}
|
||||||
if (rl_pending_input || _rl_pushed_input_available ())
|
if (rl_pending_input || _rl_pushed_input_available () || RL_ISSTATE (RL_STATE_MACROINPUT))
|
||||||
eof = readline_internal_char ();
|
eof = readline_internal_char ();
|
||||||
else
|
else
|
||||||
break;
|
break;
|
||||||
@ -143,9 +224,11 @@ void
|
|||||||
rl_callback_handler_remove ()
|
rl_callback_handler_remove ()
|
||||||
{
|
{
|
||||||
rl_linefunc = NULL;
|
rl_linefunc = NULL;
|
||||||
|
RL_UNSETSTATE (RL_STATE_CALLBACK);
|
||||||
if (in_handler)
|
if (in_handler)
|
||||||
{
|
{
|
||||||
in_handler = 0;
|
in_handler = 0;
|
||||||
|
if (rl_deprep_term_function)
|
||||||
(*rl_deprep_term_function) ();
|
(*rl_deprep_term_function) ();
|
||||||
#if defined (HANDLE_SIGNALS)
|
#if defined (HANDLE_SIGNALS)
|
||||||
rl_clear_signals ();
|
rl_clear_signals ();
|
||||||
@ -153,4 +236,25 @@ rl_callback_handler_remove ()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
_rl_callback_generic_arg *
|
||||||
|
_rl_callback_data_alloc (count)
|
||||||
|
int count;
|
||||||
|
{
|
||||||
|
_rl_callback_generic_arg *arg;
|
||||||
|
|
||||||
|
arg = (_rl_callback_generic_arg *)xmalloc (sizeof (_rl_callback_generic_arg));
|
||||||
|
arg->count = count;
|
||||||
|
|
||||||
|
arg->i1 = arg->i2 = 0;
|
||||||
|
|
||||||
|
return arg;
|
||||||
|
}
|
||||||
|
|
||||||
|
void _rl_callback_data_dispose (arg)
|
||||||
|
_rl_callback_generic_arg *arg;
|
||||||
|
{
|
||||||
|
if (arg)
|
||||||
|
free (arg);
|
||||||
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
@ -86,6 +86,8 @@
|
|||||||
/* Some systems define these; we want our definitions. */
|
/* Some systems define these; we want our definitions. */
|
||||||
#undef ISPRINT
|
#undef ISPRINT
|
||||||
|
|
||||||
|
/* Beware: these only work with single-byte ASCII characters. */
|
||||||
|
|
||||||
#define ISALNUM(c) (IN_CTYPE_DOMAIN (c) && isalnum (c))
|
#define ISALNUM(c) (IN_CTYPE_DOMAIN (c) && isalnum (c))
|
||||||
#define ISALPHA(c) (IN_CTYPE_DOMAIN (c) && isalpha (c))
|
#define ISALPHA(c) (IN_CTYPE_DOMAIN (c) && isalpha (c))
|
||||||
#define ISDIGIT(c) (IN_CTYPE_DOMAIN (c) && isdigit (c))
|
#define ISDIGIT(c) (IN_CTYPE_DOMAIN (c) && isdigit (c))
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/* complete.c -- filename completion for readline. */
|
/* complete.c -- filename completion for readline. */
|
||||||
|
|
||||||
/* Copyright (C) 1987-2004 Free Software Foundation, Inc.
|
/* Copyright (C) 1987-2005 Free Software Foundation, Inc.
|
||||||
|
|
||||||
This file is part of the GNU Readline Library, a library for
|
This file is part of the GNU Readline Library, a library for
|
||||||
reading lines of text with interactive input and history editing.
|
reading lines of text with interactive input and history editing.
|
||||||
@ -48,7 +48,9 @@
|
|||||||
extern int errno;
|
extern int errno;
|
||||||
#endif /* !errno */
|
#endif /* !errno */
|
||||||
|
|
||||||
|
#if defined (HAVE_PWD_H)
|
||||||
#include <pwd.h>
|
#include <pwd.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "posixdir.h"
|
#include "posixdir.h"
|
||||||
#include "posixstat.h"
|
#include "posixstat.h"
|
||||||
@ -79,9 +81,9 @@ typedef int QSFUNC ();
|
|||||||
|
|
||||||
/* Most systems don't declare getpwent in <pwd.h> if _POSIX_SOURCE is
|
/* Most systems don't declare getpwent in <pwd.h> if _POSIX_SOURCE is
|
||||||
defined. */
|
defined. */
|
||||||
#if !defined (HAVE_GETPW_DECLS) || defined (_POSIX_SOURCE)
|
#if defined (HAVE_GETPWENT) && (!defined (HAVE_GETPW_DECLS) || defined (_POSIX_SOURCE))
|
||||||
extern struct passwd *getpwent PARAMS((void));
|
extern struct passwd *getpwent PARAMS((void));
|
||||||
#endif /* !HAVE_GETPW_DECLS || _POSIX_SOURCE */
|
#endif /* HAVE_GETPWENT && (!HAVE_GETPW_DECLS || _POSIX_SOURCE) */
|
||||||
|
|
||||||
/* If non-zero, then this is the address of a function to call when
|
/* If non-zero, then this is the address of a function to call when
|
||||||
completing a word would normally display the list of possible matches.
|
completing a word would normally display the list of possible matches.
|
||||||
@ -206,7 +208,8 @@ int rl_completion_type = 0;
|
|||||||
|
|
||||||
/* Up to this many items will be displayed in response to a
|
/* Up to this many items will be displayed in response to a
|
||||||
possible-completions call. After that, we ask the user if
|
possible-completions call. After that, we ask the user if
|
||||||
she is sure she wants to see them all. */
|
she is sure she wants to see them all. A negative value means
|
||||||
|
don't ask. */
|
||||||
int rl_completion_query_items = 100;
|
int rl_completion_query_items = 100;
|
||||||
|
|
||||||
int _rl_page_completions = 1;
|
int _rl_page_completions = 1;
|
||||||
@ -621,6 +624,8 @@ fnprint (to_print)
|
|||||||
mbstate_t ps;
|
mbstate_t ps;
|
||||||
const char *end;
|
const char *end;
|
||||||
size_t tlen;
|
size_t tlen;
|
||||||
|
int width, w;
|
||||||
|
wchar_t wc;
|
||||||
|
|
||||||
end = to_print + strlen (to_print) + 1;
|
end = to_print + strlen (to_print) + 1;
|
||||||
memset (&ps, 0, sizeof (mbstate_t));
|
memset (&ps, 0, sizeof (mbstate_t));
|
||||||
@ -653,21 +658,28 @@ fnprint (to_print)
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
#if defined (HANDLE_MULTIBYTE)
|
#if defined (HANDLE_MULTIBYTE)
|
||||||
tlen = mbrlen (s, end - s, &ps);
|
tlen = mbrtowc (&wc, s, end - s, &ps);
|
||||||
if (MB_INVALIDCH (tlen))
|
if (MB_INVALIDCH (tlen))
|
||||||
{
|
{
|
||||||
tlen = 1;
|
tlen = 1;
|
||||||
|
width = 1;
|
||||||
memset (&ps, 0, sizeof (mbstate_t));
|
memset (&ps, 0, sizeof (mbstate_t));
|
||||||
}
|
}
|
||||||
else if (MB_NULLWCH (tlen))
|
else if (MB_NULLWCH (tlen))
|
||||||
break;
|
break;
|
||||||
|
else
|
||||||
|
{
|
||||||
|
w = wcwidth (wc);
|
||||||
|
width = (w >= 0) ? w : 1;
|
||||||
|
}
|
||||||
fwrite (s, 1, tlen, rl_outstream);
|
fwrite (s, 1, tlen, rl_outstream);
|
||||||
s += tlen;
|
s += tlen;
|
||||||
|
printed_len += width;
|
||||||
#else
|
#else
|
||||||
putc (*s, rl_outstream);
|
putc (*s, rl_outstream);
|
||||||
s++;
|
s++;
|
||||||
#endif
|
|
||||||
printed_len++;
|
printed_len++;
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -683,7 +695,7 @@ print_filename (to_print, full_pathname)
|
|||||||
char *to_print, *full_pathname;
|
char *to_print, *full_pathname;
|
||||||
{
|
{
|
||||||
int printed_len, extension_char, slen, tlen;
|
int printed_len, extension_char, slen, tlen;
|
||||||
char *s, c, *new_full_pathname;
|
char *s, c, *new_full_pathname, *dn;
|
||||||
|
|
||||||
extension_char = 0;
|
extension_char = 0;
|
||||||
printed_len = fnprint (to_print);
|
printed_len = fnprint (to_print);
|
||||||
@ -708,7 +720,17 @@ print_filename (to_print, full_pathname)
|
|||||||
files in the root directory. If we pass a null string to the
|
files in the root directory. If we pass a null string to the
|
||||||
bash directory completion hook, for example, it will expand it
|
bash directory completion hook, for example, it will expand it
|
||||||
to the current directory. We just want the `/'. */
|
to the current directory. We just want the `/'. */
|
||||||
s = tilde_expand (full_pathname && *full_pathname ? full_pathname : "/");
|
if (full_pathname == 0 || *full_pathname == 0)
|
||||||
|
dn = "/";
|
||||||
|
else if (full_pathname[0] != '/')
|
||||||
|
dn = full_pathname;
|
||||||
|
else if (full_pathname[1] == 0)
|
||||||
|
dn = "//"; /* restore trailing slash to `//' */
|
||||||
|
else if (full_pathname[1] == '/' && full_pathname[2] == 0)
|
||||||
|
dn = "/"; /* don't turn /// into // */
|
||||||
|
else
|
||||||
|
dn = full_pathname;
|
||||||
|
s = tilde_expand (dn);
|
||||||
if (rl_directory_completion_hook)
|
if (rl_directory_completion_hook)
|
||||||
(*rl_directory_completion_hook) (&s);
|
(*rl_directory_completion_hook) (&s);
|
||||||
|
|
||||||
@ -716,6 +738,10 @@ print_filename (to_print, full_pathname)
|
|||||||
tlen = strlen (to_print);
|
tlen = strlen (to_print);
|
||||||
new_full_pathname = (char *)xmalloc (slen + tlen + 2);
|
new_full_pathname = (char *)xmalloc (slen + tlen + 2);
|
||||||
strcpy (new_full_pathname, s);
|
strcpy (new_full_pathname, s);
|
||||||
|
if (s[slen - 1] == '/')
|
||||||
|
slen--;
|
||||||
|
else
|
||||||
|
new_full_pathname[slen] = '/';
|
||||||
new_full_pathname[slen] = '/';
|
new_full_pathname[slen] = '/';
|
||||||
strcpy (new_full_pathname + slen + 1, to_print);
|
strcpy (new_full_pathname + slen + 1, to_print);
|
||||||
|
|
||||||
@ -807,14 +833,7 @@ _rl_find_completion_word (fp, dp)
|
|||||||
quote substrings for the completer. Try to find the start
|
quote substrings for the completer. Try to find the start
|
||||||
of an unclosed quoted substring. */
|
of an unclosed quoted substring. */
|
||||||
/* FOUND_QUOTE is set so we know what kind of quotes we found. */
|
/* FOUND_QUOTE is set so we know what kind of quotes we found. */
|
||||||
#if defined (HANDLE_MULTIBYTE)
|
for (scan = pass_next = 0; scan < end; scan = MB_NEXTCHAR (rl_line_buffer, scan, 1, MB_FIND_ANY))
|
||||||
for (scan = pass_next = 0; scan < end;
|
|
||||||
scan = ((MB_CUR_MAX == 1 || rl_byte_oriented)
|
|
||||||
? (scan + 1)
|
|
||||||
: _rl_find_next_mbchar (rl_line_buffer, scan, 1, MB_FIND_ANY)))
|
|
||||||
#else
|
|
||||||
for (scan = pass_next = 0; scan < end; scan++)
|
|
||||||
#endif
|
|
||||||
{
|
{
|
||||||
if (pass_next)
|
if (pass_next)
|
||||||
{
|
{
|
||||||
@ -864,11 +883,7 @@ _rl_find_completion_word (fp, dp)
|
|||||||
/* We didn't find an unclosed quoted substring upon which to do
|
/* We didn't find an unclosed quoted substring upon which to do
|
||||||
completion, so use the word break characters to find the
|
completion, so use the word break characters to find the
|
||||||
substring on which to complete. */
|
substring on which to complete. */
|
||||||
#if defined (HANDLE_MULTIBYTE)
|
while (rl_point = MB_PREVCHAR (rl_line_buffer, rl_point, MB_FIND_ANY))
|
||||||
while (rl_point = _rl_find_prev_mbchar (rl_line_buffer, rl_point, MB_FIND_ANY))
|
|
||||||
#else
|
|
||||||
while (--rl_point)
|
|
||||||
#endif
|
|
||||||
{
|
{
|
||||||
scan = rl_line_buffer[rl_point];
|
scan = rl_line_buffer[rl_point];
|
||||||
|
|
||||||
@ -1151,7 +1166,7 @@ compute_lcd_of_matches (match_list, matches, text)
|
|||||||
rl_completion_found_quote &&
|
rl_completion_found_quote &&
|
||||||
rl_filename_quoting_desired)
|
rl_filename_quoting_desired)
|
||||||
{
|
{
|
||||||
dtext = (*rl_filename_dequoting_function) (text, rl_completion_quote_character);
|
dtext = (*rl_filename_dequoting_function) ((char *)text, rl_completion_quote_character);
|
||||||
text = dtext;
|
text = dtext;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1397,7 +1412,7 @@ display_matches (matches)
|
|||||||
|
|
||||||
/* If there are many items, then ask the user if she really wants to
|
/* If there are many items, then ask the user if she really wants to
|
||||||
see them all. */
|
see them all. */
|
||||||
if (len >= rl_completion_query_items)
|
if (rl_completion_query_items > 0 && len >= rl_completion_query_items)
|
||||||
{
|
{
|
||||||
rl_crlf ();
|
rl_crlf ();
|
||||||
fprintf (rl_outstream, "Display all %d possibilities? (y or n)", len);
|
fprintf (rl_outstream, "Display all %d possibilities? (y or n)", len);
|
||||||
@ -1534,7 +1549,7 @@ append_to_match (text, delimiter, quote_char, nontrivial_match)
|
|||||||
: stat (filename, &finfo);
|
: stat (filename, &finfo);
|
||||||
if (s == 0 && S_ISDIR (finfo.st_mode))
|
if (s == 0 && S_ISDIR (finfo.st_mode))
|
||||||
{
|
{
|
||||||
if (_rl_complete_mark_directories)
|
if (_rl_complete_mark_directories /* && rl_completion_suppress_append == 0 */)
|
||||||
{
|
{
|
||||||
/* This is clumsy. Avoid putting in a double slash if point
|
/* This is clumsy. Avoid putting in a double slash if point
|
||||||
is at the end of the line and the previous character is a
|
is at the end of the line and the previous character is a
|
||||||
@ -1848,16 +1863,20 @@ rl_username_completion_function (text, state)
|
|||||||
setpwent ();
|
setpwent ();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if defined (HAVE_GETPWENT)
|
||||||
while (entry = getpwent ())
|
while (entry = getpwent ())
|
||||||
{
|
{
|
||||||
/* Null usernames should result in all users as possible completions. */
|
/* Null usernames should result in all users as possible completions. */
|
||||||
if (namelen == 0 || (STREQN (username, entry->pw_name, namelen)))
|
if (namelen == 0 || (STREQN (username, entry->pw_name, namelen)))
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
if (entry == 0)
|
if (entry == 0)
|
||||||
{
|
{
|
||||||
|
#if defined (HAVE_GETPWENT)
|
||||||
endpwent ();
|
endpwent ();
|
||||||
|
#endif
|
||||||
return ((char *)NULL);
|
return ((char *)NULL);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@ -2169,9 +2188,11 @@ rl_menu_complete (count, ignore)
|
|||||||
return (0);
|
return (0);
|
||||||
}
|
}
|
||||||
|
|
||||||
match_list_index = (match_list_index + count) % match_list_size;
|
match_list_index += count;
|
||||||
if (match_list_index < 0)
|
if (match_list_index < 0)
|
||||||
match_list_index += match_list_size;
|
match_list_index += match_list_size;
|
||||||
|
else
|
||||||
|
match_list_index %= match_list_size;
|
||||||
|
|
||||||
if (match_list_index == 0 && match_list_size > 1)
|
if (match_list_index == 0 && match_list_size > 1)
|
||||||
{
|
{
|
||||||
|
@ -26,12 +26,27 @@
|
|||||||
/* Define if the `S_IS*' macros in <sys/stat.h> do not work properly. */
|
/* Define if the `S_IS*' macros in <sys/stat.h> do not work properly. */
|
||||||
#undef STAT_MACROS_BROKEN
|
#undef STAT_MACROS_BROKEN
|
||||||
|
|
||||||
|
/* Define if you have the fcntl function. */
|
||||||
|
#undef HAVE_FCNTL
|
||||||
|
|
||||||
|
/* Define if you have the getpwent function. */
|
||||||
|
#undef HAVE_GETPWENT
|
||||||
|
|
||||||
|
/* Define if you have the getpwnam function. */
|
||||||
|
#undef HAVE_GETPWNAM
|
||||||
|
|
||||||
|
/* Define if you have the getpwuid function. */
|
||||||
|
#undef HAVE_GETPWUID
|
||||||
|
|
||||||
/* Define if you have the isascii function. */
|
/* Define if you have the isascii function. */
|
||||||
#undef HAVE_ISASCII
|
#undef HAVE_ISASCII
|
||||||
|
|
||||||
/* Define if you have the isxdigit function. */
|
/* Define if you have the isxdigit function. */
|
||||||
#undef HAVE_ISXDIGIT
|
#undef HAVE_ISXDIGIT
|
||||||
|
|
||||||
|
/* Define if you have the kill function. */
|
||||||
|
#undef HAVE_KILL
|
||||||
|
|
||||||
/* Define if you have the lstat function. */
|
/* Define if you have the lstat function. */
|
||||||
#undef HAVE_LSTAT
|
#undef HAVE_LSTAT
|
||||||
|
|
||||||
@ -87,6 +102,9 @@
|
|||||||
/* Define if you have the <dirent.h> header file. */
|
/* Define if you have the <dirent.h> header file. */
|
||||||
#undef HAVE_DIRENT_H
|
#undef HAVE_DIRENT_H
|
||||||
|
|
||||||
|
/* Define if you have the <fcntl.h> header file. */
|
||||||
|
#undef HAVE_FCNTL_H
|
||||||
|
|
||||||
/* Define if you have the <langinfo.h> header file. */
|
/* Define if you have the <langinfo.h> header file. */
|
||||||
#undef HAVE_LANGINFO_H
|
#undef HAVE_LANGINFO_H
|
||||||
|
|
||||||
@ -102,6 +120,9 @@
|
|||||||
/* Define if you have the <ndir.h> header file. */
|
/* Define if you have the <ndir.h> header file. */
|
||||||
#undef HAVE_NDIR_H
|
#undef HAVE_NDIR_H
|
||||||
|
|
||||||
|
/* Define if you have the <pwd.h> header file. */
|
||||||
|
#undef HAVE_PWD_H
|
||||||
|
|
||||||
/* Define if you have the <stdarg.h> header file. */
|
/* Define if you have the <stdarg.h> header file. */
|
||||||
#undef HAVE_STDARG_H
|
#undef HAVE_STDARG_H
|
||||||
|
|
||||||
|
1923
contrib/libreadline/configure
vendored
1923
contrib/libreadline/configure
vendored
File diff suppressed because it is too large
Load Diff
@ -4,9 +4,27 @@ dnl
|
|||||||
dnl report bugs to chet@po.cwru.edu
|
dnl report bugs to chet@po.cwru.edu
|
||||||
dnl
|
dnl
|
||||||
dnl Process this file with autoconf to produce a configure script.
|
dnl Process this file with autoconf to produce a configure script.
|
||||||
AC_REVISION([for Readline 5.0, version 2.52, from autoconf version] AC_ACVERSION)
|
|
||||||
|
|
||||||
AC_INIT(readline, 5.0-rc1, bug-readline@gnu.org)
|
# Copyright (C) 1987-2005 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
|
||||||
|
# the Free Software Foundation; either version 2, or (at your option)
|
||||||
|
# any later version.
|
||||||
|
|
||||||
|
# This program is distributed in the hope that it will be useful,
|
||||||
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
# GNU General Public License for more details.
|
||||||
|
|
||||||
|
# You should have received a copy of the GNU General Public License
|
||||||
|
# along with this program; if not, write to the Free Software
|
||||||
|
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
|
||||||
|
# 02111-1307, USA.
|
||||||
|
|
||||||
|
AC_REVISION([for Readline 5.1, version 2.59])
|
||||||
|
|
||||||
|
AC_INIT(readline, 5.1-release, bug-readline@gnu.org)
|
||||||
|
|
||||||
dnl make sure we are using a recent autoconf version
|
dnl make sure we are using a recent autoconf version
|
||||||
AC_PREREQ(2.50)
|
AC_PREREQ(2.50)
|
||||||
@ -16,20 +34,28 @@ AC_CONFIG_AUX_DIR(./support)
|
|||||||
AC_CONFIG_HEADERS(config.h)
|
AC_CONFIG_HEADERS(config.h)
|
||||||
|
|
||||||
dnl update the value of RL_READLINE_VERSION in readline.h when this changes
|
dnl update the value of RL_READLINE_VERSION in readline.h when this changes
|
||||||
LIBVERSION=5.0
|
LIBVERSION=5.1
|
||||||
|
|
||||||
AC_CANONICAL_HOST
|
AC_CANONICAL_HOST
|
||||||
|
|
||||||
dnl configure defaults
|
dnl configure defaults
|
||||||
opt_curses=no
|
opt_curses=no
|
||||||
|
opt_purify=no
|
||||||
|
|
||||||
dnl arguments to configure
|
dnl arguments to configure
|
||||||
AC_ARG_WITH(curses, AC_HELP_STRING([--with-curses], [use the curses library instead of the termcap library]), opt_curses=$withval)
|
AC_ARG_WITH(curses, AC_HELP_STRING([--with-curses], [use the curses library instead of the termcap library]), opt_curses=$withval)
|
||||||
|
AC_ARG_WITH(purify, AC_HELP_STRING([--with-purify], [configure to postprocess with purify]), opt_purify=$withval)
|
||||||
|
|
||||||
if test "$opt_curses" = "yes"; then
|
if test "$opt_curses" = "yes"; then
|
||||||
prefer_curses=yes
|
prefer_curses=yes
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if test "$opt_purify" = yes; then
|
||||||
|
PURIFY="purify"
|
||||||
|
else
|
||||||
|
PURIFY=
|
||||||
|
fi
|
||||||
|
|
||||||
dnl option parsing for optional features
|
dnl option parsing for optional features
|
||||||
opt_multibyte=yes
|
opt_multibyte=yes
|
||||||
opt_static_libs=yes
|
opt_static_libs=yes
|
||||||
@ -43,6 +69,35 @@ if test $opt_multibyte = no; then
|
|||||||
AC_DEFINE(NO_MULTIBYTE_SUPPORT)
|
AC_DEFINE(NO_MULTIBYTE_SUPPORT)
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
dnl load up the cross-building cache file -- add more cases and cache
|
||||||
|
dnl files as necessary
|
||||||
|
|
||||||
|
dnl Note that host and target machine are the same, and different than the
|
||||||
|
dnl build machine.
|
||||||
|
|
||||||
|
if test "x$cross_compiling" = "xyes"; then
|
||||||
|
case "${host}" in
|
||||||
|
*-cygwin*)
|
||||||
|
cross_cache=${srcdir}/cross-build/cygwin.cache
|
||||||
|
;;
|
||||||
|
*-mingw*)
|
||||||
|
cross_cache=${srcdir}/cross-build/mingw.cache
|
||||||
|
;;
|
||||||
|
i[[3456]]86-*-beos*)
|
||||||
|
cross_cache=${srcdir}/cross-build/x86-beos.cache
|
||||||
|
;;
|
||||||
|
*) echo "configure: cross-compiling for $host is not supported" >&2
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
if test -n "${cross_cache}" && test -r "${cross_cache}"; then
|
||||||
|
echo "loading cross-build cache file ${cross_cache}"
|
||||||
|
. ${cross_cache}
|
||||||
|
fi
|
||||||
|
unset cross_cache
|
||||||
|
CROSS_COMPILE='-DCROSS_COMPILING'
|
||||||
|
AC_SUBST(CROSS_COMPILE)
|
||||||
|
fi
|
||||||
|
|
||||||
echo ""
|
echo ""
|
||||||
echo "Beginning configuration for readline-$LIBVERSION for ${host_cpu}-${host_vendor}-${host_os}"
|
echo "Beginning configuration for readline-$LIBVERSION for ${host_cpu}-${host_vendor}-${host_os}"
|
||||||
echo ""
|
echo ""
|
||||||
@ -83,14 +138,24 @@ AC_HEADER_STDC
|
|||||||
AC_HEADER_STAT
|
AC_HEADER_STAT
|
||||||
AC_HEADER_DIRENT
|
AC_HEADER_DIRENT
|
||||||
|
|
||||||
AC_CHECK_FUNCS(lstat memmove putenv select setenv setlocale \
|
AC_CHECK_FUNCS(fcntl kill lstat)
|
||||||
strcasecmp strpbrk tcgetattr vsnprintf isascii isxdigit)
|
AC_CHECK_FUNCS(memmove putenv select setenv setlocale \
|
||||||
|
strcasecmp strpbrk tcgetattr vsnprintf)
|
||||||
|
AC_CHECK_FUNCS(isascii isxdigit)
|
||||||
|
AC_CHECK_FUNCS(getpwent getpwnam getpwuid)
|
||||||
|
|
||||||
AC_FUNC_STRCOLL
|
AC_FUNC_STRCOLL
|
||||||
|
|
||||||
AC_CHECK_HEADERS(unistd.h stdlib.h varargs.h stdarg.h string.h strings.h \
|
AC_CHECK_HEADERS(fcntl.h unistd.h stdlib.h varargs.h stdarg.h string.h strings.h \
|
||||||
limits.h sys/ptem.h sys/pte.h sys/stream.h sys/select.h \
|
limits.h locale.h pwd.h memory.h termcap.h termios.h termio.h)
|
||||||
termcap.h termios.h termio.h sys/file.h locale.h memory.h )
|
AC_CHECK_HEADERS(sys/pte.h sys/stream.h sys/select.h sys/file.h)
|
||||||
|
|
||||||
|
AC_CHECK_HEADERS(sys/ptem.h,,,
|
||||||
|
[[
|
||||||
|
#if HAVE_SYS_STREAM_H
|
||||||
|
# include <sys/stream.h>
|
||||||
|
#endif
|
||||||
|
]])
|
||||||
|
|
||||||
BASH_SYS_SIGNAL_VINTAGE
|
BASH_SYS_SIGNAL_VINTAGE
|
||||||
BASH_SYS_REINSTALL_SIGHANDLERS
|
BASH_SYS_REINSTALL_SIGHANDLERS
|
||||||
@ -143,7 +208,13 @@ esac
|
|||||||
#
|
#
|
||||||
if test -f ${srcdir}/support/shobj-conf; then
|
if test -f ${srcdir}/support/shobj-conf; then
|
||||||
AC_MSG_CHECKING(configuration for building shared libraries)
|
AC_MSG_CHECKING(configuration for building shared libraries)
|
||||||
eval `${CONFIG_SHELL-/bin/sh} ${srcdir}/support/shobj-conf -C "${CC}" -c ${host_cpu} -o ${host_os} -v ${host_vendor}`
|
eval `TERMCAP_LIB=$TERMCAP_LIB ${CONFIG_SHELL-/bin/sh} ${srcdir}/support/shobj-conf -C "${CC}" -c ${host_cpu} -o ${host_os} -v ${host_vendor}`
|
||||||
|
|
||||||
|
# case "$SHLIB_LIBS" in
|
||||||
|
# *curses*|*termcap*|*termlib*) ;;
|
||||||
|
# *) SHLIB_LIBS="$SHLIB_LIBS $TERMCAP_LIB" ;;
|
||||||
|
# esac
|
||||||
|
|
||||||
AC_SUBST(SHOBJ_CC)
|
AC_SUBST(SHOBJ_CC)
|
||||||
AC_SUBST(SHOBJ_CFLAGS)
|
AC_SUBST(SHOBJ_CFLAGS)
|
||||||
AC_SUBST(SHOBJ_LD)
|
AC_SUBST(SHOBJ_LD)
|
||||||
@ -153,8 +224,11 @@ if test -f ${srcdir}/support/shobj-conf; then
|
|||||||
AC_SUBST(SHOBJ_STATUS)
|
AC_SUBST(SHOBJ_STATUS)
|
||||||
AC_SUBST(SHLIB_STATUS)
|
AC_SUBST(SHLIB_STATUS)
|
||||||
AC_SUBST(SHLIB_XLDFLAGS)
|
AC_SUBST(SHLIB_XLDFLAGS)
|
||||||
|
AC_SUBST(SHLIB_DOT)
|
||||||
|
AC_SUBST(SHLIB_LIBPREF)
|
||||||
AC_SUBST(SHLIB_LIBSUFF)
|
AC_SUBST(SHLIB_LIBSUFF)
|
||||||
AC_SUBST(SHLIB_LIBVERSION)
|
AC_SUBST(SHLIB_LIBVERSION)
|
||||||
|
AC_SUBST(SHLIB_DLLVERSION)
|
||||||
AC_SUBST(SHLIB_LIBS)
|
AC_SUBST(SHLIB_LIBS)
|
||||||
AC_MSG_RESULT($SHLIB_STATUS)
|
AC_MSG_RESULT($SHLIB_STATUS)
|
||||||
|
|
||||||
@ -191,6 +265,12 @@ msdosdjgpp*) BUILD_DIR=`pwd.exe` ;; # to prevent //d/path/file
|
|||||||
*) BUILD_DIR=`pwd` ;;
|
*) BUILD_DIR=`pwd` ;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
case "$BUILD_DIR" in
|
||||||
|
*\ *) BUILD_DIR=`echo "$BUILD_DIR" | sed 's: :\\\\ :g'` ;;
|
||||||
|
*) ;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
AC_SUBST(PURIFY)
|
||||||
AC_SUBST(BUILD_DIR)
|
AC_SUBST(BUILD_DIR)
|
||||||
|
|
||||||
AC_SUBST(CFLAGS)
|
AC_SUBST(CFLAGS)
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/* display.c -- readline redisplay facility. */
|
/* display.c -- readline redisplay facility. */
|
||||||
|
|
||||||
/* Copyright (C) 1987-2004 Free Software Foundation, Inc.
|
/* Copyright (C) 1987-2005 Free Software Foundation, Inc.
|
||||||
|
|
||||||
This file is part of the GNU Readline Library, a library for
|
This file is part of the GNU Readline Library, a library for
|
||||||
reading lines of text with interactive input and history editing.
|
reading lines of text with interactive input and history editing.
|
||||||
@ -118,16 +118,24 @@ rl_voidfunc_t *rl_redisplay_function = rl_redisplay;
|
|||||||
int rl_display_fixed = 0;
|
int rl_display_fixed = 0;
|
||||||
|
|
||||||
int _rl_suppress_redisplay = 0;
|
int _rl_suppress_redisplay = 0;
|
||||||
|
int _rl_want_redisplay = 0;
|
||||||
|
|
||||||
/* The stuff that gets printed out before the actual text of the line.
|
/* The stuff that gets printed out before the actual text of the line.
|
||||||
This is usually pointing to rl_prompt. */
|
This is usually pointing to rl_prompt. */
|
||||||
char *rl_display_prompt = (char *)NULL;
|
char *rl_display_prompt = (char *)NULL;
|
||||||
|
|
||||||
/* Pseudo-global variables declared here. */
|
/* Pseudo-global variables declared here. */
|
||||||
|
|
||||||
/* The visible cursor position. If you print some text, adjust this. */
|
/* The visible cursor position. If you print some text, adjust this. */
|
||||||
|
/* NOTE: _rl_last_c_pos is used as a buffer index when not in a locale
|
||||||
|
supporting multibyte characters, and an absolute cursor position when
|
||||||
|
in such a locale. This is an artifact of the donated multibyte support.
|
||||||
|
Care must be taken when modifying its value. */
|
||||||
int _rl_last_c_pos = 0;
|
int _rl_last_c_pos = 0;
|
||||||
int _rl_last_v_pos = 0;
|
int _rl_last_v_pos = 0;
|
||||||
|
|
||||||
|
static int cpos_adjusted;
|
||||||
|
|
||||||
/* Number of lines currently on screen minus 1. */
|
/* Number of lines currently on screen minus 1. */
|
||||||
int _rl_vis_botlin = 0;
|
int _rl_vis_botlin = 0;
|
||||||
|
|
||||||
@ -180,6 +188,18 @@ static int prompt_last_screen_line;
|
|||||||
|
|
||||||
static int prompt_physical_chars;
|
static int prompt_physical_chars;
|
||||||
|
|
||||||
|
/* Variables to save and restore prompt and display information. */
|
||||||
|
|
||||||
|
/* These are getting numerous enough that it's time to create a struct. */
|
||||||
|
|
||||||
|
static char *saved_local_prompt;
|
||||||
|
static char *saved_local_prefix;
|
||||||
|
static int saved_last_invisible;
|
||||||
|
static int saved_visible_length;
|
||||||
|
static int saved_prefix_length;
|
||||||
|
static int saved_invis_chars_first_line;
|
||||||
|
static int saved_physical_chars;
|
||||||
|
|
||||||
/* Expand the prompt string S and return the number of visible
|
/* Expand the prompt string S and return the number of visible
|
||||||
characters in *LP, if LP is not null. This is currently more-or-less
|
characters in *LP, if LP is not null. This is currently more-or-less
|
||||||
a placeholder for expansion. LIP, if non-null is a place to store the
|
a placeholder for expansion. LIP, if non-null is a place to store the
|
||||||
@ -236,6 +256,7 @@ expand_prompt (pmt, lp, lip, niflp, vlp)
|
|||||||
else if (ignoring && *p == RL_PROMPT_END_IGNORE)
|
else if (ignoring && *p == RL_PROMPT_END_IGNORE)
|
||||||
{
|
{
|
||||||
ignoring = 0;
|
ignoring = 0;
|
||||||
|
if (p[-1] != RL_PROMPT_START_IGNORE)
|
||||||
last = r - ret - 1;
|
last = r - ret - 1;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
@ -335,7 +356,8 @@ rl_expand_prompt (prompt)
|
|||||||
FREE (local_prompt_prefix);
|
FREE (local_prompt_prefix);
|
||||||
|
|
||||||
local_prompt = local_prompt_prefix = (char *)0;
|
local_prompt = local_prompt_prefix = (char *)0;
|
||||||
prompt_last_invisible = prompt_visible_length = 0;
|
prompt_last_invisible = prompt_invis_chars_first_line = 0;
|
||||||
|
prompt_visible_length = prompt_physical_chars = 0;
|
||||||
|
|
||||||
if (prompt == 0 || *prompt == 0)
|
if (prompt == 0 || *prompt == 0)
|
||||||
return (0);
|
return (0);
|
||||||
@ -423,7 +445,7 @@ rl_redisplay ()
|
|||||||
{
|
{
|
||||||
register int in, out, c, linenum, cursor_linenum;
|
register int in, out, c, linenum, cursor_linenum;
|
||||||
register char *line;
|
register char *line;
|
||||||
int c_pos, inv_botlin, lb_botlin, lb_linenum;
|
int c_pos, inv_botlin, lb_botlin, lb_linenum, o_cpos;
|
||||||
int newlines, lpos, temp, modmark, n0, num;
|
int newlines, lpos, temp, modmark, n0, num;
|
||||||
char *prompt_this_line;
|
char *prompt_this_line;
|
||||||
#if defined (HANDLE_MULTIBYTE)
|
#if defined (HANDLE_MULTIBYTE)
|
||||||
@ -440,7 +462,7 @@ rl_redisplay ()
|
|||||||
if (!rl_display_prompt)
|
if (!rl_display_prompt)
|
||||||
rl_display_prompt = "";
|
rl_display_prompt = "";
|
||||||
|
|
||||||
if (invisible_line == 0)
|
if (invisible_line == 0 || vis_lbreaks == 0)
|
||||||
{
|
{
|
||||||
init_line_structures (0);
|
init_line_structures (0);
|
||||||
rl_on_new_line ();
|
rl_on_new_line ();
|
||||||
@ -833,7 +855,7 @@ rl_redisplay ()
|
|||||||
|
|
||||||
if (_rl_horizontal_scroll_mode == 0 && _rl_term_up && *_rl_term_up)
|
if (_rl_horizontal_scroll_mode == 0 && _rl_term_up && *_rl_term_up)
|
||||||
{
|
{
|
||||||
int nleft, pos, changed_screen_line;
|
int nleft, pos, changed_screen_line, tx;
|
||||||
|
|
||||||
if (!rl_display_fixed || forced_display)
|
if (!rl_display_fixed || forced_display)
|
||||||
{
|
{
|
||||||
@ -864,9 +886,26 @@ rl_redisplay ()
|
|||||||
/* For each line in the buffer, do the updating display. */
|
/* For each line in the buffer, do the updating display. */
|
||||||
for (linenum = 0; linenum <= inv_botlin; linenum++)
|
for (linenum = 0; linenum <= inv_botlin; linenum++)
|
||||||
{
|
{
|
||||||
|
o_cpos = _rl_last_c_pos;
|
||||||
|
cpos_adjusted = 0;
|
||||||
update_line (VIS_LINE(linenum), INV_LINE(linenum), linenum,
|
update_line (VIS_LINE(linenum), INV_LINE(linenum), linenum,
|
||||||
VIS_LLEN(linenum), INV_LLEN(linenum), inv_botlin);
|
VIS_LLEN(linenum), INV_LLEN(linenum), inv_botlin);
|
||||||
|
|
||||||
|
/* update_line potentially changes _rl_last_c_pos, but doesn't
|
||||||
|
take invisible characters into account, since _rl_last_c_pos
|
||||||
|
is an absolute cursor position in a multibyte locale. See
|
||||||
|
if compensating here is the right thing, or if we have to
|
||||||
|
change update_line itself. There is one case in which
|
||||||
|
update_line adjusts _rl_last_c_pos itself (so it can pass
|
||||||
|
_rl_move_cursor_relative accurate values); it communicates
|
||||||
|
this back by setting cpos_adjusted */
|
||||||
|
if (linenum == 0 && (MB_CUR_MAX > 1 && rl_byte_oriented == 0) &&
|
||||||
|
cpos_adjusted == 0 &&
|
||||||
|
_rl_last_c_pos != o_cpos &&
|
||||||
|
_rl_last_c_pos > wrap_offset &&
|
||||||
|
o_cpos < prompt_last_invisible)
|
||||||
|
_rl_last_c_pos -= wrap_offset;
|
||||||
|
|
||||||
/* If this is the line with the prompt, we might need to
|
/* If this is the line with the prompt, we might need to
|
||||||
compensate for invisible characters in the new line. Do
|
compensate for invisible characters in the new line. Do
|
||||||
this only if there is not more than one new line (which
|
this only if there is not more than one new line (which
|
||||||
@ -878,6 +917,9 @@ rl_redisplay ()
|
|||||||
(wrap_offset > visible_wrap_offset) &&
|
(wrap_offset > visible_wrap_offset) &&
|
||||||
(_rl_last_c_pos < visible_first_line_len))
|
(_rl_last_c_pos < visible_first_line_len))
|
||||||
{
|
{
|
||||||
|
if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
|
||||||
|
nleft = _rl_screenwidth - _rl_last_c_pos;
|
||||||
|
else
|
||||||
nleft = _rl_screenwidth + wrap_offset - _rl_last_c_pos;
|
nleft = _rl_screenwidth + wrap_offset - _rl_last_c_pos;
|
||||||
if (nleft)
|
if (nleft)
|
||||||
_rl_clear_to_eol (nleft);
|
_rl_clear_to_eol (nleft);
|
||||||
@ -914,7 +956,7 @@ rl_redisplay ()
|
|||||||
the physical cursor position on the screen stays the same,
|
the physical cursor position on the screen stays the same,
|
||||||
but the buffer position needs to be adjusted to account
|
but the buffer position needs to be adjusted to account
|
||||||
for invisible characters. */
|
for invisible characters. */
|
||||||
if (cursor_linenum == 0 && wrap_offset)
|
if ((MB_CUR_MAX == 1 || rl_byte_oriented) && cursor_linenum == 0 && wrap_offset)
|
||||||
_rl_last_c_pos += wrap_offset;
|
_rl_last_c_pos += wrap_offset;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -935,7 +977,7 @@ rl_redisplay ()
|
|||||||
#endif
|
#endif
|
||||||
_rl_output_some_chars (local_prompt, nleft);
|
_rl_output_some_chars (local_prompt, nleft);
|
||||||
if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
|
if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
|
||||||
_rl_last_c_pos = _rl_col_width (local_prompt, 0, nleft);
|
_rl_last_c_pos = _rl_col_width (local_prompt, 0, nleft) - wrap_offset;
|
||||||
else
|
else
|
||||||
_rl_last_c_pos = nleft;
|
_rl_last_c_pos = nleft;
|
||||||
}
|
}
|
||||||
@ -947,18 +989,31 @@ rl_redisplay ()
|
|||||||
start of the line and the cursor position. */
|
start of the line and the cursor position. */
|
||||||
nleft = c_pos - pos;
|
nleft = c_pos - pos;
|
||||||
|
|
||||||
|
/* NLEFT is now a number of characters in a buffer. When in a
|
||||||
|
multibyte locale, however, _rl_last_c_pos is an absolute cursor
|
||||||
|
position that doesn't take invisible characters in the prompt
|
||||||
|
into account. We use a fudge factor to compensate. */
|
||||||
|
|
||||||
/* Since _rl_backspace() doesn't know about invisible characters in the
|
/* Since _rl_backspace() doesn't know about invisible characters in the
|
||||||
prompt, and there's no good way to tell it, we compensate for
|
prompt, and there's no good way to tell it, we compensate for
|
||||||
those characters here and call _rl_backspace() directly. */
|
those characters here and call _rl_backspace() directly. */
|
||||||
if (wrap_offset && cursor_linenum == 0 && nleft < _rl_last_c_pos)
|
if (wrap_offset && cursor_linenum == 0 && nleft < _rl_last_c_pos)
|
||||||
{
|
{
|
||||||
_rl_backspace (_rl_last_c_pos - nleft);
|
|
||||||
if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
|
if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
|
||||||
_rl_last_c_pos = _rl_col_width (&visible_line[pos], 0, nleft);
|
tx = _rl_col_width (&visible_line[pos], 0, nleft) - visible_wrap_offset;
|
||||||
else
|
else
|
||||||
_rl_last_c_pos = nleft;
|
tx = nleft;
|
||||||
|
if (_rl_last_c_pos > tx)
|
||||||
|
{
|
||||||
|
_rl_backspace (_rl_last_c_pos - tx); /* XXX */
|
||||||
|
_rl_last_c_pos = tx;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* We need to note that in a multibyte locale we are dealing with
|
||||||
|
_rl_last_c_pos as an absolute cursor position, but moving to a
|
||||||
|
point specified by a buffer position (NLEFT) that doesn't take
|
||||||
|
invisible characters into account. */
|
||||||
if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
|
if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
|
||||||
_rl_move_cursor_relative (nleft, &invisible_line[pos]);
|
_rl_move_cursor_relative (nleft, &invisible_line[pos]);
|
||||||
else if (nleft != _rl_last_c_pos)
|
else if (nleft != _rl_last_c_pos)
|
||||||
@ -1117,6 +1172,9 @@ update_line (old, new, current_line, omax, nmax, inv_botlin)
|
|||||||
the exact cursor position and cut-and-paste with certain terminal
|
the exact cursor position and cut-and-paste with certain terminal
|
||||||
emulators. In this calculation, TEMP is the physical screen
|
emulators. In this calculation, TEMP is the physical screen
|
||||||
position of the cursor. */
|
position of the cursor. */
|
||||||
|
if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
|
||||||
|
temp = _rl_last_c_pos;
|
||||||
|
else
|
||||||
temp = _rl_last_c_pos - W_OFFSET(_rl_last_v_pos, visible_wrap_offset);
|
temp = _rl_last_c_pos - W_OFFSET(_rl_last_v_pos, visible_wrap_offset);
|
||||||
if (temp == _rl_screenwidth && _rl_term_autowrap && !_rl_horizontal_scroll_mode
|
if (temp == _rl_screenwidth && _rl_term_autowrap && !_rl_horizontal_scroll_mode
|
||||||
&& _rl_last_v_pos == current_line - 1)
|
&& _rl_last_v_pos == current_line - 1)
|
||||||
@ -1182,7 +1240,7 @@ update_line (old, new, current_line, omax, nmax, inv_botlin)
|
|||||||
putc (new[0], rl_outstream);
|
putc (new[0], rl_outstream);
|
||||||
else
|
else
|
||||||
putc (' ', rl_outstream);
|
putc (' ', rl_outstream);
|
||||||
_rl_last_c_pos = 1; /* XXX */
|
_rl_last_c_pos = 1;
|
||||||
_rl_last_v_pos++;
|
_rl_last_v_pos++;
|
||||||
if (old[0] && new[0])
|
if (old[0] && new[0])
|
||||||
old[0] = new[0];
|
old[0] = new[0];
|
||||||
@ -1323,7 +1381,7 @@ update_line (old, new, current_line, omax, nmax, inv_botlin)
|
|||||||
if (_rl_last_v_pos != current_line)
|
if (_rl_last_v_pos != current_line)
|
||||||
{
|
{
|
||||||
_rl_move_vert (current_line);
|
_rl_move_vert (current_line);
|
||||||
if (current_line == 0 && visible_wrap_offset)
|
if ((MB_CUR_MAX == 1 || rl_byte_oriented) && current_line == 0 && visible_wrap_offset)
|
||||||
_rl_last_c_pos += visible_wrap_offset;
|
_rl_last_c_pos += visible_wrap_offset;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1352,7 +1410,12 @@ update_line (old, new, current_line, omax, nmax, inv_botlin)
|
|||||||
#endif
|
#endif
|
||||||
_rl_output_some_chars (local_prompt, lendiff);
|
_rl_output_some_chars (local_prompt, lendiff);
|
||||||
if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
|
if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
|
||||||
_rl_last_c_pos = _rl_col_width (local_prompt, 0, lendiff);
|
{
|
||||||
|
/* We take wrap_offset into account here so we can pass correct
|
||||||
|
information to _rl_move_cursor_relative. */
|
||||||
|
_rl_last_c_pos = _rl_col_width (local_prompt, 0, lendiff) - wrap_offset;
|
||||||
|
cpos_adjusted = 1;
|
||||||
|
}
|
||||||
else
|
else
|
||||||
_rl_last_c_pos = lendiff;
|
_rl_last_c_pos = lendiff;
|
||||||
}
|
}
|
||||||
@ -1414,7 +1477,7 @@ update_line (old, new, current_line, omax, nmax, inv_botlin)
|
|||||||
insert_some_chars (nfd, lendiff, col_lendiff);
|
insert_some_chars (nfd, lendiff, col_lendiff);
|
||||||
_rl_last_c_pos += col_lendiff;
|
_rl_last_c_pos += col_lendiff;
|
||||||
}
|
}
|
||||||
else if (*ols == 0 && lendiff > 0)
|
else if ((MB_CUR_MAX == 1 || rl_byte_oriented != 0) && *ols == 0 && lendiff > 0)
|
||||||
{
|
{
|
||||||
/* At the end of a line the characters do not have to
|
/* At the end of a line the characters do not have to
|
||||||
be "inserted". They can just be placed on the screen. */
|
be "inserted". They can just be placed on the screen. */
|
||||||
@ -1453,6 +1516,10 @@ update_line (old, new, current_line, omax, nmax, inv_botlin)
|
|||||||
/* cannot insert chars, write to EOL */
|
/* cannot insert chars, write to EOL */
|
||||||
_rl_output_some_chars (nfd, temp);
|
_rl_output_some_chars (nfd, temp);
|
||||||
_rl_last_c_pos += col_temp;
|
_rl_last_c_pos += col_temp;
|
||||||
|
/* If we're in a multibyte locale and were before the last invisible
|
||||||
|
char in the current line (which implies we just output some invisible
|
||||||
|
characters) we need to adjust _rl_last_c_pos, since it represents
|
||||||
|
a physical character position. */
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else /* Delete characters from line. */
|
else /* Delete characters from line. */
|
||||||
@ -1484,7 +1551,7 @@ update_line (old, new, current_line, omax, nmax, inv_botlin)
|
|||||||
if (temp > 0)
|
if (temp > 0)
|
||||||
{
|
{
|
||||||
_rl_output_some_chars (nfd, temp);
|
_rl_output_some_chars (nfd, temp);
|
||||||
_rl_last_c_pos += col_temp;
|
_rl_last_c_pos += col_temp; /* XXX */
|
||||||
}
|
}
|
||||||
lendiff = (oe - old) - (ne - new);
|
lendiff = (oe - old) - (ne - new);
|
||||||
if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
|
if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
|
||||||
@ -1546,7 +1613,7 @@ rl_on_new_line_with_prompt ()
|
|||||||
|
|
||||||
l = strlen (prompt_last_line);
|
l = strlen (prompt_last_line);
|
||||||
if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
|
if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
|
||||||
_rl_last_c_pos = _rl_col_width (prompt_last_line, 0, l);
|
_rl_last_c_pos = _rl_col_width (prompt_last_line, 0, l); /* XXX */
|
||||||
else
|
else
|
||||||
_rl_last_c_pos = l;
|
_rl_last_c_pos = l;
|
||||||
|
|
||||||
@ -1595,6 +1662,8 @@ rl_forced_update_display ()
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* Move the cursor from _rl_last_c_pos to NEW, which are buffer indices.
|
/* Move the cursor from _rl_last_c_pos to NEW, which are buffer indices.
|
||||||
|
(Well, when we don't have multibyte characters, _rl_last_c_pos is a
|
||||||
|
buffer index.)
|
||||||
DATA is the contents of the screen line of interest; i.e., where
|
DATA is the contents of the screen line of interest; i.e., where
|
||||||
the movement is being done. */
|
the movement is being done. */
|
||||||
void
|
void
|
||||||
@ -1603,28 +1672,40 @@ _rl_move_cursor_relative (new, data)
|
|||||||
const char *data;
|
const char *data;
|
||||||
{
|
{
|
||||||
register int i;
|
register int i;
|
||||||
|
int woff; /* number of invisible chars on current line */
|
||||||
|
int cpos, dpos; /* current and desired cursor positions */
|
||||||
|
|
||||||
/* If we don't have to do anything, then return. */
|
woff = W_OFFSET (_rl_last_v_pos, wrap_offset);
|
||||||
|
cpos = _rl_last_c_pos;
|
||||||
#if defined (HANDLE_MULTIBYTE)
|
#if defined (HANDLE_MULTIBYTE)
|
||||||
/* If we have multibyte characters, NEW is indexed by the buffer point in
|
/* If we have multibyte characters, NEW is indexed by the buffer point in
|
||||||
a multibyte string, but _rl_last_c_pos is the display position. In
|
a multibyte string, but _rl_last_c_pos is the display position. In
|
||||||
this case, NEW's display position is not obvious and must be
|
this case, NEW's display position is not obvious and must be
|
||||||
calculated. */
|
calculated. We need to account for invisible characters in this line,
|
||||||
if (MB_CUR_MAX == 1 || rl_byte_oriented)
|
as long as we are past them and they are counted by _rl_col_width. */
|
||||||
|
if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
|
||||||
{
|
{
|
||||||
if (_rl_last_c_pos == new)
|
dpos = _rl_col_width (data, 0, new);
|
||||||
return;
|
if (dpos > woff)
|
||||||
|
dpos -= woff;
|
||||||
}
|
}
|
||||||
else if (_rl_last_c_pos == _rl_col_width (data, 0, new))
|
else
|
||||||
return;
|
|
||||||
#else
|
|
||||||
if (_rl_last_c_pos == new) return;
|
|
||||||
#endif
|
#endif
|
||||||
|
dpos = new;
|
||||||
|
|
||||||
|
/* If we don't have to do anything, then return. */
|
||||||
|
if (cpos == dpos)
|
||||||
|
return;
|
||||||
|
|
||||||
/* It may be faster to output a CR, and then move forwards instead
|
/* It may be faster to output a CR, and then move forwards instead
|
||||||
of moving backwards. */
|
of moving backwards. */
|
||||||
/* i == current physical cursor position. */
|
/* i == current physical cursor position. */
|
||||||
i = _rl_last_c_pos - W_OFFSET(_rl_last_v_pos, visible_wrap_offset);
|
#if defined (HANDLE_MULTIBYTE)
|
||||||
|
if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
|
||||||
|
i = _rl_last_c_pos;
|
||||||
|
else
|
||||||
|
#endif
|
||||||
|
i = _rl_last_c_pos - woff;
|
||||||
if (new == 0 || CR_FASTER (new, _rl_last_c_pos) ||
|
if (new == 0 || CR_FASTER (new, _rl_last_c_pos) ||
|
||||||
(_rl_term_autowrap && i == _rl_screenwidth))
|
(_rl_term_autowrap && i == _rl_screenwidth))
|
||||||
{
|
{
|
||||||
@ -1633,10 +1714,10 @@ _rl_move_cursor_relative (new, data)
|
|||||||
#else
|
#else
|
||||||
tputs (_rl_term_cr, 1, _rl_output_character_function);
|
tputs (_rl_term_cr, 1, _rl_output_character_function);
|
||||||
#endif /* !__MSDOS__ */
|
#endif /* !__MSDOS__ */
|
||||||
_rl_last_c_pos = 0;
|
cpos = _rl_last_c_pos = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (_rl_last_c_pos < new)
|
if (cpos < dpos)
|
||||||
{
|
{
|
||||||
/* Move the cursor forward. We do it by printing the command
|
/* Move the cursor forward. We do it by printing the command
|
||||||
to move the cursor forward if there is one, else print that
|
to move the cursor forward if there is one, else print that
|
||||||
@ -1650,31 +1731,11 @@ _rl_move_cursor_relative (new, data)
|
|||||||
#if defined (HACK_TERMCAP_MOTION)
|
#if defined (HACK_TERMCAP_MOTION)
|
||||||
if (_rl_term_forward_char)
|
if (_rl_term_forward_char)
|
||||||
{
|
{
|
||||||
if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
|
for (i = cpos; i < dpos; i++)
|
||||||
{
|
|
||||||
int width;
|
|
||||||
width = _rl_col_width (data, _rl_last_c_pos, new);
|
|
||||||
for (i = 0; i < width; i++)
|
|
||||||
tputs (_rl_term_forward_char, 1, _rl_output_character_function);
|
tputs (_rl_term_forward_char, 1, _rl_output_character_function);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
#endif /* HACK_TERMCAP_MOTION */
|
||||||
for (i = _rl_last_c_pos; i < new; i++)
|
|
||||||
tputs (_rl_term_forward_char, 1, _rl_output_character_function);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
|
|
||||||
{
|
|
||||||
tputs (_rl_term_cr, 1, _rl_output_character_function);
|
|
||||||
for (i = 0; i < new; i++)
|
|
||||||
putc (data[i], rl_outstream);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
for (i = _rl_last_c_pos; i < new; i++)
|
|
||||||
putc (data[i], rl_outstream);
|
|
||||||
|
|
||||||
#else /* !HACK_TERMCAP_MOTION */
|
|
||||||
|
|
||||||
if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
|
if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
|
||||||
{
|
{
|
||||||
tputs (_rl_term_cr, 1, _rl_output_character_function);
|
tputs (_rl_term_cr, 1, _rl_output_character_function);
|
||||||
@ -1682,32 +1743,20 @@ _rl_move_cursor_relative (new, data)
|
|||||||
putc (data[i], rl_outstream);
|
putc (data[i], rl_outstream);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
for (i = _rl_last_c_pos; i < new; i++)
|
for (i = cpos; i < new; i++)
|
||||||
putc (data[i], rl_outstream);
|
putc (data[i], rl_outstream);
|
||||||
|
|
||||||
#endif /* !HACK_TERMCAP_MOTION */
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#if defined (HANDLE_MULTIBYTE)
|
#if defined (HANDLE_MULTIBYTE)
|
||||||
/* NEW points to the buffer point, but _rl_last_c_pos is the display point.
|
/* NEW points to the buffer point, but _rl_last_c_pos is the display point.
|
||||||
The byte length of the string is probably bigger than the column width
|
The byte length of the string is probably bigger than the column width
|
||||||
of the string, which means that if NEW == _rl_last_c_pos, then NEW's
|
of the string, which means that if NEW == _rl_last_c_pos, then NEW's
|
||||||
display point is less than _rl_last_c_pos. */
|
display point is less than _rl_last_c_pos. */
|
||||||
else if (_rl_last_c_pos >= new)
|
|
||||||
#else
|
|
||||||
else if (_rl_last_c_pos > new)
|
|
||||||
#endif
|
#endif
|
||||||
{
|
else if (cpos > dpos)
|
||||||
if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
|
_rl_backspace (cpos - dpos);
|
||||||
_rl_backspace (_rl_last_c_pos - _rl_col_width (data, 0, new));
|
|
||||||
else
|
|
||||||
_rl_backspace (_rl_last_c_pos - new);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
|
_rl_last_c_pos = dpos;
|
||||||
_rl_last_c_pos = _rl_col_width (data, 0, new);
|
|
||||||
else
|
|
||||||
_rl_last_c_pos = new;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* PWP: move the cursor up or down. */
|
/* PWP: move the cursor up or down. */
|
||||||
@ -1796,9 +1845,9 @@ rl_character_len (c, pos)
|
|||||||
|
|
||||||
return ((ISPRINT (uc)) ? 1 : 2);
|
return ((ISPRINT (uc)) ? 1 : 2);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* How to print things in the "echo-area". The prompt is treated as a
|
/* How to print things in the "echo-area". The prompt is treated as a
|
||||||
mini-modeline. */
|
mini-modeline. */
|
||||||
|
static int msg_saved_prompt = 0;
|
||||||
|
|
||||||
#if defined (USE_VARARGS)
|
#if defined (USE_VARARGS)
|
||||||
int
|
int
|
||||||
@ -1829,8 +1878,19 @@ rl_message (va_alist)
|
|||||||
#endif
|
#endif
|
||||||
va_end (args);
|
va_end (args);
|
||||||
|
|
||||||
|
if (saved_local_prompt == 0)
|
||||||
|
{
|
||||||
|
rl_save_prompt ();
|
||||||
|
msg_saved_prompt = 1;
|
||||||
|
}
|
||||||
rl_display_prompt = msg_buf;
|
rl_display_prompt = msg_buf;
|
||||||
|
local_prompt = expand_prompt (msg_buf, &prompt_visible_length,
|
||||||
|
&prompt_last_invisible,
|
||||||
|
&prompt_invis_chars_first_line,
|
||||||
|
&prompt_physical_chars);
|
||||||
|
local_prompt_prefix = (char *)NULL;
|
||||||
(*rl_redisplay_function) ();
|
(*rl_redisplay_function) ();
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
#else /* !USE_VARARGS */
|
#else /* !USE_VARARGS */
|
||||||
@ -1840,8 +1900,20 @@ rl_message (format, arg1, arg2)
|
|||||||
{
|
{
|
||||||
sprintf (msg_buf, format, arg1, arg2);
|
sprintf (msg_buf, format, arg1, arg2);
|
||||||
msg_buf[sizeof(msg_buf) - 1] = '\0'; /* overflow? */
|
msg_buf[sizeof(msg_buf) - 1] = '\0'; /* overflow? */
|
||||||
|
|
||||||
rl_display_prompt = msg_buf;
|
rl_display_prompt = msg_buf;
|
||||||
|
if (saved_local_prompt == 0)
|
||||||
|
{
|
||||||
|
rl_save_prompt ();
|
||||||
|
msg_saved_prompt = 1;
|
||||||
|
}
|
||||||
|
local_prompt = expand_prompt (msg_buf, &prompt_visible_length,
|
||||||
|
&prompt_last_invisible,
|
||||||
|
&prompt_invis_chars_first_line,
|
||||||
|
&prompt_physical_chars);
|
||||||
|
local_prompt_prefix = (char *)NULL;
|
||||||
(*rl_redisplay_function) ();
|
(*rl_redisplay_function) ();
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
#endif /* !USE_VARARGS */
|
#endif /* !USE_VARARGS */
|
||||||
@ -1851,6 +1923,11 @@ int
|
|||||||
rl_clear_message ()
|
rl_clear_message ()
|
||||||
{
|
{
|
||||||
rl_display_prompt = rl_prompt;
|
rl_display_prompt = rl_prompt;
|
||||||
|
if (msg_saved_prompt)
|
||||||
|
{
|
||||||
|
rl_restore_prompt ();
|
||||||
|
msg_saved_prompt = 0;
|
||||||
|
}
|
||||||
(*rl_redisplay_function) ();
|
(*rl_redisplay_function) ();
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@ -1865,27 +1942,19 @@ rl_reset_line_state ()
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* These are getting numerous enough that it's time to create a struct. */
|
|
||||||
|
|
||||||
static char *saved_local_prompt;
|
|
||||||
static char *saved_local_prefix;
|
|
||||||
static int saved_last_invisible;
|
|
||||||
static int saved_visible_length;
|
|
||||||
static int saved_invis_chars_first_line;
|
|
||||||
static int saved_physical_chars;
|
|
||||||
|
|
||||||
void
|
void
|
||||||
rl_save_prompt ()
|
rl_save_prompt ()
|
||||||
{
|
{
|
||||||
saved_local_prompt = local_prompt;
|
saved_local_prompt = local_prompt;
|
||||||
saved_local_prefix = local_prompt_prefix;
|
saved_local_prefix = local_prompt_prefix;
|
||||||
|
saved_prefix_length = prompt_prefix_length;
|
||||||
saved_last_invisible = prompt_last_invisible;
|
saved_last_invisible = prompt_last_invisible;
|
||||||
saved_visible_length = prompt_visible_length;
|
saved_visible_length = prompt_visible_length;
|
||||||
saved_invis_chars_first_line = prompt_invis_chars_first_line;
|
saved_invis_chars_first_line = prompt_invis_chars_first_line;
|
||||||
saved_physical_chars = prompt_physical_chars;
|
saved_physical_chars = prompt_physical_chars;
|
||||||
|
|
||||||
local_prompt = local_prompt_prefix = (char *)0;
|
local_prompt = local_prompt_prefix = (char *)0;
|
||||||
prompt_last_invisible = prompt_visible_length = 0;
|
prompt_last_invisible = prompt_visible_length = prompt_prefix_length = 0;
|
||||||
prompt_invis_chars_first_line = prompt_physical_chars = 0;
|
prompt_invis_chars_first_line = prompt_physical_chars = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1897,10 +1966,16 @@ rl_restore_prompt ()
|
|||||||
|
|
||||||
local_prompt = saved_local_prompt;
|
local_prompt = saved_local_prompt;
|
||||||
local_prompt_prefix = saved_local_prefix;
|
local_prompt_prefix = saved_local_prefix;
|
||||||
|
prompt_prefix_length = saved_prefix_length;
|
||||||
prompt_last_invisible = saved_last_invisible;
|
prompt_last_invisible = saved_last_invisible;
|
||||||
prompt_visible_length = saved_visible_length;
|
prompt_visible_length = saved_visible_length;
|
||||||
prompt_invis_chars_first_line = saved_invis_chars_first_line;
|
prompt_invis_chars_first_line = saved_invis_chars_first_line;
|
||||||
prompt_physical_chars = saved_physical_chars;
|
prompt_physical_chars = saved_physical_chars;
|
||||||
|
|
||||||
|
/* can test saved_local_prompt to see if prompt info has been saved. */
|
||||||
|
saved_local_prompt = saved_local_prefix = (char *)0;
|
||||||
|
saved_last_invisible = saved_visible_length = saved_prefix_length = 0;
|
||||||
|
saved_invis_chars_first_line = saved_physical_chars = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
char *
|
char *
|
||||||
@ -1934,6 +2009,8 @@ _rl_make_prompt_for_search (pchar)
|
|||||||
prompt_visible_length = saved_visible_length + 1;
|
prompt_visible_length = saved_visible_length + 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
prompt_physical_chars = saved_physical_chars + 1;
|
||||||
|
|
||||||
return pmt;
|
return pmt;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1994,6 +2071,9 @@ insert_some_chars (string, count, col)
|
|||||||
char *string;
|
char *string;
|
||||||
int count, col;
|
int count, col;
|
||||||
{
|
{
|
||||||
|
#if defined (__MSDOS__) || defined (__MINGW32__)
|
||||||
|
_rl_output_some_chars (string, count);
|
||||||
|
#else
|
||||||
/* DEBUGGING */
|
/* DEBUGGING */
|
||||||
if (MB_CUR_MAX == 1 || rl_byte_oriented)
|
if (MB_CUR_MAX == 1 || rl_byte_oriented)
|
||||||
if (count != col)
|
if (count != col)
|
||||||
@ -2032,6 +2112,7 @@ insert_some_chars (string, count, col)
|
|||||||
if (_rl_term_ei && *_rl_term_ei)
|
if (_rl_term_ei && *_rl_term_ei)
|
||||||
tputs (_rl_term_ei, 1, _rl_output_character_function);
|
tputs (_rl_term_ei, 1, _rl_output_character_function);
|
||||||
}
|
}
|
||||||
|
#endif /* __MSDOS__ || __MINGW32__ */
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Delete COUNT characters from the display line. */
|
/* Delete COUNT characters from the display line. */
|
||||||
@ -2042,6 +2123,7 @@ delete_chars (count)
|
|||||||
if (count > _rl_screenwidth) /* XXX */
|
if (count > _rl_screenwidth) /* XXX */
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
#if !defined (__MSDOS__) && !defined (__MINGW32__)
|
||||||
if (_rl_term_DC && *_rl_term_DC)
|
if (_rl_term_DC && *_rl_term_DC)
|
||||||
{
|
{
|
||||||
char *buffer;
|
char *buffer;
|
||||||
@ -2054,6 +2136,7 @@ delete_chars (count)
|
|||||||
while (count--)
|
while (count--)
|
||||||
tputs (_rl_term_dc, 1, _rl_output_character_function);
|
tputs (_rl_term_dc, 1, _rl_output_character_function);
|
||||||
}
|
}
|
||||||
|
#endif /* !__MSDOS__ && !__MINGW32__ */
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
@ -2109,18 +2192,10 @@ static void
|
|||||||
redraw_prompt (t)
|
redraw_prompt (t)
|
||||||
char *t;
|
char *t;
|
||||||
{
|
{
|
||||||
char *oldp, *oldl, *oldlprefix;
|
char *oldp;
|
||||||
int oldlen, oldlast, oldplen, oldninvis, oldphyschars;
|
|
||||||
|
|
||||||
/* Geez, I should make this a struct. */
|
|
||||||
oldp = rl_display_prompt;
|
oldp = rl_display_prompt;
|
||||||
oldl = local_prompt;
|
rl_save_prompt ();
|
||||||
oldlprefix = local_prompt_prefix;
|
|
||||||
oldlen = prompt_visible_length;
|
|
||||||
oldplen = prompt_prefix_length;
|
|
||||||
oldlast = prompt_last_invisible;
|
|
||||||
oldninvis = prompt_invis_chars_first_line;
|
|
||||||
oldphyschars = prompt_physical_chars;
|
|
||||||
|
|
||||||
rl_display_prompt = t;
|
rl_display_prompt = t;
|
||||||
local_prompt = expand_prompt (t, &prompt_visible_length,
|
local_prompt = expand_prompt (t, &prompt_visible_length,
|
||||||
@ -2128,16 +2203,11 @@ redraw_prompt (t)
|
|||||||
&prompt_invis_chars_first_line,
|
&prompt_invis_chars_first_line,
|
||||||
&prompt_physical_chars);
|
&prompt_physical_chars);
|
||||||
local_prompt_prefix = (char *)NULL;
|
local_prompt_prefix = (char *)NULL;
|
||||||
|
|
||||||
rl_forced_update_display ();
|
rl_forced_update_display ();
|
||||||
|
|
||||||
rl_display_prompt = oldp;
|
rl_display_prompt = oldp;
|
||||||
local_prompt = oldl;
|
rl_restore_prompt();
|
||||||
local_prompt_prefix = oldlprefix;
|
|
||||||
prompt_visible_length = oldlen;
|
|
||||||
prompt_prefix_length = oldplen;
|
|
||||||
prompt_last_invisible = oldlast;
|
|
||||||
prompt_invis_chars_first_line = oldninvis;
|
|
||||||
prompt_physical_chars = oldphyschars;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Redisplay the current line after a SIGWINCH is received. */
|
/* Redisplay the current line after a SIGWINCH is received. */
|
||||||
|
@ -6,9 +6,9 @@
|
|||||||
.\" Case Western Reserve University
|
.\" Case Western Reserve University
|
||||||
.\" chet@ins.CWRU.Edu
|
.\" chet@ins.CWRU.Edu
|
||||||
.\"
|
.\"
|
||||||
.\" Last Change: Wed Jan 28 15:43:53 EST 2004
|
.\" Last Change: Tue Sep 13 12:07:26 EDT 2005
|
||||||
.\"
|
.\"
|
||||||
.TH READLINE 3 "2004 January 28" "GNU Readline 5.0"
|
.TH READLINE 3 "2005 Sep 13" "GNU Readline 5.1-beta1"
|
||||||
.\"
|
.\"
|
||||||
.\" File Name macro. This used to be `.PN', for Path Name,
|
.\" File Name macro. This used to be `.PN', for Path Name,
|
||||||
.\" but Sun doesn't seem to like that very much.
|
.\" but Sun doesn't seem to like that very much.
|
||||||
@ -328,6 +328,10 @@ Except where noted, readline variables can take the values
|
|||||||
or
|
or
|
||||||
.B Off
|
.B Off
|
||||||
(without regard to case).
|
(without regard to case).
|
||||||
|
Unrecognized variable names are ignored.
|
||||||
|
When a variable value is read, empty or null values, "on" (case-insensitive),
|
||||||
|
and "1" are equivalent to \fBOn\fP. All other values are equivalent to
|
||||||
|
\fBOff\fP.
|
||||||
The variables and their default values are:
|
The variables and their default values are:
|
||||||
.PP
|
.PP
|
||||||
.PD 0
|
.PD 0
|
||||||
@ -338,6 +342,11 @@ If set to \fBnone\fP, readline never rings the bell. If set to
|
|||||||
\fBvisible\fP, readline uses a visible bell if one is available.
|
\fBvisible\fP, readline uses a visible bell if one is available.
|
||||||
If set to \fBaudible\fP, readline attempts to ring the terminal's bell.
|
If set to \fBaudible\fP, readline attempts to ring the terminal's bell.
|
||||||
.TP
|
.TP
|
||||||
|
.B bind\-tty\-special\-chars (On)
|
||||||
|
If set to \fBOn\fP, readline attempts to bind the control characters
|
||||||
|
treated specially by the kernel's terminal driver to their readline
|
||||||
|
equivalents.
|
||||||
|
.TP
|
||||||
.B comment\-begin (``#'')
|
.B comment\-begin (``#'')
|
||||||
The string that is inserted in \fBvi\fP mode when the
|
The string that is inserted in \fBvi\fP mode when the
|
||||||
.B insert\-comment
|
.B insert\-comment
|
||||||
@ -360,7 +369,7 @@ It may be set to any integer value greater than or equal to
|
|||||||
zero. If the number of possible completions is greater than
|
zero. If the number of possible completions is greater than
|
||||||
or equal to the value of this variable, the user is asked whether
|
or equal to the value of this variable, the user is asked whether
|
||||||
or not he wishes to view them; otherwise they are simply listed
|
or not he wishes to view them; otherwise they are simply listed
|
||||||
on the terminal.
|
on the terminal. A negative value causes readline to never ask.
|
||||||
.TP
|
.TP
|
||||||
.B convert\-meta (On)
|
.B convert\-meta (On)
|
||||||
If set to \fBOn\fP, readline will convert characters with the
|
If set to \fBOn\fP, readline will convert characters with the
|
||||||
@ -391,9 +400,9 @@ arrow keys.
|
|||||||
If set to \fBon\fP, tilde expansion is performed when readline
|
If set to \fBon\fP, tilde expansion is performed when readline
|
||||||
attempts word completion.
|
attempts word completion.
|
||||||
.TP
|
.TP
|
||||||
.B history-preserve-point
|
.B history\-preserve\-point (Off)
|
||||||
If set to \fBon\fP, the history code attempts to place point at the
|
If set to \fBon\fP, the history code attempts to place point at the
|
||||||
same location on each history line retrived with \fBprevious-history\fP
|
same location on each history line retrieved with \fBprevious-history\fP
|
||||||
or \fBnext-history\fP.
|
or \fBnext-history\fP.
|
||||||
.TP
|
.TP
|
||||||
.B horizontal\-scroll\-mode (Off)
|
.B horizontal\-scroll\-mode (Off)
|
||||||
@ -691,6 +700,8 @@ With an argument
|
|||||||
insert the \fIn\fPth word from the previous command (the words
|
insert the \fIn\fPth word from the previous command (the words
|
||||||
in the previous command begin with word 0). A negative argument
|
in the previous command begin with word 0). A negative argument
|
||||||
inserts the \fIn\fPth word from the end of the previous command.
|
inserts the \fIn\fPth word from the end of the previous command.
|
||||||
|
Once the argument \fIn\fP is computed, the argument is extracted
|
||||||
|
as if the "!\fIn\fP" history expansion had been specified.
|
||||||
.TP
|
.TP
|
||||||
.B
|
.B
|
||||||
yank\-last\-arg (M\-.\^, M\-_\^)
|
yank\-last\-arg (M\-.\^, M\-_\^)
|
||||||
@ -699,6 +710,8 @@ the previous history entry). With an argument,
|
|||||||
behave exactly like \fByank\-nth\-arg\fP.
|
behave exactly like \fByank\-nth\-arg\fP.
|
||||||
Successive calls to \fByank\-last\-arg\fP move back through the history
|
Successive calls to \fByank\-last\-arg\fP move back through the history
|
||||||
list, inserting the last argument of each line in turn.
|
list, inserting the last argument of each line in turn.
|
||||||
|
The history expansion facilities are used to extract the last argument,
|
||||||
|
as if the "!$" history expansion had been specified.
|
||||||
.PD
|
.PD
|
||||||
.SS Commands for Changing Text
|
.SS Commands for Changing Text
|
||||||
.PP
|
.PP
|
||||||
|
@ -5,10 +5,10 @@
|
|||||||
|
|
||||||
@ifinfo
|
@ifinfo
|
||||||
This document describes the GNU Readline Library, a utility for aiding
|
This document describes the GNU Readline Library, a utility for aiding
|
||||||
in the consitency of user interface across discrete programs that need
|
in the consistency of user interface across discrete programs that need
|
||||||
to provide a command line interface.
|
to provide a command line interface.
|
||||||
|
|
||||||
Copyright (C) 1988-2004 Free Software Foundation, Inc.
|
Copyright (C) 1988-2005 Free Software Foundation, Inc.
|
||||||
|
|
||||||
Permission is granted to make and distribute verbatim copies of
|
Permission is granted to make and distribute verbatim copies of
|
||||||
this manual provided the copyright notice and this permission notice
|
this manual provided the copyright notice and this permission notice
|
||||||
@ -284,6 +284,8 @@ negative argument.
|
|||||||
|
|
||||||
A command function should return 0 if its action completes successfully,
|
A command function should return 0 if its action completes successfully,
|
||||||
and a non-zero value if some error occurs.
|
and a non-zero value if some error occurs.
|
||||||
|
This is the convention obeyed by all of the builtin Readline bindable
|
||||||
|
command functions.
|
||||||
|
|
||||||
@node Readline Variables
|
@node Readline Variables
|
||||||
@section Readline Variables
|
@section Readline Variables
|
||||||
@ -398,6 +400,12 @@ The stdio stream to which Readline performs output.
|
|||||||
If @code{NULL}, Readline defaults to @var{stdout}.
|
If @code{NULL}, Readline defaults to @var{stdout}.
|
||||||
@end deftypevar
|
@end deftypevar
|
||||||
|
|
||||||
|
@deftypevar int rl_prefer_env_winsize
|
||||||
|
If non-zero, Readline gives values found in the @env{LINES} and
|
||||||
|
@env{COLUMNS} environment variables greater precedence than values fetched
|
||||||
|
from the kernel when computing the screen dimensions.
|
||||||
|
@end deftypevar
|
||||||
|
|
||||||
@deftypevar {rl_command_func_t *} rl_last_func
|
@deftypevar {rl_command_func_t *} rl_last_func
|
||||||
The address of the last command function Readline executed. May be used to
|
The address of the last command function Readline executed. May be used to
|
||||||
test whether or not a function is being executed twice in succession, for
|
test whether or not a function is being executed twice in succession, for
|
||||||
@ -909,10 +917,14 @@ possibly containing conversion specifications such as @samp{%d}, and
|
|||||||
any additional arguments necessary to satisfy the conversion specifications.
|
any additional arguments necessary to satisfy the conversion specifications.
|
||||||
The resulting string is displayed in the @dfn{echo area}. The echo area
|
The resulting string is displayed in the @dfn{echo area}. The echo area
|
||||||
is also used to display numeric arguments and search strings.
|
is also used to display numeric arguments and search strings.
|
||||||
|
You should call @code{rl_save_prompt} to save the prompt information
|
||||||
|
before calling this function.
|
||||||
@end deftypefun
|
@end deftypefun
|
||||||
|
|
||||||
@deftypefun int rl_clear_message (void)
|
@deftypefun int rl_clear_message (void)
|
||||||
Clear the message in the echo area.
|
Clear the message in the echo area. If the prompt was saved with a call to
|
||||||
|
@code{rl_save_prompt} before the last call to @code{rl_message},
|
||||||
|
call @code{rl_restore_prompt} before calling this function.
|
||||||
@end deftypefun
|
@end deftypefun
|
||||||
|
|
||||||
@deftypefun void rl_save_prompt (void)
|
@deftypefun void rl_save_prompt (void)
|
||||||
@ -923,6 +935,9 @@ displaying a new message in the message area with @code{rl_message()}.
|
|||||||
@deftypefun void rl_restore_prompt (void)
|
@deftypefun void rl_restore_prompt (void)
|
||||||
Restore the local Readline prompt display state saved by the most
|
Restore the local Readline prompt display state saved by the most
|
||||||
recent call to @code{rl_save_prompt}.
|
recent call to @code{rl_save_prompt}.
|
||||||
|
if @code{rl_save_prompt} was called to save the prompt before a call
|
||||||
|
to @code{rl_message}, this function should be called before the
|
||||||
|
corresponding call to @code{rl_clear_message}.
|
||||||
@end deftypefun
|
@end deftypefun
|
||||||
|
|
||||||
@deftypefun int rl_expand_prompt (char *prompt)
|
@deftypefun int rl_expand_prompt (char *prompt)
|
||||||
@ -1149,6 +1164,11 @@ This behaves as if the readline command
|
|||||||
file (@pxref{Readline Init File Syntax}).
|
file (@pxref{Readline Init File Syntax}).
|
||||||
@end deftypefun
|
@end deftypefun
|
||||||
|
|
||||||
|
@deftypefun {char *} rl_variable_value (const char *variable)
|
||||||
|
Return a string representing the value of the Readline variable @var{variable}.
|
||||||
|
For boolean variables, this string is either @samp{on} or @samp{off}.
|
||||||
|
@end deftypefun
|
||||||
|
|
||||||
@deftypefun void rl_variable_dumper (int readable)
|
@deftypefun void rl_variable_dumper (int readable)
|
||||||
Print the readline variable names and their current values
|
Print the readline variable names and their current values
|
||||||
to @code{rl_outstream}.
|
to @code{rl_outstream}.
|
||||||
@ -1378,7 +1398,8 @@ Update Readline's internal screen size by reading values from the kernel.
|
|||||||
|
|
||||||
@deftypefun void rl_set_screen_size (int rows, int cols)
|
@deftypefun void rl_set_screen_size (int rows, int cols)
|
||||||
Set Readline's idea of the terminal size to @var{rows} rows and
|
Set Readline's idea of the terminal size to @var{rows} rows and
|
||||||
@var{cols} columns.
|
@var{cols} columns. If either @var{rows} or @var{columns} is less than
|
||||||
|
or equal to 0, Readline's idea of that terminal dimension is unchanged.
|
||||||
@end deftypefun
|
@end deftypefun
|
||||||
|
|
||||||
If an application does not want to install a @code{SIGWINCH} handler, but
|
If an application does not want to install a @code{SIGWINCH} handler, but
|
||||||
@ -1390,6 +1411,10 @@ Return Readline's idea of the terminal's size in the
|
|||||||
variables pointed to by the arguments.
|
variables pointed to by the arguments.
|
||||||
@end deftypefun
|
@end deftypefun
|
||||||
|
|
||||||
|
@deftypefun void rl_reset_screen_size (void)
|
||||||
|
Cause Readline to reobtain the screen size and recalculate its dimensions.
|
||||||
|
@end deftypefun
|
||||||
|
|
||||||
The following functions install and remove Readline's signal handlers.
|
The following functions install and remove Readline's signal handlers.
|
||||||
|
|
||||||
@deftypefun int rl_set_signals (void)
|
@deftypefun int rl_set_signals (void)
|
||||||
@ -1707,8 +1732,9 @@ shell variables and hostnames.
|
|||||||
|
|
||||||
@deftypevar int rl_completion_query_items
|
@deftypevar int rl_completion_query_items
|
||||||
Up to this many items will be displayed in response to a
|
Up to this many items will be displayed in response to a
|
||||||
possible-completions call. After that, we ask the user if she is sure
|
possible-completions call. After that, readline asks the user if she is sure
|
||||||
she wants to see them all. The default value is 100.
|
she wants to see them all. The default value is 100. A negative value
|
||||||
|
indicates that Readline should never ask the user.
|
||||||
@end deftypevar
|
@end deftypevar
|
||||||
|
|
||||||
@deftypevar {int} rl_completion_append_character
|
@deftypevar {int} rl_completion_append_character
|
||||||
@ -2237,7 +2263,7 @@ too_dangerous (caller)
|
|||||||
char *caller;
|
char *caller;
|
||||||
@{
|
@{
|
||||||
fprintf (stderr,
|
fprintf (stderr,
|
||||||
"%s: Too dangerous for me to distribute.\n"
|
"%s: Too dangerous for me to distribute.\n",
|
||||||
caller);
|
caller);
|
||||||
fprintf (stderr, "Write it yourself.\n");
|
fprintf (stderr, "Write it yourself.\n");
|
||||||
@}
|
@}
|
||||||
|
@ -10,7 +10,7 @@ use these features. There is a document entitled "readline.texinfo"
|
|||||||
which contains both end-user and programmer documentation for the
|
which contains both end-user and programmer documentation for the
|
||||||
GNU Readline Library.
|
GNU Readline Library.
|
||||||
|
|
||||||
Copyright (C) 1988-2004 Free Software Foundation, Inc.
|
Copyright (C) 1988-2005 Free Software Foundation, Inc.
|
||||||
|
|
||||||
Authored by Brian Fox and Chet Ramey.
|
Authored by Brian Fox and Chet Ramey.
|
||||||
|
|
||||||
@ -383,7 +383,11 @@ set editing-mode vi
|
|||||||
@end example
|
@end example
|
||||||
|
|
||||||
Variable names and values, where appropriate, are recognized without regard
|
Variable names and values, where appropriate, are recognized without regard
|
||||||
to case.
|
to case. Unrecognized variable names are ignored.
|
||||||
|
|
||||||
|
Boolean variables (those that can be set to on or off) are set to on if
|
||||||
|
the value is null or empty, @var{on} (case-insensitive), or 1. Any other
|
||||||
|
value results in the variable being set to off.
|
||||||
|
|
||||||
@ifset BashFeatures
|
@ifset BashFeatures
|
||||||
The @w{@code{bind -V}} command lists the current Readline variable names
|
The @w{@code{bind -V}} command lists the current Readline variable names
|
||||||
@ -404,6 +408,12 @@ If set to @samp{none}, Readline never rings the bell. If set to
|
|||||||
If set to @samp{audible} (the default), Readline attempts to ring
|
If set to @samp{audible} (the default), Readline attempts to ring
|
||||||
the terminal's bell.
|
the terminal's bell.
|
||||||
|
|
||||||
|
@item bind-tty-special-chars
|
||||||
|
@vindex bind-tty-special-chars
|
||||||
|
If set to @samp{on}, Readline attempts to bind the control characters
|
||||||
|
treated specially by the kernel's terminal driver to their Readline
|
||||||
|
equivalents.
|
||||||
|
|
||||||
@item comment-begin
|
@item comment-begin
|
||||||
@vindex comment-begin
|
@vindex comment-begin
|
||||||
The string to insert at the beginning of the line when the
|
The string to insert at the beginning of the line when the
|
||||||
@ -423,6 +433,7 @@ If the number of possible completions is greater than this value,
|
|||||||
Readline will ask the user whether or not he wishes to view
|
Readline will ask the user whether or not he wishes to view
|
||||||
them; otherwise, they are simply listed.
|
them; otherwise, they are simply listed.
|
||||||
This variable must be set to an integer value greater than or equal to 0.
|
This variable must be set to an integer value greater than or equal to 0.
|
||||||
|
A negative value means Readline should never ask.
|
||||||
The default limit is @code{100}.
|
The default limit is @code{100}.
|
||||||
|
|
||||||
@item convert-meta
|
@item convert-meta
|
||||||
@ -456,10 +467,11 @@ arrow keys. The default is @samp{off}.
|
|||||||
If set to @samp{on}, tilde expansion is performed when Readline
|
If set to @samp{on}, tilde expansion is performed when Readline
|
||||||
attempts word completion. The default is @samp{off}.
|
attempts word completion. The default is @samp{off}.
|
||||||
|
|
||||||
|
@item history-preserve-point
|
||||||
@vindex history-preserve-point
|
@vindex history-preserve-point
|
||||||
If set to @samp{on}, the history code attempts to place point at the
|
If set to @samp{on}, the history code attempts to place point at the
|
||||||
same location on each history line retrieved with @code{previous-history}
|
same location on each history line retrieved with @code{previous-history}
|
||||||
or @code{next-history}.
|
or @code{next-history}. The default is @samp{off}.
|
||||||
|
|
||||||
@item horizontal-scroll-mode
|
@item horizontal-scroll-mode
|
||||||
@vindex horizontal-scroll-mode
|
@vindex horizontal-scroll-mode
|
||||||
@ -1012,6 +1024,8 @@ With an argument @var{n},
|
|||||||
insert the @var{n}th word from the previous command (the words
|
insert the @var{n}th word from the previous command (the words
|
||||||
in the previous command begin with word 0). A negative argument
|
in the previous command begin with word 0). A negative argument
|
||||||
inserts the @var{n}th word from the end of the previous command.
|
inserts the @var{n}th word from the end of the previous command.
|
||||||
|
Once the argument @var{n} is computed, the argument is extracted
|
||||||
|
as if the @samp{!@var{n}} history expansion had been specified.
|
||||||
|
|
||||||
@item yank-last-arg (M-. or M-_)
|
@item yank-last-arg (M-. or M-_)
|
||||||
Insert last argument to the previous command (the last word of the
|
Insert last argument to the previous command (the last word of the
|
||||||
@ -1019,6 +1033,8 @@ previous history entry). With an
|
|||||||
argument, behave exactly like @code{yank-nth-arg}.
|
argument, behave exactly like @code{yank-nth-arg}.
|
||||||
Successive calls to @code{yank-last-arg} move back through the history
|
Successive calls to @code{yank-last-arg} move back through the history
|
||||||
list, inserting the last argument of each line in turn.
|
list, inserting the last argument of each line in turn.
|
||||||
|
The history expansion facilities are used to extract the last argument,
|
||||||
|
as if the @samp{!$} history expansion had been specified.
|
||||||
|
|
||||||
@end ftable
|
@end ftable
|
||||||
|
|
||||||
@ -1530,7 +1546,7 @@ special variable as delimiters.
|
|||||||
Shell quoting is honored.
|
Shell quoting is honored.
|
||||||
Each word is then expanded using
|
Each word is then expanded using
|
||||||
brace expansion, tilde expansion, parameter and variable expansion,
|
brace expansion, tilde expansion, parameter and variable expansion,
|
||||||
command substitution, arithmetic expansion, and pathname expansion,
|
command substitution, and arithmetic expansion,
|
||||||
as described above (@pxref{Shell Expansions}).
|
as described above (@pxref{Shell Expansions}).
|
||||||
The results are split using the rules described above
|
The results are split using the rules described above
|
||||||
(@pxref{Word Splitting}).
|
(@pxref{Word Splitting}).
|
||||||
@ -1693,6 +1709,12 @@ shell functions specified with @option{-F}.
|
|||||||
@item nospace
|
@item nospace
|
||||||
Tell Readline not to append a space (the default) to words completed at
|
Tell Readline not to append a space (the default) to words completed at
|
||||||
the end of the line.
|
the end of the line.
|
||||||
|
|
||||||
|
@item plusdirs
|
||||||
|
After any matches defined by the compspec are generated,
|
||||||
|
directory name completion is attempted and any
|
||||||
|
matches are added to the results of the other actions.
|
||||||
|
|
||||||
@end table
|
@end table
|
||||||
|
|
||||||
@item -A @var{action}
|
@item -A @var{action}
|
||||||
|
@ -14,7 +14,7 @@ This manual describes the end user interface of the GNU Readline Library
|
|||||||
consistency of user interface across discrete programs which provide
|
consistency of user interface across discrete programs which provide
|
||||||
a command line interface.
|
a command line interface.
|
||||||
|
|
||||||
Copyright @copyright{} 1988-2004 Free Software Foundation, Inc.
|
Copyright @copyright{} 1988-2005 Free Software Foundation, Inc.
|
||||||
|
|
||||||
Permission is granted to make and distribute verbatim copies of
|
Permission is granted to make and distribute verbatim copies of
|
||||||
this manual provided the copyright notice and this permission notice
|
this manual provided the copyright notice and this permission notice
|
||||||
|
@ -1,10 +1,10 @@
|
|||||||
@ignore
|
@ignore
|
||||||
Copyright (C) 1988-2004 Free Software Foundation, Inc.
|
Copyright (C) 1988-2005 Free Software Foundation, Inc.
|
||||||
@end ignore
|
@end ignore
|
||||||
|
|
||||||
@set EDITION 5.0
|
@set EDITION 5.1-beta1
|
||||||
@set VERSION 5.0
|
@set VERSION 5.1-beta1
|
||||||
@set UPDATED 28 January 2004
|
@set UPDATED 11 November 2005
|
||||||
@set UPDATED-MONTH January 2004
|
@set UPDATED-MONTH November 2005
|
||||||
|
|
||||||
@set LASTCHANGE Wed Jan 28 15:46:54 EST 2004
|
@set LASTCHANGE Fri Nov 11 19:50:51 EST 2005
|
||||||
|
@ -40,6 +40,8 @@ INCLUDES = -I$(srcdir) -I$(top_srcdir) -I..
|
|||||||
CCFLAGS = $(DEFS) $(LOCAL_CFLAGS) $(CPPFLAGS) $(INCLUDES) $(CFLAGS)
|
CCFLAGS = $(DEFS) $(LOCAL_CFLAGS) $(CPPFLAGS) $(INCLUDES) $(CFLAGS)
|
||||||
LDFLAGS = -g -L.. @LDFLAGS@
|
LDFLAGS = -g -L.. @LDFLAGS@
|
||||||
|
|
||||||
|
PURIFY = @PURIFY@
|
||||||
|
|
||||||
READLINE_LIB = ../libreadline.a
|
READLINE_LIB = ../libreadline.a
|
||||||
HISTORY_LIB = ../libhistory.a
|
HISTORY_LIB = ../libhistory.a
|
||||||
|
|
||||||
@ -53,30 +55,32 @@ EXECUTABLES = fileman rltest rl rlcat rlversion histexamp
|
|||||||
OBJECTS = fileman.o rltest.o rl.o rlcat.o rlversion.o histexamp.o
|
OBJECTS = fileman.o rltest.o rl.o rlcat.o rlversion.o histexamp.o
|
||||||
|
|
||||||
all: $(EXECUTABLES)
|
all: $(EXECUTABLES)
|
||||||
everything: all rlfe
|
everything: all
|
||||||
|
|
||||||
rl: rl.o $(READLINE_LIB)
|
rl: rl.o $(READLINE_LIB)
|
||||||
$(CC) $(LDFLAGS) -o $@ rl.o -lreadline $(TERMCAP_LIB)
|
$(PURIFY) $(CC) $(LDFLAGS) -o $@ rl.o $(READLINE_LIB) $(TERMCAP_LIB)
|
||||||
|
|
||||||
rlcat: rlcat.o $(READLINE_LIB)
|
rlcat: rlcat.o $(READLINE_LIB)
|
||||||
$(CC) $(LDFLAGS) -o $@ rlcat.o -lreadline $(TERMCAP_LIB)
|
$(PURIFY) $(CC) $(LDFLAGS) -o $@ rlcat.o $(READLINE_LIB) $(TERMCAP_LIB)
|
||||||
|
|
||||||
fileman: fileman.o $(READLINE_LIB)
|
fileman: fileman.o $(READLINE_LIB)
|
||||||
$(CC) $(LDFLAGS) -o $@ fileman.o -lreadline $(TERMCAP_LIB)
|
$(PURIFY) $(CC) $(LDFLAGS) -o $@ fileman.o $(READLINE_LIB) $(TERMCAP_LIB)
|
||||||
|
|
||||||
rltest: rltest.o $(READLINE_LIB)
|
rltest: rltest.o $(READLINE_LIB)
|
||||||
$(CC) $(LDFLAGS) -o $@ rltest.o -lreadline $(TERMCAP_LIB)
|
$(PURIFY) $(CC) $(LDFLAGS) -o $@ rltest.o $(READLINE_LIB) $(TERMCAP_LIB)
|
||||||
|
|
||||||
|
rlptytest: rlptytest.o $(READLINE_LIB)
|
||||||
|
$(PURIFY) $(CC) $(LDFLAGS) -o $@ rlptytest.o $(READLINE_LIB) $(TERMCAP_LIB)
|
||||||
|
|
||||||
rlversion: rlversion.o $(READLINE_LIB)
|
rlversion: rlversion.o $(READLINE_LIB)
|
||||||
$(CC) $(LDFLAGS) -o $@ rlversion.o -lreadline $(TERMCAP_LIB)
|
$(CC) $(LDFLAGS) -o $@ rlversion.o $(READLINE_LIB) $(TERMCAP_LIB)
|
||||||
|
|
||||||
histexamp: histexamp.o $(HISTORY_LIB)
|
histexamp: histexamp.o $(HISTORY_LIB)
|
||||||
$(CC) $(LDFLAGS) -o $@ histexamp.o -lhistory $(TERMCAP_LIB)
|
$(PURIFY) $(CC) $(LDFLAGS) -o $@ histexamp.o -lhistory $(TERMCAP_LIB)
|
||||||
|
|
||||||
clean mostlyclean:
|
clean mostlyclean:
|
||||||
$(RM) $(OBJECTS)
|
$(RM) $(OBJECTS)
|
||||||
$(RM) $(EXECUTABLES) *.exe
|
$(RM) $(EXECUTABLES) *.exe
|
||||||
$(RM) rlfe.o rlfe
|
|
||||||
|
|
||||||
distclean maintainer-clean: clean
|
distclean maintainer-clean: clean
|
||||||
$(RM) Makefile
|
$(RM) Makefile
|
||||||
@ -86,19 +90,13 @@ rltest.o: rltest.c
|
|||||||
rl.o: rl.c
|
rl.o: rl.c
|
||||||
rlversion.o: rlversion.c
|
rlversion.o: rlversion.c
|
||||||
histexamp.o: histexamp.c
|
histexamp.o: histexamp.c
|
||||||
|
rlcat.o: rlcat.c
|
||||||
|
rlptytest.o: rlptytest.c
|
||||||
|
|
||||||
fileman.o: $(top_srcdir)/readline.h
|
fileman.o: $(top_srcdir)/readline.h
|
||||||
rltest.o: $(top_srcdir)/readline.h
|
rltest.o: $(top_srcdir)/readline.h
|
||||||
rl.o: $(top_srcdir)/readline.h
|
rl.o: $(top_srcdir)/readline.h
|
||||||
rlversion.o: $(top_srcdir)/readline.h
|
rlversion.o: $(top_srcdir)/readline.h
|
||||||
histexamp.o: $(top_srcdir)/history.h
|
histexamp.o: $(top_srcdir)/history.h
|
||||||
|
rlcat.o: $(top_srcdir)/readline.h $(top_srcdir)/history.h
|
||||||
# Stuff for Per Bothner's `rlfe' program
|
rlptytest.o: $(top_srcdir)/readline.h $(top_srcdir)/history.h
|
||||||
|
|
||||||
rlfe: rlfe.o $(READLINE_LIB) $(HISTORY_LIB)
|
|
||||||
$(CC) $(LDFLAGS) -o $@ rlfe.o -lreadline -lhistory ${TERMCAP_LIB}
|
|
||||||
|
|
||||||
rlfe.o: rlfe.c
|
|
||||||
|
|
||||||
rlfe.o: $(top_srcdir)/readline.h
|
|
||||||
rlfe.o: $(top_srcdir)/history.h
|
|
||||||
|
@ -26,6 +26,8 @@
|
|||||||
# include <readline/history.h>
|
# include <readline/history.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#include <string.h>
|
||||||
|
|
||||||
main (argc, argv)
|
main (argc, argv)
|
||||||
int argc;
|
int argc;
|
||||||
char **argv;
|
char **argv;
|
||||||
|
@ -31,12 +31,19 @@
|
|||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include "posixstat.h"
|
|
||||||
|
#ifdef HAVE_STDLIB_H
|
||||||
|
# include <stdlib.h>
|
||||||
|
#else
|
||||||
|
extern void exit();
|
||||||
|
#endif
|
||||||
|
|
||||||
#if defined (READLINE_LIBRARY)
|
#if defined (READLINE_LIBRARY)
|
||||||
|
# include "posixstat.h"
|
||||||
# include "readline.h"
|
# include "readline.h"
|
||||||
# include "history.h"
|
# include "history.h"
|
||||||
#else
|
#else
|
||||||
|
# include <sys/stat.h>
|
||||||
# include <readline/readline.h>
|
# include <readline/readline.h>
|
||||||
# include <readline/history.h>
|
# include <readline/history.h>
|
||||||
#endif
|
#endif
|
||||||
|
@ -40,6 +40,12 @@
|
|||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
|
|
||||||
|
#ifdef HAVE_STDLIB_H
|
||||||
|
# include <stdlib.h>
|
||||||
|
#else
|
||||||
|
extern void exit();
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifndef errno
|
#ifndef errno
|
||||||
extern int errno;
|
extern int errno;
|
||||||
#endif
|
#endif
|
||||||
|
37
contrib/libreadline/examples/rlfe/ChangeLog
Normal file
37
contrib/libreadline/examples/rlfe/ChangeLog
Normal file
@ -0,0 +1,37 @@
|
|||||||
|
2004-11-04 Per Bothner <per@bothner.com>
|
||||||
|
|
||||||
|
* pty.c: Import from screen-4.0.2.
|
||||||
|
* configure.in, Makefile.in, config.h.in: Set up autoconf handling,
|
||||||
|
copying a bunk of stuff over from screen.
|
||||||
|
* rlfe.c: Use OpenPTY from pty.c instead of get_master_pty.
|
||||||
|
|
||||||
|
2004-11-03 Per Bothner <per@bothner.com>
|
||||||
|
|
||||||
|
* rlfe.c: Get input emphasis (boldening) more robust.
|
||||||
|
|
||||||
|
* rlfe.c: Various cleanups on comments and names.
|
||||||
|
|
||||||
|
2003-11-07 Wolfgang Taeuber <wolfgang_taeuber@agilent.com>
|
||||||
|
|
||||||
|
* Specify a history file and the size of the history file with command
|
||||||
|
* line options; use EDITOR/VISUAL to set vi/emacs preference.
|
||||||
|
|
||||||
|
1999-09-03 Chet Ramey <chet@nike.ins.cwru.edu>
|
||||||
|
|
||||||
|
* fep.c: Memmove is not universally available. This patch assumes
|
||||||
|
that an autoconf test has been performed, and that memcpy is
|
||||||
|
available without checking.
|
||||||
|
|
||||||
|
* fep.c: VDISCARD is not universally available, even when termios is.
|
||||||
|
|
||||||
|
* fep.c: If a system doesn't have TIOCSCTTY, the first `open'
|
||||||
|
performed after setsid allocates a controlling terminal. The
|
||||||
|
original code would leave the child process running on the slave pty
|
||||||
|
without a controlling tty if TIOCSCTTY was not available.
|
||||||
|
|
||||||
|
* fep.c: Most versions of SVR4, including solaris, don't allow
|
||||||
|
terminal ioctl calls on the master side of the pty.
|
||||||
|
|
||||||
|
1999-08-28 Per Bothner <per@bothner.com>
|
||||||
|
|
||||||
|
* fep.c: Initial release.
|
176
contrib/libreadline/examples/rlfe/Makefile.in
Normal file
176
contrib/libreadline/examples/rlfe/Makefile.in
Normal file
@ -0,0 +1,176 @@
|
|||||||
|
#
|
||||||
|
# Makefile template for rlfe
|
||||||
|
#
|
||||||
|
# See machine dependant config.h for more configuration options.
|
||||||
|
#
|
||||||
|
|
||||||
|
srcdir = @srcdir@
|
||||||
|
VPATH = @srcdir@
|
||||||
|
|
||||||
|
DESTDIR =
|
||||||
|
|
||||||
|
# Where to install screen.
|
||||||
|
|
||||||
|
prefix = @prefix@
|
||||||
|
exec_prefix = @exec_prefix@
|
||||||
|
|
||||||
|
# don't forget to change mandir and infodir in doc/Makefile.
|
||||||
|
bindir = $(exec_prefix)/bin
|
||||||
|
|
||||||
|
VERSION = @VERSION@
|
||||||
|
SCREEN = screen-$(VERSION)
|
||||||
|
|
||||||
|
CC = @CC@
|
||||||
|
CFLAGS = @CFLAGS@
|
||||||
|
CPPFLAGS = @CPPFLAGS@
|
||||||
|
#LDFLAGS = -L$(READLINE_DIR)
|
||||||
|
LDFLAGS = @LDFLAGS@
|
||||||
|
LIBS = -lreadline -lhistory -lncurses
|
||||||
|
|
||||||
|
CPP=@CPP@
|
||||||
|
CPP_DEPEND=$(CC) -MM
|
||||||
|
|
||||||
|
INSTALL = @INSTALL@
|
||||||
|
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||||
|
INSTALL_DATA = @INSTALL_DATA@
|
||||||
|
|
||||||
|
AWK = @AWK@
|
||||||
|
|
||||||
|
OPTIONS=
|
||||||
|
#OPTIONS= -DDEBUG
|
||||||
|
|
||||||
|
SHELL=/bin/sh
|
||||||
|
|
||||||
|
CFILES= rlfe.c pty.c
|
||||||
|
HFILES= extern.h os.h screen.h
|
||||||
|
EXTRA_DIST=configure.in configure Makefile.in config.h.in ChangeLog README
|
||||||
|
OFILES= rlfe.o pty.o
|
||||||
|
|
||||||
|
all: rlfe
|
||||||
|
|
||||||
|
rlfe: $(OFILES)
|
||||||
|
$(CC) $(LDFLAGS) -o $@ $(OFILES) $(LIBS)
|
||||||
|
|
||||||
|
rlfe-$(VERSION).tar.gz:
|
||||||
|
tar czf $@ $(CFILES) $(HFILES) $(EXTRA_DIST)
|
||||||
|
|
||||||
|
.c.o:
|
||||||
|
$(CC) -c -I. -I$(srcdir) $(M_CFLAGS) $(DEFS) $(OPTIONS) $(CFLAGS) $<
|
||||||
|
|
||||||
|
install_bin: .version screen
|
||||||
|
-if [ -f $(DESTDIR)$(bindir)/$(SCREEN) ] && [ ! -f $(DESTDIR)$(bindir)/$(SCREEN).old ]; \
|
||||||
|
then mv $(DESTDIR)$(bindir)/$(SCREEN) $(DESTDIR)$(bindir)/$(SCREEN).old; fi
|
||||||
|
$(INSTALL_PROGRAM) screen $(DESTDIR)$(bindir)/$(SCREEN)
|
||||||
|
-chown root $(DESTDIR)$(bindir)/$(SCREEN) && chmod 4755 $(DESTDIR)$(bindir)/$(SCREEN)
|
||||||
|
# This doesn't work if $(bindir)/screen is a symlink
|
||||||
|
-if [ -f $(DESTDIR)$(bindir)/screen ] && [ ! -f $(DESTDIR)$(bindir)/screen.old ]; then mv $(DESTDIR)$(bindir)/screen $(DESTDIR)$(bindir)/screen.old; fi
|
||||||
|
rm -f $(DESTDIR)$(bindir)/screen
|
||||||
|
(cd $(DESTDIR)$(bindir) && ln -sf $(SCREEN) screen)
|
||||||
|
cp $(srcdir)/utf8encodings/?? $(DESTDIR)$(SCREENENCODINGS)
|
||||||
|
|
||||||
|
|
||||||
|
uninstall: .version
|
||||||
|
rm -f $(DESTDIR)$(bindir)/$(SCREEN)
|
||||||
|
rm -f $(DESTDIR)$(bindir)/screen
|
||||||
|
-mv $(DESTDIR)$(bindir)/screen.old $(DESTDIR)$(bindir)/screen
|
||||||
|
rm -f $(DESTDIR)$(ETCSCREENRC)
|
||||||
|
cd doc; $(MAKE) uninstall
|
||||||
|
|
||||||
|
shadow:
|
||||||
|
mkdir shadow;
|
||||||
|
cd shadow; ln -s ../*.[ch] ../*.in ../*.sh ../configure ../doc ../terminfo ../etc .
|
||||||
|
rm -f shadow/term.h shadow/tty.c shadow/comm.h shadow/osdef.h
|
||||||
|
echo "install all Makefiles and config:" > shadow/Makefile
|
||||||
|
echo " rm -f config.cache" >> shadow/Makefile
|
||||||
|
echo " sh ./configure" >> shadow/Makefile
|
||||||
|
|
||||||
|
term.h: term.c term.sh
|
||||||
|
AWK=$(AWK) srcdir=$(srcdir) sh $(srcdir)/term.sh
|
||||||
|
|
||||||
|
kmapdef.c: term.h
|
||||||
|
|
||||||
|
tty.c: tty.sh
|
||||||
|
sh $(srcdir)/tty.sh tty.c
|
||||||
|
|
||||||
|
mostlyclean:
|
||||||
|
rm -f $(OFILES) rlfe *.o
|
||||||
|
|
||||||
|
clean celan: mostlyclean
|
||||||
|
rm -f tty.c term.h comm.h osdef.h kmapdef.c core
|
||||||
|
|
||||||
|
# Delete all files from the current directory that are created by
|
||||||
|
# configuring or building the program.
|
||||||
|
# building of term.h/comm.h requires awk. Keep it in the distribution
|
||||||
|
# we keep config.h, as this file knows where 'make dist' finds the ETCSCREENRC.
|
||||||
|
#distclean: mostlyclean
|
||||||
|
# rm -f $(SCREEN).tar $(SCREEN).tar.gz
|
||||||
|
# rm -f config.status Makefile
|
||||||
|
# rm -f osdef.h doc/Makefile
|
||||||
|
|
||||||
|
maintainer-clean:
|
||||||
|
@echo "This command is not even intended for maintainers to use;"
|
||||||
|
@echo "it deletes files that may require special tools to rebuild."
|
||||||
|
|
||||||
|
|
||||||
|
# Delete everything from the current directory that can be
|
||||||
|
# reconstructed with this Makefile.
|
||||||
|
realclean: .version mostlyclean
|
||||||
|
rm -f $(SCREEN).tar $(SCREEN).tar.gz
|
||||||
|
rm -f config.status Makefile doc/Makefile
|
||||||
|
rm -f tty.c term.h comm.h osdef.h kmapdef.c
|
||||||
|
rm -f config.h
|
||||||
|
echo "install all Makefiles and config:" > Makefile
|
||||||
|
echo " sh ./configure" >> Makefile
|
||||||
|
|
||||||
|
tags TAGS: $(CFILES)
|
||||||
|
-ctags *.sh $(CFILES) *.h
|
||||||
|
-ctags -e *.sh $(CFILES) *.h
|
||||||
|
|
||||||
|
dist: .version $(SCREEN).tar.gz
|
||||||
|
|
||||||
|
|
||||||
|
# Perform self-tests (if any).
|
||||||
|
check:
|
||||||
|
|
||||||
|
config:
|
||||||
|
rm -f config.cache
|
||||||
|
sh ./configure
|
||||||
|
|
||||||
|
|
||||||
|
###############################################################################
|
||||||
|
|
||||||
|
.version:
|
||||||
|
@rev=`sed < $(srcdir)/patchlevel.h -n -e '/#define REV/s/#define REV *//p'`; \
|
||||||
|
vers=`sed < $(srcdir)/patchlevel.h -n -e '/#define VERS/s/#define VERS *//p'`; \
|
||||||
|
pat=`sed < $(srcdir)/patchlevel.h -n -e '/#define PATCHLEVEL/s/#define PATCHLEVEL *//p'`; \
|
||||||
|
if [ "$${rev}.$${vers}.$${pat}" != "$(VERSION)" ]; then \
|
||||||
|
echo "This distribution is screen-$${rev}.$${vers}.$${pat}, but"; \
|
||||||
|
echo "the Makefile is from $(VERSION). Please update!"; exit 1; fi
|
||||||
|
|
||||||
|
###############################################################################
|
||||||
|
|
||||||
|
mdepend: $(CFILES) term.h
|
||||||
|
@rm -f DEPEND ; \
|
||||||
|
for i in ${CFILES} ; do \
|
||||||
|
echo "$$i" ; \
|
||||||
|
echo `echo "$$i" | sed -e 's/.c$$/.o/'`": $$i" `\
|
||||||
|
cc -E $$i |\
|
||||||
|
grep '^# .*"\./.*\.h"' |\
|
||||||
|
(sort -t'"' -u -k 2,2 2>/dev/null || sort -t'"' -u +1 -2) |\
|
||||||
|
sed -e 's/.*"\.\/\(.*\)".*/\1/'\
|
||||||
|
` >> DEPEND ; \
|
||||||
|
done
|
||||||
|
|
||||||
|
depend: depend.in
|
||||||
|
./config.status || ./configure
|
||||||
|
|
||||||
|
depend.in: $(CFILES) term.h
|
||||||
|
cp Makefile.in Makefile.in~
|
||||||
|
sed -e '/\#\#\# Dependencies/q' < Makefile.in > tmp_make
|
||||||
|
for i in $(CFILES); do echo $$i; $(CPP_DEPEND) $$i >> tmp_make; done
|
||||||
|
mv tmp_make Makefile.in
|
||||||
|
|
||||||
|
###############################################################################
|
||||||
|
|
||||||
|
### Dependencies:
|
||||||
|
pty.o: pty.c config.h
|
78
contrib/libreadline/examples/rlfe/README
Normal file
78
contrib/libreadline/examples/rlfe/README
Normal file
@ -0,0 +1,78 @@
|
|||||||
|
rlfe (ReadLine Front-End) is a "universal wrapper" around readline.
|
||||||
|
You specify an interactive program to run (typically a shell), and
|
||||||
|
readline is used to edit input lines.
|
||||||
|
|
||||||
|
There are other such front-ends; what distinguishes this one is that
|
||||||
|
it monitors the state of the inferior pty, and if the inferior program
|
||||||
|
switches its terminal to raw mode, then rlfe passes your characters
|
||||||
|
through directly. This basically means you can run your entire
|
||||||
|
session (including bash and terminal-mode emacs) under rlfe.
|
||||||
|
|
||||||
|
FEATURES
|
||||||
|
|
||||||
|
* Can use all readline commands (and history) in commands that
|
||||||
|
read input lines in "canonical mode" - even 'cat'!
|
||||||
|
|
||||||
|
* Automatically switches between "readline-editing mode" and "raw mode"
|
||||||
|
depending on the terminal mode. If the inferior program invokes
|
||||||
|
readline itself, it will do its own line editing. (The inferior
|
||||||
|
readline will not know about rlfe, and it will have its own history.)
|
||||||
|
You can even run programs like 'emavs -nw' and 'vi' under rlfe.
|
||||||
|
The goal is you could leave rlfe always on without even knowing
|
||||||
|
about it. (We're not quite there, but it works tolerably well.)
|
||||||
|
|
||||||
|
* The input line (after any prompt) is changed to bold-face.
|
||||||
|
|
||||||
|
INSTALL
|
||||||
|
|
||||||
|
The usual: ./configure && make && make install
|
||||||
|
|
||||||
|
Note so far rlfe has only been tested on GNU Linux (Fedora Core 2)
|
||||||
|
and Mac OS X (10.3).
|
||||||
|
|
||||||
|
This assumes readline header files and libraries are in the default
|
||||||
|
places. If not, you can create a link named readline pointing to the
|
||||||
|
readline sources. To link with libreadline.a and libhistory.a
|
||||||
|
you can copy or link them, or add LDFLAGS='-/path/to/readline' to
|
||||||
|
the make command-line.
|
||||||
|
|
||||||
|
USAGE
|
||||||
|
|
||||||
|
Just run it. That by default runs bash. You can run some other
|
||||||
|
command by giving it as command-line arguments.
|
||||||
|
|
||||||
|
There are a few tweaks: -h allows you to name the history file,
|
||||||
|
and -s allows you to specify its size. It default to "emacs" mode,
|
||||||
|
but if the the environment variable EDITOR is set to "vi" that
|
||||||
|
mode is chosen.
|
||||||
|
|
||||||
|
ISSUES
|
||||||
|
|
||||||
|
* The mode switching depends on the terminal mode set by the inferior
|
||||||
|
program. Thus ssh/telnet/screen-type programs will typically be in
|
||||||
|
raw mode, so rlfe won't be much use, even if remote programs run in
|
||||||
|
canonical mode. The work-around is to run rlfe on the remote end.
|
||||||
|
|
||||||
|
* Echo supression and prompt recognition are somewhat fragile.
|
||||||
|
(A protocol so that the o/s tty code can reliably communicate its
|
||||||
|
state to rlfe could solve this problem, and the previous one.)
|
||||||
|
|
||||||
|
* See the intro to rlfe.c for more notes.
|
||||||
|
|
||||||
|
* Assumes a VT100-compatible terminal, though that could be generalized
|
||||||
|
if anybody cares.
|
||||||
|
|
||||||
|
* Requires ncurses.
|
||||||
|
|
||||||
|
* It would be useful to integrate rlfe's logic in a terminal emulator.
|
||||||
|
That would make it easier to reposition the edit position with a mouse,
|
||||||
|
integrate cut-and-paste with the system clipboard, and more robustly
|
||||||
|
handle escape sequence and multi-byte characters more robustly.
|
||||||
|
|
||||||
|
AUTHOR
|
||||||
|
|
||||||
|
Per Bothner <per@bothner.com>
|
||||||
|
|
||||||
|
LICENSE
|
||||||
|
|
||||||
|
GPL.
|
375
contrib/libreadline/examples/rlfe/config.h.in
Normal file
375
contrib/libreadline/examples/rlfe/config.h.in
Normal file
@ -0,0 +1,375 @@
|
|||||||
|
/* Copyright 2004 Per Bothner <per@bothner.com>
|
||||||
|
* Based on config.h from screen-4.0.2.
|
||||||
|
* Copyright (c) 1993-2000
|
||||||
|
* Juergen Weigert (jnweiger@immd4.informatik.uni-erlangen.de)
|
||||||
|
* Michael Schroeder (mlschroe@immd4.informatik.uni-erlangen.de)
|
||||||
|
* Copyright (c) 1987 Oliver Laumann
|
||||||
|
*
|
||||||
|
* 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
|
||||||
|
* the Free Software Foundation; either version 2, or (at your option)
|
||||||
|
* any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program (see the file COPYING); if not, write to the
|
||||||
|
* Free Software Foundation, Inc.,
|
||||||
|
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
|
||||||
|
*
|
||||||
|
****************************************************************
|
||||||
|
* $Id: config.h.in,v 1.12 1994/05/31 12:31:36 mlschroe Exp $ FAU
|
||||||
|
*/
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
/**********************************************************************
|
||||||
|
*
|
||||||
|
* User Configuration Section
|
||||||
|
*/
|
||||||
|
|
||||||
|
|
||||||
|
/*
|
||||||
|
* define PTYMODE if you do not like the default of 0622, which allows
|
||||||
|
* public write to your pty.
|
||||||
|
* define PTYGROUP to some numerical group-id if you do not want the
|
||||||
|
* tty to be in "your" group.
|
||||||
|
* Note, screen is unable to change mode or group of the pty if it
|
||||||
|
* is not installed with sufficient privilege. (e.g. set-uid-root)
|
||||||
|
* define PTYROFS if the /dev/pty devices are mounted on a read-only
|
||||||
|
* filesystem so screen should not even attempt to set mode or group
|
||||||
|
* even if running as root (e.g. on TiVo).
|
||||||
|
*/
|
||||||
|
#undef PTYMODE
|
||||||
|
#undef PTYGROUP
|
||||||
|
#undef PTYROFS
|
||||||
|
|
||||||
|
/*
|
||||||
|
* If screen is NOT installed set-uid root, screen can provide tty
|
||||||
|
* security by exclusively locking the ptys. While this keeps other
|
||||||
|
* users from opening your ptys, it also keeps your own subprocesses
|
||||||
|
* from being able to open /dev/tty. Define LOCKPTY to add this
|
||||||
|
* exclusive locking.
|
||||||
|
*/
|
||||||
|
#undef LOCKPTY
|
||||||
|
|
||||||
|
|
||||||
|
/**********************************************************************
|
||||||
|
*
|
||||||
|
* End of User Configuration Section
|
||||||
|
*
|
||||||
|
* Rest of this file is modified by 'configure'
|
||||||
|
* Change at your own risk!
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Some defines to identify special unix variants
|
||||||
|
*/
|
||||||
|
#ifndef SVR4
|
||||||
|
#undef SVR4
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef _POSIX_SOURCE
|
||||||
|
#undef _POSIX_SOURCE
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Define POSIX if your system supports IEEE Std 1003.1-1988 (POSIX).
|
||||||
|
*/
|
||||||
|
#undef POSIX
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Define TERMIO if you have struct termio instead of struct sgttyb.
|
||||||
|
* This is usually the case for SVID systems, where BSD uses sgttyb.
|
||||||
|
* POSIX systems should define this anyway, even though they use
|
||||||
|
* struct termios.
|
||||||
|
*/
|
||||||
|
#undef TERMIO
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Define CYTERMIO if you have cyrillic termio modes.
|
||||||
|
*/
|
||||||
|
#undef CYTERMIO
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Define TERMINFO if your machine emulates the termcap routines
|
||||||
|
* with the terminfo database.
|
||||||
|
* Thus the .screenrc file is parsed for
|
||||||
|
* the command 'terminfo' and not 'termcap'.
|
||||||
|
*/
|
||||||
|
#undef TERMINFO
|
||||||
|
|
||||||
|
/*
|
||||||
|
* If your library does not define ospeed, define this.
|
||||||
|
*/
|
||||||
|
#undef NEED_OSPEED
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Define SYSV if your machine is SYSV complient (Sys V, HPUX, A/UX)
|
||||||
|
*/
|
||||||
|
#ifndef SYSV
|
||||||
|
#undef SYSV
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Define SIGVOID if your signal handlers return void. On older
|
||||||
|
* systems, signal returns int, but on newer ones, it returns void.
|
||||||
|
*/
|
||||||
|
#undef SIGVOID
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Define USESIGSET if you have sigset for BSD 4.1 reliable signals.
|
||||||
|
*/
|
||||||
|
#undef USESIGSET
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Define SYSVSIGS if signal handlers must be reinstalled after
|
||||||
|
* they have been called.
|
||||||
|
*/
|
||||||
|
#undef SYSVSIGS
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Define BSDWAIT if your system defines a 'union wait' in <sys/wait.h>
|
||||||
|
*
|
||||||
|
* Only allow BSDWAIT i.e. wait3 on nonposix systems, since
|
||||||
|
* posix implies wait(3) and waitpid(3). vdlinden@fwi.uva.nl
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
#ifndef POSIX
|
||||||
|
#undef BSDWAIT
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/*
|
||||||
|
* On RISCOS we prefer wait2() over wait3(). rouilj@sni-usa.com
|
||||||
|
*/
|
||||||
|
#ifdef BSDWAIT
|
||||||
|
#undef USE_WAIT2
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Define if you have the utempter utmp helper program
|
||||||
|
*/
|
||||||
|
#undef HAVE_UTEMPTER
|
||||||
|
|
||||||
|
/*
|
||||||
|
* If ttyslot() breaks getlogin() by returning indexes to utmp entries
|
||||||
|
* of type DEAD_PROCESS, then our getlogin() replacement should be
|
||||||
|
* selected by defining BUGGYGETLOGIN.
|
||||||
|
*/
|
||||||
|
#undef BUGGYGETLOGIN
|
||||||
|
|
||||||
|
/*
|
||||||
|
* If your system has the calls setreuid() and setregid(),
|
||||||
|
* define HAVE_SETREUID. Otherwise screen will use a forked process to
|
||||||
|
* safely create output files without retaining any special privileges.
|
||||||
|
*/
|
||||||
|
#undef HAVE_SETREUID
|
||||||
|
|
||||||
|
/*
|
||||||
|
* If your system supports BSD4.4's seteuid() and setegid(), define
|
||||||
|
* HAVE_SETEUID.
|
||||||
|
*/
|
||||||
|
#undef HAVE_SETEUID
|
||||||
|
|
||||||
|
/*
|
||||||
|
* If you want the "time" command to display the current load average
|
||||||
|
* define LOADAV. Maybe you must install screen with the needed
|
||||||
|
* privileges to read /dev/kmem.
|
||||||
|
* Note that NLIST_ stuff is only checked, when getloadavg() is not available.
|
||||||
|
*/
|
||||||
|
#undef LOADAV
|
||||||
|
|
||||||
|
#undef LOADAV_NUM
|
||||||
|
#undef LOADAV_TYPE
|
||||||
|
#undef LOADAV_SCALE
|
||||||
|
#undef LOADAV_GETLOADAVG
|
||||||
|
#undef LOADAV_UNIX
|
||||||
|
#undef LOADAV_AVENRUN
|
||||||
|
#undef LOADAV_USE_NLIST64
|
||||||
|
|
||||||
|
#undef NLIST_DECLARED
|
||||||
|
#undef NLIST_STRUCT
|
||||||
|
#undef NLIST_NAME_UNION
|
||||||
|
|
||||||
|
/*
|
||||||
|
* If your system has the new format /etc/ttys (like 4.3 BSD) and the
|
||||||
|
* getttyent(3) library functions, define GETTTYENT.
|
||||||
|
*/
|
||||||
|
#undef GETTTYENT
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Define USEBCOPY if the bcopy/memcpy from your system's C library
|
||||||
|
* supports the overlapping of source and destination blocks. When
|
||||||
|
* undefined, screen uses its own (probably slower) version of bcopy().
|
||||||
|
*
|
||||||
|
* SYSV machines may have a working memcpy() -- Oh, this is
|
||||||
|
* quite unlikely. Tell me if you see one.
|
||||||
|
* "But then, memmove() should work, if at all available" he thought...
|
||||||
|
* Boing, never say "works everywhere" unless you checked SCO UNIX.
|
||||||
|
* Their memove fails the test in the configure script. Sigh. (Juergen)
|
||||||
|
*/
|
||||||
|
#undef USEBCOPY
|
||||||
|
#undef USEMEMCPY
|
||||||
|
#undef USEMEMMOVE
|
||||||
|
|
||||||
|
/*
|
||||||
|
* If your system has vsprintf() and requires the use of the macros in
|
||||||
|
* "varargs.h" to use functions with variable arguments,
|
||||||
|
* define USEVARARGS.
|
||||||
|
*/
|
||||||
|
#undef USEVARARGS
|
||||||
|
|
||||||
|
/*
|
||||||
|
* If your system has strerror() define this.
|
||||||
|
*/
|
||||||
|
#undef HAVE_STRERROR
|
||||||
|
|
||||||
|
/*
|
||||||
|
* If the select return value doesn't treat a descriptor that is
|
||||||
|
* usable for reading and writing as two hits, define SELECT_BROKEN.
|
||||||
|
*/
|
||||||
|
#undef SELECT_BROKEN
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Define this if your system supports named pipes.
|
||||||
|
*/
|
||||||
|
#undef NAMEDPIPE
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Define this if your system exits select() immediatly if a pipe is
|
||||||
|
* opened read-only and no writer has opened it.
|
||||||
|
*/
|
||||||
|
#undef BROKEN_PIPE
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Define this if the unix-domain socket implementation doesn't
|
||||||
|
* create a socket in the filesystem.
|
||||||
|
*/
|
||||||
|
#undef SOCK_NOT_IN_FS
|
||||||
|
|
||||||
|
/*
|
||||||
|
* If your system has setenv() and unsetenv() define USESETENV
|
||||||
|
*/
|
||||||
|
#undef USESETENV
|
||||||
|
|
||||||
|
/*
|
||||||
|
* If your system does not come with a setenv()/putenv()/getenv()
|
||||||
|
* functions, you may bring in our own code by defining NEEDPUTENV.
|
||||||
|
*/
|
||||||
|
#undef NEEDPUTENV
|
||||||
|
|
||||||
|
/*
|
||||||
|
* If the passwords are stored in a shadow file and you want the
|
||||||
|
* builtin lock to work properly, define SHADOWPW.
|
||||||
|
*/
|
||||||
|
#undef SHADOWPW
|
||||||
|
|
||||||
|
/*
|
||||||
|
* If you are on a SYS V machine that restricts filename length to 14
|
||||||
|
* characters, you may need to enforce that by setting NAME_MAX to 14
|
||||||
|
*/
|
||||||
|
#undef NAME_MAX /* KEEP_UNDEF_HERE override system value */
|
||||||
|
#undef NAME_MAX
|
||||||
|
|
||||||
|
/*
|
||||||
|
* define HAVE_RENAME if your system has a rename() function
|
||||||
|
*/
|
||||||
|
#undef HAVE_RENAME
|
||||||
|
|
||||||
|
/*
|
||||||
|
* define HAVE__EXIT if your system has the _exit() call.
|
||||||
|
*/
|
||||||
|
#undef HAVE__EXIT
|
||||||
|
|
||||||
|
/*
|
||||||
|
* define HAVE_LSTAT if your system has symlinks and the lstat() call.
|
||||||
|
*/
|
||||||
|
#undef HAVE_LSTAT
|
||||||
|
|
||||||
|
/*
|
||||||
|
* define HAVE_UTIMES if your system has the utimes() call.
|
||||||
|
*/
|
||||||
|
#undef HAVE_UTIMES
|
||||||
|
|
||||||
|
/*
|
||||||
|
* define HAVE_FCHOWN if your system has the fchown() call.
|
||||||
|
*/
|
||||||
|
#undef HAVE_FCHOWN
|
||||||
|
|
||||||
|
/*
|
||||||
|
* define HAVE_FCHMOD if your system has the fchmod() call.
|
||||||
|
*/
|
||||||
|
#undef HAVE_FCHMOD
|
||||||
|
|
||||||
|
/*
|
||||||
|
* define HAVE_VSNPRINTF if your system has vsnprintf() (GNU lib).
|
||||||
|
*/
|
||||||
|
#undef HAVE_VSNPRINTF
|
||||||
|
|
||||||
|
/*
|
||||||
|
* define HAVE_GETCWD if your system has the getcwd() call.
|
||||||
|
*/
|
||||||
|
#undef HAVE_GETCWD
|
||||||
|
|
||||||
|
/*
|
||||||
|
* define HAVE_SETLOCALE if your system has the setlocale() call.
|
||||||
|
*/
|
||||||
|
#undef HAVE_SETLOCALE
|
||||||
|
|
||||||
|
/*
|
||||||
|
* define HAVE_STRFTIME if your system has the strftime() call.
|
||||||
|
*/
|
||||||
|
#undef HAVE_STRFTIME
|
||||||
|
|
||||||
|
/*
|
||||||
|
* define HAVE_NL_LANGINFO if your system has the nl_langinfo() call
|
||||||
|
* and <langinfo.h> defines CODESET.
|
||||||
|
*/
|
||||||
|
#undef HAVE_NL_LANGINFO
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Newer versions of Solaris include fdwalk, which can greatly improve
|
||||||
|
* the startup time of screen; otherwise screen spends a lot of time
|
||||||
|
* closing file descriptors.
|
||||||
|
*/
|
||||||
|
#undef HAVE_FDWALK
|
||||||
|
|
||||||
|
/*
|
||||||
|
* define HAVE_DEV_PTC if you have a /dev/ptc character special
|
||||||
|
* device.
|
||||||
|
*/
|
||||||
|
#undef HAVE_DEV_PTC
|
||||||
|
|
||||||
|
/*
|
||||||
|
* define HAVE_SVR4_PTYS if you have a /dev/ptmx character special
|
||||||
|
* device and support the ptsname(), grantpt(), unlockpt() functions.
|
||||||
|
*/
|
||||||
|
#undef HAVE_SVR4_PTYS
|
||||||
|
|
||||||
|
/*
|
||||||
|
* define HAVE_GETPT if you have the getpt() function.
|
||||||
|
*/
|
||||||
|
#undef HAVE_GETPT
|
||||||
|
|
||||||
|
/*
|
||||||
|
* define HAVE_OPENPTY if your system has the openpty() call.
|
||||||
|
*/
|
||||||
|
#undef HAVE_OPENPTY
|
||||||
|
|
||||||
|
/*
|
||||||
|
* define PTYRANGE0 and or PTYRANGE1 if you want to adapt screen
|
||||||
|
* to unusual environments. E.g. For SunOs the defaults are "qpr" and
|
||||||
|
* "0123456789abcdef". For SunOs 4.1.2
|
||||||
|
* #define PTYRANGE0 "pqrstuvwxyzPQRST"
|
||||||
|
* is recommended by Dan Jacobson.
|
||||||
|
*/
|
||||||
|
#undef PTYRANGE0
|
||||||
|
#undef PTYRANGE1
|
||||||
|
|
||||||
|
#define USEVARARGS
|
5400
contrib/libreadline/examples/rlfe/configure
vendored
Executable file
5400
contrib/libreadline/examples/rlfe/configure
vendored
Executable file
File diff suppressed because it is too large
Load Diff
438
contrib/libreadline/examples/rlfe/configure.in
Normal file
438
contrib/libreadline/examples/rlfe/configure.in
Normal file
@ -0,0 +1,438 @@
|
|||||||
|
dnl Process this file with autoconf to produce a configure script.
|
||||||
|
|
||||||
|
AC_INIT(rlfe.c)
|
||||||
|
AC_CONFIG_HEADER(config.h)
|
||||||
|
VERSION=0.4
|
||||||
|
AC_SUBST(VERSION)
|
||||||
|
|
||||||
|
dnl
|
||||||
|
dnl Define some useful macros
|
||||||
|
dnl
|
||||||
|
AC_DEFUN(AC_PROGRAM_SOURCE,
|
||||||
|
[AC_REQUIRE([AC_PROG_CPP])AC_PROVIDE([$0])cat > conftest.c <<EOF
|
||||||
|
#include "confdefs.h"
|
||||||
|
[$1]
|
||||||
|
_CUT_HERE_
|
||||||
|
[$2]
|
||||||
|
EOF
|
||||||
|
eval "$ac_cpp conftest.c 2>&5 | sed -e '1,/_CUT_HERE_/d' -e 's/ //g' > conftest.out"
|
||||||
|
. ./conftest.out
|
||||||
|
rm -f conftest*
|
||||||
|
])dnl
|
||||||
|
dnl
|
||||||
|
define(AC_NOTE,
|
||||||
|
[echo "$1" 1>&AC_FD_MSG
|
||||||
|
])dnl
|
||||||
|
|
||||||
|
old_CFLAGS="$CFLAGS"
|
||||||
|
AC_PROG_CC
|
||||||
|
AC_PROG_CPP
|
||||||
|
AC_PROG_GCC_TRADITIONAL
|
||||||
|
AC_ISC_POSIX
|
||||||
|
|
||||||
|
AC_TRY_RUN(main(){exit(0);},,[
|
||||||
|
if test $CC != cc ; then
|
||||||
|
AC_NOTE(Your $CC failed - restarting with CC=cc)
|
||||||
|
AC_NOTE()
|
||||||
|
CC=cc
|
||||||
|
export CC
|
||||||
|
exec $0 $configure_args
|
||||||
|
fi
|
||||||
|
])
|
||||||
|
|
||||||
|
AC_TRY_RUN(main(){exit(0);},,
|
||||||
|
exec 5>&2
|
||||||
|
eval $ac_link
|
||||||
|
AC_NOTE(CC=$CC; CFLAGS=$CFLAGS; LIBS=$LIBS;)
|
||||||
|
AC_NOTE($ac_compile)
|
||||||
|
AC_MSG_ERROR(Can't run the compiler - sorry))
|
||||||
|
|
||||||
|
AC_TRY_RUN([
|
||||||
|
main()
|
||||||
|
{
|
||||||
|
int __something_strange_();
|
||||||
|
__something_strange_(0);
|
||||||
|
}
|
||||||
|
],AC_MSG_ERROR(Your compiler does not set the exit status - sorry))
|
||||||
|
|
||||||
|
AC_PROG_AWK
|
||||||
|
|
||||||
|
if test -f etc/toolcheck; then
|
||||||
|
AC_CHECKING(for buggy tools)
|
||||||
|
sh etc/toolcheck 1>&AC_FD_MSG
|
||||||
|
fi
|
||||||
|
|
||||||
|
dnl
|
||||||
|
dnl **** special unix variants ****
|
||||||
|
dnl
|
||||||
|
|
||||||
|
AC_CHECKING(for System V)
|
||||||
|
AC_TRY_COMPILE(
|
||||||
|
[#include <sys/types.h>
|
||||||
|
#include <signal.h>
|
||||||
|
#include <fcntl.h>], [int x = SIGCHLD | FNDELAY;], , AC_DEFINE(SYSV))
|
||||||
|
|
||||||
|
AC_CHECKING(for Solaris 2.x)
|
||||||
|
AC_EGREP_CPP(yes,
|
||||||
|
[#if defined(SVR4) && defined(sun)
|
||||||
|
yes
|
||||||
|
#endif
|
||||||
|
], LIBS="$LIBS -lsocket -lnsl -lkstat")
|
||||||
|
|
||||||
|
dnl
|
||||||
|
dnl **** select() ****
|
||||||
|
dnl
|
||||||
|
|
||||||
|
AC_CHECKING(select)
|
||||||
|
AC_TRY_LINK(,[select(0, 0, 0, 0, 0);],,
|
||||||
|
LIBS="$LIBS -lnet -lnsl"
|
||||||
|
AC_CHECKING(select with $LIBS)
|
||||||
|
AC_TRY_LINK(,[select(0, 0, 0, 0, 0);],,
|
||||||
|
AC_MSG_ERROR(!!! no select - no screen))
|
||||||
|
)
|
||||||
|
dnl
|
||||||
|
dnl **** check the select implementation ****
|
||||||
|
dnl
|
||||||
|
|
||||||
|
AC_CHECKING(select return value)
|
||||||
|
AC_TRY_RUN([
|
||||||
|
#include <sys/types.h>
|
||||||
|
#include <sys/stat.h>
|
||||||
|
#include <fcntl.h>
|
||||||
|
|
||||||
|
char *nam = "/tmp/conftest$$";
|
||||||
|
|
||||||
|
#ifdef NAMEDPIPE
|
||||||
|
|
||||||
|
#ifndef O_NONBLOCK
|
||||||
|
#define O_NONBLOCK O_NDELAY
|
||||||
|
#endif
|
||||||
|
#ifndef S_IFIFO
|
||||||
|
#define S_IFIFO 0010000
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
main()
|
||||||
|
{
|
||||||
|
#ifdef FD_SET
|
||||||
|
fd_set f;
|
||||||
|
#else
|
||||||
|
int f;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef __FreeBSD__
|
||||||
|
/* From Andrew A. Chernov (ache@astral.msk.su):
|
||||||
|
* opening RDWR fifo fails in BSD 4.4, but select return values are
|
||||||
|
* right.
|
||||||
|
*/
|
||||||
|
exit(0);
|
||||||
|
#endif
|
||||||
|
(void)alarm(5);
|
||||||
|
#ifdef POSIX
|
||||||
|
if (mkfifo(nam, 0777))
|
||||||
|
#else
|
||||||
|
if (mknod(nam, S_IFIFO|0777, 0))
|
||||||
|
#endif
|
||||||
|
exit(1);
|
||||||
|
close(0);
|
||||||
|
if (open(nam, O_RDWR | O_NONBLOCK))
|
||||||
|
exit(1);
|
||||||
|
if (write(0, "TEST", 4) == -1)
|
||||||
|
exit(1);
|
||||||
|
|
||||||
|
#else
|
||||||
|
|
||||||
|
#include <sys/types.h>
|
||||||
|
#include <sys/socket.h>
|
||||||
|
#include <sys/un.h>
|
||||||
|
|
||||||
|
main()
|
||||||
|
{
|
||||||
|
int s1, s2, l;
|
||||||
|
struct sockaddr_un a;
|
||||||
|
#ifdef FD_SET
|
||||||
|
fd_set f;
|
||||||
|
#else
|
||||||
|
int f;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
(void)alarm(5);
|
||||||
|
if ((s1 = socket(AF_UNIX, SOCK_STREAM, 0)) == -1)
|
||||||
|
exit(1);
|
||||||
|
a.sun_family = AF_UNIX;
|
||||||
|
strcpy(a.sun_path, nam);
|
||||||
|
(void) unlink(nam);
|
||||||
|
if (bind(s1, (struct sockaddr *) &a, strlen(nam)+2) == -1)
|
||||||
|
exit(1);
|
||||||
|
if (listen(s1, 2))
|
||||||
|
exit(1);
|
||||||
|
if (fork() == 0)
|
||||||
|
{
|
||||||
|
if ((s2 = socket(AF_UNIX, SOCK_STREAM, 0)) == -1)
|
||||||
|
kill(getppid(), 3);
|
||||||
|
(void)connect(s2, (struct sockaddr *)&a, strlen(nam) + 2);
|
||||||
|
if (write(s2, "HELLO", 5) == -1)
|
||||||
|
kill(getppid(), 3);
|
||||||
|
exit(0);
|
||||||
|
}
|
||||||
|
l = sizeof(a);
|
||||||
|
close(0);
|
||||||
|
if (accept(s1, (struct sockaddr *)&a, &l))
|
||||||
|
exit(1);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
#ifdef FD_SET
|
||||||
|
FD_SET(0, &f);
|
||||||
|
#else
|
||||||
|
f = 1;
|
||||||
|
#endif
|
||||||
|
if (select(1, &f, 0, 0, 0) == -1)
|
||||||
|
exit(1);
|
||||||
|
if (select(1, &f, &f, 0, 0) != 2)
|
||||||
|
exit(1);
|
||||||
|
exit(0);
|
||||||
|
}
|
||||||
|
],AC_NOTE(- select is ok),
|
||||||
|
AC_NOTE(- select can't count) AC_DEFINE(SELECT_BROKEN))
|
||||||
|
|
||||||
|
dnl
|
||||||
|
dnl **** termcap or terminfo ****
|
||||||
|
dnl
|
||||||
|
AC_CHECKING(for tgetent)
|
||||||
|
AC_TRY_LINK(,tgetent((char *)0, (char *)0);,,
|
||||||
|
olibs="$LIBS"
|
||||||
|
LIBS="-lcurses $olibs"
|
||||||
|
AC_CHECKING(libcurses)
|
||||||
|
AC_TRY_LINK(,[
|
||||||
|
#ifdef __hpux
|
||||||
|
__sorry_hpux_libcurses_is_totally_broken_in_10_10();
|
||||||
|
#else
|
||||||
|
tgetent((char *)0, (char *)0);
|
||||||
|
#endif
|
||||||
|
],,
|
||||||
|
LIBS="-ltermcap $olibs"
|
||||||
|
AC_CHECKING(libtermcap)
|
||||||
|
AC_TRY_LINK(,tgetent((char *)0, (char *)0);,,
|
||||||
|
LIBS="-ltermlib $olibs"
|
||||||
|
AC_CHECKING(libtermlib)
|
||||||
|
AC_TRY_LINK(,tgetent((char *)0, (char *)0);,,
|
||||||
|
LIBS="-lncurses $olibs"
|
||||||
|
AC_CHECKING(libncurses)
|
||||||
|
AC_TRY_LINK(,tgetent((char *)0, (char *)0);,,
|
||||||
|
AC_MSG_ERROR(!!! no tgetent - no screen))))))
|
||||||
|
|
||||||
|
AC_TRY_RUN([
|
||||||
|
main()
|
||||||
|
{
|
||||||
|
exit(strcmp(tgoto("%p1%d", 0, 1), "1") ? 0 : 1);
|
||||||
|
}], AC_NOTE(- you use the termcap database),
|
||||||
|
AC_NOTE(- you use the terminfo database) AC_DEFINE(TERMINFO))
|
||||||
|
AC_CHECKING(ospeed)
|
||||||
|
AC_TRY_LINK(extern short ospeed;,ospeed=5;,,AC_DEFINE(NEED_OSPEED))
|
||||||
|
|
||||||
|
dnl
|
||||||
|
dnl **** PTY specific things ****
|
||||||
|
dnl
|
||||||
|
AC_CHECKING(for /dev/ptc)
|
||||||
|
if test -r /dev/ptc; then
|
||||||
|
AC_DEFINE(HAVE_DEV_PTC)
|
||||||
|
fi
|
||||||
|
|
||||||
|
AC_CHECKING(for SVR4 ptys)
|
||||||
|
sysvr4ptys=
|
||||||
|
if test -c /dev/ptmx ; then
|
||||||
|
AC_TRY_LINK([],[ptsname(0);grantpt(0);unlockpt(0);],[AC_DEFINE(HAVE_SVR4_PTYS)
|
||||||
|
sysvr4ptys=1])
|
||||||
|
fi
|
||||||
|
|
||||||
|
AC_CHECK_FUNCS(getpt)
|
||||||
|
|
||||||
|
dnl check for openpty()
|
||||||
|
if test -z "$sysvr4ptys"; then
|
||||||
|
AC_CHECK_FUNCS(openpty,,
|
||||||
|
[AC_CHECK_LIB(util,openpty, [AC_DEFINE(HAVE_OPENPTY)] [LIBS="$LIBS -lutil"])])
|
||||||
|
fi
|
||||||
|
|
||||||
|
AC_CHECKING(for ptyranges)
|
||||||
|
if test -d /dev/ptym ; then
|
||||||
|
pdir='/dev/ptym'
|
||||||
|
else
|
||||||
|
pdir='/dev'
|
||||||
|
fi
|
||||||
|
dnl SCO uses ptyp%d
|
||||||
|
AC_EGREP_CPP(yes,
|
||||||
|
[#ifdef M_UNIX
|
||||||
|
yes;
|
||||||
|
#endif
|
||||||
|
], ptys=`echo /dev/ptyp??`, ptys=`echo $pdir/pty??`)
|
||||||
|
dnl if test -c /dev/ptyp19; then
|
||||||
|
dnl ptys=`echo /dev/ptyp??`
|
||||||
|
dnl else
|
||||||
|
dnl ptys=`echo $pdir/pty??`
|
||||||
|
dnl fi
|
||||||
|
if test "$ptys" != "$pdir/pty??" ; then
|
||||||
|
p0=`echo $ptys | tr ' ' '\012' | sed -e 's/^.*\(.\).$/\1/g' | sort -u | tr -d '\012'`
|
||||||
|
p1=`echo $ptys | tr ' ' '\012' | sed -e 's/^.*\(.\)$/\1/g' | sort -u | tr -d '\012'`
|
||||||
|
AC_DEFINE_UNQUOTED(PTYRANGE0,"$p0")
|
||||||
|
AC_DEFINE_UNQUOTED(PTYRANGE1,"$p1")
|
||||||
|
fi
|
||||||
|
|
||||||
|
dnl **** pty mode/group handling ****
|
||||||
|
dnl
|
||||||
|
dnl support provided by Luke Mewburn <lm@rmit.edu.au>, 931222
|
||||||
|
AC_ARG_WITH(pty-mode, [ --with-pty-mode=mode default mode for ptys], [ ptymode="${withval}" ])
|
||||||
|
AC_ARG_WITH(pty-group, [ --with-pty-group=group default group for ptys], [ ptygrp="${withval}" ])
|
||||||
|
test -n "$ptymode" || ptymode=0620
|
||||||
|
if test -n "$ptygrp" ; then
|
||||||
|
AC_DEFINE_UNQUOTED(PTYMODE, $ptymode)
|
||||||
|
AC_DEFINE_UNQUOTED(PTYGROUP,$ptygrp)
|
||||||
|
else
|
||||||
|
|
||||||
|
AC_CHECKING(default tty permissions/group)
|
||||||
|
rm -f conftest_grp
|
||||||
|
AC_TRY_RUN([
|
||||||
|
#include <sys/types.h>
|
||||||
|
#include <sys/stat.h>
|
||||||
|
#include <stdio.h>
|
||||||
|
main()
|
||||||
|
{
|
||||||
|
struct stat sb;
|
||||||
|
char *x,*ttyname();
|
||||||
|
int om, m;
|
||||||
|
FILE *fp;
|
||||||
|
|
||||||
|
if (!(x = ttyname(0))) exit(1);
|
||||||
|
if (stat(x, &sb)) exit(1);
|
||||||
|
om = sb.st_mode;
|
||||||
|
if (om & 002) exit(0);
|
||||||
|
m = system("mesg y");
|
||||||
|
if (m == -1 || m == 127) exit(1);
|
||||||
|
if (stat(x, &sb)) exit(1);
|
||||||
|
m = sb.st_mode;
|
||||||
|
if (chmod(x, om)) exit(1);
|
||||||
|
if (m & 002) exit(0);
|
||||||
|
if (sb.st_gid == getgid()) exit(1);
|
||||||
|
if (!(fp=fopen("conftest_grp", "w")))
|
||||||
|
exit(1);
|
||||||
|
fprintf(fp, "%d\n", sb.st_gid);
|
||||||
|
fclose(fp);
|
||||||
|
exit(0);
|
||||||
|
}
|
||||||
|
],[
|
||||||
|
if test -f conftest_grp; then
|
||||||
|
ptygrp=`cat conftest_grp`
|
||||||
|
AC_NOTE([- pty mode: $ptymode, group: $ptygrp])
|
||||||
|
AC_DEFINE_UNQUOTED(PTYMODE, $ptymode)
|
||||||
|
AC_DEFINE_UNQUOTED(PTYGROUP,$ptygrp)
|
||||||
|
else
|
||||||
|
AC_NOTE(- ptys are world accessable)
|
||||||
|
fi
|
||||||
|
],[
|
||||||
|
WRITEPATH=''
|
||||||
|
XTERMPATH=''
|
||||||
|
AC_PATH_PROG(WRITEPATH, write)
|
||||||
|
AC_PATH_PROG(XTERMPATH, xterm)
|
||||||
|
found=
|
||||||
|
if test -n "$WRITEPATH$XTERMPATH"; then
|
||||||
|
findfollow=
|
||||||
|
lsfollow=
|
||||||
|
found=`find $WRITEPATH $XTERMPATH -follow -print 2>/dev/null`
|
||||||
|
if test -n "$found"; then
|
||||||
|
findfollow=-follow
|
||||||
|
lsfollow=L
|
||||||
|
fi
|
||||||
|
if test -n "$XTERMPATH"; then
|
||||||
|
ptygrpn=`ls -l$lsfollow $XTERMPATH | sed -n -e 1p | $AWK '{print $4}'`
|
||||||
|
if test tty != "$ptygrpn"; then
|
||||||
|
XTERMPATH=
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
if test -n "$WRITEPATH$XTERMPATH"; then
|
||||||
|
found=`find $WRITEPATH $XTERMPATH $findfollow -perm -2000 -print`
|
||||||
|
if test -n "$found"; then
|
||||||
|
ptygrp=`ls -ln$lsfollow $found | sed -n -e 1p | $AWK '{print $4}'`
|
||||||
|
AC_NOTE([- pty mode: $ptymode, group: $ptygrp])
|
||||||
|
AC_DEFINE_UNQUOTED(PTYMODE, $ptymode)
|
||||||
|
AC_DEFINE_UNQUOTED(PTYGROUP,$ptygrp)
|
||||||
|
else
|
||||||
|
AC_NOTE(- ptys are world accessable)
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
AC_NOTE(- can't determine - assume ptys are world accessable)
|
||||||
|
fi
|
||||||
|
]
|
||||||
|
)
|
||||||
|
rm -f conftest_grp
|
||||||
|
fi
|
||||||
|
|
||||||
|
dnl
|
||||||
|
dnl **** signal handling ****
|
||||||
|
dnl
|
||||||
|
if test -n "$posix" ; then
|
||||||
|
|
||||||
|
dnl POSIX has reliable signals with void return type.
|
||||||
|
AC_NOTE(assuming posix signal definition)
|
||||||
|
AC_DEFINE(SIGVOID)
|
||||||
|
|
||||||
|
else
|
||||||
|
|
||||||
|
AC_CHECKING(return type of signal handlers)
|
||||||
|
AC_TRY_COMPILE(
|
||||||
|
[#include <sys/types.h>
|
||||||
|
#include <signal.h>
|
||||||
|
#ifdef signal
|
||||||
|
#undef signal
|
||||||
|
#endif
|
||||||
|
extern void (*signal ()) ();], [int i;], AC_DEFINE(SIGVOID))
|
||||||
|
AC_CHECKING(sigset)
|
||||||
|
AC_TRY_LINK([
|
||||||
|
#include <sys/types.h>
|
||||||
|
#include <signal.h>
|
||||||
|
],[
|
||||||
|
#ifdef SIGVOID
|
||||||
|
sigset(0, (void (*)())0);
|
||||||
|
#else
|
||||||
|
sigset(0, (int (*)())0);
|
||||||
|
#endif
|
||||||
|
], AC_DEFINE(USESIGSET))
|
||||||
|
AC_CHECKING(signal implementation)
|
||||||
|
AC_TRY_RUN([
|
||||||
|
#include <sys/types.h>
|
||||||
|
#include <signal.h>
|
||||||
|
|
||||||
|
#ifndef SIGCLD
|
||||||
|
#define SIGCLD SIGCHLD
|
||||||
|
#endif
|
||||||
|
#ifdef USESIGSET
|
||||||
|
#define signal sigset
|
||||||
|
#endif
|
||||||
|
|
||||||
|
int got;
|
||||||
|
|
||||||
|
#ifdef SIGVOID
|
||||||
|
void
|
||||||
|
#endif
|
||||||
|
hand()
|
||||||
|
{
|
||||||
|
got++;
|
||||||
|
}
|
||||||
|
|
||||||
|
main()
|
||||||
|
{
|
||||||
|
/* on hpux we use sigvec to get bsd signals */
|
||||||
|
#ifdef __hpux
|
||||||
|
(void)signal(SIGCLD, hand);
|
||||||
|
kill(getpid(), SIGCLD);
|
||||||
|
kill(getpid(), SIGCLD);
|
||||||
|
if (got < 2)
|
||||||
|
exit(1);
|
||||||
|
#endif
|
||||||
|
exit(0);
|
||||||
|
}
|
||||||
|
],,AC_DEFINE(SYSVSIGS))
|
||||||
|
|
||||||
|
fi
|
||||||
|
|
||||||
|
AC_OUTPUT(Makefile)
|
33
contrib/libreadline/examples/rlfe/extern.h
Normal file
33
contrib/libreadline/examples/rlfe/extern.h
Normal file
@ -0,0 +1,33 @@
|
|||||||
|
/* Copyright (c) 1993-2002
|
||||||
|
* Juergen Weigert (jnweiger@immd4.informatik.uni-erlangen.de)
|
||||||
|
* Michael Schroeder (mlschroe@immd4.informatik.uni-erlangen.de)
|
||||||
|
* Copyright (c) 1987 Oliver Laumann
|
||||||
|
*
|
||||||
|
* 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
|
||||||
|
* the Free Software Foundation; either version 2, or (at your option)
|
||||||
|
* any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program (see the file COPYING); if not, write to the
|
||||||
|
* Free Software Foundation, Inc.,
|
||||||
|
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
|
||||||
|
*
|
||||||
|
****************************************************************
|
||||||
|
* $Id: extern.h,v 1.18 1994/05/31 12:31:57 mlschroe Exp $ FAU
|
||||||
|
*/
|
||||||
|
|
||||||
|
#if !defined(__GNUC__) || __GNUC__ < 2
|
||||||
|
#undef __attribute__
|
||||||
|
#define __attribute__(x)
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* pty.c */
|
||||||
|
extern int OpenPTY __P((char **));
|
||||||
|
extern void InitPTY __P((int));
|
||||||
|
|
530
contrib/libreadline/examples/rlfe/os.h
Normal file
530
contrib/libreadline/examples/rlfe/os.h
Normal file
@ -0,0 +1,530 @@
|
|||||||
|
/* Copyright (c) 1993-2002
|
||||||
|
* Juergen Weigert (jnweiger@immd4.informatik.uni-erlangen.de)
|
||||||
|
* Michael Schroeder (mlschroe@immd4.informatik.uni-erlangen.de)
|
||||||
|
* Copyright (c) 1987 Oliver Laumann
|
||||||
|
*
|
||||||
|
* 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
|
||||||
|
* the Free Software Foundation; either version 2, or (at your option)
|
||||||
|
* any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program (see the file COPYING); if not, write to the
|
||||||
|
* Free Software Foundation, Inc.,
|
||||||
|
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
|
||||||
|
*
|
||||||
|
****************************************************************
|
||||||
|
* $Id: os.h,v 1.10 1994/05/31 12:32:22 mlschroe Exp $ FAU
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <errno.h>
|
||||||
|
|
||||||
|
#include <sys/param.h>
|
||||||
|
|
||||||
|
/* In strict ANSI mode, HP-UX machines define __hpux but not hpux */
|
||||||
|
#if defined(__hpux) && !defined(hpux)
|
||||||
|
# define hpux
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(__bsdi__) || defined(__386BSD__) || defined(_CX_UX) || defined(hpux) || defined(_IBMR2) || defined(linux)
|
||||||
|
# include <signal.h>
|
||||||
|
#endif /* __bsdi__ || __386BSD__ || _CX_UX || hpux || _IBMR2 || linux */
|
||||||
|
|
||||||
|
#ifdef ISC
|
||||||
|
# ifdef ENAMETOOLONG
|
||||||
|
# undef ENAMETOOLONG
|
||||||
|
# endif
|
||||||
|
# ifdef ENOTEMPTY
|
||||||
|
# undef ENOTEMPTY
|
||||||
|
# endif
|
||||||
|
# include <sys/bsdtypes.h>
|
||||||
|
# include <net/errno.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef sun
|
||||||
|
# define getpgrp __getpgrp
|
||||||
|
# define exit __exit
|
||||||
|
#endif
|
||||||
|
#ifdef POSIX
|
||||||
|
# include <unistd.h>
|
||||||
|
# if defined(__STDC__)
|
||||||
|
# include <stdlib.h>
|
||||||
|
# endif /* __STDC__ */
|
||||||
|
#endif /* POSIX */
|
||||||
|
#ifdef sun
|
||||||
|
# undef getpgrp
|
||||||
|
# undef exit
|
||||||
|
#endif /* sun */
|
||||||
|
|
||||||
|
#ifndef linux /* all done in <errno.h> */
|
||||||
|
extern int errno;
|
||||||
|
#endif /* linux */
|
||||||
|
#ifndef HAVE_STRERROR
|
||||||
|
/* No macros, please */
|
||||||
|
#undef strerror
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if !defined(SYSV) && !defined(linux)
|
||||||
|
# ifdef NEWSOS
|
||||||
|
# define strlen ___strlen___
|
||||||
|
# include <strings.h>
|
||||||
|
# undef strlen
|
||||||
|
# else /* NEWSOS */
|
||||||
|
# include <strings.h>
|
||||||
|
# endif /* NEWSOS */
|
||||||
|
#else /* SYSV */
|
||||||
|
# if defined(SVR4) || defined(NEWSOS)
|
||||||
|
# define strlen ___strlen___
|
||||||
|
# include <string.h>
|
||||||
|
# undef strlen
|
||||||
|
# if !defined(NEWSOS) && !defined(__hpux)
|
||||||
|
extern size_t strlen(const char *);
|
||||||
|
# endif
|
||||||
|
# else /* SVR4 */
|
||||||
|
# include <string.h>
|
||||||
|
# endif /* SVR4 */
|
||||||
|
#endif /* SYSV */
|
||||||
|
|
||||||
|
#ifdef USEVARARGS
|
||||||
|
# if defined(__STDC__)
|
||||||
|
# include <stdarg.h>
|
||||||
|
# define VA_LIST(var) va_list var;
|
||||||
|
# define VA_DOTS ...
|
||||||
|
# define VA_DECL
|
||||||
|
# define VA_START(ap, fmt) va_start(ap, fmt)
|
||||||
|
# define VA_ARGS(ap) ap
|
||||||
|
# define VA_END(ap) va_end(ap)
|
||||||
|
# else
|
||||||
|
# include <varargs.h>
|
||||||
|
# define VA_LIST(var) va_list var;
|
||||||
|
# define VA_DOTS va_alist
|
||||||
|
# define VA_DECL va_dcl
|
||||||
|
# define VA_START(ap, fmt) va_start(ap)
|
||||||
|
# define VA_ARGS(ap) ap
|
||||||
|
# define VA_END(ap) va_end(ap)
|
||||||
|
# endif
|
||||||
|
#else
|
||||||
|
# define VA_LIST(var)
|
||||||
|
# define VA_DOTS p1, p2, p3, p4, p5, p6
|
||||||
|
# define VA_DECL unsigned long VA_DOTS;
|
||||||
|
# define VA_START(ap, fmt)
|
||||||
|
# define VA_ARGS(ap) VA_DOTS
|
||||||
|
# define VA_END(ap)
|
||||||
|
# undef vsnprintf
|
||||||
|
# define vsnprintf xsnprintf
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if !defined(sun) && !defined(B43) && !defined(ISC) && !defined(pyr) && !defined(_CX_UX)
|
||||||
|
# include <time.h>
|
||||||
|
#endif
|
||||||
|
#include <sys/time.h>
|
||||||
|
|
||||||
|
#ifdef M_UNIX /* SCO */
|
||||||
|
# include <sys/stream.h>
|
||||||
|
# include <sys/ptem.h>
|
||||||
|
# define ftruncate(fd, s) chsize(fd, s)
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef SYSV
|
||||||
|
# define index strchr
|
||||||
|
# define rindex strrchr
|
||||||
|
# define bzero(poi,len) memset(poi,0,len)
|
||||||
|
# define bcmp memcmp
|
||||||
|
# define killpg(pgrp,sig) kill( -(pgrp), sig)
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef HAVE_GETCWD
|
||||||
|
# define getcwd(b,l) getwd(b)
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef USEBCOPY
|
||||||
|
# ifdef USEMEMMOVE
|
||||||
|
# define bcopy(s,d,len) memmove(d,s,len)
|
||||||
|
# else
|
||||||
|
# ifdef USEMEMCPY
|
||||||
|
# define bcopy(s,d,len) memcpy(d,s,len)
|
||||||
|
# else
|
||||||
|
# define NEED_OWN_BCOPY
|
||||||
|
# define bcopy xbcopy
|
||||||
|
# endif
|
||||||
|
# endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef hpux
|
||||||
|
# define setreuid(ruid, euid) setresuid(ruid, euid, -1)
|
||||||
|
# define setregid(rgid, egid) setresgid(rgid, egid, -1)
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(HAVE_SETEUID) || defined(HAVE_SETREUID)
|
||||||
|
# define USE_SETEUID
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if !defined(HAVE__EXIT) && !defined(_exit)
|
||||||
|
#define _exit(x) exit(x)
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef HAVE_UTIMES
|
||||||
|
# define utimes utime
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef BUILTIN_TELNET
|
||||||
|
# include <netinet/in.h>
|
||||||
|
# include <arpa/inet.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(USE_LOCALE) && (!defined(HAVE_SETLOCALE) || !defined(HAVE_STRFTIME))
|
||||||
|
# undef USE_LOCALE
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/*****************************************************************
|
||||||
|
* terminal handling
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifdef POSIX
|
||||||
|
# include <termios.h>
|
||||||
|
# ifdef hpux
|
||||||
|
# include <bsdtty.h>
|
||||||
|
# endif /* hpux */
|
||||||
|
# ifdef NCCS
|
||||||
|
# define MAXCC NCCS
|
||||||
|
# else
|
||||||
|
# define MAXCC 256
|
||||||
|
# endif
|
||||||
|
#else /* POSIX */
|
||||||
|
# ifdef TERMIO
|
||||||
|
# include <termio.h>
|
||||||
|
# ifdef NCC
|
||||||
|
# define MAXCC NCC
|
||||||
|
# else
|
||||||
|
# define MAXCC 256
|
||||||
|
# endif
|
||||||
|
# ifdef CYTERMIO
|
||||||
|
# include <cytermio.h>
|
||||||
|
# endif
|
||||||
|
# else /* TERMIO */
|
||||||
|
# include <sgtty.h>
|
||||||
|
# endif /* TERMIO */
|
||||||
|
#endif /* POSIX */
|
||||||
|
|
||||||
|
#ifndef VDISABLE
|
||||||
|
# ifdef _POSIX_VDISABLE
|
||||||
|
# define VDISABLE _POSIX_VDISABLE
|
||||||
|
# else
|
||||||
|
# define VDISABLE 0377
|
||||||
|
# endif /* _POSIX_VDISABLE */
|
||||||
|
#endif /* !VDISABLE */
|
||||||
|
|
||||||
|
|
||||||
|
/* on sgi, regardless of the stream head's read mode (RNORM/RMSGN/RMSGD)
|
||||||
|
* TIOCPKT mode causes data loss if our buffer is too small (IOSIZE)
|
||||||
|
* to hold the whole packet at first read().
|
||||||
|
* (Marc Boucher)
|
||||||
|
*
|
||||||
|
* matthew green:
|
||||||
|
* TIOCPKT is broken on dgux 5.4.1 generic AViiON mc88100
|
||||||
|
*
|
||||||
|
* Joe Traister: On AIX4, programs like irc won't work if screen
|
||||||
|
* uses TIOCPKT (select fails to return on pty read).
|
||||||
|
*/
|
||||||
|
#if defined(sgi) || defined(DGUX) || defined(_IBMR2)
|
||||||
|
# undef TIOCPKT
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* linux ncurses is broken, we have to use our own tputs */
|
||||||
|
#if defined(linux) && defined(TERMINFO)
|
||||||
|
# define tputs xtputs
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* Alexandre Oliva: SVR4 style ptys don't work with osf */
|
||||||
|
#ifdef __osf__
|
||||||
|
# undef HAVE_SVR4_PTYS
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/*****************************************************************
|
||||||
|
* utmp handling
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifdef GETUTENT
|
||||||
|
typedef char *slot_t;
|
||||||
|
#else
|
||||||
|
typedef int slot_t;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(UTMPOK) || defined(BUGGYGETLOGIN)
|
||||||
|
# if defined(SVR4) && !defined(DGUX) && !defined(__hpux) && !defined(linux)
|
||||||
|
# include <utmpx.h>
|
||||||
|
# define UTMPFILE UTMPX_FILE
|
||||||
|
# define utmp utmpx
|
||||||
|
# define getutent getutxent
|
||||||
|
# define getutid getutxid
|
||||||
|
# define getutline getutxline
|
||||||
|
# define pututline pututxline
|
||||||
|
# define setutent setutxent
|
||||||
|
# define endutent endutxent
|
||||||
|
# define ut_time ut_xtime
|
||||||
|
# else /* SVR4 */
|
||||||
|
# include <utmp.h>
|
||||||
|
# endif /* SVR4 */
|
||||||
|
# ifdef apollo
|
||||||
|
/*
|
||||||
|
* We don't have GETUTENT, so we dig into utmp ourselves.
|
||||||
|
* But we save the permanent filedescriptor and
|
||||||
|
* open utmp just when we need to.
|
||||||
|
* This code supports an unsorted utmp. jw.
|
||||||
|
*/
|
||||||
|
# define UTNOKEEP
|
||||||
|
# endif /* apollo */
|
||||||
|
|
||||||
|
# ifndef UTMPFILE
|
||||||
|
# ifdef UTMP_FILE
|
||||||
|
# define UTMPFILE UTMP_FILE
|
||||||
|
# else
|
||||||
|
# ifdef _PATH_UTMP
|
||||||
|
# define UTMPFILE _PATH_UTMP
|
||||||
|
# else
|
||||||
|
# define UTMPFILE "/etc/utmp"
|
||||||
|
# endif /* _PATH_UTMP */
|
||||||
|
# endif
|
||||||
|
# endif
|
||||||
|
|
||||||
|
#endif /* UTMPOK || BUGGYGETLOGIN */
|
||||||
|
|
||||||
|
#if !defined(UTMPOK) && defined(USRLIMIT)
|
||||||
|
# undef USRLIMIT
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef LOGOUTOK
|
||||||
|
# ifndef LOGINDEFAULT
|
||||||
|
# define LOGINDEFAULT 0
|
||||||
|
# endif
|
||||||
|
#else
|
||||||
|
# ifdef LOGINDEFAULT
|
||||||
|
# undef LOGINDEFAULT
|
||||||
|
# endif
|
||||||
|
# define LOGINDEFAULT 1
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
/*****************************************************************
|
||||||
|
* file stuff
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef F_OK
|
||||||
|
#define F_OK 0
|
||||||
|
#endif
|
||||||
|
#ifndef X_OK
|
||||||
|
#define X_OK 1
|
||||||
|
#endif
|
||||||
|
#ifndef W_OK
|
||||||
|
#define W_OK 2
|
||||||
|
#endif
|
||||||
|
#ifndef R_OK
|
||||||
|
#define R_OK 4
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef S_IFIFO
|
||||||
|
#define S_IFIFO 0010000
|
||||||
|
#endif
|
||||||
|
#ifndef S_IREAD
|
||||||
|
#define S_IREAD 0000400
|
||||||
|
#endif
|
||||||
|
#ifndef S_IWRITE
|
||||||
|
#define S_IWRITE 0000200
|
||||||
|
#endif
|
||||||
|
#ifndef S_IEXEC
|
||||||
|
#define S_IEXEC 0000100
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(S_IFIFO) && defined(S_IFMT) && !defined(S_ISFIFO)
|
||||||
|
#define S_ISFIFO(mode) (((mode) & S_IFMT) == S_IFIFO)
|
||||||
|
#endif
|
||||||
|
#if defined(S_IFSOCK) && defined(S_IFMT) && !defined(S_ISSOCK)
|
||||||
|
#define S_ISSOCK(mode) (((mode) & S_IFMT) == S_IFSOCK)
|
||||||
|
#endif
|
||||||
|
#if defined(S_IFCHR) && defined(S_IFMT) && !defined(S_ISCHR)
|
||||||
|
#define S_ISCHR(mode) (((mode) & S_IFMT) == S_IFCHR)
|
||||||
|
#endif
|
||||||
|
#if defined(S_IFDIR) && defined(S_IFMT) && !defined(S_ISDIR)
|
||||||
|
#define S_ISDIR(mode) (((mode) & S_IFMT) == S_IFDIR)
|
||||||
|
#endif
|
||||||
|
#if defined(S_IFLNK) && defined(S_IFMT) && !defined(S_ISLNK)
|
||||||
|
#define S_ISLNK(mode) (((mode) & S_IFMT) == S_IFLNK)
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/*
|
||||||
|
* SunOS 4.1.3: `man 2V open' has only one line that mentions O_NOBLOCK:
|
||||||
|
*
|
||||||
|
* O_NONBLOCK Same as O_NDELAY above.
|
||||||
|
*
|
||||||
|
* on the very same SunOS 4.1.3, I traced the open system call and found
|
||||||
|
* that an open("/dev/ttyy08", O_RDWR|O_NONBLOCK|O_NOCTTY) was blocked,
|
||||||
|
* whereas open("/dev/ttyy08", O_RDWR|O_NDELAY |O_NOCTTY) went through.
|
||||||
|
*
|
||||||
|
* For this simple reason I now favour O_NDELAY. jw. 4.5.95
|
||||||
|
*/
|
||||||
|
#if defined(sun) && !defined(SVR4)
|
||||||
|
# undef O_NONBLOCK
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if !defined(O_NONBLOCK) && defined(O_NDELAY)
|
||||||
|
# define O_NONBLOCK O_NDELAY
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if !defined(FNBLOCK) && defined(FNONBLOCK)
|
||||||
|
# define FNBLOCK FNONBLOCK
|
||||||
|
#endif
|
||||||
|
#if !defined(FNBLOCK) && defined(FNDELAY)
|
||||||
|
# define FNBLOCK FNDELAY
|
||||||
|
#endif
|
||||||
|
#if !defined(FNBLOCK) && defined(O_NONBLOCK)
|
||||||
|
# define FNBLOCK O_NONBLOCK
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef POSIX
|
||||||
|
#undef mkfifo
|
||||||
|
#define mkfifo(n,m) mknod(n,S_IFIFO|(m),0)
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if !defined(HAVE_LSTAT) && !defined(lstat)
|
||||||
|
# define lstat stat
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/*****************************************************************
|
||||||
|
* signal handling
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifdef SIGVOID
|
||||||
|
# define SIGRETURN
|
||||||
|
# define sigret_t void
|
||||||
|
#else
|
||||||
|
# define SIGRETURN return 0;
|
||||||
|
# define sigret_t int
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* Geeeee, reverse it? */
|
||||||
|
#if defined(SVR4) || (defined(SYSV) && defined(ISC)) || defined(_AIX) || defined(linux) || defined(ultrix) || defined(__386BSD__) || defined(__bsdi__) || defined(POSIX) || defined(NeXT)
|
||||||
|
# define SIGHASARG
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef SIGHASARG
|
||||||
|
# define SIGPROTOARG (int)
|
||||||
|
# define SIGDEFARG (sigsig) int sigsig;
|
||||||
|
# define SIGARG 0
|
||||||
|
#else
|
||||||
|
# define SIGPROTOARG (void)
|
||||||
|
# define SIGDEFARG ()
|
||||||
|
# define SIGARG
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef SIGCHLD
|
||||||
|
#define SIGCHLD SIGCLD
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(POSIX) || defined(hpux)
|
||||||
|
# define signal xsignal
|
||||||
|
#else
|
||||||
|
# ifdef USESIGSET
|
||||||
|
# define signal sigset
|
||||||
|
# endif /* USESIGSET */
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* used in screen.c and attacher.c */
|
||||||
|
#ifndef NSIG /* kbeal needs these w/o SYSV */
|
||||||
|
# define NSIG 32
|
||||||
|
#endif /* !NSIG */
|
||||||
|
|
||||||
|
|
||||||
|
/*****************************************************************
|
||||||
|
* Wait stuff
|
||||||
|
*/
|
||||||
|
|
||||||
|
#if (!defined(sysV68) && !defined(M_XENIX)) || defined(NeXT) || defined(M_UNIX)
|
||||||
|
# include <sys/wait.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef WTERMSIG
|
||||||
|
# ifndef BSDWAIT /* if wait is NOT a union: */
|
||||||
|
# define WTERMSIG(status) (status & 0177)
|
||||||
|
# else
|
||||||
|
# define WTERMSIG(status) status.w_T.w_Termsig
|
||||||
|
# endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef WSTOPSIG
|
||||||
|
# ifndef BSDWAIT /* if wait is NOT a union: */
|
||||||
|
# define WSTOPSIG(status) ((status >> 8) & 0377)
|
||||||
|
# else
|
||||||
|
# define WSTOPSIG(status) status.w_S.w_Stopsig
|
||||||
|
# endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* NET-2 uses WCOREDUMP */
|
||||||
|
#if defined(WCOREDUMP) && !defined(WIFCORESIG)
|
||||||
|
# define WIFCORESIG(status) WCOREDUMP(status)
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef WIFCORESIG
|
||||||
|
# ifndef BSDWAIT /* if wait is NOT a union: */
|
||||||
|
# define WIFCORESIG(status) (status & 0200)
|
||||||
|
# else
|
||||||
|
# define WIFCORESIG(status) status.w_T.w_Coredump
|
||||||
|
# endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef WEXITSTATUS
|
||||||
|
# ifndef BSDWAIT /* if wait is NOT a union: */
|
||||||
|
# define WEXITSTATUS(status) ((status >> 8) & 0377)
|
||||||
|
# else
|
||||||
|
# define WEXITSTATUS(status) status.w_T.w_Retcode
|
||||||
|
# endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
/*****************************************************************
|
||||||
|
* select stuff
|
||||||
|
*/
|
||||||
|
|
||||||
|
#if defined(M_XENIX) || defined(M_UNIX) || defined(_SEQUENT_)
|
||||||
|
#include <sys/select.h> /* for timeval + FD... */
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/*
|
||||||
|
* SunOS 3.5 - Tom Schmidt - Micron Semiconductor, Inc - 27-Jul-93
|
||||||
|
* tschmidt@vax.micron.com
|
||||||
|
*/
|
||||||
|
#ifndef FD_SET
|
||||||
|
# ifndef SUNOS3
|
||||||
|
typedef struct fd_set { int fds_bits[1]; } fd_set;
|
||||||
|
# endif
|
||||||
|
# define FD_ZERO(fd) ((fd)->fds_bits[0] = 0)
|
||||||
|
# define FD_SET(b, fd) ((fd)->fds_bits[0] |= 1 << (b))
|
||||||
|
# define FD_ISSET(b, fd) ((fd)->fds_bits[0] & 1 << (b))
|
||||||
|
# define FD_SETSIZE 32
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
/*****************************************************************
|
||||||
|
* user defineable stuff
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef TERMCAP_BUFSIZE
|
||||||
|
# define TERMCAP_BUFSIZE 2048
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef MAXPATHLEN
|
||||||
|
# define MAXPATHLEN 1024
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/*
|
||||||
|
* you may try to vary this value. Use low values if your (VMS) system
|
||||||
|
* tends to choke when pasting. Use high values if you want to test
|
||||||
|
* how many characters your pty's can buffer.
|
||||||
|
*/
|
||||||
|
#define IOSIZE 4096
|
||||||
|
|
387
contrib/libreadline/examples/rlfe/pty.c
Normal file
387
contrib/libreadline/examples/rlfe/pty.c
Normal file
@ -0,0 +1,387 @@
|
|||||||
|
/* Copyright (c) 1993-2002
|
||||||
|
* Juergen Weigert (jnweiger@immd4.informatik.uni-erlangen.de)
|
||||||
|
* Michael Schroeder (mlschroe@immd4.informatik.uni-erlangen.de)
|
||||||
|
* Copyright (c) 1987 Oliver Laumann
|
||||||
|
*
|
||||||
|
* 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
|
||||||
|
* the Free Software Foundation; either version 2, or (at your option)
|
||||||
|
* any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program (see the file COPYING); if not, write to the
|
||||||
|
* Free Software Foundation, Inc.,
|
||||||
|
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
|
||||||
|
*
|
||||||
|
****************************************************************
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <sys/types.h>
|
||||||
|
#include <sys/stat.h>
|
||||||
|
#include <fcntl.h>
|
||||||
|
#include <signal.h>
|
||||||
|
|
||||||
|
#include "config.h"
|
||||||
|
#include "screen.h"
|
||||||
|
|
||||||
|
#ifndef sun
|
||||||
|
# include <sys/ioctl.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* for solaris 2.1, Unixware (SVR4.2) and possibly others */
|
||||||
|
#ifdef HAVE_SVR4_PTYS
|
||||||
|
# include <sys/stropts.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(sun) && defined(LOCKPTY) && !defined(TIOCEXCL)
|
||||||
|
# include <sys/ttold.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef ISC
|
||||||
|
# include <sys/tty.h>
|
||||||
|
# include <sys/sioctl.h>
|
||||||
|
# include <sys/pty.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef sgi
|
||||||
|
# include <sys/sysmacros.h>
|
||||||
|
#endif /* sgi */
|
||||||
|
|
||||||
|
#include "extern.h"
|
||||||
|
|
||||||
|
/*
|
||||||
|
* if no PTYRANGE[01] is in the config file, we pick a default
|
||||||
|
*/
|
||||||
|
#ifndef PTYRANGE0
|
||||||
|
# define PTYRANGE0 "qpr"
|
||||||
|
#endif
|
||||||
|
#ifndef PTYRANGE1
|
||||||
|
# define PTYRANGE1 "0123456789abcdef"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* SVR4 pseudo ttys don't seem to work with SCO-5 */
|
||||||
|
#ifdef M_UNIX
|
||||||
|
# undef HAVE_SVR4_PTYS
|
||||||
|
#endif
|
||||||
|
|
||||||
|
extern int eff_uid;
|
||||||
|
|
||||||
|
/* used for opening a new pty-pair: */
|
||||||
|
static char PtyName[32], TtyName[32];
|
||||||
|
|
||||||
|
#if !(defined(sequent) || defined(_SEQUENT_) || defined(HAVE_SVR4_PTYS))
|
||||||
|
# ifdef hpux
|
||||||
|
static char PtyProto[] = "/dev/ptym/ptyXY";
|
||||||
|
static char TtyProto[] = "/dev/pty/ttyXY";
|
||||||
|
# else
|
||||||
|
# ifdef M_UNIX
|
||||||
|
static char PtyProto[] = "/dev/ptypXY";
|
||||||
|
static char TtyProto[] = "/dev/ttypXY";
|
||||||
|
# else
|
||||||
|
static char PtyProto[] = "/dev/ptyXY";
|
||||||
|
static char TtyProto[] = "/dev/ttyXY";
|
||||||
|
# endif
|
||||||
|
# endif /* hpux */
|
||||||
|
#endif
|
||||||
|
|
||||||
|
static void initmaster __P((int));
|
||||||
|
|
||||||
|
#if defined(sun)
|
||||||
|
/* sun's utmp_update program opens the salve side, thus corrupting
|
||||||
|
*/
|
||||||
|
int pty_preopen = 1;
|
||||||
|
#else
|
||||||
|
int pty_preopen = 0;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Open all ptys with O_NOCTTY, just to be on the safe side
|
||||||
|
* (RISCos mips breaks otherwise)
|
||||||
|
*/
|
||||||
|
#ifndef O_NOCTTY
|
||||||
|
# define O_NOCTTY 0
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/***************************************************************/
|
||||||
|
|
||||||
|
static void
|
||||||
|
initmaster(f)
|
||||||
|
int f;
|
||||||
|
{
|
||||||
|
#ifdef POSIX
|
||||||
|
tcflush(f, TCIOFLUSH);
|
||||||
|
#else
|
||||||
|
# ifdef TIOCFLUSH
|
||||||
|
(void) ioctl(f, TIOCFLUSH, (char *) 0);
|
||||||
|
# endif
|
||||||
|
#endif
|
||||||
|
#ifdef LOCKPTY
|
||||||
|
(void) ioctl(f, TIOCEXCL, (char *) 0);
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
InitPTY(f)
|
||||||
|
int f;
|
||||||
|
{
|
||||||
|
if (f < 0)
|
||||||
|
return;
|
||||||
|
#if defined(I_PUSH) && defined(HAVE_SVR4_PTYS) && !defined(sgi) && !defined(linux) && !defined(__osf__) && !defined(M_UNIX)
|
||||||
|
if (ioctl(f, I_PUSH, "ptem"))
|
||||||
|
Panic(errno, "InitPTY: cannot I_PUSH ptem");
|
||||||
|
if (ioctl(f, I_PUSH, "ldterm"))
|
||||||
|
Panic(errno, "InitPTY: cannot I_PUSH ldterm");
|
||||||
|
# ifdef sun
|
||||||
|
if (ioctl(f, I_PUSH, "ttcompat"))
|
||||||
|
Panic(errno, "InitPTY: cannot I_PUSH ttcompat");
|
||||||
|
# endif
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
/***************************************************************/
|
||||||
|
|
||||||
|
#if defined(OSX) && !defined(PTY_DONE)
|
||||||
|
#define PTY_DONE
|
||||||
|
int
|
||||||
|
OpenPTY(ttyn)
|
||||||
|
char **ttyn;
|
||||||
|
{
|
||||||
|
register int f;
|
||||||
|
if ((f = open_controlling_pty(TtyName)) < 0)
|
||||||
|
return -1;
|
||||||
|
initmaster(f);
|
||||||
|
*ttyn = TtyName;
|
||||||
|
return f;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/***************************************************************/
|
||||||
|
|
||||||
|
#if (defined(sequent) || defined(_SEQUENT_)) && !defined(PTY_DONE)
|
||||||
|
#define PTY_DONE
|
||||||
|
int
|
||||||
|
OpenPTY(ttyn)
|
||||||
|
char **ttyn;
|
||||||
|
{
|
||||||
|
char *m, *s;
|
||||||
|
register int f;
|
||||||
|
|
||||||
|
if ((f = getpseudotty(&s, &m)) < 0)
|
||||||
|
return -1;
|
||||||
|
#ifdef _SEQUENT_
|
||||||
|
fvhangup(s);
|
||||||
|
#endif
|
||||||
|
strncpy(PtyName, m, sizeof(PtyName));
|
||||||
|
strncpy(TtyName, s, sizeof(TtyName));
|
||||||
|
initmaster(f);
|
||||||
|
*ttyn = TtyName;
|
||||||
|
return f;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/***************************************************************/
|
||||||
|
|
||||||
|
#if defined(__sgi) && !defined(PTY_DONE)
|
||||||
|
#define PTY_DONE
|
||||||
|
int
|
||||||
|
OpenPTY(ttyn)
|
||||||
|
char **ttyn;
|
||||||
|
{
|
||||||
|
int f;
|
||||||
|
char *name, *_getpty();
|
||||||
|
sigret_t (*sigcld)__P(SIGPROTOARG);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* SIGCHLD set to SIG_DFL for _getpty() because it may fork() and
|
||||||
|
* exec() /usr/adm/mkpts
|
||||||
|
*/
|
||||||
|
sigcld = signal(SIGCHLD, SIG_DFL);
|
||||||
|
name = _getpty(&f, O_RDWR | O_NONBLOCK, 0600, 0);
|
||||||
|
signal(SIGCHLD, sigcld);
|
||||||
|
|
||||||
|
if (name == 0)
|
||||||
|
return -1;
|
||||||
|
initmaster(f);
|
||||||
|
*ttyn = name;
|
||||||
|
return f;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/***************************************************************/
|
||||||
|
|
||||||
|
#if defined(MIPS) && defined(HAVE_DEV_PTC) && !defined(PTY_DONE)
|
||||||
|
#define PTY_DONE
|
||||||
|
int
|
||||||
|
OpenPTY(ttyn)
|
||||||
|
char **ttyn;
|
||||||
|
{
|
||||||
|
register int f;
|
||||||
|
struct stat buf;
|
||||||
|
|
||||||
|
strcpy(PtyName, "/dev/ptc");
|
||||||
|
if ((f = open(PtyName, O_RDWR | O_NOCTTY | O_NONBLOCK)) < 0)
|
||||||
|
return -1;
|
||||||
|
if (fstat(f, &buf) < 0)
|
||||||
|
{
|
||||||
|
close(f);
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
sprintf(TtyName, "/dev/ttyq%d", minor(buf.st_rdev));
|
||||||
|
initmaster(f);
|
||||||
|
*ttyn = TtyName;
|
||||||
|
return f;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/***************************************************************/
|
||||||
|
|
||||||
|
#if defined(HAVE_SVR4_PTYS) && !defined(PTY_DONE)
|
||||||
|
#define PTY_DONE
|
||||||
|
int
|
||||||
|
OpenPTY(ttyn)
|
||||||
|
char **ttyn;
|
||||||
|
{
|
||||||
|
register int f;
|
||||||
|
char *m, *ptsname();
|
||||||
|
int unlockpt __P((int)), grantpt __P((int));
|
||||||
|
#if defined(HAVE_GETPT) && defined(linux)
|
||||||
|
int getpt __P((void));
|
||||||
|
#endif
|
||||||
|
sigret_t (*sigcld)__P(SIGPROTOARG);
|
||||||
|
|
||||||
|
strcpy(PtyName, "/dev/ptmx");
|
||||||
|
#if defined(HAVE_GETPT) && defined(linux)
|
||||||
|
if ((f = getpt()) == -1)
|
||||||
|
#else
|
||||||
|
if ((f = open(PtyName, O_RDWR | O_NOCTTY)) == -1)
|
||||||
|
#endif
|
||||||
|
return -1;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* SIGCHLD set to SIG_DFL for grantpt() because it fork()s and
|
||||||
|
* exec()s pt_chmod
|
||||||
|
*/
|
||||||
|
sigcld = signal(SIGCHLD, SIG_DFL);
|
||||||
|
if ((m = ptsname(f)) == NULL || grantpt(f) || unlockpt(f))
|
||||||
|
{
|
||||||
|
signal(SIGCHLD, sigcld);
|
||||||
|
close(f);
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
signal(SIGCHLD, sigcld);
|
||||||
|
strncpy(TtyName, m, sizeof(TtyName));
|
||||||
|
initmaster(f);
|
||||||
|
*ttyn = TtyName;
|
||||||
|
return f;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/***************************************************************/
|
||||||
|
|
||||||
|
#if defined(_AIX) && defined(HAVE_DEV_PTC) && !defined(PTY_DONE)
|
||||||
|
#define PTY_DONE
|
||||||
|
|
||||||
|
int
|
||||||
|
OpenPTY(ttyn)
|
||||||
|
char **ttyn;
|
||||||
|
{
|
||||||
|
register int f;
|
||||||
|
|
||||||
|
/* a dumb looking loop replaced by mycrofts code: */
|
||||||
|
strcpy (PtyName, "/dev/ptc");
|
||||||
|
if ((f = open (PtyName, O_RDWR | O_NOCTTY)) < 0)
|
||||||
|
return -1;
|
||||||
|
strncpy(TtyName, ttyname(f), sizeof(TtyName));
|
||||||
|
if (eff_uid && access(TtyName, R_OK | W_OK))
|
||||||
|
{
|
||||||
|
close(f);
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
initmaster(f);
|
||||||
|
# ifdef _IBMR2
|
||||||
|
pty_preopen = 1;
|
||||||
|
# endif
|
||||||
|
*ttyn = TtyName;
|
||||||
|
return f;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/***************************************************************/
|
||||||
|
|
||||||
|
#if defined(HAVE_OPENPTY) && !defined(PTY_DONE)
|
||||||
|
#define PTY_DONE
|
||||||
|
int
|
||||||
|
OpenPTY(ttyn)
|
||||||
|
char **ttyn;
|
||||||
|
{
|
||||||
|
int f, s;
|
||||||
|
if (openpty(&f, &s, TtyName, NULL, NULL) != 0)
|
||||||
|
return -1;
|
||||||
|
close(s);
|
||||||
|
initmaster(f);
|
||||||
|
pty_preopen = 1;
|
||||||
|
*ttyn = TtyName;
|
||||||
|
return f;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/***************************************************************/
|
||||||
|
|
||||||
|
#ifndef PTY_DONE
|
||||||
|
int
|
||||||
|
OpenPTY(ttyn)
|
||||||
|
char **ttyn;
|
||||||
|
{
|
||||||
|
register char *p, *q, *l, *d;
|
||||||
|
register int f;
|
||||||
|
|
||||||
|
debug("OpenPTY: Using BSD style ptys.\n");
|
||||||
|
strcpy(PtyName, PtyProto);
|
||||||
|
strcpy(TtyName, TtyProto);
|
||||||
|
for (p = PtyName; *p != 'X'; p++)
|
||||||
|
;
|
||||||
|
for (q = TtyName; *q != 'X'; q++)
|
||||||
|
;
|
||||||
|
for (l = PTYRANGE0; (*p = *l) != '\0'; l++)
|
||||||
|
{
|
||||||
|
for (d = PTYRANGE1; (p[1] = *d) != '\0'; d++)
|
||||||
|
{
|
||||||
|
debug1("OpenPTY tries '%s'\n", PtyName);
|
||||||
|
if ((f = open(PtyName, O_RDWR | O_NOCTTY)) == -1)
|
||||||
|
continue;
|
||||||
|
q[0] = *l;
|
||||||
|
q[1] = *d;
|
||||||
|
if (eff_uid && access(TtyName, R_OK | W_OK))
|
||||||
|
{
|
||||||
|
close(f);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
#if defined(sun) && defined(TIOCGPGRP) && !defined(SUNOS3)
|
||||||
|
/* Hack to ensure that the slave side of the pty is
|
||||||
|
* unused. May not work in anything other than SunOS4.1
|
||||||
|
*/
|
||||||
|
{
|
||||||
|
int pgrp;
|
||||||
|
|
||||||
|
/* tcgetpgrp does not work (uses TIOCGETPGRP)! */
|
||||||
|
if (ioctl(f, TIOCGPGRP, (char *)&pgrp) != -1 || errno != EIO)
|
||||||
|
{
|
||||||
|
close(f);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
initmaster(f);
|
||||||
|
*ttyn = TtyName;
|
||||||
|
return f;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
780
contrib/libreadline/examples/rlfe/rlfe.c
Normal file
780
contrib/libreadline/examples/rlfe/rlfe.c
Normal file
@ -0,0 +1,780 @@
|
|||||||
|
/* A front-end using readline to "cook" input lines.
|
||||||
|
*
|
||||||
|
* Copyright (C) 2004, 1999 Per Bothner
|
||||||
|
*
|
||||||
|
* This front-end program is free software; you can redistribute it and/or
|
||||||
|
* modify it under the terms of the GNU General Public License as published
|
||||||
|
* by the Free Software Foundation; either version 2, or (at your option)
|
||||||
|
* any later version.
|
||||||
|
*
|
||||||
|
* Some code from Johnson & Troan: "Linux Application Development"
|
||||||
|
* (Addison-Wesley, 1998) was used directly or for inspiration.
|
||||||
|
*
|
||||||
|
* 2003-11-07 Wolfgang Taeuber <wolfgang_taeuber@agilent.com>
|
||||||
|
* Specify a history file and the size of the history file with command
|
||||||
|
* line options; use EDITOR/VISUAL to set vi/emacs preference.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/* PROBLEMS/TODO:
|
||||||
|
*
|
||||||
|
* Only tested under GNU/Linux and Mac OS 10.x; needs to be ported.
|
||||||
|
*
|
||||||
|
* Switching between line-editing-mode vs raw-char-mode depending on
|
||||||
|
* what tcgetattr returns is inherently not robust, plus it doesn't
|
||||||
|
* work when ssh/telnetting in. A better solution is possible if the
|
||||||
|
* tty system can send in-line escape sequences indicating the current
|
||||||
|
* mode, echo'd input, etc. That would also allow a user preference
|
||||||
|
* to set different colors for prompt, input, stdout, and stderr.
|
||||||
|
*
|
||||||
|
* When running mc -c under the Linux console, mc does not recognize
|
||||||
|
* mouse clicks, which mc does when not running under rlfe.
|
||||||
|
*
|
||||||
|
* Pasting selected text containing tabs is like hitting the tab character,
|
||||||
|
* which invokes readline completion. We don't want this. I don't know
|
||||||
|
* if this is fixable without integrating rlfe into a terminal emulator.
|
||||||
|
*
|
||||||
|
* Echo suppression is a kludge, but can only be avoided with better kernel
|
||||||
|
* support: We need a tty mode to disable "real" echoing, while still
|
||||||
|
* letting the inferior think its tty driver to doing echoing.
|
||||||
|
* Stevens's book claims SCR$ and BSD4.3+ have TIOCREMOTE.
|
||||||
|
*
|
||||||
|
* The latest readline may have some hooks we can use to avoid having
|
||||||
|
* to back up the prompt. (See HAVE_ALREADY_PROMPTED.)
|
||||||
|
*
|
||||||
|
* Desirable readline feature: When in cooked no-echo mode (e.g. password),
|
||||||
|
* echo characters are they are types with '*', but remove them when done.
|
||||||
|
*
|
||||||
|
* Asynchronous output while we're editing an input line should be
|
||||||
|
* inserted in the output view *before* the input line, so that the
|
||||||
|
* lines being edited (with the prompt) float at the end of the input.
|
||||||
|
*
|
||||||
|
* A "page mode" option to emulate more/less behavior: At each page of
|
||||||
|
* output, pause for a user command. This required parsing the output
|
||||||
|
* to keep track of line lengths. It also requires remembering the
|
||||||
|
* output, if we want an option to scroll back, which suggests that
|
||||||
|
* this should be integrated with a terminal emulator like xterm.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <fcntl.h>
|
||||||
|
#include <sys/types.h>
|
||||||
|
#include <sys/socket.h>
|
||||||
|
#include <netinet/in.h>
|
||||||
|
#include <arpa/inet.h>
|
||||||
|
#include <signal.h>
|
||||||
|
#include <netdb.h>
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <errno.h>
|
||||||
|
#include <grp.h>
|
||||||
|
#include <string.h>
|
||||||
|
#include <sys/stat.h>
|
||||||
|
#include <unistd.h>
|
||||||
|
#include <sys/ioctl.h>
|
||||||
|
#include <termios.h>
|
||||||
|
|
||||||
|
#include "config.h"
|
||||||
|
|
||||||
|
#ifdef READLINE_LIBRARY
|
||||||
|
# include "readline.h"
|
||||||
|
# include "history.h"
|
||||||
|
#else
|
||||||
|
# include <readline/readline.h>
|
||||||
|
# include <readline/history.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef COMMAND
|
||||||
|
#define COMMAND "/bin/bash"
|
||||||
|
#endif
|
||||||
|
#ifndef COMMAND_ARGS
|
||||||
|
#define COMMAND_ARGS COMMAND
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef ALT_COMMAND
|
||||||
|
#define ALT_COMMAND "/bin/sh"
|
||||||
|
#endif
|
||||||
|
#ifndef ALT_COMMAND_ARGS
|
||||||
|
#define ALT_COMMAND_ARGS ALT_COMMAND
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef HAVE_MEMMOVE
|
||||||
|
# if __GNUC__ > 1
|
||||||
|
# define memmove(d, s, n) __builtin_memcpy(d, s, n)
|
||||||
|
# else
|
||||||
|
# define memmove(d, s, n) memcpy(d, s, n)
|
||||||
|
# endif
|
||||||
|
#else
|
||||||
|
# define memmove(d, s, n) memcpy(d, s, n)
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#define APPLICATION_NAME "rlfe"
|
||||||
|
|
||||||
|
static int in_from_inferior_fd;
|
||||||
|
static int out_to_inferior_fd;
|
||||||
|
static void set_edit_mode ();
|
||||||
|
static void usage_exit ();
|
||||||
|
static char *hist_file = 0;
|
||||||
|
static int hist_size = 0;
|
||||||
|
|
||||||
|
/* Unfortunately, we cannot safely display echo from the inferior process.
|
||||||
|
The reason is that the echo bit in the pty is "owned" by the inferior,
|
||||||
|
and if we try to turn it off, we could confuse the inferior.
|
||||||
|
Thus, when echoing, we get echo twice: First readline echoes while
|
||||||
|
we're actually editing. Then we send the line to the inferior, and the
|
||||||
|
terminal driver send back an extra echo.
|
||||||
|
The work-around is to remember the input lines, and when we see that
|
||||||
|
line come back, we supress the output.
|
||||||
|
A better solution (supposedly available on SVR4) would be a smarter
|
||||||
|
terminal driver, with more flags ... */
|
||||||
|
#define ECHO_SUPPRESS_MAX 1024
|
||||||
|
char echo_suppress_buffer[ECHO_SUPPRESS_MAX];
|
||||||
|
int echo_suppress_start = 0;
|
||||||
|
int echo_suppress_limit = 0;
|
||||||
|
|
||||||
|
/*#define DEBUG*/
|
||||||
|
|
||||||
|
#ifdef DEBUG
|
||||||
|
FILE *logfile = NULL;
|
||||||
|
#define DPRINT0(FMT) (fprintf(logfile, FMT), fflush(logfile))
|
||||||
|
#define DPRINT1(FMT, V1) (fprintf(logfile, FMT, V1), fflush(logfile))
|
||||||
|
#define DPRINT2(FMT, V1, V2) (fprintf(logfile, FMT, V1, V2), fflush(logfile))
|
||||||
|
#else
|
||||||
|
#define DPRINT0(FMT) ((void) 0) /* Do nothing */
|
||||||
|
#define DPRINT1(FMT, V1) ((void) 0) /* Do nothing */
|
||||||
|
#define DPRINT2(FMT, V1, V2) ((void) 0) /* Do nothing */
|
||||||
|
#endif
|
||||||
|
|
||||||
|
struct termios orig_term;
|
||||||
|
|
||||||
|
/* Pid of child process. */
|
||||||
|
static pid_t child = -1;
|
||||||
|
|
||||||
|
static void
|
||||||
|
sig_child (int signo)
|
||||||
|
{
|
||||||
|
int status;
|
||||||
|
wait (&status);
|
||||||
|
if (hist_file != 0)
|
||||||
|
{
|
||||||
|
write_history (hist_file);
|
||||||
|
if (hist_size)
|
||||||
|
history_truncate_file (hist_file, hist_size);
|
||||||
|
}
|
||||||
|
DPRINT0 ("(Child process died.)\n");
|
||||||
|
tcsetattr(STDIN_FILENO, TCSANOW, &orig_term);
|
||||||
|
exit (0);
|
||||||
|
}
|
||||||
|
|
||||||
|
volatile int propagate_sigwinch = 0;
|
||||||
|
|
||||||
|
/* sigwinch_handler
|
||||||
|
* propagate window size changes from input file descriptor to
|
||||||
|
* master side of pty.
|
||||||
|
*/
|
||||||
|
void sigwinch_handler(int signal) {
|
||||||
|
propagate_sigwinch = 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/* get_slave_pty() returns an integer file descriptor.
|
||||||
|
* If it returns < 0, an error has occurred.
|
||||||
|
* Otherwise, it has returned the slave file descriptor.
|
||||||
|
*/
|
||||||
|
|
||||||
|
int get_slave_pty(char *name) {
|
||||||
|
struct group *gptr;
|
||||||
|
gid_t gid;
|
||||||
|
int slave = -1;
|
||||||
|
|
||||||
|
/* chown/chmod the corresponding pty, if possible.
|
||||||
|
* This will only work if the process has root permissions.
|
||||||
|
* Alternatively, write and exec a small setuid program that
|
||||||
|
* does just this.
|
||||||
|
*/
|
||||||
|
if ((gptr = getgrnam("tty")) != 0) {
|
||||||
|
gid = gptr->gr_gid;
|
||||||
|
} else {
|
||||||
|
/* if the tty group does not exist, don't change the
|
||||||
|
* group on the slave pty, only the owner
|
||||||
|
*/
|
||||||
|
gid = -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Note that we do not check for errors here. If this is code
|
||||||
|
* where these actions are critical, check for errors!
|
||||||
|
*/
|
||||||
|
chown(name, getuid(), gid);
|
||||||
|
/* This code only makes the slave read/writeable for the user.
|
||||||
|
* If this is for an interactive shell that will want to
|
||||||
|
* receive "write" and "wall" messages, OR S_IWGRP into the
|
||||||
|
* second argument below.
|
||||||
|
*/
|
||||||
|
chmod(name, S_IRUSR|S_IWUSR);
|
||||||
|
|
||||||
|
/* open the corresponding slave pty */
|
||||||
|
slave = open(name, O_RDWR);
|
||||||
|
return (slave);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Certain special characters, such as ctrl/C, we want to pass directly
|
||||||
|
to the inferior, rather than letting readline handle them. */
|
||||||
|
|
||||||
|
static char special_chars[20];
|
||||||
|
static int special_chars_count;
|
||||||
|
|
||||||
|
static void
|
||||||
|
add_special_char(int ch)
|
||||||
|
{
|
||||||
|
if (ch != 0)
|
||||||
|
special_chars[special_chars_count++] = ch;
|
||||||
|
}
|
||||||
|
|
||||||
|
static int eof_char;
|
||||||
|
|
||||||
|
static int
|
||||||
|
is_special_char(int ch)
|
||||||
|
{
|
||||||
|
int i;
|
||||||
|
#if 0
|
||||||
|
if (ch == eof_char && rl_point == rl_end)
|
||||||
|
return 1;
|
||||||
|
#endif
|
||||||
|
for (i = special_chars_count; --i >= 0; )
|
||||||
|
if (special_chars[i] == ch)
|
||||||
|
return 1;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
static char buf[1024];
|
||||||
|
/* buf[0 .. buf_count-1] is the what has been emitted on the current line.
|
||||||
|
It is used as the readline prompt. */
|
||||||
|
static int buf_count = 0;
|
||||||
|
|
||||||
|
int do_emphasize_input = 1;
|
||||||
|
int current_emphasize_input;
|
||||||
|
|
||||||
|
char *start_input_mode = "\033[1m";
|
||||||
|
char *end_input_mode = "\033[0m";
|
||||||
|
|
||||||
|
int num_keys = 0;
|
||||||
|
|
||||||
|
static void maybe_emphasize_input (int on)
|
||||||
|
{
|
||||||
|
if (on == current_emphasize_input
|
||||||
|
|| (on && ! do_emphasize_input))
|
||||||
|
return;
|
||||||
|
fprintf (rl_outstream, on ? start_input_mode : end_input_mode);
|
||||||
|
fflush (rl_outstream);
|
||||||
|
current_emphasize_input = on;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
null_prep_terminal (int meta)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
null_deprep_terminal ()
|
||||||
|
{
|
||||||
|
maybe_emphasize_input (0);
|
||||||
|
}
|
||||||
|
|
||||||
|
static int
|
||||||
|
pre_input_change_mode (void)
|
||||||
|
{
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
char pending_special_char;
|
||||||
|
|
||||||
|
static void
|
||||||
|
line_handler (char *line)
|
||||||
|
{
|
||||||
|
if (line == NULL)
|
||||||
|
{
|
||||||
|
char buf[1];
|
||||||
|
DPRINT0("saw eof!\n");
|
||||||
|
buf[0] = '\004'; /* ctrl/d */
|
||||||
|
write (out_to_inferior_fd, buf, 1);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
static char enter[] = "\r";
|
||||||
|
/* Send line to inferior: */
|
||||||
|
int length = strlen (line);
|
||||||
|
if (length > ECHO_SUPPRESS_MAX-2)
|
||||||
|
{
|
||||||
|
echo_suppress_start = 0;
|
||||||
|
echo_suppress_limit = 0;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
if (echo_suppress_limit + length > ECHO_SUPPRESS_MAX - 2)
|
||||||
|
{
|
||||||
|
if (echo_suppress_limit - echo_suppress_start + length
|
||||||
|
<= ECHO_SUPPRESS_MAX - 2)
|
||||||
|
{
|
||||||
|
memmove (echo_suppress_buffer,
|
||||||
|
echo_suppress_buffer + echo_suppress_start,
|
||||||
|
echo_suppress_limit - echo_suppress_start);
|
||||||
|
echo_suppress_limit -= echo_suppress_start;
|
||||||
|
echo_suppress_start = 0;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
echo_suppress_limit = 0;
|
||||||
|
}
|
||||||
|
echo_suppress_start = 0;
|
||||||
|
}
|
||||||
|
memcpy (echo_suppress_buffer + echo_suppress_limit,
|
||||||
|
line, length);
|
||||||
|
echo_suppress_limit += length;
|
||||||
|
echo_suppress_buffer[echo_suppress_limit++] = '\r';
|
||||||
|
echo_suppress_buffer[echo_suppress_limit++] = '\n';
|
||||||
|
}
|
||||||
|
write (out_to_inferior_fd, line, length);
|
||||||
|
if (pending_special_char == 0)
|
||||||
|
{
|
||||||
|
write (out_to_inferior_fd, enter, sizeof(enter)-1);
|
||||||
|
if (*line)
|
||||||
|
add_history (line);
|
||||||
|
}
|
||||||
|
free (line);
|
||||||
|
}
|
||||||
|
rl_callback_handler_remove ();
|
||||||
|
buf_count = 0;
|
||||||
|
num_keys = 0;
|
||||||
|
if (pending_special_char != 0)
|
||||||
|
{
|
||||||
|
write (out_to_inferior_fd, &pending_special_char, 1);
|
||||||
|
pending_special_char = 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Value of rl_getc_function.
|
||||||
|
Use this because readline should read from stdin, not rl_instream,
|
||||||
|
points to the pty (so readline has monitor its terminal modes). */
|
||||||
|
|
||||||
|
int
|
||||||
|
my_rl_getc (FILE *dummy)
|
||||||
|
{
|
||||||
|
int ch = rl_getc (stdin);
|
||||||
|
if (is_special_char (ch))
|
||||||
|
{
|
||||||
|
pending_special_char = ch;
|
||||||
|
return '\r';
|
||||||
|
}
|
||||||
|
return ch;
|
||||||
|
}
|
||||||
|
|
||||||
|
int
|
||||||
|
main(int argc, char** argv)
|
||||||
|
{
|
||||||
|
char *path;
|
||||||
|
int i;
|
||||||
|
int master;
|
||||||
|
char *name;
|
||||||
|
int in_from_tty_fd;
|
||||||
|
struct sigaction act;
|
||||||
|
struct winsize ws;
|
||||||
|
struct termios t;
|
||||||
|
int maxfd;
|
||||||
|
fd_set in_set;
|
||||||
|
static char empty_string[1] = "";
|
||||||
|
char *prompt = empty_string;
|
||||||
|
int ioctl_err = 0;
|
||||||
|
int arg_base = 1;
|
||||||
|
|
||||||
|
#ifdef DEBUG
|
||||||
|
logfile = fopen("/tmp/rlfe.log", "w");
|
||||||
|
#endif
|
||||||
|
|
||||||
|
while (arg_base<argc)
|
||||||
|
{
|
||||||
|
if (argv[arg_base][0] != '-')
|
||||||
|
break;
|
||||||
|
if (arg_base+1 >= argc )
|
||||||
|
usage_exit();
|
||||||
|
switch(argv[arg_base][1])
|
||||||
|
{
|
||||||
|
case 'h':
|
||||||
|
arg_base++;
|
||||||
|
hist_file = argv[arg_base];
|
||||||
|
break;
|
||||||
|
case 's':
|
||||||
|
arg_base++;
|
||||||
|
hist_size = atoi(argv[arg_base]);
|
||||||
|
if (hist_size<0)
|
||||||
|
usage_exit();
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
usage_exit();
|
||||||
|
}
|
||||||
|
arg_base++;
|
||||||
|
}
|
||||||
|
if (hist_file)
|
||||||
|
read_history (hist_file);
|
||||||
|
|
||||||
|
set_edit_mode ();
|
||||||
|
|
||||||
|
rl_readline_name = APPLICATION_NAME;
|
||||||
|
|
||||||
|
if ((master = OpenPTY (&name)) < 0)
|
||||||
|
{
|
||||||
|
perror("ptypair: could not open master pty");
|
||||||
|
exit(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
DPRINT1("pty name: '%s'\n", name);
|
||||||
|
|
||||||
|
/* set up SIGWINCH handler */
|
||||||
|
act.sa_handler = sigwinch_handler;
|
||||||
|
sigemptyset(&(act.sa_mask));
|
||||||
|
act.sa_flags = 0;
|
||||||
|
if (sigaction(SIGWINCH, &act, NULL) < 0)
|
||||||
|
{
|
||||||
|
perror("ptypair: could not handle SIGWINCH ");
|
||||||
|
exit(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (ioctl(STDIN_FILENO, TIOCGWINSZ, &ws) < 0)
|
||||||
|
{
|
||||||
|
perror("ptypair: could not get window size");
|
||||||
|
exit(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
if ((child = fork()) < 0)
|
||||||
|
{
|
||||||
|
perror("cannot fork");
|
||||||
|
exit(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (child == 0)
|
||||||
|
{
|
||||||
|
int slave; /* file descriptor for slave pty */
|
||||||
|
|
||||||
|
/* We are in the child process */
|
||||||
|
close(master);
|
||||||
|
|
||||||
|
#ifdef TIOCSCTTY
|
||||||
|
if ((slave = get_slave_pty(name)) < 0)
|
||||||
|
{
|
||||||
|
perror("ptypair: could not open slave pty");
|
||||||
|
exit(1);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* We need to make this process a session group leader, because
|
||||||
|
* it is on a new PTY, and things like job control simply will
|
||||||
|
* not work correctly unless there is a session group leader
|
||||||
|
* and process group leader (which a session group leader
|
||||||
|
* automatically is). This also disassociates us from our old
|
||||||
|
* controlling tty.
|
||||||
|
*/
|
||||||
|
if (setsid() < 0)
|
||||||
|
{
|
||||||
|
perror("could not set session leader");
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Tie us to our new controlling tty. */
|
||||||
|
#ifdef TIOCSCTTY
|
||||||
|
if (ioctl(slave, TIOCSCTTY, NULL))
|
||||||
|
{
|
||||||
|
perror("could not set new controlling tty");
|
||||||
|
}
|
||||||
|
#else
|
||||||
|
if ((slave = get_slave_pty(name)) < 0)
|
||||||
|
{
|
||||||
|
perror("ptypair: could not open slave pty");
|
||||||
|
exit(1);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* make slave pty be standard in, out, and error */
|
||||||
|
dup2(slave, STDIN_FILENO);
|
||||||
|
dup2(slave, STDOUT_FILENO);
|
||||||
|
dup2(slave, STDERR_FILENO);
|
||||||
|
|
||||||
|
/* at this point the slave pty should be standard input */
|
||||||
|
if (slave > 2)
|
||||||
|
{
|
||||||
|
close(slave);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Try to restore window size; failure isn't critical */
|
||||||
|
if (ioctl(STDOUT_FILENO, TIOCSWINSZ, &ws) < 0)
|
||||||
|
{
|
||||||
|
perror("could not restore window size");
|
||||||
|
}
|
||||||
|
|
||||||
|
/* now start the shell */
|
||||||
|
{
|
||||||
|
static char* command_args[] = { COMMAND_ARGS, NULL };
|
||||||
|
static char* alt_command_args[] = { ALT_COMMAND_ARGS, NULL };
|
||||||
|
if (argc <= 1)
|
||||||
|
{
|
||||||
|
execvp (COMMAND, command_args);
|
||||||
|
execvp (ALT_COMMAND, alt_command_args);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
execvp (argv[arg_base], &argv[arg_base]);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* should never be reached */
|
||||||
|
exit(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* parent */
|
||||||
|
signal (SIGCHLD, sig_child);
|
||||||
|
|
||||||
|
/* Note that we only set termios settings for standard input;
|
||||||
|
* the master side of a pty is NOT a tty.
|
||||||
|
*/
|
||||||
|
tcgetattr(STDIN_FILENO, &orig_term);
|
||||||
|
|
||||||
|
t = orig_term;
|
||||||
|
eof_char = t.c_cc[VEOF];
|
||||||
|
/* add_special_char(t.c_cc[VEOF]);*/
|
||||||
|
add_special_char(t.c_cc[VINTR]);
|
||||||
|
add_special_char(t.c_cc[VQUIT]);
|
||||||
|
add_special_char(t.c_cc[VSUSP]);
|
||||||
|
#if defined (VDISCARD)
|
||||||
|
add_special_char(t.c_cc[VDISCARD]);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
t.c_lflag &= ~(ICANON | ISIG | ECHO | ECHOCTL | ECHOE | \
|
||||||
|
ECHOK | ECHOKE | ECHONL | ECHOPRT );
|
||||||
|
t.c_iflag &= ~ICRNL;
|
||||||
|
t.c_iflag |= IGNBRK;
|
||||||
|
t.c_cc[VMIN] = 1;
|
||||||
|
t.c_cc[VTIME] = 0;
|
||||||
|
tcsetattr(STDIN_FILENO, TCSANOW, &t);
|
||||||
|
in_from_inferior_fd = master;
|
||||||
|
out_to_inferior_fd = master;
|
||||||
|
rl_instream = fdopen (master, "r");
|
||||||
|
rl_getc_function = my_rl_getc;
|
||||||
|
|
||||||
|
rl_prep_term_function = null_prep_terminal;
|
||||||
|
rl_deprep_term_function = null_deprep_terminal;
|
||||||
|
rl_pre_input_hook = pre_input_change_mode;
|
||||||
|
rl_callback_handler_install (prompt, line_handler);
|
||||||
|
|
||||||
|
in_from_tty_fd = STDIN_FILENO;
|
||||||
|
FD_ZERO (&in_set);
|
||||||
|
maxfd = in_from_inferior_fd > in_from_tty_fd ? in_from_inferior_fd
|
||||||
|
: in_from_tty_fd;
|
||||||
|
for (;;)
|
||||||
|
{
|
||||||
|
int num;
|
||||||
|
FD_SET (in_from_inferior_fd, &in_set);
|
||||||
|
FD_SET (in_from_tty_fd, &in_set);
|
||||||
|
|
||||||
|
num = select(maxfd+1, &in_set, NULL, NULL, NULL);
|
||||||
|
|
||||||
|
if (propagate_sigwinch)
|
||||||
|
{
|
||||||
|
struct winsize ws;
|
||||||
|
if (ioctl (STDIN_FILENO, TIOCGWINSZ, &ws) >= 0)
|
||||||
|
{
|
||||||
|
ioctl (master, TIOCSWINSZ, &ws);
|
||||||
|
}
|
||||||
|
propagate_sigwinch = 0;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (num <= 0)
|
||||||
|
{
|
||||||
|
perror ("select");
|
||||||
|
exit (-1);
|
||||||
|
}
|
||||||
|
if (FD_ISSET (in_from_tty_fd, &in_set))
|
||||||
|
{
|
||||||
|
extern int readline_echoing_p;
|
||||||
|
struct termios term_master;
|
||||||
|
int do_canon = 1;
|
||||||
|
int do_icrnl = 1;
|
||||||
|
int ioctl_ret;
|
||||||
|
|
||||||
|
DPRINT1("[tty avail num_keys:%d]\n", num_keys);
|
||||||
|
|
||||||
|
/* If we can't get tty modes for the master side of the pty, we
|
||||||
|
can't handle non-canonical-mode programs. Always assume the
|
||||||
|
master is in canonical echo mode if we can't tell. */
|
||||||
|
ioctl_ret = tcgetattr(master, &term_master);
|
||||||
|
|
||||||
|
if (ioctl_ret >= 0)
|
||||||
|
{
|
||||||
|
do_canon = (term_master.c_lflag & ICANON) != 0;
|
||||||
|
do_icrnl = (term_master.c_lflag & ICRNL) != 0;
|
||||||
|
readline_echoing_p = (term_master.c_lflag & ECHO) != 0;
|
||||||
|
DPRINT1 ("echo,canon,crnl:%03d\n",
|
||||||
|
100 * readline_echoing_p
|
||||||
|
+ 10 * do_canon
|
||||||
|
+ 1 * do_icrnl);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
if (ioctl_err == 0)
|
||||||
|
DPRINT1("tcgetattr on master fd failed: errno = %d\n", errno);
|
||||||
|
ioctl_err = 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (do_canon == 0 && num_keys == 0)
|
||||||
|
{
|
||||||
|
char ch[10];
|
||||||
|
int count = read (STDIN_FILENO, ch, sizeof(ch));
|
||||||
|
DPRINT1("[read %d chars from stdin: ", count);
|
||||||
|
DPRINT2(" \"%.*s\"]\n", count, ch);
|
||||||
|
if (do_icrnl)
|
||||||
|
{
|
||||||
|
int i = count;
|
||||||
|
while (--i >= 0)
|
||||||
|
{
|
||||||
|
if (ch[i] == '\r')
|
||||||
|
ch[i] = '\n';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
maybe_emphasize_input (1);
|
||||||
|
write (out_to_inferior_fd, ch, count);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
if (num_keys == 0)
|
||||||
|
{
|
||||||
|
int i;
|
||||||
|
/* Re-install callback handler for new prompt. */
|
||||||
|
if (prompt != empty_string)
|
||||||
|
free (prompt);
|
||||||
|
if (prompt == NULL)
|
||||||
|
{
|
||||||
|
DPRINT0("New empty prompt\n");
|
||||||
|
prompt = empty_string;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
if (do_emphasize_input && buf_count > 0)
|
||||||
|
{
|
||||||
|
prompt = malloc (buf_count + strlen (end_input_mode)
|
||||||
|
+ strlen (start_input_mode) + 5);
|
||||||
|
sprintf (prompt, "\001%s\002%.*s\001%s\002",
|
||||||
|
end_input_mode,
|
||||||
|
buf_count, buf,
|
||||||
|
start_input_mode);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
prompt = malloc (buf_count + 1);
|
||||||
|
memcpy (prompt, buf, buf_count);
|
||||||
|
prompt[buf_count] = '\0';
|
||||||
|
}
|
||||||
|
DPRINT1("New prompt '%s'\n", prompt);
|
||||||
|
#if 0 /* ifdef HAVE_RL_ALREADY_PROMPTED */
|
||||||
|
/* Doesn't quite work when do_emphasize_input is 1. */
|
||||||
|
rl_already_prompted = buf_count > 0;
|
||||||
|
#else
|
||||||
|
if (buf_count > 0)
|
||||||
|
write (1, "\r", 1);
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
rl_callback_handler_install (prompt, line_handler);
|
||||||
|
}
|
||||||
|
num_keys++;
|
||||||
|
maybe_emphasize_input (1);
|
||||||
|
rl_callback_read_char ();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else /* output from inferior. */
|
||||||
|
{
|
||||||
|
int i;
|
||||||
|
int count;
|
||||||
|
int old_count;
|
||||||
|
if (buf_count > (sizeof(buf) >> 2))
|
||||||
|
buf_count = 0;
|
||||||
|
count = read (in_from_inferior_fd, buf+buf_count,
|
||||||
|
sizeof(buf) - buf_count);
|
||||||
|
DPRINT2("read %d from inferior, buf_count=%d", count, buf_count);
|
||||||
|
DPRINT2(": \"%.*s\"", count, buf+buf_count);
|
||||||
|
maybe_emphasize_input (0);
|
||||||
|
if (count <= 0)
|
||||||
|
{
|
||||||
|
DPRINT0 ("(Connection closed by foreign host.)\n");
|
||||||
|
tcsetattr(STDIN_FILENO, TCSANOW, &orig_term);
|
||||||
|
exit (0);
|
||||||
|
}
|
||||||
|
old_count = buf_count;
|
||||||
|
|
||||||
|
/* Look for any pending echo that we need to suppress. */
|
||||||
|
while (echo_suppress_start < echo_suppress_limit
|
||||||
|
&& count > 0
|
||||||
|
&& buf[buf_count] == echo_suppress_buffer[echo_suppress_start])
|
||||||
|
{
|
||||||
|
count--;
|
||||||
|
buf_count++;
|
||||||
|
echo_suppress_start++;
|
||||||
|
}
|
||||||
|
DPRINT1("suppressed %d characters of echo.\n", buf_count-old_count);
|
||||||
|
|
||||||
|
/* Write to the terminal anything that was not suppressed. */
|
||||||
|
if (count > 0)
|
||||||
|
write (1, buf + buf_count, count);
|
||||||
|
|
||||||
|
/* Finally, look for a prompt candidate.
|
||||||
|
* When we get around to going input (from the keyboard),
|
||||||
|
* we will consider the prompt to be anything since the last
|
||||||
|
* line terminator. So we need to save that text in the
|
||||||
|
* initial part of buf. However, anything before the
|
||||||
|
* most recent end-of-line is not interesting. */
|
||||||
|
buf_count += count;
|
||||||
|
#if 1
|
||||||
|
for (i = buf_count; --i >= old_count; )
|
||||||
|
#else
|
||||||
|
for (i = buf_count - 1; i-- >= buf_count - count; )
|
||||||
|
#endif
|
||||||
|
{
|
||||||
|
if (buf[i] == '\n' || buf[i] == '\r')
|
||||||
|
{
|
||||||
|
i++;
|
||||||
|
memmove (buf, buf+i, buf_count - i);
|
||||||
|
buf_count -= i;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
DPRINT2("-> i: %d, buf_count: %d\n", i, buf_count);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static void set_edit_mode ()
|
||||||
|
{
|
||||||
|
int vi = 0;
|
||||||
|
char *shellopts;
|
||||||
|
|
||||||
|
shellopts = getenv ("SHELLOPTS");
|
||||||
|
while (shellopts != 0)
|
||||||
|
{
|
||||||
|
if (strncmp ("vi", shellopts, 2) == 0)
|
||||||
|
{
|
||||||
|
vi = 1;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
shellopts = index (shellopts + 1, ':');
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!vi)
|
||||||
|
{
|
||||||
|
if (getenv ("EDITOR") != 0)
|
||||||
|
vi |= strcmp (getenv ("EDITOR"), "vi") == 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (vi)
|
||||||
|
rl_variable_bind ("editing-mode", "vi");
|
||||||
|
else
|
||||||
|
rl_variable_bind ("editing-mode", "emacs");
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
static void usage_exit ()
|
||||||
|
{
|
||||||
|
fprintf (stderr, "Usage: rlfe [-h histfile] [-s size] cmd [arg1] [arg2] ...\n\n");
|
||||||
|
exit (1);
|
||||||
|
}
|
2
contrib/libreadline/examples/rlfe/screen.h
Normal file
2
contrib/libreadline/examples/rlfe/screen.h
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
/* Dummy header to avoid modifying pty.c */
|
||||||
|
#include "os.h"
|
337
contrib/libreadline/examples/rlptytest.c
Normal file
337
contrib/libreadline/examples/rlptytest.c
Normal file
@ -0,0 +1,337 @@
|
|||||||
|
/*
|
||||||
|
*
|
||||||
|
* Another test harness for the readline callback interface.
|
||||||
|
*
|
||||||
|
* Author: Bob Rossi <bob@brasko.net>
|
||||||
|
*/
|
||||||
|
|
||||||
|
#if defined (HAVE_CONFIG_H)
|
||||||
|
#include <config.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <sys/types.h>
|
||||||
|
#include <errno.h>
|
||||||
|
#include <curses.h>
|
||||||
|
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <unistd.h>
|
||||||
|
|
||||||
|
#include <signal.h>
|
||||||
|
|
||||||
|
#if 0 /* LINUX */
|
||||||
|
#include <pty.h>
|
||||||
|
#else
|
||||||
|
#include <util.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef READLINE_LIBRARY
|
||||||
|
# include "readline.h"
|
||||||
|
#else
|
||||||
|
# include <readline/readline.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Master/Slave PTY used to keep readline off of stdin/stdout.
|
||||||
|
*/
|
||||||
|
static int masterfd = -1;
|
||||||
|
static int slavefd;
|
||||||
|
|
||||||
|
void
|
||||||
|
sigint (s)
|
||||||
|
int s;
|
||||||
|
{
|
||||||
|
tty_reset (STDIN_FILENO);
|
||||||
|
close (masterfd);
|
||||||
|
close (slavefd);
|
||||||
|
printf ("\n");
|
||||||
|
exit (0);
|
||||||
|
}
|
||||||
|
|
||||||
|
static int
|
||||||
|
user_input()
|
||||||
|
{
|
||||||
|
int size;
|
||||||
|
const int MAX = 1024;
|
||||||
|
char *buf = (char *)malloc(MAX+1);
|
||||||
|
|
||||||
|
size = read (STDIN_FILENO, buf, MAX);
|
||||||
|
if (size == -1)
|
||||||
|
return -1;
|
||||||
|
|
||||||
|
size = write (masterfd, buf, size);
|
||||||
|
if (size == -1)
|
||||||
|
return -1;
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
static int
|
||||||
|
readline_input()
|
||||||
|
{
|
||||||
|
const int MAX = 1024;
|
||||||
|
char *buf = (char *)malloc(MAX+1);
|
||||||
|
int size;
|
||||||
|
|
||||||
|
size = read (masterfd, buf, MAX);
|
||||||
|
if (size == -1)
|
||||||
|
{
|
||||||
|
free( buf );
|
||||||
|
buf = NULL;
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
buf[size] = 0;
|
||||||
|
|
||||||
|
/* Display output from readline */
|
||||||
|
if ( size > 0 )
|
||||||
|
fprintf(stderr, "%s", buf);
|
||||||
|
|
||||||
|
free( buf );
|
||||||
|
buf = NULL;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
rlctx_send_user_command(char *line)
|
||||||
|
{
|
||||||
|
/* This happens when rl_callback_read_char gets EOF */
|
||||||
|
if ( line == NULL )
|
||||||
|
return;
|
||||||
|
|
||||||
|
if (strcmp (line, "exit") == 0) {
|
||||||
|
tty_reset (STDIN_FILENO);
|
||||||
|
close (masterfd);
|
||||||
|
close (slavefd);
|
||||||
|
printf ("\n");
|
||||||
|
exit (0);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Don't add the enter command */
|
||||||
|
if ( line && *line != '\0' )
|
||||||
|
add_history(line);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
custom_deprep_term_function ()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
static int
|
||||||
|
init_readline (int inputfd, int outputfd)
|
||||||
|
{
|
||||||
|
FILE *inputFILE, *outputFILE;
|
||||||
|
|
||||||
|
inputFILE = fdopen (inputfd, "r");
|
||||||
|
if (!inputFILE)
|
||||||
|
return -1;
|
||||||
|
|
||||||
|
outputFILE = fdopen (outputfd, "w");
|
||||||
|
if (!outputFILE)
|
||||||
|
return -1;
|
||||||
|
|
||||||
|
rl_instream = inputFILE;
|
||||||
|
rl_outstream = outputFILE;
|
||||||
|
|
||||||
|
/* Tell readline what the prompt is if it needs to put it back */
|
||||||
|
rl_callback_handler_install("(rltest): ", rlctx_send_user_command);
|
||||||
|
|
||||||
|
/* Set the terminal type to dumb so the output of readline can be
|
||||||
|
* understood by tgdb */
|
||||||
|
if ( rl_reset_terminal("dumb") == -1 )
|
||||||
|
return -1;
|
||||||
|
|
||||||
|
/* For some reason, readline can not deprep the terminal.
|
||||||
|
* However, it doesn't matter because no other application is working on
|
||||||
|
* the terminal besides readline */
|
||||||
|
rl_deprep_term_function = custom_deprep_term_function;
|
||||||
|
|
||||||
|
using_history();
|
||||||
|
read_history(".history");
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
static int
|
||||||
|
main_loop(void)
|
||||||
|
{
|
||||||
|
fd_set rset;
|
||||||
|
int max;
|
||||||
|
|
||||||
|
max = (masterfd > STDIN_FILENO) ? masterfd : STDIN_FILENO;
|
||||||
|
max = (max > slavefd) ? max : slavefd;
|
||||||
|
|
||||||
|
for (;;)
|
||||||
|
{
|
||||||
|
/* Reset the fd_set, and watch for input from GDB or stdin */
|
||||||
|
FD_ZERO(&rset);
|
||||||
|
|
||||||
|
FD_SET(STDIN_FILENO, &rset);
|
||||||
|
FD_SET(slavefd, &rset);
|
||||||
|
FD_SET(masterfd, &rset);
|
||||||
|
|
||||||
|
/* Wait for input */
|
||||||
|
if (select(max + 1, &rset, NULL, NULL, NULL) == -1)
|
||||||
|
{
|
||||||
|
if (errno == EINTR)
|
||||||
|
continue;
|
||||||
|
else
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Input received through the pty: Handle it
|
||||||
|
* Wrote to masterfd, slave fd has that input, alert readline to read it.
|
||||||
|
*/
|
||||||
|
if (FD_ISSET(slavefd, &rset))
|
||||||
|
rl_callback_read_char();
|
||||||
|
|
||||||
|
/* Input received through the pty.
|
||||||
|
* Readline read from slavefd, and it wrote to the masterfd.
|
||||||
|
*/
|
||||||
|
if (FD_ISSET(masterfd, &rset))
|
||||||
|
if ( readline_input() == -1 )
|
||||||
|
return -1;
|
||||||
|
|
||||||
|
/* Input received: Handle it, write to masterfd (input to readline) */
|
||||||
|
if (FD_ISSET(STDIN_FILENO, &rset))
|
||||||
|
if ( user_input() == -1 )
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* The terminal attributes before calling tty_cbreak */
|
||||||
|
static struct termios save_termios;
|
||||||
|
static struct winsize size;
|
||||||
|
static enum { RESET, TCBREAK } ttystate = RESET;
|
||||||
|
|
||||||
|
/* tty_cbreak: Sets terminal to cbreak mode. Also known as noncanonical mode.
|
||||||
|
* 1. Signal handling is still turned on, so the user can still type those.
|
||||||
|
* 2. echo is off
|
||||||
|
* 3. Read in one char at a time.
|
||||||
|
*
|
||||||
|
* fd - The file descriptor of the terminal
|
||||||
|
*
|
||||||
|
* Returns: 0 on sucess, -1 on error
|
||||||
|
*/
|
||||||
|
int tty_cbreak(int fd){
|
||||||
|
struct termios buf;
|
||||||
|
int ttysavefd = -1;
|
||||||
|
|
||||||
|
if(tcgetattr(fd, &save_termios) < 0)
|
||||||
|
return -1;
|
||||||
|
|
||||||
|
buf = save_termios;
|
||||||
|
buf.c_lflag &= ~(ECHO | ICANON);
|
||||||
|
buf.c_iflag &= ~(ICRNL | INLCR);
|
||||||
|
buf.c_cc[VMIN] = 1;
|
||||||
|
buf.c_cc[VTIME] = 0;
|
||||||
|
|
||||||
|
#if defined (VLNEXT) && defined (_POSIX_VDISABLE)
|
||||||
|
buf.c_cc[VLNEXT] = _POSIX_VDISABLE;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined (VDSUSP) && defined (_POSIX_VDISABLE)
|
||||||
|
buf.c_cc[VDSUSP] = _POSIX_VDISABLE;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* enable flow control; only stty start char can restart output */
|
||||||
|
#if 0
|
||||||
|
buf.c_iflag |= (IXON|IXOFF);
|
||||||
|
#ifdef IXANY
|
||||||
|
buf.c_iflag &= ~IXANY;
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* disable flow control; let ^S and ^Q through to pty */
|
||||||
|
buf.c_iflag &= ~(IXON|IXOFF);
|
||||||
|
#ifdef IXANY
|
||||||
|
buf.c_iflag &= ~IXANY;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
if(tcsetattr(fd, TCSAFLUSH, &buf) < 0)
|
||||||
|
return -1;
|
||||||
|
|
||||||
|
ttystate = TCBREAK;
|
||||||
|
ttysavefd = fd;
|
||||||
|
|
||||||
|
/* set size */
|
||||||
|
if(ioctl(fd, TIOCGWINSZ, (char *)&size) < 0)
|
||||||
|
return -1;
|
||||||
|
|
||||||
|
#ifdef DEBUG
|
||||||
|
err_msg("%d rows and %d cols\n", size.ws_row, size.ws_col);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
return (0);
|
||||||
|
}
|
||||||
|
|
||||||
|
int
|
||||||
|
tty_off_xon_xoff (int fd)
|
||||||
|
{
|
||||||
|
struct termios buf;
|
||||||
|
int ttysavefd = -1;
|
||||||
|
|
||||||
|
if(tcgetattr(fd, &buf) < 0)
|
||||||
|
return -1;
|
||||||
|
|
||||||
|
buf.c_iflag &= ~(IXON|IXOFF);
|
||||||
|
|
||||||
|
if(tcsetattr(fd, TCSAFLUSH, &buf) < 0)
|
||||||
|
return -1;
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* tty_reset: Sets the terminal attributes back to their previous state.
|
||||||
|
* PRE: tty_cbreak must have already been called.
|
||||||
|
*
|
||||||
|
* fd - The file descrioptor of the terminal to reset.
|
||||||
|
*
|
||||||
|
* Returns: 0 on success, -1 on error
|
||||||
|
*/
|
||||||
|
int tty_reset(int fd)
|
||||||
|
{
|
||||||
|
if(ttystate != TCBREAK)
|
||||||
|
return (0);
|
||||||
|
|
||||||
|
if(tcsetattr(fd, TCSAFLUSH, &save_termios) < 0)
|
||||||
|
return (-1);
|
||||||
|
|
||||||
|
ttystate = RESET;
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
int
|
||||||
|
main()
|
||||||
|
{
|
||||||
|
int val;
|
||||||
|
val = openpty (&masterfd, &slavefd, NULL, NULL, NULL);
|
||||||
|
if (val == -1)
|
||||||
|
return -1;
|
||||||
|
|
||||||
|
val = tty_off_xon_xoff (masterfd);
|
||||||
|
if (val == -1)
|
||||||
|
return -1;
|
||||||
|
|
||||||
|
val = init_readline (slavefd, slavefd);
|
||||||
|
if (val == -1)
|
||||||
|
return -1;
|
||||||
|
|
||||||
|
val = tty_cbreak (STDIN_FILENO);
|
||||||
|
if (val == -1)
|
||||||
|
return -1;
|
||||||
|
|
||||||
|
signal (SIGINT, sigint);
|
||||||
|
|
||||||
|
val = main_loop ();
|
||||||
|
|
||||||
|
tty_reset (STDIN_FILENO);
|
||||||
|
|
||||||
|
if (val == -1)
|
||||||
|
return -1;
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
@ -31,6 +31,12 @@
|
|||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
|
|
||||||
|
#ifdef HAVE_STDLIB_H
|
||||||
|
# include <stdlib.h>
|
||||||
|
#else
|
||||||
|
extern void exit();
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef READLINE_LIBRARY
|
#ifdef READLINE_LIBRARY
|
||||||
# include "readline.h"
|
# include "readline.h"
|
||||||
# include "history.h"
|
# include "history.h"
|
||||||
|
@ -30,6 +30,12 @@
|
|||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include "posixstat.h"
|
#include "posixstat.h"
|
||||||
|
|
||||||
|
#ifdef HAVE_STDLIB_H
|
||||||
|
# include <stdlib.h>
|
||||||
|
#else
|
||||||
|
extern void exit();
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef READLINE_LIBRARY
|
#ifdef READLINE_LIBRARY
|
||||||
# include "readline.h"
|
# include "readline.h"
|
||||||
#else
|
#else
|
||||||
|
@ -176,6 +176,7 @@ static FUNMAP default_funmap[] = {
|
|||||||
{ "vi-put", rl_vi_put },
|
{ "vi-put", rl_vi_put },
|
||||||
{ "vi-redo", rl_vi_redo },
|
{ "vi-redo", rl_vi_redo },
|
||||||
{ "vi-replace", rl_vi_replace },
|
{ "vi-replace", rl_vi_replace },
|
||||||
|
{ "vi-rubout", rl_vi_rubout },
|
||||||
{ "vi-search", rl_vi_search },
|
{ "vi-search", rl_vi_search },
|
||||||
{ "vi-search-again", rl_vi_search_again },
|
{ "vi-search-again", rl_vi_search_again },
|
||||||
{ "vi-set-mark", rl_vi_set_mark },
|
{ "vi-set-mark", rl_vi_set_mark },
|
||||||
|
@ -206,6 +206,7 @@ get_history_event (string, caller_index, delimiting_quote)
|
|||||||
|
|
||||||
/* Only a closing `?' or a newline delimit a substring search string. */
|
/* Only a closing `?' or a newline delimit a substring search string. */
|
||||||
for (local_index = i; c = string[i]; i++)
|
for (local_index = i; c = string[i]; i++)
|
||||||
|
{
|
||||||
#if defined (HANDLE_MULTIBYTE)
|
#if defined (HANDLE_MULTIBYTE)
|
||||||
if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
|
if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
|
||||||
{
|
{
|
||||||
@ -222,7 +223,7 @@ get_history_event (string, caller_index, delimiting_quote)
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
|
||||||
#endif /* HANDLE_MULTIBYTE */
|
#endif /* HANDLE_MULTIBYTE */
|
||||||
if ((!substring_okay && (whitespace (c) || c == ':' ||
|
if ((!substring_okay && (whitespace (c) || c == ':' ||
|
||||||
(history_search_delimiter_chars && member (c, history_search_delimiter_chars)) ||
|
(history_search_delimiter_chars && member (c, history_search_delimiter_chars)) ||
|
||||||
@ -230,6 +231,7 @@ get_history_event (string, caller_index, delimiting_quote)
|
|||||||
string[i] == '\n' ||
|
string[i] == '\n' ||
|
||||||
(substring_okay && string[i] == '?'))
|
(substring_okay && string[i] == '?'))
|
||||||
break;
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
which = i - local_index;
|
which = i - local_index;
|
||||||
temp = (char *)xmalloc (1 + which);
|
temp = (char *)xmalloc (1 + which);
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/* history.c -- standalone history library */
|
/* history.c -- standalone history library */
|
||||||
|
|
||||||
/* Copyright (C) 1989-2003 Free Software Foundation, Inc.
|
/* Copyright (C) 1989-2005 Free Software Foundation, Inc.
|
||||||
|
|
||||||
This file contains the GNU History Library (the Library), a set of
|
This file contains the GNU History Library (the Library), a set of
|
||||||
routines for managing the text of previously typed lines.
|
routines for managing the text of previously typed lines.
|
||||||
@ -204,7 +204,7 @@ history_get (offset)
|
|||||||
int local_index;
|
int local_index;
|
||||||
|
|
||||||
local_index = offset - history_base;
|
local_index = offset - history_base;
|
||||||
return (local_index >= history_length || local_index < 0 || !the_history)
|
return (local_index >= history_length || local_index < 0 || the_history == 0)
|
||||||
? (HIST_ENTRY *)NULL
|
? (HIST_ENTRY *)NULL
|
||||||
: the_history[local_index];
|
: the_history[local_index];
|
||||||
}
|
}
|
||||||
@ -340,7 +340,7 @@ replace_history_entry (which, line, data)
|
|||||||
{
|
{
|
||||||
HIST_ENTRY *temp, *old_value;
|
HIST_ENTRY *temp, *old_value;
|
||||||
|
|
||||||
if (which >= history_length)
|
if (which < 0 || which >= history_length)
|
||||||
return ((HIST_ENTRY *)NULL);
|
return ((HIST_ENTRY *)NULL);
|
||||||
|
|
||||||
temp = (HIST_ENTRY *)xmalloc (sizeof (HIST_ENTRY));
|
temp = (HIST_ENTRY *)xmalloc (sizeof (HIST_ENTRY));
|
||||||
@ -364,17 +364,15 @@ remove_history (which)
|
|||||||
HIST_ENTRY *return_value;
|
HIST_ENTRY *return_value;
|
||||||
register int i;
|
register int i;
|
||||||
|
|
||||||
if (which >= history_length || !history_length)
|
if (which < 0 || which >= history_length || history_length == 0 || the_history == 0)
|
||||||
return_value = (HIST_ENTRY *)NULL;
|
return ((HIST_ENTRY *)NULL);
|
||||||
else
|
|
||||||
{
|
|
||||||
return_value = the_history[which];
|
return_value = the_history[which];
|
||||||
|
|
||||||
for (i = which; i < history_length; i++)
|
for (i = which; i < history_length; i++)
|
||||||
the_history[i] = the_history[i + 1];
|
the_history[i] = the_history[i + 1];
|
||||||
|
|
||||||
history_length--;
|
history_length--;
|
||||||
}
|
|
||||||
|
|
||||||
return (return_value);
|
return (return_value);
|
||||||
}
|
}
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/* input.c -- character input functions for readline. */
|
/* input.c -- character input functions for readline. */
|
||||||
|
|
||||||
/* Copyright (C) 1994 Free Software Foundation, Inc.
|
/* Copyright (C) 1994-2005 Free Software Foundation, Inc.
|
||||||
|
|
||||||
This file is part of the GNU Readline Library, a library for
|
This file is part of the GNU Readline Library, a library for
|
||||||
reading lines of text with interactive input and history editing.
|
reading lines of text with interactive input and history editing.
|
||||||
@ -444,6 +444,10 @@ rl_getc (stream)
|
|||||||
|
|
||||||
while (1)
|
while (1)
|
||||||
{
|
{
|
||||||
|
#if defined (__MINGW32__)
|
||||||
|
if (isatty (fileno (stream)))
|
||||||
|
return (getch ());
|
||||||
|
#endif
|
||||||
result = read (fileno (stream), &c, sizeof (unsigned char));
|
result = read (fileno (stream), &c, sizeof (unsigned char));
|
||||||
|
|
||||||
if (result == sizeof (unsigned char))
|
if (result == sizeof (unsigned char))
|
||||||
@ -519,6 +523,12 @@ _rl_read_mbchar (mbchar, size)
|
|||||||
ps = ps_back;
|
ps = ps_back;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
else if (mbchar_bytes_length == 0)
|
||||||
|
{
|
||||||
|
mbchar[0] = '\0'; /* null wide character */
|
||||||
|
mb_len = 1;
|
||||||
|
break;
|
||||||
|
}
|
||||||
else if (mbchar_bytes_length > (size_t)(0))
|
else if (mbchar_bytes_length > (size_t)(0))
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
/* */
|
/* */
|
||||||
/* **************************************************************** */
|
/* **************************************************************** */
|
||||||
|
|
||||||
/* Copyright (C) 1987-2002 Free Software Foundation, Inc.
|
/* Copyright (C) 1987-2005 Free Software Foundation, Inc.
|
||||||
|
|
||||||
This file contains the Readline Library (the Library), a set of
|
This file contains the Readline Library (the Library), a set of
|
||||||
routines for providing Emacs style line input to programs that ask
|
routines for providing Emacs style line input to programs that ask
|
||||||
@ -56,12 +56,17 @@
|
|||||||
/* Variables exported to other files in the readline library. */
|
/* Variables exported to other files in the readline library. */
|
||||||
char *_rl_isearch_terminators = (char *)NULL;
|
char *_rl_isearch_terminators = (char *)NULL;
|
||||||
|
|
||||||
|
_rl_search_cxt *_rl_iscxt = 0;
|
||||||
|
|
||||||
/* Variables imported from other files in the readline library. */
|
/* Variables imported from other files in the readline library. */
|
||||||
extern HIST_ENTRY *_rl_saved_line_for_history;
|
extern HIST_ENTRY *_rl_saved_line_for_history;
|
||||||
|
|
||||||
/* Forward declarations */
|
|
||||||
static int rl_search_history PARAMS((int, int));
|
static int rl_search_history PARAMS((int, int));
|
||||||
|
|
||||||
|
static _rl_search_cxt *_rl_isearch_init PARAMS((int));
|
||||||
|
static void _rl_isearch_fini PARAMS((_rl_search_cxt *));
|
||||||
|
static int _rl_isearch_cleanup PARAMS((_rl_search_cxt *, int));
|
||||||
|
|
||||||
/* Last line found by the current incremental search, so we don't `find'
|
/* Last line found by the current incremental search, so we don't `find'
|
||||||
identical lines many times in a row. */
|
identical lines many times in a row. */
|
||||||
static char *prev_line_found;
|
static char *prev_line_found;
|
||||||
@ -72,6 +77,57 @@ static int last_isearch_string_len;
|
|||||||
|
|
||||||
static char *default_isearch_terminators = "\033\012";
|
static char *default_isearch_terminators = "\033\012";
|
||||||
|
|
||||||
|
_rl_search_cxt *
|
||||||
|
_rl_scxt_alloc (type, flags)
|
||||||
|
int type, flags;
|
||||||
|
{
|
||||||
|
_rl_search_cxt *cxt;
|
||||||
|
|
||||||
|
cxt = (_rl_search_cxt *)xmalloc (sizeof (_rl_search_cxt));
|
||||||
|
|
||||||
|
cxt->type = type;
|
||||||
|
cxt->sflags = flags;
|
||||||
|
|
||||||
|
cxt->search_string = 0;
|
||||||
|
cxt->search_string_size = cxt->search_string_index = 0;
|
||||||
|
|
||||||
|
cxt->lines = 0;
|
||||||
|
cxt->allocated_line = 0;
|
||||||
|
cxt->hlen = cxt->hindex = 0;
|
||||||
|
|
||||||
|
cxt->save_point = rl_point;
|
||||||
|
cxt->save_mark = rl_mark;
|
||||||
|
cxt->save_line = where_history ();
|
||||||
|
cxt->last_found_line = cxt->save_line;
|
||||||
|
cxt->prev_line_found = 0;
|
||||||
|
|
||||||
|
cxt->save_undo_list = 0;
|
||||||
|
|
||||||
|
cxt->history_pos = 0;
|
||||||
|
cxt->direction = 0;
|
||||||
|
|
||||||
|
cxt->lastc = 0;
|
||||||
|
|
||||||
|
cxt->sline = 0;
|
||||||
|
cxt->sline_len = cxt->sline_index = 0;
|
||||||
|
|
||||||
|
cxt->search_terminators = 0;
|
||||||
|
|
||||||
|
return cxt;
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
_rl_scxt_dispose (cxt, flags)
|
||||||
|
_rl_search_cxt *cxt;
|
||||||
|
int flags;
|
||||||
|
{
|
||||||
|
FREE (cxt->search_string);
|
||||||
|
FREE (cxt->allocated_line);
|
||||||
|
FREE (cxt->lines);
|
||||||
|
|
||||||
|
free (cxt);
|
||||||
|
}
|
||||||
|
|
||||||
/* Search backwards through the history looking for a string which is typed
|
/* Search backwards through the history looking for a string which is typed
|
||||||
interactively. Start with the current line. */
|
interactively. Start with the current line. */
|
||||||
int
|
int
|
||||||
@ -92,7 +148,7 @@ rl_forward_search_history (sign, key)
|
|||||||
|
|
||||||
/* Display the current state of the search in the echo-area.
|
/* Display the current state of the search in the echo-area.
|
||||||
SEARCH_STRING contains the string that is being searched for,
|
SEARCH_STRING contains the string that is being searched for,
|
||||||
DIRECTION is zero for forward, or 1 for reverse,
|
DIRECTION is zero for forward, or non-zero for reverse,
|
||||||
WHERE is the history list number of the current line. If it is
|
WHERE is the history list number of the current line. If it is
|
||||||
-1, then this line is the starting one. */
|
-1, then this line is the starting one. */
|
||||||
static void
|
static void
|
||||||
@ -140,66 +196,23 @@ rl_display_search (search_string, reverse_p, where)
|
|||||||
(*rl_redisplay_function) ();
|
(*rl_redisplay_function) ();
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Search through the history looking for an interactively typed string.
|
static _rl_search_cxt *
|
||||||
This is analogous to i-search. We start the search in the current line.
|
_rl_isearch_init (direction)
|
||||||
DIRECTION is which direction to search; >= 0 means forward, < 0 means
|
int direction;
|
||||||
backwards. */
|
|
||||||
static int
|
|
||||||
rl_search_history (direction, invoking_key)
|
|
||||||
int direction, invoking_key;
|
|
||||||
{
|
{
|
||||||
/* The string that the user types in to search for. */
|
_rl_search_cxt *cxt;
|
||||||
char *search_string;
|
register int i;
|
||||||
|
|
||||||
/* The current length of SEARCH_STRING. */
|
|
||||||
int search_string_index;
|
|
||||||
|
|
||||||
/* The amount of space that SEARCH_STRING has allocated to it. */
|
|
||||||
int search_string_size;
|
|
||||||
|
|
||||||
/* The list of lines to search through. */
|
|
||||||
char **lines, *allocated_line;
|
|
||||||
|
|
||||||
/* The length of LINES. */
|
|
||||||
int hlen;
|
|
||||||
|
|
||||||
/* Where we get LINES from. */
|
|
||||||
HIST_ENTRY **hlist;
|
HIST_ENTRY **hlist;
|
||||||
|
|
||||||
register int i;
|
cxt = _rl_scxt_alloc (RL_SEARCH_ISEARCH, 0);
|
||||||
int orig_point, orig_mark, orig_line, last_found_line;
|
if (direction < 0)
|
||||||
int c, found, failed, sline_len;
|
cxt->sflags |= SF_REVERSE;
|
||||||
int n, wstart, wlen;
|
|
||||||
#if defined (HANDLE_MULTIBYTE)
|
|
||||||
char mb[MB_LEN_MAX];
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* The line currently being searched. */
|
cxt->search_terminators = _rl_isearch_terminators ? _rl_isearch_terminators
|
||||||
char *sline;
|
|
||||||
|
|
||||||
/* Offset in that line. */
|
|
||||||
int line_index;
|
|
||||||
|
|
||||||
/* Non-zero if we are doing a reverse search. */
|
|
||||||
int reverse;
|
|
||||||
|
|
||||||
/* The list of characters which terminate the search, but are not
|
|
||||||
subsequently executed. If the variable isearch-terminators has
|
|
||||||
been set, we use that value, otherwise we use ESC and C-J. */
|
|
||||||
char *isearch_terminators;
|
|
||||||
|
|
||||||
RL_SETSTATE(RL_STATE_ISEARCH);
|
|
||||||
orig_point = rl_point;
|
|
||||||
orig_mark = rl_mark;
|
|
||||||
last_found_line = orig_line = where_history ();
|
|
||||||
reverse = direction < 0;
|
|
||||||
hlist = history_list ();
|
|
||||||
allocated_line = (char *)NULL;
|
|
||||||
|
|
||||||
isearch_terminators = _rl_isearch_terminators ? _rl_isearch_terminators
|
|
||||||
: default_isearch_terminators;
|
: default_isearch_terminators;
|
||||||
|
|
||||||
/* Create an arrary of pointers to the lines that we want to search. */
|
/* Create an arrary of pointers to the lines that we want to search. */
|
||||||
|
hlist = history_list ();
|
||||||
rl_maybe_replace_line ();
|
rl_maybe_replace_line ();
|
||||||
i = 0;
|
i = 0;
|
||||||
if (hlist)
|
if (hlist)
|
||||||
@ -207,81 +220,138 @@ rl_search_history (direction, invoking_key)
|
|||||||
|
|
||||||
/* Allocate space for this many lines, +1 for the current input line,
|
/* Allocate space for this many lines, +1 for the current input line,
|
||||||
and remember those lines. */
|
and remember those lines. */
|
||||||
lines = (char **)xmalloc ((1 + (hlen = i)) * sizeof (char *));
|
cxt->lines = (char **)xmalloc ((1 + (cxt->hlen = i)) * sizeof (char *));
|
||||||
for (i = 0; i < hlen; i++)
|
for (i = 0; i < cxt->hlen; i++)
|
||||||
lines[i] = hlist[i]->line;
|
cxt->lines[i] = hlist[i]->line;
|
||||||
|
|
||||||
if (_rl_saved_line_for_history)
|
if (_rl_saved_line_for_history)
|
||||||
lines[i] = _rl_saved_line_for_history->line;
|
cxt->lines[i] = _rl_saved_line_for_history->line;
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
/* Keep track of this so we can free it. */
|
/* Keep track of this so we can free it. */
|
||||||
allocated_line = (char *)xmalloc (1 + strlen (rl_line_buffer));
|
cxt->allocated_line = (char *)xmalloc (1 + strlen (rl_line_buffer));
|
||||||
strcpy (allocated_line, &rl_line_buffer[0]);
|
strcpy (cxt->allocated_line, &rl_line_buffer[0]);
|
||||||
lines[i] = allocated_line;
|
cxt->lines[i] = cxt->allocated_line;
|
||||||
}
|
}
|
||||||
|
|
||||||
hlen++;
|
cxt->hlen++;
|
||||||
|
|
||||||
/* The line where we start the search. */
|
/* The line where we start the search. */
|
||||||
i = orig_line;
|
cxt->history_pos = cxt->save_line;
|
||||||
|
|
||||||
rl_save_prompt ();
|
rl_save_prompt ();
|
||||||
|
|
||||||
/* Initialize search parameters. */
|
/* Initialize search parameters. */
|
||||||
search_string = (char *)xmalloc (search_string_size = 128);
|
cxt->search_string = (char *)xmalloc (cxt->search_string_size = 128);
|
||||||
*search_string = '\0';
|
cxt->search_string[cxt->search_string_index = 0] = '\0';
|
||||||
search_string_index = 0;
|
|
||||||
prev_line_found = (char *)0; /* XXX */
|
|
||||||
|
|
||||||
/* Normalize DIRECTION into 1 or -1. */
|
/* Normalize DIRECTION into 1 or -1. */
|
||||||
direction = (direction >= 0) ? 1 : -1;
|
cxt->direction = (direction >= 0) ? 1 : -1;
|
||||||
|
|
||||||
rl_display_search (search_string, reverse, -1);
|
cxt->sline = rl_line_buffer;
|
||||||
|
cxt->sline_len = strlen (cxt->sline);
|
||||||
|
cxt->sline_index = rl_point;
|
||||||
|
|
||||||
sline = rl_line_buffer;
|
_rl_iscxt = cxt; /* save globally */
|
||||||
sline_len = strlen (sline);
|
|
||||||
line_index = rl_point;
|
|
||||||
|
|
||||||
found = failed = 0;
|
return cxt;
|
||||||
for (;;)
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
_rl_isearch_fini (cxt)
|
||||||
|
_rl_search_cxt *cxt;
|
||||||
{
|
{
|
||||||
rl_command_func_t *f = (rl_command_func_t *)NULL;
|
/* First put back the original state. */
|
||||||
|
strcpy (rl_line_buffer, cxt->lines[cxt->save_line]);
|
||||||
|
|
||||||
|
rl_restore_prompt ();
|
||||||
|
|
||||||
|
/* Save the search string for possible later use. */
|
||||||
|
FREE (last_isearch_string);
|
||||||
|
last_isearch_string = cxt->search_string;
|
||||||
|
last_isearch_string_len = cxt->search_string_index;
|
||||||
|
cxt->search_string = 0;
|
||||||
|
|
||||||
|
if (cxt->last_found_line < cxt->save_line)
|
||||||
|
rl_get_previous_history (cxt->save_line - cxt->last_found_line, 0);
|
||||||
|
else
|
||||||
|
rl_get_next_history (cxt->last_found_line - cxt->save_line, 0);
|
||||||
|
|
||||||
|
/* If the string was not found, put point at the end of the last matching
|
||||||
|
line. If last_found_line == orig_line, we didn't find any matching
|
||||||
|
history lines at all, so put point back in its original position. */
|
||||||
|
if (cxt->sline_index < 0)
|
||||||
|
{
|
||||||
|
if (cxt->last_found_line == cxt->save_line)
|
||||||
|
cxt->sline_index = cxt->save_point;
|
||||||
|
else
|
||||||
|
cxt->sline_index = strlen (rl_line_buffer);
|
||||||
|
rl_mark = cxt->save_mark;
|
||||||
|
}
|
||||||
|
|
||||||
|
rl_point = cxt->sline_index;
|
||||||
|
/* Don't worry about where to put the mark here; rl_get_previous_history
|
||||||
|
and rl_get_next_history take care of it. */
|
||||||
|
|
||||||
|
rl_clear_message ();
|
||||||
|
}
|
||||||
|
|
||||||
|
int
|
||||||
|
_rl_search_getchar (cxt)
|
||||||
|
_rl_search_cxt *cxt;
|
||||||
|
{
|
||||||
|
int c;
|
||||||
|
|
||||||
/* Read a key and decide how to proceed. */
|
/* Read a key and decide how to proceed. */
|
||||||
RL_SETSTATE(RL_STATE_MOREINPUT);
|
RL_SETSTATE(RL_STATE_MOREINPUT);
|
||||||
c = rl_read_key ();
|
c = cxt->lastc = rl_read_key ();
|
||||||
RL_UNSETSTATE(RL_STATE_MOREINPUT);
|
RL_UNSETSTATE(RL_STATE_MOREINPUT);
|
||||||
|
|
||||||
#if defined (HANDLE_MULTIBYTE)
|
#if defined (HANDLE_MULTIBYTE)
|
||||||
if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
|
if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
|
||||||
c = _rl_read_mbstring (c, mb, MB_LEN_MAX);
|
c = cxt->lastc = _rl_read_mbstring (cxt->lastc, cxt->mb, MB_LEN_MAX);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
return c;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Process just-read character C according to isearch context CXT. Return
|
||||||
|
-1 if the caller should just free the context and return, 0 if we should
|
||||||
|
break out of the loop, and 1 if we should continue to read characters. */
|
||||||
|
int
|
||||||
|
_rl_isearch_dispatch (cxt, c)
|
||||||
|
_rl_search_cxt *cxt;
|
||||||
|
int c;
|
||||||
|
{
|
||||||
|
int n, wstart, wlen, limit, cval;
|
||||||
|
rl_command_func_t *f;
|
||||||
|
|
||||||
|
f = (rl_command_func_t *)NULL;
|
||||||
|
|
||||||
/* Translate the keys we do something with to opcodes. */
|
/* Translate the keys we do something with to opcodes. */
|
||||||
if (c >= 0 && _rl_keymap[c].type == ISFUNC)
|
if (c >= 0 && _rl_keymap[c].type == ISFUNC)
|
||||||
{
|
{
|
||||||
f = _rl_keymap[c].function;
|
f = _rl_keymap[c].function;
|
||||||
|
|
||||||
if (f == rl_reverse_search_history)
|
if (f == rl_reverse_search_history)
|
||||||
c = reverse ? -1 : -2;
|
cxt->lastc = (cxt->sflags & SF_REVERSE) ? -1 : -2;
|
||||||
else if (f == rl_forward_search_history)
|
else if (f == rl_forward_search_history)
|
||||||
c = !reverse ? -1 : -2;
|
cxt->lastc = (cxt->sflags & SF_REVERSE) ? -2 : -1;
|
||||||
else if (f == rl_rubout)
|
else if (f == rl_rubout)
|
||||||
c = -3;
|
cxt->lastc = -3;
|
||||||
else if (c == CTRL ('G'))
|
else if (c == CTRL ('G'))
|
||||||
c = -4;
|
cxt->lastc = -4;
|
||||||
else if (c == CTRL ('W')) /* XXX */
|
else if (c == CTRL ('W')) /* XXX */
|
||||||
c = -5;
|
cxt->lastc = -5;
|
||||||
else if (c == CTRL ('Y')) /* XXX */
|
else if (c == CTRL ('Y')) /* XXX */
|
||||||
c = -6;
|
cxt->lastc = -6;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* The characters in isearch_terminators (set from the user-settable
|
/* The characters in isearch_terminators (set from the user-settable
|
||||||
variable isearch-terminators) are used to terminate the search but
|
variable isearch-terminators) are used to terminate the search but
|
||||||
not subsequently execute the character as a command. The default
|
not subsequently execute the character as a command. The default
|
||||||
value is "\033\012" (ESC and C-J). */
|
value is "\033\012" (ESC and C-J). */
|
||||||
if (strchr (isearch_terminators, c))
|
if (strchr (cxt->search_terminators, cxt->lastc))
|
||||||
{
|
{
|
||||||
/* ESC still terminates the search, but if there is pending
|
/* ESC still terminates the search, but if there is pending
|
||||||
input or if input arrives within 0.1 seconds (on systems
|
input or if input arrives within 0.1 seconds (on systems
|
||||||
@ -292,9 +362,9 @@ rl_search_history (direction, invoking_key)
|
|||||||
XXX - since _rl_input_available depends on the application-
|
XXX - since _rl_input_available depends on the application-
|
||||||
settable keyboard timeout value, this could alternatively
|
settable keyboard timeout value, this could alternatively
|
||||||
use _rl_input_queued(100000) */
|
use _rl_input_queued(100000) */
|
||||||
if (c == ESC && _rl_input_available ())
|
if (cxt->lastc == ESC && _rl_input_available ())
|
||||||
rl_execute_next (ESC);
|
rl_execute_next (ESC);
|
||||||
break;
|
return (0);
|
||||||
}
|
}
|
||||||
|
|
||||||
#define ENDSRCH_CHAR(c) \
|
#define ENDSRCH_CHAR(c) \
|
||||||
@ -303,52 +373,58 @@ rl_search_history (direction, invoking_key)
|
|||||||
#if defined (HANDLE_MULTIBYTE)
|
#if defined (HANDLE_MULTIBYTE)
|
||||||
if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
|
if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
|
||||||
{
|
{
|
||||||
if (c >= 0 && strlen (mb) == 1 && ENDSRCH_CHAR (c))
|
if (cxt->lastc >= 0 && (cxt->mb[0] && cxt->mb[1] == '\0') && ENDSRCH_CHAR (cxt->lastc))
|
||||||
{
|
{
|
||||||
/* This sets rl_pending_input to c; it will be picked up the next
|
/* This sets rl_pending_input to c; it will be picked up the next
|
||||||
time rl_read_key is called. */
|
time rl_read_key is called. */
|
||||||
rl_execute_next (c);
|
rl_execute_next (cxt->lastc);
|
||||||
break;
|
return (0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
#endif
|
#endif
|
||||||
if (c >= 0 && ENDSRCH_CHAR (c))
|
if (cxt->lastc >= 0 && ENDSRCH_CHAR (cxt->lastc))
|
||||||
{
|
{
|
||||||
/* This sets rl_pending_input to c; it will be picked up the next
|
/* This sets rl_pending_input to LASTC; it will be picked up the next
|
||||||
time rl_read_key is called. */
|
time rl_read_key is called. */
|
||||||
rl_execute_next (c);
|
rl_execute_next (cxt->lastc);
|
||||||
break;
|
return (0);
|
||||||
}
|
}
|
||||||
|
|
||||||
switch (c)
|
/* Now dispatch on the character. `Opcodes' affect the search string or
|
||||||
|
state. Other characters are added to the string. */
|
||||||
|
switch (cxt->lastc)
|
||||||
{
|
{
|
||||||
|
/* search again */
|
||||||
case -1:
|
case -1:
|
||||||
if (search_string_index == 0)
|
if (cxt->search_string_index == 0)
|
||||||
{
|
{
|
||||||
if (last_isearch_string)
|
if (last_isearch_string)
|
||||||
{
|
{
|
||||||
search_string_size = 64 + last_isearch_string_len;
|
cxt->search_string_size = 64 + last_isearch_string_len;
|
||||||
search_string = (char *)xrealloc (search_string, search_string_size);
|
cxt->search_string = (char *)xrealloc (cxt->search_string, cxt->search_string_size);
|
||||||
strcpy (search_string, last_isearch_string);
|
strcpy (cxt->search_string, last_isearch_string);
|
||||||
search_string_index = last_isearch_string_len;
|
cxt->search_string_index = last_isearch_string_len;
|
||||||
rl_display_search (search_string, reverse, -1);
|
rl_display_search (cxt->search_string, (cxt->sflags & SF_REVERSE), -1);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
continue;
|
return (1);
|
||||||
}
|
}
|
||||||
else if (reverse)
|
else if (cxt->sflags & SF_REVERSE)
|
||||||
--line_index;
|
cxt->sline_index--;
|
||||||
else if (line_index != sline_len)
|
else if (cxt->sline_index != cxt->sline_len)
|
||||||
++line_index;
|
cxt->sline_index++;
|
||||||
else
|
else
|
||||||
rl_ding ();
|
rl_ding ();
|
||||||
break;
|
break;
|
||||||
|
|
||||||
/* switch directions */
|
/* switch directions */
|
||||||
case -2:
|
case -2:
|
||||||
direction = -direction;
|
cxt->direction = -cxt->direction;
|
||||||
reverse = direction < 0;
|
if (cxt->direction < 0)
|
||||||
|
cxt->sflags |= SF_REVERSE;
|
||||||
|
else
|
||||||
|
cxt->sflags &= ~SF_REVERSE;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
/* delete character from search string. */
|
/* delete character from search string. */
|
||||||
@ -357,28 +433,24 @@ rl_search_history (direction, invoking_key)
|
|||||||
stack of search positions for the current search, with
|
stack of search positions for the current search, with
|
||||||
sentinels marking the beginning and end. But this will
|
sentinels marking the beginning and end. But this will
|
||||||
do until we have a real isearch-undo. */
|
do until we have a real isearch-undo. */
|
||||||
if (search_string_index == 0)
|
if (cxt->search_string_index == 0)
|
||||||
rl_ding ();
|
rl_ding ();
|
||||||
else
|
else
|
||||||
search_string[--search_string_index] = '\0';
|
cxt->search_string[--cxt->search_string_index] = '\0';
|
||||||
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case -4: /* C-G */
|
case -4: /* C-G, abort */
|
||||||
rl_replace_line (lines[orig_line], 0);
|
rl_replace_line (cxt->lines[cxt->save_line], 0);
|
||||||
rl_point = orig_point;
|
rl_point = cxt->save_point;
|
||||||
rl_mark = orig_mark;
|
rl_mark = cxt->save_mark;
|
||||||
rl_restore_prompt();
|
rl_restore_prompt();
|
||||||
rl_clear_message ();
|
rl_clear_message ();
|
||||||
if (allocated_line)
|
|
||||||
free (allocated_line);
|
return -1;
|
||||||
free (lines);
|
|
||||||
RL_UNSETSTATE(RL_STATE_ISEARCH);
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
case -5: /* C-W */
|
case -5: /* C-W */
|
||||||
/* skip over portion of line we already matched */
|
/* skip over portion of line we already matched and yank word */
|
||||||
wstart = rl_point + search_string_index;
|
wstart = rl_point + cxt->search_string_index;
|
||||||
if (wstart >= rl_end)
|
if (wstart >= rl_end)
|
||||||
{
|
{
|
||||||
rl_ding ();
|
rl_ding ();
|
||||||
@ -386,81 +458,87 @@ rl_search_history (direction, invoking_key)
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* if not in a word, move to one. */
|
/* if not in a word, move to one. */
|
||||||
if (rl_alphabetic(rl_line_buffer[wstart]) == 0)
|
cval = _rl_char_value (rl_line_buffer, wstart);
|
||||||
|
if (_rl_walphabetic (cval) == 0)
|
||||||
{
|
{
|
||||||
rl_ding ();
|
rl_ding ();
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
n = wstart;
|
n = MB_NEXTCHAR (rl_line_buffer, wstart, 1, MB_FIND_NONZERO);;
|
||||||
while (n < rl_end && rl_alphabetic(rl_line_buffer[n]))
|
while (n < rl_end)
|
||||||
n++;
|
|
||||||
wlen = n - wstart + 1;
|
|
||||||
if (search_string_index + wlen + 1 >= search_string_size)
|
|
||||||
{
|
{
|
||||||
search_string_size += wlen + 1;
|
cval = _rl_char_value (rl_line_buffer, n);
|
||||||
search_string = (char *)xrealloc (search_string, search_string_size);
|
if (_rl_walphabetic (cval) == 0)
|
||||||
|
break;
|
||||||
|
n = MB_NEXTCHAR (rl_line_buffer, n, 1, MB_FIND_NONZERO);;
|
||||||
|
}
|
||||||
|
wlen = n - wstart + 1;
|
||||||
|
if (cxt->search_string_index + wlen + 1 >= cxt->search_string_size)
|
||||||
|
{
|
||||||
|
cxt->search_string_size += wlen + 1;
|
||||||
|
cxt->search_string = (char *)xrealloc (cxt->search_string, cxt->search_string_size);
|
||||||
}
|
}
|
||||||
for (; wstart < n; wstart++)
|
for (; wstart < n; wstart++)
|
||||||
search_string[search_string_index++] = rl_line_buffer[wstart];
|
cxt->search_string[cxt->search_string_index++] = rl_line_buffer[wstart];
|
||||||
search_string[search_string_index] = '\0';
|
cxt->search_string[cxt->search_string_index] = '\0';
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case -6: /* C-Y */
|
case -6: /* C-Y */
|
||||||
/* skip over portion of line we already matched */
|
/* skip over portion of line we already matched and yank rest */
|
||||||
wstart = rl_point + search_string_index;
|
wstart = rl_point + cxt->search_string_index;
|
||||||
if (wstart >= rl_end)
|
if (wstart >= rl_end)
|
||||||
{
|
{
|
||||||
rl_ding ();
|
rl_ding ();
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
n = rl_end - wstart + 1;
|
n = rl_end - wstart + 1;
|
||||||
if (search_string_index + n + 1 >= search_string_size)
|
if (cxt->search_string_index + n + 1 >= cxt->search_string_size)
|
||||||
{
|
{
|
||||||
search_string_size += n + 1;
|
cxt->search_string_size += n + 1;
|
||||||
search_string = (char *)xrealloc (search_string, search_string_size);
|
cxt->search_string = (char *)xrealloc (cxt->search_string, cxt->search_string_size);
|
||||||
}
|
}
|
||||||
for (n = wstart; n < rl_end; n++)
|
for (n = wstart; n < rl_end; n++)
|
||||||
search_string[search_string_index++] = rl_line_buffer[n];
|
cxt->search_string[cxt->search_string_index++] = rl_line_buffer[n];
|
||||||
search_string[search_string_index] = '\0';
|
cxt->search_string[cxt->search_string_index] = '\0';
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
|
||||||
/* Add character to search string and continue search. */
|
/* Add character to search string and continue search. */
|
||||||
if (search_string_index + 2 >= search_string_size)
|
default:
|
||||||
|
if (cxt->search_string_index + 2 >= cxt->search_string_size)
|
||||||
{
|
{
|
||||||
search_string_size += 128;
|
cxt->search_string_size += 128;
|
||||||
search_string = (char *)xrealloc (search_string, search_string_size);
|
cxt->search_string = (char *)xrealloc (cxt->search_string, cxt->search_string_size);
|
||||||
}
|
}
|
||||||
#if defined (HANDLE_MULTIBYTE)
|
#if defined (HANDLE_MULTIBYTE)
|
||||||
if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
|
if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
|
||||||
{
|
{
|
||||||
int j, l;
|
int j, l;
|
||||||
for (j = 0, l = strlen (mb); j < l; )
|
for (j = 0, l = strlen (cxt->mb); j < l; )
|
||||||
search_string[search_string_index++] = mb[j++];
|
cxt->search_string[cxt->search_string_index++] = cxt->mb[j++];
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
#endif
|
#endif
|
||||||
search_string[search_string_index++] = c;
|
cxt->search_string[cxt->search_string_index++] = c;
|
||||||
search_string[search_string_index] = '\0';
|
cxt->search_string[cxt->search_string_index] = '\0';
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
for (found = failed = 0;;)
|
for (cxt->sflags &= ~(SF_FOUND|SF_FAILED);; )
|
||||||
{
|
{
|
||||||
int limit = sline_len - search_string_index + 1;
|
limit = cxt->sline_len - cxt->search_string_index + 1;
|
||||||
|
|
||||||
/* Search the current line. */
|
/* Search the current line. */
|
||||||
while (reverse ? (line_index >= 0) : (line_index < limit))
|
while ((cxt->sflags & SF_REVERSE) ? (cxt->sline_index >= 0) : (cxt->sline_index < limit))
|
||||||
{
|
{
|
||||||
if (STREQN (search_string, sline + line_index, search_string_index))
|
if (STREQN (cxt->search_string, cxt->sline + cxt->sline_index, cxt->search_string_index))
|
||||||
{
|
{
|
||||||
found++;
|
cxt->sflags |= SF_FOUND;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
line_index += direction;
|
cxt->sline_index += cxt->direction;
|
||||||
}
|
}
|
||||||
if (found)
|
if (cxt->sflags & SF_FOUND)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
/* Move to the next line, but skip new copies of the line
|
/* Move to the next line, but skip new copies of the line
|
||||||
@ -469,92 +547,120 @@ rl_search_history (direction, invoking_key)
|
|||||||
do
|
do
|
||||||
{
|
{
|
||||||
/* Move to the next line. */
|
/* Move to the next line. */
|
||||||
i += direction;
|
cxt->history_pos += cxt->direction;
|
||||||
|
|
||||||
/* At limit for direction? */
|
/* At limit for direction? */
|
||||||
if (reverse ? (i < 0) : (i == hlen))
|
if ((cxt->sflags & SF_REVERSE) ? (cxt->history_pos < 0) : (cxt->history_pos == cxt->hlen))
|
||||||
{
|
{
|
||||||
failed++;
|
cxt->sflags |= SF_FAILED;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* We will need these later. */
|
/* We will need these later. */
|
||||||
sline = lines[i];
|
cxt->sline = cxt->lines[cxt->history_pos];
|
||||||
sline_len = strlen (sline);
|
cxt->sline_len = strlen (cxt->sline);
|
||||||
}
|
}
|
||||||
while ((prev_line_found && STREQ (prev_line_found, lines[i])) ||
|
while ((cxt->prev_line_found && STREQ (cxt->prev_line_found, cxt->lines[cxt->history_pos])) ||
|
||||||
(search_string_index > sline_len));
|
(cxt->search_string_index > cxt->sline_len));
|
||||||
|
|
||||||
if (failed)
|
if (cxt->sflags & SF_FAILED)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
/* Now set up the line for searching... */
|
/* Now set up the line for searching... */
|
||||||
line_index = reverse ? sline_len - search_string_index : 0;
|
cxt->sline_index = (cxt->sflags & SF_REVERSE) ? cxt->sline_len - cxt->search_string_index : 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (failed)
|
if (cxt->sflags & SF_FAILED)
|
||||||
{
|
{
|
||||||
/* We cannot find the search string. Ding the bell. */
|
/* We cannot find the search string. Ding the bell. */
|
||||||
rl_ding ();
|
rl_ding ();
|
||||||
i = last_found_line;
|
cxt->history_pos = cxt->last_found_line;
|
||||||
continue; /* XXX - was break */
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* We have found the search string. Just display it. But don't
|
/* We have found the search string. Just display it. But don't
|
||||||
actually move there in the history list until the user accepts
|
actually move there in the history list until the user accepts
|
||||||
the location. */
|
the location. */
|
||||||
if (found)
|
if (cxt->sflags & SF_FOUND)
|
||||||
{
|
{
|
||||||
prev_line_found = lines[i];
|
cxt->prev_line_found = cxt->lines[cxt->history_pos];
|
||||||
rl_replace_line (lines[i], 0);
|
rl_replace_line (cxt->lines[cxt->history_pos], 0);
|
||||||
rl_point = line_index;
|
rl_point = cxt->sline_index;
|
||||||
last_found_line = i;
|
cxt->last_found_line = cxt->history_pos;
|
||||||
rl_display_search (search_string, reverse, (i == orig_line) ? -1 : i);
|
rl_display_search (cxt->search_string, (cxt->sflags & SF_REVERSE), (cxt->history_pos == cxt->save_line) ? -1 : cxt->history_pos);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
static int
|
||||||
|
_rl_isearch_cleanup (cxt, r)
|
||||||
|
_rl_search_cxt *cxt;
|
||||||
|
int r;
|
||||||
|
{
|
||||||
|
if (r >= 0)
|
||||||
|
_rl_isearch_fini (cxt);
|
||||||
|
_rl_scxt_dispose (cxt, 0);
|
||||||
|
_rl_iscxt = 0;
|
||||||
|
|
||||||
|
RL_UNSETSTATE(RL_STATE_ISEARCH);
|
||||||
|
|
||||||
|
return (r != 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Search through the history looking for an interactively typed string.
|
||||||
|
This is analogous to i-search. We start the search in the current line.
|
||||||
|
DIRECTION is which direction to search; >= 0 means forward, < 0 means
|
||||||
|
backwards. */
|
||||||
|
static int
|
||||||
|
rl_search_history (direction, invoking_key)
|
||||||
|
int direction, invoking_key;
|
||||||
|
{
|
||||||
|
_rl_search_cxt *cxt; /* local for now, but saved globally */
|
||||||
|
int c, r;
|
||||||
|
|
||||||
|
RL_SETSTATE(RL_STATE_ISEARCH);
|
||||||
|
cxt = _rl_isearch_init (direction);
|
||||||
|
|
||||||
|
rl_display_search (cxt->search_string, (cxt->sflags & SF_REVERSE), -1);
|
||||||
|
|
||||||
|
/* If we are using the callback interface, all we do is set up here and
|
||||||
|
return. The key is that we leave RL_STATE_ISEARCH set. */
|
||||||
|
if (RL_ISSTATE (RL_STATE_CALLBACK))
|
||||||
|
return (0);
|
||||||
|
|
||||||
|
r = -1;
|
||||||
|
for (;;)
|
||||||
|
{
|
||||||
|
c = _rl_search_getchar (cxt);
|
||||||
|
/* We might want to handle EOF here (c == 0) */
|
||||||
|
r = _rl_isearch_dispatch (cxt, cxt->lastc);
|
||||||
|
if (r <= 0)
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* The searching is over. The user may have found the string that she
|
/* The searching is over. The user may have found the string that she
|
||||||
was looking for, or else she may have exited a failing search. If
|
was looking for, or else she may have exited a failing search. If
|
||||||
LINE_INDEX is -1, then that shows that the string searched for was
|
LINE_INDEX is -1, then that shows that the string searched for was
|
||||||
not found. We use this to determine where to place rl_point. */
|
not found. We use this to determine where to place rl_point. */
|
||||||
|
return (_rl_isearch_cleanup (cxt, r));
|
||||||
|
}
|
||||||
|
|
||||||
/* First put back the original state. */
|
#if defined (READLINE_CALLBACKS)
|
||||||
strcpy (rl_line_buffer, lines[orig_line]);
|
/* Called from the callback functions when we are ready to read a key. The
|
||||||
|
callback functions know to call this because RL_ISSTATE(RL_STATE_ISEARCH).
|
||||||
rl_restore_prompt ();
|
If _rl_isearch_dispatch finishes searching, this function is responsible
|
||||||
|
for turning off RL_STATE_ISEARCH, which it does using _rl_isearch_cleanup. */
|
||||||
/* Save the search string for possible later use. */
|
int
|
||||||
FREE (last_isearch_string);
|
_rl_isearch_callback (cxt)
|
||||||
last_isearch_string = search_string;
|
_rl_search_cxt *cxt;
|
||||||
last_isearch_string_len = search_string_index;
|
|
||||||
|
|
||||||
if (last_found_line < orig_line)
|
|
||||||
rl_get_previous_history (orig_line - last_found_line, 0);
|
|
||||||
else
|
|
||||||
rl_get_next_history (last_found_line - orig_line, 0);
|
|
||||||
|
|
||||||
/* If the string was not found, put point at the end of the last matching
|
|
||||||
line. If last_found_line == orig_line, we didn't find any matching
|
|
||||||
history lines at all, so put point back in its original position. */
|
|
||||||
if (line_index < 0)
|
|
||||||
{
|
{
|
||||||
if (last_found_line == orig_line)
|
int c, r;
|
||||||
line_index = orig_point;
|
|
||||||
else
|
c = _rl_search_getchar (cxt);
|
||||||
line_index = strlen (rl_line_buffer);
|
/* We might want to handle EOF here */
|
||||||
rl_mark = orig_mark;
|
r = _rl_isearch_dispatch (cxt, cxt->lastc);
|
||||||
}
|
|
||||||
|
return (r <= 0) ? _rl_isearch_cleanup (cxt, r) : 0;
|
||||||
rl_point = line_index;
|
|
||||||
/* Don't worry about where to put the mark here; rl_get_previous_history
|
|
||||||
and rl_get_next_history take care of it. */
|
|
||||||
|
|
||||||
rl_clear_message ();
|
|
||||||
|
|
||||||
FREE (allocated_line);
|
|
||||||
free (lines);
|
|
||||||
|
|
||||||
RL_UNSETSTATE(RL_STATE_ISEARCH);
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
@ -100,6 +100,8 @@ _rl_with_macro_input (string)
|
|||||||
int
|
int
|
||||||
_rl_next_macro_key ()
|
_rl_next_macro_key ()
|
||||||
{
|
{
|
||||||
|
int c;
|
||||||
|
|
||||||
if (rl_executing_macro == 0)
|
if (rl_executing_macro == 0)
|
||||||
return (0);
|
return (0);
|
||||||
|
|
||||||
@ -109,7 +111,14 @@ _rl_next_macro_key ()
|
|||||||
return (_rl_next_macro_key ());
|
return (_rl_next_macro_key ());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if defined (READLINE_CALLBACKS)
|
||||||
|
c = rl_executing_macro[executing_macro_index++];
|
||||||
|
if (RL_ISSTATE (RL_STATE_CALLBACK) && RL_ISSTATE (RL_STATE_READCMD) && rl_executing_macro[executing_macro_index] == 0)
|
||||||
|
_rl_pop_executing_macro ();
|
||||||
|
return c;
|
||||||
|
#else
|
||||||
return (rl_executing_macro[executing_macro_index++]);
|
return (rl_executing_macro[executing_macro_index++]);
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Save the currently executing macro on a stack of saved macros. */
|
/* Save the currently executing macro on a stack of saved macros. */
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/* mbutil.c -- readline multibyte character utility functions */
|
/* mbutil.c -- readline multibyte character utility functions */
|
||||||
|
|
||||||
/* Copyright (C) 2001-2004 Free Software Foundation, Inc.
|
/* Copyright (C) 2001-2005 Free Software Foundation, Inc.
|
||||||
|
|
||||||
This file is part of the GNU Readline Library, a library for
|
This file is part of the GNU Readline Library, a library for
|
||||||
reading lines of text with interactive input and history editing.
|
reading lines of text with interactive input and history editing.
|
||||||
@ -77,11 +77,13 @@ _rl_find_next_mbchar_internal (string, seed, count, find_non_zero)
|
|||||||
char *string;
|
char *string;
|
||||||
int seed, count, find_non_zero;
|
int seed, count, find_non_zero;
|
||||||
{
|
{
|
||||||
size_t tmp = 0;
|
size_t tmp;
|
||||||
mbstate_t ps;
|
mbstate_t ps;
|
||||||
int point = 0;
|
int point;
|
||||||
wchar_t wc;
|
wchar_t wc;
|
||||||
|
|
||||||
|
tmp = 0;
|
||||||
|
|
||||||
memset(&ps, 0, sizeof (mbstate_t));
|
memset(&ps, 0, sizeof (mbstate_t));
|
||||||
if (seed < 0)
|
if (seed < 0)
|
||||||
seed = 0;
|
seed = 0;
|
||||||
@ -134,6 +136,7 @@ _rl_find_next_mbchar_internal (string, seed, count, find_non_zero)
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return point;
|
return point;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -313,6 +316,28 @@ _rl_is_mbchar_matched (string, seed, end, mbchar, length)
|
|||||||
return 0;
|
return 0;
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
wchar_t
|
||||||
|
_rl_char_value (buf, ind)
|
||||||
|
char *buf;
|
||||||
|
int ind;
|
||||||
|
{
|
||||||
|
size_t tmp;
|
||||||
|
wchar_t wc;
|
||||||
|
mbstate_t ps;
|
||||||
|
int l;
|
||||||
|
|
||||||
|
if (MB_LEN_MAX == 1 || rl_byte_oriented)
|
||||||
|
return ((wchar_t) buf[ind]);
|
||||||
|
l = strlen (buf);
|
||||||
|
if (ind >= l - 1)
|
||||||
|
return ((wchar_t) buf[ind]);
|
||||||
|
memset (&ps, 0, sizeof (mbstate_t));
|
||||||
|
tmp = mbrtowc (&wc, buf + ind, l - ind, &ps);
|
||||||
|
if (MB_INVALIDCH (tmp) || MB_NULLWCH (tmp))
|
||||||
|
return ((wchar_t) buf[ind]);
|
||||||
|
return wc;
|
||||||
|
}
|
||||||
#endif /* HANDLE_MULTIBYTE */
|
#endif /* HANDLE_MULTIBYTE */
|
||||||
|
|
||||||
/* Find next `count' characters started byte point of the specified seed.
|
/* Find next `count' characters started byte point of the specified seed.
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/* misc.c -- miscellaneous bindable readline functions. */
|
/* misc.c -- miscellaneous bindable readline functions. */
|
||||||
|
|
||||||
/* Copyright (C) 1987-2004 Free Software Foundation, Inc.
|
/* Copyright (C) 1987-2005 Free Software Foundation, Inc.
|
||||||
|
|
||||||
This file is part of the GNU Readline Library, a library for
|
This file is part of the GNU Readline Library, a library for
|
||||||
reading lines of text with interactive input and history editing.
|
reading lines of text with interactive input and history editing.
|
||||||
@ -63,6 +63,8 @@ void _rl_free_history_entry PARAMS((HIST_ENTRY *));
|
|||||||
to preserve the value of rl_point from line to line. */
|
to preserve the value of rl_point from line to line. */
|
||||||
int _rl_history_preserve_point = 0;
|
int _rl_history_preserve_point = 0;
|
||||||
|
|
||||||
|
_rl_arg_cxt _rl_argcxt;
|
||||||
|
|
||||||
/* Saved target point for when _rl_history_preserve_point is set. Special
|
/* Saved target point for when _rl_history_preserve_point is set. Special
|
||||||
value of -1 means that point is at the end of the line. */
|
value of -1 means that point is at the end of the line. */
|
||||||
int _rl_history_saved_point = -1;
|
int _rl_history_saved_point = -1;
|
||||||
@ -73,47 +75,68 @@ int _rl_history_saved_point = -1;
|
|||||||
/* */
|
/* */
|
||||||
/* **************************************************************** */
|
/* **************************************************************** */
|
||||||
|
|
||||||
/* Handle C-u style numeric args, as well as M--, and M-digits. */
|
int
|
||||||
static int
|
_rl_arg_overflow ()
|
||||||
rl_digit_loop ()
|
|
||||||
{
|
|
||||||
int key, c, sawminus, sawdigits;
|
|
||||||
|
|
||||||
rl_save_prompt ();
|
|
||||||
|
|
||||||
RL_SETSTATE(RL_STATE_NUMERICARG);
|
|
||||||
sawminus = sawdigits = 0;
|
|
||||||
while (1)
|
|
||||||
{
|
{
|
||||||
if (rl_numeric_arg > 1000000)
|
if (rl_numeric_arg > 1000000)
|
||||||
{
|
{
|
||||||
sawdigits = rl_explicit_arg = rl_numeric_arg = 0;
|
_rl_argcxt = 0;
|
||||||
|
rl_explicit_arg = rl_numeric_arg = 0;
|
||||||
rl_ding ();
|
rl_ding ();
|
||||||
rl_restore_prompt ();
|
rl_restore_prompt ();
|
||||||
rl_clear_message ();
|
rl_clear_message ();
|
||||||
RL_UNSETSTATE(RL_STATE_NUMERICARG);
|
RL_UNSETSTATE(RL_STATE_NUMERICARG);
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
_rl_arg_init ()
|
||||||
|
{
|
||||||
|
rl_save_prompt ();
|
||||||
|
_rl_argcxt = 0;
|
||||||
|
RL_SETSTATE(RL_STATE_NUMERICARG);
|
||||||
|
}
|
||||||
|
|
||||||
|
int
|
||||||
|
_rl_arg_getchar ()
|
||||||
|
{
|
||||||
|
int c;
|
||||||
|
|
||||||
rl_message ("(arg: %d) ", rl_arg_sign * rl_numeric_arg);
|
rl_message ("(arg: %d) ", rl_arg_sign * rl_numeric_arg);
|
||||||
RL_SETSTATE(RL_STATE_MOREINPUT);
|
RL_SETSTATE(RL_STATE_MOREINPUT);
|
||||||
key = c = rl_read_key ();
|
c = rl_read_key ();
|
||||||
RL_UNSETSTATE(RL_STATE_MOREINPUT);
|
RL_UNSETSTATE(RL_STATE_MOREINPUT);
|
||||||
|
|
||||||
if (c < 0)
|
return c;
|
||||||
{
|
|
||||||
_rl_abort_internal ();
|
|
||||||
return -1;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Process C as part of the current numeric argument. Return -1 if the
|
||||||
|
argument should be aborted, 0 if we should not read any more chars, and
|
||||||
|
1 if we should continue to read chars. */
|
||||||
|
int
|
||||||
|
_rl_arg_dispatch (cxt, c)
|
||||||
|
_rl_arg_cxt cxt;
|
||||||
|
int c;
|
||||||
|
{
|
||||||
|
int key, r;
|
||||||
|
|
||||||
|
key = c;
|
||||||
|
|
||||||
/* If we see a key bound to `universal-argument' after seeing digits,
|
/* If we see a key bound to `universal-argument' after seeing digits,
|
||||||
it ends the argument but is otherwise ignored. */
|
it ends the argument but is otherwise ignored. */
|
||||||
if (_rl_keymap[c].type == ISFUNC &&
|
if (_rl_keymap[c].type == ISFUNC && _rl_keymap[c].function == rl_universal_argument)
|
||||||
_rl_keymap[c].function == rl_universal_argument)
|
|
||||||
{
|
{
|
||||||
if (sawdigits == 0)
|
if ((cxt & NUM_SAWDIGITS) == 0)
|
||||||
{
|
{
|
||||||
rl_numeric_arg *= 4;
|
rl_numeric_arg *= 4;
|
||||||
continue;
|
return 1;
|
||||||
|
}
|
||||||
|
else if (RL_ISSTATE (RL_STATE_CALLBACK))
|
||||||
|
{
|
||||||
|
_rl_argcxt |= NUM_READONE;
|
||||||
|
return 0; /* XXX */
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@ -131,55 +154,92 @@ rl_digit_loop ()
|
|||||||
|
|
||||||
if (_rl_digit_p (c))
|
if (_rl_digit_p (c))
|
||||||
{
|
{
|
||||||
rl_numeric_arg = rl_explicit_arg ? (rl_numeric_arg * 10) + c - '0' : c - '0';
|
r = _rl_digit_value (c);
|
||||||
sawdigits = rl_explicit_arg = 1;
|
rl_numeric_arg = rl_explicit_arg ? (rl_numeric_arg * 10) + r : r;
|
||||||
|
rl_explicit_arg = 1;
|
||||||
|
_rl_argcxt |= NUM_SAWDIGITS;
|
||||||
}
|
}
|
||||||
else if (c == '-' && rl_explicit_arg == 0)
|
else if (c == '-' && rl_explicit_arg == 0)
|
||||||
{
|
{
|
||||||
rl_numeric_arg = sawminus = 1;
|
rl_numeric_arg = 1;
|
||||||
|
_rl_argcxt |= NUM_SAWMINUS;
|
||||||
rl_arg_sign = -1;
|
rl_arg_sign = -1;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
/* Make M-- command equivalent to M--1 command. */
|
/* Make M-- command equivalent to M--1 command. */
|
||||||
if (sawminus && rl_numeric_arg == 1 && rl_explicit_arg == 0)
|
if ((_rl_argcxt & NUM_SAWMINUS) && rl_numeric_arg == 1 && rl_explicit_arg == 0)
|
||||||
rl_explicit_arg = 1;
|
rl_explicit_arg = 1;
|
||||||
rl_restore_prompt ();
|
rl_restore_prompt ();
|
||||||
rl_clear_message ();
|
rl_clear_message ();
|
||||||
RL_UNSETSTATE(RL_STATE_NUMERICARG);
|
RL_UNSETSTATE(RL_STATE_NUMERICARG);
|
||||||
return (_rl_dispatch (key, _rl_keymap));
|
|
||||||
|
r = _rl_dispatch (key, _rl_keymap);
|
||||||
|
if (RL_ISSTATE (RL_STATE_CALLBACK))
|
||||||
|
{
|
||||||
|
/* At worst, this will cause an extra redisplay. Otherwise,
|
||||||
|
we have to wait until the next character comes in. */
|
||||||
|
if (rl_done == 0)
|
||||||
|
(*rl_redisplay_function) ();
|
||||||
|
r = 0;
|
||||||
|
}
|
||||||
|
return r;
|
||||||
|
}
|
||||||
|
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Handle C-u style numeric args, as well as M--, and M-digits. */
|
||||||
|
static int
|
||||||
|
rl_digit_loop ()
|
||||||
|
{
|
||||||
|
int c, r;
|
||||||
|
|
||||||
|
while (1)
|
||||||
|
{
|
||||||
|
if (_rl_arg_overflow ())
|
||||||
|
return 1;
|
||||||
|
|
||||||
|
c = _rl_arg_getchar ();
|
||||||
|
|
||||||
|
if (c < 0)
|
||||||
|
{
|
||||||
|
_rl_abort_internal ();
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
r = _rl_arg_dispatch (_rl_argcxt, c);
|
||||||
|
if (r <= 0 || (RL_ISSTATE (RL_STATE_NUMERICARG) == 0))
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/*NOTREACHED*/
|
/* Create a default argument. */
|
||||||
|
void
|
||||||
|
_rl_reset_argument ()
|
||||||
|
{
|
||||||
|
rl_numeric_arg = rl_arg_sign = 1;
|
||||||
|
rl_explicit_arg = 0;
|
||||||
|
_rl_argcxt = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Add the current digit to the argument in progress. */
|
/* Start a numeric argument with initial value KEY */
|
||||||
int
|
int
|
||||||
rl_digit_argument (ignore, key)
|
rl_digit_argument (ignore, key)
|
||||||
int ignore, key;
|
int ignore, key;
|
||||||
|
{
|
||||||
|
_rl_arg_init ();
|
||||||
|
if (RL_ISSTATE (RL_STATE_CALLBACK))
|
||||||
|
{
|
||||||
|
_rl_arg_dispatch (_rl_argcxt, key);
|
||||||
|
rl_message ("(arg: %d) ", rl_arg_sign * rl_numeric_arg);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
else
|
||||||
{
|
{
|
||||||
rl_execute_next (key);
|
rl_execute_next (key);
|
||||||
return (rl_digit_loop ());
|
return (rl_digit_loop ());
|
||||||
}
|
}
|
||||||
|
|
||||||
/* What to do when you abort reading an argument. */
|
|
||||||
int
|
|
||||||
rl_discard_argument ()
|
|
||||||
{
|
|
||||||
rl_ding ();
|
|
||||||
rl_clear_message ();
|
|
||||||
_rl_init_argument ();
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Create a default argument. */
|
|
||||||
int
|
|
||||||
_rl_init_argument ()
|
|
||||||
{
|
|
||||||
rl_numeric_arg = rl_arg_sign = 1;
|
|
||||||
rl_explicit_arg = 0;
|
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* C-u, universal argument. Multiply the current argument by 4.
|
/* C-u, universal argument. Multiply the current argument by 4.
|
||||||
@ -189,8 +249,43 @@ int
|
|||||||
rl_universal_argument (count, key)
|
rl_universal_argument (count, key)
|
||||||
int count, key;
|
int count, key;
|
||||||
{
|
{
|
||||||
|
_rl_arg_init ();
|
||||||
rl_numeric_arg *= 4;
|
rl_numeric_arg *= 4;
|
||||||
return (rl_digit_loop ());
|
|
||||||
|
return (RL_ISSTATE (RL_STATE_CALLBACK) ? 0 : rl_digit_loop ());
|
||||||
|
}
|
||||||
|
|
||||||
|
int
|
||||||
|
_rl_arg_callback (cxt)
|
||||||
|
_rl_arg_cxt cxt;
|
||||||
|
{
|
||||||
|
int c, r;
|
||||||
|
|
||||||
|
c = _rl_arg_getchar ();
|
||||||
|
|
||||||
|
if (_rl_argcxt & NUM_READONE)
|
||||||
|
{
|
||||||
|
_rl_argcxt &= ~NUM_READONE;
|
||||||
|
rl_restore_prompt ();
|
||||||
|
rl_clear_message ();
|
||||||
|
RL_UNSETSTATE(RL_STATE_NUMERICARG);
|
||||||
|
rl_execute_next (c);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
r = _rl_arg_dispatch (cxt, c);
|
||||||
|
return (r != 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* What to do when you abort reading an argument. */
|
||||||
|
int
|
||||||
|
rl_discard_argument ()
|
||||||
|
{
|
||||||
|
rl_ding ();
|
||||||
|
rl_clear_message ();
|
||||||
|
_rl_reset_argument ();
|
||||||
|
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* **************************************************************** */
|
/* **************************************************************** */
|
||||||
@ -225,8 +320,10 @@ _rl_free_history_entry (entry)
|
|||||||
{
|
{
|
||||||
if (entry == 0)
|
if (entry == 0)
|
||||||
return;
|
return;
|
||||||
if (entry->line)
|
|
||||||
free (entry->line);
|
FREE (entry->line);
|
||||||
|
FREE (entry->timestamp);
|
||||||
|
|
||||||
free (entry);
|
free (entry);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -242,6 +339,7 @@ rl_maybe_replace_line ()
|
|||||||
{
|
{
|
||||||
temp = replace_history_entry (where_history (), rl_line_buffer, (histdata_t)rl_undo_list);
|
temp = replace_history_entry (where_history (), rl_line_buffer, (histdata_t)rl_undo_list);
|
||||||
free (temp->line);
|
free (temp->line);
|
||||||
|
FREE (temp->timestamp);
|
||||||
free (temp);
|
free (temp);
|
||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
@ -274,6 +372,7 @@ rl_maybe_save_line ()
|
|||||||
{
|
{
|
||||||
_rl_saved_line_for_history = (HIST_ENTRY *)xmalloc (sizeof (HIST_ENTRY));
|
_rl_saved_line_for_history = (HIST_ENTRY *)xmalloc (sizeof (HIST_ENTRY));
|
||||||
_rl_saved_line_for_history->line = savestring (rl_line_buffer);
|
_rl_saved_line_for_history->line = savestring (rl_line_buffer);
|
||||||
|
_rl_saved_line_for_history->timestamp = (char *)NULL;
|
||||||
_rl_saved_line_for_history->data = (char *)rl_undo_list;
|
_rl_saved_line_for_history->data = (char *)rl_undo_list;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/* readline.c -- a general facility for reading lines of input
|
/* readline.c -- a general facility for reading lines of input
|
||||||
with emacs style editing and completion. */
|
with emacs style editing and completion. */
|
||||||
|
|
||||||
/* Copyright (C) 1987-2002 Free Software Foundation, Inc.
|
/* Copyright (C) 1987-2005 Free Software Foundation, Inc.
|
||||||
|
|
||||||
This file is part of the GNU Readline Library, a library for
|
This file is part of the GNU Readline Library, a library for
|
||||||
reading lines of text with interactive input and history editing.
|
reading lines of text with interactive input and history editing.
|
||||||
@ -68,11 +68,11 @@
|
|||||||
#include "xmalloc.h"
|
#include "xmalloc.h"
|
||||||
|
|
||||||
#ifndef RL_LIBRARY_VERSION
|
#ifndef RL_LIBRARY_VERSION
|
||||||
# define RL_LIBRARY_VERSION "5.0"
|
# define RL_LIBRARY_VERSION "5.1"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef RL_READLINE_VERSION
|
#ifndef RL_READLINE_VERSION
|
||||||
# define RL_READLINE_VERSION 0x0500
|
# define RL_READLINE_VERSION 0x0501
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
extern void _rl_free_history_entry PARAMS((HIST_ENTRY *));
|
extern void _rl_free_history_entry PARAMS((HIST_ENTRY *));
|
||||||
@ -87,6 +87,9 @@ static void bind_arrow_keys PARAMS((void));
|
|||||||
static void readline_default_bindings PARAMS((void));
|
static void readline_default_bindings PARAMS((void));
|
||||||
static void reset_default_bindings PARAMS((void));
|
static void reset_default_bindings PARAMS((void));
|
||||||
|
|
||||||
|
static int _rl_subseq_result PARAMS((int, Keymap, int, int));
|
||||||
|
static int _rl_subseq_getchar PARAMS((int));
|
||||||
|
|
||||||
/* **************************************************************** */
|
/* **************************************************************** */
|
||||||
/* */
|
/* */
|
||||||
/* Line editing input utility */
|
/* Line editing input utility */
|
||||||
@ -104,6 +107,7 @@ int rl_gnu_readline_p = 1;
|
|||||||
By default, it is the standard emacs keymap. */
|
By default, it is the standard emacs keymap. */
|
||||||
Keymap _rl_keymap = emacs_standard_keymap;
|
Keymap _rl_keymap = emacs_standard_keymap;
|
||||||
|
|
||||||
|
|
||||||
/* The current style of editing. */
|
/* The current style of editing. */
|
||||||
int rl_editing_mode = emacs_mode;
|
int rl_editing_mode = emacs_mode;
|
||||||
|
|
||||||
@ -219,6 +223,9 @@ char *_rl_comment_begin;
|
|||||||
/* Keymap holding the function currently being executed. */
|
/* Keymap holding the function currently being executed. */
|
||||||
Keymap rl_executing_keymap;
|
Keymap rl_executing_keymap;
|
||||||
|
|
||||||
|
/* Keymap we're currently using to dispatch. */
|
||||||
|
Keymap _rl_dispatching_keymap;
|
||||||
|
|
||||||
/* Non-zero means to erase entire line, including prompt, on empty input lines. */
|
/* Non-zero means to erase entire line, including prompt, on empty input lines. */
|
||||||
int rl_erase_empty_line = 0;
|
int rl_erase_empty_line = 0;
|
||||||
|
|
||||||
@ -230,6 +237,9 @@ int rl_num_chars_to_read;
|
|||||||
char *rl_line_buffer = (char *)NULL;
|
char *rl_line_buffer = (char *)NULL;
|
||||||
int rl_line_buffer_len = 0;
|
int rl_line_buffer_len = 0;
|
||||||
|
|
||||||
|
/* Key sequence `contexts' */
|
||||||
|
_rl_keyseq_cxt *_rl_kscxt = 0;
|
||||||
|
|
||||||
/* Forward declarations used by the display, termcap, and history code. */
|
/* Forward declarations used by the display, termcap, and history code. */
|
||||||
|
|
||||||
/* **************************************************************** */
|
/* **************************************************************** */
|
||||||
@ -251,6 +261,10 @@ int _rl_convert_meta_chars_to_ascii = 1;
|
|||||||
rather than as a meta-prefixed escape sequence. */
|
rather than as a meta-prefixed escape sequence. */
|
||||||
int _rl_output_meta_chars = 0;
|
int _rl_output_meta_chars = 0;
|
||||||
|
|
||||||
|
/* Non-zero means to look at the termios special characters and bind
|
||||||
|
them to equivalent readline functions at startup. */
|
||||||
|
int _rl_bind_stty_chars = 1;
|
||||||
|
|
||||||
/* **************************************************************** */
|
/* **************************************************************** */
|
||||||
/* */
|
/* */
|
||||||
/* Top Level Functions */
|
/* Top Level Functions */
|
||||||
@ -291,6 +305,7 @@ readline (prompt)
|
|||||||
rl_set_prompt (prompt);
|
rl_set_prompt (prompt);
|
||||||
|
|
||||||
rl_initialize ();
|
rl_initialize ();
|
||||||
|
if (rl_prep_term_function)
|
||||||
(*rl_prep_term_function) (_rl_meta_flag);
|
(*rl_prep_term_function) (_rl_meta_flag);
|
||||||
|
|
||||||
#if defined (HANDLE_SIGNALS)
|
#if defined (HANDLE_SIGNALS)
|
||||||
@ -298,6 +313,7 @@ readline (prompt)
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
value = readline_internal ();
|
value = readline_internal ();
|
||||||
|
if (rl_deprep_term_function)
|
||||||
(*rl_deprep_term_function) ();
|
(*rl_deprep_term_function) ();
|
||||||
|
|
||||||
#if defined (HANDLE_SIGNALS)
|
#if defined (HANDLE_SIGNALS)
|
||||||
@ -388,6 +404,36 @@ readline_internal_teardown (eof)
|
|||||||
return (eof ? (char *)NULL : savestring (the_line));
|
return (eof ? (char *)NULL : savestring (the_line));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
_rl_internal_char_cleanup ()
|
||||||
|
{
|
||||||
|
#if defined (VI_MODE)
|
||||||
|
/* In vi mode, when you exit insert mode, the cursor moves back
|
||||||
|
over the previous character. We explicitly check for that here. */
|
||||||
|
if (rl_editing_mode == vi_mode && _rl_keymap == vi_movement_keymap)
|
||||||
|
rl_vi_check ();
|
||||||
|
#endif /* VI_MODE */
|
||||||
|
|
||||||
|
if (rl_num_chars_to_read && rl_end >= rl_num_chars_to_read)
|
||||||
|
{
|
||||||
|
(*rl_redisplay_function) ();
|
||||||
|
_rl_want_redisplay = 0;
|
||||||
|
rl_newline (1, '\n');
|
||||||
|
}
|
||||||
|
|
||||||
|
if (rl_done == 0)
|
||||||
|
{
|
||||||
|
(*rl_redisplay_function) ();
|
||||||
|
_rl_want_redisplay = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* If the application writer has told us to erase the entire line if
|
||||||
|
the only character typed was something bound to rl_newline, do so. */
|
||||||
|
if (rl_erase_empty_line && rl_done && rl_last_func == rl_newline &&
|
||||||
|
rl_point == 0 && rl_end == 0)
|
||||||
|
_rl_erase_entire_line ();
|
||||||
|
}
|
||||||
|
|
||||||
STATIC_CALLBACK int
|
STATIC_CALLBACK int
|
||||||
#if defined (READLINE_CALLBACKS)
|
#if defined (READLINE_CALLBACKS)
|
||||||
readline_internal_char ()
|
readline_internal_char ()
|
||||||
@ -410,12 +456,21 @@ readline_internal_charloop ()
|
|||||||
code = setjmp (readline_top_level);
|
code = setjmp (readline_top_level);
|
||||||
|
|
||||||
if (code)
|
if (code)
|
||||||
|
{
|
||||||
(*rl_redisplay_function) ();
|
(*rl_redisplay_function) ();
|
||||||
|
_rl_want_redisplay = 0;
|
||||||
|
/* If we get here, we're not being called from something dispatched
|
||||||
|
from _rl_callback_read_char(), which sets up its own value of
|
||||||
|
readline_top_level (saving and restoring the old, of course), so
|
||||||
|
we can just return here. */
|
||||||
|
if (RL_ISSTATE (RL_STATE_CALLBACK))
|
||||||
|
return (0);
|
||||||
|
}
|
||||||
|
|
||||||
if (rl_pending_input == 0)
|
if (rl_pending_input == 0)
|
||||||
{
|
{
|
||||||
/* Then initialize the argument and number of keys read. */
|
/* Then initialize the argument and number of keys read. */
|
||||||
_rl_init_argument ();
|
_rl_reset_argument ();
|
||||||
rl_key_sequence_length = 0;
|
rl_key_sequence_length = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -449,27 +504,7 @@ readline_internal_charloop ()
|
|||||||
if (rl_pending_input == 0 && lk == _rl_last_command_was_kill)
|
if (rl_pending_input == 0 && lk == _rl_last_command_was_kill)
|
||||||
_rl_last_command_was_kill = 0;
|
_rl_last_command_was_kill = 0;
|
||||||
|
|
||||||
#if defined (VI_MODE)
|
_rl_internal_char_cleanup ();
|
||||||
/* In vi mode, when you exit insert mode, the cursor moves back
|
|
||||||
over the previous character. We explicitly check for that here. */
|
|
||||||
if (rl_editing_mode == vi_mode && _rl_keymap == vi_movement_keymap)
|
|
||||||
rl_vi_check ();
|
|
||||||
#endif /* VI_MODE */
|
|
||||||
|
|
||||||
if (rl_num_chars_to_read && rl_end >= rl_num_chars_to_read)
|
|
||||||
{
|
|
||||||
(*rl_redisplay_function) ();
|
|
||||||
rl_newline (1, '\n');
|
|
||||||
}
|
|
||||||
|
|
||||||
if (rl_done == 0)
|
|
||||||
(*rl_redisplay_function) ();
|
|
||||||
|
|
||||||
/* If the application writer has told us to erase the entire line if
|
|
||||||
the only character typed was something bound to rl_newline, do so. */
|
|
||||||
if (rl_erase_empty_line && rl_done && rl_last_func == rl_newline &&
|
|
||||||
rl_point == 0 && rl_end == 0)
|
|
||||||
_rl_erase_entire_line ();
|
|
||||||
|
|
||||||
#if defined (READLINE_CALLBACKS)
|
#if defined (READLINE_CALLBACKS)
|
||||||
return 0;
|
return 0;
|
||||||
@ -519,6 +554,107 @@ _rl_set_the_line ()
|
|||||||
the_line = rl_line_buffer;
|
the_line = rl_line_buffer;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if defined (READLINE_CALLBACKS)
|
||||||
|
_rl_keyseq_cxt *
|
||||||
|
_rl_keyseq_cxt_alloc ()
|
||||||
|
{
|
||||||
|
_rl_keyseq_cxt *cxt;
|
||||||
|
|
||||||
|
cxt = (_rl_keyseq_cxt *)xmalloc (sizeof (_rl_keyseq_cxt));
|
||||||
|
|
||||||
|
cxt->flags = cxt->subseq_arg = cxt->subseq_retval = 0;
|
||||||
|
|
||||||
|
cxt->okey = 0;
|
||||||
|
cxt->ocxt = _rl_kscxt;
|
||||||
|
cxt->childval = 42; /* sentinel value */
|
||||||
|
|
||||||
|
return cxt;
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
_rl_keyseq_cxt_dispose (cxt)
|
||||||
|
_rl_keyseq_cxt *cxt;
|
||||||
|
{
|
||||||
|
free (cxt);
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
_rl_keyseq_chain_dispose ()
|
||||||
|
{
|
||||||
|
_rl_keyseq_cxt *cxt;
|
||||||
|
|
||||||
|
while (_rl_kscxt)
|
||||||
|
{
|
||||||
|
cxt = _rl_kscxt;
|
||||||
|
_rl_kscxt = _rl_kscxt->ocxt;
|
||||||
|
_rl_keyseq_cxt_dispose (cxt);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
static int
|
||||||
|
_rl_subseq_getchar (key)
|
||||||
|
int key;
|
||||||
|
{
|
||||||
|
int k;
|
||||||
|
|
||||||
|
if (key == ESC)
|
||||||
|
RL_SETSTATE(RL_STATE_METANEXT);
|
||||||
|
RL_SETSTATE(RL_STATE_MOREINPUT);
|
||||||
|
k = rl_read_key ();
|
||||||
|
RL_UNSETSTATE(RL_STATE_MOREINPUT);
|
||||||
|
if (key == ESC)
|
||||||
|
RL_UNSETSTATE(RL_STATE_METANEXT);
|
||||||
|
|
||||||
|
return k;
|
||||||
|
}
|
||||||
|
|
||||||
|
#if defined (READLINE_CALLBACKS)
|
||||||
|
int
|
||||||
|
_rl_dispatch_callback (cxt)
|
||||||
|
_rl_keyseq_cxt *cxt;
|
||||||
|
{
|
||||||
|
int nkey, r;
|
||||||
|
|
||||||
|
/* For now */
|
||||||
|
#if 1
|
||||||
|
/* The first time this context is used, we want to read input and dispatch
|
||||||
|
on it. When traversing the chain of contexts back `up', we want to use
|
||||||
|
the value from the next context down. We're simulating recursion using
|
||||||
|
a chain of contexts. */
|
||||||
|
if ((cxt->flags & KSEQ_DISPATCHED) == 0)
|
||||||
|
{
|
||||||
|
nkey = _rl_subseq_getchar (cxt->okey);
|
||||||
|
r = _rl_dispatch_subseq (nkey, cxt->dmap, cxt->subseq_arg);
|
||||||
|
cxt->flags |= KSEQ_DISPATCHED;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
r = cxt->childval;
|
||||||
|
#else
|
||||||
|
r = _rl_dispatch_subseq (nkey, cxt->dmap, cxt->subseq_arg);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* For now */
|
||||||
|
r = _rl_subseq_result (r, cxt->oldmap, cxt->okey, (cxt->flags & KSEQ_SUBSEQ));
|
||||||
|
|
||||||
|
if (r == 0) /* success! */
|
||||||
|
{
|
||||||
|
_rl_keyseq_chain_dispose ();
|
||||||
|
RL_UNSETSTATE (RL_STATE_MULTIKEY);
|
||||||
|
return r;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (r != -3) /* magic value that says we added to the chain */
|
||||||
|
_rl_kscxt = cxt->ocxt;
|
||||||
|
if (_rl_kscxt)
|
||||||
|
_rl_kscxt->childval = r;
|
||||||
|
if (r != -3)
|
||||||
|
_rl_keyseq_cxt_dispose (cxt);
|
||||||
|
|
||||||
|
return r;
|
||||||
|
}
|
||||||
|
#endif /* READLINE_CALLBACKS */
|
||||||
|
|
||||||
/* Do the command associated with KEY in MAP.
|
/* Do the command associated with KEY in MAP.
|
||||||
If the associated command is really a keymap, then read
|
If the associated command is really a keymap, then read
|
||||||
another key, and dispatch into that map. */
|
another key, and dispatch into that map. */
|
||||||
@ -527,6 +663,7 @@ _rl_dispatch (key, map)
|
|||||||
register int key;
|
register int key;
|
||||||
Keymap map;
|
Keymap map;
|
||||||
{
|
{
|
||||||
|
_rl_dispatching_keymap = map;
|
||||||
return _rl_dispatch_subseq (key, map, 0);
|
return _rl_dispatch_subseq (key, map, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -539,6 +676,9 @@ _rl_dispatch_subseq (key, map, got_subseq)
|
|||||||
int r, newkey;
|
int r, newkey;
|
||||||
char *macro;
|
char *macro;
|
||||||
rl_command_func_t *func;
|
rl_command_func_t *func;
|
||||||
|
#if defined (READLINE_CALLBACKS)
|
||||||
|
_rl_keyseq_cxt *cxt;
|
||||||
|
#endif
|
||||||
|
|
||||||
if (META_CHAR (key) && _rl_convert_meta_chars_to_ascii)
|
if (META_CHAR (key) && _rl_convert_meta_chars_to_ascii)
|
||||||
{
|
{
|
||||||
@ -572,10 +712,6 @@ _rl_dispatch_subseq (key, map, got_subseq)
|
|||||||
|
|
||||||
rl_executing_keymap = map;
|
rl_executing_keymap = map;
|
||||||
|
|
||||||
#if 0
|
|
||||||
_rl_suppress_redisplay = (map[key].function == rl_insert) && _rl_input_available ();
|
|
||||||
#endif
|
|
||||||
|
|
||||||
rl_dispatching = 1;
|
rl_dispatching = 1;
|
||||||
RL_SETSTATE(RL_STATE_DISPATCHING);
|
RL_SETSTATE(RL_STATE_DISPATCHING);
|
||||||
r = (*map[key].function)(rl_numeric_arg * rl_arg_sign, key);
|
r = (*map[key].function)(rl_numeric_arg * rl_arg_sign, key);
|
||||||
@ -607,6 +743,10 @@ _rl_dispatch_subseq (key, map, got_subseq)
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
#if defined (READLINE_CALLBACKS)
|
||||||
|
RL_UNSETSTATE (RL_STATE_MULTIKEY);
|
||||||
|
_rl_keyseq_chain_dispose ();
|
||||||
|
#endif
|
||||||
_rl_abort_internal ();
|
_rl_abort_internal ();
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
@ -628,58 +768,43 @@ _rl_dispatch_subseq (key, map, got_subseq)
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
rl_key_sequence_length++;
|
rl_key_sequence_length++;
|
||||||
|
_rl_dispatching_keymap = FUNCTION_TO_KEYMAP (map, key);
|
||||||
|
|
||||||
if (key == ESC)
|
/* Allocate new context here. Use linked contexts (linked through
|
||||||
RL_SETSTATE(RL_STATE_METANEXT);
|
cxt->ocxt) to simulate recursion */
|
||||||
RL_SETSTATE(RL_STATE_MOREINPUT);
|
#if defined (READLINE_CALLBACKS)
|
||||||
newkey = rl_read_key ();
|
if (RL_ISSTATE (RL_STATE_CALLBACK))
|
||||||
RL_UNSETSTATE(RL_STATE_MOREINPUT);
|
{
|
||||||
if (key == ESC)
|
/* Return 0 only the first time, to indicate success to
|
||||||
RL_UNSETSTATE(RL_STATE_METANEXT);
|
_rl_callback_read_char. The rest of the time, we're called
|
||||||
|
from _rl_dispatch_callback, so we return 3 to indicate
|
||||||
|
special handling is necessary. */
|
||||||
|
r = RL_ISSTATE (RL_STATE_MULTIKEY) ? -3 : 0;
|
||||||
|
cxt = _rl_keyseq_cxt_alloc ();
|
||||||
|
|
||||||
|
if (got_subseq)
|
||||||
|
cxt->flags |= KSEQ_SUBSEQ;
|
||||||
|
cxt->okey = key;
|
||||||
|
cxt->oldmap = map;
|
||||||
|
cxt->dmap = _rl_dispatching_keymap;
|
||||||
|
cxt->subseq_arg = got_subseq || cxt->dmap[ANYOTHERKEY].function;
|
||||||
|
|
||||||
|
RL_SETSTATE (RL_STATE_MULTIKEY);
|
||||||
|
_rl_kscxt = cxt;
|
||||||
|
|
||||||
|
return r; /* don't indicate immediate success */
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
newkey = _rl_subseq_getchar (key);
|
||||||
if (newkey < 0)
|
if (newkey < 0)
|
||||||
{
|
{
|
||||||
_rl_abort_internal ();
|
_rl_abort_internal ();
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
r = _rl_dispatch_subseq (newkey, FUNCTION_TO_KEYMAP (map, key), got_subseq || map[ANYOTHERKEY].function);
|
r = _rl_dispatch_subseq (newkey, _rl_dispatching_keymap, got_subseq || map[ANYOTHERKEY].function);
|
||||||
|
return _rl_subseq_result (r, map, key, got_subseq);
|
||||||
if (r == -2)
|
|
||||||
/* We didn't match anything, and the keymap we're indexed into
|
|
||||||
shadowed a function previously bound to that prefix. Call
|
|
||||||
the function. The recursive call to _rl_dispatch_subseq has
|
|
||||||
already taken care of pushing any necessary input back onto
|
|
||||||
the input queue with _rl_unget_char. */
|
|
||||||
{
|
|
||||||
#if 0
|
|
||||||
r = _rl_dispatch (ANYOTHERKEY, FUNCTION_TO_KEYMAP (map, key));
|
|
||||||
#else
|
|
||||||
/* XXX - experimental code -- might never be executed. Save
|
|
||||||
for later. */
|
|
||||||
Keymap m = FUNCTION_TO_KEYMAP (map, key);
|
|
||||||
int type = m[ANYOTHERKEY].type;
|
|
||||||
func = m[ANYOTHERKEY].function;
|
|
||||||
if (type == ISFUNC && func == rl_do_lowercase_version)
|
|
||||||
r = _rl_dispatch (_rl_to_lower (key), map);
|
|
||||||
else
|
|
||||||
r = _rl_dispatch (ANYOTHERKEY, m);
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
else if (r && map[ANYOTHERKEY].function)
|
|
||||||
{
|
|
||||||
/* We didn't match (r is probably -1), so return something to
|
|
||||||
tell the caller that it should try ANYOTHERKEY for an
|
|
||||||
overridden function. */
|
|
||||||
_rl_unget_char (key);
|
|
||||||
return -2;
|
|
||||||
}
|
|
||||||
else if (r && got_subseq)
|
|
||||||
{
|
|
||||||
/* OK, back up the chain. */
|
|
||||||
_rl_unget_char (key);
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@ -703,9 +828,69 @@ _rl_dispatch_subseq (key, map, got_subseq)
|
|||||||
_rl_vi_textmod_command (key))
|
_rl_vi_textmod_command (key))
|
||||||
_rl_vi_set_last (key, rl_numeric_arg, rl_arg_sign);
|
_rl_vi_set_last (key, rl_numeric_arg, rl_arg_sign);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
return (r);
|
return (r);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int
|
||||||
|
_rl_subseq_result (r, map, key, got_subseq)
|
||||||
|
int r;
|
||||||
|
Keymap map;
|
||||||
|
int key, got_subseq;
|
||||||
|
{
|
||||||
|
Keymap m;
|
||||||
|
int type, nt;
|
||||||
|
rl_command_func_t *func, *nf;
|
||||||
|
|
||||||
|
if (r == -2)
|
||||||
|
/* We didn't match anything, and the keymap we're indexed into
|
||||||
|
shadowed a function previously bound to that prefix. Call
|
||||||
|
the function. The recursive call to _rl_dispatch_subseq has
|
||||||
|
already taken care of pushing any necessary input back onto
|
||||||
|
the input queue with _rl_unget_char. */
|
||||||
|
{
|
||||||
|
m = _rl_dispatching_keymap;
|
||||||
|
type = m[ANYOTHERKEY].type;
|
||||||
|
func = m[ANYOTHERKEY].function;
|
||||||
|
if (type == ISFUNC && func == rl_do_lowercase_version)
|
||||||
|
r = _rl_dispatch (_rl_to_lower (key), map);
|
||||||
|
else if (type == ISFUNC && func == rl_insert)
|
||||||
|
{
|
||||||
|
/* If the function that was shadowed was self-insert, we
|
||||||
|
somehow need a keymap with map[key].func == self-insert.
|
||||||
|
Let's use this one. */
|
||||||
|
nt = m[key].type;
|
||||||
|
nf = m[key].function;
|
||||||
|
|
||||||
|
m[key].type = type;
|
||||||
|
m[key].function = func;
|
||||||
|
r = _rl_dispatch (key, m);
|
||||||
|
m[key].type = nt;
|
||||||
|
m[key].function = nf;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
r = _rl_dispatch (ANYOTHERKEY, m);
|
||||||
|
}
|
||||||
|
else if (r && map[ANYOTHERKEY].function)
|
||||||
|
{
|
||||||
|
/* We didn't match (r is probably -1), so return something to
|
||||||
|
tell the caller that it should try ANYOTHERKEY for an
|
||||||
|
overridden function. */
|
||||||
|
_rl_unget_char (key);
|
||||||
|
_rl_dispatching_keymap = map;
|
||||||
|
return -2;
|
||||||
|
}
|
||||||
|
else if (r && got_subseq)
|
||||||
|
{
|
||||||
|
/* OK, back up the chain. */
|
||||||
|
_rl_unget_char (key);
|
||||||
|
_rl_dispatching_keymap = map;
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
return r;
|
||||||
|
}
|
||||||
|
|
||||||
/* **************************************************************** */
|
/* **************************************************************** */
|
||||||
/* */
|
/* */
|
||||||
/* Initializations */
|
/* Initializations */
|
||||||
@ -863,6 +1048,7 @@ readline_initialize_everything ()
|
|||||||
static void
|
static void
|
||||||
readline_default_bindings ()
|
readline_default_bindings ()
|
||||||
{
|
{
|
||||||
|
if (_rl_bind_stty_chars)
|
||||||
rl_tty_set_default_bindings (_rl_keymap);
|
rl_tty_set_default_bindings (_rl_keymap);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -870,10 +1056,13 @@ readline_default_bindings ()
|
|||||||
interested in back to rl_insert and read the new ones. */
|
interested in back to rl_insert and read the new ones. */
|
||||||
static void
|
static void
|
||||||
reset_default_bindings ()
|
reset_default_bindings ()
|
||||||
|
{
|
||||||
|
if (_rl_bind_stty_chars)
|
||||||
{
|
{
|
||||||
rl_tty_unset_default_bindings (_rl_keymap);
|
rl_tty_unset_default_bindings (_rl_keymap);
|
||||||
rl_tty_set_default_bindings (_rl_keymap);
|
rl_tty_set_default_bindings (_rl_keymap);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/* Bind some common arrow key sequences in MAP. */
|
/* Bind some common arrow key sequences in MAP. */
|
||||||
static void
|
static void
|
||||||
@ -906,6 +1095,13 @@ bind_arrow_keys_internal (map)
|
|||||||
rl_bind_keyseq_if_unbound ("\033OH", rl_beg_of_line);
|
rl_bind_keyseq_if_unbound ("\033OH", rl_beg_of_line);
|
||||||
rl_bind_keyseq_if_unbound ("\033OF", rl_end_of_line);
|
rl_bind_keyseq_if_unbound ("\033OF", rl_end_of_line);
|
||||||
|
|
||||||
|
#if defined (__MINGW32__)
|
||||||
|
rl_bind_keyseq_if_unbound ("\340H", rl_get_previous_history);
|
||||||
|
rl_bind_keyseq_if_unbound ("\340P", rl_get_next_history);
|
||||||
|
rl_bind_keyseq_if_unbound ("\340M", rl_forward_char);
|
||||||
|
rl_bind_keyseq_if_unbound ("\340K", rl_backward_char);
|
||||||
|
#endif
|
||||||
|
|
||||||
_rl_keymap = xkeymap;
|
_rl_keymap = xkeymap;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/* Readline.h -- the names of functions callable from within readline. */
|
/* Readline.h -- the names of functions callable from within readline. */
|
||||||
|
|
||||||
/* Copyright (C) 1987-2004 Free Software Foundation, Inc.
|
/* Copyright (C) 1987-2005 Free Software Foundation, Inc.
|
||||||
|
|
||||||
This file is part of the GNU Readline Library, a library for
|
This file is part of the GNU Readline Library, a library for
|
||||||
reading lines of text with interactive input and history editing.
|
reading lines of text with interactive input and history editing.
|
||||||
@ -40,9 +40,9 @@ extern "C" {
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* Hex-encoded Readline version number. */
|
/* Hex-encoded Readline version number. */
|
||||||
#define RL_READLINE_VERSION 0x0500 /* Readline 5.0 */
|
#define RL_READLINE_VERSION 0x0501 /* Readline 5.1 */
|
||||||
#define RL_VERSION_MAJOR 5
|
#define RL_VERSION_MAJOR 5
|
||||||
#define RL_VERSION_MINOR 0
|
#define RL_VERSION_MINOR 1
|
||||||
|
|
||||||
/* Readline data structures. */
|
/* Readline data structures. */
|
||||||
|
|
||||||
@ -241,6 +241,7 @@ extern int rl_vi_column PARAMS((int, int));
|
|||||||
extern int rl_vi_delete_to PARAMS((int, int));
|
extern int rl_vi_delete_to PARAMS((int, int));
|
||||||
extern int rl_vi_change_to PARAMS((int, int));
|
extern int rl_vi_change_to PARAMS((int, int));
|
||||||
extern int rl_vi_yank_to PARAMS((int, int));
|
extern int rl_vi_yank_to PARAMS((int, int));
|
||||||
|
extern int rl_vi_rubout PARAMS((int, int));
|
||||||
extern int rl_vi_delete PARAMS((int, int));
|
extern int rl_vi_delete PARAMS((int, int));
|
||||||
extern int rl_vi_back_to_indent PARAMS((int, int));
|
extern int rl_vi_back_to_indent PARAMS((int, int));
|
||||||
extern int rl_vi_first_print PARAMS((int, int));
|
extern int rl_vi_first_print PARAMS((int, int));
|
||||||
@ -302,6 +303,8 @@ extern int rl_bind_keyseq_in_map PARAMS((const char *, rl_command_func_t *, Keym
|
|||||||
extern int rl_bind_keyseq_if_unbound PARAMS((const char *, rl_command_func_t *));
|
extern int rl_bind_keyseq_if_unbound PARAMS((const char *, rl_command_func_t *));
|
||||||
extern int rl_bind_keyseq_if_unbound_in_map PARAMS((const char *, rl_command_func_t *, Keymap));
|
extern int rl_bind_keyseq_if_unbound_in_map PARAMS((const char *, rl_command_func_t *, Keymap));
|
||||||
extern int rl_generic_bind PARAMS((int, const char *, char *, Keymap));
|
extern int rl_generic_bind PARAMS((int, const char *, char *, Keymap));
|
||||||
|
|
||||||
|
extern char *rl_variable_value PARAMS((const char *));
|
||||||
extern int rl_variable_bind PARAMS((const char *, const char *));
|
extern int rl_variable_bind PARAMS((const char *, const char *));
|
||||||
|
|
||||||
/* Backwards compatibility, use rl_bind_keyseq_in_map instead. */
|
/* Backwards compatibility, use rl_bind_keyseq_in_map instead. */
|
||||||
@ -401,6 +404,7 @@ extern int rl_reset_terminal PARAMS((const char *));
|
|||||||
extern void rl_resize_terminal PARAMS((void));
|
extern void rl_resize_terminal PARAMS((void));
|
||||||
extern void rl_set_screen_size PARAMS((int, int));
|
extern void rl_set_screen_size PARAMS((int, int));
|
||||||
extern void rl_get_screen_size PARAMS((int *, int *));
|
extern void rl_get_screen_size PARAMS((int *, int *));
|
||||||
|
extern void rl_reset_screen_size PARAMS((void));
|
||||||
|
|
||||||
extern char *rl_get_termcap PARAMS((const char *));
|
extern char *rl_get_termcap PARAMS((const char *));
|
||||||
|
|
||||||
@ -528,6 +532,11 @@ extern const char *rl_terminal_name;
|
|||||||
extern FILE *rl_instream;
|
extern FILE *rl_instream;
|
||||||
extern FILE *rl_outstream;
|
extern FILE *rl_outstream;
|
||||||
|
|
||||||
|
/* If non-zero, Readline gives values of LINES and COLUMNS from the environment
|
||||||
|
greater precedence than values fetched from the kernel when computing the
|
||||||
|
screen dimensions. */
|
||||||
|
extern int rl_prefer_env_winsize;
|
||||||
|
|
||||||
/* If non-zero, then this is the address of a function to call just
|
/* If non-zero, then this is the address of a function to call just
|
||||||
before readline_internal () prints the first prompt. */
|
before readline_internal () prints the first prompt. */
|
||||||
extern rl_hook_func_t *rl_startup_hook;
|
extern rl_hook_func_t *rl_startup_hook;
|
||||||
@ -759,29 +768,33 @@ extern int rl_inhibit_completion;
|
|||||||
#define MULT_MATCH 2
|
#define MULT_MATCH 2
|
||||||
|
|
||||||
/* Possible state values for rl_readline_state */
|
/* Possible state values for rl_readline_state */
|
||||||
#define RL_STATE_NONE 0x00000 /* no state; before first call */
|
#define RL_STATE_NONE 0x000000 /* no state; before first call */
|
||||||
|
|
||||||
#define RL_STATE_INITIALIZING 0x00001 /* initializing */
|
#define RL_STATE_INITIALIZING 0x000001 /* initializing */
|
||||||
#define RL_STATE_INITIALIZED 0x00002 /* initialization done */
|
#define RL_STATE_INITIALIZED 0x000002 /* initialization done */
|
||||||
#define RL_STATE_TERMPREPPED 0x00004 /* terminal is prepped */
|
#define RL_STATE_TERMPREPPED 0x000004 /* terminal is prepped */
|
||||||
#define RL_STATE_READCMD 0x00008 /* reading a command key */
|
#define RL_STATE_READCMD 0x000008 /* reading a command key */
|
||||||
#define RL_STATE_METANEXT 0x00010 /* reading input after ESC */
|
#define RL_STATE_METANEXT 0x000010 /* reading input after ESC */
|
||||||
#define RL_STATE_DISPATCHING 0x00020 /* dispatching to a command */
|
#define RL_STATE_DISPATCHING 0x000020 /* dispatching to a command */
|
||||||
#define RL_STATE_MOREINPUT 0x00040 /* reading more input in a command function */
|
#define RL_STATE_MOREINPUT 0x000040 /* reading more input in a command function */
|
||||||
#define RL_STATE_ISEARCH 0x00080 /* doing incremental search */
|
#define RL_STATE_ISEARCH 0x000080 /* doing incremental search */
|
||||||
#define RL_STATE_NSEARCH 0x00100 /* doing non-inc search */
|
#define RL_STATE_NSEARCH 0x000100 /* doing non-inc search */
|
||||||
#define RL_STATE_SEARCH 0x00200 /* doing a history search */
|
#define RL_STATE_SEARCH 0x000200 /* doing a history search */
|
||||||
#define RL_STATE_NUMERICARG 0x00400 /* reading numeric argument */
|
#define RL_STATE_NUMERICARG 0x000400 /* reading numeric argument */
|
||||||
#define RL_STATE_MACROINPUT 0x00800 /* getting input from a macro */
|
#define RL_STATE_MACROINPUT 0x000800 /* getting input from a macro */
|
||||||
#define RL_STATE_MACRODEF 0x01000 /* defining keyboard macro */
|
#define RL_STATE_MACRODEF 0x001000 /* defining keyboard macro */
|
||||||
#define RL_STATE_OVERWRITE 0x02000 /* overwrite mode */
|
#define RL_STATE_OVERWRITE 0x002000 /* overwrite mode */
|
||||||
#define RL_STATE_COMPLETING 0x04000 /* doing completion */
|
#define RL_STATE_COMPLETING 0x004000 /* doing completion */
|
||||||
#define RL_STATE_SIGHANDLER 0x08000 /* in readline sighandler */
|
#define RL_STATE_SIGHANDLER 0x008000 /* in readline sighandler */
|
||||||
#define RL_STATE_UNDOING 0x10000 /* doing an undo */
|
#define RL_STATE_UNDOING 0x010000 /* doing an undo */
|
||||||
#define RL_STATE_INPUTPENDING 0x20000 /* rl_execute_next called */
|
#define RL_STATE_INPUTPENDING 0x020000 /* rl_execute_next called */
|
||||||
#define RL_STATE_TTYCSAVED 0x40000 /* tty special chars saved */
|
#define RL_STATE_TTYCSAVED 0x040000 /* tty special chars saved */
|
||||||
|
#define RL_STATE_CALLBACK 0x080000 /* using the callback interface */
|
||||||
|
#define RL_STATE_VIMOTION 0x100000 /* reading vi motion arg */
|
||||||
|
#define RL_STATE_MULTIKEY 0x200000 /* reading multiple-key command */
|
||||||
|
#define RL_STATE_VICMDONCE 0x400000 /* entered vi command mode at least once */
|
||||||
|
|
||||||
#define RL_STATE_DONE 0x80000 /* done; accepted line */
|
#define RL_STATE_DONE 0x800000 /* done; accepted line */
|
||||||
|
|
||||||
#define RL_SETSTATE(x) (rl_readline_state |= (x))
|
#define RL_SETSTATE(x) (rl_readline_state |= (x))
|
||||||
#define RL_UNSETSTATE(x) (rl_readline_state &= ~(x))
|
#define RL_UNSETSTATE(x) (rl_readline_state &= ~(x))
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
for readline. This should be included after any files that define
|
for readline. This should be included after any files that define
|
||||||
system-specific constants like _POSIX_VERSION or USG. */
|
system-specific constants like _POSIX_VERSION or USG. */
|
||||||
|
|
||||||
/* Copyright (C) 1987,1989 Free Software Foundation, Inc.
|
/* Copyright (C) 1987-2005 Free Software Foundation, Inc.
|
||||||
|
|
||||||
This file contains the Readline Library (the Library), a set of
|
This file contains the Readline Library (the Library), a set of
|
||||||
routines for providing Emacs style line input to programs that ask
|
routines for providing Emacs style line input to programs that ask
|
||||||
@ -38,7 +38,11 @@
|
|||||||
# if defined (HAVE_TERMIO_H)
|
# if defined (HAVE_TERMIO_H)
|
||||||
# define TERMIO_TTY_DRIVER
|
# define TERMIO_TTY_DRIVER
|
||||||
# else
|
# else
|
||||||
|
# if !defined (__MINGW32__)
|
||||||
# define NEW_TTY_DRIVER
|
# define NEW_TTY_DRIVER
|
||||||
|
# else
|
||||||
|
# define NO_TTY_DRIVER
|
||||||
|
# endif
|
||||||
# endif
|
# endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -97,6 +97,21 @@ extern int _rl_read_mbstring PARAMS((int, char *, int));
|
|||||||
|
|
||||||
extern int _rl_is_mbchar_matched PARAMS((char *, int, int, char *, int));
|
extern int _rl_is_mbchar_matched PARAMS((char *, int, int, char *, int));
|
||||||
|
|
||||||
|
extern wchar_t _rl_char_value PARAMS((char *, int));
|
||||||
|
extern int _rl_walphabetic PARAMS((wchar_t));
|
||||||
|
|
||||||
|
#define _rl_to_wupper(wc) (iswlower (wc) ? towupper (wc) : (wc))
|
||||||
|
#define _rl_to_wlower(wc) (iswupper (wc) ? towlower (wc) : (wc))
|
||||||
|
|
||||||
|
#define MB_NEXTCHAR(b,s,c,f) \
|
||||||
|
((MB_CUR_MAX > 1 && rl_byte_oriented == 0) \
|
||||||
|
? _rl_find_next_mbchar ((b), (s), (c), (f)) \
|
||||||
|
: ((s) + (c)))
|
||||||
|
#define MB_PREVCHAR(b,s,f) \
|
||||||
|
((MB_CUR_MAX > 1 && rl_byte_oriented == 0) \
|
||||||
|
? _rl_find_prev_mbchar ((b), (s), (f)) \
|
||||||
|
: ((s) - 1))
|
||||||
|
|
||||||
#define MB_INVALIDCH(x) ((x) == (size_t)-1 || (x) == (size_t)-2)
|
#define MB_INVALIDCH(x) ((x) == (size_t)-1 || (x) == (size_t)-2)
|
||||||
#define MB_NULLWCH(x) ((x) == 0)
|
#define MB_NULLWCH(x) ((x) == 0)
|
||||||
|
|
||||||
@ -111,6 +126,16 @@ extern int _rl_is_mbchar_matched PARAMS((char *, int, int, char *, int));
|
|||||||
#define _rl_find_prev_mbchar(b, i, f) (((i) == 0) ? (i) : ((i) - 1))
|
#define _rl_find_prev_mbchar(b, i, f) (((i) == 0) ? (i) : ((i) - 1))
|
||||||
#define _rl_find_next_mbchar(b, i1, i2, f) ((i1) + (i2))
|
#define _rl_find_next_mbchar(b, i1, i2, f) ((i1) + (i2))
|
||||||
|
|
||||||
|
#define _rl_char_value(buf,ind) ((buf)[(ind)])
|
||||||
|
|
||||||
|
#define _rl_walphabetic(c) (rl_alphabetic (c))
|
||||||
|
|
||||||
|
#define _rl_to_wupper(c) (_rl_to_upper (c))
|
||||||
|
#define _rl_to_wlower(c) (_rl_to_lower (c))
|
||||||
|
|
||||||
|
#define MB_NEXTCHAR(b,s,c,f) ((s) + (c))
|
||||||
|
#define MB_PREVCHAR(b,s,f) ((s) - 1)
|
||||||
|
|
||||||
#define MB_INVALIDCH(x) (0)
|
#define MB_INVALIDCH(x) (0)
|
||||||
#define MB_NULLWCH(x) (0)
|
#define MB_NULLWCH(x) (0)
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/* rlprivate.h -- functions and variables global to the readline library,
|
/* rlprivate.h -- functions and variables global to the readline library,
|
||||||
but not intended for use by applications. */
|
but not intended for use by applications. */
|
||||||
|
|
||||||
/* Copyright (C) 1999-2004 Free Software Foundation, Inc.
|
/* Copyright (C) 1999-2005 Free Software Foundation, Inc.
|
||||||
|
|
||||||
This file is part of the GNU Readline Library, a library for
|
This file is part of the GNU Readline Library, a library for
|
||||||
reading lines of text with interactive input and history editing.
|
reading lines of text with interactive input and history editing.
|
||||||
@ -28,6 +28,95 @@
|
|||||||
#include "rlstdc.h"
|
#include "rlstdc.h"
|
||||||
#include "posixjmp.h" /* defines procenv_t */
|
#include "posixjmp.h" /* defines procenv_t */
|
||||||
|
|
||||||
|
/*************************************************************************
|
||||||
|
* *
|
||||||
|
* Global structs undocumented in texinfo manual and not in readline.h *
|
||||||
|
* *
|
||||||
|
*************************************************************************/
|
||||||
|
/* search types */
|
||||||
|
#define RL_SEARCH_ISEARCH 0x01 /* incremental search */
|
||||||
|
#define RL_SEARCH_NSEARCH 0x02 /* non-incremental search */
|
||||||
|
#define RL_SEARCH_CSEARCH 0x04 /* intra-line char search */
|
||||||
|
|
||||||
|
/* search flags */
|
||||||
|
#define SF_REVERSE 0x01
|
||||||
|
#define SF_FOUND 0x02
|
||||||
|
#define SF_FAILED 0x04
|
||||||
|
|
||||||
|
typedef struct __rl_search_context
|
||||||
|
{
|
||||||
|
int type;
|
||||||
|
int sflags;
|
||||||
|
|
||||||
|
char *search_string;
|
||||||
|
int search_string_index;
|
||||||
|
int search_string_size;
|
||||||
|
|
||||||
|
char **lines;
|
||||||
|
char *allocated_line;
|
||||||
|
int hlen;
|
||||||
|
int hindex;
|
||||||
|
|
||||||
|
int save_point;
|
||||||
|
int save_mark;
|
||||||
|
int save_line;
|
||||||
|
int last_found_line;
|
||||||
|
char *prev_line_found;
|
||||||
|
|
||||||
|
UNDO_LIST *save_undo_list;
|
||||||
|
|
||||||
|
int history_pos;
|
||||||
|
int direction;
|
||||||
|
|
||||||
|
int lastc;
|
||||||
|
#if defined (HANDLE_MULTIBYTE)
|
||||||
|
char mb[MB_LEN_MAX];
|
||||||
|
#endif
|
||||||
|
|
||||||
|
char *sline;
|
||||||
|
int sline_len;
|
||||||
|
int sline_index;
|
||||||
|
|
||||||
|
char *search_terminators;
|
||||||
|
} _rl_search_cxt;
|
||||||
|
|
||||||
|
/* Callback data for reading numeric arguments */
|
||||||
|
#define NUM_SAWMINUS 0x01
|
||||||
|
#define NUM_SAWDIGITS 0x02
|
||||||
|
#define NUM_READONE 0x04
|
||||||
|
|
||||||
|
typedef int _rl_arg_cxt;
|
||||||
|
|
||||||
|
/* A context for reading key sequences longer than a single character when
|
||||||
|
using the callback interface. */
|
||||||
|
#define KSEQ_DISPATCHED 0x01
|
||||||
|
#define KSEQ_SUBSEQ 0x02
|
||||||
|
#define KSEQ_RECURSIVE 0x04
|
||||||
|
|
||||||
|
typedef struct __rl_keyseq_context
|
||||||
|
{
|
||||||
|
int flags;
|
||||||
|
int subseq_arg;
|
||||||
|
int subseq_retval; /* XXX */
|
||||||
|
Keymap dmap;
|
||||||
|
|
||||||
|
Keymap oldmap;
|
||||||
|
int okey;
|
||||||
|
struct __rl_keyseq_context *ocxt;
|
||||||
|
int childval;
|
||||||
|
} _rl_keyseq_cxt;
|
||||||
|
|
||||||
|
/* fill in more as needed */
|
||||||
|
/* `Generic' callback data and functions */
|
||||||
|
typedef struct __rl_callback_generic_arg
|
||||||
|
{
|
||||||
|
int count;
|
||||||
|
int i1, i2;
|
||||||
|
/* add here as needed */
|
||||||
|
} _rl_callback_generic_arg;
|
||||||
|
|
||||||
|
typedef int _rl_callback_func_t PARAMS((_rl_callback_generic_arg *));
|
||||||
|
|
||||||
/*************************************************************************
|
/*************************************************************************
|
||||||
* *
|
* *
|
||||||
* Global functions undocumented in texinfo manual and not in readline.h *
|
* Global functions undocumented in texinfo manual and not in readline.h *
|
||||||
@ -54,6 +143,8 @@ extern int readline_echoing_p;
|
|||||||
extern int rl_key_sequence_length;
|
extern int rl_key_sequence_length;
|
||||||
extern int rl_byte_oriented;
|
extern int rl_byte_oriented;
|
||||||
|
|
||||||
|
extern _rl_keyseq_cxt *_rl_kscxt;
|
||||||
|
|
||||||
/* display.c */
|
/* display.c */
|
||||||
extern int rl_display_fixed;
|
extern int rl_display_fixed;
|
||||||
|
|
||||||
@ -100,6 +191,16 @@ extern void readline_internal_setup PARAMS((void));
|
|||||||
extern char *readline_internal_teardown PARAMS((int));
|
extern char *readline_internal_teardown PARAMS((int));
|
||||||
extern int readline_internal_char PARAMS((void));
|
extern int readline_internal_char PARAMS((void));
|
||||||
|
|
||||||
|
extern _rl_keyseq_cxt *_rl_keyseq_cxt_alloc PARAMS((void));
|
||||||
|
extern void _rl_keyseq_cxt_dispose PARAMS((_rl_keyseq_cxt *));
|
||||||
|
extern void _rl_keyseq_chain_dispose PARAMS((void));
|
||||||
|
|
||||||
|
extern int _rl_dispatch_callback PARAMS((_rl_keyseq_cxt *));
|
||||||
|
|
||||||
|
/* callback.c */
|
||||||
|
extern _rl_callback_generic_arg *_rl_callback_data_alloc PARAMS((int));
|
||||||
|
extern void _rl_callback_data_dispose PARAMS((_rl_callback_generic_arg *));
|
||||||
|
|
||||||
#endif /* READLINE_CALLBACKS */
|
#endif /* READLINE_CALLBACKS */
|
||||||
|
|
||||||
/* bind.c */
|
/* bind.c */
|
||||||
@ -132,6 +233,15 @@ extern void _rl_insert_typein PARAMS((int));
|
|||||||
extern int _rl_unget_char PARAMS((int));
|
extern int _rl_unget_char PARAMS((int));
|
||||||
extern int _rl_pushed_input_available PARAMS((void));
|
extern int _rl_pushed_input_available PARAMS((void));
|
||||||
|
|
||||||
|
/* isearch.c */
|
||||||
|
extern _rl_search_cxt *_rl_scxt_alloc PARAMS((int, int));
|
||||||
|
extern void _rl_scxt_dispose PARAMS((_rl_search_cxt *, int));
|
||||||
|
|
||||||
|
extern int _rl_isearch_dispatch PARAMS((_rl_search_cxt *, int));
|
||||||
|
extern int _rl_isearch_callback PARAMS((_rl_search_cxt *));
|
||||||
|
|
||||||
|
extern int _rl_search_getchar PARAMS((_rl_search_cxt *));
|
||||||
|
|
||||||
/* macro.c */
|
/* macro.c */
|
||||||
extern void _rl_with_macro_input PARAMS((char *));
|
extern void _rl_with_macro_input PARAMS((char *));
|
||||||
extern int _rl_next_macro_key PARAMS((void));
|
extern int _rl_next_macro_key PARAMS((void));
|
||||||
@ -141,7 +251,12 @@ extern void _rl_add_macro_char PARAMS((int));
|
|||||||
extern void _rl_kill_kbd_macro PARAMS((void));
|
extern void _rl_kill_kbd_macro PARAMS((void));
|
||||||
|
|
||||||
/* misc.c */
|
/* misc.c */
|
||||||
extern int _rl_init_argument PARAMS((void));
|
extern int _rl_arg_overflow PARAMS((void));
|
||||||
|
extern void _rl_arg_init PARAMS((void));
|
||||||
|
extern int _rl_arg_getchar PARAMS((void));
|
||||||
|
extern int _rl_arg_callback PARAMS((_rl_arg_cxt));
|
||||||
|
extern void _rl_reset_argument PARAMS((void));
|
||||||
|
|
||||||
extern void _rl_start_using_history PARAMS((void));
|
extern void _rl_start_using_history PARAMS((void));
|
||||||
extern int _rl_free_saved_history_line PARAMS((void));
|
extern int _rl_free_saved_history_line PARAMS((void));
|
||||||
extern void _rl_set_insert_mode PARAMS((int, int));
|
extern void _rl_set_insert_mode PARAMS((int, int));
|
||||||
@ -157,11 +272,15 @@ extern void _rl_init_line_state PARAMS((void));
|
|||||||
extern void _rl_set_the_line PARAMS((void));
|
extern void _rl_set_the_line PARAMS((void));
|
||||||
extern int _rl_dispatch PARAMS((int, Keymap));
|
extern int _rl_dispatch PARAMS((int, Keymap));
|
||||||
extern int _rl_dispatch_subseq PARAMS((int, Keymap, int));
|
extern int _rl_dispatch_subseq PARAMS((int, Keymap, int));
|
||||||
|
extern void _rl_internal_char_cleanup PARAMS((void));
|
||||||
|
|
||||||
/* rltty.c */
|
/* rltty.c */
|
||||||
extern int _rl_disable_tty_signals PARAMS((void));
|
extern int _rl_disable_tty_signals PARAMS((void));
|
||||||
extern int _rl_restore_tty_signals PARAMS((void));
|
extern int _rl_restore_tty_signals PARAMS((void));
|
||||||
|
|
||||||
|
/* search.c */
|
||||||
|
extern int _rl_nsearch_callback PARAMS((_rl_search_cxt *));
|
||||||
|
|
||||||
/* terminal.c */
|
/* terminal.c */
|
||||||
extern void _rl_get_screen_size PARAMS((int, int));
|
extern void _rl_get_screen_size PARAMS((int, int));
|
||||||
extern int _rl_init_terminal_io PARAMS((const char *));
|
extern int _rl_init_terminal_io PARAMS((const char *));
|
||||||
@ -217,6 +336,10 @@ extern void _rl_vi_done_inserting PARAMS((void));
|
|||||||
extern const char *_rl_possible_control_prefixes[];
|
extern const char *_rl_possible_control_prefixes[];
|
||||||
extern const char *_rl_possible_meta_prefixes[];
|
extern const char *_rl_possible_meta_prefixes[];
|
||||||
|
|
||||||
|
/* callback.c */
|
||||||
|
extern _rl_callback_func_t *_rl_callback_func;
|
||||||
|
extern _rl_callback_generic_arg *_rl_callback_data;
|
||||||
|
|
||||||
/* complete.c */
|
/* complete.c */
|
||||||
extern int _rl_complete_show_all;
|
extern int _rl_complete_show_all;
|
||||||
extern int _rl_complete_show_unmodified;
|
extern int _rl_complete_show_unmodified;
|
||||||
@ -231,11 +354,14 @@ extern int _rl_page_completions;
|
|||||||
extern int _rl_vis_botlin;
|
extern int _rl_vis_botlin;
|
||||||
extern int _rl_last_c_pos;
|
extern int _rl_last_c_pos;
|
||||||
extern int _rl_suppress_redisplay;
|
extern int _rl_suppress_redisplay;
|
||||||
|
extern int _rl_want_redisplay;
|
||||||
extern char *rl_display_prompt;
|
extern char *rl_display_prompt;
|
||||||
|
|
||||||
/* isearch.c */
|
/* isearch.c */
|
||||||
extern char *_rl_isearch_terminators;
|
extern char *_rl_isearch_terminators;
|
||||||
|
|
||||||
|
extern _rl_search_cxt *_rl_iscxt;
|
||||||
|
|
||||||
/* macro.c */
|
/* macro.c */
|
||||||
extern char *_rl_executing_macro;
|
extern char *_rl_executing_macro;
|
||||||
|
|
||||||
@ -243,6 +369,8 @@ extern char *_rl_executing_macro;
|
|||||||
extern int _rl_history_preserve_point;
|
extern int _rl_history_preserve_point;
|
||||||
extern int _rl_history_saved_point;
|
extern int _rl_history_saved_point;
|
||||||
|
|
||||||
|
extern _rl_arg_cxt _rl_argcxt;
|
||||||
|
|
||||||
/* readline.c */
|
/* readline.c */
|
||||||
extern int _rl_horizontal_scroll_mode;
|
extern int _rl_horizontal_scroll_mode;
|
||||||
extern int _rl_mark_modified_lines;
|
extern int _rl_mark_modified_lines;
|
||||||
@ -250,6 +378,7 @@ extern int _rl_bell_preference;
|
|||||||
extern int _rl_meta_flag;
|
extern int _rl_meta_flag;
|
||||||
extern int _rl_convert_meta_chars_to_ascii;
|
extern int _rl_convert_meta_chars_to_ascii;
|
||||||
extern int _rl_output_meta_chars;
|
extern int _rl_output_meta_chars;
|
||||||
|
extern int _rl_bind_stty_chars;
|
||||||
extern char *_rl_comment_begin;
|
extern char *_rl_comment_begin;
|
||||||
extern unsigned char _rl_parsing_conditionalized_out;
|
extern unsigned char _rl_parsing_conditionalized_out;
|
||||||
extern Keymap _rl_keymap;
|
extern Keymap _rl_keymap;
|
||||||
@ -259,6 +388,9 @@ extern int _rl_last_command_was_kill;
|
|||||||
extern int _rl_eof_char;
|
extern int _rl_eof_char;
|
||||||
extern procenv_t readline_top_level;
|
extern procenv_t readline_top_level;
|
||||||
|
|
||||||
|
/* search.c */
|
||||||
|
extern _rl_search_cxt *_rl_nscxt;
|
||||||
|
|
||||||
/* terminal.c */
|
/* terminal.c */
|
||||||
extern int _rl_enable_keypad;
|
extern int _rl_enable_keypad;
|
||||||
extern int _rl_enable_meta;
|
extern int _rl_enable_meta;
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/* rltty.c -- functions to prepare and restore the terminal for readline's
|
/* rltty.c -- functions to prepare and restore the terminal for readline's
|
||||||
use. */
|
use. */
|
||||||
|
|
||||||
/* Copyright (C) 1992 Free Software Foundation, Inc.
|
/* Copyright (C) 1992-2005 Free Software Foundation, Inc.
|
||||||
|
|
||||||
This file is part of the GNU Readline Library, a library for
|
This file is part of the GNU Readline Library, a library for
|
||||||
reading lines of text with interactive input and history editing.
|
reading lines of text with interactive input and history editing.
|
||||||
@ -152,7 +152,9 @@ set_winsize (tty)
|
|||||||
#endif /* TIOCGWINSZ */
|
#endif /* TIOCGWINSZ */
|
||||||
}
|
}
|
||||||
|
|
||||||
#if defined (NEW_TTY_DRIVER)
|
#if defined (NO_TTY_DRIVER)
|
||||||
|
/* Nothing */
|
||||||
|
#elif defined (NEW_TTY_DRIVER)
|
||||||
|
|
||||||
/* Values for the `flags' field of a struct bsdtty. This tells which
|
/* Values for the `flags' field of a struct bsdtty. This tells which
|
||||||
elements of the struct bsdtty have been fetched from the system and
|
elements of the struct bsdtty have been fetched from the system and
|
||||||
@ -233,6 +235,7 @@ get_tty_settings (tty, tiop)
|
|||||||
|
|
||||||
tiop->flags = tiop->lflag = 0;
|
tiop->flags = tiop->lflag = 0;
|
||||||
|
|
||||||
|
errno = 0;
|
||||||
if (ioctl (tty, TIOCGETP, &(tiop->sgttyb)) < 0)
|
if (ioctl (tty, TIOCGETP, &(tiop->sgttyb)) < 0)
|
||||||
return -1;
|
return -1;
|
||||||
tiop->flags |= SGTTY_SET;
|
tiop->flags |= SGTTY_SET;
|
||||||
@ -518,6 +521,7 @@ get_tty_settings (tty, tiop)
|
|||||||
{
|
{
|
||||||
set_winsize (tty);
|
set_winsize (tty);
|
||||||
|
|
||||||
|
errno = 0;
|
||||||
if (_get_tty_settings (tty, tiop) < 0)
|
if (_get_tty_settings (tty, tiop) < 0)
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
@ -631,9 +635,23 @@ prepare_terminal_settings (meta_flag, oldtio, tiop)
|
|||||||
|
|
||||||
#endif /* TERMIOS_TTY_DRIVER && _POSIX_VDISABLE */
|
#endif /* TERMIOS_TTY_DRIVER && _POSIX_VDISABLE */
|
||||||
}
|
}
|
||||||
#endif /* NEW_TTY_DRIVER */
|
#endif /* !NEW_TTY_DRIVER */
|
||||||
|
|
||||||
/* Put the terminal in CBREAK mode so that we can detect key presses. */
|
/* Put the terminal in CBREAK mode so that we can detect key presses. */
|
||||||
|
#if defined (NO_TTY_DRIVER)
|
||||||
|
void
|
||||||
|
rl_prep_terminal (meta_flag)
|
||||||
|
int meta_flag;
|
||||||
|
{
|
||||||
|
readline_echoing_p = 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
rl_deprep_terminal ()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
#else /* ! NO_TTY_DRIVER */
|
||||||
void
|
void
|
||||||
rl_prep_terminal (meta_flag)
|
rl_prep_terminal (meta_flag)
|
||||||
int meta_flag;
|
int meta_flag;
|
||||||
@ -651,16 +669,43 @@ rl_prep_terminal (meta_flag)
|
|||||||
|
|
||||||
if (get_tty_settings (tty, &tio) < 0)
|
if (get_tty_settings (tty, &tio) < 0)
|
||||||
{
|
{
|
||||||
|
#if defined (ENOTSUP)
|
||||||
|
/* MacOS X, at least, lies about the value of errno if tcgetattr fails. */
|
||||||
|
if (errno == ENOTTY || errno == ENOTSUP)
|
||||||
|
#else
|
||||||
|
if (errno == ENOTTY)
|
||||||
|
#endif
|
||||||
|
readline_echoing_p = 1; /* XXX */
|
||||||
release_sigint ();
|
release_sigint ();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
otio = tio;
|
otio = tio;
|
||||||
|
|
||||||
|
if (_rl_bind_stty_chars)
|
||||||
|
{
|
||||||
|
#if defined (VI_MODE)
|
||||||
|
/* If editing in vi mode, make sure we restore the bindings in the
|
||||||
|
insertion keymap no matter what keymap we ended up in. */
|
||||||
|
if (rl_editing_mode == vi_mode)
|
||||||
|
rl_tty_unset_default_bindings (vi_insertion_keymap);
|
||||||
|
else
|
||||||
|
#endif
|
||||||
rl_tty_unset_default_bindings (_rl_keymap);
|
rl_tty_unset_default_bindings (_rl_keymap);
|
||||||
|
}
|
||||||
save_tty_chars (&otio);
|
save_tty_chars (&otio);
|
||||||
RL_SETSTATE(RL_STATE_TTYCSAVED);
|
RL_SETSTATE(RL_STATE_TTYCSAVED);
|
||||||
|
if (_rl_bind_stty_chars)
|
||||||
|
{
|
||||||
|
#if defined (VI_MODE)
|
||||||
|
/* If editing in vi mode, make sure we set the bindings in the
|
||||||
|
insertion keymap no matter what keymap we ended up in. */
|
||||||
|
if (rl_editing_mode == vi_mode)
|
||||||
|
_rl_bind_tty_special_chars (vi_insertion_keymap, tio);
|
||||||
|
else
|
||||||
|
#endif
|
||||||
_rl_bind_tty_special_chars (_rl_keymap, tio);
|
_rl_bind_tty_special_chars (_rl_keymap, tio);
|
||||||
|
}
|
||||||
|
|
||||||
prepare_terminal_settings (meta_flag, otio, &tio);
|
prepare_terminal_settings (meta_flag, otio, &tio);
|
||||||
|
|
||||||
@ -710,6 +755,7 @@ rl_deprep_terminal ()
|
|||||||
|
|
||||||
release_sigint ();
|
release_sigint ();
|
||||||
}
|
}
|
||||||
|
#endif /* !NO_TTY_DRIVER */
|
||||||
|
|
||||||
/* **************************************************************** */
|
/* **************************************************************** */
|
||||||
/* */
|
/* */
|
||||||
@ -721,6 +767,10 @@ int
|
|||||||
rl_restart_output (count, key)
|
rl_restart_output (count, key)
|
||||||
int count, key;
|
int count, key;
|
||||||
{
|
{
|
||||||
|
#if defined (__MINGW32__)
|
||||||
|
return 0;
|
||||||
|
#else /* !__MING32__ */
|
||||||
|
|
||||||
int fildes = fileno (rl_outstream);
|
int fildes = fileno (rl_outstream);
|
||||||
#if defined (TIOCSTART)
|
#if defined (TIOCSTART)
|
||||||
#if defined (apollo)
|
#if defined (apollo)
|
||||||
@ -748,12 +798,17 @@ rl_restart_output (count, key)
|
|||||||
#endif /* !TIOCSTART */
|
#endif /* !TIOCSTART */
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
#endif /* !__MINGW32__ */
|
||||||
}
|
}
|
||||||
|
|
||||||
int
|
int
|
||||||
rl_stop_output (count, key)
|
rl_stop_output (count, key)
|
||||||
int count, key;
|
int count, key;
|
||||||
{
|
{
|
||||||
|
#if defined (__MINGW32__)
|
||||||
|
return 0;
|
||||||
|
#else
|
||||||
|
|
||||||
int fildes = fileno (rl_instream);
|
int fildes = fileno (rl_instream);
|
||||||
|
|
||||||
#if defined (TIOCSTOP)
|
#if defined (TIOCSTOP)
|
||||||
@ -776,6 +831,7 @@ rl_stop_output (count, key)
|
|||||||
#endif /* !TIOCSTOP */
|
#endif /* !TIOCSTOP */
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
#endif /* !__MINGW32__ */
|
||||||
}
|
}
|
||||||
|
|
||||||
/* **************************************************************** */
|
/* **************************************************************** */
|
||||||
@ -784,9 +840,16 @@ rl_stop_output (count, key)
|
|||||||
/* */
|
/* */
|
||||||
/* **************************************************************** */
|
/* **************************************************************** */
|
||||||
|
|
||||||
|
#if !defined (NO_TTY_DRIVER)
|
||||||
#define SET_SPECIAL(sc, func) set_special_char(kmap, &ttybuff, sc, func)
|
#define SET_SPECIAL(sc, func) set_special_char(kmap, &ttybuff, sc, func)
|
||||||
|
#endif
|
||||||
|
|
||||||
#if defined (NEW_TTY_DRIVER)
|
#if defined (NO_TTY_DRIVER)
|
||||||
|
|
||||||
|
#define SET_SPECIAL(sc, func)
|
||||||
|
#define RESET_SPECIAL(c)
|
||||||
|
|
||||||
|
#elif defined (NEW_TTY_DRIVER)
|
||||||
static void
|
static void
|
||||||
set_special_char (kmap, tiop, sc, func)
|
set_special_char (kmap, tiop, sc, func)
|
||||||
Keymap kmap;
|
Keymap kmap;
|
||||||
@ -867,6 +930,7 @@ void
|
|||||||
rltty_set_default_bindings (kmap)
|
rltty_set_default_bindings (kmap)
|
||||||
Keymap kmap;
|
Keymap kmap;
|
||||||
{
|
{
|
||||||
|
#if !defined (NO_TTY_DRIVER)
|
||||||
TIOTYPE ttybuff;
|
TIOTYPE ttybuff;
|
||||||
int tty;
|
int tty;
|
||||||
static int called = 0;
|
static int called = 0;
|
||||||
@ -875,6 +939,7 @@ rltty_set_default_bindings (kmap)
|
|||||||
|
|
||||||
if (get_tty_settings (tty, &ttybuff) == 0)
|
if (get_tty_settings (tty, &ttybuff) == 0)
|
||||||
_rl_bind_tty_special_chars (kmap, ttybuff);
|
_rl_bind_tty_special_chars (kmap, ttybuff);
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
/* New public way to set the system default editing chars to their readline
|
/* New public way to set the system default editing chars to their readline
|
||||||
@ -912,7 +977,7 @@ rl_tty_unset_default_bindings (kmap)
|
|||||||
|
|
||||||
#if defined (HANDLE_SIGNALS)
|
#if defined (HANDLE_SIGNALS)
|
||||||
|
|
||||||
#if defined (NEW_TTY_DRIVER)
|
#if defined (NEW_TTY_DRIVER) || defined (NO_TTY_DRIVER)
|
||||||
int
|
int
|
||||||
_rl_disable_tty_signals ()
|
_rl_disable_tty_signals ()
|
||||||
{
|
{
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/* search.c - code for non-incremental searching in emacs and vi modes. */
|
/* search.c - code for non-incremental searching in emacs and vi modes. */
|
||||||
|
|
||||||
/* Copyright (C) 1992 Free Software Foundation, Inc.
|
/* Copyright (C) 1992-2005 Free Software Foundation, Inc.
|
||||||
|
|
||||||
This file is part of the Readline Library (the Library), a set of
|
This file is part of the Readline Library (the Library), a set of
|
||||||
routines for providing Emacs style line input to programs that ask
|
routines for providing Emacs style line input to programs that ask
|
||||||
@ -53,6 +53,8 @@
|
|||||||
#endif
|
#endif
|
||||||
#define abs(x) (((x) >= 0) ? (x) : -(x))
|
#define abs(x) (((x) >= 0) ? (x) : -(x))
|
||||||
|
|
||||||
|
_rl_search_cxt *_rl_nscxt = 0;
|
||||||
|
|
||||||
extern HIST_ENTRY *_rl_saved_line_for_history;
|
extern HIST_ENTRY *_rl_saved_line_for_history;
|
||||||
|
|
||||||
/* Functions imported from the rest of the library. */
|
/* Functions imported from the rest of the library. */
|
||||||
@ -68,13 +70,19 @@ static int rl_history_search_pos;
|
|||||||
static char *history_search_string;
|
static char *history_search_string;
|
||||||
static int history_string_size;
|
static int history_string_size;
|
||||||
|
|
||||||
|
static UNDO_LIST *noninc_saved_undo_list;
|
||||||
static void make_history_line_current PARAMS((HIST_ENTRY *));
|
static void make_history_line_current PARAMS((HIST_ENTRY *));
|
||||||
static int noninc_search_from_pos PARAMS((char *, int, int));
|
static int noninc_search_from_pos PARAMS((char *, int, int));
|
||||||
static void noninc_dosearch PARAMS((char *, int));
|
static int noninc_dosearch PARAMS((char *, int));
|
||||||
static void noninc_search PARAMS((int, int));
|
static int noninc_search PARAMS((int, int));
|
||||||
static int rl_history_search_internal PARAMS((int, int));
|
static int rl_history_search_internal PARAMS((int, int));
|
||||||
static void rl_history_search_reinit PARAMS((void));
|
static void rl_history_search_reinit PARAMS((void));
|
||||||
|
|
||||||
|
static _rl_search_cxt *_rl_nsearch_init PARAMS((int, int));
|
||||||
|
static int _rl_nsearch_cleanup PARAMS((_rl_search_cxt *, int));
|
||||||
|
static void _rl_nsearch_abort PARAMS((_rl_search_cxt *));
|
||||||
|
static int _rl_nsearch_dispatch PARAMS((_rl_search_cxt *, int));
|
||||||
|
|
||||||
/* Make the data from the history entry ENTRY be the contents of the
|
/* Make the data from the history entry ENTRY be the contents of the
|
||||||
current line. This doesn't do anything with rl_point; the caller
|
current line. This doesn't do anything with rl_point; the caller
|
||||||
must set it. */
|
must set it. */
|
||||||
@ -82,12 +90,15 @@ static void
|
|||||||
make_history_line_current (entry)
|
make_history_line_current (entry)
|
||||||
HIST_ENTRY *entry;
|
HIST_ENTRY *entry;
|
||||||
{
|
{
|
||||||
#if 0
|
|
||||||
rl_replace_line (entry->line, 1);
|
|
||||||
rl_undo_list = (UNDO_LIST *)entry->data;
|
|
||||||
#else
|
|
||||||
_rl_replace_text (entry->line, 0, rl_end);
|
_rl_replace_text (entry->line, 0, rl_end);
|
||||||
_rl_fix_point (1);
|
_rl_fix_point (1);
|
||||||
|
#if defined (VI_MODE)
|
||||||
|
if (rl_editing_mode == vi_mode)
|
||||||
|
/* POSIX.2 says that the `U' command doesn't affect the copy of any
|
||||||
|
command lines to the edit line. We're going to implement that by
|
||||||
|
making the undo list start after the matching line is copied to the
|
||||||
|
current editing buffer. */
|
||||||
|
rl_free_undo_list ();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (_rl_saved_line_for_history)
|
if (_rl_saved_line_for_history)
|
||||||
@ -130,8 +141,8 @@ noninc_search_from_pos (string, pos, dir)
|
|||||||
|
|
||||||
/* Search for a line in the history containing STRING. If DIR is < 0, the
|
/* Search for a line in the history containing STRING. If DIR is < 0, the
|
||||||
search is backwards through previous entries, else through subsequent
|
search is backwards through previous entries, else through subsequent
|
||||||
entries. */
|
entries. Returns 1 if the search was successful, 0 otherwise. */
|
||||||
static void
|
static int
|
||||||
noninc_dosearch (string, dir)
|
noninc_dosearch (string, dir)
|
||||||
char *string;
|
char *string;
|
||||||
int dir;
|
int dir;
|
||||||
@ -142,7 +153,7 @@ noninc_dosearch (string, dir)
|
|||||||
if (string == 0 || *string == '\0' || noninc_history_pos < 0)
|
if (string == 0 || *string == '\0' || noninc_history_pos < 0)
|
||||||
{
|
{
|
||||||
rl_ding ();
|
rl_ding ();
|
||||||
return;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
pos = noninc_search_from_pos (string, noninc_history_pos + dir, dir);
|
pos = noninc_search_from_pos (string, noninc_history_pos + dir, dir);
|
||||||
@ -153,7 +164,7 @@ noninc_dosearch (string, dir)
|
|||||||
rl_clear_message ();
|
rl_clear_message ();
|
||||||
rl_point = 0;
|
rl_point = 0;
|
||||||
rl_ding ();
|
rl_ding ();
|
||||||
return;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
noninc_history_pos = pos;
|
noninc_history_pos = pos;
|
||||||
@ -172,27 +183,24 @@ noninc_dosearch (string, dir)
|
|||||||
rl_mark = rl_end;
|
rl_mark = rl_end;
|
||||||
|
|
||||||
rl_clear_message ();
|
rl_clear_message ();
|
||||||
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Search non-interactively through the history list. DIR < 0 means to
|
static _rl_search_cxt *
|
||||||
search backwards through the history of previous commands; otherwise
|
_rl_nsearch_init (dir, pchar)
|
||||||
the search is for commands subsequent to the current position in the
|
int dir, pchar;
|
||||||
history list. PCHAR is the character to use for prompting when reading
|
|
||||||
the search string; if not specified (0), it defaults to `:'. */
|
|
||||||
static void
|
|
||||||
noninc_search (dir, pchar)
|
|
||||||
int dir;
|
|
||||||
int pchar;
|
|
||||||
{
|
{
|
||||||
int saved_point, saved_mark, c;
|
_rl_search_cxt *cxt;
|
||||||
char *p;
|
char *p;
|
||||||
#if defined (HANDLE_MULTIBYTE)
|
|
||||||
char mb[MB_LEN_MAX];
|
cxt = _rl_scxt_alloc (RL_SEARCH_NSEARCH, 0);
|
||||||
#endif
|
if (dir < 0)
|
||||||
|
cxt->sflags |= SF_REVERSE; /* not strictly needed */
|
||||||
|
|
||||||
|
cxt->direction = dir;
|
||||||
|
cxt->history_pos = cxt->save_line;
|
||||||
|
|
||||||
rl_maybe_save_line ();
|
rl_maybe_save_line ();
|
||||||
saved_point = rl_point;
|
|
||||||
saved_mark = rl_mark;
|
|
||||||
|
|
||||||
/* Clear the undo list, since reading the search string should create its
|
/* Clear the undo list, since reading the search string should create its
|
||||||
own undo list, and the whole list will end up being freed when we
|
own undo list, and the whole list will end up being freed when we
|
||||||
@ -207,39 +215,49 @@ noninc_search (dir, pchar)
|
|||||||
rl_message (p, 0, 0);
|
rl_message (p, 0, 0);
|
||||||
free (p);
|
free (p);
|
||||||
|
|
||||||
#define SEARCH_RETURN rl_restore_prompt (); RL_UNSETSTATE(RL_STATE_NSEARCH); return
|
|
||||||
|
|
||||||
RL_SETSTATE(RL_STATE_NSEARCH);
|
RL_SETSTATE(RL_STATE_NSEARCH);
|
||||||
/* Read the search string. */
|
|
||||||
while (1)
|
_rl_nscxt = cxt;
|
||||||
|
|
||||||
|
return cxt;
|
||||||
|
}
|
||||||
|
|
||||||
|
static int
|
||||||
|
_rl_nsearch_cleanup (cxt, r)
|
||||||
|
_rl_search_cxt *cxt;
|
||||||
|
int r;
|
||||||
{
|
{
|
||||||
RL_SETSTATE(RL_STATE_MOREINPUT);
|
_rl_scxt_dispose (cxt, 0);
|
||||||
c = rl_read_key ();
|
_rl_nscxt = 0;
|
||||||
RL_UNSETSTATE(RL_STATE_MOREINPUT);
|
|
||||||
|
|
||||||
#if defined (HANDLE_MULTIBYTE)
|
RL_UNSETSTATE(RL_STATE_NSEARCH);
|
||||||
if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
|
|
||||||
c = _rl_read_mbstring (c, mb, MB_LEN_MAX);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
if (c == 0)
|
return (r != 1);
|
||||||
break;
|
}
|
||||||
|
|
||||||
switch (c)
|
static void
|
||||||
{
|
_rl_nsearch_abort (cxt)
|
||||||
case CTRL('H'):
|
_rl_search_cxt *cxt;
|
||||||
case RUBOUT:
|
|
||||||
if (rl_point == 0)
|
|
||||||
{
|
{
|
||||||
rl_maybe_unsave_line ();
|
rl_maybe_unsave_line ();
|
||||||
rl_clear_message ();
|
rl_clear_message ();
|
||||||
rl_point = saved_point;
|
rl_point = cxt->save_point;
|
||||||
rl_mark = saved_mark;
|
rl_mark = cxt->save_mark;
|
||||||
SEARCH_RETURN;
|
rl_restore_prompt ();
|
||||||
}
|
|
||||||
_rl_rubout_char (1, c);
|
|
||||||
break;
|
|
||||||
|
|
||||||
|
RL_UNSETSTATE (RL_STATE_NSEARCH);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Process just-read character C according to search context CXT. Return -1
|
||||||
|
if the caller should abort the search, 0 if we should break out of the
|
||||||
|
loop, and 1 if we should continue to read characters. */
|
||||||
|
static int
|
||||||
|
_rl_nsearch_dispatch (cxt, c)
|
||||||
|
_rl_search_cxt *cxt;
|
||||||
|
int c;
|
||||||
|
{
|
||||||
|
switch (c)
|
||||||
|
{
|
||||||
case CTRL('W'):
|
case CTRL('W'):
|
||||||
rl_unix_word_rubout (1, c);
|
rl_unix_word_rubout (1, c);
|
||||||
break;
|
break;
|
||||||
@ -250,56 +268,116 @@ noninc_search (dir, pchar)
|
|||||||
|
|
||||||
case RETURN:
|
case RETURN:
|
||||||
case NEWLINE:
|
case NEWLINE:
|
||||||
goto dosearch;
|
return 0;
|
||||||
/* NOTREACHED */
|
|
||||||
|
case CTRL('H'):
|
||||||
|
case RUBOUT:
|
||||||
|
if (rl_point == 0)
|
||||||
|
{
|
||||||
|
_rl_nsearch_abort (cxt);
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
_rl_rubout_char (1, c);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case CTRL('C'):
|
case CTRL('C'):
|
||||||
case CTRL('G'):
|
case CTRL('G'):
|
||||||
rl_maybe_unsave_line ();
|
|
||||||
rl_clear_message ();
|
|
||||||
rl_point = saved_point;
|
|
||||||
rl_mark = saved_mark;
|
|
||||||
rl_ding ();
|
rl_ding ();
|
||||||
SEARCH_RETURN;
|
_rl_nsearch_abort (cxt);
|
||||||
|
return -1;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
#if defined (HANDLE_MULTIBYTE)
|
#if defined (HANDLE_MULTIBYTE)
|
||||||
if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
|
if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
|
||||||
rl_insert_text (mb);
|
rl_insert_text (cxt->mb);
|
||||||
else
|
else
|
||||||
#endif
|
#endif
|
||||||
_rl_insert_char (1, c);
|
_rl_insert_char (1, c);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
(*rl_redisplay_function) ();
|
(*rl_redisplay_function) ();
|
||||||
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
dosearch:
|
/* Perform one search according to CXT, using NONINC_SEARCH_STRING. Return
|
||||||
rl_mark = saved_mark;
|
-1 if the search should be aborted, any other value means to clean up
|
||||||
|
using _rl_nsearch_cleanup (). Returns 1 if the search was successful,
|
||||||
|
0 otherwise. */
|
||||||
|
static int
|
||||||
|
_rl_nsearch_dosearch (cxt)
|
||||||
|
_rl_search_cxt *cxt;
|
||||||
|
{
|
||||||
|
rl_mark = cxt->save_mark;
|
||||||
|
|
||||||
/* If rl_point == 0, we want to re-use the previous search string and
|
/* If rl_point == 0, we want to re-use the previous search string and
|
||||||
start from the saved history position. If there's no previous search
|
start from the saved history position. If there's no previous search
|
||||||
string, punt. */
|
string, punt. */
|
||||||
if (rl_point == 0)
|
if (rl_point == 0)
|
||||||
{
|
{
|
||||||
if (!noninc_search_string)
|
if (noninc_search_string == 0)
|
||||||
{
|
{
|
||||||
rl_ding ();
|
rl_ding ();
|
||||||
SEARCH_RETURN;
|
rl_restore_prompt ();
|
||||||
|
RL_UNSETSTATE (RL_STATE_NSEARCH);
|
||||||
|
return -1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
/* We want to start the search from the current history position. */
|
/* We want to start the search from the current history position. */
|
||||||
noninc_history_pos = where_history ();
|
noninc_history_pos = cxt->save_line;
|
||||||
FREE (noninc_search_string);
|
FREE (noninc_search_string);
|
||||||
noninc_search_string = savestring (rl_line_buffer);
|
noninc_search_string = savestring (rl_line_buffer);
|
||||||
|
|
||||||
|
/* If we don't want the subsequent undo list generated by the search
|
||||||
|
matching a history line to include the contents of the search string,
|
||||||
|
we need to clear rl_line_buffer here. For now, we just clear the
|
||||||
|
undo list generated by reading the search string. (If the search
|
||||||
|
fails, the old undo list will be restored by rl_maybe_unsave_line.) */
|
||||||
|
rl_free_undo_list ();
|
||||||
}
|
}
|
||||||
|
|
||||||
rl_restore_prompt ();
|
rl_restore_prompt ();
|
||||||
noninc_dosearch (noninc_search_string, dir);
|
return (noninc_dosearch (noninc_search_string, cxt->direction));
|
||||||
RL_UNSETSTATE(RL_STATE_NSEARCH);
|
}
|
||||||
|
|
||||||
|
/* Search non-interactively through the history list. DIR < 0 means to
|
||||||
|
search backwards through the history of previous commands; otherwise
|
||||||
|
the search is for commands subsequent to the current position in the
|
||||||
|
history list. PCHAR is the character to use for prompting when reading
|
||||||
|
the search string; if not specified (0), it defaults to `:'. */
|
||||||
|
static int
|
||||||
|
noninc_search (dir, pchar)
|
||||||
|
int dir;
|
||||||
|
int pchar;
|
||||||
|
{
|
||||||
|
_rl_search_cxt *cxt;
|
||||||
|
int c, r;
|
||||||
|
|
||||||
|
cxt = _rl_nsearch_init (dir, pchar);
|
||||||
|
|
||||||
|
if (RL_ISSTATE (RL_STATE_CALLBACK))
|
||||||
|
return (0);
|
||||||
|
|
||||||
|
/* Read the search string. */
|
||||||
|
r = 0;
|
||||||
|
while (1)
|
||||||
|
{
|
||||||
|
c = _rl_search_getchar (cxt);
|
||||||
|
|
||||||
|
if (c == 0)
|
||||||
|
break;
|
||||||
|
|
||||||
|
r = _rl_nsearch_dispatch (cxt, c);
|
||||||
|
if (r < 0)
|
||||||
|
return 1;
|
||||||
|
else if (r == 0)
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
r = _rl_nsearch_dosearch (cxt);
|
||||||
|
return ((r >= 0) ? _rl_nsearch_cleanup (cxt, r) : (r != 1));
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Search forward through the history list for a string. If the vi-mode
|
/* Search forward through the history list for a string. If the vi-mode
|
||||||
@ -308,8 +386,7 @@ int
|
|||||||
rl_noninc_forward_search (count, key)
|
rl_noninc_forward_search (count, key)
|
||||||
int count, key;
|
int count, key;
|
||||||
{
|
{
|
||||||
noninc_search (1, (key == '?') ? '?' : 0);
|
return noninc_search (1, (key == '?') ? '?' : 0);
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Reverse search the history list for a string. If the vi-mode code
|
/* Reverse search the history list for a string. If the vi-mode code
|
||||||
@ -318,8 +395,7 @@ int
|
|||||||
rl_noninc_reverse_search (count, key)
|
rl_noninc_reverse_search (count, key)
|
||||||
int count, key;
|
int count, key;
|
||||||
{
|
{
|
||||||
noninc_search (-1, (key == '/') ? '/' : 0);
|
return noninc_search (-1, (key == '/') ? '/' : 0);
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Search forward through the history list for the last string searched
|
/* Search forward through the history list for the last string searched
|
||||||
@ -328,13 +404,15 @@ int
|
|||||||
rl_noninc_forward_search_again (count, key)
|
rl_noninc_forward_search_again (count, key)
|
||||||
int count, key;
|
int count, key;
|
||||||
{
|
{
|
||||||
|
int r;
|
||||||
|
|
||||||
if (!noninc_search_string)
|
if (!noninc_search_string)
|
||||||
{
|
{
|
||||||
rl_ding ();
|
rl_ding ();
|
||||||
return (-1);
|
return (-1);
|
||||||
}
|
}
|
||||||
noninc_dosearch (noninc_search_string, 1);
|
r = noninc_dosearch (noninc_search_string, 1);
|
||||||
return 0;
|
return (r != 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Reverse search in the history list for the last string searched
|
/* Reverse search in the history list for the last string searched
|
||||||
@ -343,15 +421,34 @@ int
|
|||||||
rl_noninc_reverse_search_again (count, key)
|
rl_noninc_reverse_search_again (count, key)
|
||||||
int count, key;
|
int count, key;
|
||||||
{
|
{
|
||||||
|
int r;
|
||||||
|
|
||||||
if (!noninc_search_string)
|
if (!noninc_search_string)
|
||||||
{
|
{
|
||||||
rl_ding ();
|
rl_ding ();
|
||||||
return (-1);
|
return (-1);
|
||||||
}
|
}
|
||||||
noninc_dosearch (noninc_search_string, -1);
|
r = noninc_dosearch (noninc_search_string, -1);
|
||||||
return 0;
|
return (r != 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if defined (READLINE_CALLBACKS)
|
||||||
|
int
|
||||||
|
_rl_nsearch_callback (cxt)
|
||||||
|
_rl_search_cxt *cxt;
|
||||||
|
{
|
||||||
|
int c, r;
|
||||||
|
|
||||||
|
c = _rl_search_getchar (cxt);
|
||||||
|
r = _rl_nsearch_dispatch (cxt, c);
|
||||||
|
if (r != 0)
|
||||||
|
return 1;
|
||||||
|
|
||||||
|
r = _rl_nsearch_dosearch (cxt);
|
||||||
|
return ((r >= 0) ? _rl_nsearch_cleanup (cxt, r) : (r != 1));
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
static int
|
static int
|
||||||
rl_history_search_internal (count, dir)
|
rl_history_search_internal (count, dir)
|
||||||
int count, dir;
|
int count, dir;
|
||||||
|
@ -48,8 +48,12 @@
|
|||||||
# include <limits.h>
|
# include <limits.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if defined (HAVE_FCNTL_H)
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
|
#endif
|
||||||
|
#if defined (HAVE_PWD_H)
|
||||||
#include <pwd.h>
|
#include <pwd.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
|
||||||
@ -57,9 +61,9 @@
|
|||||||
#include "rlshell.h"
|
#include "rlshell.h"
|
||||||
#include "xmalloc.h"
|
#include "xmalloc.h"
|
||||||
|
|
||||||
#if !defined (HAVE_GETPW_DECLS)
|
#if defined (HAVE_GETPWUID) && !defined (HAVE_GETPW_DECLS)
|
||||||
extern struct passwd *getpwuid PARAMS((uid_t));
|
extern struct passwd *getpwuid PARAMS((uid_t));
|
||||||
#endif /* !HAVE_GETPW_DECLS */
|
#endif /* HAVE_GETPWUID && !HAVE_GETPW_DECLS */
|
||||||
|
|
||||||
#ifndef NULL
|
#ifndef NULL
|
||||||
# define NULL 0
|
# define NULL 0
|
||||||
@ -122,15 +126,6 @@ sh_set_lines_and_columns (lines, cols)
|
|||||||
{
|
{
|
||||||
char *b;
|
char *b;
|
||||||
|
|
||||||
#if defined (HAVE_PUTENV)
|
|
||||||
b = (char *)xmalloc (INT_STRLEN_BOUND (int) + sizeof ("LINES=") + 1);
|
|
||||||
sprintf (b, "LINES=%d", lines);
|
|
||||||
putenv (b);
|
|
||||||
|
|
||||||
b = (char *)xmalloc (INT_STRLEN_BOUND (int) + sizeof ("COLUMNS=") + 1);
|
|
||||||
sprintf (b, "COLUMNS=%d", cols);
|
|
||||||
putenv (b);
|
|
||||||
#else /* !HAVE_PUTENV */
|
|
||||||
#if defined (HAVE_SETENV)
|
#if defined (HAVE_SETENV)
|
||||||
b = (char *)xmalloc (INT_STRLEN_BOUND (int) + 1);
|
b = (char *)xmalloc (INT_STRLEN_BOUND (int) + 1);
|
||||||
sprintf (b, "%d", lines);
|
sprintf (b, "%d", lines);
|
||||||
@ -141,8 +136,17 @@ sh_set_lines_and_columns (lines, cols)
|
|||||||
sprintf (b, "%d", cols);
|
sprintf (b, "%d", cols);
|
||||||
setenv ("COLUMNS", b, 1);
|
setenv ("COLUMNS", b, 1);
|
||||||
free (b);
|
free (b);
|
||||||
# endif /* HAVE_SETENV */
|
#else /* !HAVE_SETENV */
|
||||||
#endif /* !HAVE_PUTENV */
|
# if defined (HAVE_PUTENV)
|
||||||
|
b = (char *)xmalloc (INT_STRLEN_BOUND (int) + sizeof ("LINES=") + 1);
|
||||||
|
sprintf (b, "LINES=%d", lines);
|
||||||
|
putenv (b);
|
||||||
|
|
||||||
|
b = (char *)xmalloc (INT_STRLEN_BOUND (int) + sizeof ("COLUMNS=") + 1);
|
||||||
|
sprintf (b, "COLUMNS=%d", cols);
|
||||||
|
putenv (b);
|
||||||
|
# endif /* HAVE_PUTENV */
|
||||||
|
#endif /* !HAVE_SETENV */
|
||||||
}
|
}
|
||||||
|
|
||||||
char *
|
char *
|
||||||
@ -159,9 +163,11 @@ sh_get_home_dir ()
|
|||||||
struct passwd *entry;
|
struct passwd *entry;
|
||||||
|
|
||||||
home_dir = (char *)NULL;
|
home_dir = (char *)NULL;
|
||||||
|
#if defined (HAVE_GETPWUID)
|
||||||
entry = getpwuid (getuid ());
|
entry = getpwuid (getuid ());
|
||||||
if (entry)
|
if (entry)
|
||||||
home_dir = entry->pw_dir;
|
home_dir = entry->pw_dir;
|
||||||
|
#endif
|
||||||
return (home_dir);
|
return (home_dir);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -175,6 +181,7 @@ int
|
|||||||
sh_unset_nodelay_mode (fd)
|
sh_unset_nodelay_mode (fd)
|
||||||
int fd;
|
int fd;
|
||||||
{
|
{
|
||||||
|
#if defined (HAVE_FCNTL)
|
||||||
int flags, bflags;
|
int flags, bflags;
|
||||||
|
|
||||||
if ((flags = fcntl (fd, F_GETFL, 0)) < 0)
|
if ((flags = fcntl (fd, F_GETFL, 0)) < 0)
|
||||||
@ -195,6 +202,7 @@ sh_unset_nodelay_mode (fd)
|
|||||||
flags &= ~bflags;
|
flags &= ~bflags;
|
||||||
return (fcntl (fd, F_SETFL, flags));
|
return (fcntl (fd, F_SETFL, flags));
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -53,6 +53,7 @@ host_os = @host_os@
|
|||||||
prefix = @prefix@
|
prefix = @prefix@
|
||||||
exec_prefix = @exec_prefix@
|
exec_prefix = @exec_prefix@
|
||||||
includedir = @includedir@
|
includedir = @includedir@
|
||||||
|
bindir = @bindir@
|
||||||
libdir = @libdir@
|
libdir = @libdir@
|
||||||
datadir = @datadir@
|
datadir = @datadir@
|
||||||
localedir = $(datadir)/locale
|
localedir = $(datadir)/locale
|
||||||
@ -65,7 +66,7 @@ LOCAL_CFLAGS = @LOCAL_CFLAGS@ -DRL_LIBRARY_VERSION='"$(RL_LIBRARY_VERSION)"'
|
|||||||
CPPFLAGS = @CPPFLAGS@
|
CPPFLAGS = @CPPFLAGS@
|
||||||
LDFLAGS = @LDFLAGS@ @LOCAL_LDFLAGS@ @CFLAGS@
|
LDFLAGS = @LDFLAGS@ @LOCAL_LDFLAGS@ @CFLAGS@
|
||||||
|
|
||||||
DEFS = @DEFS@
|
DEFS = @DEFS@ @CROSS_COMPILE@
|
||||||
LOCAL_DEFS = @LOCAL_DEFS@
|
LOCAL_DEFS = @LOCAL_DEFS@
|
||||||
|
|
||||||
#
|
#
|
||||||
@ -84,12 +85,18 @@ SHOBJ_LIBS = @SHOBJ_LIBS@
|
|||||||
|
|
||||||
SHLIB_XLDFLAGS = @LDFLAGS@ @SHLIB_XLDFLAGS@
|
SHLIB_XLDFLAGS = @LDFLAGS@ @SHLIB_XLDFLAGS@
|
||||||
SHLIB_LIBS = @SHLIB_LIBS@
|
SHLIB_LIBS = @SHLIB_LIBS@
|
||||||
|
|
||||||
|
SHLIB_DOT = @SHLIB_DOT@
|
||||||
|
SHLIB_LIBPREF = @SHLIB_LIBPREF@
|
||||||
SHLIB_LIBSUFF = @SHLIB_LIBSUFF@
|
SHLIB_LIBSUFF = @SHLIB_LIBSUFF@
|
||||||
|
|
||||||
SHLIB_LIBVERSION = @SHLIB_LIBVERSION@
|
SHLIB_LIBVERSION = @SHLIB_LIBVERSION@
|
||||||
|
SHLIB_DLLVERSION = @SHLIB_DLLVERSION@
|
||||||
|
|
||||||
SHLIB_STATUS = @SHLIB_STATUS@
|
SHLIB_STATUS = @SHLIB_STATUS@
|
||||||
|
|
||||||
|
TERMCAP_LIB = @TERMCAP_LIB@
|
||||||
|
|
||||||
# shared library versioning
|
# shared library versioning
|
||||||
SHLIB_MAJOR= @SHLIB_MAJOR@
|
SHLIB_MAJOR= @SHLIB_MAJOR@
|
||||||
# shared library systems like SVR4's do not use minor versions
|
# shared library systems like SVR4's do not use minor versions
|
||||||
@ -109,8 +116,8 @@ CCFLAGS = $(DEFS) $(LOCAL_DEFS) $(CPPFLAGS) $(INCLUDES) $(LOCAL_CFLAGS) $(CFLAGS
|
|||||||
|
|
||||||
# The name of the main library target.
|
# The name of the main library target.
|
||||||
|
|
||||||
SHARED_READLINE = libreadline.$(SHLIB_LIBVERSION)
|
SHARED_READLINE = $(SHLIB_LIBPREF)readline$(SHLIB_DOT)$(SHLIB_LIBVERSION)
|
||||||
SHARED_HISTORY = libhistory.$(SHLIB_LIBVERSION)
|
SHARED_HISTORY = $(SHLIB_LIBPREF)history$(SHLIB_DOT)$(SHLIB_LIBVERSION)
|
||||||
SHARED_LIBS = $(SHARED_READLINE) $(SHARED_HISTORY)
|
SHARED_LIBS = $(SHARED_READLINE) $(SHARED_HISTORY)
|
||||||
|
|
||||||
# The C code source files for this library.
|
# The C code source files for this library.
|
||||||
@ -174,13 +181,13 @@ installdirs: $(topdir)/support/mkdirs
|
|||||||
-$(SHELL) $(topdir)/support/mkdirs $(DESTDIR)$(libdir)
|
-$(SHELL) $(topdir)/support/mkdirs $(DESTDIR)$(libdir)
|
||||||
|
|
||||||
install: installdirs $(SHLIB_STATUS)
|
install: installdirs $(SHLIB_STATUS)
|
||||||
$(SHELL) $(topdir)/support/shlib-install -O $(host_os) -d $(DESTDIR)$(libdir) -i "$(INSTALL_DATA)" $(SHARED_HISTORY)
|
$(SHELL) $(topdir)/support/shlib-install -O $(host_os) -d $(DESTDIR)$(libdir) -b $(DESTDIR)$(bindir) -i "$(INSTALL_DATA)" $(SHARED_HISTORY)
|
||||||
$(SHELL) $(topdir)/support/shlib-install -O $(host_os) -d $(DESTDIR)$(libdir) -i "$(INSTALL_DATA)" $(SHARED_READLINE)
|
$(SHELL) $(topdir)/support/shlib-install -O $(host_os) -d $(DESTDIR)$(libdir) -b $(DESTDIR)$(bindir) -i "$(INSTALL_DATA)" $(SHARED_READLINE)
|
||||||
@echo install: you may need to run ldconfig
|
@echo install: you may need to run ldconfig
|
||||||
|
|
||||||
uninstall:
|
uninstall:
|
||||||
$(SHELL) $(topdir)/support/shlib-install -O $(host_os) -d $(DESTDIR)$(libdir) -U $(SHARED_HISTORY)
|
$(SHELL) $(topdir)/support/shlib-install -O $(host_os) -d $(DESTDIR)$(libdir) -b $(DESTDIR)$(bindir) -U $(SHARED_HISTORY)
|
||||||
$(SHELL) $(topdir)/support/shlib-install -O $(host_os) -d $(DESTDIR)$(libdir) -U $(SHARED_READLINE)
|
$(SHELL) $(topdir)/support/shlib-install -O $(host_os) -d $(DESTDIR)$(libdir) -b $(DESTDIR)$(bindir) -U $(SHARED_READLINE)
|
||||||
@echo uninstall: you may need to run ldconfig
|
@echo uninstall: you may need to run ldconfig
|
||||||
|
|
||||||
clean mostlyclean: force
|
clean mostlyclean: force
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/* signals.c -- signal handling support for readline. */
|
/* signals.c -- signal handling support for readline. */
|
||||||
|
|
||||||
/* Copyright (C) 1987, 1989, 1992 Free Software Foundation, Inc.
|
/* Copyright (C) 1987-2005 Free Software Foundation, Inc.
|
||||||
|
|
||||||
This file is part of the GNU Readline Library, a library for
|
This file is part of the GNU Readline Library, a library for
|
||||||
reading lines of text with interactive input and history editing.
|
reading lines of text with interactive input and history editing.
|
||||||
@ -131,7 +131,11 @@ rl_signal_handler (sig)
|
|||||||
#if !defined (HAVE_BSD_SIGNALS) && !defined (HAVE_POSIX_SIGNALS)
|
#if !defined (HAVE_BSD_SIGNALS) && !defined (HAVE_POSIX_SIGNALS)
|
||||||
/* Since the signal will not be blocked while we are in the signal
|
/* Since the signal will not be blocked while we are in the signal
|
||||||
handler, ignore it until rl_clear_signals resets the catcher. */
|
handler, ignore it until rl_clear_signals resets the catcher. */
|
||||||
|
# if defined (SIGALRM)
|
||||||
if (sig == SIGINT || sig == SIGALRM)
|
if (sig == SIGINT || sig == SIGALRM)
|
||||||
|
# else
|
||||||
|
if (sig == SIGINT)
|
||||||
|
# endif
|
||||||
rl_set_sighandler (sig, SIG_IGN, &dummy_cxt);
|
rl_set_sighandler (sig, SIG_IGN, &dummy_cxt);
|
||||||
#endif /* !HAVE_BSD_SIGNALS && !HAVE_POSIX_SIGNALS */
|
#endif /* !HAVE_BSD_SIGNALS && !HAVE_POSIX_SIGNALS */
|
||||||
|
|
||||||
@ -141,14 +145,18 @@ rl_signal_handler (sig)
|
|||||||
rl_free_line_state ();
|
rl_free_line_state ();
|
||||||
/* FALLTHROUGH */
|
/* FALLTHROUGH */
|
||||||
|
|
||||||
|
case SIGTERM:
|
||||||
#if defined (SIGTSTP)
|
#if defined (SIGTSTP)
|
||||||
case SIGTSTP:
|
case SIGTSTP:
|
||||||
case SIGTTOU:
|
case SIGTTOU:
|
||||||
case SIGTTIN:
|
case SIGTTIN:
|
||||||
#endif /* SIGTSTP */
|
#endif /* SIGTSTP */
|
||||||
|
#if defined (SIGALRM)
|
||||||
case SIGALRM:
|
case SIGALRM:
|
||||||
case SIGTERM:
|
#endif
|
||||||
|
#if defined (SIGQUIT)
|
||||||
case SIGQUIT:
|
case SIGQUIT:
|
||||||
|
#endif
|
||||||
rl_cleanup_after_signal ();
|
rl_cleanup_after_signal ();
|
||||||
|
|
||||||
#if defined (HAVE_POSIX_SIGNALS)
|
#if defined (HAVE_POSIX_SIGNALS)
|
||||||
@ -164,7 +172,11 @@ rl_signal_handler (sig)
|
|||||||
signal (sig, SIG_ACK);
|
signal (sig, SIG_ACK);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if defined (HAVE_KILL)
|
||||||
kill (getpid (), sig);
|
kill (getpid (), sig);
|
||||||
|
#else
|
||||||
|
raise (sig); /* assume we have raise */
|
||||||
|
#endif
|
||||||
|
|
||||||
/* Let the signal that we just sent through. */
|
/* Let the signal that we just sent through. */
|
||||||
#if defined (HAVE_POSIX_SIGNALS)
|
#if defined (HAVE_POSIX_SIGNALS)
|
||||||
@ -281,8 +293,11 @@ rl_set_signals ()
|
|||||||
{
|
{
|
||||||
rl_maybe_set_sighandler (SIGINT, rl_signal_handler, &old_int);
|
rl_maybe_set_sighandler (SIGINT, rl_signal_handler, &old_int);
|
||||||
rl_maybe_set_sighandler (SIGTERM, rl_signal_handler, &old_term);
|
rl_maybe_set_sighandler (SIGTERM, rl_signal_handler, &old_term);
|
||||||
|
#if defined (SIGQUIT)
|
||||||
rl_maybe_set_sighandler (SIGQUIT, rl_signal_handler, &old_quit);
|
rl_maybe_set_sighandler (SIGQUIT, rl_signal_handler, &old_quit);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined (SIGALRM)
|
||||||
oh = rl_set_sighandler (SIGALRM, rl_signal_handler, &old_alrm);
|
oh = rl_set_sighandler (SIGALRM, rl_signal_handler, &old_alrm);
|
||||||
if (oh == (SigHandler *)SIG_IGN)
|
if (oh == (SigHandler *)SIG_IGN)
|
||||||
rl_sigaction (SIGALRM, &old_alrm, &dummy);
|
rl_sigaction (SIGALRM, &old_alrm, &dummy);
|
||||||
@ -294,6 +309,7 @@ rl_set_signals ()
|
|||||||
if (oh != (SigHandler *)SIG_DFL && (old_alrm.sa_flags & SA_RESTART))
|
if (oh != (SigHandler *)SIG_DFL && (old_alrm.sa_flags & SA_RESTART))
|
||||||
rl_sigaction (SIGALRM, &old_alrm, &dummy);
|
rl_sigaction (SIGALRM, &old_alrm, &dummy);
|
||||||
#endif /* HAVE_POSIX_SIGNALS */
|
#endif /* HAVE_POSIX_SIGNALS */
|
||||||
|
#endif /* SIGALRM */
|
||||||
|
|
||||||
#if defined (SIGTSTP)
|
#if defined (SIGTSTP)
|
||||||
rl_maybe_set_sighandler (SIGTSTP, rl_signal_handler, &old_tstp);
|
rl_maybe_set_sighandler (SIGTSTP, rl_signal_handler, &old_tstp);
|
||||||
@ -332,8 +348,12 @@ rl_clear_signals ()
|
|||||||
|
|
||||||
rl_sigaction (SIGINT, &old_int, &dummy);
|
rl_sigaction (SIGINT, &old_int, &dummy);
|
||||||
rl_sigaction (SIGTERM, &old_term, &dummy);
|
rl_sigaction (SIGTERM, &old_term, &dummy);
|
||||||
|
#if defined (SIGQUIT)
|
||||||
rl_sigaction (SIGQUIT, &old_quit, &dummy);
|
rl_sigaction (SIGQUIT, &old_quit, &dummy);
|
||||||
|
#endif
|
||||||
|
#if defined (SIGALRM)
|
||||||
rl_sigaction (SIGALRM, &old_alrm, &dummy);
|
rl_sigaction (SIGALRM, &old_alrm, &dummy);
|
||||||
|
#endif
|
||||||
|
|
||||||
#if defined (SIGTSTP)
|
#if defined (SIGTSTP)
|
||||||
rl_sigaction (SIGTSTP, &old_tstp, &dummy);
|
rl_sigaction (SIGTSTP, &old_tstp, &dummy);
|
||||||
@ -368,6 +388,7 @@ void
|
|||||||
rl_cleanup_after_signal ()
|
rl_cleanup_after_signal ()
|
||||||
{
|
{
|
||||||
_rl_clean_up_for_exit ();
|
_rl_clean_up_for_exit ();
|
||||||
|
if (rl_deprep_term_function)
|
||||||
(*rl_deprep_term_function) ();
|
(*rl_deprep_term_function) ();
|
||||||
rl_clear_signals ();
|
rl_clear_signals ();
|
||||||
rl_clear_pending_input ();
|
rl_clear_pending_input ();
|
||||||
@ -377,6 +398,7 @@ rl_cleanup_after_signal ()
|
|||||||
void
|
void
|
||||||
rl_reset_after_signal ()
|
rl_reset_after_signal ()
|
||||||
{
|
{
|
||||||
|
if (rl_prep_term_function)
|
||||||
(*rl_prep_term_function) (_rl_meta_flag);
|
(*rl_prep_term_function) (_rl_meta_flag);
|
||||||
rl_set_signals ();
|
rl_set_signals ();
|
||||||
}
|
}
|
||||||
@ -398,7 +420,7 @@ rl_free_line_state ()
|
|||||||
|
|
||||||
_rl_kill_kbd_macro ();
|
_rl_kill_kbd_macro ();
|
||||||
rl_clear_message ();
|
rl_clear_message ();
|
||||||
_rl_init_argument ();
|
_rl_reset_argument ();
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif /* HANDLE_SIGNALS */
|
#endif /* HANDLE_SIGNALS */
|
||||||
|
2
contrib/libreadline/support/config.guess
vendored
2
contrib/libreadline/support/config.guess
vendored
@ -1162,7 +1162,7 @@ EOF
|
|||||||
*:QNX:*:4*)
|
*:QNX:*:4*)
|
||||||
echo i386-pc-qnx
|
echo i386-pc-qnx
|
||||||
exit 0 ;;
|
exit 0 ;;
|
||||||
NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*)
|
NSR-[DGKLNPTVWXY]:NONSTOP_KERNEL:*:*)
|
||||||
echo nsr-tandem-nsk${UNAME_RELEASE}
|
echo nsr-tandem-nsk${UNAME_RELEASE}
|
||||||
exit 0 ;;
|
exit 0 ;;
|
||||||
*:NonStop-UX:*:*)
|
*:NonStop-UX:*:*)
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
# shlib-install - install a shared library and do any necessary host-specific
|
# shlib-install - install a shared library and do any necessary host-specific
|
||||||
# post-installation configuration (like ldconfig)
|
# post-installation configuration (like ldconfig)
|
||||||
#
|
#
|
||||||
# usage: shlib-install [-D] -O host_os -d installation-dir -i install-prog [-U] library
|
# usage: shlib-install [-D] -O host_os -d installation-dir [-b bin-dir] -i install-prog [-U] library
|
||||||
#
|
#
|
||||||
# Chet Ramey
|
# Chet Ramey
|
||||||
# chet@po.cwru.edu
|
# chet@po.cwru.edu
|
||||||
@ -15,7 +15,7 @@ INSTALLDIR=/usr/local/lib
|
|||||||
LDCONFIG=ldconfig
|
LDCONFIG=ldconfig
|
||||||
|
|
||||||
PROGNAME=`basename $0`
|
PROGNAME=`basename $0`
|
||||||
USAGE="$PROGNAME [-D] -O host_os -d installation-dir -i install-prog [-U] library"
|
USAGE="$PROGNAME [-D] -O host_os -d installation-dir [-b bin-dir] -i install-prog [-U] library"
|
||||||
|
|
||||||
# process options
|
# process options
|
||||||
|
|
||||||
@ -23,6 +23,7 @@ while [ $# -gt 0 ]; do
|
|||||||
case "$1" in
|
case "$1" in
|
||||||
-O) shift; host_os="$1"; shift ;;
|
-O) shift; host_os="$1"; shift ;;
|
||||||
-d) shift; INSTALLDIR="$1"; shift ;;
|
-d) shift; INSTALLDIR="$1"; shift ;;
|
||||||
|
-b) shift; BINDIR="$1" ; shift ;;
|
||||||
-i) shift; INSTALLPROG="$1" ; shift ;;
|
-i) shift; INSTALLPROG="$1" ; shift ;;
|
||||||
-D) echo=echo ; shift ;;
|
-D) echo=echo ; shift ;;
|
||||||
-U) uninstall=true ; shift ;;
|
-U) uninstall=true ; shift ;;
|
||||||
@ -64,11 +65,30 @@ fi
|
|||||||
# post-install/uninstall
|
# post-install/uninstall
|
||||||
|
|
||||||
# HP-UX and Darwin/MacOS X require that a shared library have execute permission
|
# HP-UX and Darwin/MacOS X require that a shared library have execute permission
|
||||||
|
# Cygwin installs both a dll (which must go in $BINDIR) and an implicit
|
||||||
|
# link library (in $libdir)
|
||||||
case "$host_os" in
|
case "$host_os" in
|
||||||
hpux*|darwin*|macosx*)
|
hpux*|darwin*|macosx*)
|
||||||
if [ -z "$uninstall" ]; then
|
if [ -z "$uninstall" ]; then
|
||||||
chmod 555 ${INSTALLDIR}/${LIBNAME}
|
chmod 555 ${INSTALLDIR}/${LIBNAME}
|
||||||
fi ;;
|
fi ;;
|
||||||
|
cygwin*)
|
||||||
|
IMPLIBNAME=`echo ${LIBNAME} \
|
||||||
|
| sed -e 's,^cyg,lib,' -e 's,[0-9]*.dll$,.dll.a,'`
|
||||||
|
if [ -z "$uninstall" ]; then
|
||||||
|
${echo} $RM ${BINDIR}/${LIBNAME}.${OLDSUFF}
|
||||||
|
if [ -f "$BINDIR/$LIBNAME" ]; then
|
||||||
|
${echo} $MV $BINDIR/$LIBNAME $BINDIR/$LIBNAME.$OLDSUFF
|
||||||
|
fi
|
||||||
|
${echo} $MV ${INSTALLDIR}/${LIBNAME} ${BINDIR}/${LIBNAME}
|
||||||
|
${echo} chmod a+x ${BINDIR}/${LIBNAME}
|
||||||
|
${echo} eval ${INSTALLPROG} ${LIBNAME}.a \
|
||||||
|
${INSTALLDIR}/${IMPLIBNAME}
|
||||||
|
else
|
||||||
|
${echo} ${RM} ${BINDIR}/${LIBNAME}
|
||||||
|
${echo} ${RM} ${INSTALLDIR}/${IMPLIBNAME}
|
||||||
|
fi ;;
|
||||||
|
|
||||||
*) ;;
|
*) ;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
@ -163,6 +183,12 @@ hpux1*)
|
|||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
|
|
||||||
|
cygwin*)
|
||||||
|
# Links to .dlls don't work. Hence shobj-conf used DLLVERSION.dll
|
||||||
|
# instead of so.SHLIB_MAJOR.SHLIB_MINOR. The postinstall above
|
||||||
|
# took care of everything else.
|
||||||
|
;;
|
||||||
|
|
||||||
*) ;;
|
*) ;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
@ -41,9 +41,13 @@ SHOBJ_LIBS=
|
|||||||
|
|
||||||
SHLIB_XLDFLAGS=
|
SHLIB_XLDFLAGS=
|
||||||
SHLIB_LIBS=
|
SHLIB_LIBS=
|
||||||
|
|
||||||
|
SHLIB_DOT='.'
|
||||||
|
SHLIB_LIBPREF='lib'
|
||||||
SHLIB_LIBSUFF='so'
|
SHLIB_LIBSUFF='so'
|
||||||
|
|
||||||
SHLIB_LIBVERSION='$(SHLIB_LIBSUFF)'
|
SHLIB_LIBVERSION='$(SHLIB_LIBSUFF)'
|
||||||
|
SHLIB_DLLVERSION='$(SHLIB_MAJOR)'
|
||||||
|
|
||||||
PROGNAME=`basename $0`
|
PROGNAME=`basename $0`
|
||||||
USAGE="$PROGNAME [-C compiler] -c host_cpu -o host_os -v host_vendor"
|
USAGE="$PROGNAME [-C compiler] -c host_cpu -o host_os -v host_vendor"
|
||||||
@ -78,10 +82,14 @@ sunos4*)
|
|||||||
sunos5*-*gcc*|solaris2*-*gcc*)
|
sunos5*-*gcc*|solaris2*-*gcc*)
|
||||||
SHOBJ_CFLAGS=-fpic
|
SHOBJ_CFLAGS=-fpic
|
||||||
SHOBJ_LD='${CC}'
|
SHOBJ_LD='${CC}'
|
||||||
|
ld_used=`gcc -print-prog-name=ld`
|
||||||
|
if ${ld_used} -V 2>&1 | grep GNU >/dev/null 2>&1; then
|
||||||
|
# This line works for the GNU ld
|
||||||
|
SHOBJ_LDFLAGS='-shared -Wl,-h,$@'
|
||||||
|
else
|
||||||
# This line works for the Solaris linker in /usr/ccs/bin/ld
|
# This line works for the Solaris linker in /usr/ccs/bin/ld
|
||||||
SHOBJ_LDFLAGS='-shared -Wl,-i -Wl,-h,$@'
|
SHOBJ_LDFLAGS='-shared -Wl,-i -Wl,-h,$@'
|
||||||
# This line works for the GNU ld
|
fi
|
||||||
# SHOBJ_LDFLAGS='-shared -Wl,-h,$@'
|
|
||||||
|
|
||||||
# SHLIB_XLDFLAGS='-R $(libdir)'
|
# SHLIB_XLDFLAGS='-R $(libdir)'
|
||||||
SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)'
|
SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)'
|
||||||
@ -116,7 +124,7 @@ freebsd2* | netbsd*)
|
|||||||
;;
|
;;
|
||||||
|
|
||||||
# FreeBSD-3.x ELF
|
# FreeBSD-3.x ELF
|
||||||
freebsd[3-9]*|freebsdelf[3-9]*|freebsdaout[3-9]*)
|
freebsd[3-9]*|freebsdelf[3-9]*|freebsdaout[3-9]*|dragonfly*)
|
||||||
SHOBJ_CFLAGS=-fpic
|
SHOBJ_CFLAGS=-fpic
|
||||||
SHOBJ_LD='${CC}'
|
SHOBJ_LD='${CC}'
|
||||||
|
|
||||||
@ -146,7 +154,7 @@ darwin*|macosx*)
|
|||||||
SHLIB_LIBSUFF='dylib'
|
SHLIB_LIBSUFF='dylib'
|
||||||
|
|
||||||
case "${host_os}" in
|
case "${host_os}" in
|
||||||
darwin7*) SHOBJ_LDFLAGS=''
|
darwin[78]*) SHOBJ_LDFLAGS=''
|
||||||
SHLIB_XLDFLAGS='-dynamiclib -arch_only `/usr/bin/arch` -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v'
|
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'
|
*) SHOBJ_LDFLAGS='-dynamic'
|
||||||
@ -409,6 +417,38 @@ sysv5uw7*)
|
|||||||
SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)'
|
SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)'
|
||||||
;;
|
;;
|
||||||
|
|
||||||
|
sysv5UnixWare*-*gcc*)
|
||||||
|
SHOBJ_CFLAGS=-fpic
|
||||||
|
SHOBJ_LD='${CC}'
|
||||||
|
SHOBJ_LDFLAGS='-shared'
|
||||||
|
|
||||||
|
SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)'
|
||||||
|
;;
|
||||||
|
|
||||||
|
sysv5UnixWare*)
|
||||||
|
SHOBJ_CFLAGS='-K PIC'
|
||||||
|
SHOBJ_LD=ld
|
||||||
|
SHOBJ_LDFLAGS='-G -dy -z text -h $@'
|
||||||
|
|
||||||
|
SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)'
|
||||||
|
;;
|
||||||
|
|
||||||
|
sysv5OpenUNIX*-*gcc*)
|
||||||
|
SHOBJ_CFLAGS=-fpic
|
||||||
|
SHOBJ_LD='${CC}'
|
||||||
|
SHOBJ_LDFLAGS='-shared'
|
||||||
|
|
||||||
|
SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)'
|
||||||
|
;;
|
||||||
|
|
||||||
|
sysv5OpenUNIX*)
|
||||||
|
SHOBJ_CFLAGS='-K PIC'
|
||||||
|
SHOBJ_LD=ld
|
||||||
|
SHOBJ_LDFLAGS='-G -dy -z text -h $@'
|
||||||
|
|
||||||
|
SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)'
|
||||||
|
;;
|
||||||
|
|
||||||
dgux*-*gcc*)
|
dgux*-*gcc*)
|
||||||
SHOBJ_CFLAGS=-fpic
|
SHOBJ_CFLAGS=-fpic
|
||||||
SHOBJ_LD='${CC}'
|
SHOBJ_LD='${CC}'
|
||||||
@ -430,6 +470,24 @@ msdos*)
|
|||||||
SHLIB_STATUS=unsupported
|
SHLIB_STATUS=unsupported
|
||||||
;;
|
;;
|
||||||
|
|
||||||
|
cygwin*)
|
||||||
|
SHOBJ_LD='$(CC)'
|
||||||
|
SHOBJ_LDFLAGS='-shared -Wl,--enable-auto-import -Wl,--enable-auto-image-base -Wl,--export-all -Wl,--out-implib=$(@).a'
|
||||||
|
SHLIB_LIBPREF='cyg'
|
||||||
|
SHLIB_LIBSUFF='dll'
|
||||||
|
SHLIB_LIBVERSION='$(SHLIB_DLLVERSION).$(SHLIB_LIBSUFF)'
|
||||||
|
SHLIB_LIBS='$(TERMCAP_LIB)'
|
||||||
|
|
||||||
|
SHLIB_DOT=
|
||||||
|
# For official cygwin releases, DLLVERSION will be defined in the
|
||||||
|
# environment of configure, and will be incremented any time the API
|
||||||
|
# changes in a non-backwards compatible manner. Otherwise, it is just
|
||||||
|
# SHLIB_MAJOR.
|
||||||
|
if [ -n "$DLLVERSION" ] ; then
|
||||||
|
SHLIB_DLLVERSION="$DLLVERSION"
|
||||||
|
fi
|
||||||
|
;;
|
||||||
|
|
||||||
#
|
#
|
||||||
# Rely on correct gcc configuration for everything else
|
# Rely on correct gcc configuration for everything else
|
||||||
#
|
#
|
||||||
@ -457,8 +515,14 @@ echo SHOBJ_LIBS=\'"$SHOBJ_LIBS"\'
|
|||||||
|
|
||||||
echo SHLIB_XLDFLAGS=\'"$SHLIB_XLDFLAGS"\'
|
echo SHLIB_XLDFLAGS=\'"$SHLIB_XLDFLAGS"\'
|
||||||
echo SHLIB_LIBS=\'"$SHLIB_LIBS"\'
|
echo SHLIB_LIBS=\'"$SHLIB_LIBS"\'
|
||||||
|
|
||||||
|
echo SHLIB_DOT=\'"$SHLIB_DOT"\'
|
||||||
|
|
||||||
|
echo SHLIB_LIBPREF=\'"$SHLIB_LIBPREF"\'
|
||||||
echo SHLIB_LIBSUFF=\'"$SHLIB_LIBSUFF"\'
|
echo SHLIB_LIBSUFF=\'"$SHLIB_LIBSUFF"\'
|
||||||
|
|
||||||
echo SHLIB_LIBVERSION=\'"$SHLIB_LIBVERSION"\'
|
echo SHLIB_LIBVERSION=\'"$SHLIB_LIBVERSION"\'
|
||||||
|
echo SHLIB_DLLVERSION=\'"$SHLIB_DLLVERSION"\'
|
||||||
|
|
||||||
echo SHOBJ_STATUS=\'"$SHOBJ_STATUS"\'
|
echo SHOBJ_STATUS=\'"$SHOBJ_STATUS"\'
|
||||||
echo SHLIB_STATUS=\'"$SHLIB_STATUS"\'
|
echo SHLIB_STATUS=\'"$SHLIB_STATUS"\'
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/* terminal.c -- controlling the terminal with termcap. */
|
/* terminal.c -- controlling the terminal with termcap. */
|
||||||
|
|
||||||
/* Copyright (C) 1996 Free Software Foundation, Inc.
|
/* Copyright (C) 1996-2005 Free Software Foundation, Inc.
|
||||||
|
|
||||||
This file is part of the GNU Readline Library, a library for
|
This file is part of the GNU Readline Library, a library for
|
||||||
reading lines of text with interactive input and history editing.
|
reading lines of text with interactive input and history editing.
|
||||||
@ -69,6 +69,8 @@
|
|||||||
#define CUSTOM_REDISPLAY_FUNC() (rl_redisplay_function != rl_redisplay)
|
#define CUSTOM_REDISPLAY_FUNC() (rl_redisplay_function != rl_redisplay)
|
||||||
#define CUSTOM_INPUT_FUNC() (rl_getc_function != rl_getc)
|
#define CUSTOM_INPUT_FUNC() (rl_getc_function != rl_getc)
|
||||||
|
|
||||||
|
int rl_prefer_env_winsize;
|
||||||
|
|
||||||
/* **************************************************************** */
|
/* **************************************************************** */
|
||||||
/* */
|
/* */
|
||||||
/* Terminal and Termcap */
|
/* Terminal and Termcap */
|
||||||
@ -145,6 +147,9 @@ static char *_rl_term_kh;
|
|||||||
static char *_rl_term_kH;
|
static char *_rl_term_kH;
|
||||||
static char *_rl_term_at7; /* @7 */
|
static char *_rl_term_at7; /* @7 */
|
||||||
|
|
||||||
|
/* Delete key */
|
||||||
|
static char *_rl_term_kD;
|
||||||
|
|
||||||
/* Insert key */
|
/* Insert key */
|
||||||
static char *_rl_term_kI;
|
static char *_rl_term_kI;
|
||||||
|
|
||||||
@ -191,12 +196,14 @@ _rl_get_screen_size (tty, ignore_env)
|
|||||||
#if defined (TIOCGWINSZ)
|
#if defined (TIOCGWINSZ)
|
||||||
struct winsize window_size;
|
struct winsize window_size;
|
||||||
#endif /* TIOCGWINSZ */
|
#endif /* TIOCGWINSZ */
|
||||||
|
int wr, wc;
|
||||||
|
|
||||||
|
wr = wc = -1;
|
||||||
#if defined (TIOCGWINSZ)
|
#if defined (TIOCGWINSZ)
|
||||||
if (ioctl (tty, TIOCGWINSZ, &window_size) == 0)
|
if (ioctl (tty, TIOCGWINSZ, &window_size) == 0)
|
||||||
{
|
{
|
||||||
_rl_screenwidth = (int) window_size.ws_col;
|
wc = (int) window_size.ws_col;
|
||||||
_rl_screenheight = (int) window_size.ws_row;
|
wr = (int) window_size.ws_row;
|
||||||
}
|
}
|
||||||
#endif /* TIOCGWINSZ */
|
#endif /* TIOCGWINSZ */
|
||||||
|
|
||||||
@ -204,13 +211,25 @@ _rl_get_screen_size (tty, ignore_env)
|
|||||||
_emx_get_screensize (&_rl_screenwidth, &_rl_screenheight);
|
_emx_get_screensize (&_rl_screenwidth, &_rl_screenheight);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
if (ignore_env || rl_prefer_env_winsize == 0)
|
||||||
|
{
|
||||||
|
_rl_screenwidth = wc;
|
||||||
|
_rl_screenheight = wr;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
_rl_screenwidth = _rl_screenheight = -1;
|
||||||
|
|
||||||
/* Environment variable COLUMNS overrides setting of "co" if IGNORE_ENV
|
/* Environment variable COLUMNS overrides setting of "co" if IGNORE_ENV
|
||||||
is unset. */
|
is unset. If we prefer the environment, check it first before
|
||||||
|
assigning the value returned by the kernel. */
|
||||||
if (_rl_screenwidth <= 0)
|
if (_rl_screenwidth <= 0)
|
||||||
{
|
{
|
||||||
if (ignore_env == 0 && (ss = sh_get_env_value ("COLUMNS")))
|
if (ignore_env == 0 && (ss = sh_get_env_value ("COLUMNS")))
|
||||||
_rl_screenwidth = atoi (ss);
|
_rl_screenwidth = atoi (ss);
|
||||||
|
|
||||||
|
if (_rl_screenwidth <= 0)
|
||||||
|
_rl_screenwidth = wc;
|
||||||
|
|
||||||
#if !defined (__DJGPP__)
|
#if !defined (__DJGPP__)
|
||||||
if (_rl_screenwidth <= 0 && term_string_buffer)
|
if (_rl_screenwidth <= 0 && term_string_buffer)
|
||||||
_rl_screenwidth = tgetnum ("co");
|
_rl_screenwidth = tgetnum ("co");
|
||||||
@ -224,6 +243,9 @@ _rl_get_screen_size (tty, ignore_env)
|
|||||||
if (ignore_env == 0 && (ss = sh_get_env_value ("LINES")))
|
if (ignore_env == 0 && (ss = sh_get_env_value ("LINES")))
|
||||||
_rl_screenheight = atoi (ss);
|
_rl_screenheight = atoi (ss);
|
||||||
|
|
||||||
|
if (_rl_screenheight <= 0)
|
||||||
|
_rl_screenheight = wr;
|
||||||
|
|
||||||
#if !defined (__DJGPP__)
|
#if !defined (__DJGPP__)
|
||||||
if (_rl_screenheight <= 0 && term_string_buffer)
|
if (_rl_screenheight <= 0 && term_string_buffer)
|
||||||
_rl_screenheight = tgetnum ("li");
|
_rl_screenheight = tgetnum ("li");
|
||||||
@ -252,15 +274,16 @@ void
|
|||||||
_rl_set_screen_size (rows, cols)
|
_rl_set_screen_size (rows, cols)
|
||||||
int rows, cols;
|
int rows, cols;
|
||||||
{
|
{
|
||||||
if (rows == 0 || cols == 0)
|
if (rows > 0)
|
||||||
return;
|
|
||||||
|
|
||||||
_rl_screenheight = rows;
|
_rl_screenheight = rows;
|
||||||
|
if (cols > 0)
|
||||||
|
{
|
||||||
_rl_screenwidth = cols;
|
_rl_screenwidth = cols;
|
||||||
|
|
||||||
if (_rl_term_autowrap == 0)
|
if (_rl_term_autowrap == 0)
|
||||||
_rl_screenwidth--;
|
_rl_screenwidth--;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (rows > 0 || cols > 0)
|
||||||
_rl_screenchars = _rl_screenwidth * _rl_screenheight;
|
_rl_screenchars = _rl_screenwidth * _rl_screenheight;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -281,6 +304,12 @@ rl_get_screen_size (rows, cols)
|
|||||||
*cols = _rl_screenwidth;
|
*cols = _rl_screenwidth;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
rl_reset_screen_size ()
|
||||||
|
{
|
||||||
|
_rl_get_screen_size (fileno (rl_instream), 0);
|
||||||
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
rl_resize_terminal ()
|
rl_resize_terminal ()
|
||||||
{
|
{
|
||||||
@ -313,6 +342,7 @@ static struct _tc_string tc_strings[] =
|
|||||||
{ "ei", &_rl_term_ei },
|
{ "ei", &_rl_term_ei },
|
||||||
{ "ic", &_rl_term_ic },
|
{ "ic", &_rl_term_ic },
|
||||||
{ "im", &_rl_term_im },
|
{ "im", &_rl_term_im },
|
||||||
|
{ "kD", &_rl_term_kD }, /* delete */
|
||||||
{ "kH", &_rl_term_kH }, /* home down ?? */
|
{ "kH", &_rl_term_kH }, /* home down ?? */
|
||||||
{ "kI", &_rl_term_kI }, /* insert */
|
{ "kI", &_rl_term_kI }, /* insert */
|
||||||
{ "kd", &_rl_term_kd },
|
{ "kd", &_rl_term_kd },
|
||||||
@ -363,7 +393,6 @@ _rl_init_terminal_io (terminal_name)
|
|||||||
term = terminal_name ? terminal_name : sh_get_env_value ("TERM");
|
term = terminal_name ? terminal_name : sh_get_env_value ("TERM");
|
||||||
_rl_term_clrpag = _rl_term_cr = _rl_term_clreol = (char *)NULL;
|
_rl_term_clrpag = _rl_term_cr = _rl_term_clreol = (char *)NULL;
|
||||||
tty = rl_instream ? fileno (rl_instream) : 0;
|
tty = rl_instream ? fileno (rl_instream) : 0;
|
||||||
_rl_screenwidth = _rl_screenheight = 0;
|
|
||||||
|
|
||||||
if (term == 0)
|
if (term == 0)
|
||||||
term = "dumb";
|
term = "dumb";
|
||||||
@ -396,12 +425,17 @@ _rl_init_terminal_io (terminal_name)
|
|||||||
|
|
||||||
_rl_term_autowrap = 0; /* used by _rl_get_screen_size */
|
_rl_term_autowrap = 0; /* used by _rl_get_screen_size */
|
||||||
|
|
||||||
|
/* Allow calling application to set default height and width, using
|
||||||
|
rl_set_screen_size */
|
||||||
|
if (_rl_screenwidth <= 0 || _rl_screenheight <= 0)
|
||||||
|
{
|
||||||
#if defined (__EMX__)
|
#if defined (__EMX__)
|
||||||
_emx_get_screensize (&_rl_screenwidth, &_rl_screenheight);
|
_emx_get_screensize (&_rl_screenwidth, &_rl_screenheight);
|
||||||
_rl_screenwidth--;
|
_rl_screenwidth--;
|
||||||
#else /* !__EMX__ */
|
#else /* !__EMX__ */
|
||||||
_rl_get_screen_size (tty, 0);
|
_rl_get_screen_size (tty, 0);
|
||||||
#endif /* !__EMX__ */
|
#endif /* !__EMX__ */
|
||||||
|
}
|
||||||
|
|
||||||
/* Defaults. */
|
/* Defaults. */
|
||||||
if (_rl_screenwidth <= 0 || _rl_screenheight <= 0)
|
if (_rl_screenwidth <= 0 || _rl_screenheight <= 0)
|
||||||
@ -416,7 +450,7 @@ _rl_init_terminal_io (terminal_name)
|
|||||||
_rl_term_im = _rl_term_ei = _rl_term_ic = _rl_term_IC = (char *)NULL;
|
_rl_term_im = _rl_term_ei = _rl_term_ic = _rl_term_IC = (char *)NULL;
|
||||||
_rl_term_up = _rl_term_dc = _rl_term_DC = _rl_visible_bell = (char *)NULL;
|
_rl_term_up = _rl_term_dc = _rl_term_DC = _rl_visible_bell = (char *)NULL;
|
||||||
_rl_term_ku = _rl_term_kd = _rl_term_kl = _rl_term_kr = (char *)NULL;
|
_rl_term_ku = _rl_term_kd = _rl_term_kl = _rl_term_kr = (char *)NULL;
|
||||||
_rl_term_kh = _rl_term_kH = _rl_term_kI = (char *)NULL;
|
_rl_term_kh = _rl_term_kH = _rl_term_kI = _rl_term_kD = (char *)NULL;
|
||||||
_rl_term_ks = _rl_term_ke = _rl_term_at7 = (char *)NULL;
|
_rl_term_ks = _rl_term_ke = _rl_term_at7 = (char *)NULL;
|
||||||
_rl_term_mm = _rl_term_mo = (char *)NULL;
|
_rl_term_mm = _rl_term_mo = (char *)NULL;
|
||||||
_rl_term_ve = _rl_term_vs = (char *)NULL;
|
_rl_term_ve = _rl_term_vs = (char *)NULL;
|
||||||
@ -448,6 +482,9 @@ _rl_init_terminal_io (terminal_name)
|
|||||||
|
|
||||||
_rl_term_autowrap = tgetflag ("am") && tgetflag ("xn");
|
_rl_term_autowrap = tgetflag ("am") && tgetflag ("xn");
|
||||||
|
|
||||||
|
/* Allow calling application to set default height and width, using
|
||||||
|
rl_set_screen_size */
|
||||||
|
if (_rl_screenwidth <= 0 || _rl_screenheight <= 0)
|
||||||
_rl_get_screen_size (tty, 0);
|
_rl_get_screen_size (tty, 0);
|
||||||
|
|
||||||
/* "An application program can assume that the terminal can do
|
/* "An application program can assume that the terminal can do
|
||||||
@ -493,6 +530,8 @@ bind_termcap_arrow_keys (map)
|
|||||||
rl_bind_keyseq_if_unbound (_rl_term_kh, rl_beg_of_line); /* Home */
|
rl_bind_keyseq_if_unbound (_rl_term_kh, rl_beg_of_line); /* Home */
|
||||||
rl_bind_keyseq_if_unbound (_rl_term_at7, rl_end_of_line); /* End */
|
rl_bind_keyseq_if_unbound (_rl_term_at7, rl_end_of_line); /* End */
|
||||||
|
|
||||||
|
rl_bind_keyseq_if_unbound (_rl_term_kD, rl_delete);
|
||||||
|
|
||||||
_rl_keymap = xkeymap;
|
_rl_keymap = xkeymap;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -518,6 +557,7 @@ int
|
|||||||
rl_reset_terminal (terminal_name)
|
rl_reset_terminal (terminal_name)
|
||||||
const char *terminal_name;
|
const char *terminal_name;
|
||||||
{
|
{
|
||||||
|
_rl_screenwidth = _rl_screenheight = 0;
|
||||||
_rl_init_terminal_io (terminal_name);
|
_rl_init_terminal_io (terminal_name);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/* text.c -- text handling commands for readline. */
|
/* text.c -- text handling commands for readline. */
|
||||||
|
|
||||||
/* Copyright (C) 1987-2004 Free Software Foundation, Inc.
|
/* Copyright (C) 1987-2005 Free Software Foundation, Inc.
|
||||||
|
|
||||||
This file is part of the GNU Readline Library, a library for
|
This file is part of the GNU Readline Library, a library for
|
||||||
reading lines of text with interactive input and history editing.
|
reading lines of text with interactive input and history editing.
|
||||||
@ -62,6 +62,11 @@
|
|||||||
static int rl_change_case PARAMS((int, int));
|
static int rl_change_case PARAMS((int, int));
|
||||||
static int _rl_char_search PARAMS((int, int, int));
|
static int _rl_char_search PARAMS((int, int, int));
|
||||||
|
|
||||||
|
#if defined (READLINE_CALLBACKS)
|
||||||
|
static int _rl_insert_next_callback PARAMS((_rl_callback_generic_arg *));
|
||||||
|
static int _rl_char_search_callback PARAMS((_rl_callback_generic_arg *));
|
||||||
|
#endif
|
||||||
|
|
||||||
/* **************************************************************** */
|
/* **************************************************************** */
|
||||||
/* */
|
/* */
|
||||||
/* Insert and Delete */
|
/* Insert and Delete */
|
||||||
@ -420,8 +425,7 @@ rl_end_of_line (count, key)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* XXX - these might need changes for multibyte characters */
|
/* Move forward a word. We do what Emacs does. Handles multibyte chars. */
|
||||||
/* Move forward a word. We do what Emacs does. */
|
|
||||||
int
|
int
|
||||||
rl_forward_word (count, key)
|
rl_forward_word (count, key)
|
||||||
int count, key;
|
int count, key;
|
||||||
@ -438,68 +442,80 @@ rl_forward_word (count, key)
|
|||||||
|
|
||||||
/* If we are not in a word, move forward until we are in one.
|
/* If we are not in a word, move forward until we are in one.
|
||||||
Then, move forward until we hit a non-alphabetic character. */
|
Then, move forward until we hit a non-alphabetic character. */
|
||||||
c = rl_line_buffer[rl_point];
|
c = _rl_char_value (rl_line_buffer, rl_point);
|
||||||
if (rl_alphabetic (c) == 0)
|
|
||||||
|
if (_rl_walphabetic (c) == 0)
|
||||||
{
|
{
|
||||||
while (++rl_point < rl_end)
|
rl_point = MB_NEXTCHAR (rl_line_buffer, rl_point, 1, MB_FIND_NONZERO);
|
||||||
|
while (rl_point < rl_end)
|
||||||
{
|
{
|
||||||
c = rl_line_buffer[rl_point];
|
c = _rl_char_value (rl_line_buffer, rl_point);
|
||||||
if (rl_alphabetic (c))
|
if (_rl_walphabetic (c))
|
||||||
break;
|
break;
|
||||||
|
rl_point = MB_NEXTCHAR (rl_line_buffer, rl_point, 1, MB_FIND_NONZERO);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (rl_point == rl_end)
|
if (rl_point == rl_end)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
while (++rl_point < rl_end)
|
rl_point = MB_NEXTCHAR (rl_line_buffer, rl_point, 1, MB_FIND_NONZERO);
|
||||||
|
while (rl_point < rl_end)
|
||||||
{
|
{
|
||||||
c = rl_line_buffer[rl_point];
|
c = _rl_char_value (rl_line_buffer, rl_point);
|
||||||
if (rl_alphabetic (c) == 0)
|
if (_rl_walphabetic (c) == 0)
|
||||||
break;
|
break;
|
||||||
|
rl_point = MB_NEXTCHAR (rl_line_buffer, rl_point, 1, MB_FIND_NONZERO);
|
||||||
}
|
}
|
||||||
|
|
||||||
--count;
|
--count;
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Move backward a word. We do what Emacs does. */
|
/* Move backward a word. We do what Emacs does. Handles multibyte chars. */
|
||||||
int
|
int
|
||||||
rl_backward_word (count, key)
|
rl_backward_word (count, key)
|
||||||
int count, key;
|
int count, key;
|
||||||
{
|
{
|
||||||
int c;
|
int c, p;
|
||||||
|
|
||||||
if (count < 0)
|
if (count < 0)
|
||||||
return (rl_forward_word (-count, key));
|
return (rl_forward_word (-count, key));
|
||||||
|
|
||||||
while (count)
|
while (count)
|
||||||
{
|
{
|
||||||
if (!rl_point)
|
if (rl_point == 0)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
/* Like rl_forward_word (), except that we look at the characters
|
/* Like rl_forward_word (), except that we look at the characters
|
||||||
just before point. */
|
just before point. */
|
||||||
|
|
||||||
c = rl_line_buffer[rl_point - 1];
|
p = MB_PREVCHAR (rl_line_buffer, rl_point, MB_FIND_NONZERO);
|
||||||
if (rl_alphabetic (c) == 0)
|
c = _rl_char_value (rl_line_buffer, p);
|
||||||
|
|
||||||
|
if (_rl_walphabetic (c) == 0)
|
||||||
{
|
{
|
||||||
while (--rl_point)
|
rl_point = p;
|
||||||
|
while (rl_point > 0)
|
||||||
{
|
{
|
||||||
c = rl_line_buffer[rl_point - 1];
|
p = MB_PREVCHAR (rl_line_buffer, rl_point, MB_FIND_NONZERO);
|
||||||
if (rl_alphabetic (c))
|
c = _rl_char_value (rl_line_buffer, p);
|
||||||
|
if (_rl_walphabetic (c))
|
||||||
break;
|
break;
|
||||||
|
rl_point = p;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
while (rl_point)
|
while (rl_point)
|
||||||
{
|
{
|
||||||
c = rl_line_buffer[rl_point - 1];
|
p = MB_PREVCHAR (rl_line_buffer, rl_point, MB_FIND_NONZERO);
|
||||||
if (rl_alphabetic (c) == 0)
|
c = _rl_char_value (rl_line_buffer, p);
|
||||||
|
if (_rl_walphabetic (c) == 0)
|
||||||
break;
|
break;
|
||||||
else
|
else
|
||||||
--rl_point;
|
rl_point = p;
|
||||||
}
|
}
|
||||||
|
|
||||||
--count;
|
--count;
|
||||||
@ -756,10 +772,8 @@ _rl_insert_char (count, c)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
#if defined (HANDLE_MULTIBYTE)
|
|
||||||
if (MB_CUR_MAX == 1 || rl_byte_oriented)
|
if (MB_CUR_MAX == 1 || rl_byte_oriented)
|
||||||
{
|
{
|
||||||
#endif
|
|
||||||
/* We are inserting a single character.
|
/* We are inserting a single character.
|
||||||
If there is pending input, then make a string of all of the
|
If there is pending input, then make a string of all of the
|
||||||
pending characters that are bound to rl_insert, and insert
|
pending characters that are bound to rl_insert, and insert
|
||||||
@ -775,8 +789,8 @@ _rl_insert_char (count, c)
|
|||||||
str[0] = c;
|
str[0] = c;
|
||||||
rl_insert_text (str);
|
rl_insert_text (str);
|
||||||
}
|
}
|
||||||
#if defined (HANDLE_MULTIBYTE)
|
|
||||||
}
|
}
|
||||||
|
#if defined (HANDLE_MULTIBYTE)
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
rl_insert_text (incoming);
|
rl_insert_text (incoming);
|
||||||
@ -833,27 +847,63 @@ rl_insert (count, c)
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* Insert the next typed character verbatim. */
|
/* Insert the next typed character verbatim. */
|
||||||
int
|
static int
|
||||||
rl_quoted_insert (count, key)
|
_rl_insert_next (count)
|
||||||
int count, key;
|
int count;
|
||||||
{
|
{
|
||||||
int c;
|
int c;
|
||||||
|
|
||||||
#if defined (HANDLE_SIGNALS)
|
|
||||||
_rl_disable_tty_signals ();
|
|
||||||
#endif
|
|
||||||
|
|
||||||
RL_SETSTATE(RL_STATE_MOREINPUT);
|
RL_SETSTATE(RL_STATE_MOREINPUT);
|
||||||
c = rl_read_key ();
|
c = rl_read_key ();
|
||||||
RL_UNSETSTATE(RL_STATE_MOREINPUT);
|
RL_UNSETSTATE(RL_STATE_MOREINPUT);
|
||||||
|
|
||||||
#if defined (HANDLE_SIGNALS)
|
#if defined (HANDLE_SIGNALS)
|
||||||
|
if (RL_ISSTATE (RL_STATE_CALLBACK) == 0)
|
||||||
_rl_restore_tty_signals ();
|
_rl_restore_tty_signals ();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
return (_rl_insert_char (count, c));
|
return (_rl_insert_char (count, c));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if defined (READLINE_CALLBACKS)
|
||||||
|
static int
|
||||||
|
_rl_insert_next_callback (data)
|
||||||
|
_rl_callback_generic_arg *data;
|
||||||
|
{
|
||||||
|
int count;
|
||||||
|
|
||||||
|
count = data->count;
|
||||||
|
|
||||||
|
/* Deregister function, let rl_callback_read_char deallocate data */
|
||||||
|
_rl_callback_func = 0;
|
||||||
|
_rl_want_redisplay = 1;
|
||||||
|
|
||||||
|
return _rl_insert_next (count);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
int
|
||||||
|
rl_quoted_insert (count, key)
|
||||||
|
int count, key;
|
||||||
|
{
|
||||||
|
/* Let's see...should the callback interface futz with signal handling? */
|
||||||
|
#if defined (HANDLE_SIGNALS)
|
||||||
|
if (RL_ISSTATE (RL_STATE_CALLBACK) == 0)
|
||||||
|
_rl_disable_tty_signals ();
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined (READLINE_CALLBACKS)
|
||||||
|
if (RL_ISSTATE (RL_STATE_CALLBACK))
|
||||||
|
{
|
||||||
|
_rl_callback_data = _rl_callback_data_alloc (count);
|
||||||
|
_rl_callback_func = _rl_insert_next_callback;
|
||||||
|
return (0);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
return _rl_insert_next (count);
|
||||||
|
}
|
||||||
|
|
||||||
/* Insert a tab character. */
|
/* Insert a tab character. */
|
||||||
int
|
int
|
||||||
rl_tab_insert (count, key)
|
rl_tab_insert (count, key)
|
||||||
@ -988,43 +1038,17 @@ _rl_rubout_char (count, key)
|
|||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
orig_point = rl_point;
|
||||||
if (count > 1 || rl_explicit_arg)
|
if (count > 1 || rl_explicit_arg)
|
||||||
{
|
{
|
||||||
orig_point = rl_point;
|
|
||||||
#if defined (HANDLE_MULTIBYTE)
|
|
||||||
if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
|
|
||||||
rl_backward_char (count, key);
|
rl_backward_char (count, key);
|
||||||
else
|
|
||||||
#endif
|
|
||||||
rl_backward_byte (count, key);
|
|
||||||
rl_kill_text (orig_point, rl_point);
|
rl_kill_text (orig_point, rl_point);
|
||||||
}
|
}
|
||||||
else
|
else if (MB_CUR_MAX == 1 || rl_byte_oriented)
|
||||||
{
|
{
|
||||||
#if defined (HANDLE_MULTIBYTE)
|
|
||||||
if (MB_CUR_MAX == 1 || rl_byte_oriented)
|
|
||||||
{
|
|
||||||
#endif
|
|
||||||
c = rl_line_buffer[--rl_point];
|
c = rl_line_buffer[--rl_point];
|
||||||
rl_delete_text (rl_point, rl_point + 1);
|
|
||||||
#if defined (HANDLE_MULTIBYTE)
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
int orig_point;
|
|
||||||
|
|
||||||
orig_point = rl_point;
|
|
||||||
rl_point = _rl_find_prev_mbchar (rl_line_buffer, rl_point, MB_FIND_NONZERO);
|
|
||||||
c = rl_line_buffer[rl_point];
|
|
||||||
rl_delete_text (rl_point, orig_point);
|
rl_delete_text (rl_point, orig_point);
|
||||||
}
|
/* The erase-at-end-of-line hack is of questionable merit now. */
|
||||||
#endif /* HANDLE_MULTIBYTE */
|
|
||||||
|
|
||||||
/* I don't think that the hack for end of line is needed for
|
|
||||||
multibyte chars. */
|
|
||||||
#if defined (HANDLE_MULTIBYTE)
|
|
||||||
if (MB_CUR_MAX == 1 || rl_byte_oriented)
|
|
||||||
#endif
|
|
||||||
if (rl_point == rl_end && ISPRINT (c) && _rl_last_c_pos)
|
if (rl_point == rl_end && ISPRINT (c) && _rl_last_c_pos)
|
||||||
{
|
{
|
||||||
int l;
|
int l;
|
||||||
@ -1032,6 +1056,11 @@ _rl_rubout_char (count, key)
|
|||||||
_rl_erase_at_end_of_line (l);
|
_rl_erase_at_end_of_line (l);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
rl_point = _rl_find_prev_mbchar (rl_line_buffer, rl_point, MB_FIND_NONZERO);
|
||||||
|
rl_delete_text (rl_point, orig_point);
|
||||||
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@ -1056,11 +1085,9 @@ rl_delete (count, key)
|
|||||||
if (count > 1 || rl_explicit_arg)
|
if (count > 1 || rl_explicit_arg)
|
||||||
{
|
{
|
||||||
int orig_point = rl_point;
|
int orig_point = rl_point;
|
||||||
#if defined (HANDLE_MULTIBYTE)
|
|
||||||
if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
|
if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
|
||||||
rl_forward_char (count, key);
|
rl_forward_char (count, key);
|
||||||
else
|
else
|
||||||
#endif
|
|
||||||
rl_forward_byte (count, key);
|
rl_forward_byte (count, key);
|
||||||
|
|
||||||
r = rl_kill_text (orig_point, rl_point);
|
r = rl_kill_text (orig_point, rl_point);
|
||||||
@ -1070,11 +1097,8 @@ rl_delete (count, key)
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
int new_point;
|
int new_point;
|
||||||
if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
|
|
||||||
new_point = _rl_find_next_mbchar (rl_line_buffer, rl_point, 1, MB_FIND_NONZERO);
|
|
||||||
else
|
|
||||||
new_point = rl_point + 1;
|
|
||||||
|
|
||||||
|
new_point = MB_NEXTCHAR (rl_line_buffer, rl_point, 1, MB_FIND_NONZERO);
|
||||||
return (rl_delete_text (rl_point, new_point));
|
return (rl_delete_text (rl_point, new_point));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -1113,6 +1137,10 @@ rl_delete_horizontal_space (count, ignore)
|
|||||||
rl_delete_text (start, rl_point);
|
rl_delete_text (start, rl_point);
|
||||||
rl_point = start;
|
rl_point = start;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (rl_point < 0)
|
||||||
|
rl_point = 0;
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1206,42 +1234,80 @@ static int
|
|||||||
rl_change_case (count, op)
|
rl_change_case (count, op)
|
||||||
int count, op;
|
int count, op;
|
||||||
{
|
{
|
||||||
register int start, end;
|
int start, next, end;
|
||||||
int inword, c;
|
int inword, c, nc, nop;
|
||||||
|
#if defined (HANDLE_MULTIBYTE)
|
||||||
|
wchar_t wc, nwc;
|
||||||
|
char mb[MB_LEN_MAX+1];
|
||||||
|
int mblen, p;
|
||||||
|
mbstate_t ps;
|
||||||
|
#endif
|
||||||
|
|
||||||
start = rl_point;
|
start = rl_point;
|
||||||
rl_forward_word (count, 0);
|
rl_forward_word (count, 0);
|
||||||
end = rl_point;
|
end = rl_point;
|
||||||
|
|
||||||
|
if (op != UpCase && op != DownCase && op != CapCase)
|
||||||
|
{
|
||||||
|
rl_ding ();
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
if (count < 0)
|
if (count < 0)
|
||||||
SWAP (start, end);
|
SWAP (start, end);
|
||||||
|
|
||||||
|
#if defined (HANDLE_MULTIBYTE)
|
||||||
|
memset (&ps, 0, sizeof (mbstate_t));
|
||||||
|
#endif
|
||||||
|
|
||||||
/* We are going to modify some text, so let's prepare to undo it. */
|
/* We are going to modify some text, so let's prepare to undo it. */
|
||||||
rl_modifying (start, end);
|
rl_modifying (start, end);
|
||||||
|
|
||||||
for (inword = 0; start < end; start++)
|
inword = 0;
|
||||||
|
while (start < end)
|
||||||
{
|
{
|
||||||
c = rl_line_buffer[start];
|
c = _rl_char_value (rl_line_buffer, start);
|
||||||
switch (op)
|
/* This assumes that the upper and lower case versions are the same width. */
|
||||||
|
next = MB_NEXTCHAR (rl_line_buffer, start, 1, MB_FIND_NONZERO);
|
||||||
|
|
||||||
|
if (_rl_walphabetic (c) == 0)
|
||||||
{
|
{
|
||||||
case UpCase:
|
inword = 0;
|
||||||
rl_line_buffer[start] = _rl_to_upper (c);
|
start = next;
|
||||||
break;
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
case DownCase:
|
if (op == CapCase)
|
||||||
rl_line_buffer[start] = _rl_to_lower (c);
|
{
|
||||||
break;
|
nop = inword ? DownCase : UpCase;
|
||||||
|
inword = 1;
|
||||||
case CapCase:
|
}
|
||||||
rl_line_buffer[start] = (inword == 0) ? _rl_to_upper (c) : _rl_to_lower (c);
|
else
|
||||||
inword = rl_alphabetic (rl_line_buffer[start]);
|
nop = op;
|
||||||
break;
|
if (MB_CUR_MAX == 1 || rl_byte_oriented || isascii (c))
|
||||||
|
{
|
||||||
default:
|
nc = (nop == UpCase) ? _rl_to_upper (c) : _rl_to_lower (c);
|
||||||
rl_ding ();
|
rl_line_buffer[start] = nc;
|
||||||
return -1;
|
}
|
||||||
|
#if defined (HANDLE_MULTIBYTE)
|
||||||
|
else
|
||||||
|
{
|
||||||
|
mbrtowc (&wc, rl_line_buffer + start, end - start, &ps);
|
||||||
|
nwc = (nop == UpCase) ? _rl_to_wupper (wc) : _rl_to_wlower (wc);
|
||||||
|
if (nwc != wc) /* just skip unchanged characters */
|
||||||
|
{
|
||||||
|
mblen = wcrtomb (mb, nwc, &ps);
|
||||||
|
if (mblen > 0)
|
||||||
|
mb[mblen] = '\0';
|
||||||
|
/* Assume the same width */
|
||||||
|
strncpy (rl_line_buffer + start, mb, mblen);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
start = next;
|
||||||
|
}
|
||||||
|
|
||||||
rl_point = end;
|
rl_point = end;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@ -1321,11 +1387,11 @@ rl_transpose_chars (count, key)
|
|||||||
{
|
{
|
||||||
#if defined (HANDLE_MULTIBYTE)
|
#if defined (HANDLE_MULTIBYTE)
|
||||||
char *dummy;
|
char *dummy;
|
||||||
int i, prev_point;
|
int i;
|
||||||
#else
|
#else
|
||||||
char dummy[2];
|
char dummy[2];
|
||||||
#endif
|
#endif
|
||||||
int char_length;
|
int char_length, prev_point;
|
||||||
|
|
||||||
if (count == 0)
|
if (count == 0)
|
||||||
return 0;
|
return 0;
|
||||||
@ -1340,20 +1406,12 @@ rl_transpose_chars (count, key)
|
|||||||
|
|
||||||
if (rl_point == rl_end)
|
if (rl_point == rl_end)
|
||||||
{
|
{
|
||||||
if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
|
rl_point = MB_PREVCHAR (rl_line_buffer, rl_point, MB_FIND_NONZERO);
|
||||||
rl_point = _rl_find_prev_mbchar (rl_line_buffer, rl_point, MB_FIND_NONZERO);
|
|
||||||
else
|
|
||||||
--rl_point;
|
|
||||||
count = 1;
|
count = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
#if defined (HANDLE_MULTIBYTE)
|
|
||||||
prev_point = rl_point;
|
prev_point = rl_point;
|
||||||
if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
|
rl_point = MB_PREVCHAR (rl_line_buffer, rl_point, MB_FIND_NONZERO);
|
||||||
rl_point = _rl_find_prev_mbchar (rl_line_buffer, rl_point, MB_FIND_NONZERO);
|
|
||||||
else
|
|
||||||
#endif
|
|
||||||
rl_point--;
|
|
||||||
|
|
||||||
#if defined (HANDLE_MULTIBYTE)
|
#if defined (HANDLE_MULTIBYTE)
|
||||||
char_length = prev_point - rl_point;
|
char_length = prev_point - rl_point;
|
||||||
@ -1487,10 +1545,33 @@ _rl_char_search (count, fdir, bdir)
|
|||||||
}
|
}
|
||||||
#endif /* !HANDLE_MULTIBYTE */
|
#endif /* !HANDLE_MULTIBYTE */
|
||||||
|
|
||||||
|
#if defined (READLINE_CALLBACKS)
|
||||||
|
static int
|
||||||
|
_rl_char_search_callback (data)
|
||||||
|
_rl_callback_generic_arg *data;
|
||||||
|
{
|
||||||
|
_rl_callback_func = 0;
|
||||||
|
_rl_want_redisplay = 1;
|
||||||
|
|
||||||
|
return (_rl_char_search (data->count, data->i1, data->i2));
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
int
|
int
|
||||||
rl_char_search (count, key)
|
rl_char_search (count, key)
|
||||||
int count, key;
|
int count, key;
|
||||||
{
|
{
|
||||||
|
#if defined (READLINE_CALLBACKS)
|
||||||
|
if (RL_ISSTATE (RL_STATE_CALLBACK))
|
||||||
|
{
|
||||||
|
_rl_callback_data = _rl_callback_data_alloc (count);
|
||||||
|
_rl_callback_data->i1 = FFIND;
|
||||||
|
_rl_callback_data->i2 = BFIND;
|
||||||
|
_rl_callback_func = _rl_char_search_callback;
|
||||||
|
return (0);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
return (_rl_char_search (count, FFIND, BFIND));
|
return (_rl_char_search (count, FFIND, BFIND));
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1498,6 +1579,17 @@ int
|
|||||||
rl_backward_char_search (count, key)
|
rl_backward_char_search (count, key)
|
||||||
int count, key;
|
int count, key;
|
||||||
{
|
{
|
||||||
|
#if defined (READLINE_CALLBACKS)
|
||||||
|
if (RL_ISSTATE (RL_STATE_CALLBACK))
|
||||||
|
{
|
||||||
|
_rl_callback_data = _rl_callback_data_alloc (count);
|
||||||
|
_rl_callback_data->i1 = BFIND;
|
||||||
|
_rl_callback_data->i2 = FFIND;
|
||||||
|
_rl_callback_func = _rl_char_search_callback;
|
||||||
|
return (0);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
return (_rl_char_search (count, BFIND, FFIND));
|
return (_rl_char_search (count, BFIND, FFIND));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -43,7 +43,9 @@
|
|||||||
#endif /* HAVE_STDLIB_H */
|
#endif /* HAVE_STDLIB_H */
|
||||||
|
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
|
#if defined (HAVE_PWD_H)
|
||||||
#include <pwd.h>
|
#include <pwd.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "tilde.h"
|
#include "tilde.h"
|
||||||
|
|
||||||
@ -54,8 +56,12 @@ static void *xmalloc (), *xrealloc ();
|
|||||||
#endif /* TEST || STATIC_MALLOC */
|
#endif /* TEST || STATIC_MALLOC */
|
||||||
|
|
||||||
#if !defined (HAVE_GETPW_DECLS)
|
#if !defined (HAVE_GETPW_DECLS)
|
||||||
|
# if defined (HAVE_GETPWUID)
|
||||||
extern struct passwd *getpwuid PARAMS((uid_t));
|
extern struct passwd *getpwuid PARAMS((uid_t));
|
||||||
|
# endif
|
||||||
|
# if defined (HAVE_GETPWNAM)
|
||||||
extern struct passwd *getpwnam PARAMS((const char *));
|
extern struct passwd *getpwnam PARAMS((const char *));
|
||||||
|
# endif
|
||||||
#endif /* !HAVE_GETPW_DECLS */
|
#endif /* !HAVE_GETPW_DECLS */
|
||||||
|
|
||||||
#if !defined (savestring)
|
#if !defined (savestring)
|
||||||
@ -277,6 +283,39 @@ isolate_tilde_prefix (fname, lenp)
|
|||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if 0
|
||||||
|
/* Public function to scan a string (FNAME) beginning with a tilde and find
|
||||||
|
the portion of the string that should be passed to the tilde expansion
|
||||||
|
function. Right now, it just calls tilde_find_suffix and allocates new
|
||||||
|
memory, but it can be expanded to do different things later. */
|
||||||
|
char *
|
||||||
|
tilde_find_word (fname, flags, lenp)
|
||||||
|
const char *fname;
|
||||||
|
int flags, *lenp;
|
||||||
|
{
|
||||||
|
int x;
|
||||||
|
char *r;
|
||||||
|
|
||||||
|
x = tilde_find_suffix (fname);
|
||||||
|
if (x == 0)
|
||||||
|
{
|
||||||
|
r = savestring (fname);
|
||||||
|
if (lenp)
|
||||||
|
*lenp = 0;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
r = (char *)xmalloc (1 + x);
|
||||||
|
strncpy (r, fname, x);
|
||||||
|
r[x] = '\0';
|
||||||
|
if (lenp)
|
||||||
|
*lenp = x;
|
||||||
|
}
|
||||||
|
|
||||||
|
return r;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
/* Return a string that is PREFIX concatenated with SUFFIX starting at
|
/* Return a string that is PREFIX concatenated with SUFFIX starting at
|
||||||
SUFFIND. */
|
SUFFIND. */
|
||||||
static char *
|
static char *
|
||||||
@ -347,7 +386,11 @@ tilde_expand_word (filename)
|
|||||||
/* No preexpansion hook, or the preexpansion hook failed. Look in the
|
/* No preexpansion hook, or the preexpansion hook failed. Look in the
|
||||||
password database. */
|
password database. */
|
||||||
dirname = (char *)NULL;
|
dirname = (char *)NULL;
|
||||||
|
#if defined (HAVE_GETPWNAM)
|
||||||
user_entry = getpwnam (username);
|
user_entry = getpwnam (username);
|
||||||
|
#else
|
||||||
|
user_entry = 0;
|
||||||
|
#endif
|
||||||
if (user_entry == 0)
|
if (user_entry == 0)
|
||||||
{
|
{
|
||||||
/* If the calling program has a special syntax for expanding tildes,
|
/* If the calling program has a special syntax for expanding tildes,
|
||||||
@ -372,8 +415,9 @@ tilde_expand_word (filename)
|
|||||||
free (username);
|
free (username);
|
||||||
dirname = glue_prefix_and_suffix (user_entry->pw_dir, filename, user_len);
|
dirname = glue_prefix_and_suffix (user_entry->pw_dir, filename, user_len);
|
||||||
}
|
}
|
||||||
|
#if defined (HAVE_GETPWENT)
|
||||||
endpwent ();
|
endpwent ();
|
||||||
|
#endif
|
||||||
return (dirname);
|
return (dirname);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -71,6 +71,9 @@ extern char *tilde_expand PARAMS((const char *));
|
|||||||
tilde. If there is no expansion, call tilde_expansion_failure_hook. */
|
tilde. If there is no expansion, call tilde_expansion_failure_hook. */
|
||||||
extern char *tilde_expand_word PARAMS((const char *));
|
extern char *tilde_expand_word PARAMS((const char *));
|
||||||
|
|
||||||
|
/* Find the portion of the string beginning with ~ that should be expanded. */
|
||||||
|
extern char *tilde_find_word PARAMS((const char *, int, int *));
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
@ -237,7 +237,12 @@ rl_revert_line (count, key)
|
|||||||
{
|
{
|
||||||
while (rl_undo_list)
|
while (rl_undo_list)
|
||||||
rl_do_undo ();
|
rl_do_undo ();
|
||||||
|
#if defined (VI_MODE)
|
||||||
|
if (rl_editing_mode == vi_mode)
|
||||||
|
rl_point = rl_mark = 0; /* rl_end should be set correctly */
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/* util.c -- readline utility functions */
|
/* util.c -- readline utility functions */
|
||||||
|
|
||||||
/* Copyright (C) 1987, 1989, 1992 Free Software Foundation, Inc.
|
/* Copyright (C) 1987-2005 Free Software Foundation, Inc.
|
||||||
|
|
||||||
This file is part of the GNU Readline Library, a library for
|
This file is part of the GNU Readline Library, a library for
|
||||||
reading lines of text with interactive input and history editing.
|
reading lines of text with interactive input and history editing.
|
||||||
@ -44,6 +44,7 @@
|
|||||||
|
|
||||||
/* System-specific feature definitions and include files. */
|
/* System-specific feature definitions and include files. */
|
||||||
#include "rldefs.h"
|
#include "rldefs.h"
|
||||||
|
#include "rlmbutil.h"
|
||||||
|
|
||||||
#if defined (TIOCSTAT_IN_SYS_IOCTL)
|
#if defined (TIOCSTAT_IN_SYS_IOCTL)
|
||||||
# include <sys/ioctl.h>
|
# include <sys/ioctl.h>
|
||||||
@ -78,13 +79,29 @@ rl_alphabetic (c)
|
|||||||
strchr (pathname_alphabetic_chars, c) != NULL);
|
strchr (pathname_alphabetic_chars, c) != NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if defined (HANDLE_MULTIBYTE)
|
||||||
|
int
|
||||||
|
_rl_walphabetic (wc)
|
||||||
|
wchar_t wc;
|
||||||
|
{
|
||||||
|
int c;
|
||||||
|
|
||||||
|
if (iswalnum (wc))
|
||||||
|
return (1);
|
||||||
|
|
||||||
|
c = wc & 0177;
|
||||||
|
return (_rl_allow_pathname_alphabetic_chars &&
|
||||||
|
strchr (pathname_alphabetic_chars, c) != NULL);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
/* How to abort things. */
|
/* How to abort things. */
|
||||||
int
|
int
|
||||||
_rl_abort_internal ()
|
_rl_abort_internal ()
|
||||||
{
|
{
|
||||||
rl_ding ();
|
rl_ding ();
|
||||||
rl_clear_message ();
|
rl_clear_message ();
|
||||||
_rl_init_argument ();
|
_rl_reset_argument ();
|
||||||
rl_clear_pending_input ();
|
rl_clear_pending_input ();
|
||||||
|
|
||||||
RL_UNSETSTATE (RL_STATE_MACRODEF);
|
RL_UNSETSTATE (RL_STATE_MACRODEF);
|
||||||
|
@ -130,7 +130,7 @@ KEYMAP_ENTRY_ARRAY vi_movement_keymap = {
|
|||||||
{ ISFUNC, rl_revert_line }, /* U */
|
{ ISFUNC, rl_revert_line }, /* U */
|
||||||
{ ISFUNC, (rl_command_func_t *)0x0 }, /* V */
|
{ ISFUNC, (rl_command_func_t *)0x0 }, /* V */
|
||||||
{ ISFUNC, rl_vi_next_word }, /* W */
|
{ ISFUNC, rl_vi_next_word }, /* W */
|
||||||
{ ISFUNC, rl_rubout }, /* X */
|
{ ISFUNC, rl_vi_rubout }, /* X */
|
||||||
{ ISFUNC, rl_vi_yank_to }, /* Y */
|
{ ISFUNC, rl_vi_yank_to }, /* Y */
|
||||||
{ ISFUNC, (rl_command_func_t *)0x0 }, /* Z */
|
{ ISFUNC, (rl_command_func_t *)0x0 }, /* Z */
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/* vi_mode.c -- A vi emulation mode for Bash.
|
/* vi_mode.c -- A vi emulation mode for Bash.
|
||||||
Derived from code written by Jeff Sparkes (jsparkes@bnr.ca). */
|
Derived from code written by Jeff Sparkes (jsparkes@bnr.ca). */
|
||||||
|
|
||||||
/* Copyright (C) 1987-2004 Free Software Foundation, Inc.
|
/* Copyright (C) 1987-2005 Free Software Foundation, Inc.
|
||||||
|
|
||||||
This file is part of the GNU Readline Library, a library for
|
This file is part of the GNU Readline Library, a library for
|
||||||
reading lines of text with interactive input and history editing.
|
reading lines of text with interactive input and history editing.
|
||||||
@ -90,6 +90,7 @@ static int _rl_vi_last_arg_sign = 1;
|
|||||||
static int _rl_vi_last_motion;
|
static int _rl_vi_last_motion;
|
||||||
#if defined (HANDLE_MULTIBYTE)
|
#if defined (HANDLE_MULTIBYTE)
|
||||||
static char _rl_vi_last_search_mbchar[MB_LEN_MAX];
|
static char _rl_vi_last_search_mbchar[MB_LEN_MAX];
|
||||||
|
static int _rl_vi_last_search_mblen;
|
||||||
#else
|
#else
|
||||||
static int _rl_vi_last_search_char;
|
static int _rl_vi_last_search_char;
|
||||||
#endif
|
#endif
|
||||||
@ -107,8 +108,22 @@ static int vi_mark_chars['z' - 'a' + 1];
|
|||||||
|
|
||||||
static void _rl_vi_stuff_insert PARAMS((int));
|
static void _rl_vi_stuff_insert PARAMS((int));
|
||||||
static void _rl_vi_save_insert PARAMS((UNDO_LIST *));
|
static void _rl_vi_save_insert PARAMS((UNDO_LIST *));
|
||||||
|
|
||||||
|
static int _rl_vi_arg_dispatch PARAMS((int));
|
||||||
static int rl_digit_loop1 PARAMS((void));
|
static int rl_digit_loop1 PARAMS((void));
|
||||||
|
|
||||||
|
static int _rl_vi_set_mark PARAMS((void));
|
||||||
|
static int _rl_vi_goto_mark PARAMS((void));
|
||||||
|
|
||||||
|
static int _rl_vi_callback_getchar PARAMS((char *, int));
|
||||||
|
|
||||||
|
#if defined (READLINE_CALLBACKS)
|
||||||
|
static int _rl_vi_callback_set_mark PARAMS((_rl_callback_generic_arg *));
|
||||||
|
static int _rl_vi_callback_goto_mark PARAMS((_rl_callback_generic_arg *));
|
||||||
|
static int _rl_vi_callback_change_char PARAMS((_rl_callback_generic_arg *));
|
||||||
|
static int _rl_vi_callback_char_search PARAMS((_rl_callback_generic_arg *));
|
||||||
|
#endif
|
||||||
|
|
||||||
void
|
void
|
||||||
_rl_vi_initialize_line ()
|
_rl_vi_initialize_line ()
|
||||||
{
|
{
|
||||||
@ -116,6 +131,8 @@ _rl_vi_initialize_line ()
|
|||||||
|
|
||||||
for (i = 0; i < sizeof (vi_mark_chars) / sizeof (int); i++)
|
for (i = 0; i < sizeof (vi_mark_chars) / sizeof (int); i++)
|
||||||
vi_mark_chars[i] = -1;
|
vi_mark_chars[i] = -1;
|
||||||
|
|
||||||
|
RL_UNSETSTATE(RL_STATE_VICMDONCE);
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
@ -671,6 +688,13 @@ rl_vi_movement_mode (count, key)
|
|||||||
|
|
||||||
_rl_keymap = vi_movement_keymap;
|
_rl_keymap = vi_movement_keymap;
|
||||||
_rl_vi_done_inserting ();
|
_rl_vi_done_inserting ();
|
||||||
|
|
||||||
|
/* This is how POSIX.2 says `U' should behave -- everything up until the
|
||||||
|
first time you go into command mode should not be undone. */
|
||||||
|
if (RL_ISSTATE (RL_STATE_VICMDONCE) == 0)
|
||||||
|
rl_free_undo_list ();
|
||||||
|
|
||||||
|
RL_SETSTATE (RL_STATE_VICMDONCE);
|
||||||
return (0);
|
return (0);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -840,7 +864,9 @@ rl_vi_domove (key, nextkey)
|
|||||||
save = rl_numeric_arg;
|
save = rl_numeric_arg;
|
||||||
rl_numeric_arg = _rl_digit_value (c);
|
rl_numeric_arg = _rl_digit_value (c);
|
||||||
rl_explicit_arg = 1;
|
rl_explicit_arg = 1;
|
||||||
|
RL_SETSTATE (RL_STATE_NUMERICARG|RL_STATE_VIMOTION);
|
||||||
rl_digit_loop1 ();
|
rl_digit_loop1 ();
|
||||||
|
RL_UNSETSTATE (RL_STATE_VIMOTION);
|
||||||
rl_numeric_arg *= save;
|
rl_numeric_arg *= save;
|
||||||
RL_SETSTATE(RL_STATE_MOREINPUT);
|
RL_SETSTATE(RL_STATE_MOREINPUT);
|
||||||
c = rl_read_key (); /* real command */
|
c = rl_read_key (); /* real command */
|
||||||
@ -913,38 +939,24 @@ rl_vi_domove (key, nextkey)
|
|||||||
return (0);
|
return (0);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* A simplified loop for vi. Don't dispatch key at end.
|
/* Process C as part of the current numeric argument. Return -1 if the
|
||||||
Don't recognize minus sign?
|
argument should be aborted, 0 if we should not read any more chars, and
|
||||||
Should this do rl_save_prompt/rl_restore_prompt? */
|
1 if we should continue to read chars. */
|
||||||
static int
|
static int
|
||||||
rl_digit_loop1 ()
|
_rl_vi_arg_dispatch (c)
|
||||||
|
int c;
|
||||||
{
|
{
|
||||||
int key, c;
|
int key;
|
||||||
|
|
||||||
RL_SETSTATE(RL_STATE_NUMERICARG);
|
key = c;
|
||||||
while (1)
|
if (c >= 0 && _rl_keymap[c].type == ISFUNC && _rl_keymap[c].function == rl_universal_argument)
|
||||||
{
|
|
||||||
if (rl_numeric_arg > 1000000)
|
|
||||||
{
|
|
||||||
rl_explicit_arg = rl_numeric_arg = 0;
|
|
||||||
rl_ding ();
|
|
||||||
rl_clear_message ();
|
|
||||||
RL_UNSETSTATE(RL_STATE_NUMERICARG);
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
rl_message ("(arg: %d) ", rl_arg_sign * rl_numeric_arg);
|
|
||||||
RL_SETSTATE(RL_STATE_MOREINPUT);
|
|
||||||
key = c = rl_read_key ();
|
|
||||||
RL_UNSETSTATE(RL_STATE_MOREINPUT);
|
|
||||||
|
|
||||||
if (c >= 0 && _rl_keymap[c].type == ISFUNC &&
|
|
||||||
_rl_keymap[c].function == rl_universal_argument)
|
|
||||||
{
|
{
|
||||||
rl_numeric_arg *= 4;
|
rl_numeric_arg *= 4;
|
||||||
continue;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
c = UNMETA (c);
|
c = UNMETA (c);
|
||||||
|
|
||||||
if (_rl_digit_p (c))
|
if (_rl_digit_p (c))
|
||||||
{
|
{
|
||||||
if (rl_explicit_arg)
|
if (rl_explicit_arg)
|
||||||
@ -952,15 +964,36 @@ rl_digit_loop1 ()
|
|||||||
else
|
else
|
||||||
rl_numeric_arg = _rl_digit_value (c);
|
rl_numeric_arg = _rl_digit_value (c);
|
||||||
rl_explicit_arg = 1;
|
rl_explicit_arg = 1;
|
||||||
|
return 1;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
rl_clear_message ();
|
rl_clear_message ();
|
||||||
rl_stuff_char (key);
|
rl_stuff_char (key);
|
||||||
break;
|
return 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* A simplified loop for vi. Don't dispatch key at end.
|
||||||
|
Don't recognize minus sign?
|
||||||
|
Should this do rl_save_prompt/rl_restore_prompt? */
|
||||||
|
static int
|
||||||
|
rl_digit_loop1 ()
|
||||||
|
{
|
||||||
|
int c, r;
|
||||||
|
|
||||||
|
while (1)
|
||||||
|
{
|
||||||
|
if (_rl_arg_overflow ())
|
||||||
|
return 1;
|
||||||
|
|
||||||
|
c = _rl_arg_getchar ();
|
||||||
|
|
||||||
|
r = _rl_vi_arg_dispatch (c);
|
||||||
|
if (r <= 0)
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
RL_UNSETSTATE(RL_STATE_NUMERICARG);
|
RL_UNSETSTATE(RL_STATE_NUMERICARG);
|
||||||
return (0);
|
return (0);
|
||||||
}
|
}
|
||||||
@ -1048,8 +1081,9 @@ int
|
|||||||
rl_vi_yank_to (count, key)
|
rl_vi_yank_to (count, key)
|
||||||
int count, key;
|
int count, key;
|
||||||
{
|
{
|
||||||
int c, save = rl_point;
|
int c, save;
|
||||||
|
|
||||||
|
save = rl_point;
|
||||||
if (_rl_uppercase_p (key))
|
if (_rl_uppercase_p (key))
|
||||||
rl_stuff_char ('$');
|
rl_stuff_char ('$');
|
||||||
|
|
||||||
@ -1073,12 +1107,46 @@ rl_vi_yank_to (count, key)
|
|||||||
return (0);
|
return (0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int
|
||||||
|
rl_vi_rubout (count, key)
|
||||||
|
int count, key;
|
||||||
|
{
|
||||||
|
int p, opoint;
|
||||||
|
|
||||||
|
if (count < 0)
|
||||||
|
return (rl_vi_delete (-count, key));
|
||||||
|
|
||||||
|
if (rl_point == 0)
|
||||||
|
{
|
||||||
|
rl_ding ();
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
opoint = rl_point;
|
||||||
|
if (count > 1 && MB_CUR_MAX > 1 && rl_byte_oriented == 0)
|
||||||
|
rl_backward_char (count, key);
|
||||||
|
else if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
|
||||||
|
rl_point = _rl_find_prev_mbchar (rl_line_buffer, rl_point, MB_FIND_NONZERO);
|
||||||
|
else
|
||||||
|
rl_point -= count;
|
||||||
|
|
||||||
|
if (rl_point < 0)
|
||||||
|
rl_point = 0;
|
||||||
|
|
||||||
|
rl_kill_text (rl_point, opoint);
|
||||||
|
|
||||||
|
return (0);
|
||||||
|
}
|
||||||
|
|
||||||
int
|
int
|
||||||
rl_vi_delete (count, key)
|
rl_vi_delete (count, key)
|
||||||
int count, key;
|
int count, key;
|
||||||
{
|
{
|
||||||
int end;
|
int end;
|
||||||
|
|
||||||
|
if (count < 0)
|
||||||
|
return (rl_vi_rubout (-count, key));
|
||||||
|
|
||||||
if (rl_end == 0)
|
if (rl_end == 0)
|
||||||
{
|
{
|
||||||
rl_ding ();
|
rl_ding ();
|
||||||
@ -1097,6 +1165,7 @@ rl_vi_delete (count, key)
|
|||||||
|
|
||||||
if (rl_point > 0 && rl_point == rl_end)
|
if (rl_point > 0 && rl_point == rl_end)
|
||||||
rl_backward_char (1, key);
|
rl_backward_char (1, key);
|
||||||
|
|
||||||
return (0);
|
return (0);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1117,64 +1186,102 @@ rl_vi_first_print (count, key)
|
|||||||
return (rl_vi_back_to_indent (1, key));
|
return (rl_vi_back_to_indent (1, key));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int _rl_cs_dir, _rl_cs_orig_dir;
|
||||||
|
|
||||||
|
#if defined (READLINE_CALLBACKS)
|
||||||
|
static int
|
||||||
|
_rl_vi_callback_char_search (data)
|
||||||
|
_rl_callback_generic_arg *data;
|
||||||
|
{
|
||||||
|
#if defined (HANDLE_MULTIBYTE)
|
||||||
|
_rl_vi_last_search_mblen = _rl_read_mbchar (_rl_vi_last_search_mbchar, MB_LEN_MAX);
|
||||||
|
#else
|
||||||
|
RL_SETSTATE(RL_STATE_MOREINPUT);
|
||||||
|
_rl_vi_last_search_char = rl_read_key ();
|
||||||
|
RL_UNSETSTATE(RL_STATE_MOREINPUT);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
_rl_callback_func = 0;
|
||||||
|
_rl_want_redisplay = 1;
|
||||||
|
|
||||||
|
#if defined (HANDLE_MULTIBYTE)
|
||||||
|
return (_rl_char_search_internal (data->count, _rl_cs_dir, _rl_vi_last_search_mbchar, _rl_vi_last_search_mblen));
|
||||||
|
#else
|
||||||
|
return (_rl_char_search_internal (data->count, _rl_cs_dir, _rl_vi_last_search_char));
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
int
|
int
|
||||||
rl_vi_char_search (count, key)
|
rl_vi_char_search (count, key)
|
||||||
int count, key;
|
int count, key;
|
||||||
{
|
{
|
||||||
#if defined (HANDLE_MULTIBYTE)
|
#if defined (HANDLE_MULTIBYTE)
|
||||||
static char *target;
|
static char *target;
|
||||||
static int mb_len;
|
static int tlen;
|
||||||
#else
|
#else
|
||||||
static char target;
|
static char target;
|
||||||
#endif
|
#endif
|
||||||
static int orig_dir, dir;
|
|
||||||
|
|
||||||
if (key == ';' || key == ',')
|
if (key == ';' || key == ',')
|
||||||
dir = key == ';' ? orig_dir : -orig_dir;
|
_rl_cs_dir = (key == ';') ? _rl_cs_orig_dir : -_rl_cs_orig_dir;
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if (vi_redoing)
|
|
||||||
#if defined (HANDLE_MULTIBYTE)
|
|
||||||
target = _rl_vi_last_search_mbchar;
|
|
||||||
#else
|
|
||||||
target = _rl_vi_last_search_char;
|
|
||||||
#endif
|
|
||||||
else
|
|
||||||
{
|
|
||||||
#if defined (HANDLE_MULTIBYTE)
|
|
||||||
mb_len = _rl_read_mbchar (_rl_vi_last_search_mbchar, MB_LEN_MAX);
|
|
||||||
target = _rl_vi_last_search_mbchar;
|
|
||||||
#else
|
|
||||||
RL_SETSTATE(RL_STATE_MOREINPUT);
|
|
||||||
_rl_vi_last_search_char = target = rl_read_key ();
|
|
||||||
RL_UNSETSTATE(RL_STATE_MOREINPUT);
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
switch (key)
|
switch (key)
|
||||||
{
|
{
|
||||||
case 't':
|
case 't':
|
||||||
orig_dir = dir = FTO;
|
_rl_cs_orig_dir = _rl_cs_dir = FTO;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 'T':
|
case 'T':
|
||||||
orig_dir = dir = BTO;
|
_rl_cs_orig_dir = _rl_cs_dir = BTO;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 'f':
|
case 'f':
|
||||||
orig_dir = dir = FFIND;
|
_rl_cs_orig_dir = _rl_cs_dir = FFIND;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 'F':
|
case 'F':
|
||||||
orig_dir = dir = BFIND;
|
_rl_cs_orig_dir = _rl_cs_dir = BFIND;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (vi_redoing)
|
||||||
|
{
|
||||||
|
/* set target and tlen below */
|
||||||
|
}
|
||||||
|
#if defined (READLINE_CALLBACKS)
|
||||||
|
else if (RL_ISSTATE (RL_STATE_CALLBACK))
|
||||||
|
{
|
||||||
|
_rl_callback_data = _rl_callback_data_alloc (count);
|
||||||
|
_rl_callback_data->i1 = _rl_cs_dir;
|
||||||
|
_rl_callback_func = _rl_vi_callback_char_search;
|
||||||
|
return (0);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
else
|
||||||
|
{
|
||||||
|
#if defined (HANDLE_MULTIBYTE)
|
||||||
|
_rl_vi_last_search_mblen = _rl_read_mbchar (_rl_vi_last_search_mbchar, MB_LEN_MAX);
|
||||||
|
#else
|
||||||
|
RL_SETSTATE(RL_STATE_MOREINPUT);
|
||||||
|
_rl_vi_last_search_char = rl_read_key ();
|
||||||
|
RL_UNSETSTATE(RL_STATE_MOREINPUT);
|
||||||
|
#endif
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#if defined (HANDLE_MULTIBYTE)
|
#if defined (HANDLE_MULTIBYTE)
|
||||||
return (_rl_char_search_internal (count, dir, target, mb_len));
|
target = _rl_vi_last_search_mbchar;
|
||||||
|
tlen = _rl_vi_last_search_mblen;
|
||||||
#else
|
#else
|
||||||
return (_rl_char_search_internal (count, dir, target));
|
target = _rl_vi_last_search_char;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined (HANDLE_MULTIBYTE)
|
||||||
|
return (_rl_char_search_internal (count, _rl_cs_dir, target, tlen));
|
||||||
|
#else
|
||||||
|
return (_rl_char_search_internal (count, _rl_cs_dir, target));
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1285,25 +1392,12 @@ rl_vi_bracktype (c)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* XXX - think about reading an entire mbchar with _rl_read_mbchar and
|
static int
|
||||||
inserting it in one bunch instead of the loop below (like in
|
_rl_vi_change_char (count, c, mb)
|
||||||
rl_vi_char_search or _rl_vi_change_mbchar_case). Set c to mbchar[0]
|
int count, c;
|
||||||
for test against 033 or ^C. Make sure that _rl_read_mbchar does
|
char *mb;
|
||||||
this right. */
|
|
||||||
int
|
|
||||||
rl_vi_change_char (count, key)
|
|
||||||
int count, key;
|
|
||||||
{
|
{
|
||||||
int c, p;
|
int p;
|
||||||
|
|
||||||
if (vi_redoing)
|
|
||||||
c = _rl_vi_last_replacement;
|
|
||||||
else
|
|
||||||
{
|
|
||||||
RL_SETSTATE(RL_STATE_MOREINPUT);
|
|
||||||
_rl_vi_last_replacement = c = rl_read_key ();
|
|
||||||
RL_UNSETSTATE(RL_STATE_MOREINPUT);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (c == '\033' || c == CTRL ('C'))
|
if (c == '\033' || c == CTRL ('C'))
|
||||||
return -1;
|
return -1;
|
||||||
@ -1313,31 +1407,87 @@ rl_vi_change_char (count, key)
|
|||||||
{
|
{
|
||||||
p = rl_point;
|
p = rl_point;
|
||||||
rl_vi_delete (1, c);
|
rl_vi_delete (1, c);
|
||||||
|
if (rl_point < p) /* Did we retreat at EOL? */
|
||||||
|
rl_point++;
|
||||||
#if defined (HANDLE_MULTIBYTE)
|
#if defined (HANDLE_MULTIBYTE)
|
||||||
if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
|
if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
|
||||||
{
|
rl_insert_text (mb);
|
||||||
if (rl_point < p) /* Did we retreat at EOL? */
|
|
||||||
rl_point++;
|
|
||||||
while (_rl_insert_char (1, c))
|
|
||||||
{
|
|
||||||
RL_SETSTATE (RL_STATE_MOREINPUT);
|
|
||||||
c = rl_read_key ();
|
|
||||||
RL_UNSETSTATE (RL_STATE_MOREINPUT);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
else
|
||||||
#endif
|
#endif
|
||||||
{
|
|
||||||
if (rl_point < p) /* Did we retreat at EOL? */
|
|
||||||
rl_point++;
|
|
||||||
_rl_insert_char (1, c);
|
_rl_insert_char (1, c);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
/* The cursor shall be left on the last character changed. */
|
||||||
|
rl_backward_char (1, c);
|
||||||
|
|
||||||
rl_end_undo_group ();
|
rl_end_undo_group ();
|
||||||
|
|
||||||
return (0);
|
return (0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int
|
||||||
|
_rl_vi_callback_getchar (mb, mblen)
|
||||||
|
char *mb;
|
||||||
|
int mblen;
|
||||||
|
{
|
||||||
|
int c;
|
||||||
|
|
||||||
|
RL_SETSTATE(RL_STATE_MOREINPUT);
|
||||||
|
c = rl_read_key ();
|
||||||
|
RL_UNSETSTATE(RL_STATE_MOREINPUT);
|
||||||
|
|
||||||
|
#if defined (HANDLE_MULTIBYTE)
|
||||||
|
if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
|
||||||
|
c = _rl_read_mbstring (c, mb, mblen);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
return c;
|
||||||
|
}
|
||||||
|
|
||||||
|
#if defined (READLINE_CALLBACKS)
|
||||||
|
static int
|
||||||
|
_rl_vi_callback_change_char (data)
|
||||||
|
_rl_callback_generic_arg *data;
|
||||||
|
{
|
||||||
|
int c;
|
||||||
|
char mb[MB_LEN_MAX];
|
||||||
|
|
||||||
|
_rl_vi_last_replacement = c = _rl_vi_callback_getchar (mb, MB_LEN_MAX);
|
||||||
|
|
||||||
|
_rl_callback_func = 0;
|
||||||
|
_rl_want_redisplay = 1;
|
||||||
|
|
||||||
|
return (_rl_vi_change_char (data->count, c, mb));
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
int
|
||||||
|
rl_vi_change_char (count, key)
|
||||||
|
int count, key;
|
||||||
|
{
|
||||||
|
int c;
|
||||||
|
char mb[MB_LEN_MAX];
|
||||||
|
|
||||||
|
if (vi_redoing)
|
||||||
|
{
|
||||||
|
c = _rl_vi_last_replacement;
|
||||||
|
mb[0] = c;
|
||||||
|
mb[1] = '\0';
|
||||||
|
}
|
||||||
|
#if defined (READLINE_CALLBACKS)
|
||||||
|
else if (RL_ISSTATE (RL_STATE_CALLBACK))
|
||||||
|
{
|
||||||
|
_rl_callback_data = _rl_callback_data_alloc (count);
|
||||||
|
_rl_callback_func = _rl_vi_callback_change_char;
|
||||||
|
return (0);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
else
|
||||||
|
_rl_vi_last_replacement = c = _rl_vi_callback_getchar (mb, MB_LEN_MAX);
|
||||||
|
|
||||||
|
return (_rl_vi_change_char (count, c, mb));
|
||||||
|
}
|
||||||
|
|
||||||
int
|
int
|
||||||
rl_vi_subst (count, key)
|
rl_vi_subst (count, key)
|
||||||
int count, key;
|
int count, key;
|
||||||
@ -1460,9 +1610,8 @@ rl_vi_possible_completions()
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* Functions to save and restore marks. */
|
/* Functions to save and restore marks. */
|
||||||
int
|
static int
|
||||||
rl_vi_set_mark (count, key)
|
_rl_vi_set_mark ()
|
||||||
int count, key;
|
|
||||||
{
|
{
|
||||||
int ch;
|
int ch;
|
||||||
|
|
||||||
@ -1480,9 +1629,36 @@ rl_vi_set_mark (count, key)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if defined (READLINE_CALLBACKS)
|
||||||
|
static int
|
||||||
|
_rl_vi_callback_set_mark (data)
|
||||||
|
_rl_callback_generic_arg *data;
|
||||||
|
{
|
||||||
|
_rl_callback_func = 0;
|
||||||
|
_rl_want_redisplay = 1;
|
||||||
|
|
||||||
|
return (_rl_vi_set_mark ());
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
int
|
int
|
||||||
rl_vi_goto_mark (count, key)
|
rl_vi_set_mark (count, key)
|
||||||
int count, key;
|
int count, key;
|
||||||
|
{
|
||||||
|
#if defined (READLINE_CALLBACKS)
|
||||||
|
if (RL_ISSTATE (RL_STATE_CALLBACK))
|
||||||
|
{
|
||||||
|
_rl_callback_data = 0;
|
||||||
|
_rl_callback_func = _rl_vi_callback_set_mark;
|
||||||
|
return (0);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
return (_rl_vi_set_mark ());
|
||||||
|
}
|
||||||
|
|
||||||
|
static int
|
||||||
|
_rl_vi_goto_mark ()
|
||||||
{
|
{
|
||||||
int ch;
|
int ch;
|
||||||
|
|
||||||
@ -1511,4 +1687,31 @@ rl_vi_goto_mark (count, key)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if defined (READLINE_CALLBACKS)
|
||||||
|
static int
|
||||||
|
_rl_vi_callback_goto_mark (data)
|
||||||
|
_rl_callback_generic_arg *data;
|
||||||
|
{
|
||||||
|
_rl_callback_func = 0;
|
||||||
|
_rl_want_redisplay = 1;
|
||||||
|
|
||||||
|
return (_rl_vi_goto_mark ());
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
int
|
||||||
|
rl_vi_goto_mark (count, key)
|
||||||
|
int count, key;
|
||||||
|
{
|
||||||
|
#if defined (READLINE_CALLBACKS)
|
||||||
|
if (RL_ISSTATE (RL_STATE_CALLBACK))
|
||||||
|
{
|
||||||
|
_rl_callback_data = 0;
|
||||||
|
_rl_callback_func = _rl_vi_callback_goto_mark;
|
||||||
|
return (0);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
return (_rl_vi_goto_mark ());
|
||||||
|
}
|
||||||
#endif /* VI_MODE */
|
#endif /* VI_MODE */
|
||||||
|
Loading…
Reference in New Issue
Block a user