From e3af937042423cb5644bc00b08054c6823572fb4 Mon Sep 17 00:00:00 2001 From: Chet Ramey Date: Mon, 12 Dec 2011 22:16:16 -0500 Subject: [PATCH] commit bash-4.2 snapshot --- CHANGES | 9 + builtins/mkbuiltins.c | 2 +- configure | 22 +- configure.in | 4 +- doc/FAQ | 2 +- doc/bashref.dvi | Bin 680368 -> 680368 bytes doc/bashref.pdf | Bin 570068 -> 570072 bytes execute_cmd.c | 6 +- lib/readline/COPYING | 675 +++++++++++++++++++++++++++++++- lib/readline/ansi_stdlib.h | 55 ++- lib/readline/bind.c | 4 +- lib/readline/doc/fdl.texi | 507 +++++++++++++++++++++++- lib/readline/doc/history.texi | 2 +- lib/readline/doc/hstech.texi | 2 +- lib/readline/doc/hsuser.texi | 2 +- lib/readline/doc/rlman.texi | 2 +- lib/readline/doc/rltech.texi | 2 +- lib/readline/doc/rluser.texi | 2 +- lib/readline/doc/rluserman.texi | 2 +- lib/readline/doc/version.texi | 2 +- lib/readline/posixdir.h | 62 ++- lib/readline/posixjmp.h | 41 +- lib/readline/posixselect.h | 48 ++- lib/readline/posixstat.h | 143 ++++++- lib/readline/signals.c | 1 + lib/readline/tilde.c | 503 +++++++++++++++++++++++- lib/readline/tilde.h | 81 +++- po/en@boldquot.gmo | Bin 161159 -> 161163 bytes po/en@boldquot.po | 2 +- po/en@quot.gmo | Bin 159607 -> 159611 bytes po/en@quot.po | 2 +- subst.c | 40 +- support/mkconffiles | 0 support/mkversion.sh | 0 support/rlvers.sh | 0 support/shobj-conf | 0 trap.c | 1 + 37 files changed, 2152 insertions(+), 74 deletions(-) mode change 120000 => 100644 lib/readline/COPYING mode change 120000 => 100644 lib/readline/ansi_stdlib.h mode change 120000 => 100644 lib/readline/doc/fdl.texi mode change 120000 => 100644 lib/readline/posixdir.h mode change 120000 => 100644 lib/readline/posixjmp.h mode change 120000 => 100644 lib/readline/posixselect.h mode change 120000 => 100644 lib/readline/posixstat.h mode change 120000 => 100644 lib/readline/tilde.c mode change 120000 => 100644 lib/readline/tilde.h mode change 100644 => 100755 support/mkconffiles mode change 100644 => 100755 support/mkversion.sh mode change 100644 => 100755 support/rlvers.sh mode change 100644 => 100755 support/shobj-conf diff --git a/CHANGES b/CHANGES index 43e95971b..84e1dbda1 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,12 @@ +This document details the changes between this version, bash-4.2-release, +and the previous version, bash-4.2-rc2. + +1. Changes to Bash + +a. Fixed a bug that caused some variables to be clobbered by a longjmp, + resulting in stack corruption. + +------------------------------------------------------------------------------ This document details the changes between this version, bash-4.2-rc2, and the previous version, bash-4.2-rc1. diff --git a/builtins/mkbuiltins.c b/builtins/mkbuiltins.c index 10a285833..cdfdfb18a 100644 --- a/builtins/mkbuiltins.c +++ b/builtins/mkbuiltins.c @@ -1127,7 +1127,7 @@ char *structfile_header[] = { }; char *structfile_footer[] = { - " { (char *)0x0, (sh_builtin_func_t *)0x0, 0, (char **)0x0, (char *)0x0 }", + " { (char *)0x0, (sh_builtin_func_t *)0x0, 0, (char **)0x0, (char *)0x0, (char *)0x0 }", "};", "", "struct builtin *shell_builtins = static_shell_builtins;", diff --git a/configure b/configure index 6ec0063b1..7ec72fe67 100755 --- a/configure +++ b/configure @@ -1,7 +1,7 @@ #! /bin/sh -# From configure.in for Bash 4.2, version 4.036. +# From configure.in for Bash 4.2, version 4.037. # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for bash 4.2-rc2. +# Generated by GNU Autoconf 2.63 for bash 4.2-release. # # Report bugs to . # @@ -597,8 +597,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='bash' PACKAGE_TARNAME='bash' -PACKAGE_VERSION='4.2-rc2' -PACKAGE_STRING='bash 4.2-rc2' +PACKAGE_VERSION='4.2-release' +PACKAGE_STRING='bash 4.2-release' PACKAGE_BUGREPORT='bug-bash@gnu.org' ac_unique_file="shell.h" @@ -1410,7 +1410,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures bash 4.2-rc2 to adapt to many kinds of systems. +\`configure' configures bash 4.2-release to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1475,7 +1475,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of bash 4.2-rc2:";; + short | recursive ) echo "Configuration of bash 4.2-release:";; esac cat <<\_ACEOF @@ -1650,7 +1650,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -bash configure 4.2-rc2 +bash configure 4.2-release generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1664,7 +1664,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by bash $as_me 4.2-rc2, which was +It was created by bash $as_me 4.2-release, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2078,7 +2078,7 @@ ac_config_headers="$ac_config_headers config.h" BASHVERS=4.2 -RELSTATUS=rc2 +RELSTATUS=release case "$RELSTATUS" in alp*|bet*|dev*|rc*|maint*) DEBUG='-DDEBUG' MALLOC_DEBUG='-DMALLOC_DEBUG' ;; @@ -31862,7 +31862,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by bash $as_me 4.2-rc2, which was +This file was extended by bash $as_me 4.2-release, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -31925,7 +31925,7 @@ Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -bash config.status 4.2-rc2 +bash config.status 4.2-release configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff --git a/configure.in b/configure.in index cd084f936..d7e09983c 100644 --- a/configure.in +++ b/configure.in @@ -21,10 +21,10 @@ dnl Process this file with autoconf to produce a configure script. # You should have received a copy of the GNU General Public License # along with this program. If not, see . -AC_REVISION([for Bash 4.2, version 4.036])dnl +AC_REVISION([for Bash 4.2, version 4.037])dnl define(bashvers, 4.2) -define(relstatus, rc2) +define(relstatus, release) AC_INIT([bash], bashvers-relstatus, [bug-bash@gnu.org]) diff --git a/doc/FAQ b/doc/FAQ index 8b0f2deee..33ca3d32a 100644 --- a/doc/FAQ +++ b/doc/FAQ @@ -144,7 +144,7 @@ of Case Western Reserve University. A2) What's the latest version? -The latest version is 4.2, first made available on NN December, 2010. +The latest version is 4.2, first made available on 14 February, 2011. A3) Where can I get it? diff --git a/doc/bashref.dvi b/doc/bashref.dvi index 0c293893b2afcdc218a5665e08d891d071d1289e..5494dbf10148ab66664502fca338cbdb59fca4bd 100644 GIT binary patch delta 62 zc-q@=SaZW+%?XNpMtX+ER)$7~=G_bo42;tizcQ;d2Db(?wgxk`1~az?v$O`Ywg$7c S2D7&YbF>C?ZVl#&O#}c}*Aj{V delta 62 zc-q@=SaZW+%?XNphI&R8Rz^k!=G_bo42;tizcQ;d2Db(?wgxk`1~az?v$O`Ywg$7c S2D7&YbF>C?ZVl#&O#}c~(GrgU diff --git a/doc/bashref.pdf b/doc/bashref.pdf index dbec106c975a6ae4f01ea670f4c1f1ebde7c92b8..ef90d3bcd43958a6d6d960b45870c52daef35185 100644 GIT binary patch delta 24695 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

8JI9<& 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 diff --git a/execute_cmd.c b/execute_cmd.c index 3e33f3f6f..485b0c791 100644 --- a/execute_cmd.c +++ b/execute_cmd.c @@ -1317,7 +1317,7 @@ execute_in_subshell (command, asynchronous, pipe_in, pipe_out, fds_to_close) int user_subshell, return_code, function_value, should_redir_stdin, invert; int ois, user_coproc; int result; - COMMAND *tcom; + volatile COMMAND *tcom; USE_VAR(user_subshell); USE_VAR(user_coproc); @@ -4135,7 +4135,9 @@ execute_function (var, words, flags, fds_to_close, async, subshell) char *debug_trap, *error_trap, *return_trap; #if defined (ARRAY_VARS) SHELL_VAR *funcname_v, *nfv, *bash_source_v, *bash_lineno_v; - ARRAY *funcname_a, *bash_source_a, *bash_lineno_a; + ARRAY *funcname_a; + volatile ARRAY *bash_source_a; + volatile ARRAY *bash_lineno_a; #endif FUNCTION_DEF *shell_fn; char *sfile, *t; diff --git a/lib/readline/COPYING b/lib/readline/COPYING deleted file mode 120000 index 7d29222e4..000000000 --- a/lib/readline/COPYING +++ /dev/null @@ -1 +0,0 @@ -../../COPYING \ No newline at end of file diff --git a/lib/readline/COPYING b/lib/readline/COPYING new file mode 100644 index 000000000..94a9ed024 --- /dev/null +++ b/lib/readline/COPYING @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + 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 3 of the License, 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, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/lib/readline/ansi_stdlib.h b/lib/readline/ansi_stdlib.h deleted file mode 120000 index 0bfba502e..000000000 --- a/lib/readline/ansi_stdlib.h +++ /dev/null @@ -1 +0,0 @@ -../../include/ansi_stdlib.h \ No newline at end of file diff --git a/lib/readline/ansi_stdlib.h b/lib/readline/ansi_stdlib.h new file mode 100644 index 000000000..7dc2ee0cf --- /dev/null +++ b/lib/readline/ansi_stdlib.h @@ -0,0 +1,54 @@ +/* ansi_stdlib.h -- An ANSI Standard stdlib.h. */ +/* A minimal stdlib.h containing extern declarations for those functions + that bash uses. */ + +/* Copyright (C) 1993 Free Software Foundation, Inc. + + This file is part of GNU Bash, the Bourne Again SHell. + + Bash 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 3 of the License, or + (at your option) any later version. + + Bash 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 Bash. If not, see . +*/ + +#if !defined (_STDLIB_H_) +#define _STDLIB_H_ 1 + +/* String conversion functions. */ +extern int atoi (); + +extern double atof (); +extern double strtod (); + +/* Memory allocation functions. */ +/* Generic pointer type. */ +#ifndef PTR_T + +#if defined (__STDC__) +# define PTR_T void * +#else +# define PTR_T char * +#endif + +#endif /* PTR_T */ + +extern PTR_T malloc (); +extern PTR_T realloc (); +extern void free (); + +/* Other miscellaneous functions. */ +extern void abort (); +extern void exit (); +extern char *getenv (); +extern void qsort (); + +#endif /* _STDLIB_H */ diff --git a/lib/readline/bind.c b/lib/readline/bind.c index b552abb3b..59e796436 100644 --- a/lib/readline/bind.c +++ b/lib/readline/bind.c @@ -1451,7 +1451,7 @@ static const struct { #if defined (VISIBLE_STATS) { "visible-stats", &rl_visible_stats, 0 }, #endif /* VISIBLE_STATS */ - { (char *)NULL, (int *)NULL } + { (char *)NULL, (int *)NULL, 0 } }; static int @@ -1526,7 +1526,7 @@ static const struct { { "history-size", V_INT, sv_histsize }, { "isearch-terminators", V_STRING, sv_isrchterm }, { "keymap", V_STRING, sv_keymap }, - { (char *)NULL, 0 } + { (char *)NULL, 0, (_rl_sv_func_t *)0 } }; static int diff --git a/lib/readline/doc/fdl.texi b/lib/readline/doc/fdl.texi deleted file mode 120000 index 68e5eb548..000000000 --- a/lib/readline/doc/fdl.texi +++ /dev/null @@ -1 +0,0 @@ -../../../doc/fdl.texi \ No newline at end of file diff --git a/lib/readline/doc/fdl.texi b/lib/readline/doc/fdl.texi new file mode 100644 index 000000000..8805f1a47 --- /dev/null +++ b/lib/readline/doc/fdl.texi @@ -0,0 +1,506 @@ +@c The GNU Free Documentation License. +@center Version 1.3, 3 November 2008 + +@c This file is intended to be included within another document, +@c hence no sectioning command or @node. + +@display +Copyright @copyright{} 2000, 2001, 2002, 2007, 2008 Free Software Foundation, Inc. +@uref{http://fsf.org/} + +Everyone is permitted to copy and distribute verbatim copies +of this license document, but changing it is not allowed. +@end display + +@enumerate 0 +@item +PREAMBLE + +The purpose of this License is to make a manual, textbook, or other +functional and useful document @dfn{free} in the sense of freedom: to +assure everyone the effective freedom to copy and redistribute it, +with or without modifying it, either commercially or noncommercially. +Secondarily, this License preserves for the author and publisher a way +to get credit for their work, while not being considered responsible +for modifications made by others. + +This License is a kind of ``copyleft'', which means that derivative +works of the document must themselves be free in the same sense. It +complements the GNU General Public License, which is a copyleft +license designed for free software. + +We have designed this License in order to use it for manuals for free +software, because free software needs free documentation: a free +program should come with manuals providing the same freedoms that the +software does. But this License is not limited to software manuals; +it can be used for any textual work, regardless of subject matter or +whether it is published as a printed book. We recommend this License +principally for works whose purpose is instruction or reference. + +@item +APPLICABILITY AND DEFINITIONS + +This License applies to any manual or other work, in any medium, that +contains a notice placed by the copyright holder saying it can be +distributed under the terms of this License. Such a notice grants a +world-wide, royalty-free license, unlimited in duration, to use that +work under the conditions stated herein. The ``Document'', below, +refers to any such manual or work. Any member of the public is a +licensee, and is addressed as ``you''. You accept the license if you +copy, modify or distribute the work in a way requiring permission +under copyright law. + +A ``Modified Version'' of the Document means any work containing the +Document or a portion of it, either copied verbatim, or with +modifications and/or translated into another language. + +A ``Secondary Section'' is a named appendix or a front-matter section +of the Document that deals exclusively with the relationship of the +publishers or authors of the Document to the Document's overall +subject (or to related matters) and contains nothing that could fall +directly within that overall subject. (Thus, if the Document is in +part a textbook of mathematics, a Secondary Section may not explain +any mathematics.) The relationship could be a matter of historical +connection with the subject or with related matters, or of legal, +commercial, philosophical, ethical or political position regarding +them. + +The ``Invariant Sections'' are certain Secondary Sections whose titles +are designated, as being those of Invariant Sections, in the notice +that says that the Document is released under this License. If a +section does not fit the above definition of Secondary then it is not +allowed to be designated as Invariant. The Document may contain zero +Invariant Sections. If the Document does not identify any Invariant +Sections then there are none. + +The ``Cover Texts'' are certain short passages of text that are listed, +as Front-Cover Texts or Back-Cover Texts, in the notice that says that +the Document is released under this License. A Front-Cover Text may +be at most 5 words, and a Back-Cover Text may be at most 25 words. + +A ``Transparent'' copy of the Document means a machine-readable copy, +represented in a format whose specification is available to the +general public, that is suitable for revising the document +straightforwardly with generic text editors or (for images composed of +pixels) generic paint programs or (for drawings) some widely available +drawing editor, and that is suitable for input to text formatters or +for automatic translation to a variety of formats suitable for input +to text formatters. A copy made in an otherwise Transparent file +format whose markup, or absence of markup, has been arranged to thwart +or discourage subsequent modification by readers is not Transparent. +An image format is not Transparent if used for any substantial amount +of text. A copy that is not ``Transparent'' is called ``Opaque''. + +Examples of suitable formats for Transparent copies include plain +@sc{ascii} without markup, Texinfo input format, La@TeX{} input +format, @acronym{SGML} or @acronym{XML} using a publicly available +@acronym{DTD}, and standard-conforming simple @acronym{HTML}, +PostScript or @acronym{PDF} designed for human modification. Examples +of transparent image formats include @acronym{PNG}, @acronym{XCF} and +@acronym{JPG}. Opaque formats include proprietary formats that can be +read and edited only by proprietary word processors, @acronym{SGML} or +@acronym{XML} for which the @acronym{DTD} and/or processing tools are +not generally available, and the machine-generated @acronym{HTML}, +PostScript or @acronym{PDF} produced by some word processors for +output purposes only. + +The ``Title Page'' means, for a printed book, the title page itself, +plus such following pages as are needed to hold, legibly, the material +this License requires to appear in the title page. For works in +formats which do not have any title page as such, ``Title Page'' means +the text near the most prominent appearance of the work's title, +preceding the beginning of the body of the text. + +The ``publisher'' means any person or entity that distributes copies +of the Document to the public. + +A section ``Entitled XYZ'' means a named subunit of the Document whose +title either is precisely XYZ or contains XYZ in parentheses following +text that translates XYZ in another language. (Here XYZ stands for a +specific section name mentioned below, such as ``Acknowledgements'', +``Dedications'', ``Endorsements'', or ``History''.) To ``Preserve the Title'' +of such a section when you modify the Document means that it remains a +section ``Entitled XYZ'' according to this definition. + +The Document may include Warranty Disclaimers next to the notice which +states that this License applies to the Document. These Warranty +Disclaimers are considered to be included by reference in this +License, but only as regards disclaiming warranties: any other +implication that these Warranty Disclaimers may have is void and has +no effect on the meaning of this License. + +@item +VERBATIM COPYING + +You may copy and distribute the Document in any medium, either +commercially or noncommercially, provided that this License, the +copyright notices, and the license notice saying this License applies +to the Document are reproduced in all copies, and that you add no other +conditions whatsoever to those of this License. You may not use +technical measures to obstruct or control the reading or further +copying of the copies you make or distribute. However, you may accept +compensation in exchange for copies. If you distribute a large enough +number of copies you must also follow the conditions in section 3. + +You may also lend copies, under the same conditions stated above, and +you may publicly display copies. + +@item +COPYING IN QUANTITY + +If you publish printed copies (or copies in media that commonly have +printed covers) of the Document, numbering more than 100, and the +Document's license notice requires Cover Texts, you must enclose the +copies in covers that carry, clearly and legibly, all these Cover +Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on +the back cover. Both covers must also clearly and legibly identify +you as the publisher of these copies. The front cover must present +the full title with all words of the title equally prominent and +visible. You may add other material on the covers in addition. +Copying with changes limited to the covers, as long as they preserve +the title of the Document and satisfy these conditions, can be treated +as verbatim copying in other respects. + +If the required texts for either cover are too voluminous to fit +legibly, you should put the first ones listed (as many as fit +reasonably) on the actual cover, and continue the rest onto adjacent +pages. + +If you publish or distribute Opaque copies of the Document numbering +more than 100, you must either include a machine-readable Transparent +copy along with each Opaque copy, or state in or with each Opaque copy +a computer-network location from which the general network-using +public has access to download using public-standard network protocols +a complete Transparent copy of the Document, free of added material. +If you use the latter option, you must take reasonably prudent steps, +when you begin distribution of Opaque copies in quantity, to ensure +that this Transparent copy will remain thus accessible at the stated +location until at least one year after the last time you distribute an +Opaque copy (directly or through your agents or retailers) of that +edition to the public. + +It is requested, but not required, that you contact the authors of the +Document well before redistributing any large number of copies, to give +them a chance to provide you with an updated version of the Document. + +@item +MODIFICATIONS + +You may copy and distribute a Modified Version of the Document under +the conditions of sections 2 and 3 above, provided that you release +the Modified Version under precisely this License, with the Modified +Version filling the role of the Document, thus licensing distribution +and modification of the Modified Version to whoever possesses a copy +of it. In addition, you must do these things in the Modified Version: + +@enumerate A +@item +Use in the Title Page (and on the covers, if any) a title distinct +from that of the Document, and from those of previous versions +(which should, if there were any, be listed in the History section +of the Document). You may use the same title as a previous version +if the original publisher of that version gives permission. + +@item +List on the Title Page, as authors, one or more persons or entities +responsible for authorship of the modifications in the Modified +Version, together with at least five of the principal authors of the +Document (all of its principal authors, if it has fewer than five), +unless they release you from this requirement. + +@item +State on the Title page the name of the publisher of the +Modified Version, as the publisher. + +@item +Preserve all the copyright notices of the Document. + +@item +Add an appropriate copyright notice for your modifications +adjacent to the other copyright notices. + +@item +Include, immediately after the copyright notices, a license notice +giving the public permission to use the Modified Version under the +terms of this License, in the form shown in the Addendum below. + +@item +Preserve in that license notice the full lists of Invariant Sections +and required Cover Texts given in the Document's license notice. + +@item +Include an unaltered copy of this License. + +@item +Preserve the section Entitled ``History'', Preserve its Title, and add +to it an item stating at least the title, year, new authors, and +publisher of the Modified Version as given on the Title Page. If +there is no section Entitled ``History'' in the Document, create one +stating the title, year, authors, and publisher of the Document as +given on its Title Page, then add an item describing the Modified +Version as stated in the previous sentence. + +@item +Preserve the network location, if any, given in the Document for +public access to a Transparent copy of the Document, and likewise +the network locations given in the Document for previous versions +it was based on. These may be placed in the ``History'' section. +You may omit a network location for a work that was published at +least four years before the Document itself, or if the original +publisher of the version it refers to gives permission. + +@item +For any section Entitled ``Acknowledgements'' or ``Dedications'', Preserve +the Title of the section, and preserve in the section all the +substance and tone of each of the contributor acknowledgements and/or +dedications given therein. + +@item +Preserve all the Invariant Sections of the Document, +unaltered in their text and in their titles. Section numbers +or the equivalent are not considered part of the section titles. + +@item +Delete any section Entitled ``Endorsements''. Such a section +may not be included in the Modified Version. + +@item +Do not retitle any existing section to be Entitled ``Endorsements'' or +to conflict in title with any Invariant Section. + +@item +Preserve any Warranty Disclaimers. +@end enumerate + +If the Modified Version includes new front-matter sections or +appendices that qualify as Secondary Sections and contain no material +copied from the Document, you may at your option designate some or all +of these sections as invariant. To do this, add their titles to the +list of Invariant Sections in the Modified Version's license notice. +These titles must be distinct from any other section titles. + +You may add a section Entitled ``Endorsements'', provided it contains +nothing but endorsements of your Modified Version by various +parties---for example, statements of peer review or that the text has +been approved by an organization as the authoritative definition of a +standard. + +You may add a passage of up to five words as a Front-Cover Text, and a +passage of up to 25 words as a Back-Cover Text, to the end of the list +of Cover Texts in the Modified Version. Only one passage of +Front-Cover Text and one of Back-Cover Text may be added by (or +through arrangements made by) any one entity. If the Document already +includes a cover text for the same cover, previously added by you or +by arrangement made by the same entity you are acting on behalf of, +you may not add another; but you may replace the old one, on explicit +permission from the previous publisher that added the old one. + +The author(s) and publisher(s) of the Document do not by this License +give permission to use their names for publicity for or to assert or +imply endorsement of any Modified Version. + +@item +COMBINING DOCUMENTS + +You may combine the Document with other documents released under this +License, under the terms defined in section 4 above for modified +versions, provided that you include in the combination all of the +Invariant Sections of all of the original documents, unmodified, and +list them all as Invariant Sections of your combined work in its +license notice, and that you preserve all their Warranty Disclaimers. + +The combined work need only contain one copy of this License, and +multiple identical Invariant Sections may be replaced with a single +copy. If there are multiple Invariant Sections with the same name but +different contents, make the title of each such section unique by +adding at the end of it, in parentheses, the name of the original +author or publisher of that section if known, or else a unique number. +Make the same adjustment to the section titles in the list of +Invariant Sections in the license notice of the combined work. + +In the combination, you must combine any sections Entitled ``History'' +in the various original documents, forming one section Entitled +``History''; likewise combine any sections Entitled ``Acknowledgements'', +and any sections Entitled ``Dedications''. You must delete all +sections Entitled ``Endorsements.'' + +@item +COLLECTIONS OF DOCUMENTS + +You may make a collection consisting of the Document and other documents +released under this License, and replace the individual copies of this +License in the various documents with a single copy that is included in +the collection, provided that you follow the rules of this License for +verbatim copying of each of the documents in all other respects. + +You may extract a single document from such a collection, and distribute +it individually under this License, provided you insert a copy of this +License into the extracted document, and follow this License in all +other respects regarding verbatim copying of that document. + +@item +AGGREGATION WITH INDEPENDENT WORKS + +A compilation of the Document or its derivatives with other separate +and independent documents or works, in or on a volume of a storage or +distribution medium, is called an ``aggregate'' if the copyright +resulting from the compilation is not used to limit the legal rights +of the compilation's users beyond what the individual works permit. +When the Document is included in an aggregate, this License does not +apply to the other works in the aggregate which are not themselves +derivative works of the Document. + +If the Cover Text requirement of section 3 is applicable to these +copies of the Document, then if the Document is less than one half of +the entire aggregate, the Document's Cover Texts may be placed on +covers that bracket the Document within the aggregate, or the +electronic equivalent of covers if the Document is in electronic form. +Otherwise they must appear on printed covers that bracket the whole +aggregate. + +@item +TRANSLATION + +Translation is considered a kind of modification, so you may +distribute translations of the Document under the terms of section 4. +Replacing Invariant Sections with translations requires special +permission from their copyright holders, but you may include +translations of some or all Invariant Sections in addition to the +original versions of these Invariant Sections. You may include a +translation of this License, and all the license notices in the +Document, and any Warranty Disclaimers, provided that you also include +the original English version of this License and the original versions +of those notices and disclaimers. In case of a disagreement between +the translation and the original version of this License or a notice +or disclaimer, the original version will prevail. + +If a section in the Document is Entitled ``Acknowledgements'', +``Dedications'', or ``History'', the requirement (section 4) to Preserve +its Title (section 1) will typically require changing the actual +title. + +@item +TERMINATION + +You may not copy, modify, sublicense, or distribute the Document +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense, or distribute it is void, and +will automatically terminate your rights under this License. + +However, if you cease all violation of this License, then your license +from a particular copyright holder is reinstated (a) provisionally, +unless and until the copyright holder explicitly and finally +terminates your license, and (b) permanently, if the copyright holder +fails to notify you of the violation by some reasonable means prior to +60 days after the cessation. + +Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + +Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, receipt of a copy of some or all of the same material does +not give you any rights to use it. + +@item +FUTURE REVISIONS OF THIS LICENSE + +The Free Software Foundation may publish new, revised versions +of the GNU Free Documentation License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. See +@uref{http://www.gnu.org/copyleft/}. + +Each version of the License is given a distinguishing version number. +If the Document specifies that a particular numbered version of this +License ``or any later version'' applies to it, you have the option of +following the terms and conditions either of that specified version or +of any later version that has been published (not as a draft) by the +Free Software Foundation. If the Document does not specify a version +number of this License, you may choose any version ever published (not +as a draft) by the Free Software Foundation. If the Document +specifies that a proxy can decide which future versions of this +License can be used, that proxy's public statement of acceptance of a +version permanently authorizes you to choose that version for the +Document. + +@item +RELICENSING + +``Massive Multiauthor Collaboration Site'' (or ``MMC Site'') means any +World Wide Web server that publishes copyrightable works and also +provides prominent facilities for anybody to edit those works. A +public wiki that anybody can edit is an example of such a server. A +``Massive Multiauthor Collaboration'' (or ``MMC'') contained in the +site means any set of copyrightable works thus published on the MMC +site. + +``CC-BY-SA'' means the Creative Commons Attribution-Share Alike 3.0 +license published by Creative Commons Corporation, a not-for-profit +corporation with a principal place of business in San Francisco, +California, as well as future copyleft versions of that license +published by that same organization. + +``Incorporate'' means to publish or republish a Document, in whole or +in part, as part of another Document. + +An MMC is ``eligible for relicensing'' if it is licensed under this +License, and if all works that were first published under this License +somewhere other than this MMC, and subsequently incorporated in whole +or in part into the MMC, (1) had no cover texts or invariant sections, +and (2) were thus incorporated prior to November 1, 2008. + +The operator of an MMC Site may republish an MMC contained in the site +under CC-BY-SA on the same site at any time before August 1, 2009, +provided the MMC is eligible for relicensing. + +@end enumerate + +@page +@heading ADDENDUM: How to use this License for your documents + +To use this License in a document you have written, include a copy of +the License in the document and put the following copyright and +license notices just after the title page: + +@smallexample +@group + Copyright (C) @var{year} @var{your name}. + Permission is granted to copy, distribute and/or modify this document + under the terms of the GNU Free Documentation License, Version 1.3 + or any later version published by the Free Software Foundation; + with no Invariant Sections, no Front-Cover Texts, and no Back-Cover + Texts. A copy of the license is included in the section entitled ``GNU + Free Documentation License''. +@end group +@end smallexample + +If you have Invariant Sections, Front-Cover Texts and Back-Cover Texts, +replace the ``with@dots{}Texts.'' line with this: + +@smallexample +@group + with the Invariant Sections being @var{list their titles}, with + the Front-Cover Texts being @var{list}, and with the Back-Cover Texts + being @var{list}. +@end group +@end smallexample + +If you have Invariant Sections without Cover Texts, or some other +combination of the three, merge those two alternatives to suit the +situation. + +If your document contains nontrivial examples of program code, we +recommend releasing these examples in parallel under your choice of +free software license, such as the GNU General Public License, +to permit their use in free software. + +@c Local Variables: +@c ispell-local-pdict: "ispell-dict" +@c End: + diff --git a/lib/readline/doc/history.texi b/lib/readline/doc/history.texi index afdb90160..64945d86e 100644 --- a/lib/readline/doc/history.texi +++ b/lib/readline/doc/history.texi @@ -12,7 +12,7 @@ This document describes the GNU History library a programming tool that provides a consistent user interface for recalling lines of previously typed input. -Copyright @copyright{} 1988--2009 Free Software Foundation, Inc. +Copyright @copyright{} 1988--2011 Free Software Foundation, Inc. Permission is granted to make and distribute verbatim copies of this manual provided the copyright notice and this permission notice diff --git a/lib/readline/doc/hstech.texi b/lib/readline/doc/hstech.texi index ad9cfa822..4fc9e8ef1 100644 --- a/lib/readline/doc/hstech.texi +++ b/lib/readline/doc/hstech.texi @@ -1,7 +1,7 @@ @ignore This file documents the user interface to the GNU History library. -Copyright (C) 1988-2007 Free Software Foundation, Inc. +Copyright (C) 1988-2011 Free Software Foundation, Inc. Authored by Brian Fox and Chet Ramey. Permission is granted to make and distribute verbatim copies of this manual diff --git a/lib/readline/doc/hsuser.texi b/lib/readline/doc/hsuser.texi index c94eae8aa..75df3ee48 100644 --- a/lib/readline/doc/hsuser.texi +++ b/lib/readline/doc/hsuser.texi @@ -1,7 +1,7 @@ @ignore This file documents the user interface to the GNU History library. -Copyright (C) 1988--2010 Free Software Foundation, Inc. +Copyright (C) 1988--2011 Free Software Foundation, Inc. Authored by Brian Fox and Chet Ramey. Permission is granted to make and distribute verbatim copies of this manual diff --git a/lib/readline/doc/rlman.texi b/lib/readline/doc/rlman.texi index be24709d3..1c9ac1333 100644 --- a/lib/readline/doc/rlman.texi +++ b/lib/readline/doc/rlman.texi @@ -13,7 +13,7 @@ This manual describes the GNU Readline Library consistency of user interface across discrete programs which provide a command line interface. -Copyright @copyright{} 1988--2009 Free Software Foundation, Inc. +Copyright @copyright{} 1988--2011 Free Software Foundation, Inc. Permission is granted to make and distribute verbatim copies of this manual provided the copyright notice and this permission notice diff --git a/lib/readline/doc/rltech.texi b/lib/readline/doc/rltech.texi index 528e18fab..dc272a219 100644 --- a/lib/readline/doc/rltech.texi +++ b/lib/readline/doc/rltech.texi @@ -7,7 +7,7 @@ This document describes the GNU Readline Library, a utility for aiding in the consistency of user interface across discrete programs that need to provide a command line interface. -Copyright (C) 1988--2010 Free Software Foundation, Inc. +Copyright (C) 1988--2011 Free Software Foundation, Inc. Permission is granted to make and distribute verbatim copies of this manual provided the copyright notice and this permission notice diff --git a/lib/readline/doc/rluser.texi b/lib/readline/doc/rluser.texi index d00f729b5..8a69c9931 100644 --- a/lib/readline/doc/rluser.texi +++ b/lib/readline/doc/rluser.texi @@ -9,7 +9,7 @@ use these features. There is a document entitled "readline.texinfo" which contains both end-user and programmer documentation for the GNU Readline Library. -Copyright (C) 1988--2010 Free Software Foundation, Inc. +Copyright (C) 1988--2011 Free Software Foundation, Inc. Authored by Brian Fox and Chet Ramey. diff --git a/lib/readline/doc/rluserman.texi b/lib/readline/doc/rluserman.texi index 3856cd539..3d5452045 100644 --- a/lib/readline/doc/rluserman.texi +++ b/lib/readline/doc/rluserman.texi @@ -12,7 +12,7 @@ This manual describes the end user interface of the GNU Readline Library consistency of user interface across discrete programs which provide a command line interface. -Copyright @copyright{} 1988--2010 Free Software Foundation, Inc. +Copyright @copyright{} 1988--2011 Free Software Foundation, Inc. Permission is granted to make and distribute verbatim copies of this manual provided the copyright notice and this permission notice diff --git a/lib/readline/doc/version.texi b/lib/readline/doc/version.texi index 033c5307b..3ee1c10e8 100644 --- a/lib/readline/doc/version.texi +++ b/lib/readline/doc/version.texi @@ -1,5 +1,5 @@ @ignore -Copyright (C) 1988-2010 Free Software Foundation, Inc. +Copyright (C) 1988-2011 Free Software Foundation, Inc. @end ignore @set EDITION 6.2 diff --git a/lib/readline/posixdir.h b/lib/readline/posixdir.h deleted file mode 120000 index 8b1638454..000000000 --- a/lib/readline/posixdir.h +++ /dev/null @@ -1 +0,0 @@ -../../include/posixdir.h \ No newline at end of file diff --git a/lib/readline/posixdir.h b/lib/readline/posixdir.h new file mode 100644 index 000000000..bd33694db --- /dev/null +++ b/lib/readline/posixdir.h @@ -0,0 +1,61 @@ +/* posixdir.h -- Posix directory reading includes and defines. */ + +/* Copyright (C) 1987,1991 Free Software Foundation, Inc. + + This file is part of GNU Bash, the Bourne Again SHell. + + Bash 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 3 of the License, or + (at your option) any later version. + + Bash 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 Bash. If not, see . +*/ + +/* This file should be included instead of or . */ + +#if !defined (_POSIXDIR_H_) +#define _POSIXDIR_H_ + +#if defined (HAVE_DIRENT_H) +# include +# if defined (HAVE_STRUCT_DIRENT_D_NAMLEN) +# define D_NAMLEN(d) ((d)->d_namlen) +# else +# define D_NAMLEN(d) (strlen ((d)->d_name)) +# endif /* !HAVE_STRUCT_DIRENT_D_NAMLEN */ +#else +# if defined (HAVE_SYS_NDIR_H) +# include +# endif +# if defined (HAVE_SYS_DIR_H) +# include +# endif +# if defined (HAVE_NDIR_H) +# include +# endif +# if !defined (dirent) +# define dirent direct +# endif /* !dirent */ +# define D_NAMLEN(d) ((d)->d_namlen) +#endif /* !HAVE_DIRENT_H */ + +#if defined (HAVE_STRUCT_DIRENT_D_INO) && !defined (HAVE_STRUCT_DIRENT_D_FILENO) +# define d_fileno d_ino +#endif + +#if defined (_POSIX_SOURCE) && (!defined (HAVE_STRUCT_DIRENT_D_INO) || defined (BROKEN_DIRENT_D_INO)) +/* Posix does not require that the d_ino field be present, and some + systems do not provide it. */ +# define REAL_DIR_ENTRY(dp) 1 +#else +# define REAL_DIR_ENTRY(dp) (dp->d_ino != 0) +#endif /* _POSIX_SOURCE */ + +#endif /* !_POSIXDIR_H_ */ diff --git a/lib/readline/posixjmp.h b/lib/readline/posixjmp.h deleted file mode 120000 index b4d3ee74b..000000000 --- a/lib/readline/posixjmp.h +++ /dev/null @@ -1 +0,0 @@ -../../include/posixjmp.h \ No newline at end of file diff --git a/lib/readline/posixjmp.h b/lib/readline/posixjmp.h new file mode 100644 index 000000000..49bfecf33 --- /dev/null +++ b/lib/readline/posixjmp.h @@ -0,0 +1,40 @@ +/* posixjmp.h -- wrapper for setjmp.h with changes for POSIX systems. */ + +/* Copyright (C) 1987,1991 Free Software Foundation, Inc. + + This file is part of GNU Bash, the Bourne Again SHell. + + Bash 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 3 of the License, or + (at your option) any later version. + + Bash 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 Bash. If not, see . +*/ + +#ifndef _POSIXJMP_H_ +#define _POSIXJMP_H_ + +#include + +/* This *must* be included *after* config.h */ + +#if defined (HAVE_POSIX_SIGSETJMP) +# define procenv_t sigjmp_buf +# if !defined (__OPENNT) +# undef setjmp +# define setjmp(x) sigsetjmp((x), 1) +# undef longjmp +# define longjmp(x, n) siglongjmp((x), (n)) +# endif /* !__OPENNT */ +#else +# define procenv_t jmp_buf +#endif + +#endif /* _POSIXJMP_H_ */ diff --git a/lib/readline/posixselect.h b/lib/readline/posixselect.h deleted file mode 120000 index 56a0a2c69..000000000 --- a/lib/readline/posixselect.h +++ /dev/null @@ -1 +0,0 @@ -../../include/posixselect.h \ No newline at end of file diff --git a/lib/readline/posixselect.h b/lib/readline/posixselect.h new file mode 100644 index 000000000..da6a1ace0 --- /dev/null +++ b/lib/readline/posixselect.h @@ -0,0 +1,47 @@ +/* posixselect.h -- wrapper for select(2) includes and definitions */ + +/* Copyright (C) 2009 Free Software Foundation, Inc. + + This file is part of GNU Bash, the Bourne Again SHell. + + Bash 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 3 of the License, or + (at your option) any later version. + + Bash 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 Bash. If not, see . +*/ + +#ifndef _POSIXSELECT_H_ +#define _POSIXSELECT_H_ + +#if defined (FD_SET) && !defined (HAVE_SELECT) +# define HAVE_SELECT 1 +#endif + +#if defined (HAVE_SELECT) +# if !defined (HAVE_SYS_SELECT_H) || !defined (M_UNIX) +# include +# endif +#endif /* HAVE_SELECT */ +#if defined (HAVE_SYS_SELECT_H) +# include +#endif + +#ifndef USEC_PER_SEC +# define USEC_PER_SEC 1000000 +#endif + +#define USEC_TO_TIMEVAL(us, tv) \ +do { \ + (tv).tv_sec = (us) / USEC_PER_SEC; \ + (tv).tv_usec = (us) % USEC_PER_SEC; \ +} while (0) + +#endif /* _POSIXSELECT_H_ */ diff --git a/lib/readline/posixstat.h b/lib/readline/posixstat.h deleted file mode 120000 index c6164b792..000000000 --- a/lib/readline/posixstat.h +++ /dev/null @@ -1 +0,0 @@ -../../include/posixstat.h \ No newline at end of file diff --git a/lib/readline/posixstat.h b/lib/readline/posixstat.h new file mode 100644 index 000000000..3eb7f2906 --- /dev/null +++ b/lib/readline/posixstat.h @@ -0,0 +1,142 @@ +/* posixstat.h -- Posix stat(2) definitions for systems that + don't have them. */ + +/* Copyright (C) 1987,1991 Free Software Foundation, Inc. + + This file is part of GNU Bash, the Bourne Again SHell. + + Bash 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 3 of the License, or + (at your option) any later version. + + Bash 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 Bash. If not, see . +*/ + +/* This file should be included instead of . + It relies on the local sys/stat.h to work though. */ +#if !defined (_POSIXSTAT_H_) +#define _POSIXSTAT_H_ + +#include + +#if defined (STAT_MACROS_BROKEN) +# undef S_ISBLK +# undef S_ISCHR +# undef S_ISDIR +# undef S_ISFIFO +# undef S_ISREG +# undef S_ISLNK +#endif /* STAT_MACROS_BROKEN */ + +/* These are guaranteed to work only on isc386 */ +#if !defined (S_IFDIR) && !defined (S_ISDIR) +# define S_IFDIR 0040000 +#endif /* !S_IFDIR && !S_ISDIR */ +#if !defined (S_IFMT) +# define S_IFMT 0170000 +#endif /* !S_IFMT */ + +/* Posix 1003.1 5.6.1.1 file types */ + +/* Some Posix-wannabe systems define _S_IF* macros instead of S_IF*, but + do not provide the S_IS* macros that Posix requires. */ + +#if defined (_S_IFMT) && !defined (S_IFMT) +#define S_IFMT _S_IFMT +#endif +#if defined (_S_IFIFO) && !defined (S_IFIFO) +#define S_IFIFO _S_IFIFO +#endif +#if defined (_S_IFCHR) && !defined (S_IFCHR) +#define S_IFCHR _S_IFCHR +#endif +#if defined (_S_IFDIR) && !defined (S_IFDIR) +#define S_IFDIR _S_IFDIR +#endif +#if defined (_S_IFBLK) && !defined (S_IFBLK) +#define S_IFBLK _S_IFBLK +#endif +#if defined (_S_IFREG) && !defined (S_IFREG) +#define S_IFREG _S_IFREG +#endif +#if defined (_S_IFLNK) && !defined (S_IFLNK) +#define S_IFLNK _S_IFLNK +#endif +#if defined (_S_IFSOCK) && !defined (S_IFSOCK) +#define S_IFSOCK _S_IFSOCK +#endif + +/* Test for each symbol individually and define the ones necessary (some + systems claiming Posix compatibility define some but not all). */ + +#if defined (S_IFBLK) && !defined (S_ISBLK) +#define S_ISBLK(m) (((m)&S_IFMT) == S_IFBLK) /* block device */ +#endif + +#if defined (S_IFCHR) && !defined (S_ISCHR) +#define S_ISCHR(m) (((m)&S_IFMT) == S_IFCHR) /* character device */ +#endif + +#if defined (S_IFDIR) && !defined (S_ISDIR) +#define S_ISDIR(m) (((m)&S_IFMT) == S_IFDIR) /* directory */ +#endif + +#if defined (S_IFREG) && !defined (S_ISREG) +#define S_ISREG(m) (((m)&S_IFMT) == S_IFREG) /* file */ +#endif + +#if defined (S_IFIFO) && !defined (S_ISFIFO) +#define S_ISFIFO(m) (((m)&S_IFMT) == S_IFIFO) /* fifo - named pipe */ +#endif + +#if defined (S_IFLNK) && !defined (S_ISLNK) +#define S_ISLNK(m) (((m)&S_IFMT) == S_IFLNK) /* symbolic link */ +#endif + +#if defined (S_IFSOCK) && !defined (S_ISSOCK) +#define S_ISSOCK(m) (((m)&S_IFMT) == S_IFSOCK) /* socket */ +#endif + +/* + * POSIX 1003.1 5.6.1.2 File Modes + */ + +#if !defined (S_IRWXU) +# if !defined (S_IREAD) +# define S_IREAD 00400 +# define S_IWRITE 00200 +# define S_IEXEC 00100 +# endif /* S_IREAD */ + +# if !defined (S_IRUSR) +# define S_IRUSR S_IREAD /* read, owner */ +# define S_IWUSR S_IWRITE /* write, owner */ +# define S_IXUSR S_IEXEC /* execute, owner */ + +# define S_IRGRP (S_IREAD >> 3) /* read, group */ +# define S_IWGRP (S_IWRITE >> 3) /* write, group */ +# define S_IXGRP (S_IEXEC >> 3) /* execute, group */ + +# define S_IROTH (S_IREAD >> 6) /* read, other */ +# define S_IWOTH (S_IWRITE >> 6) /* write, other */ +# define S_IXOTH (S_IEXEC >> 6) /* execute, other */ +# endif /* !S_IRUSR */ + +# define S_IRWXU (S_IRUSR | S_IWUSR | S_IXUSR) +# define S_IRWXG (S_IRGRP | S_IWGRP | S_IXGRP) +# define S_IRWXO (S_IROTH | S_IWOTH | S_IXOTH) +#endif /* !S_IRWXU */ + +/* These are non-standard, but are used in builtins.c$symbolic_umask() */ +#define S_IRUGO (S_IRUSR | S_IRGRP | S_IROTH) +#define S_IWUGO (S_IWUSR | S_IWGRP | S_IWOTH) +#define S_IXUGO (S_IXUSR | S_IXGRP | S_IXOTH) + +#endif /* _POSIXSTAT_H_ */ diff --git a/lib/readline/signals.c b/lib/readline/signals.c index 4fbc019e6..6a68d78c9 100644 --- a/lib/readline/signals.c +++ b/lib/readline/signals.c @@ -131,6 +131,7 @@ static sighandler_cxt old_winch; /* Called from RL_CHECK_SIGNALS() macro */ RETSIGTYPE _rl_signal_handler (sig) + int sig; { _rl_caught_signal = 0; /* XXX */ diff --git a/lib/readline/tilde.c b/lib/readline/tilde.c deleted file mode 120000 index 439ceedeb..000000000 --- a/lib/readline/tilde.c +++ /dev/null @@ -1 +0,0 @@ -../tilde/tilde.c \ No newline at end of file diff --git a/lib/readline/tilde.c b/lib/readline/tilde.c new file mode 100644 index 000000000..1c53a457d --- /dev/null +++ b/lib/readline/tilde.c @@ -0,0 +1,502 @@ +/* tilde.c -- Tilde expansion code (~/foo := $HOME/foo). */ + +/* Copyright (C) 1988-2009 Free Software Foundation, Inc. + + This file is part of the GNU Readline Library (Readline), a library + for reading lines of text with interactive input and history editing. + + Readline 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 3 of the License, or + (at your option) any later version. + + Readline 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 Readline. If not, see . +*/ + +#if defined (HAVE_CONFIG_H) +# include +#endif + +#if defined (HAVE_UNISTD_H) +# ifdef _MINIX +# include +# endif +# include +#endif + +#if defined (HAVE_STRING_H) +# include +#else /* !HAVE_STRING_H */ +# include +#endif /* !HAVE_STRING_H */ + +#if defined (HAVE_STDLIB_H) +# include +#else +# include "ansi_stdlib.h" +#endif /* HAVE_STDLIB_H */ + +#include +#if defined (HAVE_PWD_H) +#include +#endif + +#include "tilde.h" + +#if defined (TEST) || defined (STATIC_MALLOC) +static void *xmalloc (), *xrealloc (); +#else +# include "xmalloc.h" +#endif /* TEST || STATIC_MALLOC */ + +#if !defined (HAVE_GETPW_DECLS) +# if defined (HAVE_GETPWUID) +extern struct passwd *getpwuid PARAMS((uid_t)); +# endif +# if defined (HAVE_GETPWNAM) +extern struct passwd *getpwnam PARAMS((const char *)); +# endif +#endif /* !HAVE_GETPW_DECLS */ + +#if !defined (savestring) +#define savestring(x) strcpy ((char *)xmalloc (1 + strlen (x)), (x)) +#endif /* !savestring */ + +#if !defined (NULL) +# if defined (__STDC__) +# define NULL ((void *) 0) +# else +# define NULL 0x0 +# endif /* !__STDC__ */ +#endif /* !NULL */ + +/* If being compiled as part of bash, these will be satisfied from + variables.o. If being compiled as part of readline, they will + be satisfied from shell.o. */ +extern char *sh_get_home_dir PARAMS((void)); +extern char *sh_get_env_value PARAMS((const char *)); + +/* The default value of tilde_additional_prefixes. This is set to + whitespace preceding a tilde so that simple programs which do not + perform any word separation get desired behaviour. */ +static const char *default_prefixes[] = + { " ~", "\t~", (const char *)NULL }; + +/* The default value of tilde_additional_suffixes. This is set to + whitespace or newline so that simple programs which do not + perform any word separation get desired behaviour. */ +static const char *default_suffixes[] = + { " ", "\n", (const char *)NULL }; + +/* If non-null, this contains the address of a function that the application + wants called before trying the standard tilde expansions. The function + is called with the text sans tilde, and returns a malloc()'ed string + which is the expansion, or a NULL pointer if the expansion fails. */ +tilde_hook_func_t *tilde_expansion_preexpansion_hook = (tilde_hook_func_t *)NULL; + +/* If non-null, this contains the address of a function to call if the + standard meaning for expanding a tilde fails. The function is called + with the text (sans tilde, as in "foo"), and returns a malloc()'ed string + which is the expansion, or a NULL pointer if there is no expansion. */ +tilde_hook_func_t *tilde_expansion_failure_hook = (tilde_hook_func_t *)NULL; + +/* When non-null, this is a NULL terminated array of strings which + are duplicates for a tilde prefix. Bash uses this to expand + `=~' and `:~'. */ +char **tilde_additional_prefixes = (char **)default_prefixes; + +/* When non-null, this is a NULL terminated array of strings which match + the end of a username, instead of just "/". Bash sets this to + `:' and `=~'. */ +char **tilde_additional_suffixes = (char **)default_suffixes; + +static int tilde_find_prefix PARAMS((const char *, int *)); +static int tilde_find_suffix PARAMS((const char *)); +static char *isolate_tilde_prefix PARAMS((const char *, int *)); +static char *glue_prefix_and_suffix PARAMS((char *, const char *, int)); + +/* Find the start of a tilde expansion in STRING, and return the index of + the tilde which starts the expansion. Place the length of the text + which identified this tilde starter in LEN, excluding the tilde itself. */ +static int +tilde_find_prefix (string, len) + const char *string; + int *len; +{ + register int i, j, string_len; + register char **prefixes; + + prefixes = tilde_additional_prefixes; + + string_len = strlen (string); + *len = 0; + + if (*string == '\0' || *string == '~') + return (0); + + if (prefixes) + { + for (i = 0; i < string_len; i++) + { + for (j = 0; prefixes[j]; j++) + { + if (strncmp (string + i, prefixes[j], strlen (prefixes[j])) == 0) + { + *len = strlen (prefixes[j]) - 1; + return (i + *len); + } + } + } + } + return (string_len); +} + +/* Find the end of a tilde expansion in STRING, and return the index of + the character which ends the tilde definition. */ +static int +tilde_find_suffix (string) + const char *string; +{ + register int i, j, string_len; + register char **suffixes; + + suffixes = tilde_additional_suffixes; + string_len = strlen (string); + + for (i = 0; i < string_len; i++) + { +#if defined (__MSDOS__) + if (string[i] == '/' || string[i] == '\\' /* || !string[i] */) +#else + if (string[i] == '/' /* || !string[i] */) +#endif + break; + + for (j = 0; suffixes && suffixes[j]; j++) + { + if (strncmp (string + i, suffixes[j], strlen (suffixes[j])) == 0) + return (i); + } + } + return (i); +} + +/* Return a new string which is the result of tilde expanding STRING. */ +char * +tilde_expand (string) + const char *string; +{ + char *result; + int result_size, result_index; + + result_index = result_size = 0; + if (result = strchr (string, '~')) + result = (char *)xmalloc (result_size = (strlen (string) + 16)); + else + result = (char *)xmalloc (result_size = (strlen (string) + 1)); + + /* Scan through STRING expanding tildes as we come to them. */ + while (1) + { + register int start, end; + char *tilde_word, *expansion; + int len; + + /* Make START point to the tilde which starts the expansion. */ + start = tilde_find_prefix (string, &len); + + /* Copy the skipped text into the result. */ + if ((result_index + start + 1) > result_size) + result = (char *)xrealloc (result, 1 + (result_size += (start + 20))); + + strncpy (result + result_index, string, start); + result_index += start; + + /* Advance STRING to the starting tilde. */ + string += start; + + /* Make END be the index of one after the last character of the + username. */ + end = tilde_find_suffix (string); + + /* If both START and END are zero, we are all done. */ + if (!start && !end) + break; + + /* Expand the entire tilde word, and copy it into RESULT. */ + tilde_word = (char *)xmalloc (1 + end); + strncpy (tilde_word, string, end); + tilde_word[end] = '\0'; + string += end; + + expansion = tilde_expand_word (tilde_word); + xfree (tilde_word); + + len = strlen (expansion); +#ifdef __CYGWIN__ + /* Fix for Cygwin to prevent ~user/xxx from expanding to //xxx when + $HOME for `user' is /. On cygwin, // denotes a network drive. */ + if (len > 1 || *expansion != '/' || *string != '/') +#endif + { + if ((result_index + len + 1) > result_size) + result = (char *)xrealloc (result, 1 + (result_size += (len + 20))); + + strcpy (result + result_index, expansion); + result_index += len; + } + xfree (expansion); + } + + result[result_index] = '\0'; + + return (result); +} + +/* Take FNAME and return the tilde prefix we want expanded. If LENP is + non-null, the index of the end of the prefix into FNAME is returned in + the location it points to. */ +static char * +isolate_tilde_prefix (fname, lenp) + const char *fname; + int *lenp; +{ + char *ret; + int i; + + ret = (char *)xmalloc (strlen (fname)); +#if defined (__MSDOS__) + for (i = 1; fname[i] && fname[i] != '/' && fname[i] != '\\'; i++) +#else + for (i = 1; fname[i] && fname[i] != '/'; i++) +#endif + ret[i - 1] = fname[i]; + ret[i - 1] = '\0'; + if (lenp) + *lenp = i; + 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 + SUFFIND. */ +static char * +glue_prefix_and_suffix (prefix, suffix, suffind) + char *prefix; + const char *suffix; + int suffind; +{ + char *ret; + int plen, slen; + + plen = (prefix && *prefix) ? strlen (prefix) : 0; + slen = strlen (suffix + suffind); + ret = (char *)xmalloc (plen + slen + 1); + if (plen) + strcpy (ret, prefix); + strcpy (ret + plen, suffix + suffind); + return ret; +} + +/* Do the work of tilde expansion on FILENAME. FILENAME starts with a + tilde. If there is no expansion, call tilde_expansion_failure_hook. + This always returns a newly-allocated string, never static storage. */ +char * +tilde_expand_word (filename) + const char *filename; +{ + char *dirname, *expansion, *username; + int user_len; + struct passwd *user_entry; + + if (filename == 0) + return ((char *)NULL); + + if (*filename != '~') + return (savestring (filename)); + + /* A leading `~/' or a bare `~' is *always* translated to the value of + $HOME or the home directory of the current user, regardless of any + preexpansion hook. */ + if (filename[1] == '\0' || filename[1] == '/') + { + /* Prefix $HOME to the rest of the string. */ + expansion = sh_get_env_value ("HOME"); + + /* If there is no HOME variable, look up the directory in + the password database. */ + if (expansion == 0) + expansion = sh_get_home_dir (); + + return (glue_prefix_and_suffix (expansion, filename, 1)); + } + + username = isolate_tilde_prefix (filename, &user_len); + + if (tilde_expansion_preexpansion_hook) + { + expansion = (*tilde_expansion_preexpansion_hook) (username); + if (expansion) + { + dirname = glue_prefix_and_suffix (expansion, filename, user_len); + xfree (username); + xfree (expansion); + return (dirname); + } + } + + /* No preexpansion hook, or the preexpansion hook failed. Look in the + password database. */ + dirname = (char *)NULL; +#if defined (HAVE_GETPWNAM) + user_entry = getpwnam (username); +#else + user_entry = 0; +#endif + if (user_entry == 0) + { + /* If the calling program has a special syntax for expanding tildes, + and we couldn't find a standard expansion, then let them try. */ + if (tilde_expansion_failure_hook) + { + expansion = (*tilde_expansion_failure_hook) (username); + if (expansion) + { + dirname = glue_prefix_and_suffix (expansion, filename, user_len); + xfree (expansion); + } + } + /* If we don't have a failure hook, or if the failure hook did not + expand the tilde, return a copy of what we were passed. */ + if (dirname == 0) + dirname = savestring (filename); + } +#if defined (HAVE_GETPWENT) + else + dirname = glue_prefix_and_suffix (user_entry->pw_dir, filename, user_len); +#endif + + xfree (username); +#if defined (HAVE_GETPWENT) + endpwent (); +#endif + return (dirname); +} + + +#if defined (TEST) +#undef NULL +#include + +main (argc, argv) + int argc; + char **argv; +{ + char *result, line[512]; + int done = 0; + + while (!done) + { + printf ("~expand: "); + fflush (stdout); + + if (!gets (line)) + strcpy (line, "done"); + + if ((strcmp (line, "done") == 0) || + (strcmp (line, "quit") == 0) || + (strcmp (line, "exit") == 0)) + { + done = 1; + break; + } + + result = tilde_expand (line); + printf (" --> %s\n", result); + free (result); + } + exit (0); +} + +static void memory_error_and_abort (); + +static void * +xmalloc (bytes) + size_t bytes; +{ + void *temp = (char *)malloc (bytes); + + if (!temp) + memory_error_and_abort (); + return (temp); +} + +static void * +xrealloc (pointer, bytes) + void *pointer; + int bytes; +{ + void *temp; + + if (!pointer) + temp = malloc (bytes); + else + temp = realloc (pointer, bytes); + + if (!temp) + memory_error_and_abort (); + + return (temp); +} + +static void +memory_error_and_abort () +{ + fprintf (stderr, "readline: out of virtual memory\n"); + abort (); +} + +/* + * Local variables: + * compile-command: "gcc -g -DTEST -o tilde tilde.c" + * end: + */ +#endif /* TEST */ diff --git a/lib/readline/tilde.h b/lib/readline/tilde.h deleted file mode 120000 index 6fea2aeaa..000000000 --- a/lib/readline/tilde.h +++ /dev/null @@ -1 +0,0 @@ -../tilde/tilde.h \ No newline at end of file diff --git a/lib/readline/tilde.h b/lib/readline/tilde.h new file mode 100644 index 000000000..e26dd0476 --- /dev/null +++ b/lib/readline/tilde.h @@ -0,0 +1,80 @@ +/* tilde.h: Externally available variables and function in libtilde.a. */ + +/* Copyright (C) 1992-2009 Free Software Foundation, Inc. + + This file contains the Readline Library (Readline), a set of + routines for providing Emacs style line input to programs that ask + for it. + + Readline 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 3 of the License, or + (at your option) any later version. + + Readline 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 Readline. If not, see . +*/ + +#if !defined (_TILDE_H_) +# define _TILDE_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +/* A function can be defined using prototypes and compile on both ANSI C + and traditional C compilers with something like this: + extern char *func PARAMS((char *, char *, int)); */ + +#if !defined (PARAMS) +# if defined (__STDC__) || defined (__GNUC__) || defined (__cplusplus) +# define PARAMS(protos) protos +# else +# define PARAMS(protos) () +# endif +#endif + +typedef char *tilde_hook_func_t PARAMS((char *)); + +/* If non-null, this contains the address of a function that the application + wants called before trying the standard tilde expansions. The function + is called with the text sans tilde, and returns a malloc()'ed string + which is the expansion, or a NULL pointer if the expansion fails. */ +extern tilde_hook_func_t *tilde_expansion_preexpansion_hook; + +/* If non-null, this contains the address of a function to call if the + standard meaning for expanding a tilde fails. The function is called + with the text (sans tilde, as in "foo"), and returns a malloc()'ed string + which is the expansion, or a NULL pointer if there is no expansion. */ +extern tilde_hook_func_t *tilde_expansion_failure_hook; + +/* When non-null, this is a NULL terminated array of strings which + are duplicates for a tilde prefix. Bash uses this to expand + `=~' and `:~'. */ +extern char **tilde_additional_prefixes; + +/* When non-null, this is a NULL terminated array of strings which match + the end of a username, instead of just "/". Bash sets this to + `:' and `=~'. */ +extern char **tilde_additional_suffixes; + +/* Return a new string which is the result of tilde expanding STRING. */ +extern char *tilde_expand PARAMS((const char *)); + +/* Do the work of tilde expansion on FILENAME. FILENAME starts with a + tilde. If there is no expansion, call tilde_expansion_failure_hook. */ +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 +} +#endif + +#endif /* _TILDE_H_ */ diff --git a/po/en@boldquot.gmo b/po/en@boldquot.gmo index bb64e1ffc7a8646176a13b224a9f99e5b8e5cf43..d8813f82503519b019a4a83d41122d1cb831bc38 100644 GIT binary patch delta 4451 zc-k$Od303u702)I1&|;hAX``jv9bur5{f`%hL? zUT_$A6zmUP2m9%MU_96((@1Y{KqjA$$u!Z}k6E}e0`z3kfhFKja6R~lZVZkC4`buBqtrnbuyA=;1F<= zla9OtCW2?d;h@PfG7=nNb50fw*V){e#mGOi`7QV~*pWrW#%9xjpQ-)>@uN7K5iH53 z!Pl}G;d|M1?6iH|2KE9U*z0<^Xy9oV4X4=G5u0mVRCFge9c;4i-*z#;Xj~3A91bR^ z683dk4s+?xp~Uq$bo7_taBss8F(pj^%r}ewl|gvcbOI>EU}#9vW`(FtD#Z44}h9 zNBeno->Aq$FFpFP*N)iBoYvd-8@-h5n9U1bcEN3XT?aT5e8NXXN_=#5xsSE99efyk z*GFZK`1t-gum|kR6(2or^D#$Ou8}9eXF+tQ6y@@HAeZg4IF}o)1>-u2Yz2dHBEKo1 z5?ur2zyQ~c22-)olmHDcE#dPuV6;1a{JMk--zZ_9HrYG^u7H74CCpt~rIArsSO|92 z9EOcdR_Vb>;0dq>hVFpxgCz@5lonF>3nTfsPG4-~IvoAO5+g3$U;6_3|3w(MzTC(a zJP5pu_UMdxu-eF2EGT@%2xgP4-C$%73|!m@MX>IrO-4N6$}L9lx?J8yhyJ>ak=+Eh z;rTuAKCU-!H*yR6Zu+f}97G&#G;$pG|MCv{KMX_L_8Ym28{M0*0StC}&&c<;Ofq93GJOmHA9x;L-rPncBW8JFbM(R}=@JpS1CycBDZ=B#H ztvShJTolER@8IdildQ^>r^y|sSKerp%4#ysUz!WqaOX9%lI7^T%33ak070aLOLIy#tp(gOE z?$gzhY~WhFg;b&c61!P3sgu9}3}k>8VBp;zmi!*ltnOt=8m=b}uw*b;pI}LMH1alF z97R#>Mx}c2e)%LzQov?VrH`9z$v5Dmph|rgJd6EJq7|!=Pp4YaOZ)!kc7r8B~7pgMLlosqVK`hk)#*NP3A z6mX(`h=6)5zX9s#z69!d-wr;hhgt^TO9jV+^FclCcYvexRLzJ|x_{z^9<%Y8+;Chb z4HSWTZf^wj+&&8Gh`t8uz)5gev5`E&K?kNd=zz;X#TGjl$a)8r`JIFB?E`gk9*8<< zu+_nhhd8;R8{7m|I$1pJPCD8-%ZiYmPN-BvKjGo zaAfRzgUUo#**}`HnbWH_ySgahWSd@42h9sEreFuChtzrd`i_emkIJ#+hw4xcbG{PP zQ*m<+9onD60Iq^F^!yh$bDsq2M9X&5P_3IAzY1>A;}_hm--sS7_NDW^hY^kUQt}*7 zC*TtMy1`2a_j#%CXI{2lCm&PVJx171@=>~Zpq}rmZSDYdsy~;?tp=xQyV}>Sxm2cSo+Y!i|A*$WC<^kJPbGtXO5Wh-J_r0%>}x+2=$4QE*9X({nY;3QR{i>X z_H{Gp(A?&;ZBh$pAXLB_Sy#a7K3KrWPl0KA41+FBO(CDZR7iz37t+x^g;eBFA^P8~ z?N>+#W*5=J+9FE+S`lmGU=eeBu859YD&oNER7@!c6jQO0#Wa*u%yxDb^Swwhi}FP< zQwUdtl;S1qf)e~6Ba3sK@}Ar^I-eeDc!-_j5r zZ2+VCZPplK(Y+a>p^rkGRR0b!*9mnju8DP&bZ%X2c1yI5RsTU9KQ#UWKBtD~Get}1 zbN$=%dB$9y&%S?n0hzJ@{jcq^3^(-u`iBeHW+u#t;=?SWVPRJPj4->zALf8s7-mZL zg_-k%VH!FXW~8^mY~M#BTt6Yg_2m(MqSZxavWk~S$hRXjblF~TKf-qDxsaT?kV+LS iWZTuR@Qpa+8)1^4>QWXgD-M@6Y)?0bwx?TdqyG;+7H}W{ delta 4447 zc-l3Wd303u702)Iu_GW`*hNK=$ZiyZER{{xKqkqonXHqYEEAXnf>I`)2!VniAeAE# z@E`(;4WNaRN-IlyNDx~KEntwt(Hxcnr&U`LS)|`P-`BrB@4flG-@W&Hm*1N;H#=0{ z?67}gw{W}>sfaT&R76hAGtwRW5u5(vYv4d|71$Hp4L%Nj z2KE9kfl<02*a7SSW8J_W@%(*oya`7xCgQ;$Fe#o6ECwF~SA&o0#^7-9a6An+fjz*R zU~ljt*dOfeFfs~!-oXH}91LJPI37Idpy7u$dnJU8MB`#a0v&KCFp{O<0B~Ib9r*}+ z9;^qS03U$QfCCfBmlJ8Y$YxC#l znJ(ti>!QRJE;{-q_$0X3#SKn_&w|&%eqeVuBOBqS;puL^?{PDLpqq|Yxg$!3z8_1BWvyZ8V}#A_0aI2Jq+x!hXJ&B=x8^u z?i&^v?xjcLy>`T2=Cs0ozTHd7j@mryWf$DA*R_BzfsgyBNV<=XF7vULwt$a-AN#26 z5g*@g06W9JT=dc7Yd+@aXYeU-T(S{#r=%qF_q1fTPkAyotOi@P7TE+AwGw$djY_l* zkUaxj_cS;I8;uUo@RBV4z7h;~!o{z%xNv6{`?S{P5wHpdPGm86GxLoM!9qXSUUL{S z5~I?C&w+mgi(%+{@ONN(If~Lk3YQp3#r>?MMy|lo4_-0i#PjOq=>OMX;8LZLZ}3Cf z3baQX%!AcNhGBt!oe|6?seaSQUKlvH0g7PV@{LA3VC7~bcwH`Rp+nznVPsdqE%^No z_%rU;*BH5leb>Ef#D$1o-D%`Fo_|$~{tv;>Tlh;E0iZpy&5S+QEa?M~xsz>2wVDSoivIBg<47@EiDtmZ@DX&pSLSOc5u`QpBMuKQCxyX6X~sWc6okX;(6L{tM) zIkoZU4x#P-3Zod2{^o*_*Wn3=z`RzLAX`${+L9S~@5#1gKBzTR3trZJ+F6o> z=ZzgKqze5vs-qQ=Iu;DTz#Q;A41C<#k`ExwimsN-#r^Q!mh=ZJ`dZQnjrgmHr|49r$RB6_NT!@C^2U5MxDZS>Pq8Gd6KU@hDo_XNs67K}E*rsai1?pV=-~ZnmUy)*rdyGjUof2pH%;ez4K^=; z*Wtib5G^l%nZf;L&$8r(PFPR}*3{WnII?kVoE4eXC*l}kBdCsDjbo(Epnjl4&9fqd zW->ThKSV%1mUn_Wy3d1p-Zz7T^-!D7_ojj)z+zC3`>o&*Jyqw2DcvnR&||huJU5Jv zr-2ku&+RurJ-0stbwoFUI&h*KR%9d(bkKp(4m#j)P_c3c16l2$GVeI}-X2gV=Yg<; z2Adq*xK9E%OawQA*$FJ3<^(!w60OK-*)NeBP6YMvnUhEde+5p`lqNFbYl(C$Dv1$~ z0iTI{Z%~==>-I%$5_9^s&DKszIMSvQ)Isx#lPTB=>LGQ;zW?6Ijh}K^GDaP8G3S+_ zo{H;TbZDQ80elUP*Yp3ri@A?=Tak$t@1~&zZf?8=+^okhxJ$ngJyzsP=O+&%de%$H z6F{ASi|zX=FCE>V%O4~<>{)_cdx?E7t_Z2p`f;w^!_$c8iA0@x;V^QAm zF~>cVxjq`y4~<`d`myRwrgAI5aoVo-eN!@(>FBp)vi5&pKZ_#S&m3p@IR}>cxzPqc z4gJB-i2eq)Q3rGbZA(8Lo0LMS=cZ7}{1i%FmBM`vq)@TTDO8|sD*9i47?aA}1yWh{ zt5ez6b)Z9Yo65GCnnnYKX{?b|X{_#pX^i{?I9HEh(5b0O=kLqYsnGg#I=U;JihPoe z{&#EprPG0F8T4>L1|{E^!P+>O!Q3`v(2?^Q99WV`DSKp6u|b(M6r0I*o|nn@N;6rM zzXapea3;H~RUpiZr~oA$5@5TH2rw0~0XpIcuy{%X98eWDtH5FUKOw;OtpjI*{|T@N zCuXr$GC`lVTNZ2WVip5y3ELN4vuQ9on=eesW*4MqQ<=(aw$1KrN?H$AXd7iyfutO! zCXmC3!#PxFZ4Pt2J%^5dnL~x|{(s$|T+Z}Sxr}I4E>E#dxg0DPa#=im@>ql~=dmk% zc`UBdJW9RI=CM2~+LXs4ypu;oyX9LF1pDXHu{EGy`+r+L`}}S``+9f*iz}soeY>)N z#Z^~8CC(LablxjqPDd`FgV_rhzy_N&3%KuYaJEVgzMuoDkcxNx2FTf{bdu!s@039*R!hgkh%L+lc7hy!Y2 zh$-0VKceV(rP3g1{Z2I1k5RdyN90j^YY*cUarsf(t&`NhA;Fc zl(f`ZFE?zk7o6Y=b;-+(I+|Lgh-4-eN;7HLT$A&oCUaz&JzisS-8Pd4ziZO5&rLee zY|_wQ68l<8_4U!B;Xd1AA7dJ^e}BeD$#&cPlaEz!%AVH@PLt&GQ;}>x4GsC3OUuD- z;08aH-Qnl@1~A2vr1I0^L}v-*+ncLe-Sr~fmb^y^$6$&%S))l zfiQV2%z0$Kcv99+^72b42*S1Yyp3XR}bFiFa9 zu~w77%Zr&@sY|qq;-EZmFWC4n6g8maQmu+HUb#%G6EO7Rqc9l1H?BbaPsagC^;&&| z7qeHw(@qjZtwv))pS4<{H>vFBwAw9MydH{RUit>D9sp-<(hAGf$}KeL=`HkZBUq33 zuYk8O9=c7d@3C+H?ONr*<1Vjg^(KDzG@$-tI7sc$suif+r&Sjm7Jg0p`!UvIUe#f(mV=AH)8K!=HQ5;BoMsqs)Ovo49a&6X)%2VznFrC6wPZu|u{rQHi!D zhO+B1hOn2-5y$wuHRBi;%mwp7hs|xE1D;<2heG3N$KeSk2ENp43_P85TB|Iu^dDMP zVE)Tzm|RK!#Ck~32SoH##RZ1w=GQ1g#HbB)iy>FE8ruo=S9OKSxA{8CLt+N*1shwm zdP@|!rPbfDQTJAq6Mk?0NvlmTtnD^Ku&!OJ4&V%Bs2$)eZK!!zcg`S(bubb+6a)VT z9_VN&7k*#e*+8gJe`oO^QeOgdaKJ6_OB|4uY^a^^xJQbivN7J<%TV}JH+viE4is`y zUqjU+sd|qzRDn1!)=+c6Z$XiM^f*IZ0%w3C^`P;F`V{-8jW-fGa($Aax=a1H;z44P zG}%Zri~*o1G7-eZrZPaeJl0Mz63O!+D2=HJlwA16W;-}luGjkvg$h;qU^d1dOf}Rw z82UdjNBY4`L(P|}$S{;89Vwnc1%3}otK9%fEMEedFV{p#_Rze*~rF zZUf~O+y^Eu8&Iz8c5t+0^L(y%fzpCw^Qq99`CPXPychfolxn#SN~`alWAUH~IYy$K zvU0d#5S$Kl~-1(q6OKw}6t(wpmp`>DGbL>-T_iNqudPJ2|=WH1IyK z#L1X%axx^ZI=RnbCmr|}OqcsVsgSYDE@TJ-g*<3!AvfLvz96v!Uk6JU(34Isa;%Gz zdqC-ckJ;nZE*ki@iwd7`vFv_!F{B;cLe$@6H>E3cGufW7xdoJ#`;MCu9&uChW;c_o z#myLZ_i+9&P(C!$!7=h>=Ap+=c$iCX*yA%ED$@>TO8uvJnH2e6CX4B1AE@$jqZM8r z^rn{{eGJMac@fN%r1a9TG?P+KGpVH8WDYDexz7%hihXWUffmq`7lVC_UA~W&{?5ln zvI}%dmikz3Z9Q1Yb#=Emj#W7`m*A%_BNSj_=S*&3i?or63mHORW3800#4kVzR1vQ=*h zvdX>-T6|~=Qqpe4EVmxTEVtBR8ZxDr$>T0&g9_TLEM{^oE@t`e1ZPQ%iJQ!wG{58yMZVprG z85MPwF$v4csOSoCp_FAA4QmAhQvb>2tn&&`{)2h3oXK?zlz+Ke%IW#=2tCOJ z<)gDQ!kBK2(7+QBI`E6lq$v0873FO=7n}k<7iIPziAoZp{%%B>RAVZ*k;mqf6|9Cm z6*TBV1wBcw+lJs_6o>B<-5`{!ePe>BEB z=BF4H9a>AeYf=A_WUFfF`KPrkvma{dQClsQxHHa6V^o|~;)t_BMdJ*~_Bdm{E6#)V z#p&t4;>`A6?fHZ1INw{xsteW4VvAfKv_&hL=QFZ+GbZ+a1Q)A^!)1=w-YB delta 4447 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 V({$cABQk0At|HyOtH}5y?f>8AUQ+-7 diff --git a/po/en@quot.po b/po/en@quot.po index 738d2a3e1..ec46fb145 100644 --- a/po/en@quot.po +++ b/po/en@quot.po @@ -27,7 +27,7 @@ # msgid "" msgstr "" -"Project-Id-Version: GNU bash 4.2-rc2\n" +"Project-Id-Version: GNU bash 4.2-release\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2011-01-28 22:09-0500\n" "PO-Revision-Date: 2011-01-28 22:09-0500\n" diff --git a/subst.c b/subst.c index 230737085..0e83e56e4 100644 --- a/subst.c +++ b/subst.c @@ -2884,33 +2884,17 @@ do_assignment_no_expand (string) WORD_LIST * list_rest_of_args () { - register WORD_LIST *list, *args, *last, *l; - WORD_DESC *w; + register WORD_LIST *list, *args; int i; /* Break out of the loop as soon as one of the dollar variables is null. */ - list = last = 0; for (i = 1, list = (WORD_LIST *)NULL; i < 10 && dollar_vars[i]; i++) - { - w = make_bare_word (dollar_vars[i]); - l = make_word_list (w, (WORD_LIST *)NULL); - if (list == 0) - list = last = l; - else - { - last->next = l; - last = l; - } - } + list = make_word_list (make_bare_word (dollar_vars[i]), list); for (args = rest_of_args; args; args = args->next) - { - w = make_bare_word (args->word->word); - last->next = make_word_list (w, (WORD_LIST *)NULL); - last = last->next; - } + list = make_word_list (make_bare_word (args->word->word), list); - return list; + return (REVERSE_LIST (list, WORD_LIST *)); } int @@ -7929,22 +7913,6 @@ expand_word_internal (word, quoted, isexp, contains_dollar_at, expanded_somethin DECLARE_MBSTATE; - /* XXX - experimental -- short-circuit "$@" */ - if (STREQ (word->word, "$@") && - ((quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES|Q_PATQUOTE)) || (word->flags & (W_DQUOTE|W_NOPROCSUB))) && - (word->flags & W_NOSPLIT) == 0 && - dollar_vars[1] && - ifs_value) - { - list = list_rest_of_args (); - quote_list (list); - if (expanded_something) - *expanded_something = 1; - if (contains_dollar_at) - *contains_dollar_at = 1; - return list; - } - istring = (char *)xmalloc (istring_size = DEFAULT_INITIAL_ARRAY_SIZE); istring[istring_index = 0] = '\0'; quoted_dollar_at = had_quoted_null = has_dollar_at = 0; diff --git a/support/mkconffiles b/support/mkconffiles old mode 100644 new mode 100755 diff --git a/support/mkversion.sh b/support/mkversion.sh old mode 100644 new mode 100755 diff --git a/support/rlvers.sh b/support/rlvers.sh old mode 100644 new mode 100755 diff --git a/support/shobj-conf b/support/shobj-conf old mode 100644 new mode 100755 diff --git a/trap.c b/trap.c index ef251498c..86665e7a5 100644 --- a/trap.c +++ b/trap.c @@ -1100,6 +1100,7 @@ signal_is_ignored (sig) int signal_is_hard_ignored (sig) + int sig; { return (sigmodes[sig] & SIG_HARD_IGNORE); } -- 2.47.3