[Midnightbsd-cvs] src [11362] trunk/contrib/less: less 530
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Fri Jul 6 08:46:07 EDT 2018
Revision: 11362
http://svnweb.midnightbsd.org/src/?rev=11362
Author: laffer1
Date: 2018-07-06 08:46:07 -0400 (Fri, 06 Jul 2018)
Log Message:
-----------
less 530
Modified Paths:
--------------
trunk/contrib/less/LICENSE
trunk/contrib/less/NEWS
trunk/contrib/less/README
trunk/contrib/less/brac.c
trunk/contrib/less/ch.c
trunk/contrib/less/charset.c
trunk/contrib/less/charset.h
trunk/contrib/less/cmd.h
trunk/contrib/less/cmdbuf.c
trunk/contrib/less/command.c
trunk/contrib/less/cvt.c
trunk/contrib/less/decode.c
trunk/contrib/less/edit.c
trunk/contrib/less/filename.c
trunk/contrib/less/forwback.c
trunk/contrib/less/funcs.h
trunk/contrib/less/help.c
trunk/contrib/less/ifile.c
trunk/contrib/less/input.c
trunk/contrib/less/jump.c
trunk/contrib/less/less.h
trunk/contrib/less/less.hlp
trunk/contrib/less/less.nro
trunk/contrib/less/lessecho.c
trunk/contrib/less/lessecho.nro
trunk/contrib/less/lesskey.c
trunk/contrib/less/lesskey.h
trunk/contrib/less/lesskey.nro
trunk/contrib/less/lglob.h
trunk/contrib/less/line.c
trunk/contrib/less/linenum.c
trunk/contrib/less/lsystem.c
trunk/contrib/less/main.c
trunk/contrib/less/mark.c
trunk/contrib/less/optfunc.c
trunk/contrib/less/option.c
trunk/contrib/less/option.h
trunk/contrib/less/opttbl.c
trunk/contrib/less/os.c
trunk/contrib/less/output.c
trunk/contrib/less/pattern.c
trunk/contrib/less/pattern.h
trunk/contrib/less/pckeys.h
trunk/contrib/less/position.c
trunk/contrib/less/position.h
trunk/contrib/less/prompt.c
trunk/contrib/less/regexp.c
trunk/contrib/less/screen.c
trunk/contrib/less/scrsize.c
trunk/contrib/less/search.c
trunk/contrib/less/signal.c
trunk/contrib/less/tags.c
trunk/contrib/less/ttyin.c
trunk/contrib/less/version.c
Added Paths:
-----------
trunk/contrib/less/compose.uni
trunk/contrib/less/fmt.uni
trunk/contrib/less/mkutable
trunk/contrib/less/ubin.uni
trunk/contrib/less/wide.uni
Removed Paths:
-------------
trunk/contrib/less/COPYING
trunk/contrib/less/Makefile.aut
trunk/contrib/less/Makefile.dsb
trunk/contrib/less/Makefile.dsg
trunk/contrib/less/Makefile.dsu
trunk/contrib/less/Makefile.in
trunk/contrib/less/Makefile.o2e
trunk/contrib/less/Makefile.o9c
trunk/contrib/less/Makefile.o9u
trunk/contrib/less/Makefile.wnb
trunk/contrib/less/Makefile.wnm
trunk/contrib/less/configure
trunk/contrib/less/configure.ac
trunk/contrib/less/defines.ds
trunk/contrib/less/defines.h.in
trunk/contrib/less/defines.o2
trunk/contrib/less/defines.o9
trunk/contrib/less/defines.wn
trunk/contrib/less/install.sh
trunk/contrib/less/less.man
trunk/contrib/less/lessecho.man
trunk/contrib/less/lesskey.man
trunk/contrib/less/mkfuncs.awk
trunk/contrib/less/mkhelp.c
trunk/contrib/less/mkinstalldirs
Property Changed:
----------------
trunk/contrib/less/
Index: trunk/contrib/less
===================================================================
--- trunk/contrib/less 2018-07-06 12:43:22 UTC (rev 11361)
+++ trunk/contrib/less 2018-07-06 12:46:07 UTC (rev 11362)
Property changes on: trunk/contrib/less
___________________________________________________________________
Modified: svn:mergeinfo
## -1,3 +1,3 ##
/branches/LESS/contrib/less:4255-6385
/vendor/less/458:6429
-/vendor/less/dist:6386-6420
\ No newline at end of property
+/vendor/less/dist:6386-11361
\ No newline at end of property
Deleted: trunk/contrib/less/COPYING
===================================================================
--- trunk/contrib/less/COPYING 2018-07-06 12:43:22 UTC (rev 11361)
+++ trunk/contrib/less/COPYING 2018-07-06 12:46:07 UTC (rev 11362)
@@ -1,674 +0,0 @@
- GNU GENERAL PUBLIC LICENSE
- Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- 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.
-
- <one line to give the program's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
-
- 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 <http://www.gnu.org/licenses/>.
-
-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:
-
- <program> Copyright (C) <year> <name of author>
- 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
-<http://www.gnu.org/licenses/>.
-
- 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
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
Modified: trunk/contrib/less/LICENSE
===================================================================
--- trunk/contrib/less/LICENSE 2018-07-06 12:43:22 UTC (rev 11361)
+++ trunk/contrib/less/LICENSE 2018-07-06 12:46:07 UTC (rev 11362)
@@ -2,7 +2,7 @@
------------
Less
-Copyright (C) 1984-2012 Mark Nudelman
+Copyright (C) 1984-2016 Mark Nudelman
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
Deleted: trunk/contrib/less/Makefile.aut
===================================================================
--- trunk/contrib/less/Makefile.aut 2018-07-06 12:43:22 UTC (rev 11361)
+++ trunk/contrib/less/Makefile.aut 2018-07-06 12:46:07 UTC (rev 11362)
@@ -1,132 +0,0 @@
-# Makefile for authoring less.
-
-EMAIL = bug-less at gnu.org
-HOMEPAGE = http://www.greenwoodsoftware.com/less
-SHELL = /bin/sh
-RCS = rcs
-NROFF = nroff -man
-
-srcdir = .
-
-SRC = \
- main.c screen.c brac.c ch.c charset.c cmdbuf.c \
- command.c cvt.c decode.c edit.c filename.c forwback.c \
- help.c ifile.c input.c jump.c line.c linenum.c \
- lsystem.c mark.c optfunc.c option.c opttbl.c os.c \
- output.c pattern.c position.c prompt.c search.c signal.c \
- tags.c ttyin.c version.c
-DISTFILES_W = \
- defines.ds Makefile.dsb Makefile.dsg Makefile.dsu \
- defines.o2 Makefile.o2e \
- defines.o9 Makefile.o9c Makefile.o9u \
- defines.wn Makefile.wnm Makefile.wnb
-DISTFILES = \
- ${SRC} regexp.c regexp.h \
- COPYING INSTALL LICENSE Makefile.in Makefile.aut NEWS README \
- configure configure.ac lesskey.c lessecho.c scrsize.c \
- charset.h cmd.h funcs.h lglob.h less.h lesskey.h option.h \
- pckeys.h pattern.h position.h \
- install.sh defines.h.in mkinstalldirs \
- less.nro less.man lesskey.nro lesskey.man lessecho.nro lessecho.man \
- less.hlp \
- mkfuncs.awk mkhelp.c \
- ${DISTFILES_W}
-
-all: help.c funcs.h ${srcdir}/configure
-
-release: .FORCE
- ${MAKE} -f Makefile.aut tagall
- ${MAKE} -f Makefile.aut all
- ${MAKE} -f Makefile.aut clean
- ${MAKE} -f Makefile.aut dist
-
-.FORCE:
-
-help.c: less.hlp mkhelp
- -mv -f ${srcdir}/help.c ${srcdir}/help.c.old
- rm -rf help.c
- ./mkhelp < less.hlp > help.c
- if cmp -s help.c help.c.old; then mv help.c.old help.c; fi
-
-mkhelp: mkhelp.c
- ${CC} -o mkhelp mkhelp.c
-
-${srcdir}/configure: ${srcdir}/configure.ac \
- ${srcdir}/Makefile.in
- cd ${srcdir}; autoheader; autoconf
-
-funcs.h: ${SRC:%=${srcdir}/%}
- -mv -f ${srcdir}/funcs.h ${srcdir}/funcs.h.old
- awk -f ${srcdir}/mkfuncs.awk ${SRC:%=${srcdir}/%} >${srcdir}/funcs.h
- if cmp -s funcs.h funcs.h.old; then mv funcs.h.old funcs.h; fi
-
-lint:
- lint -I. ${CPPFLAGS} ${SRC}
-
-clean:
- rm -f Makefile config.status config.log config.cache defines.h stamp-h \
- README NEWS \
- less.nro less.man lesskey.nro lesskey.man lessecho.nro lessecho.man
-
-distclean: clean
-realclean: clean
-
-REPLACE_VERSION = \
- @REL=`sed -e '/char version/!d' -e 's/[^0-9.]*\([0-9.]*\).*/\1/' -e q ${srcdir}/version.c`; \
- DT=`date '+%d %h %Y'`; \
- echo "Stuffing version number $$REL into $@"; \
- sed \
- -e "s;@@VERSION@@;$$REL;" \
- -e "s;@@DATE@@;$$DT;" \
- -e "s;@@EMAIL@@;${EMAIL};" \
- -e "s;@@HOMEPAGE@@;${HOMEPAGE};" >$@
-
-${srcdir}/README: ${srcdir}/README.VER ${srcdir}/version.c
- ${REPLACE_VERSION} ${srcdir}/README.VER
-${srcdir}/NEWS: ${srcdir}/NEWS.VER ${srcdir}/version.c
- ${REPLACE_VERSION} ${srcdir}/NEWS.VER
-${srcdir}/less.nro: ${srcdir}/less.nro.VER ${srcdir}/version.c
- ${REPLACE_VERSION} ${srcdir}/less.nro.VER
-${srcdir}/lesskey.nro: ${srcdir}/lesskey.nro.VER ${srcdir}/version.c
- ${REPLACE_VERSION} ${srcdir}/lesskey.nro.VER
-${srcdir}/lessecho.nro: ${srcdir}/lessecho.nro.VER ${srcdir}/version.c
- ${REPLACE_VERSION} ${srcdir}/lessecho.nro.VER
-${srcdir}/less.hlp: ${srcdir}/less.hlp.VER ${srcdir}/version.c
- ${REPLACE_VERSION} ${srcdir}/less.hlp.VER
-
-${srcdir}/less.man: ${srcdir}/less.nro
- ${NROFF} ${srcdir}/less.nro >${srcdir}/less.man
-${srcdir}/lesskey.man: ${srcdir}/lesskey.nro
- ${NROFF} ${srcdir}/lesskey.nro >${srcdir}/lesskey.man
-${srcdir}/lessecho.man: ${srcdir}/lessecho.nro
- ${NROFF} ${srcdir}/lessecho.nro >${srcdir}/lessecho.man
-
-
-distfiles: ${DISTFILES}
-
-dist: ${DISTFILES}
- if [ ! -d ${srcdir}/release ]; then mkdir ${srcdir}/release; fi
- @cd ${srcdir}; \
- REL=`sed -e '/char version/!d' -e 's/[^0-9.]*\([0-9.]*\).*/less-\1/' -e q version.c`; \
- rm -rf release/$$REL; mkdir release/$$REL; \
- echo "Preparing $$REL"; \
- rm -rf $$REL; mkdir $$REL; \
- for file in ${DISTFILES}; do \
- ./add_copyright $$file $$REL; \
- done; \
- cd $$REL; chmod +w ${DISTFILES_W}; cd ..; \
- echo "Creating release/$$REL/$$REL.tar.gz"; \
- tar -cf - $$REL | gzip -c >release/$$REL/$$REL.tar.gz; \
- echo "Signing release/$$REL/$$REL.tar.gz"; \
- gpg --detach-sign release/$$REL/$$REL.tar.gz; \
- echo "Creating release/$$REL/$$REL.zip"; \
- zip -rq release/$$REL/$$REL.zip $$REL; \
- rm -rf $$REL
-
-tagall:
- @REL=`sed -e '/char version/!d' -e 's/[^0-9.]*\([0-9.]*\).*/v\1/' -e q ${srcdir}/version.c`; \
- echo "tagging $$REL"; \
- for f in ${srcdir}/RCS/*,v; do \
- REV=`co -p $$f 2>&1 | sed -e '1d' -e '3,$$d' -e 's/revision //'`; \
- ${RCS} -N$$REL:$$REV $$f; \
- done
Deleted: trunk/contrib/less/Makefile.dsb
===================================================================
--- trunk/contrib/less/Makefile.dsb 2018-07-06 12:43:22 UTC (rev 11361)
+++ trunk/contrib/less/Makefile.dsb 2018-07-06 12:46:07 UTC (rev 11362)
@@ -1,51 +0,0 @@
-# Makefile for less.
-# MS-DOS version (Borland C/C++ 4.02)
-
-#### Start of system configuration section. ####
-
-CC = bcc
-LIBDIR = \bc\lib
-
-CFLAGS = -A- -mm -O2 -w- -1- -2- -a -d -Z
-LDFLAGS = -mm
-LIBS =
-EXT = .EXE
-
-#### End of system configuration section. ####
-
-# This rule allows us to supply the necessary -D options
-# in addition to whatever the user asks for.
-.c.obj:
- $(CC) -c -I. $(CPPFLAGS) $(CFLAGS) $<
-
-OBJ = \
- main.obj screen.obj brac.obj ch.obj charset.obj cmdbuf.obj \
- command.obj cvt.obj decode.obj edit.obj filename.obj forwback.obj \
- help.obj ifile.obj input.obj jump.obj line.obj linenum.obj \
- lsystem.obj mark.obj optfunc.obj option.obj opttbl.obj os.obj \
- output.obj pattern.obj position.obj prompt.obj search.obj signal.obj \
- tags.obj ttyin.obj version.obj
-
-all: less$(EXT) lesskey$(EXT)
-
-# This is really horrible, but the command line is too long for
-# MS-DOS if we try to link $(OBJ).
-less$(EXT): $(OBJ)
- ren lesskey.obj lesskey.obo
- $(CC) $(LDFLAGS) -e$@ *.obj $(LIBS)
- ren lesskey.obo lesskey.obj
-
-lesskey$(EXT): lesskey.obj version.obj
- $(CC) $(LDFLAGS) -e$@ lesskey.obj version.obj $(LIBS)
-
-defines.h: defines.ds
- -del defines.h
- -copy defines.ds defines.h
-
-$(OBJ): less.h defines.h
-
-clean:
- -del *.obj
- -del less.exe
- -del lesskey.exe
-
Deleted: trunk/contrib/less/Makefile.dsg
===================================================================
--- trunk/contrib/less/Makefile.dsg 2018-07-06 12:43:22 UTC (rev 11361)
+++ trunk/contrib/less/Makefile.dsg 2018-07-06 12:46:07 UTC (rev 11362)
@@ -1,92 +0,0 @@
-# Makefile for less under DJGPP v2.0 or later.
-
-#### Start of system configuration section. ####
-
-srcdir = .
-VPATH = .
-
-CC = gcc
-INSTALL = ginstall -c
-INSTALL_PROGRAM = ginstall
-INSTALL_DATA = ginstall -m 644
-AWK = gawk
-
-CFLAGS = -O2 -g
-CFLAGS_COMPILE_ONLY = -c
-#LDFLAGS = -s
-LDFLAGS = -g
-O=o
-
-LIBS =
-prefix = /dev/env/DJDIR
-exec_prefix = ${prefix}
-
-bindir = ${exec_prefix}/bin
-sysconfdir = ${prefix}/etc
-mandir = ${prefix}/man
-manext = 1
-
-#### End of system configuration section. ####
-
-# This rule allows us to supply the necessary -D options
-# in addition to whatever the user asks for.
-.c.o:
- ${CC} -I. ${CFLAGS_COMPILE_ONLY} -DBINDIR=\"${bindir}\" -DSYSDIR=\"${sysconfdir}\" ${CPPFLAGS} ${CFLAGS} $<
-
-OBJ = \
- main.${O} screen.${O} brac.${O} ch.${O} charset.${O} cmdbuf.${O} \
- command.${O} cvt.${O} decode.${O} edit.${O} filename.${O} forwback.${O} \
- help.${O} ifile.${O} input.${O} jump.${O} line.${O} linenum.${O} \
- lsystem.${O} mark.${O} optfunc.${O} option.${O} opttbl.${O} os.${O} \
- output.${O} pattern.${O} position.${O} prompt.${O} search.${O} signal.${O} \
- tags.${O} ttyin.${O} version.${O}
-
-all: less lesskey lessecho
-
-less: ${OBJ}
- ${CC} ${LDFLAGS} -o $@ ${OBJ} ${LIBS}
-
-lesskey: lesskey.${O} version.${O}
- ${CC} ${LDFLAGS} -o $@ lesskey.${O} version.${O}
-
-lessecho: lessecho.${O} version.${O}
- ${CC} ${LDFLAGS} -o $@ lessecho.${O} version.${O}
-
-defines.h: defines.ds
- command.com /c copy $< $@
-
-${OBJ}: ${srcdir}/less.h defines.h ${srcdir}/funcs.h
-
-install: all ${srcdir}/less.man ${srcdir}/lesskey.man
- ${INSTALL_PROGRAM} less.exe ${bindir}/less.exe
- ${INSTALL_PROGRAM} lesskey.exe ${bindir}/lesskey.exe
- ${INSTALL_PROGRAM} lessecho.exe ${bindir}/lessecho.exe
- ${INSTALL_DATA} ${srcdir}/less.man ${mandir}/man${manext}/less.${manext}
- ${INSTALL_DATA} ${srcdir}/lesskey.man ${mandir}/man${manext}/lesskey.${manext}
-
-info:
-install-info:
-dvi:
-check:
-installcheck:
-
-TAGS:
- etags *.c *.h
-
-newfuncs:
- command.com /c if exist funcs.h del funcs.h
- ${AWK} -f mkfuncs.awk ${OBJ:.${O}=.c} > funcs.h
-
-clean:
- command.com /c for %f in (*.${O} less lesskey lessecho *.exe) do if exist %f del %f
-
-mostlyclean: clean
-
-distclean: clean
- command.com /c if not exist Makefile.dsg ren Makefile Makefile.dsg
- command.com /c if not exist defines.ds ren defines.h defines.ds
- command.com /c for %f in (Makefile defines.h) do if exist %f del %f
-
-realclean: distclean
- command.com /c if exist TAGS del TAGS
-
Deleted: trunk/contrib/less/Makefile.dsu
===================================================================
--- trunk/contrib/less/Makefile.dsu 2018-07-06 12:43:22 UTC (rev 11361)
+++ trunk/contrib/less/Makefile.dsu 2018-07-06 12:46:07 UTC (rev 11362)
@@ -1,59 +0,0 @@
-# Makefile for less.
-# MS-DOS version
-
-#### Start of system configuration section. ####
-
-CC = cl
-# Change the following directories to match your installation.
-LIBDIR = c:\msvc\lib
-INCDIR = c:\msvc\include
-
-# CFLAGS are compile-time options and LDFLAGS are link-time options. They are
-# customized for MSVC 1.0 (MSC 8.0). If you have a different version of the
-# compiler, you may need to change some of the options to their equivalents.
-# -Ot optimize for speed
-# -AL large memory model
-# -Za ANSI C conformance
-# -nologo suppress MSVC banners
-# -onerror:noexe no .EXE file if link errors occur
-CFLAGS = -Ot -AL -Za -nologo
-LDFLAGS = -onerror:noexe -nologo
-LIBS = $(LIBDIR)\llibce.lib $(LIBDIR)\graphics.lib
-
-#### End of system configuration section. ####
-
-# This rule allows us to supply the necessary -D options
-# in addition to whatever the user asks for.
-.c.obj:
- $(CC) -c -I. -I$(INCDIR) $(CPPFLAGS) $(CFLAGS) $<
-
-OBJ = \
- main.obj screen.obj brac.obj ch.obj charset.obj cmdbuf.obj \
- command.obj cvt.obj decode.obj edit.obj filename.obj forwback.obj \
- help.obj ifile.obj input.obj jump.obj line.obj linenum.obj \
- lsystem.obj mark.obj optfunc.obj option.obj opttbl.obj os.obj \
- output.obj pattern.obj position.obj prompt.obj search.obj signal.obj \
- tags.obj ttyin.obj version.obj
-
-all: less lesskey
-
-# This is really horrible, but the command line is too long for
-# MS-DOS if we try to link $(OBJ).
-less: $(OBJ)
- -if exist lesskey.obj del lesskey.obj
- $(CC) $(LDFLAGS) -o $@ *.obj $(LIBS)
-
-lesskey: lesskey.obj version.obj
- $(CC) $(LDFLAGS) -o $@ lesskey.obj version.obj $(LIBS)
-
-defines.h: defines.ds
- -del defines.h
- -copy defines.ds defines.h
-
-$(OBJ): less.h defines.h
-
-clean:
- -del *.obj
- -del less.exe
- -del lesskey.exe
-
Deleted: trunk/contrib/less/Makefile.in
===================================================================
--- trunk/contrib/less/Makefile.in 2018-07-06 12:43:22 UTC (rev 11361)
+++ trunk/contrib/less/Makefile.in 2018-07-06 12:46:07 UTC (rev 11362)
@@ -1,122 +0,0 @@
-# Makefile for less.
-
-#### Start of system configuration section. ####
-
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-CC = @CC@
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
-
-CFLAGS = @CFLAGS@
-CFLAGS_COMPILE_ONLY = -c
-LDFLAGS = @LDFLAGS@
-CPPFLAGS = @CPPFLAGS@
-EXEEXT = @EXEEXT@
-O=o
-
-LIBS = @LIBS@
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-# Where the installed binary goes.
-bindir = @bindir@
-binprefix =
-
-sysconfdir = @sysconfdir@
-datarootdir = @datarootdir@
-
-mandir = @mandir@
-manext = 1
-manprefix =
-DESTDIR =
-
-#### End of system configuration section. ####
-
-SHELL = /bin/sh
-
-# This rule allows us to supply the necessary -D options
-# in addition to whatever the user asks for.
-.c.o:
- ${CC} -I. ${CFLAGS_COMPILE_ONLY} -DBINDIR=\"${bindir}\" -DSYSDIR=\"${sysconfdir}\" ${CPPFLAGS} ${CFLAGS} $<
-
-OBJ = \
- main.${O} screen.${O} brac.${O} ch.${O} charset.${O} cmdbuf.${O} \
- command.${O} cvt.${O} decode.${O} edit.${O} filename.${O} forwback.${O} \
- help.${O} ifile.${O} input.${O} jump.${O} line.${O} linenum.${O} \
- lsystem.${O} mark.${O} optfunc.${O} option.${O} opttbl.${O} os.${O} \
- output.${O} pattern.${O} position.${O} prompt.${O} search.${O} signal.${O} \
- tags.${O} ttyin.${O} version.${O} @REGEX_O@
-
-all: less$(EXEEXT) lesskey$(EXEEXT) lessecho$(EXEEXT)
-
-less$(EXEEXT): ${OBJ}
- ${CC} ${LDFLAGS} -o $@ ${OBJ} ${LIBS}
-
-lesskey$(EXEEXT): lesskey.${O} version.${O}
- ${CC} ${LDFLAGS} -o $@ lesskey.${O} version.${O}
-
-lessecho$(EXEEXT): lessecho.${O} version.${O}
- ${CC} ${LDFLAGS} -o $@ lessecho.${O} version.${O}
-
-${OBJ}: ${srcdir}/less.h ${srcdir}/funcs.h defines.h
-
-install: all ${srcdir}/less.nro ${srcdir}/lesskey.nro ${srcdir}/lessecho.nro installdirs
- ${INSTALL_PROGRAM} less$(EXEEXT) ${DESTDIR}${bindir}/${binprefix}less$(EXEEXT)
- ${INSTALL_PROGRAM} lesskey$(EXEEXT) ${DESTDIR}${bindir}/${binprefix}lesskey$(EXEEXT)
- ${INSTALL_PROGRAM} lessecho$(EXEEXT) ${DESTDIR}${bindir}/${binprefix}lessecho$(EXEEXT)
- ${INSTALL_DATA} ${srcdir}/less.nro ${DESTDIR}${mandir}/man${manext}/${manprefix}less.${manext}
- ${INSTALL_DATA} ${srcdir}/lesskey.nro ${DESTDIR}${mandir}/man${manext}/${manprefix}lesskey.${manext}
- ${INSTALL_DATA} ${srcdir}/lessecho.nro ${DESTDIR}${mandir}/man${manext}/${manprefix}lessecho.${manext}
-
-install-strip:
- ${MAKE} INSTALL_PROGRAM='${INSTALL_PROGRAM} -s' install
-
-installdirs: mkinstalldirs
- ${srcdir}/mkinstalldirs ${DESTDIR}${bindir} ${DESTDIR}${mandir}/man${manext}
-
-uninstall:
- rm -f ${DESTDIR}${bindir}/${binprefix}less$(EXEEXT)
- rm -f ${DESTDIR}${bindir}/${binprefix}lesskey$(EXEEXT)
- rm -f ${DESTDIR}${bindir}/${binprefix}lessecho$(EXEEXT)
- rm -f ${DESTDIR}${mandir}/man${manext}/${manprefix}less.${manext}
- rm -f ${DESTDIR}${mandir}/man${manext}/${manprefix}lesskey.${manext}
- rm -f ${DESTDIR}${mandir}/man${manext}/${manprefix}lessecho.${manext}
-
-info:
-install-info:
-dvi:
-check:
-installcheck:
-
-TAGS:
- cd ${srcdir} && etags *.c *.h
-
-# config.status might not change defines.h
-# Don't rerun config.status if we just configured (so there's no stamp-h).
-defines.h: stamp-h
-stamp-h: defines.h.in config.status
- test ! -f stamp-h || CONFIG_FILES= CONFIG_HEADERS=defines.h ./config.status
- touch stamp-h
-Makefile: ${srcdir}/Makefile.in config.status
- CONFIG_FILES=Makefile CONFIG_HEADERS= ./config.status
-config.status: ${srcdir}/configure
- ./config.status --recheck
-
-${srcdir}/configure: ${srcdir}/configure.ac
- cd ${srcdir}; autoheader; autoconf
-
-clean:
- rm -f *.${O} core less$(EXEEXT) lesskey$(EXEEXT) lessecho$(EXEEXT)
-
-mostlyclean: clean
-
-distclean: clean
- rm -f Makefile config.status config.log config.cache defines.h stamp-h
-
-realclean: distclean
- rm -f TAGS
-
Deleted: trunk/contrib/less/Makefile.o2e
===================================================================
--- trunk/contrib/less/Makefile.o2e 2018-07-06 12:43:22 UTC (rev 11361)
+++ trunk/contrib/less/Makefile.o2e 2018-07-06 12:46:07 UTC (rev 11362)
@@ -1,43 +0,0 @@
-# Makefile for less.
-# OS/2 version, for emx+gcc compiler
-
-#### Start of system configuration section. ####
-
-CC = gcc -Zomf
-CFLAGS = -I. -O2 -Wall
-LDFLAGS = -s -Zcrtdll
-LIBS = -ltermcap
-O = obj
-
-#### End of system configuration section. ####
-
-.SUFFIXES: .c .${O}
-
-# This rule allows us to supply the necessary -D options
-# in addition to whatever the user asks for.
-.c.${O}:
- ${CC} -c ${CPPFLAGS} ${CFLAGS} $<
-
-OBJ = \
- main.${O} screen.${O} brac.${O} ch.${O} charset.${O} cmdbuf.${O} \
- command.${O} cvt.${O} decode.${O} edit.${O} filename.${O} forwback.${O} \
- help.${O} ifile.${O} input.${O} jump.${O} line.${O} linenum.${O} \
- lsystem.${O} mark.${O} optfunc.${O} option.${O} opttbl.${O} os.${O} \
- output.${O} pattern.${O} position.${O} prompt.${O} search.${O} signal.${O} \
- tags.${O} ttyin.${O} version.${O} regexp.${O}
-
-all: less.exe lesskey.exe scrsize.exe
-
-less.exe: ${OBJ}
- ${CC} ${OBJ} -o $@ ${LDFLAGS} ${LIBS}
-
-lesskey.exe: lesskey.${O} version.${O}
- ${CC} lesskey.${O} version.${O} -o $@ ${LDFLAGS}
-
-scrsize.exe: scrsize.c
- ${CC} ${CFLAGS} -D__ST_MT_ERRNO__ -s -Zmtd -lX11 $<
-
-${OBJ}: defines.h less.h
-
-defines.h: defines.o2
- copy defines.o2 defines.h
Deleted: trunk/contrib/less/Makefile.o9c
===================================================================
--- trunk/contrib/less/Makefile.o9c 2018-07-06 12:43:22 UTC (rev 11361)
+++ trunk/contrib/less/Makefile.o9c 2018-07-06 12:46:07 UTC (rev 11362)
@@ -1,47 +0,0 @@
-# Makefile for less.
-# OS-9 version for Microware C 3.2.
-
-#### Start of system configuration section. ####
-
-CC = cc
-CPPFLAGS = -D_OSK_MWC32 -DDEBUG=0 -DSTRCSPN
-CFLAGS = -k=0 -v=.
-CFLAGS_COMPILE_ONLY = -r
-LDFLAGS = -igm=8
-LIBS = -l=/dd/lib/termlib.l
-O = r
-
-
-#### End of system configuration section. ####
-
-.SUFFIXES: .c .${O}
-
-# This rule allows us to supply the necessary -D options
-# in addition to whatever the user asks for.
-
-.c.${O}:
- ${CC} ${CFLAGS_COMPILE_ONLY} ${CPPFLAGS} ${CFLAGS} $<
-
-OBJ = \
- main.${O} screen.${O} brac.${O} ch.${O} charset.${O} cmdbuf.${O} \
- command.${O} cvt.${O} decode.${O} edit.${O} filename.${O} forwback.${O} \
- help.${O} ifile.${O} input.${O} jump.${O} line.${O} linenum.${O} \
- lsystem.${O} mark.${O} optfunc.${O} option.${O} opttbl.${O} os.${O} \
- output.${O} pattern.${O} position.${O} prompt.${O} search.${O} signal.${O} \
- tags.${O} ttyin.${O} version.${O} regexp.${O}
-
-all: less lessecho lesskey
-
-less: ${OBJ}
- ${CC} ${OBJ} -f=$@ ${LDFLAGS} ${LIBS}
-
-lesskey: lesskey.${O} version.${O}
- ${CC} lesskey.${O} version.${O} -f=$@ ${LDFLAGS}
-
-lessecho: lessecho.${O} version.${O}
- ${CC} lessecho.${O} version.${O} -f=$@ ${LDFLAGS}
-
-${OBJ}: defines.h less.h
-
-defines.h: defines.o9
- copy defines.o9 defines.h -rf
Deleted: trunk/contrib/less/Makefile.o9u
===================================================================
--- trunk/contrib/less/Makefile.o9u 2018-07-06 12:43:22 UTC (rev 11361)
+++ trunk/contrib/less/Makefile.o9u 2018-07-06 12:46:07 UTC (rev 11362)
@@ -1,43 +0,0 @@
-# Makefile for less.
-# OS-9 version for Ultra C.
-
-#### Start of system configuration section. ####
-
-CC = cc
-CPPFLAGS =
-CFLAGS = -v=.
-CFLAGS_COMPILE_ONLY = -eas
-LDFLAGS = -olM=24k
-LIBS = -ltermlib.l -lsys_clib.l -lunix.l
-O = r
-
-
-#### End of system configuration section. ####
-
-.SUFFIXES: .c .${O}
-
-# This rule allows us to supply the necessary -D options
-# in addition to whatever the user asks for.
-.c.${O}:
- ${CC} ${CFLAGS_COMPILE_ONLY} ${CPPFLAGS} ${CFLAGS} $<
-
-OBJ = \
- main.${O} screen.${O} brac.${O} ch.${O} charset.${O} cmdbuf.${O} \
- command.${O} cvt.${O} decode.${O} edit.${O} filename.${O} forwback.${O} \
- help.${O} ifile.${O} input.${O} jump.${O} line.${O} linenum.${O} \
- lsystem.${O} mark.${O} optfunc.${O} option.${O} opttbl.${O} os.${O} \
- output.${O} pattern.${O} position.${O} prompt.${O} search.${O} signal.${O} \
- tags.${O} ttyin.${O} version.${O} regexp.${O}
-
-all: less lesskey
-
-less: ${OBJ}
- ${CC} ${OBJ} -f=$@ ${LDFLAGS} ${LIBS}
-
-lesskey: lesskey.${O} version.${O}
- ${CC} lesskey.${O} version.${O} -f=$@ ${LDFLAGS}
-
-${OBJ}: defines.h less.h
-
-defines.h: defines.o9
- copy defines.o9 defines.h -rf
Deleted: trunk/contrib/less/Makefile.wnb
===================================================================
--- trunk/contrib/less/Makefile.wnb 2018-07-06 12:43:22 UTC (rev 11361)
+++ trunk/contrib/less/Makefile.wnb 2018-07-06 12:46:07 UTC (rev 11362)
@@ -1,71 +0,0 @@
-# Makefile for less.
-# Windows version
-# Bolarnd C++ 5.5.1 free command line tools
-
-#### Start of system configuration section. ####
-#
-# Borland's make knows its own location in the
-# filesystem.
-#
-
-CC = bcc32
-LIBDIR = $(MAKEDIR)\..\lib
-
-CFLAGS = -O2 -w-pro -TWC -P-c -v- -d -f- -ff- -vi
-LDFLAGS = -Tpe -v- -ap -c -x -V4.0 -GF:AGGRESSIVE
-LD = ilink32
-LIBS = ${LIBDIR}\import32.lib ${LIBDIR}\cw32.lib
-
-#### End of system configuration section. ####
-
-#
-# This rule allows us to supply the necessary -D options
-# in addition to whatever the user asks for.
-#
-.c.obj:
- ${CC} -c -I. ${CPPFLAGS} ${CFLAGS} $<
-
-OBJ = \
- main.obj screen.obj brac.obj ch.obj charset.obj cmdbuf.obj \
- command.obj cvt.obj decode.obj edit.obj filename.obj forwback.obj \
- help.obj ifile.obj input.obj jump.obj line.obj linenum.obj \
- lsystem.obj mark.obj optfunc.obj option.obj opttbl.obj os.obj \
- output.obj pattern.obj position.obj prompt.obj search.obj signal.obj \
- tags.obj ttyin.obj version.obj regexp.obj
-
-all: less lesskey lessecho
-
-#
-# This is really horrible, but the command line is too long for
-# MS-DOS if we try to link ${OBJ}.
-#
-less: ${OBJ}
- ${LD} ${LDFLAGS} ${LIBDIR}\c0x32.obj $**, $@,,${LIBS}
-
-lesskey: lesskey.obj version.obj
- ${LD} ${LDFLAGS} ${LIBDIR}\c0x32.obj $**, $@,,${LIBS}
-
-lessecho: lessecho.obj version.obj
- ${LD} ${LDFLAGS} ${LIBDIR}\c0x32.obj $**, $@,,${LIBS}
-
-defines.h: defines.wn
- -del defines.h
- -copy defines.wn defines.h
-
-${OBJ}: less.h defines.h funcs.h cmd.h
-
-clean:
- -del *.obj
- -del *.il?
- -del *.tds
- -del defines.h
-
-spotless: clean
- -del less.exe
- -del lesskey.exe
- -del lessecho.exe
-
-realclean: spotless
-
-distclean: spotless
-
Deleted: trunk/contrib/less/Makefile.wnm
===================================================================
--- trunk/contrib/less/Makefile.wnm 2018-07-06 12:43:22 UTC (rev 11361)
+++ trunk/contrib/less/Makefile.wnm 2018-07-06 12:46:07 UTC (rev 11362)
@@ -1,56 +0,0 @@
-# Makefile for less.
-# Windows 32 Visual C++ version
-
-#### Start of system configuration section. ####
-
-CC = cl
-
-# Normal flags
-CFLAGS = /nologo /ML /W3 /GX /O2 /I "." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /c
-LDFLAGS = /nologo /subsystem:console /incremental:no /machine:I386
-
-# Debugging flags
-#CFLAGS = /nologo /MDd /W3 /GX /Od /Gm /Zi /I "." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /c
-#LDFLAGS = /nologo /subsystem:console /incremental:yes /debug /machine:I386
-
-LD = link
-LIBS = user32.lib
-
-#### End of system configuration section. ####
-
-# This rule allows us to supply the necessary -D options
-# in addition to whatever the user asks for.
-.c.obj:
- $(CC) $(CFLAGS) $<
-
-OBJ = \
- main.obj screen.obj brac.obj ch.obj charset.obj cmdbuf.obj \
- command.obj cvt.obj decode.obj edit.obj filename.obj forwback.obj \
- help.obj ifile.obj input.obj jump.obj line.obj linenum.obj \
- lsystem.obj mark.obj optfunc.obj option.obj opttbl.obj os.obj \
- output.obj pattern.obj position.obj prompt.obj search.obj signal.obj \
- tags.obj ttyin.obj version.obj regexp.obj
-
-all: less.exe lesskey.exe
-
-# This is really horrible, but the command line is too long for
-# MS-DOS if we try to link ${OBJ}.
-less.exe: $(OBJ)
- -del lesskey.obj
- $(LD) $(LDFLAGS) *.obj $(LIBS) /out:$@
-
-lesskey.exe: lesskey.obj version.obj
- $(LD) $(LDFLAGS) lesskey.obj version.obj $(LIBS) /out:$@
-
-defines.h: defines.wn
- -del defines.h
- -copy defines.wn defines.h
-
-$(OBJ): less.h defines.h funcs.h cmd.h
-
-clean:
- -del *.obj
- -del less.exe
- -del lesskey.exe
-
-
Modified: trunk/contrib/less/NEWS
===================================================================
--- trunk/contrib/less/NEWS 2018-07-06 12:43:22 UTC (rev 11361)
+++ trunk/contrib/less/NEWS 2018-07-06 12:46:07 UTC (rev 11362)
@@ -7,10 +7,123 @@
http://www.greenwoodsoftware.com/less
You can also download the latest version of less from there.
- To report bugs, suggestions or comments, send email to bug-less at gnu.org.
+ To report bugs, suggestions or comments, send email to bug-less at gnu.org
======================================================================
+ Major changes between "less" versions 487 and 530
+
+* Don't output terminal init sequence if using -F and file fits on one screen.
+
+* When using -S, mark truncated lines with a special character.
+ The character can be changed or disabled via the new --rscroll option.
+
+* New command M marks the last line displayed on the screen.
+
+* New command ESC-m removes a line mark.
+
+* Status column (enabled via -J) now shows mark letters.
+
+* Status column shows search matches even if highlighting is disabled via -G.
+
+* A second ESC-u command will clear search match markers in the status column.
+
+* Do same ANSI escape code filtering for tag matching that we do for
+ searching, to help when viewing syntax-highlighted code.
+
+* Catch SIGTERM and clean up before exiting.
+
+* Fix bug initializing default charset on Windows.
+
+* Handle keypad ENTER key correctly if it sends something other than newline.
+
+* Fix buffering bug when using stdin with a LESSOPEN pipe.
+
+* On Windows, allow 'u' in -D option to enable underlining.
+
+* On Windows, use underline in sgr mode.
+
+* On Windows, convert UTF-8 to multibyte if console is not UTF-8.
+
+* Update Unicode tables to 2017-03-08.
+
+* Pass-thru Unicode formating chars (Cf type) instead of treating them
+ as binary chars. But treat them as binary if -U is set.
+
+* Fix erroneous binary file warning when UTF-8 file contains ANSI SGR sequences.
+
+* Fix bugs when using LESSOPEN and switching between stdin and other files.
+
+* Fix some bugs handling filenames containing shell metacharacters.
+
+* Fix some memory leaks.
+
+* Allow some debugging environment variables to be set in lesskey file.
+
+* Code improvements:
+ . Use ANSI prototypes in funcs.h declarations.
+ . Fix some const mismatches.
+ . Remove archaic "register" in variable declarations.
+
+======================================================================
+
+ Major changes between "less" versions 481 and 487
+
+* New commands ESC-{ and ESC-} to shift to start/end of displayed lines.
+
+* Make search highlights work correctly when changing caselessness with -i.
+
+* New option -Da in Windows version to enable SGR mode.
+
+* Fix "nothing to search" error when top or bottom line on screen is empty.
+
+* Fix bug when terminal has no "cm" termcap entry.
+
+* Fix incorrect display when entering double-width chars in search string.
+
+* Fix bug in Unicode handling that missed some double width characters.
+
+* Update Unicode database to 9.0.0.
+
+======================================================================
+
+ Major changes between "less" versions 458 and 481
+
+* Don't overwrite history file; just append to it.
+
+* New command ESC-G goes to end of currently buffered data in a pipe.
+
+* Disable history feature when compiled with LESSHISTFILE set to "-".
+
+* In more-compatible mode, make the -p option apply to every file opened,
+ not just the first one.
+
+* In more-compatible mode, change the -e option to work like -E, not -EF.
+
+* Treat multiple CRs before LF are like one CR (all the CRs are hidden).
+
+* Allow "extra" string in lesskey file to append to a multi-char command
+ (like a search pattern), without executing the command.
+
+* Ignore -u/-U setting while viewing help file, so that
+ underline and bold chars are displayed correctly.
+
+* Improve detection of "binary" files in UTF-8 mode.
+
+* Fix bug with ++ commands.
+
+* Fix bug where prompt was sometimes not displayed with +G.
+
+* Fix possible memory corruption
+
+* Fix bugs and improve performance in ampersand filtering.
+
+* Automate construction of Unicode tables from Unicode database.
+
+* Allow %% escape sequence in LESSOPEN variable.
+
+======================================================================
+
Major changes between "less" versions 451 and 458
* Allow backslash escaping of metacharacters in LESS environment variable
Modified: trunk/contrib/less/README
===================================================================
--- trunk/contrib/less/README 2018-07-06 12:43:22 UTC (rev 11361)
+++ trunk/contrib/less/README 2018-07-06 12:46:07 UTC (rev 11362)
@@ -1,7 +1,15 @@
+**************************************************************************
+**************************************************************************
+** **
+** The FreeBSD Project has chosen to redistribute and modify Less under **
+** the 'Less License' (as described in the 'LICENSE' file). **
+** **
+**************************************************************************
+**************************************************************************
- Less, version 458
+ Less, version 530
- This is the distribution of less, version 458, released 04 Apr 2013.
+ This is the distribution of less, version 530, released 05 Dec 2017.
This program is part of the GNU project (http://www.gnu.org).
This program is free software. You may redistribute it and/or
@@ -15,6 +23,7 @@
Please report any problems to bug-less at gnu.org.
See http://www.greenwoodsoftware.com/less for the latest info.
+ Source repository is at https://github.com/gwsw/less.git.
=========================================================================
@@ -45,8 +54,9 @@
Specifies the regular expression library used by less for pattern
matching. The default is "auto", which means the configure program
finds a regular expression library automatically. Other values are:
+ gnu Use the GNU regex library.
+ pcre Use the PCRE library.
posix Use the POSIX-compatible regcomp.
- pcre Use the PCRE library.
regcmp Use the regcmp library.
re_comp Use the re_comp library.
regcomp Use the V8-compatible regcomp.
Modified: trunk/contrib/less/brac.c
===================================================================
--- trunk/contrib/less/brac.c 2018-07-06 12:43:22 UTC (rev 11361)
+++ trunk/contrib/less/brac.c 2018-07-06 12:46:07 UTC (rev 11362)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 1984-2012 Mark Nudelman
+ * Copyright (C) 1984-2017 Mark Nudelman
*
* You may distribute under the terms of either the GNU General Public
* License or the Less License, as specified in the README file.
@@ -25,13 +25,13 @@
*/
public void
match_brac(obrac, cbrac, forwdir, n)
- register int obrac;
- register int cbrac;
+ int obrac;
+ int cbrac;
int forwdir;
int n;
{
- register int c;
- register int nest;
+ int c;
+ int nest;
POSITION pos;
int (*chget)();
Modified: trunk/contrib/less/ch.c
===================================================================
--- trunk/contrib/less/ch.c 2018-07-06 12:43:22 UTC (rev 11361)
+++ trunk/contrib/less/ch.c 2018-07-06 12:46:07 UTC (rev 11362)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 1984-2012 Mark Nudelman
+ * Copyright (C) 1984-2017 Mark Nudelman
*
* You may distribute under the terms of either the GNU General Public
* License or the Less License, as specified in the README file.
@@ -54,7 +54,7 @@
* The file state is maintained in a filestate structure.
* A pointer to the filestate is kept in the ifile structure.
*/
-#define BUFHASH_SIZE 64
+#define BUFHASH_SIZE 1024
struct filestate {
struct bufnode buflist;
struct bufnode hashtbl[BUFHASH_SIZE];
@@ -146,11 +146,11 @@
int
ch_get()
{
- register struct buf *bp;
- register struct bufnode *bn;
- register int n;
- register int slept;
- register int h;
+ struct buf *bp;
+ struct bufnode *bn;
+ int n;
+ int slept;
+ int h;
POSITION pos;
POSITION len;
@@ -323,13 +323,16 @@
#if HAVE_STAT_INO
if (follow_mode == FOLLOW_NAME)
{
- /* See whether the file's i-number has changed.
+ /* See whether the file's i-number has changed,
+ * or the file has shrunk.
* If so, force the file to be closed and
* reopened. */
struct stat st;
+ POSITION curr_pos = ch_tell();
int r = stat(get_filename(curr_ifile), &st);
if (r == 0 && (st.st_ino != curr_ino ||
- st.st_dev != curr_dev))
+ st.st_dev != curr_dev ||
+ (curr_pos != NULL_POSITION && st.st_size < curr_pos)))
{
/* screen_trashed=2 causes
* make_display to reopen the file. */
@@ -416,8 +419,8 @@
public void
sync_logfile()
{
- register struct buf *bp;
- register struct bufnode *bn;
+ struct buf *bp;
+ struct bufnode *bn;
int warned = FALSE;
BLOCKNUM block;
BLOCKNUM nblocks;
@@ -454,9 +457,9 @@
buffered(block)
BLOCKNUM block;
{
- register struct buf *bp;
- register struct bufnode *bn;
- register int h;
+ struct buf *bp;
+ struct bufnode *bn;
+ int h;
h = BUFHASH(block);
FOR_BUFS_IN_CHAIN(h, bn)
@@ -474,7 +477,7 @@
*/
public int
ch_seek(pos)
- register POSITION pos;
+ POSITION pos;
{
BLOCKNUM new_block;
POSITION len;
@@ -536,6 +539,32 @@
}
/*
+ * Seek to the last position in the file that is currently buffered.
+ */
+ public int
+ch_end_buffer_seek()
+{
+ struct buf *bp;
+ struct bufnode *bn;
+ POSITION buf_pos;
+ POSITION end_pos;
+
+ if (thisfile == NULL || (ch_flags & CH_CANSEEK))
+ return (ch_end_seek());
+
+ end_pos = 0;
+ FOR_BUFS(bn)
+ {
+ bp = bufnode_buf(bn);
+ buf_pos = (bp->block * LBUFSIZE) + bp->datasize;
+ if (buf_pos > end_pos)
+ end_pos = buf_pos;
+ }
+
+ return (ch_seek(end_pos));
+}
+
+/*
* Seek to the beginning of the file, or as close to it as we can get.
* We may not be able to seek there if input is a pipe and the
* beginning of the pipe is no longer buffered.
@@ -543,8 +572,8 @@
public int
ch_beg_seek()
{
- register struct bufnode *bn;
- register struct bufnode *firstbn;
+ struct bufnode *bn;
+ struct bufnode *firstbn;
/*
* Try a plain ch_seek first.
@@ -603,7 +632,7 @@
public int
ch_forw_get()
{
- register int c;
+ int c;
if (thisfile == NULL)
return (EOI);
@@ -666,7 +695,7 @@
public void
ch_flush()
{
- register struct bufnode *bn;
+ struct bufnode *bn;
if (thisfile == NULL)
return;
@@ -733,8 +762,8 @@
static int
ch_addbuf()
{
- register struct buf *bp;
- register struct bufnode *bn;
+ struct buf *bp;
+ struct bufnode *bn;
/*
* Allocate and initialize a new buffer and link it
@@ -758,7 +787,7 @@
static void
init_hashtbl()
{
- register int h;
+ int h;
for (h = 0; h < BUFHASH_SIZE; h++)
{
@@ -773,7 +802,7 @@
static void
ch_delbufs()
{
- register struct bufnode *bn;
+ struct bufnode *bn;
while (ch_bufhead != END_OF_CHAIN)
{
@@ -838,13 +867,12 @@
calloc(1, sizeof(struct filestate));
thisfile->buflist.next = thisfile->buflist.prev = END_OF_CHAIN;
thisfile->nbufs = 0;
- thisfile->flags = 0;
+ thisfile->flags = flags;
thisfile->fpos = 0;
thisfile->block = 0;
thisfile->offset = 0;
thisfile->file = -1;
thisfile->fsize = NULL_POSITION;
- ch_flags = flags;
init_hashtbl();
/*
* Try to seek; set CH_CANSEEK if it works.
@@ -869,7 +897,7 @@
if (thisfile == NULL)
return;
- if (ch_flags & (CH_CANSEEK|CH_POPENED|CH_HELPFILE))
+ if ((ch_flags & (CH_CANSEEK|CH_POPENED|CH_HELPFILE)) && !(ch_flags & CH_KEEPOPEN))
{
/*
* We can seek or re-open, so we don't need to keep buffers.
Modified: trunk/contrib/less/charset.c
===================================================================
--- trunk/contrib/less/charset.c 2018-07-06 12:43:22 UTC (rev 11361)
+++ trunk/contrib/less/charset.c 2018-07-06 12:46:07 UTC (rev 11362)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 1984-2012 Mark Nudelman
+ * Copyright (C) 1984-2017 Mark Nudelman
*
* You may distribute under the terms of either the GNU General Public
* License or the Less License, as specified in the README file.
@@ -22,6 +22,13 @@
#include "charset.h"
+#if MSDOS_COMPILER==WIN32C
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#endif
+
+extern int bs_mode;
+
public int utf_mode = 0;
/*
@@ -64,6 +71,8 @@
char *oname;
} cs_aliases[] = {
{ "UTF-8", "utf-8" },
+ { "utf8", "utf-8" },
+ { "UTF8", "utf-8" },
{ "ANSI_X3.4-1968", "ascii" },
{ "US-ASCII", "ascii" },
{ "latin1", "iso8859" },
@@ -133,9 +142,9 @@
ichardef(s)
char *s;
{
- register char *cp;
- register int n;
- register char v;
+ char *cp;
+ int n;
+ char v;
n = 0;
v = 0;
@@ -188,11 +197,11 @@
*/
static int
icharset(name, no_error)
- register char *name;
+ char *name;
int no_error;
{
- register struct charset *p;
- register struct cs_alias *a;
+ struct charset *p;
+ struct cs_alias *a;
if (name == NULL || *name == '\0')
return (0);
@@ -213,7 +222,13 @@
{
ichardef(p->desc);
if (p->p_flag != NULL)
+ {
+#if MSDOS_COMPILER==WIN32C
+ *(p->p_flag) = 1 + (GetConsoleOutputCP() != CP_UTF8);
+#else
*(p->p_flag) = 1;
+#endif
+ }
return (1);
}
}
@@ -232,7 +247,7 @@
static void
ilocale()
{
- register int c;
+ int c;
for (c = 0; c < (int) sizeof(chardef); c++)
{
@@ -249,16 +264,17 @@
/*
* Define the printing format for control (or binary utf) chars.
*/
- static void
-setbinfmt(s, fmtvarptr, default_fmt)
+ public void
+setfmt(s, fmtvarptr, attrptr, default_fmt)
char *s;
char **fmtvarptr;
+ int *attrptr;
char *default_fmt;
{
if (s && utf_mode)
{
/* It would be too hard to account for width otherwise. */
- char *t = s;
+ char constant *t = s;
while (*t)
{
if (*t < ' ' || *t > '~')
@@ -280,15 +296,15 @@
* Select the attributes if it starts with "*".
*/
attr:
- if (*s == '*')
+ if (*s == '*' && s[1] != '\0')
{
switch (s[1])
{
- case 'd': binattr = AT_BOLD; break;
- case 'k': binattr = AT_BLINK; break;
- case 's': binattr = AT_STANDOUT; break;
- case 'u': binattr = AT_UNDERLINE; break;
- default: binattr = AT_NORMAL; break;
+ case 'd': *attrptr = AT_BOLD; break;
+ case 'k': *attrptr = AT_BLINK; break;
+ case 's': *attrptr = AT_STANDOUT; break;
+ case 'u': *attrptr = AT_UNDERLINE; break;
+ default: *attrptr = AT_NORMAL; break;
}
s += 2;
}
@@ -303,7 +319,15 @@
{
char *s;
+#if MSDOS_COMPILER==WIN32C
/*
+ * If the Windows console is using UTF-8, we'll use it too.
+ */
+ if (GetConsoleOutputCP() == CP_UTF8)
+ if (icharset("utf-8", 1))
+ return;
+#endif
+ /*
* See if environment variable LESSCHARSET is defined.
*/
s = lgetenv("LESSCHARSET");
@@ -352,6 +376,7 @@
* rather than from predefined charset entry.
*/
ilocale();
+#else
#if MSDOS_COMPILER
/*
* Default to "dos".
@@ -381,10 +406,10 @@
set_charset();
s = lgetenv("LESSBINFMT");
- setbinfmt(s, &binfmt, "*s<%02X>");
+ setfmt(s, &binfmt, &binattr, "*s<%02X>");
s = lgetenv("LESSUTFBINFMT");
- setbinfmt(s, &utfbinfmt, "<U+%04lX>");
+ setfmt(s, &utfbinfmt, &binattr, "<U+%04lX>");
}
/*
@@ -466,36 +491,15 @@
else
SNPRINTF1(buf, sizeof(buf), binfmt, (char) ch);
} else if (is_ubin_char(ch))
+ {
SNPRINTF1(buf, sizeof(buf), utfbinfmt, ch);
- else
+ } else
{
- int len;
+ char *p = buf;
if (ch >= 0x80000000)
- {
- len = 3;
- ch = 0xFFFD;
- } else
- {
- len = (ch < 0x80) ? 1
- : (ch < 0x800) ? 2
- : (ch < 0x10000) ? 3
- : (ch < 0x200000) ? 4
- : (ch < 0x4000000) ? 5
- : 6;
- }
- buf[len] = '\0';
- if (len == 1)
- *buf = (char) ch;
- else
- {
- *buf = ((1 << len) - 1) << (8 - len);
- while (--len > 0)
- {
- buf[len] = (char) (0x80 | (ch & 0x3F));
- ch >>= 6;
- }
- *buf |= ch;
- }
+ ch = 0xFFFD; /* REPLACEMENT CHARACTER */
+ put_wchar(&p, ch);
+ *p = '\0';
}
return (buf);
}
@@ -505,7 +509,7 @@
*/
public int
utf_len(ch)
- char ch;
+ unsigned char ch;
{
if ((ch & 0x80) == 0)
return 1;
@@ -524,19 +528,23 @@
}
/*
- * Is a UTF-8 character well-formed?
+ * Does the parameter point to the lead byte of a well-formed UTF-8 character?
*/
public int
-is_utf8_well_formed(s)
- unsigned char *s;
+is_utf8_well_formed(ss, slen)
+ char *ss;
+ int slen;
{
int i;
int len;
+ unsigned char *s = (unsigned char *) ss;
if (IS_UTF8_INVALID(s[0]))
return (0);
- len = utf_len((char) s[0]);
+ len = utf_len(s[0]);
+ if (len > slen)
+ return (0);
if (len == 1)
return (1);
if (len == 2)
@@ -558,11 +566,25 @@
}
/*
+ * Skip bytes until a UTF-8 lead byte (11xxxxxx) or ASCII byte (0xxxxxxx) is found.
+ */
+ public void
+utf_skip_to_lead(pp, limit)
+ char **pp;
+ char *limit;
+{
+ do {
+ ++(*pp);
+ } while (*pp < limit && !IS_UTF8_LEAD((*pp)[0] & 0377) && !IS_ASCII_OCTET((*pp)[0]));
+}
+
+
+/*
* Get the value of a UTF-8 character.
*/
public LWCHAR
get_wchar(p)
- char *p;
+ constant char *p;
{
switch (utf_len(p[0]))
{
@@ -666,7 +688,7 @@
step_char(pp, dir, limit)
char **pp;
signed int dir;
- char *limit;
+ constant char *limit;
{
LWCHAR ch;
int len;
@@ -676,9 +698,9 @@
{
/* It's easy if chars are one byte. */
if (dir > 0)
- ch = (LWCHAR) ((p < limit) ? *p++ : 0);
+ ch = (LWCHAR) (unsigned char) ((p < limit) ? *p++ : 0);
else
- ch = (LWCHAR) ((p > limit) ? *--p : 0);
+ ch = (LWCHAR) (unsigned char) ((p > limit) ? *--p : 0);
} else if (dir > 0)
{
len = utf_len(*p);
@@ -685,7 +707,7 @@
if (p + len > limit)
{
ch = 0;
- p = limit;
+ p = (char *) limit;
} else
{
ch = get_wchar(p);
@@ -706,411 +728,55 @@
/*
* Unicode characters data
+ * Actual data is in the generated *.uni files.
*/
-struct wchar_range { LWCHAR first, last; };
-/*
- * Characters with general category values
- * Mn: Mark, Nonspacing
- * Me: Mark, Enclosing
- * Last synched with
- * <http://www.unicode.org/Public/5.0.0/ucd/UnicodeData-5.0.0d7.txt>
- * dated 2005-11-30T00:58:48Z
- */
-static struct wchar_range comp_table[] = {
- { 0x0300, 0x036F} /* Mn */, { 0x0483, 0x0486} /* Mn */,
- { 0x0488, 0x0489} /* Me */,
- { 0x0591, 0x05BD} /* Mn */, { 0x05BF, 0x05BF} /* Mn */,
- { 0x05C1, 0x05C2} /* Mn */, { 0x05C4, 0x05C5} /* Mn */,
- { 0x05C7, 0x05C7} /* Mn */, { 0x0610, 0x0615} /* Mn */,
- { 0x064B, 0x065E} /* Mn */, { 0x0670, 0x0670} /* Mn */,
- { 0x06D6, 0x06DC} /* Mn */,
- { 0x06DE, 0x06DE} /* Me */,
- { 0x06DF, 0x06E4} /* Mn */, { 0x06E7, 0x06E8} /* Mn */,
- { 0x06EA, 0x06ED} /* Mn */, { 0x0711, 0x0711} /* Mn */,
- { 0x0730, 0x074A} /* Mn */, { 0x07A6, 0x07B0} /* Mn */,
- { 0x07EB, 0x07F3} /* Mn */, { 0x0901, 0x0902} /* Mn */,
- { 0x093C, 0x093C} /* Mn */, { 0x0941, 0x0948} /* Mn */,
- { 0x094D, 0x094D} /* Mn */, { 0x0951, 0x0954} /* Mn */,
- { 0x0962, 0x0963} /* Mn */, { 0x0981, 0x0981} /* Mn */,
- { 0x09BC, 0x09BC} /* Mn */, { 0x09C1, 0x09C4} /* Mn */,
- { 0x09CD, 0x09CD} /* Mn */, { 0x09E2, 0x09E3} /* Mn */,
- { 0x0A01, 0x0A02} /* Mn */, { 0x0A3C, 0x0A3C} /* Mn */,
- { 0x0A41, 0x0A42} /* Mn */, { 0x0A47, 0x0A48} /* Mn */,
- { 0x0A4B, 0x0A4D} /* Mn */, { 0x0A70, 0x0A71} /* Mn */,
- { 0x0A81, 0x0A82} /* Mn */, { 0x0ABC, 0x0ABC} /* Mn */,
- { 0x0AC1, 0x0AC5} /* Mn */, { 0x0AC7, 0x0AC8} /* Mn */,
- { 0x0ACD, 0x0ACD} /* Mn */, { 0x0AE2, 0x0AE3} /* Mn */,
- { 0x0B01, 0x0B01} /* Mn */, { 0x0B3C, 0x0B3C} /* Mn */,
- { 0x0B3F, 0x0B3F} /* Mn */, { 0x0B41, 0x0B43} /* Mn */,
- { 0x0B4D, 0x0B4D} /* Mn */, { 0x0B56, 0x0B56} /* Mn */,
- { 0x0B82, 0x0B82} /* Mn */, { 0x0BC0, 0x0BC0} /* Mn */,
- { 0x0BCD, 0x0BCD} /* Mn */, { 0x0C3E, 0x0C40} /* Mn */,
- { 0x0C46, 0x0C48} /* Mn */, { 0x0C4A, 0x0C4D} /* Mn */,
- { 0x0C55, 0x0C56} /* Mn */, { 0x0CBC, 0x0CBC} /* Mn */,
- { 0x0CBF, 0x0CBF} /* Mn */, { 0x0CC6, 0x0CC6} /* Mn */,
- { 0x0CCC, 0x0CCD} /* Mn */, { 0x0CE2, 0x0CE3} /* Mn */,
- { 0x0D41, 0x0D43} /* Mn */, { 0x0D4D, 0x0D4D} /* Mn */,
- { 0x0DCA, 0x0DCA} /* Mn */, { 0x0DD2, 0x0DD4} /* Mn */,
- { 0x0DD6, 0x0DD6} /* Mn */, { 0x0E31, 0x0E31} /* Mn */,
- { 0x0E34, 0x0E3A} /* Mn */, { 0x0E47, 0x0E4E} /* Mn */,
- { 0x0EB1, 0x0EB1} /* Mn */, { 0x0EB4, 0x0EB9} /* Mn */,
- { 0x0EBB, 0x0EBC} /* Mn */, { 0x0EC8, 0x0ECD} /* Mn */,
- { 0x0F18, 0x0F19} /* Mn */, { 0x0F35, 0x0F35} /* Mn */,
- { 0x0F37, 0x0F37} /* Mn */, { 0x0F39, 0x0F39} /* Mn */,
- { 0x0F71, 0x0F7E} /* Mn */, { 0x0F80, 0x0F84} /* Mn */,
- { 0x0F86, 0x0F87} /* Mn */, { 0x0F90, 0x0F97} /* Mn */,
- { 0x0F99, 0x0FBC} /* Mn */, { 0x0FC6, 0x0FC6} /* Mn */,
- { 0x102D, 0x1030} /* Mn */, { 0x1032, 0x1032} /* Mn */,
- { 0x1036, 0x1037} /* Mn */, { 0x1039, 0x1039} /* Mn */,
- { 0x1058, 0x1059} /* Mn */, { 0x135F, 0x135F} /* Mn */,
- { 0x1712, 0x1714} /* Mn */, { 0x1732, 0x1734} /* Mn */,
- { 0x1752, 0x1753} /* Mn */, { 0x1772, 0x1773} /* Mn */,
- { 0x17B7, 0x17BD} /* Mn */, { 0x17C6, 0x17C6} /* Mn */,
- { 0x17C9, 0x17D3} /* Mn */, { 0x17DD, 0x17DD} /* Mn */,
- { 0x180B, 0x180D} /* Mn */, { 0x18A9, 0x18A9} /* Mn */,
- { 0x1920, 0x1922} /* Mn */, { 0x1927, 0x1928} /* Mn */,
- { 0x1932, 0x1932} /* Mn */, { 0x1939, 0x193B} /* Mn */,
- { 0x1A17, 0x1A18} /* Mn */, { 0x1B00, 0x1B03} /* Mn */,
- { 0x1B34, 0x1B34} /* Mn */, { 0x1B36, 0x1B3A} /* Mn */,
- { 0x1B3C, 0x1B3C} /* Mn */, { 0x1B42, 0x1B42} /* Mn */,
- { 0x1B6B, 0x1B73} /* Mn */, { 0x1DC0, 0x1DCA} /* Mn */,
- { 0x1DFE, 0x1DFF} /* Mn */, { 0x20D0, 0x20DC} /* Mn */,
- { 0x20DD, 0x20E0} /* Me */,
- { 0x20E1, 0x20E1} /* Mn */,
- { 0x20E2, 0x20E4} /* Me */,
- { 0x20E5, 0x20EF} /* Mn */, { 0x302A, 0x302F} /* Mn */,
- { 0x3099, 0x309A} /* Mn */, { 0xA806, 0xA806} /* Mn */,
- { 0xA80B, 0xA80B} /* Mn */, { 0xA825, 0xA826} /* Mn */,
- { 0xFB1E, 0xFB1E} /* Mn */, { 0xFE00, 0xFE0F} /* Mn */,
- { 0xFE20, 0xFE23} /* Mn */, { 0x10A01, 0x10A03} /* Mn */,
- { 0x10A05, 0x10A06} /* Mn */, { 0x10A0C, 0x10A0F} /* Mn */,
- { 0x10A38, 0x10A3A} /* Mn */, { 0x10A3F, 0x10A3F} /* Mn */,
- { 0x1D167, 0x1D169} /* Mn */, { 0x1D17B, 0x1D182} /* Mn */,
- { 0x1D185, 0x1D18B} /* Mn */, { 0x1D1AA, 0x1D1AD} /* Mn */,
- { 0x1D242, 0x1D244} /* Mn */, { 0xE0100, 0xE01EF} /* Mn */,
-};
+#define DECLARE_RANGE_TABLE_START(name) \
+ static struct wchar_range name##_array[] = {
+#define DECLARE_RANGE_TABLE_END(name) \
+ }; struct wchar_range_table name##_table = { name##_array, sizeof(name##_array)/sizeof(*name##_array) };
-/*
- * Special pairs, not ranges.
- */
+DECLARE_RANGE_TABLE_START(compose)
+#include "compose.uni"
+DECLARE_RANGE_TABLE_END(compose)
+
+DECLARE_RANGE_TABLE_START(ubin)
+#include "ubin.uni"
+DECLARE_RANGE_TABLE_END(ubin)
+
+DECLARE_RANGE_TABLE_START(wide)
+#include "wide.uni"
+DECLARE_RANGE_TABLE_END(wide)
+
+DECLARE_RANGE_TABLE_START(fmt)
+#include "fmt.uni"
+DECLARE_RANGE_TABLE_END(fmt)
+
+/* comb_table is special pairs, not ranges. */
static struct wchar_range comb_table[] = {
{0x0644,0x0622}, {0x0644,0x0623}, {0x0644,0x0625}, {0x0644,0x0627},
};
-/*
- * Characters with general category values
- * Cc: Other, Control
- * Cf: Other, Format
- * Cs: Other, Surrogate
- * Co: Other, Private Use
- * Cn: Other, Not Assigned
- * Zl: Separator, Line
- * Zp: Separator, Paragraph
- * Last synched with
- * <http://www.unicode.org/Public/5.0.0/ucd/UnicodeData-5.0.0d7.txt>
- * dated 2005-11-30T00:58:48Z
- */
-static struct wchar_range ubin_table[] = {
- { 0x0000, 0x0007} /* Cc */,
- { 0x000B, 0x000C} /* Cc */,
- { 0x000E, 0x001A} /* Cc */,
- { 0x001C, 0x001F} /* Cc */,
- { 0x007F, 0x009F} /* Cc */,
-#if 0
- { 0x00AD, 0x00AD} /* Cf */,
-#endif
- { 0x0370, 0x0373} /* Cn */, { 0x0376, 0x0379} /* Cn */,
- { 0x037F, 0x0383} /* Cn */, { 0x038B, 0x038B} /* Cn */,
- { 0x038D, 0x038D} /* Cn */, { 0x03A2, 0x03A2} /* Cn */,
- { 0x03CF, 0x03CF} /* Cn */, { 0x0487, 0x0487} /* Cn */,
- { 0x0514, 0x0530} /* Cn */, { 0x0557, 0x0558} /* Cn */,
- { 0x0560, 0x0560} /* Cn */, { 0x0588, 0x0588} /* Cn */,
- { 0x058B, 0x0590} /* Cn */, { 0x05C8, 0x05CF} /* Cn */,
- { 0x05EB, 0x05EF} /* Cn */, { 0x05F5, 0x05FF} /* Cn */,
-#if 0
- { 0x0600, 0x0603} /* Cf */,
-#endif
- { 0x0604, 0x060A} /* Cn */, { 0x0616, 0x061A} /* Cn */,
- { 0x061C, 0x061D} /* Cn */, { 0x0620, 0x0620} /* Cn */,
- { 0x063B, 0x063F} /* Cn */, { 0x065F, 0x065F} /* Cn */,
-#if 0
- { 0x06DD, 0x06DD} /* Cf */,
-#endif
- { 0x070E, 0x070E} /* Cn */,
-#if 0
- { 0x070F, 0x070F} /* Cf */,
-#endif
- { 0x074B, 0x074C} /* Cn */, { 0x076E, 0x077F} /* Cn */,
- { 0x07B2, 0x07BF} /* Cn */, { 0x07FB, 0x0900} /* Cn */,
- { 0x093A, 0x093B} /* Cn */, { 0x094E, 0x094F} /* Cn */,
- { 0x0955, 0x0957} /* Cn */, { 0x0971, 0x097A} /* Cn */,
- { 0x0980, 0x0980} /* Cn */, { 0x0984, 0x0984} /* Cn */,
- { 0x098D, 0x098E} /* Cn */, { 0x0991, 0x0992} /* Cn */,
- { 0x09A9, 0x09A9} /* Cn */, { 0x09B1, 0x09B1} /* Cn */,
- { 0x09B3, 0x09B5} /* Cn */, { 0x09BA, 0x09BB} /* Cn */,
- { 0x09C5, 0x09C6} /* Cn */, { 0x09C9, 0x09CA} /* Cn */,
- { 0x09CF, 0x09D6} /* Cn */, { 0x09D8, 0x09DB} /* Cn */,
- { 0x09DE, 0x09DE} /* Cn */, { 0x09E4, 0x09E5} /* Cn */,
- { 0x09FB, 0x0A00} /* Cn */, { 0x0A04, 0x0A04} /* Cn */,
- { 0x0A0B, 0x0A0E} /* Cn */, { 0x0A11, 0x0A12} /* Cn */,
- { 0x0A29, 0x0A29} /* Cn */, { 0x0A31, 0x0A31} /* Cn */,
- { 0x0A34, 0x0A34} /* Cn */, { 0x0A37, 0x0A37} /* Cn */,
- { 0x0A3A, 0x0A3B} /* Cn */, { 0x0A3D, 0x0A3D} /* Cn */,
- { 0x0A43, 0x0A46} /* Cn */, { 0x0A49, 0x0A4A} /* Cn */,
- { 0x0A4E, 0x0A58} /* Cn */, { 0x0A5D, 0x0A5D} /* Cn */,
- { 0x0A5F, 0x0A65} /* Cn */, { 0x0A75, 0x0A80} /* Cn */,
- { 0x0A84, 0x0A84} /* Cn */, { 0x0A8E, 0x0A8E} /* Cn */,
- { 0x0A92, 0x0A92} /* Cn */, { 0x0AA9, 0x0AA9} /* Cn */,
- { 0x0AB1, 0x0AB1} /* Cn */, { 0x0AB4, 0x0AB4} /* Cn */,
- { 0x0ABA, 0x0ABB} /* Cn */, { 0x0AC6, 0x0AC6} /* Cn */,
- { 0x0ACA, 0x0ACA} /* Cn */, { 0x0ACE, 0x0ACF} /* Cn */,
- { 0x0AD1, 0x0ADF} /* Cn */, { 0x0AE4, 0x0AE5} /* Cn */,
- { 0x0AF0, 0x0AF0} /* Cn */, { 0x0AF2, 0x0B00} /* Cn */,
- { 0x0B04, 0x0B04} /* Cn */, { 0x0B0D, 0x0B0E} /* Cn */,
- { 0x0B11, 0x0B12} /* Cn */, { 0x0B29, 0x0B29} /* Cn */,
- { 0x0B31, 0x0B31} /* Cn */, { 0x0B34, 0x0B34} /* Cn */,
- { 0x0B3A, 0x0B3B} /* Cn */, { 0x0B44, 0x0B46} /* Cn */,
- { 0x0B49, 0x0B4A} /* Cn */, { 0x0B4E, 0x0B55} /* Cn */,
- { 0x0B58, 0x0B5B} /* Cn */, { 0x0B5E, 0x0B5E} /* Cn */,
- { 0x0B62, 0x0B65} /* Cn */, { 0x0B72, 0x0B81} /* Cn */,
- { 0x0B84, 0x0B84} /* Cn */, { 0x0B8B, 0x0B8D} /* Cn */,
- { 0x0B91, 0x0B91} /* Cn */, { 0x0B96, 0x0B98} /* Cn */,
- { 0x0B9B, 0x0B9B} /* Cn */, { 0x0B9D, 0x0B9D} /* Cn */,
- { 0x0BA0, 0x0BA2} /* Cn */, { 0x0BA5, 0x0BA7} /* Cn */,
- { 0x0BAB, 0x0BAD} /* Cn */, { 0x0BBA, 0x0BBD} /* Cn */,
- { 0x0BC3, 0x0BC5} /* Cn */, { 0x0BC9, 0x0BC9} /* Cn */,
- { 0x0BCE, 0x0BD6} /* Cn */, { 0x0BD8, 0x0BE5} /* Cn */,
- { 0x0BFB, 0x0C00} /* Cn */, { 0x0C04, 0x0C04} /* Cn */,
- { 0x0C0D, 0x0C0D} /* Cn */, { 0x0C11, 0x0C11} /* Cn */,
- { 0x0C29, 0x0C29} /* Cn */, { 0x0C34, 0x0C34} /* Cn */,
- { 0x0C3A, 0x0C3D} /* Cn */, { 0x0C45, 0x0C45} /* Cn */,
- { 0x0C49, 0x0C49} /* Cn */, { 0x0C4E, 0x0C54} /* Cn */,
- { 0x0C57, 0x0C5F} /* Cn */, { 0x0C62, 0x0C65} /* Cn */,
- { 0x0C70, 0x0C81} /* Cn */, { 0x0C84, 0x0C84} /* Cn */,
- { 0x0C8D, 0x0C8D} /* Cn */, { 0x0C91, 0x0C91} /* Cn */,
- { 0x0CA9, 0x0CA9} /* Cn */, { 0x0CB4, 0x0CB4} /* Cn */,
- { 0x0CBA, 0x0CBB} /* Cn */, { 0x0CC5, 0x0CC5} /* Cn */,
- { 0x0CC9, 0x0CC9} /* Cn */, { 0x0CCE, 0x0CD4} /* Cn */,
- { 0x0CD7, 0x0CDD} /* Cn */, { 0x0CDF, 0x0CDF} /* Cn */,
- { 0x0CE4, 0x0CE5} /* Cn */, { 0x0CF0, 0x0CF0} /* Cn */,
- { 0x0CF3, 0x0D01} /* Cn */, { 0x0D04, 0x0D04} /* Cn */,
- { 0x0D0D, 0x0D0D} /* Cn */, { 0x0D11, 0x0D11} /* Cn */,
- { 0x0D29, 0x0D29} /* Cn */, { 0x0D3A, 0x0D3D} /* Cn */,
- { 0x0D44, 0x0D45} /* Cn */, { 0x0D49, 0x0D49} /* Cn */,
- { 0x0D4E, 0x0D56} /* Cn */, { 0x0D58, 0x0D5F} /* Cn */,
- { 0x0D62, 0x0D65} /* Cn */, { 0x0D70, 0x0D81} /* Cn */,
- { 0x0D84, 0x0D84} /* Cn */, { 0x0D97, 0x0D99} /* Cn */,
- { 0x0DB2, 0x0DB2} /* Cn */, { 0x0DBC, 0x0DBC} /* Cn */,
- { 0x0DBE, 0x0DBF} /* Cn */, { 0x0DC7, 0x0DC9} /* Cn */,
- { 0x0DCB, 0x0DCE} /* Cn */, { 0x0DD5, 0x0DD5} /* Cn */,
- { 0x0DD7, 0x0DD7} /* Cn */, { 0x0DE0, 0x0DF1} /* Cn */,
- { 0x0DF5, 0x0E00} /* Cn */, { 0x0E3B, 0x0E3E} /* Cn */,
- { 0x0E5C, 0x0E80} /* Cn */, { 0x0E83, 0x0E83} /* Cn */,
- { 0x0E85, 0x0E86} /* Cn */, { 0x0E89, 0x0E89} /* Cn */,
- { 0x0E8B, 0x0E8C} /* Cn */, { 0x0E8E, 0x0E93} /* Cn */,
- { 0x0E98, 0x0E98} /* Cn */, { 0x0EA0, 0x0EA0} /* Cn */,
- { 0x0EA4, 0x0EA4} /* Cn */, { 0x0EA6, 0x0EA6} /* Cn */,
- { 0x0EA8, 0x0EA9} /* Cn */, { 0x0EAC, 0x0EAC} /* Cn */,
- { 0x0EBA, 0x0EBA} /* Cn */, { 0x0EBE, 0x0EBF} /* Cn */,
- { 0x0EC5, 0x0EC5} /* Cn */, { 0x0EC7, 0x0EC7} /* Cn */,
- { 0x0ECE, 0x0ECF} /* Cn */, { 0x0EDA, 0x0EDB} /* Cn */,
- { 0x0EDE, 0x0EFF} /* Cn */, { 0x0F48, 0x0F48} /* Cn */,
- { 0x0F6B, 0x0F70} /* Cn */, { 0x0F8C, 0x0F8F} /* Cn */,
- { 0x0F98, 0x0F98} /* Cn */, { 0x0FBD, 0x0FBD} /* Cn */,
- { 0x0FCD, 0x0FCE} /* Cn */, { 0x0FD2, 0x0FFF} /* Cn */,
- { 0x1022, 0x1022} /* Cn */, { 0x1028, 0x1028} /* Cn */,
- { 0x102B, 0x102B} /* Cn */, { 0x1033, 0x1035} /* Cn */,
- { 0x103A, 0x103F} /* Cn */, { 0x105A, 0x109F} /* Cn */,
- { 0x10C6, 0x10CF} /* Cn */, { 0x10FD, 0x10FF} /* Cn */,
- { 0x115A, 0x115E} /* Cn */, { 0x11A3, 0x11A7} /* Cn */,
- { 0x11FA, 0x11FF} /* Cn */, { 0x1249, 0x1249} /* Cn */,
- { 0x124E, 0x124F} /* Cn */, { 0x1257, 0x1257} /* Cn */,
- { 0x1259, 0x1259} /* Cn */, { 0x125E, 0x125F} /* Cn */,
- { 0x1289, 0x1289} /* Cn */, { 0x128E, 0x128F} /* Cn */,
- { 0x12B1, 0x12B1} /* Cn */, { 0x12B6, 0x12B7} /* Cn */,
- { 0x12BF, 0x12BF} /* Cn */, { 0x12C1, 0x12C1} /* Cn */,
- { 0x12C6, 0x12C7} /* Cn */, { 0x12D7, 0x12D7} /* Cn */,
- { 0x1311, 0x1311} /* Cn */, { 0x1316, 0x1317} /* Cn */,
- { 0x135B, 0x135E} /* Cn */, { 0x137D, 0x137F} /* Cn */,
- { 0x139A, 0x139F} /* Cn */, { 0x13F5, 0x1400} /* Cn */,
- { 0x1677, 0x167F} /* Cn */, { 0x169D, 0x169F} /* Cn */,
- { 0x16F1, 0x16FF} /* Cn */, { 0x170D, 0x170D} /* Cn */,
- { 0x1715, 0x171F} /* Cn */, { 0x1737, 0x173F} /* Cn */,
- { 0x1754, 0x175F} /* Cn */, { 0x176D, 0x176D} /* Cn */,
- { 0x1771, 0x1771} /* Cn */, { 0x1774, 0x177F} /* Cn */,
-#if 0
- { 0x17B4, 0x17B5} /* Cf */,
-#endif
- { 0x17DE, 0x17DF} /* Cn */, { 0x17EA, 0x17EF} /* Cn */,
- { 0x17FA, 0x17FF} /* Cn */, { 0x180F, 0x180F} /* Cn */,
- { 0x181A, 0x181F} /* Cn */, { 0x1878, 0x187F} /* Cn */,
- { 0x18AA, 0x18FF} /* Cn */, { 0x191D, 0x191F} /* Cn */,
- { 0x192C, 0x192F} /* Cn */, { 0x193C, 0x193F} /* Cn */,
- { 0x1941, 0x1943} /* Cn */, { 0x196E, 0x196F} /* Cn */,
- { 0x1975, 0x197F} /* Cn */, { 0x19AA, 0x19AF} /* Cn */,
- { 0x19CA, 0x19CF} /* Cn */, { 0x19DA, 0x19DD} /* Cn */,
- { 0x1A1C, 0x1A1D} /* Cn */, { 0x1A20, 0x1AFF} /* Cn */,
- { 0x1B4C, 0x1B4F} /* Cn */, { 0x1B7D, 0x1CFF} /* Cn */,
- { 0x1DCB, 0x1DFD} /* Cn */, { 0x1E9C, 0x1E9F} /* Cn */,
- { 0x1EFA, 0x1EFF} /* Cn */, { 0x1F16, 0x1F17} /* Cn */,
- { 0x1F1E, 0x1F1F} /* Cn */, { 0x1F46, 0x1F47} /* Cn */,
- { 0x1F4E, 0x1F4F} /* Cn */, { 0x1F58, 0x1F58} /* Cn */,
- { 0x1F5A, 0x1F5A} /* Cn */, { 0x1F5C, 0x1F5C} /* Cn */,
- { 0x1F5E, 0x1F5E} /* Cn */, { 0x1F7E, 0x1F7F} /* Cn */,
- { 0x1FB5, 0x1FB5} /* Cn */, { 0x1FC5, 0x1FC5} /* Cn */,
- { 0x1FD4, 0x1FD5} /* Cn */, { 0x1FDC, 0x1FDC} /* Cn */,
- { 0x1FF0, 0x1FF1} /* Cn */, { 0x1FF5, 0x1FF5} /* Cn */,
- { 0x1FFF, 0x1FFF} /* Cn */,
- { 0x200B, 0x200F} /* Cf */,
- { 0x2028, 0x2028} /* Zl */,
- { 0x2029, 0x2029} /* Zp */,
- { 0x202A, 0x202E} /* Cf */,
- { 0x2060, 0x2063} /* Cf */,
- { 0x2064, 0x2069} /* Cn */,
- { 0x206A, 0x206F} /* Cf */,
- { 0x2072, 0x2073} /* Cn */, { 0x208F, 0x208F} /* Cn */,
- { 0x2095, 0x209F} /* Cn */, { 0x20B6, 0x20CF} /* Cn */,
- { 0x20F0, 0x20FF} /* Cn */, { 0x214F, 0x2152} /* Cn */,
- { 0x2185, 0x218F} /* Cn */, { 0x23E8, 0x23FF} /* Cn */,
- { 0x2427, 0x243F} /* Cn */, { 0x244B, 0x245F} /* Cn */,
- { 0x269D, 0x269F} /* Cn */, { 0x26B3, 0x2700} /* Cn */,
- { 0x2705, 0x2705} /* Cn */, { 0x270A, 0x270B} /* Cn */,
- { 0x2728, 0x2728} /* Cn */, { 0x274C, 0x274C} /* Cn */,
- { 0x274E, 0x274E} /* Cn */, { 0x2753, 0x2755} /* Cn */,
- { 0x2757, 0x2757} /* Cn */, { 0x275F, 0x2760} /* Cn */,
- { 0x2795, 0x2797} /* Cn */, { 0x27B0, 0x27B0} /* Cn */,
- { 0x27BF, 0x27BF} /* Cn */, { 0x27CB, 0x27CF} /* Cn */,
- { 0x27EC, 0x27EF} /* Cn */, { 0x2B1B, 0x2B1F} /* Cn */,
- { 0x2B24, 0x2BFF} /* Cn */, { 0x2C2F, 0x2C2F} /* Cn */,
- { 0x2C5F, 0x2C5F} /* Cn */, { 0x2C6D, 0x2C73} /* Cn */,
- { 0x2C78, 0x2C7F} /* Cn */, { 0x2CEB, 0x2CF8} /* Cn */,
- { 0x2D26, 0x2D2F} /* Cn */, { 0x2D66, 0x2D6E} /* Cn */,
- { 0x2D70, 0x2D7F} /* Cn */, { 0x2D97, 0x2D9F} /* Cn */,
- { 0x2DA7, 0x2DA7} /* Cn */, { 0x2DAF, 0x2DAF} /* Cn */,
- { 0x2DB7, 0x2DB7} /* Cn */, { 0x2DBF, 0x2DBF} /* Cn */,
- { 0x2DC7, 0x2DC7} /* Cn */, { 0x2DCF, 0x2DCF} /* Cn */,
- { 0x2DD7, 0x2DD7} /* Cn */, { 0x2DDF, 0x2DFF} /* Cn */,
- { 0x2E18, 0x2E1B} /* Cn */, { 0x2E1E, 0x2E7F} /* Cn */,
- { 0x2E9A, 0x2E9A} /* Cn */, { 0x2EF4, 0x2EFF} /* Cn */,
- { 0x2FD6, 0x2FEF} /* Cn */, { 0x2FFC, 0x2FFF} /* Cn */,
- { 0x3040, 0x3040} /* Cn */, { 0x3097, 0x3098} /* Cn */,
- { 0x3100, 0x3104} /* Cn */, { 0x312D, 0x3130} /* Cn */,
- { 0x318F, 0x318F} /* Cn */, { 0x31B8, 0x31BF} /* Cn */,
- { 0x31D0, 0x31EF} /* Cn */, { 0x321F, 0x321F} /* Cn */,
- { 0x3244, 0x324F} /* Cn */, { 0x32FF, 0x32FF} /* Cn */,
- { 0x4DB6, 0x4DBF} /* Cn */, { 0x9FBC, 0x9FFF} /* Cn */,
- { 0xA48D, 0xA48F} /* Cn */, { 0xA4C7, 0xA6FF} /* Cn */,
- { 0xA71B, 0xA71F} /* Cn */, { 0xA722, 0xA7FF} /* Cn */,
- { 0xA82C, 0xA83F} /* Cn */, { 0xA878, 0xABFF} /* Cn */,
- { 0xD7A4, 0xD7FF} /* Cn */,
- { 0xD800, 0xDFFF} /* Cs */,
- { 0xE000, 0xF8FF} /* Co */,
- { 0xFA2E, 0xFA2F} /* Cn */, { 0xFA6B, 0xFA6F} /* Cn */,
- { 0xFADA, 0xFAFF} /* Cn */, { 0xFB07, 0xFB12} /* Cn */,
- { 0xFB18, 0xFB1C} /* Cn */, { 0xFB37, 0xFB37} /* Cn */,
- { 0xFB3D, 0xFB3D} /* Cn */, { 0xFB3F, 0xFB3F} /* Cn */,
- { 0xFB42, 0xFB42} /* Cn */, { 0xFB45, 0xFB45} /* Cn */,
- { 0xFBB2, 0xFBD2} /* Cn */, { 0xFD40, 0xFD4F} /* Cn */,
- { 0xFD90, 0xFD91} /* Cn */, { 0xFDC8, 0xFDEF} /* Cn */,
- { 0xFDFE, 0xFDFF} /* Cn */, { 0xFE1A, 0xFE1F} /* Cn */,
- { 0xFE24, 0xFE2F} /* Cn */, { 0xFE53, 0xFE53} /* Cn */,
- { 0xFE67, 0xFE67} /* Cn */, { 0xFE6C, 0xFE6F} /* Cn */,
- { 0xFE75, 0xFE75} /* Cn */, { 0xFEFD, 0xFEFE} /* Cn */,
- { 0xFEFF, 0xFEFF} /* Cf */,
- { 0xFF00, 0xFF00} /* Cn */, { 0xFFBF, 0xFFC1} /* Cn */,
- { 0xFFC8, 0xFFC9} /* Cn */, { 0xFFD0, 0xFFD1} /* Cn */,
- { 0xFFD8, 0xFFD9} /* Cn */, { 0xFFDD, 0xFFDF} /* Cn */,
- { 0xFFE7, 0xFFE7} /* Cn */, { 0xFFEF, 0xFFF8} /* Cn */,
- { 0xFFF9, 0xFFFB} /* Cf */,
- { 0xFFFE, 0xFFFF} /* Cn */, { 0x1000C, 0x1000C} /* Cn */,
- { 0x10027, 0x10027} /* Cn */, { 0x1003B, 0x1003B} /* Cn */,
- { 0x1003E, 0x1003E} /* Cn */, { 0x1004E, 0x1004F} /* Cn */,
- { 0x1005E, 0x1007F} /* Cn */, { 0x100FB, 0x100FF} /* Cn */,
- { 0x10103, 0x10106} /* Cn */, { 0x10134, 0x10136} /* Cn */,
- { 0x1018B, 0x102FF} /* Cn */, { 0x1031F, 0x1031F} /* Cn */,
- { 0x10324, 0x1032F} /* Cn */, { 0x1034B, 0x1037F} /* Cn */,
- { 0x1039E, 0x1039E} /* Cn */, { 0x103C4, 0x103C7} /* Cn */,
- { 0x103D6, 0x103FF} /* Cn */,
- { 0x1049E, 0x1049F} /* Cn */, { 0x104AA, 0x107FF} /* Cn */,
- { 0x10806, 0x10807} /* Cn */, { 0x10809, 0x10809} /* Cn */,
- { 0x10836, 0x10836} /* Cn */, { 0x10839, 0x1083B} /* Cn */,
- { 0x1083D, 0x1083E} /* Cn */, { 0x10840, 0x108FF} /* Cn */,
- { 0x1091A, 0x1091E} /* Cn */, { 0x10920, 0x109FF} /* Cn */,
- { 0x10A04, 0x10A04} /* Cn */, { 0x10A07, 0x10A0B} /* Cn */,
- { 0x10A14, 0x10A14} /* Cn */, { 0x10A18, 0x10A18} /* Cn */,
- { 0x10A34, 0x10A37} /* Cn */, { 0x10A3B, 0x10A3E} /* Cn */,
- { 0x10A48, 0x10A4F} /* Cn */, { 0x10A59, 0x11FFF} /* Cn */,
- { 0x1236F, 0x123FF} /* Cn */, { 0x12463, 0x1246F} /* Cn */,
- { 0x12474, 0x1CFFF} /* Cn */, { 0x1D0F6, 0x1D0FF} /* Cn */,
- { 0x1D127, 0x1D129} /* Cn */,
- { 0x1D173, 0x1D17A} /* Cf */,
- { 0x1D1DE, 0x1D1FF} /* Cn */, { 0x1D246, 0x1D2FF} /* Cn */,
- { 0x1D357, 0x1D35F} /* Cn */, { 0x1D372, 0x1D3FF} /* Cn */,
- { 0x1D455, 0x1D455} /* Cn */, { 0x1D49D, 0x1D49D} /* Cn */,
- { 0x1D4A0, 0x1D4A1} /* Cn */, { 0x1D4A3, 0x1D4A4} /* Cn */,
- { 0x1D4A7, 0x1D4A8} /* Cn */, { 0x1D4AD, 0x1D4AD} /* Cn */,
- { 0x1D4BA, 0x1D4BA} /* Cn */, { 0x1D4BC, 0x1D4BC} /* Cn */,
- { 0x1D4C4, 0x1D4C4} /* Cn */, { 0x1D506, 0x1D506} /* Cn */,
- { 0x1D50B, 0x1D50C} /* Cn */, { 0x1D515, 0x1D515} /* Cn */,
- { 0x1D51D, 0x1D51D} /* Cn */, { 0x1D53A, 0x1D53A} /* Cn */,
- { 0x1D53F, 0x1D53F} /* Cn */, { 0x1D545, 0x1D545} /* Cn */,
- { 0x1D547, 0x1D549} /* Cn */, { 0x1D551, 0x1D551} /* Cn */,
- { 0x1D6A6, 0x1D6A7} /* Cn */, { 0x1D7CC, 0x1D7CD} /* Cn */,
- { 0x1D800, 0x1FFFF} /* Cn */, { 0x2A6D7, 0x2F7FF} /* Cn */,
- { 0x2FA1E, 0xE0000} /* Cn */,
- { 0xE0001, 0xE0001} /* Cf */,
- { 0xE0002, 0xE001F} /* Cn */,
- { 0xE0020, 0xE007F} /* Cf */,
- { 0xE0080, 0xE00FF} /* Cn */, { 0xE01F0, 0xEFFFF} /* Cn */,
- { 0xF0000, 0xFFFFD} /* Co */,
- { 0xFFFFE, 0xFFFFF} /* Cn */,
- {0x100000,0x10FFFD} /* Co */,
- {0x10FFFE,0x10FFFF} /* Cn */,
- {0x110000,0x7FFFFFFF} /* ISO 10646?? */
-};
-/*
- * Double width characters
- * W: East Asian Wide
- * F: East Asian Full-width
- * Unassigned code points may be included when they allow ranges to be merged.
- * Last synched with
- * <http://www.unicode.org/Public/5.0.0/ucd/EastAsianWidth-5.0.0d2.txt>
- * dated 2005-11-08T01:32:56Z
- */
-static struct wchar_range wide_table[] = {
- { 0x1100, 0x115F} /* W */, { 0x2329, 0x232A} /* W */,
- { 0x2E80, 0x2FFB} /* W */,
- { 0x3000, 0x3000} /* F */,
- { 0x3001, 0x303E} /* W */, { 0x3041, 0x4DB5} /* W */,
- { 0x4E00, 0x9FBB} /* W */, { 0xA000, 0xA4C6} /* W */,
- { 0xAC00, 0xD7A3} /* W */, { 0xF900, 0xFAD9} /* W */,
- { 0xFE10, 0xFE19} /* W */, { 0xFE30, 0xFE6B} /* W */,
- { 0xFF01, 0xFF60} /* F */, { 0xFFE0, 0xFFE6} /* F */,
- { 0x20000, 0x2FFFD} /* W */, { 0x30000, 0x3FFFD} /* W */,
-};
-
static int
-is_in_table(ch, table, tsize)
+is_in_table(ch, table)
LWCHAR ch;
- struct wchar_range table[];
- int tsize;
+ struct wchar_range_table *table;
{
int hi;
int lo;
/* Binary search in the table. */
- if (ch < table[0].first)
+ if (ch < table->table[0].first)
return 0;
lo = 0;
- hi = tsize - 1;
+ hi = table->count - 1;
while (lo <= hi)
{
int mid = (lo + hi) / 2;
- if (ch > table[mid].last)
+ if (ch > table->table[mid].last)
lo = mid + 1;
- else if (ch < table[mid].first)
+ else if (ch < table->table[mid].first)
hi = mid - 1;
else
return 1;
@@ -1126,7 +792,8 @@
is_composing_char(ch)
LWCHAR ch;
{
- return is_in_table(ch, comp_table, (sizeof(comp_table) / sizeof(*comp_table)));
+ return is_in_table(ch, &compose_table) ||
+ (bs_mode != BS_CONTROL && is_in_table(ch, &fmt_table));
}
/*
@@ -1136,7 +803,21 @@
is_ubin_char(ch)
LWCHAR ch;
{
- return is_in_table(ch, ubin_table, (sizeof(ubin_table) / sizeof(*ubin_table)));
+ int ubin = is_in_table(ch, &ubin_table) ||
+ (bs_mode == BS_CONTROL && is_in_table(ch, &fmt_table));
+#if MSDOS_COMPILER==WIN32C
+ if (!ubin && utf_mode == 2 && ch < 0x10000)
+ {
+ /*
+ * Consider it binary if it can't be converted.
+ */
+ BOOL used_default = TRUE;
+ WideCharToMultiByte(GetConsoleOutputCP(), WC_NO_BEST_FIT_CHARS, (LPCWSTR) &ch, 1, NULL, 0, NULL, &used_default);
+ if (used_default)
+ ubin = 1;
+ }
+#endif
+ return ubin;
}
/*
@@ -1146,7 +827,7 @@
is_wide_char(ch)
LWCHAR ch;
{
- return is_in_table(ch, wide_table, (sizeof(wide_table) / sizeof(*wide_table)));
+ return is_in_table(ch, &wide_table);
}
/*
Modified: trunk/contrib/less/charset.h
===================================================================
--- trunk/contrib/less/charset.h 2018-07-06 12:43:22 UTC (rev 11361)
+++ trunk/contrib/less/charset.h 2018-07-06 12:46:07 UTC (rev 11362)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 1984-2012 Mark Nudelman
+ * Copyright (C) 1984-2017 Mark Nudelman
*
* You may distribute under the terms of either the GNU General Public
* License or the Less License, as specified in the README file.
Modified: trunk/contrib/less/cmd.h
===================================================================
--- trunk/contrib/less/cmd.h 2018-07-06 12:43:22 UTC (rev 11361)
+++ trunk/contrib/less/cmd.h 2018-07-06 12:46:07 UTC (rev 11362)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 1984-2012 Mark Nudelman
+ * Copyright (C) 1984-2017 Mark Nudelman
*
* You may distribute under the terms of either the GNU General Public
* License or the Less License, as specified in the README file.
@@ -8,126 +8,131 @@
*/
-#define MAX_USERCMD 1000
-#define MAX_CMDLEN 16
+#define MAX_USERCMD 1000
+#define MAX_CMDLEN 16
-#define A_B_LINE 2
-#define A_B_SCREEN 3
-#define A_B_SCROLL 4
-#define A_B_SEARCH 5
-#define A_DIGIT 6
-#define A_DISP_OPTION 7
-#define A_DEBUG 8
-#define A_EXAMINE 9
-#define A_FIRSTCMD 10
-#define A_FREPAINT 11
-#define A_F_LINE 12
-#define A_F_SCREEN 13
-#define A_F_SCROLL 14
-#define A_F_SEARCH 15
-#define A_GOEND 16
-#define A_GOLINE 17
-#define A_GOMARK 18
-#define A_HELP 19
-#define A_NEXT_FILE 20
-#define A_PERCENT 21
-#define A_PREFIX 22
-#define A_PREV_FILE 23
-#define A_QUIT 24
-#define A_REPAINT 25
-#define A_SETMARK 26
-#define A_SHELL 27
-#define A_STAT 28
-#define A_FF_LINE 29
-#define A_BF_LINE 30
-#define A_VERSION 31
-#define A_VISUAL 32
-#define A_F_WINDOW 33
-#define A_B_WINDOW 34
-#define A_F_BRACKET 35
-#define A_B_BRACKET 36
-#define A_PIPE 37
-#define A_INDEX_FILE 38
-#define A_UNDO_SEARCH 39
-#define A_FF_SCREEN 40
-#define A_LSHIFT 41
-#define A_RSHIFT 42
-#define A_AGAIN_SEARCH 43
-#define A_T_AGAIN_SEARCH 44
-#define A_REVERSE_SEARCH 45
-#define A_T_REVERSE_SEARCH 46
-#define A_OPT_TOGGLE 47
-#define A_OPT_SET 48
-#define A_OPT_UNSET 49
-#define A_F_FOREVER 50
-#define A_GOPOS 51
-#define A_REMOVE_FILE 52
-#define A_NEXT_TAG 53
-#define A_PREV_TAG 54
-#define A_FILTER 55
-#define A_F_UNTIL_HILITE 56
+#define A_B_LINE 2
+#define A_B_SCREEN 3
+#define A_B_SCROLL 4
+#define A_B_SEARCH 5
+#define A_DIGIT 6
+#define A_DISP_OPTION 7
+#define A_DEBUG 8
+#define A_EXAMINE 9
+#define A_FIRSTCMD 10
+#define A_FREPAINT 11
+#define A_F_LINE 12
+#define A_F_SCREEN 13
+#define A_F_SCROLL 14
+#define A_F_SEARCH 15
+#define A_GOEND 16
+#define A_GOLINE 17
+#define A_GOMARK 18
+#define A_HELP 19
+#define A_NEXT_FILE 20
+#define A_PERCENT 21
+#define A_PREFIX 22
+#define A_PREV_FILE 23
+#define A_QUIT 24
+#define A_REPAINT 25
+#define A_SETMARK 26
+#define A_SHELL 27
+#define A_STAT 28
+#define A_FF_LINE 29
+#define A_BF_LINE 30
+#define A_VERSION 31
+#define A_VISUAL 32
+#define A_F_WINDOW 33
+#define A_B_WINDOW 34
+#define A_F_BRACKET 35
+#define A_B_BRACKET 36
+#define A_PIPE 37
+#define A_INDEX_FILE 38
+#define A_UNDO_SEARCH 39
+#define A_FF_SCREEN 40
+#define A_LSHIFT 41
+#define A_RSHIFT 42
+#define A_AGAIN_SEARCH 43
+#define A_T_AGAIN_SEARCH 44
+#define A_REVERSE_SEARCH 45
+#define A_T_REVERSE_SEARCH 46
+#define A_OPT_TOGGLE 47
+#define A_OPT_SET 48
+#define A_OPT_UNSET 49
+#define A_F_FOREVER 50
+#define A_GOPOS 51
+#define A_REMOVE_FILE 52
+#define A_NEXT_TAG 53
+#define A_PREV_TAG 54
+#define A_FILTER 55
+#define A_F_UNTIL_HILITE 56
+#define A_GOEND_BUF 57
+#define A_LLSHIFT 58
+#define A_RRSHIFT 59
+#define A_CLRMARK 62
+#define A_SETMARKBOT 63
-#define A_INVALID 100
-#define A_NOACTION 101
-#define A_UINVALID 102
-#define A_END_LIST 103
-#define A_SPECIAL_KEY 104
+#define A_INVALID 100
+#define A_NOACTION 101
+#define A_UINVALID 102
+#define A_END_LIST 103
+#define A_SPECIAL_KEY 104
-#define A_SKIP 127
+#define A_SKIP 127
-#define A_EXTRA 0200
+#define A_EXTRA 0200
/* Line editing characters */
-#define EC_BACKSPACE 1
-#define EC_LINEKILL 2
-#define EC_RIGHT 3
-#define EC_LEFT 4
-#define EC_W_LEFT 5
-#define EC_W_RIGHT 6
-#define EC_INSERT 7
-#define EC_DELETE 8
-#define EC_HOME 9
-#define EC_END 10
-#define EC_W_BACKSPACE 11
-#define EC_W_DELETE 12
-#define EC_UP 13
-#define EC_DOWN 14
-#define EC_EXPAND 15
-#define EC_F_COMPLETE 17
-#define EC_B_COMPLETE 18
-#define EC_LITERAL 19
-#define EC_ABORT 20
+#define EC_BACKSPACE 1
+#define EC_LINEKILL 2
+#define EC_RIGHT 3
+#define EC_LEFT 4
+#define EC_W_LEFT 5
+#define EC_W_RIGHT 6
+#define EC_INSERT 7
+#define EC_DELETE 8
+#define EC_HOME 9
+#define EC_END 10
+#define EC_W_BACKSPACE 11
+#define EC_W_DELETE 12
+#define EC_UP 13
+#define EC_DOWN 14
+#define EC_EXPAND 15
+#define EC_F_COMPLETE 17
+#define EC_B_COMPLETE 18
+#define EC_LITERAL 19
+#define EC_ABORT 20
-#define EC_NOACTION 101
-#define EC_UINVALID 102
+#define EC_NOACTION 101
+#define EC_UINVALID 102
/* Flags for editchar() */
-#define EC_PEEK 01
-#define EC_NOHISTORY 02
-#define EC_NOCOMPLETE 04
-#define EC_NORIGHTLEFT 010
+#define EC_PEEK 01
+#define EC_NOHISTORY 02
+#define EC_NOCOMPLETE 04
+#define EC_NORIGHTLEFT 010
/* Environment variable stuff */
-#define EV_OK 01
+#define EV_OK 01
/* Special keys (keys which output different strings on different terminals) */
-#define SK_SPECIAL_KEY CONTROL('K')
-#define SK_RIGHT_ARROW 1
-#define SK_LEFT_ARROW 2
-#define SK_UP_ARROW 3
-#define SK_DOWN_ARROW 4
-#define SK_PAGE_UP 5
-#define SK_PAGE_DOWN 6
-#define SK_HOME 7
-#define SK_END 8
-#define SK_DELETE 9
-#define SK_INSERT 10
-#define SK_CTL_LEFT_ARROW 11
-#define SK_CTL_RIGHT_ARROW 12
-#define SK_CTL_DELETE 13
-#define SK_F1 14
-#define SK_BACKTAB 15
-#define SK_CTL_BACKSPACE 16
-#define SK_CONTROL_K 40
+#define SK_SPECIAL_KEY CONTROL('K')
+#define SK_RIGHT_ARROW 1
+#define SK_LEFT_ARROW 2
+#define SK_UP_ARROW 3
+#define SK_DOWN_ARROW 4
+#define SK_PAGE_UP 5
+#define SK_PAGE_DOWN 6
+#define SK_HOME 7
+#define SK_END 8
+#define SK_DELETE 9
+#define SK_INSERT 10
+#define SK_CTL_LEFT_ARROW 11
+#define SK_CTL_RIGHT_ARROW 12
+#define SK_CTL_DELETE 13
+#define SK_F1 14
+#define SK_BACKTAB 15
+#define SK_CTL_BACKSPACE 16
+#define SK_CONTROL_K 40
Modified: trunk/contrib/less/cmdbuf.c
===================================================================
--- trunk/contrib/less/cmdbuf.c 2018-07-06 12:43:22 UTC (rev 11361)
+++ trunk/contrib/less/cmdbuf.c 2018-07-06 12:46:07 UTC (rev 11362)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 1984-2012 Mark Nudelman
+ * Copyright (C) 1984-2017 Mark Nudelman
*
* You may distribute under the terms of either the GNU General Public
* License or the Less License, as specified in the README file.
@@ -40,7 +40,7 @@
static char *tk_text;
static char *tk_original;
static char *tk_ipoint;
-static char *tk_trial;
+static char *tk_trial = NULL;
static struct textlist tk_tlist;
#endif
@@ -76,25 +76,25 @@
*/
struct mlist mlist_search =
{ &mlist_search, &mlist_search, &mlist_search, NULL, 0 };
-public void * constant ml_search = (void *) &mlist_search;
+public void *ml_search = (void *) &mlist_search;
struct mlist mlist_examine =
{ &mlist_examine, &mlist_examine, &mlist_examine, NULL, 0 };
-public void * constant ml_examine = (void *) &mlist_examine;
+public void *ml_examine = (void *) &mlist_examine;
#if SHELL_ESCAPE || PIPEC
struct mlist mlist_shell =
{ &mlist_shell, &mlist_shell, &mlist_shell, NULL, 0 };
-public void * constant ml_shell = (void *) &mlist_shell;
+public void *ml_shell = (void *) &mlist_shell;
#endif
#else /* CMD_HISTORY */
/* If CMD_HISTORY is off, these are just flags. */
-public void * constant ml_search = (void *)1;
-public void * constant ml_examine = (void *)2;
+public void *ml_search = (void *)1;
+public void *ml_examine = (void *)2;
#if SHELL_ESCAPE || PIPEC
-public void * constant ml_shell = (void *)3;
+public void *ml_shell = (void *)3;
#endif
#endif /* CMD_HISTORY */
@@ -141,28 +141,26 @@
*/
public void
cmd_putstr(s)
- char *s;
+ constant char *s;
{
LWCHAR prev_ch = 0;
LWCHAR ch;
- char *endline = s + strlen(s);
+ constant char *endline = s + strlen(s);
while (*s != '\0')
{
- char *ns = s;
+ char *ns = (char *) s;
+ int width;
ch = step_char(&ns, +1, endline);
while (s < ns)
putchr(*s++);
if (!utf_mode)
- {
- cmd_col++;
- prompt_col++;
- } else if (!is_composing_char(ch) &&
- !is_combining_char(prev_ch, ch))
- {
- int width = is_wide_char(ch) ? 2 : 1;
- cmd_col += width;
- prompt_col += width;
- }
+ width = 1;
+ else if (is_composing_char(ch) || is_combining_char(prev_ch, ch))
+ width = 0;
+ else
+ width = is_wide_char(ch) ? 2 : 1;
+ cmd_col += width;
+ prompt_col += width;
prev_ch = ch;
}
}
@@ -187,6 +185,8 @@
/*
* Common part of cmd_step_right() and cmd_step_left().
+ * {{ Returning pwidth and bswidth separately is a historical artifact
+ * since they're always the same. Maybe clean this up someday. }}
*/
static char *
cmd_step_common(p, ch, len, pwidth, bswidth)
@@ -197,58 +197,32 @@
int *bswidth;
{
char *pr;
+ int width;
if (len == 1)
{
pr = prchar((int) ch);
- if (pwidth != NULL || bswidth != NULL)
- {
- int len = strlen(pr);
- if (pwidth != NULL)
- *pwidth = len;
- if (bswidth != NULL)
- *bswidth = len;
- }
+ width = (int) strlen(pr);
} else
{
pr = prutfchar(ch);
- if (pwidth != NULL || bswidth != NULL)
+ if (is_composing_char(ch))
+ width = 0;
+ else if (is_ubin_char(ch))
+ width = (int) strlen(pr);
+ else
{
- if (is_composing_char(ch))
- {
- if (pwidth != NULL)
- *pwidth = 0;
- if (bswidth != NULL)
- *bswidth = 0;
- } else if (is_ubin_char(ch))
- {
- int len = strlen(pr);
- if (pwidth != NULL)
- *pwidth = len;
- if (bswidth != NULL)
- *bswidth = len;
- } else
- {
- LWCHAR prev_ch = step_char(&p, -1, cmdbuf);
- if (is_combining_char(prev_ch, ch))
- {
- if (pwidth != NULL)
- *pwidth = 0;
- if (bswidth != NULL)
- *bswidth = 0;
- } else
- {
- if (pwidth != NULL)
- *pwidth = is_wide_char(ch)
- ? 2
- : 1;
- if (bswidth != NULL)
- *bswidth = 1;
- }
- }
+ LWCHAR prev_ch = step_char(&p, -1, cmdbuf);
+ if (is_combining_char(prev_ch, ch))
+ width = 0;
+ else
+ width = is_wide_char(ch) ? 2 : 1;
}
}
-
+ if (pwidth != NULL)
+ *pwidth = width;
+ if (bswidth != NULL)
+ *bswidth = width;
return (pr);
}
@@ -288,7 +262,7 @@
*/
static void
cmd_repaint(old_cp)
- char *old_cp;
+ constant char *old_cp;
{
/*
* Repaint the line from the current position.
@@ -375,7 +349,7 @@
s = ns;
}
- cmd_offset = s - cmdbuf;
+ cmd_offset = (int) (s - cmdbuf);
save_cp = cp;
cmd_home();
cmd_repaint(save_cp);
@@ -405,7 +379,7 @@
cols += width;
}
- cmd_offset = s - cmdbuf;
+ cmd_offset = (int) (s - cmdbuf);
save_cp = cp;
cmd_home();
cmd_repaint(save_cp);
@@ -453,8 +427,9 @@
cmd_left()
{
char *ncp;
- int width, bswidth;
-
+ int width = 0;
+ int bswidth = 0;
+
if (cp <= cmdbuf)
{
/* Already at the beginning of the line */
@@ -519,7 +494,7 @@
static int
cmd_erase()
{
- register char *s;
+ char *s;
int clen;
if (cp == cmdbuf)
@@ -535,7 +510,7 @@
*/
s = cp;
cmd_left();
- clen = s - cp;
+ clen = (int) (s - cp);
/*
* Remove the char from the buffer (shift the buffer left).
@@ -687,7 +662,7 @@
cmd_updown(action)
int action;
{
- char *s;
+ constant char *s;
struct mlist *ml;
if (curr_mlist == NULL)
@@ -701,7 +676,7 @@
if (updown_match < 0)
{
- updown_match = cp - cmdbuf;
+ updown_match = (int) (cp - cmdbuf);
}
/*
@@ -744,12 +719,13 @@
#endif
/*
- * Add a string to a history list.
+ * Add a string to an mlist.
*/
public void
-cmd_addhist(mlist, cmd)
+cmd_addhist(mlist, cmd, modified)
struct mlist *mlist;
- char *cmd;
+ constant char *cmd;
+ int modified;
{
#if CMD_HISTORY
struct mlist *ml;
@@ -773,6 +749,7 @@
*/
ml = (struct mlist *) ecalloc(1, sizeof(struct mlist));
ml->string = save(cmd);
+ ml->modified = modified;
ml->next = mlist;
ml->prev = mlist->prev;
mlist->prev->next = ml;
@@ -799,7 +776,7 @@
*/
if (curr_mlist == NULL)
return;
- cmd_addhist(curr_mlist, cmdbuf);
+ cmd_addhist(curr_mlist, cmdbuf, 1);
curr_mlist->modified = 1;
#endif
}
@@ -964,8 +941,8 @@
char *p;
int delim_quoted = 0;
int meta_quoted = 0;
- char *esc = get_meta_escape();
- int esclen = strlen(esc);
+ constant char *esc = get_meta_escape();
+ int esclen = (int) strlen(esc);
#endif
/*
@@ -1247,6 +1224,13 @@
*cmd_mbc_buf = c;
if (IS_ASCII_OCTET(c))
cmd_mbc_buf_len = 1;
+#if MSDOS_COMPILER || OS2
+ else if (c == (unsigned char) '\340' && IS_ASCII_OCTET(peekcc()))
+ {
+ /* Assume a special key. */
+ cmd_mbc_buf_len = 1;
+ }
+#endif
else if (IS_UTF8_LEAD(c))
{
cmd_mbc_buf_len = utf_len(c);
@@ -1262,7 +1246,7 @@
cmd_mbc_buf[cmd_mbc_buf_index++] = c;
if (cmd_mbc_buf_index < cmd_mbc_buf_len)
return (CC_OK);
- if (!is_utf8_well_formed(cmd_mbc_buf))
+ if (!is_utf8_well_formed(cmd_mbc_buf, cmd_mbc_buf_index))
{
/* complete, but not well formed (non-shortest form), sequence */
cmd_mbc_buf_len = 0;
@@ -1359,6 +1343,18 @@
#if CMD_HISTORY
/*
+ */
+ static int
+mlist_size(ml)
+ struct mlist *ml;
+{
+ int size = 0;
+ for (ml = ml->next; ml->string != NULL; ml = ml->next)
+ ++size;
+ return size;
+}
+
+/*
* Get the name of the history file.
*/
static char *
@@ -1378,6 +1374,10 @@
return (save(name));
}
+ /* See if history file is disabled in the build. */
+ if (strcmp(LESSHISTFILE, "") == 0 || strcmp(LESSHISTFILE, "-") == 0)
+ return (NULL);
+
/* Otherwise, file is in $HOME. */
home = lgetenv("HOME");
if (home == NULL || *home == '\0')
@@ -1388,25 +1388,28 @@
#endif
return (NULL);
}
- len = strlen(home) + strlen(LESSHISTFILE) + 2;
+ len = (int) (strlen(home) + strlen(LESSHISTFILE) + 2);
name = (char *) ecalloc(len, sizeof(char));
SNPRINTF2(name, len, "%s/%s", home, LESSHISTFILE);
return (name);
}
-#endif /* CMD_HISTORY */
/*
- * Initialize history from a .lesshist file.
+ * Read a .lesshst file and call a callback for each line in the file.
*/
- public void
-init_cmdhist()
+ static void
+read_cmdhist2(action, uparam, skip_search, skip_shell)
+ void (*action)(void*,struct mlist*,char*);
+ void *uparam;
+ int skip_search;
+ int skip_shell;
{
-#if CMD_HISTORY
struct mlist *ml = NULL;
char line[CMDBUF_SIZE];
char *filename;
FILE *f;
char *p;
+ int *skip = NULL;
filename = histfile_name();
if (filename == NULL)
@@ -1432,84 +1435,170 @@
}
}
if (strcmp(line, HISTFILE_SEARCH_SECTION) == 0)
+ {
ml = &mlist_search;
- else if (strcmp(line, HISTFILE_SHELL_SECTION) == 0)
+ skip = &skip_search;
+ } else if (strcmp(line, HISTFILE_SHELL_SECTION) == 0)
{
#if SHELL_ESCAPE || PIPEC
ml = &mlist_shell;
+ skip = &skip_shell;
#else
ml = NULL;
+ skip = NULL;
#endif
} else if (*line == '"')
{
if (ml != NULL)
- cmd_addhist(ml, line+1);
+ {
+ if (skip != NULL && *skip > 0)
+ --(*skip);
+ else
+ (*action)(uparam, ml, line+1);
+ }
}
}
fclose(f);
+}
+
+ static void
+read_cmdhist(action, uparam, skip_search, skip_shell)
+ void (*action)(void*,struct mlist*,char*);
+ void *uparam;
+ int skip_search;
+ int skip_shell;
+{
+ read_cmdhist2(action, uparam, skip_search, skip_shell);
+ (*action)(uparam, NULL, NULL); /* signal end of file */
+}
+
+ static void
+addhist_init(void *uparam, struct mlist *ml, char *string)
+{
+ if (ml == NULL || string == NULL)
+ return;
+ cmd_addhist(ml, string, 0);
+}
#endif /* CMD_HISTORY */
+
+/*
+ * Initialize history from a .lesshist file.
+ */
+ public void
+init_cmdhist()
+{
+#if CMD_HISTORY
+ read_cmdhist(&addhist_init, NULL, 0, 0);
+#endif /* CMD_HISTORY */
}
/*
- *
+ * Write the header for a section of the history file.
*/
#if CMD_HISTORY
static void
-save_mlist(ml, f)
+write_mlist_header(ml, f)
struct mlist *ml;
FILE *f;
{
- int histsize = 0;
- int n;
- char *s;
+ if (ml == &mlist_search)
+ fprintf(f, "%s\n", HISTFILE_SEARCH_SECTION);
+#if SHELL_ESCAPE || PIPEC
+ else if (ml == &mlist_shell)
+ fprintf(f, "%s\n", HISTFILE_SHELL_SECTION);
+#endif
+}
- s = lgetenv("LESSHISTSIZE");
- if (s != NULL)
- histsize = atoi(s);
- if (histsize == 0)
- histsize = 100;
-
- ml = ml->prev;
- for (n = 0; n < histsize; n++)
+/*
+ * Write all modified entries in an mlist to the history file.
+ */
+ static void
+write_mlist(ml, f)
+ struct mlist *ml;
+ FILE *f;
+{
+ for (ml = ml->next; ml->string != NULL; ml = ml->next)
{
- if (ml->string == NULL)
- break;
- ml = ml->prev;
+ if (!ml->modified)
+ continue;
+ fprintf(f, "\"%s\n", ml->string);
+ ml->modified = 0;
}
- for (ml = ml->next; ml->string != NULL; ml = ml->next)
- fprintf(f, "\"%s\n", ml->string);
+ ml->modified = 0; /* entire mlist is now unmodified */
}
-#endif /* CMD_HISTORY */
/*
- *
+ * Make a temp name in the same directory as filename.
*/
- public void
-save_cmdhist()
+ static char *
+make_tempname(filename)
+ char *filename;
{
-#if CMD_HISTORY
- char *filename;
- FILE *f;
- int modified = 0;
+ char lastch;
+ char *tempname = ecalloc(1, strlen(filename)+1);
+ strcpy(tempname, filename);
+ lastch = tempname[strlen(tempname)-1];
+ tempname[strlen(tempname)-1] = (lastch == 'Q') ? 'Z' : 'Q';
+ return tempname;
+}
- if (mlist_search.modified)
- modified = 1;
+struct save_ctx
+{
+ struct mlist *mlist;
+ FILE *fout;
+};
+
+/*
+ * Copy entries from the saved history file to a new file.
+ * At the end of each mlist, append any new entries
+ * created during this session.
+ */
+ static void
+copy_hist(void *uparam, struct mlist *ml, char *string)
+{
+ struct save_ctx *ctx = (struct save_ctx *) uparam;
+
+ if (ml != ctx->mlist) {
+ /* We're changing mlists. */
+ if (ctx->mlist)
+ /* Append any new entries to the end of the current mlist. */
+ write_mlist(ctx->mlist, ctx->fout);
+ /* Write the header for the new mlist. */
+ ctx->mlist = ml;
+ write_mlist_header(ctx->mlist, ctx->fout);
+ }
+ if (string != NULL)
+ {
+ /* Copy the entry. */
+ fprintf(ctx->fout, "\"%s\n", string);
+ }
+ if (ml == NULL) /* End of file */
+ {
+ /* Write any sections that were not in the original file. */
+ if (mlist_search.modified)
+ {
+ write_mlist_header(&mlist_search, ctx->fout);
+ write_mlist(&mlist_search, ctx->fout);
+ }
#if SHELL_ESCAPE || PIPEC
- if (mlist_shell.modified)
- modified = 1;
+ if (mlist_shell.modified)
+ {
+ write_mlist_header(&mlist_shell, ctx->fout);
+ write_mlist(&mlist_shell, ctx->fout);
+ }
#endif
- if (!modified)
- return;
- filename = histfile_name();
- if (filename == NULL)
- return;
- f = fopen(filename, "w");
- free(filename);
- if (f == NULL)
- return;
+ }
+}
+#endif /* CMD_HISTORY */
+
+/*
+ * Make a file readable only by its owner.
+ */
+ static void
+make_file_private(f)
+ FILE *f;
+{
#if HAVE_FCHMOD
-{
- /* Make history file readable only by owner. */
int do_chmod = 1;
#if HAVE_STAT
struct stat statbuf;
@@ -1520,19 +1609,74 @@
#endif
if (do_chmod)
fchmod(fileno(f), 0600);
+#endif
}
+
+/*
+ * Does the history file need to be updated?
+ */
+ static int
+histfile_modified()
+{
+ if (mlist_search.modified)
+ return 1;
+#if SHELL_ESCAPE || PIPEC
+ if (mlist_shell.modified)
+ return 1;
#endif
+ return 0;
+}
- fprintf(f, "%s\n", HISTFILE_FIRST_LINE);
+/*
+ * Update the .lesshst file.
+ */
+ public void
+save_cmdhist()
+{
+#if CMD_HISTORY
+ char *histname;
+ char *tempname;
+ int skip_search;
+ int skip_shell;
+ struct save_ctx ctx;
+ char *s;
+ FILE *fout = NULL;
+ int histsize = 0;
- fprintf(f, "%s\n", HISTFILE_SEARCH_SECTION);
- save_mlist(&mlist_search, f);
-
+ if (!histfile_modified())
+ return;
+ histname = histfile_name();
+ if (histname == NULL)
+ return;
+ tempname = make_tempname(histname);
+ fout = fopen(tempname, "w");
+ if (fout != NULL)
+ {
+ make_file_private(fout);
+ s = lgetenv("LESSHISTSIZE");
+ if (s != NULL)
+ histsize = atoi(s);
+ if (histsize <= 0)
+ histsize = 100;
+ skip_search = mlist_size(&mlist_search) - histsize;
#if SHELL_ESCAPE || PIPEC
- fprintf(f, "%s\n", HISTFILE_SHELL_SECTION);
- save_mlist(&mlist_shell, f);
+ skip_shell = mlist_size(&mlist_shell) - histsize;
#endif
-
- fclose(f);
+ fprintf(fout, "%s\n", HISTFILE_FIRST_LINE);
+ ctx.fout = fout;
+ ctx.mlist = NULL;
+ read_cmdhist(copy_hist, &ctx, skip_search, skip_shell);
+ fclose(fout);
+#if MSDOS_COMPILER==WIN32C
+ /*
+ * Windows rename doesn't remove an existing file,
+ * making it useless for atomic operations. Sigh.
+ */
+ remove(histname);
+#endif
+ rename(tempname, histname);
+ }
+ free(tempname);
+ free(histname);
#endif /* CMD_HISTORY */
}
Modified: trunk/contrib/less/command.c
===================================================================
--- trunk/contrib/less/command.c 2018-07-06 12:43:22 UTC (rev 11361)
+++ trunk/contrib/less/command.c 2018-07-06 12:46:07 UTC (rev 11362)
@@ -1,5 +1,6 @@
+/* $FreeBSD: stable/10/contrib/less/command.c 330571 2018-03-07 06:39:00Z delphij $ */
/*
- * Copyright (C) 1984-2012 Mark Nudelman
+ * Copyright (C) 1984-2017 Mark Nudelman
*
* You may distribute under the terms of either the GNU General Public
* License or the Less License, as specified in the README file.
@@ -26,6 +27,7 @@
extern int squished;
extern int sc_width;
extern int sc_height;
+extern char *kent;
extern int swindow;
extern int jump_sline;
extern int quitting;
@@ -34,17 +36,21 @@
extern int ignore_eoi;
extern int secure;
extern int hshift;
+extern int bs_mode;
extern int show_attn;
+extern int less_is_more;
+extern int status_col;
extern POSITION highest_hilite;
+extern POSITION start_attnpos;
+extern POSITION end_attnpos;
extern char *every_first_cmd;
-extern char *curr_altfilename;
extern char version[];
extern struct scrpos initial_scrpos;
extern IFILE curr_ifile;
-extern void constant *ml_search;
-extern void constant *ml_examine;
+extern void *ml_search;
+extern void *ml_examine;
#if SHELL_ESCAPE || PIPEC
-extern void constant *ml_shell;
+extern void *ml_shell;
#endif
#if EDITOR
extern char *editor;
@@ -68,16 +74,17 @@
static int optgetname;
static POSITION bottompos;
static int save_hshift;
+static int save_bs_mode;
#if PIPEC
static char pipec;
#endif
+/* Stack of ungotten chars (via ungetcc) */
struct ungot {
struct ungot *ug_next;
- char ug_char;
+ LWCHAR ug_char;
};
static struct ungot* ungot = NULL;
-static int unget_end = 0;
static void multi_search();
@@ -89,9 +96,7 @@
static void
cmd_exec()
{
-#if HILITE_SEARCH
- clear_attn();
-#endif
+ clear_attn();
clear_bot();
flush();
}
@@ -103,7 +108,7 @@
start_mca(action, prompt, mlist, cmdflags)
int action;
constant char *prompt;
- constant void *mlist;
+ void *mlist;
int cmdflags;
{
mca = action;
@@ -158,6 +163,7 @@
cmd_putstr("/");
else
cmd_putstr("?");
+ forw_prompt = 0;
set_mlist(ml_search, 0);
}
@@ -192,6 +198,7 @@
cmd_putstr("!");
break;
}
+ forw_prompt = 0;
set_mlist(NULL, 0);
}
@@ -201,7 +208,7 @@
static void
exec_mca()
{
- register char *cbuf;
+ char *cbuf;
cmd_exec();
cbuf = get_cmdbuf();
@@ -210,7 +217,7 @@
{
case A_F_SEARCH:
case A_B_SEARCH:
- multi_search(cbuf, (int) number);
+ multi_search(cbuf, (int) number, 0);
break;
#if HILITE_SEARCH
case A_FILTER:
@@ -296,11 +303,21 @@
}
/*
+ * Is a character a carriage return or newline?
+ */
+ static int
+is_newline_char(c)
+ int c;
+{
+ return (c == '\n' || c == '\r');
+}
+
+/*
* Handle the first char of an option (after the initial dash).
*/
static int
mca_opt_first_char(c)
- int c;
+ int c;
{
int flag = (optflag & ~OPT_NO_PROMPT);
if (flag == OPT_NO_TOGGLE)
@@ -420,7 +437,7 @@
if (optgetname)
{
/* We're getting a long option name. */
- if (c != '\n' && c != '\r')
+ if (!is_newline_char(c))
return (mca_opt_nonfirst_char(c));
if (curropt == NULL)
{
@@ -484,13 +501,17 @@
switch (c)
{
+ case '*':
+ if (less_is_more)
+ break;
case CONTROL('E'): /* ignore END of file */
- case '*':
if (mca != A_FILTER)
flag = SRCH_PAST_EOF;
break;
+ case '@':
+ if (less_is_more)
+ break;
case CONTROL('F'): /* FIRST file */
- case '@':
if (mca != A_FILTER)
flag = SRCH_FIRST_FILE;
break;
@@ -584,7 +605,7 @@
/*
* The multichar command is terminated by a newline.
*/
- if (c == '\n' || c == '\r')
+ if (is_newline_char(c))
{
/*
* Execute the command.
@@ -680,9 +701,9 @@
static void
prompt()
{
- register constant char *p;
+ constant char *p;
- if (ungot != NULL)
+ if (ungot != NULL && ungot->ug_char != CHAR_END_COMMAND)
{
/*
* No prompt necessary if commands are from
@@ -764,76 +785,118 @@
}
/*
+ * Return a character to complete a partial command, if possible.
+ */
+ static LWCHAR
+getcc_end_command()
+{
+ switch (mca)
+ {
+ case A_DIGIT:
+ /* We have a number but no command. Treat as #g. */
+ return ('g');
+ case A_F_SEARCH:
+ case A_B_SEARCH:
+ /* We have "/string" but no newline. Add the \n. */
+ return ('\n');
+ default:
+ /* Some other incomplete command. Let user complete it. */
+ return (getchr());
+ }
+}
+
+/*
* Get command character.
* The character normally comes from the keyboard,
* but may come from ungotten characters
* (characters previously given to ungetcc or ungetsc).
*/
- public int
-getcc()
+ static LWCHAR
+getccu(VOID_PARAM)
{
- if (unget_end)
- {
- /*
- * We have just run out of ungotten chars.
- */
- unget_end = 0;
- if (len_cmdbuf() == 0 || !empty_screen())
- return (getchr());
- /*
- * Command is incomplete, so try to complete it.
- */
- switch (mca)
- {
- case A_DIGIT:
- /*
- * We have a number but no command. Treat as #g.
- */
- return ('g');
-
- case A_F_SEARCH:
- case A_B_SEARCH:
- /*
- * We have "/string" but no newline. Add the \n.
- */
- return ('\n');
-
- default:
- /*
- * Some other incomplete command. Let user complete it.
- */
- return (getchr());
- }
- }
-
+ LWCHAR c;
if (ungot == NULL)
{
- /*
- * Normal case: no ungotten chars, so get one from the user.
- */
- return (getchr());
- }
-
- /*
- * Return the next ungotten char.
- */
+ /* Normal case: no ungotten chars.
+ * Get char from the user. */
+ c = getchr();
+ } else
{
+ /* Ungotten chars available:
+ * Take the top of stack (most recent). */
struct ungot *ug = ungot;
- char c = ug->ug_char;
+ c = ug->ug_char;
ungot = ug->ug_next;
free(ug);
- unget_end = (ungot == NULL);
- return (c);
+
+ if (c == CHAR_END_COMMAND)
+ c = getcc_end_command();
}
+ return (c);
}
/*
+ * Get a command character, but if we receive the orig sequence,
+ * convert it to the repl sequence.
+ */
+ static LWCHAR
+getcc_repl(orig, repl, gr_getc, gr_ungetc)
+ char const* orig;
+ char const* repl;
+ LWCHAR (*gr_getc)(VOID_PARAM);
+ void (*gr_ungetc)(LWCHAR);
+{
+ LWCHAR c;
+ LWCHAR keys[16];
+ int ki = 0;
+
+ c = (*gr_getc)();
+ if (orig == NULL || orig[0] == '\0')
+ return c;
+ for (;;)
+ {
+ keys[ki] = c;
+ if (c != orig[ki] || ki >= sizeof(keys)-1)
+ {
+ /* This is not orig we have been receiving.
+ * If we have stashed chars in keys[],
+ * unget them and return the first one. */
+ while (ki > 0)
+ (*gr_ungetc)(keys[ki--]);
+ return keys[0];
+ }
+ if (orig[++ki] == '\0')
+ {
+ /* We've received the full orig sequence.
+ * Return the repl sequence. */
+ ki = strlen(repl)-1;
+ while (ki > 0)
+ (*gr_ungetc)(repl[ki--]);
+ return repl[0];
+ }
+ /* We've received a partial orig sequence (ki chars of it).
+ * Get next char and see if it continues to match orig. */
+ c = (*gr_getc)();
+ }
+}
+
+/*
+ * Get command character.
+ */
+ public int
+getcc()
+{
+ /* Replace kent (keypad Enter) with a newline. */
+ return getcc_repl(kent, "\n", getccu, ungetcc);
+}
+
+/*
* "Unget" a command character.
* The next getcc() will return this character.
*/
public void
ungetcc(c)
- int c;
+ LWCHAR c;
{
struct ungot *ug = (struct ungot *) ecalloc(1, sizeof(struct ungot));
@@ -840,7 +903,6 @@
ug->ug_char = c;
ug->ug_next = ungot;
ungot = ug;
- unget_end = 0;
}
/*
@@ -851,7 +913,7 @@
ungetsc(s)
char *s;
{
- register char *p;
+ char *p;
for (p = s + strlen(s) - 1; p >= s; p--)
ungetcc(*p);
@@ -858,16 +920,28 @@
}
/*
+ * Peek the next command character, without consuming it.
+ */
+ public LWCHAR
+peekcc()
+{
+ LWCHAR c = getcc();
+ ungetcc(c);
+ return c;
+}
+
+/*
* Search for a pattern, possibly in multiple files.
* If SRCH_FIRST_FILE is set, begin searching at the first file.
* If SRCH_PAST_EOF is set, continue the search thru multiple files.
*/
static void
-multi_search(pattern, n)
+multi_search(pattern, n, silent)
char *pattern;
int n;
+ int silent;
{
- register int nomore;
+ int nomore;
IFILE save_ifile;
int changed_file;
@@ -940,7 +1014,7 @@
* Didn't find it.
* Print an error message if we haven't already.
*/
- if (n > 0)
+ if (n > 0 && !silent)
error("Pattern not found", NULL_PARG);
if (changed_file)
@@ -968,7 +1042,7 @@
return (A_NOACTION);
cmd_exec();
- jump_forw();
+ jump_forw_buffered();
curr_len = ch_length();
highest_hilite = until_hilite ? curr_len : NULL_POSITION;
ignore_eoi = 1;
@@ -1002,9 +1076,9 @@
public void
commands()
{
- register int c;
- register int action;
- register char *cbuf;
+ int c;
+ int action;
+ char *cbuf;
int newaction;
int save_search_type;
char *extra;
@@ -1013,7 +1087,6 @@
IFILE old_ifile;
IFILE new_ifile;
char *tagfile;
- int until_hilite = 0;
search_type = SRCH_FORW;
wscroll = (sc_height + 1) / 2;
@@ -1241,6 +1314,8 @@
/*
* Forward forever, ignoring EOF.
*/
+ if (show_attn)
+ set_attnpos(bottompos);
newaction = forw_loop(0);
break;
@@ -1326,6 +1401,17 @@
jump_back(number);
break;
+ case A_GOEND_BUF:
+ /*
+ * Go to line N, default last buffered byte.
+ */
+ cmd_exec();
+ if (number <= 0)
+ jump_forw_buffered();
+ else
+ jump_back(number);
+ break;
+
case A_GOPOS:
/*
* Go to a specified byte position in the file.
@@ -1368,6 +1454,7 @@
* previous file.
*/
hshift = save_hshift;
+ bs_mode = save_bs_mode;
if (edit_prev(1) == 0)
break;
}
@@ -1383,7 +1470,7 @@
if (number <= 0) number = 1; \
mca_search(); \
cmd_exec(); \
- multi_search((char *)NULL, (int) number);
+ multi_search((char *)NULL, (int) number, 0);
case A_F_SEARCH:
@@ -1459,6 +1546,9 @@
break;
case A_UNDO_SEARCH:
+ /*
+ * Clear search string highlighting.
+ */
undo_search();
break;
@@ -1471,26 +1561,25 @@
cmd_exec();
save_hshift = hshift;
hshift = 0;
+ save_bs_mode = bs_mode;
+ bs_mode = BS_SPECIAL;
(void) edit(FAKE_HELPFILE);
break;
case A_EXAMINE:
-#if EXAMINE
/*
* Edit a new file. Get the filename.
*/
- if (secure)
+#if EXAMINE
+ if (!secure)
{
- error("Command not available", NULL_PARG);
- break;
+ start_mca(A_EXAMINE, "Examine: ", ml_examine, 0);
+ c = getcc();
+ goto again;
}
- start_mca(A_EXAMINE, "Examine: ", ml_examine, 0);
- c = getcc();
- goto again;
-#else
+#endif
error("Command not available", NULL_PARG);
break;
-#endif
case A_VISUAL:
/*
@@ -1497,38 +1586,35 @@
* Invoke an editor on the input file.
*/
#if EDITOR
- if (secure)
+ if (!secure)
{
- error("Command not available", NULL_PARG);
+ if (ch_getflags() & CH_HELPFILE)
+ break;
+ if (strcmp(get_filename(curr_ifile), "-") == 0)
+ {
+ error("Cannot edit standard input", NULL_PARG);
+ break;
+ }
+ if (get_altfilename(curr_ifile) != NULL)
+ {
+ error("WARNING: This file was viewed via LESSOPEN",
+ NULL_PARG);
+ }
+ start_mca(A_SHELL, "!", ml_shell, 0);
+ /*
+ * Expand the editor prototype string
+ * and pass it to the system to execute.
+ * (Make sure the screen is displayed so the
+ * expansion of "+%lm" works.)
+ */
+ make_display();
+ cmd_exec();
+ lsystem(pr_expand(editproto, 0), (char*)NULL);
break;
}
- if (ch_getflags() & CH_HELPFILE)
- break;
- if (strcmp(get_filename(curr_ifile), "-") == 0)
- {
- error("Cannot edit standard input", NULL_PARG);
- break;
- }
- if (curr_altfilename != NULL)
- {
- error("WARNING: This file was viewed via LESSOPEN",
- NULL_PARG);
- }
- start_mca(A_SHELL, "!", ml_shell, 0);
- /*
- * Expand the editor prototype string
- * and pass it to the system to execute.
- * (Make sure the screen is displayed so the
- * expansion of "+%lm" works.)
- */
- make_display();
- cmd_exec();
- lsystem(pr_expand(editproto, 0), (char*)NULL);
- break;
-#else
+#endif
error("Command not available", NULL_PARG);
break;
-#endif
case A_NEXT_FILE:
/*
@@ -1574,6 +1660,9 @@
break;
case A_NEXT_TAG:
+ /*
+ * Jump to the next tag in the current tag list.
+ */
#if TAGS
if (number <= 0)
number = 1;
@@ -1583,6 +1672,7 @@
error("No next tag", NULL_PARG);
break;
}
+ cmd_exec();
if (edit(tagfile) == 0)
{
POSITION pos = tagsearch();
@@ -1595,6 +1685,9 @@
break;
case A_PREV_TAG:
+ /*
+ * Jump to the previous tag in the current tag list.
+ */
#if TAGS
if (number <= 0)
number = 1;
@@ -1604,6 +1697,7 @@
error("No previous tag", NULL_PARG);
break;
}
+ cmd_exec();
if (edit(tagfile) == 0)
{
POSITION pos = tagsearch();
@@ -1626,6 +1720,9 @@
break;
case A_REMOVE_FILE:
+ /*
+ * Remove a file from the input file list.
+ */
if (ch_getflags() & CH_HELPFILE)
break;
old_ifile = curr_ifile;
@@ -1644,6 +1741,9 @@
break;
case A_OPT_TOGGLE:
+ /*
+ * Change the setting of an option.
+ */
optflag = OPT_TOGGLE;
optgetname = FALSE;
mca_opt_toggle();
@@ -1652,7 +1752,7 @@
case A_DISP_OPTION:
/*
- * Report a flag setting.
+ * Report the setting of an option.
*/
optflag = OPT_NO_TOGGLE;
optgetname = FALSE;
@@ -1673,41 +1773,50 @@
* Shell escape.
*/
#if SHELL_ESCAPE
- if (secure)
+ if (!secure)
{
- error("Command not available", NULL_PARG);
- break;
+ start_mca(A_SHELL, "!", ml_shell, 0);
+ c = getcc();
+ goto again;
}
- start_mca(A_SHELL, "!", ml_shell, 0);
- c = getcc();
- goto again;
-#else
+#endif
error("Command not available", NULL_PARG);
break;
-#endif
case A_SETMARK:
+ case A_SETMARKBOT:
/*
* Set a mark.
*/
if (ch_getflags() & CH_HELPFILE)
break;
- start_mca(A_SETMARK, "mark: ", (void*)NULL, 0);
+ start_mca(A_SETMARK, "set mark: ", (void*)NULL, 0);
c = getcc();
- if (c == erase_char || c == erase2_char ||
- c == kill_char || c == '\n' || c == '\r')
+ if (is_erase_char(c) || is_newline_char(c))
break;
- setmark(c);
+ setmark(c, action == A_SETMARKBOT ? BOTTOM : TOP);
+ repaint();
break;
+ case A_CLRMARK:
+ /*
+ * Clear a mark.
+ */
+ start_mca(A_CLRMARK, "clear mark: ", (void*)NULL, 0);
+ c = getcc();
+ if (is_erase_char(c) || is_newline_char(c))
+ break;
+ clrmark(c);
+ repaint();
+ break;
+
case A_GOMARK:
/*
- * Go to a mark.
+ * Jump to a marked position.
*/
start_mca(A_GOMARK, "goto mark: ", (void*)NULL, 0);
c = getcc();
- if (c == erase_char || c == erase2_char ||
- c == kill_char || c == '\n' || c == '\r')
+ if (is_erase_char(c) || is_newline_char(c))
break;
cmd_exec();
gomark(c);
@@ -1714,28 +1823,28 @@
break;
case A_PIPE:
+ /*
+ * Write part of the input to a pipe to a shell command.
+ */
#if PIPEC
- if (secure)
+ if (!secure)
{
- error("Command not available", NULL_PARG);
- break;
+ start_mca(A_PIPE, "|mark: ", (void*)NULL, 0);
+ c = getcc();
+ if (is_erase_char(c))
+ break;
+ if (is_newline_char(c))
+ c = '.';
+ if (badmark(c))
+ break;
+ pipec = c;
+ start_mca(A_PIPE, "!", ml_shell, 0);
+ c = getcc();
+ goto again;
}
- start_mca(A_PIPE, "|mark: ", (void*)NULL, 0);
- c = getcc();
- if (c == erase_char || c == erase2_char || c == kill_char)
- break;
- if (c == '\n' || c == '\r')
- c = '.';
- if (badmark(c))
- break;
- pipec = c;
- start_mca(A_PIPE, "!", ml_shell, 0);
- c = getcc();
- goto again;
-#else
+#endif
error("Command not available", NULL_PARG);
break;
-#endif
case A_B_BRACKET:
case A_F_BRACKET:
@@ -1744,6 +1853,9 @@
goto again;
case A_LSHIFT:
+ /*
+ * Shift view left.
+ */
if (number > 0)
shift_count = number;
else
@@ -1756,6 +1868,9 @@
break;
case A_RSHIFT:
+ /*
+ * Shift view right.
+ */
if (number > 0)
shift_count = number;
else
@@ -1765,6 +1880,22 @@
screen_trashed = 1;
break;
+ case A_LLSHIFT:
+ /*
+ * Shift view left to margin.
+ */
+ hshift = 0;
+ screen_trashed = 1;
+ break;
+
+ case A_RRSHIFT:
+ /*
+ * Shift view right to view rightmost char on screen.
+ */
+ hshift = rrshift();
+ screen_trashed = 1;
+ break;
+
case A_PREFIX:
/*
* The command is incomplete (more chars are needed).
Copied: trunk/contrib/less/compose.uni (from rev 11361, vendor/less/dist/compose.uni)
===================================================================
--- trunk/contrib/less/compose.uni (rev 0)
+++ trunk/contrib/less/compose.uni 2018-07-06 12:46:07 UTC (rev 11362)
@@ -0,0 +1,325 @@
+/* Generated by "./mkutable -f2 Mn Me Cf -- unicode/UnicodeData.txt" on Tue Jul 25 09:04:35 PDT 2017 */
+ { 0x00ad, 0x00ad }, /* Cf */
+ { 0x0300, 0x036f }, /* Mn */
+ { 0x0483, 0x0487 }, /* Mn */
+ { 0x0488, 0x0489 }, /* Me */
+ { 0x0591, 0x05bd }, /* Mn */
+ { 0x05bf, 0x05bf }, /* Mn */
+ { 0x05c1, 0x05c2 }, /* Mn */
+ { 0x05c4, 0x05c5 }, /* Mn */
+ { 0x05c7, 0x05c7 }, /* Mn */
+ { 0x0600, 0x0605 }, /* Cf */
+ { 0x0610, 0x061a }, /* Mn */
+ { 0x061c, 0x061c }, /* Cf */
+ { 0x064b, 0x065f }, /* Mn */
+ { 0x0670, 0x0670 }, /* Mn */
+ { 0x06d6, 0x06dc }, /* Mn */
+ { 0x06dd, 0x06dd }, /* Cf */
+ { 0x06df, 0x06e4 }, /* Mn */
+ { 0x06e7, 0x06e8 }, /* Mn */
+ { 0x06ea, 0x06ed }, /* Mn */
+ { 0x070f, 0x070f }, /* Cf */
+ { 0x0711, 0x0711 }, /* Mn */
+ { 0x0730, 0x074a }, /* Mn */
+ { 0x07a6, 0x07b0 }, /* Mn */
+ { 0x07eb, 0x07f3 }, /* Mn */
+ { 0x0816, 0x0819 }, /* Mn */
+ { 0x081b, 0x0823 }, /* Mn */
+ { 0x0825, 0x0827 }, /* Mn */
+ { 0x0829, 0x082d }, /* Mn */
+ { 0x0859, 0x085b }, /* Mn */
+ { 0x08d4, 0x08e1 }, /* Mn */
+ { 0x08e2, 0x08e2 }, /* Cf */
+ { 0x08e3, 0x0902 }, /* Mn */
+ { 0x093a, 0x093a }, /* Mn */
+ { 0x093c, 0x093c }, /* Mn */
+ { 0x0941, 0x0948 }, /* Mn */
+ { 0x094d, 0x094d }, /* Mn */
+ { 0x0951, 0x0957 }, /* Mn */
+ { 0x0962, 0x0963 }, /* Mn */
+ { 0x0981, 0x0981 }, /* Mn */
+ { 0x09bc, 0x09bc }, /* Mn */
+ { 0x09c1, 0x09c4 }, /* Mn */
+ { 0x09cd, 0x09cd }, /* Mn */
+ { 0x09e2, 0x09e3 }, /* Mn */
+ { 0x0a01, 0x0a02 }, /* Mn */
+ { 0x0a3c, 0x0a3c }, /* Mn */
+ { 0x0a41, 0x0a42 }, /* Mn */
+ { 0x0a47, 0x0a48 }, /* Mn */
+ { 0x0a4b, 0x0a4d }, /* Mn */
+ { 0x0a51, 0x0a51 }, /* Mn */
+ { 0x0a70, 0x0a71 }, /* Mn */
+ { 0x0a75, 0x0a75 }, /* Mn */
+ { 0x0a81, 0x0a82 }, /* Mn */
+ { 0x0abc, 0x0abc }, /* Mn */
+ { 0x0ac1, 0x0ac5 }, /* Mn */
+ { 0x0ac7, 0x0ac8 }, /* Mn */
+ { 0x0acd, 0x0acd }, /* Mn */
+ { 0x0ae2, 0x0ae3 }, /* Mn */
+ { 0x0afa, 0x0aff }, /* Mn */
+ { 0x0b01, 0x0b01 }, /* Mn */
+ { 0x0b3c, 0x0b3c }, /* Mn */
+ { 0x0b3f, 0x0b3f }, /* Mn */
+ { 0x0b41, 0x0b44 }, /* Mn */
+ { 0x0b4d, 0x0b4d }, /* Mn */
+ { 0x0b56, 0x0b56 }, /* Mn */
+ { 0x0b62, 0x0b63 }, /* Mn */
+ { 0x0b82, 0x0b82 }, /* Mn */
+ { 0x0bc0, 0x0bc0 }, /* Mn */
+ { 0x0bcd, 0x0bcd }, /* Mn */
+ { 0x0c00, 0x0c00 }, /* Mn */
+ { 0x0c3e, 0x0c40 }, /* Mn */
+ { 0x0c46, 0x0c48 }, /* Mn */
+ { 0x0c4a, 0x0c4d }, /* Mn */
+ { 0x0c55, 0x0c56 }, /* Mn */
+ { 0x0c62, 0x0c63 }, /* Mn */
+ { 0x0c81, 0x0c81 }, /* Mn */
+ { 0x0cbc, 0x0cbc }, /* Mn */
+ { 0x0cbf, 0x0cbf }, /* Mn */
+ { 0x0cc6, 0x0cc6 }, /* Mn */
+ { 0x0ccc, 0x0ccd }, /* Mn */
+ { 0x0ce2, 0x0ce3 }, /* Mn */
+ { 0x0d00, 0x0d01 }, /* Mn */
+ { 0x0d3b, 0x0d3c }, /* Mn */
+ { 0x0d41, 0x0d44 }, /* Mn */
+ { 0x0d4d, 0x0d4d }, /* Mn */
+ { 0x0d62, 0x0d63 }, /* Mn */
+ { 0x0dca, 0x0dca }, /* Mn */
+ { 0x0dd2, 0x0dd4 }, /* Mn */
+ { 0x0dd6, 0x0dd6 }, /* Mn */
+ { 0x0e31, 0x0e31 }, /* Mn */
+ { 0x0e34, 0x0e3a }, /* Mn */
+ { 0x0e47, 0x0e4e }, /* Mn */
+ { 0x0eb1, 0x0eb1 }, /* Mn */
+ { 0x0eb4, 0x0eb9 }, /* Mn */
+ { 0x0ebb, 0x0ebc }, /* Mn */
+ { 0x0ec8, 0x0ecd }, /* Mn */
+ { 0x0f18, 0x0f19 }, /* Mn */
+ { 0x0f35, 0x0f35 }, /* Mn */
+ { 0x0f37, 0x0f37 }, /* Mn */
+ { 0x0f39, 0x0f39 }, /* Mn */
+ { 0x0f71, 0x0f7e }, /* Mn */
+ { 0x0f80, 0x0f84 }, /* Mn */
+ { 0x0f86, 0x0f87 }, /* Mn */
+ { 0x0f8d, 0x0f97 }, /* Mn */
+ { 0x0f99, 0x0fbc }, /* Mn */
+ { 0x0fc6, 0x0fc6 }, /* Mn */
+ { 0x102d, 0x1030 }, /* Mn */
+ { 0x1032, 0x1037 }, /* Mn */
+ { 0x1039, 0x103a }, /* Mn */
+ { 0x103d, 0x103e }, /* Mn */
+ { 0x1058, 0x1059 }, /* Mn */
+ { 0x105e, 0x1060 }, /* Mn */
+ { 0x1071, 0x1074 }, /* Mn */
+ { 0x1082, 0x1082 }, /* Mn */
+ { 0x1085, 0x1086 }, /* Mn */
+ { 0x108d, 0x108d }, /* Mn */
+ { 0x109d, 0x109d }, /* Mn */
+ { 0x135d, 0x135f }, /* Mn */
+ { 0x1712, 0x1714 }, /* Mn */
+ { 0x1732, 0x1734 }, /* Mn */
+ { 0x1752, 0x1753 }, /* Mn */
+ { 0x1772, 0x1773 }, /* Mn */
+ { 0x17b4, 0x17b5 }, /* Mn */
+ { 0x17b7, 0x17bd }, /* Mn */
+ { 0x17c6, 0x17c6 }, /* Mn */
+ { 0x17c9, 0x17d3 }, /* Mn */
+ { 0x17dd, 0x17dd }, /* Mn */
+ { 0x180b, 0x180d }, /* Mn */
+ { 0x180e, 0x180e }, /* Cf */
+ { 0x1885, 0x1886 }, /* Mn */
+ { 0x18a9, 0x18a9 }, /* Mn */
+ { 0x1920, 0x1922 }, /* Mn */
+ { 0x1927, 0x1928 }, /* Mn */
+ { 0x1932, 0x1932 }, /* Mn */
+ { 0x1939, 0x193b }, /* Mn */
+ { 0x1a17, 0x1a18 }, /* Mn */
+ { 0x1a1b, 0x1a1b }, /* Mn */
+ { 0x1a56, 0x1a56 }, /* Mn */
+ { 0x1a58, 0x1a5e }, /* Mn */
+ { 0x1a60, 0x1a60 }, /* Mn */
+ { 0x1a62, 0x1a62 }, /* Mn */
+ { 0x1a65, 0x1a6c }, /* Mn */
+ { 0x1a73, 0x1a7c }, /* Mn */
+ { 0x1a7f, 0x1a7f }, /* Mn */
+ { 0x1ab0, 0x1abd }, /* Mn */
+ { 0x1abe, 0x1abe }, /* Me */
+ { 0x1b00, 0x1b03 }, /* Mn */
+ { 0x1b34, 0x1b34 }, /* Mn */
+ { 0x1b36, 0x1b3a }, /* Mn */
+ { 0x1b3c, 0x1b3c }, /* Mn */
+ { 0x1b42, 0x1b42 }, /* Mn */
+ { 0x1b6b, 0x1b73 }, /* Mn */
+ { 0x1b80, 0x1b81 }, /* Mn */
+ { 0x1ba2, 0x1ba5 }, /* Mn */
+ { 0x1ba8, 0x1ba9 }, /* Mn */
+ { 0x1bab, 0x1bad }, /* Mn */
+ { 0x1be6, 0x1be6 }, /* Mn */
+ { 0x1be8, 0x1be9 }, /* Mn */
+ { 0x1bed, 0x1bed }, /* Mn */
+ { 0x1bef, 0x1bf1 }, /* Mn */
+ { 0x1c2c, 0x1c33 }, /* Mn */
+ { 0x1c36, 0x1c37 }, /* Mn */
+ { 0x1cd0, 0x1cd2 }, /* Mn */
+ { 0x1cd4, 0x1ce0 }, /* Mn */
+ { 0x1ce2, 0x1ce8 }, /* Mn */
+ { 0x1ced, 0x1ced }, /* Mn */
+ { 0x1cf4, 0x1cf4 }, /* Mn */
+ { 0x1cf8, 0x1cf9 }, /* Mn */
+ { 0x1dc0, 0x1df9 }, /* Mn */
+ { 0x1dfb, 0x1dff }, /* Mn */
+ { 0x200b, 0x200f }, /* Cf */
+ { 0x202a, 0x202e }, /* Cf */
+ { 0x2060, 0x2064 }, /* Cf */
+ { 0x2066, 0x206f }, /* Cf */
+ { 0x20d0, 0x20dc }, /* Mn */
+ { 0x20dd, 0x20e0 }, /* Me */
+ { 0x20e1, 0x20e1 }, /* Mn */
+ { 0x20e2, 0x20e4 }, /* Me */
+ { 0x20e5, 0x20f0 }, /* Mn */
+ { 0x2cef, 0x2cf1 }, /* Mn */
+ { 0x2d7f, 0x2d7f }, /* Mn */
+ { 0x2de0, 0x2dff }, /* Mn */
+ { 0x302a, 0x302d }, /* Mn */
+ { 0x3099, 0x309a }, /* Mn */
+ { 0xa66f, 0xa66f }, /* Mn */
+ { 0xa670, 0xa672 }, /* Me */
+ { 0xa674, 0xa67d }, /* Mn */
+ { 0xa69e, 0xa69f }, /* Mn */
+ { 0xa6f0, 0xa6f1 }, /* Mn */
+ { 0xa802, 0xa802 }, /* Mn */
+ { 0xa806, 0xa806 }, /* Mn */
+ { 0xa80b, 0xa80b }, /* Mn */
+ { 0xa825, 0xa826 }, /* Mn */
+ { 0xa8c4, 0xa8c5 }, /* Mn */
+ { 0xa8e0, 0xa8f1 }, /* Mn */
+ { 0xa926, 0xa92d }, /* Mn */
+ { 0xa947, 0xa951 }, /* Mn */
+ { 0xa980, 0xa982 }, /* Mn */
+ { 0xa9b3, 0xa9b3 }, /* Mn */
+ { 0xa9b6, 0xa9b9 }, /* Mn */
+ { 0xa9bc, 0xa9bc }, /* Mn */
+ { 0xa9e5, 0xa9e5 }, /* Mn */
+ { 0xaa29, 0xaa2e }, /* Mn */
+ { 0xaa31, 0xaa32 }, /* Mn */
+ { 0xaa35, 0xaa36 }, /* Mn */
+ { 0xaa43, 0xaa43 }, /* Mn */
+ { 0xaa4c, 0xaa4c }, /* Mn */
+ { 0xaa7c, 0xaa7c }, /* Mn */
+ { 0xaab0, 0xaab0 }, /* Mn */
+ { 0xaab2, 0xaab4 }, /* Mn */
+ { 0xaab7, 0xaab8 }, /* Mn */
+ { 0xaabe, 0xaabf }, /* Mn */
+ { 0xaac1, 0xaac1 }, /* Mn */
+ { 0xaaec, 0xaaed }, /* Mn */
+ { 0xaaf6, 0xaaf6 }, /* Mn */
+ { 0xabe5, 0xabe5 }, /* Mn */
+ { 0xabe8, 0xabe8 }, /* Mn */
+ { 0xabed, 0xabed }, /* Mn */
+ { 0xfb1e, 0xfb1e }, /* Mn */
+ { 0xfe00, 0xfe0f }, /* Mn */
+ { 0xfe20, 0xfe2f }, /* Mn */
+ { 0xfeff, 0xfeff }, /* Cf */
+ { 0xfff9, 0xfffb }, /* Cf */
+ { 0x101fd, 0x101fd }, /* Mn */
+ { 0x102e0, 0x102e0 }, /* Mn */
+ { 0x10376, 0x1037a }, /* Mn */
+ { 0x10a01, 0x10a03 }, /* Mn */
+ { 0x10a05, 0x10a06 }, /* Mn */
+ { 0x10a0c, 0x10a0f }, /* Mn */
+ { 0x10a38, 0x10a3a }, /* Mn */
+ { 0x10a3f, 0x10a3f }, /* Mn */
+ { 0x10ae5, 0x10ae6 }, /* Mn */
+ { 0x11001, 0x11001 }, /* Mn */
+ { 0x11038, 0x11046 }, /* Mn */
+ { 0x1107f, 0x11081 }, /* Mn */
+ { 0x110b3, 0x110b6 }, /* Mn */
+ { 0x110b9, 0x110ba }, /* Mn */
+ { 0x110bd, 0x110bd }, /* Cf */
+ { 0x11100, 0x11102 }, /* Mn */
+ { 0x11127, 0x1112b }, /* Mn */
+ { 0x1112d, 0x11134 }, /* Mn */
+ { 0x11173, 0x11173 }, /* Mn */
+ { 0x11180, 0x11181 }, /* Mn */
+ { 0x111b6, 0x111be }, /* Mn */
+ { 0x111ca, 0x111cc }, /* Mn */
+ { 0x1122f, 0x11231 }, /* Mn */
+ { 0x11234, 0x11234 }, /* Mn */
+ { 0x11236, 0x11237 }, /* Mn */
+ { 0x1123e, 0x1123e }, /* Mn */
+ { 0x112df, 0x112df }, /* Mn */
+ { 0x112e3, 0x112ea }, /* Mn */
+ { 0x11300, 0x11301 }, /* Mn */
+ { 0x1133c, 0x1133c }, /* Mn */
+ { 0x11340, 0x11340 }, /* Mn */
+ { 0x11366, 0x1136c }, /* Mn */
+ { 0x11370, 0x11374 }, /* Mn */
+ { 0x11438, 0x1143f }, /* Mn */
+ { 0x11442, 0x11444 }, /* Mn */
+ { 0x11446, 0x11446 }, /* Mn */
+ { 0x114b3, 0x114b8 }, /* Mn */
+ { 0x114ba, 0x114ba }, /* Mn */
+ { 0x114bf, 0x114c0 }, /* Mn */
+ { 0x114c2, 0x114c3 }, /* Mn */
+ { 0x115b2, 0x115b5 }, /* Mn */
+ { 0x115bc, 0x115bd }, /* Mn */
+ { 0x115bf, 0x115c0 }, /* Mn */
+ { 0x115dc, 0x115dd }, /* Mn */
+ { 0x11633, 0x1163a }, /* Mn */
+ { 0x1163d, 0x1163d }, /* Mn */
+ { 0x1163f, 0x11640 }, /* Mn */
+ { 0x116ab, 0x116ab }, /* Mn */
+ { 0x116ad, 0x116ad }, /* Mn */
+ { 0x116b0, 0x116b5 }, /* Mn */
+ { 0x116b7, 0x116b7 }, /* Mn */
+ { 0x1171d, 0x1171f }, /* Mn */
+ { 0x11722, 0x11725 }, /* Mn */
+ { 0x11727, 0x1172b }, /* Mn */
+ { 0x11a01, 0x11a06 }, /* Mn */
+ { 0x11a09, 0x11a0a }, /* Mn */
+ { 0x11a33, 0x11a38 }, /* Mn */
+ { 0x11a3b, 0x11a3e }, /* Mn */
+ { 0x11a47, 0x11a47 }, /* Mn */
+ { 0x11a51, 0x11a56 }, /* Mn */
+ { 0x11a59, 0x11a5b }, /* Mn */
+ { 0x11a8a, 0x11a96 }, /* Mn */
+ { 0x11a98, 0x11a99 }, /* Mn */
+ { 0x11c30, 0x11c36 }, /* Mn */
+ { 0x11c38, 0x11c3d }, /* Mn */
+ { 0x11c3f, 0x11c3f }, /* Mn */
+ { 0x11c92, 0x11ca7 }, /* Mn */
+ { 0x11caa, 0x11cb0 }, /* Mn */
+ { 0x11cb2, 0x11cb3 }, /* Mn */
+ { 0x11cb5, 0x11cb6 }, /* Mn */
+ { 0x11d31, 0x11d36 }, /* Mn */
+ { 0x11d3a, 0x11d3a }, /* Mn */
+ { 0x11d3c, 0x11d3d }, /* Mn */
+ { 0x11d3f, 0x11d45 }, /* Mn */
+ { 0x11d47, 0x11d47 }, /* Mn */
+ { 0x16af0, 0x16af4 }, /* Mn */
+ { 0x16b30, 0x16b36 }, /* Mn */
+ { 0x16f8f, 0x16f92 }, /* Mn */
+ { 0x1bc9d, 0x1bc9e }, /* Mn */
+ { 0x1bca0, 0x1bca3 }, /* Cf */
+ { 0x1d167, 0x1d169 }, /* Mn */
+ { 0x1d173, 0x1d17a }, /* Cf */
+ { 0x1d17b, 0x1d182 }, /* Mn */
+ { 0x1d185, 0x1d18b }, /* Mn */
+ { 0x1d1aa, 0x1d1ad }, /* Mn */
+ { 0x1d242, 0x1d244 }, /* Mn */
+ { 0x1da00, 0x1da36 }, /* Mn */
+ { 0x1da3b, 0x1da6c }, /* Mn */
+ { 0x1da75, 0x1da75 }, /* Mn */
+ { 0x1da84, 0x1da84 }, /* Mn */
+ { 0x1da9b, 0x1da9f }, /* Mn */
+ { 0x1daa1, 0x1daaf }, /* Mn */
+ { 0x1e000, 0x1e006 }, /* Mn */
+ { 0x1e008, 0x1e018 }, /* Mn */
+ { 0x1e01b, 0x1e021 }, /* Mn */
+ { 0x1e023, 0x1e024 }, /* Mn */
+ { 0x1e026, 0x1e02a }, /* Mn */
+ { 0x1e8d0, 0x1e8d6 }, /* Mn */
+ { 0x1e944, 0x1e94a }, /* Mn */
+ { 0xe0001, 0xe0001 }, /* Cf */
+ { 0xe0020, 0xe007f }, /* Cf */
+ { 0xe0100, 0xe01ef }, /* Mn */
Deleted: trunk/contrib/less/configure
===================================================================
--- trunk/contrib/less/configure 2018-07-06 12:43:22 UTC (rev 11361)
+++ trunk/contrib/less/configure 2018-07-06 12:46:07 UTC (rev 11362)
@@ -1,6747 +0,0 @@
-#! /bin/sh
-# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for less 1.
-#
-#
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
-#
-#
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-## -------------------- ##
-## M4sh Initialization. ##
-## -------------------- ##
-
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
- emulate sh
- NULLCMD=:
- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
- # is contrary to our usage. Disable this feature.
- alias -g '${1+"$@"}'='"$@"'
- setopt NO_GLOB_SUBST
-else
- case `(set -o) 2>/dev/null` in #(
- *posix*) :
- set -o posix ;; #(
- *) :
- ;;
-esac
-fi
-
-
-as_nl='
-'
-export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
- && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
- as_echo='print -r --'
- as_echo_n='print -rn --'
-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
- as_echo='printf %s\n'
- as_echo_n='printf %s'
-else
- if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
- as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
- as_echo_n='/usr/ucb/echo -n'
- else
- as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
- as_echo_n_body='eval
- arg=$1;
- case $arg in #(
- *"$as_nl"*)
- expr "X$arg" : "X\\(.*\\)$as_nl";
- arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
- esac;
- expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
- '
- export as_echo_n_body
- as_echo_n='sh -c $as_echo_n_body as_echo'
- fi
- export as_echo_body
- as_echo='sh -c $as_echo_body as_echo'
-fi
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
- PATH_SEPARATOR=:
- (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
- (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
- PATH_SEPARATOR=';'
- }
-fi
-
-
-# IFS
-# We need space, tab and new line, in precisely that order. Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-IFS=" "" $as_nl"
-
-# Find who we are. Look in the path if we contain no directory separator.
-as_myself=
-case $0 in #((
- *[\\/]* ) as_myself=$0 ;;
- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
- done
-IFS=$as_save_IFS
-
- ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
- as_myself=$0
-fi
-if test ! -f "$as_myself"; then
- $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
- exit 1
-fi
-
-# Unset variables that we do not need and which cause bugs (e.g. in
-# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1"
-# suppresses any "Segmentation fault" message there. '((' could
-# trigger a bug in pdksh 5.2.14.
-for as_var in BASH_ENV ENV MAIL MAILPATH
-do eval test x\${$as_var+set} = xset \
- && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-if test "x$CONFIG_SHELL" = x; then
- as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
- emulate sh
- NULLCMD=:
- # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
- # is contrary to our usage. Disable this feature.
- alias -g '\${1+\"\$@\"}'='\"\$@\"'
- setopt NO_GLOB_SUBST
-else
- case \`(set -o) 2>/dev/null\` in #(
- *posix*) :
- set -o posix ;; #(
- *) :
- ;;
-esac
-fi
-"
- as_required="as_fn_return () { (exit \$1); }
-as_fn_success () { as_fn_return 0; }
-as_fn_failure () { as_fn_return 1; }
-as_fn_ret_success () { return 0; }
-as_fn_ret_failure () { return 1; }
-
-exitcode=0
-as_fn_success || { exitcode=1; echo as_fn_success failed.; }
-as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
-as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
-as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
-if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
-
-else
- exitcode=1; echo positional parameters were not saved.
-fi
-test x\$exitcode = x0 || exit 1"
- as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
- as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
- eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
- test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
-test \$(( 1 + 1 )) = 2 || exit 1"
- if (eval "$as_required") 2>/dev/null; then :
- as_have_required=yes
-else
- as_have_required=no
-fi
- if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
-
-else
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_found=false
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- as_found=:
- case $as_dir in #(
- /*)
- for as_base in sh bash ksh sh5; do
- # Try only shells that exist, to save several forks.
- as_shell=$as_dir/$as_base
- if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
- { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
- CONFIG_SHELL=$as_shell as_have_required=yes
- if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
- break 2
-fi
-fi
- done;;
- esac
- as_found=false
-done
-$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
- { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
- CONFIG_SHELL=$SHELL as_have_required=yes
-fi; }
-IFS=$as_save_IFS
-
-
- if test "x$CONFIG_SHELL" != x; then :
- # We cannot yet assume a decent shell, so we have to provide a
- # neutralization value for shells without unset; and this also
- # works around shells that cannot unset nonexistent variables.
- # Preserve -v and -x to the replacement shell.
- BASH_ENV=/dev/null
- ENV=/dev/null
- (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
- export CONFIG_SHELL
- case $- in # ((((
- *v*x* | *x*v* ) as_opts=-vx ;;
- *v* ) as_opts=-v ;;
- *x* ) as_opts=-x ;;
- * ) as_opts= ;;
- esac
- exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
-fi
-
- if test x$as_have_required = xno; then :
- $as_echo "$0: This script requires a shell more modern than all"
- $as_echo "$0: the shells that I found on your system."
- if test x${ZSH_VERSION+set} = xset ; then
- $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
- $as_echo "$0: be upgraded to zsh 4.3.4 or later."
- else
- $as_echo "$0: Please tell bug-autoconf at gnu.org about your system,
-$0: including any error possibly output before this
-$0: message. Then install a modern shell, or manually run
-$0: the script under such a shell if you do have one."
- fi
- exit 1
-fi
-fi
-fi
-SHELL=${CONFIG_SHELL-/bin/sh}
-export SHELL
-# Unset more variables known to interfere with behavior of common tools.
-CLICOLOR_FORCE= GREP_OPTIONS=
-unset CLICOLOR_FORCE GREP_OPTIONS
-
-## --------------------- ##
-## M4sh Shell Functions. ##
-## --------------------- ##
-# as_fn_unset VAR
-# ---------------
-# Portably unset VAR.
-as_fn_unset ()
-{
- { eval $1=; unset $1;}
-}
-as_unset=as_fn_unset
-
-# as_fn_set_status STATUS
-# -----------------------
-# Set $? to STATUS, without forking.
-as_fn_set_status ()
-{
- return $1
-} # as_fn_set_status
-
-# as_fn_exit STATUS
-# -----------------
-# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
-as_fn_exit ()
-{
- set +e
- as_fn_set_status $1
- exit $1
-} # as_fn_exit
-
-# as_fn_mkdir_p
-# -------------
-# Create "$as_dir" as a directory, including parents if necessary.
-as_fn_mkdir_p ()
-{
-
- case $as_dir in #(
- -*) as_dir=./$as_dir;;
- esac
- test -d "$as_dir" || eval $as_mkdir_p || {
- as_dirs=
- while :; do
- case $as_dir in #(
- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
- *) as_qdir=$as_dir;;
- esac
- as_dirs="'$as_qdir' $as_dirs"
- as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$as_dir" : 'X\(//\)[^/]' \| \
- X"$as_dir" : 'X\(//\)$' \| \
- X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
- s//\1/
- q
- }
- /^X\(\/\/\)[^/].*/{
- s//\1/
- q
- }
- /^X\(\/\/\)$/{
- s//\1/
- q
- }
- /^X\(\/\).*/{
- s//\1/
- q
- }
- s/.*/./; q'`
- test -d "$as_dir" && break
- done
- test -z "$as_dirs" || eval "mkdir $as_dirs"
- } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
-
-
-} # as_fn_mkdir_p
-# as_fn_append VAR VALUE
-# ----------------------
-# Append the text in VALUE to the end of the definition contained in VAR. Take
-# advantage of any shell optimizations that allow amortized linear growth over
-# repeated appends, instead of the typical quadratic growth present in naive
-# implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
- eval 'as_fn_append ()
- {
- eval $1+=\$2
- }'
-else
- as_fn_append ()
- {
- eval $1=\$$1\$2
- }
-fi # as_fn_append
-
-# as_fn_arith ARG...
-# ------------------
-# Perform arithmetic evaluation on the ARGs, and store the result in the
-# global $as_val. Take advantage of shells that can avoid forks. The arguments
-# must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
- eval 'as_fn_arith ()
- {
- as_val=$(( $* ))
- }'
-else
- as_fn_arith ()
- {
- as_val=`expr "$@" || test $? -eq 1`
- }
-fi # as_fn_arith
-
-
-# as_fn_error STATUS ERROR [LINENO LOG_FD]
-# ----------------------------------------
-# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
-# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with STATUS, using 1 if that was 0.
-as_fn_error ()
-{
- as_status=$1; test $as_status -eq 0 && as_status=1
- if test "$4"; then
- as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
- fi
- $as_echo "$as_me: error: $2" >&2
- as_fn_exit $as_status
-} # as_fn_error
-
-if expr a : '\(a\)' >/dev/null 2>&1 &&
- test "X`expr 00001 : '.*\(...\)'`" = X001; then
- as_expr=expr
-else
- as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
- as_basename=basename
-else
- as_basename=false
-fi
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
- as_dirname=dirname
-else
- as_dirname=false
-fi
-
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
- X"$0" : 'X\(//\)$' \| \
- X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
- sed '/^.*\/\([^/][^/]*\)\/*$/{
- s//\1/
- q
- }
- /^X\/\(\/\/\)$/{
- s//\1/
- q
- }
- /^X\/\(\/\).*/{
- s//\1/
- q
- }
- s/.*/./; q'`
-
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-
- as_lineno_1=$LINENO as_lineno_1a=$LINENO
- as_lineno_2=$LINENO as_lineno_2a=$LINENO
- eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
- test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
- # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-)
- sed -n '
- p
- /[$]LINENO/=
- ' <$as_myself |
- sed '
- s/[$]LINENO.*/&-/
- t lineno
- b
- :lineno
- N
- :loop
- s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
- t loop
- s/-\n.*//
- ' >$as_me.lineno &&
- chmod +x "$as_me.lineno" ||
- { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
-
- # Don't try to exec as it changes $[0], causing all sort of problems
- # (the dirname of $[0] is not the place where we might find the
- # original and so on. Autoconf is especially sensitive to this).
- . "./$as_me.lineno"
- # Exit status is that of the last command.
- exit
-}
-
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in #(((((
--n*)
- case `echo 'xy\c'` in
- *c*) ECHO_T=' ';; # ECHO_T is single tab character.
- xy) ECHO_C='\c';;
- *) echo `echo ksh88 bug on AIX 6.1` > /dev/null
- ECHO_T=' ';;
- esac;;
-*)
- ECHO_N='-n';;
-esac
-
-rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
- rm -f conf$$.dir/conf$$.file
-else
- rm -f conf$$.dir
- mkdir conf$$.dir 2>/dev/null
-fi
-if (echo >conf$$.file) 2>/dev/null; then
- if ln -s conf$$.file conf$$ 2>/dev/null; then
- as_ln_s='ln -s'
- # ... but there are two gotchas:
- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
- # In both cases, we have to default to `cp -p'.
- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
- as_ln_s='cp -p'
- elif ln conf$$.file conf$$ 2>/dev/null; then
- as_ln_s=ln
- else
- as_ln_s='cp -p'
- fi
-else
- as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
-
-if mkdir -p . 2>/dev/null; then
- as_mkdir_p='mkdir -p "$as_dir"'
-else
- test -d ./-p && rmdir ./-p
- as_mkdir_p=false
-fi
-
-if test -x / >/dev/null 2>&1; then
- as_test_x='test -x'
-else
- if ls -dL / >/dev/null 2>&1; then
- as_ls_L_option=L
- else
- as_ls_L_option=
- fi
- as_test_x='
- eval sh -c '\''
- if test -d "$1"; then
- test -d "$1/.";
- else
- case $1 in #(
- -*)set "./$1";;
- esac;
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
- ???[sx]*):;;*)false;;esac;fi
- '\'' sh
- '
-fi
-as_executable_p=$as_test_x
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-test -n "$DJDIR" || exec 7<&0 </dev/null
-exec 6>&1
-
-# Name of the host.
-# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
-# so uname gets run too.
-ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-
-#
-# Initializations.
-#
-ac_default_prefix=/usr/local
-ac_clean_files=
-ac_config_libobj_dir=.
-LIBOBJS=
-cross_compiling=no
-subdirs=
-MFLAGS=
-MAKEFLAGS=
-
-# Identity of this package.
-PACKAGE_NAME='less'
-PACKAGE_TARNAME='less'
-PACKAGE_VERSION='1'
-PACKAGE_STRING='less 1'
-PACKAGE_BUGREPORT=''
-PACKAGE_URL=''
-
-ac_unique_file="forwback.c"
-# Factoring default headers for most tests.
-ac_includes_default="\
-#include <stdio.h>
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-# include <stdlib.h>
-# endif
-#endif
-#ifdef HAVE_STRING_H
-# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
-# include <memory.h>
-# endif
-# include <string.h>
-#endif
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
-#ifdef HAVE_INTTYPES_H
-# include <inttypes.h>
-#endif
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif"
-
-ac_subst_vars='LTLIBOBJS
-LIBOBJS
-REGEX_O
-INSTALL_DATA
-INSTALL_SCRIPT
-INSTALL_PROGRAM
-EGREP
-GREP
-CPP
-OBJEXT
-EXEEXT
-ac_ct_CC
-CPPFLAGS
-LDFLAGS
-CFLAGS
-CC
-target_alias
-host_alias
-build_alias
-LIBS
-ECHO_T
-ECHO_N
-ECHO_C
-DEFS
-mandir
-localedir
-libdir
-psdir
-pdfdir
-dvidir
-htmldir
-infodir
-docdir
-oldincludedir
-includedir
-localstatedir
-sharedstatedir
-sysconfdir
-datadir
-datarootdir
-libexecdir
-sbindir
-bindir
-program_transform_name
-prefix
-exec_prefix
-PACKAGE_URL
-PACKAGE_BUGREPORT
-PACKAGE_STRING
-PACKAGE_VERSION
-PACKAGE_TARNAME
-PACKAGE_NAME
-PATH_SEPARATOR
-SHELL'
-ac_subst_files=''
-ac_user_opts='
-enable_option_checking
-enable_largefile
-with_secure
-with_no_float
-with_regex
-with_editor
-'
- ac_precious_vars='build_alias
-host_alias
-target_alias
-CC
-CFLAGS
-LDFLAGS
-LIBS
-CPPFLAGS
-CPP'
-
-
-# Initialize some variables set by options.
-ac_init_help=
-ac_init_version=false
-ac_unrecognized_opts=
-ac_unrecognized_sep=
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-cache_file=/dev/null
-exec_prefix=NONE
-no_create=
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-verbose=
-x_includes=NONE
-x_libraries=NONE
-
-# Installation directory options.
-# These are left unexpanded so users can "make install exec_prefix=/foo"
-# and all the variables that are supposed to be based on exec_prefix
-# by default will actually change.
-# Use braces instead of parens because sh, perl, etc. also accept them.
-# (The list follows the same order as the GNU Coding Standards.)
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datarootdir='${prefix}/share'
-datadir='${datarootdir}'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
-infodir='${datarootdir}/info'
-htmldir='${docdir}'
-dvidir='${docdir}'
-pdfdir='${docdir}'
-psdir='${docdir}'
-libdir='${exec_prefix}/lib'
-localedir='${datarootdir}/locale'
-mandir='${datarootdir}/man'
-
-ac_prev=
-ac_dashdash=
-for ac_option
-do
- # If the previous option needs an argument, assign it.
- if test -n "$ac_prev"; then
- eval $ac_prev=\$ac_option
- ac_prev=
- continue
- fi
-
- case $ac_option in
- *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
- *=) ac_optarg= ;;
- *) ac_optarg=yes ;;
- esac
-
- # Accept the important Cygnus configure options, so we can diagnose typos.
-
- case $ac_dashdash$ac_option in
- --)
- ac_dashdash=yes ;;
-
- -bindir | --bindir | --bindi | --bind | --bin | --bi)
- ac_prev=bindir ;;
- -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
- bindir=$ac_optarg ;;
-
- -build | --build | --buil | --bui | --bu)
- ac_prev=build_alias ;;
- -build=* | --build=* | --buil=* | --bui=* | --bu=*)
- build_alias=$ac_optarg ;;
-
- -cache-file | --cache-file | --cache-fil | --cache-fi \
- | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
- ac_prev=cache_file ;;
- -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
- | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
- cache_file=$ac_optarg ;;
-
- --config-cache | -C)
- cache_file=config.cache ;;
-
- -datadir | --datadir | --datadi | --datad)
- ac_prev=datadir ;;
- -datadir=* | --datadir=* | --datadi=* | --datad=*)
- datadir=$ac_optarg ;;
-
- -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
- | --dataroo | --dataro | --datar)
- ac_prev=datarootdir ;;
- -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
- | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
- datarootdir=$ac_optarg ;;
-
- -disable-* | --disable-*)
- ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
- # Reject names that are not valid shell variable names.
- expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- as_fn_error $? "invalid feature name: $ac_useropt"
- ac_useropt_orig=$ac_useropt
- ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
- case $ac_user_opts in
- *"
-"enable_$ac_useropt"
-"*) ;;
- *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
- ac_unrecognized_sep=', ';;
- esac
- eval enable_$ac_useropt=no ;;
-
- -docdir | --docdir | --docdi | --doc | --do)
- ac_prev=docdir ;;
- -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
- docdir=$ac_optarg ;;
-
- -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
- ac_prev=dvidir ;;
- -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
- dvidir=$ac_optarg ;;
-
- -enable-* | --enable-*)
- ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
- # Reject names that are not valid shell variable names.
- expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- as_fn_error $? "invalid feature name: $ac_useropt"
- ac_useropt_orig=$ac_useropt
- ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
- case $ac_user_opts in
- *"
-"enable_$ac_useropt"
-"*) ;;
- *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
- ac_unrecognized_sep=', ';;
- esac
- eval enable_$ac_useropt=\$ac_optarg ;;
-
- -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
- | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
- | --exec | --exe | --ex)
- ac_prev=exec_prefix ;;
- -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
- | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
- | --exec=* | --exe=* | --ex=*)
- exec_prefix=$ac_optarg ;;
-
- -gas | --gas | --ga | --g)
- # Obsolete; use --with-gas.
- with_gas=yes ;;
-
- -help | --help | --hel | --he | -h)
- ac_init_help=long ;;
- -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
- ac_init_help=recursive ;;
- -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
- ac_init_help=short ;;
-
- -host | --host | --hos | --ho)
- ac_prev=host_alias ;;
- -host=* | --host=* | --hos=* | --ho=*)
- host_alias=$ac_optarg ;;
-
- -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
- ac_prev=htmldir ;;
- -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
- | --ht=*)
- htmldir=$ac_optarg ;;
-
- -includedir | --includedir | --includedi | --included | --include \
- | --includ | --inclu | --incl | --inc)
- ac_prev=includedir ;;
- -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
- | --includ=* | --inclu=* | --incl=* | --inc=*)
- includedir=$ac_optarg ;;
-
- -infodir | --infodir | --infodi | --infod | --info | --inf)
- ac_prev=infodir ;;
- -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
- infodir=$ac_optarg ;;
-
- -libdir | --libdir | --libdi | --libd)
- ac_prev=libdir ;;
- -libdir=* | --libdir=* | --libdi=* | --libd=*)
- libdir=$ac_optarg ;;
-
- -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
- | --libexe | --libex | --libe)
- ac_prev=libexecdir ;;
- -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
- | --libexe=* | --libex=* | --libe=*)
- libexecdir=$ac_optarg ;;
-
- -localedir | --localedir | --localedi | --localed | --locale)
- ac_prev=localedir ;;
- -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
- localedir=$ac_optarg ;;
-
- -localstatedir | --localstatedir | --localstatedi | --localstated \
- | --localstate | --localstat | --localsta | --localst | --locals)
- ac_prev=localstatedir ;;
- -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
- | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
- localstatedir=$ac_optarg ;;
-
- -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
- ac_prev=mandir ;;
- -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
- mandir=$ac_optarg ;;
-
- -nfp | --nfp | --nf)
- # Obsolete; use --without-fp.
- with_fp=no ;;
-
- -no-create | --no-create | --no-creat | --no-crea | --no-cre \
- | --no-cr | --no-c | -n)
- no_create=yes ;;
-
- -no-recursion | --no-recursion | --no-recursio | --no-recursi \
- | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
- no_recursion=yes ;;
-
- -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
- | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
- | --oldin | --oldi | --old | --ol | --o)
- ac_prev=oldincludedir ;;
- -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
- | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
- | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
- oldincludedir=$ac_optarg ;;
-
- -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
- ac_prev=prefix ;;
- -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
- prefix=$ac_optarg ;;
-
- -program-prefix | --program-prefix | --program-prefi | --program-pref \
- | --program-pre | --program-pr | --program-p)
- ac_prev=program_prefix ;;
- -program-prefix=* | --program-prefix=* | --program-prefi=* \
- | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
- program_prefix=$ac_optarg ;;
-
- -program-suffix | --program-suffix | --program-suffi | --program-suff \
- | --program-suf | --program-su | --program-s)
- ac_prev=program_suffix ;;
- -program-suffix=* | --program-suffix=* | --program-suffi=* \
- | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
- program_suffix=$ac_optarg ;;
-
- -program-transform-name | --program-transform-name \
- | --program-transform-nam | --program-transform-na \
- | --program-transform-n | --program-transform- \
- | --program-transform | --program-transfor \
- | --program-transfo | --program-transf \
- | --program-trans | --program-tran \
- | --progr-tra | --program-tr | --program-t)
- ac_prev=program_transform_name ;;
- -program-transform-name=* | --program-transform-name=* \
- | --program-transform-nam=* | --program-transform-na=* \
- | --program-transform-n=* | --program-transform-=* \
- | --program-transform=* | --program-transfor=* \
- | --program-transfo=* | --program-transf=* \
- | --program-trans=* | --program-tran=* \
- | --progr-tra=* | --program-tr=* | --program-t=*)
- program_transform_name=$ac_optarg ;;
-
- -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
- ac_prev=pdfdir ;;
- -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
- pdfdir=$ac_optarg ;;
-
- -psdir | --psdir | --psdi | --psd | --ps)
- ac_prev=psdir ;;
- -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
- psdir=$ac_optarg ;;
-
- -q | -quiet | --quiet | --quie | --qui | --qu | --q \
- | -silent | --silent | --silen | --sile | --sil)
- silent=yes ;;
-
- -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
- ac_prev=sbindir ;;
- -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
- | --sbi=* | --sb=*)
- sbindir=$ac_optarg ;;
-
- -sharedstatedir | --sharedstatedir | --sharedstatedi \
- | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
- | --sharedst | --shareds | --shared | --share | --shar \
- | --sha | --sh)
- ac_prev=sharedstatedir ;;
- -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
- | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
- | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
- | --sha=* | --sh=*)
- sharedstatedir=$ac_optarg ;;
-
- -site | --site | --sit)
- ac_prev=site ;;
- -site=* | --site=* | --sit=*)
- site=$ac_optarg ;;
-
- -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
- ac_prev=srcdir ;;
- -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
- srcdir=$ac_optarg ;;
-
- -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
- | --syscon | --sysco | --sysc | --sys | --sy)
- ac_prev=sysconfdir ;;
- -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
- | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
- sysconfdir=$ac_optarg ;;
-
- -target | --target | --targe | --targ | --tar | --ta | --t)
- ac_prev=target_alias ;;
- -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
- target_alias=$ac_optarg ;;
-
- -v | -verbose | --verbose | --verbos | --verbo | --verb)
- verbose=yes ;;
-
- -version | --version | --versio | --versi | --vers | -V)
- ac_init_version=: ;;
-
- -with-* | --with-*)
- ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
- # Reject names that are not valid shell variable names.
- expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- as_fn_error $? "invalid package name: $ac_useropt"
- ac_useropt_orig=$ac_useropt
- ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
- case $ac_user_opts in
- *"
-"with_$ac_useropt"
-"*) ;;
- *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
- ac_unrecognized_sep=', ';;
- esac
- eval with_$ac_useropt=\$ac_optarg ;;
-
- -without-* | --without-*)
- ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
- # Reject names that are not valid shell variable names.
- expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- as_fn_error $? "invalid package name: $ac_useropt"
- ac_useropt_orig=$ac_useropt
- ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
- case $ac_user_opts in
- *"
-"with_$ac_useropt"
-"*) ;;
- *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
- ac_unrecognized_sep=', ';;
- esac
- eval with_$ac_useropt=no ;;
-
- --x)
- # Obsolete; use --with-x.
- with_x=yes ;;
-
- -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
- | --x-incl | --x-inc | --x-in | --x-i)
- ac_prev=x_includes ;;
- -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
- | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
- x_includes=$ac_optarg ;;
-
- -x-libraries | --x-libraries | --x-librarie | --x-librari \
- | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
- ac_prev=x_libraries ;;
- -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
- | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
- x_libraries=$ac_optarg ;;
-
- -*) as_fn_error $? "unrecognized option: \`$ac_option'
-Try \`$0 --help' for more information"
- ;;
-
- *=*)
- ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
- # Reject names that are not valid shell variable names.
- case $ac_envvar in #(
- '' | [0-9]* | *[!_$as_cr_alnum]* )
- as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
- esac
- eval $ac_envvar=\$ac_optarg
- export $ac_envvar ;;
-
- *)
- # FIXME: should be removed in autoconf 3.0.
- $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
- expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
- $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
- : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
- ;;
-
- esac
-done
-
-if test -n "$ac_prev"; then
- ac_option=--`echo $ac_prev | sed 's/_/-/g'`
- as_fn_error $? "missing argument to $ac_option"
-fi
-
-if test -n "$ac_unrecognized_opts"; then
- case $enable_option_checking in
- no) ;;
- fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
- *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
- esac
-fi
-
-# Check all directory arguments for consistency.
-for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
- datadir sysconfdir sharedstatedir localstatedir includedir \
- oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
- libdir localedir mandir
-do
- eval ac_val=\$$ac_var
- # Remove trailing slashes.
- case $ac_val in
- */ )
- ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
- eval $ac_var=\$ac_val;;
- esac
- # Be sure to have absolute directory names.
- case $ac_val in
- [\\/$]* | ?:[\\/]* ) continue;;
- NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
- esac
- as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
-done
-
-# There might be people who depend on the old broken behavior: `$host'
-# used to hold the argument of --host etc.
-# FIXME: To remove some day.
-build=$build_alias
-host=$host_alias
-target=$target_alias
-
-# FIXME: To remove some day.
-if test "x$host_alias" != x; then
- if test "x$build_alias" = x; then
- cross_compiling=maybe
- $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
- If a cross compiler is detected then cross compile mode will be used" >&2
- elif test "x$build_alias" != "x$host_alias"; then
- cross_compiling=yes
- fi
-fi
-
-ac_tool_prefix=
-test -n "$host_alias" && ac_tool_prefix=$host_alias-
-
-test "$silent" = yes && exec 6>/dev/null
-
-
-ac_pwd=`pwd` && test -n "$ac_pwd" &&
-ac_ls_di=`ls -di .` &&
-ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
- as_fn_error $? "working directory cannot be determined"
-test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
- as_fn_error $? "pwd does not report name of working directory"
-
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
- ac_srcdir_defaulted=yes
- # Try the directory containing this script, then the parent directory.
- ac_confdir=`$as_dirname -- "$as_myself" ||
-$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$as_myself" : 'X\(//\)[^/]' \| \
- X"$as_myself" : 'X\(//\)$' \| \
- X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_myself" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
- s//\1/
- q
- }
- /^X\(\/\/\)[^/].*/{
- s//\1/
- q
- }
- /^X\(\/\/\)$/{
- s//\1/
- q
- }
- /^X\(\/\).*/{
- s//\1/
- q
- }
- s/.*/./; q'`
- srcdir=$ac_confdir
- if test ! -r "$srcdir/$ac_unique_file"; then
- srcdir=..
- fi
-else
- ac_srcdir_defaulted=no
-fi
-if test ! -r "$srcdir/$ac_unique_file"; then
- test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
- as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
-fi
-ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
-ac_abs_confdir=`(
- cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
- pwd)`
-# When building in place, set srcdir=.
-if test "$ac_abs_confdir" = "$ac_pwd"; then
- srcdir=.
-fi
-# Remove unnecessary trailing slashes from srcdir.
-# Double slashes in file names in object file debugging info
-# mess up M-x gdb in Emacs.
-case $srcdir in
-*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
-esac
-for ac_var in $ac_precious_vars; do
- eval ac_env_${ac_var}_set=\${${ac_var}+set}
- eval ac_env_${ac_var}_value=\$${ac_var}
- eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
- eval ac_cv_env_${ac_var}_value=\$${ac_var}
-done
-
-#
-# Report the --help message.
-#
-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 less 1 to adapt to many kinds of systems.
-
-Usage: $0 [OPTION]... [VAR=VALUE]...
-
-To assign environment variables (e.g., CC, CFLAGS...), specify them as
-VAR=VALUE. See below for descriptions of some of the useful variables.
-
-Defaults for the options are specified in brackets.
-
-Configuration:
- -h, --help display this help and exit
- --help=short display options specific to this package
- --help=recursive display the short help of all the included packages
- -V, --version display version information and exit
- -q, --quiet, --silent do not print \`checking ...' messages
- --cache-file=FILE cache test results in FILE [disabled]
- -C, --config-cache alias for \`--cache-file=config.cache'
- -n, --no-create do not create output files
- --srcdir=DIR find the sources in DIR [configure dir or \`..']
-
-Installation directories:
- --prefix=PREFIX install architecture-independent files in PREFIX
- [$ac_default_prefix]
- --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX
- [PREFIX]
-
-By default, \`make install' will install all the files in
-\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify
-an installation prefix other than \`$ac_default_prefix' using \`--prefix',
-for instance \`--prefix=\$HOME'.
-
-For better control, use the options below.
-
-Fine tuning of the installation directories:
- --bindir=DIR user executables [EPREFIX/bin]
- --sbindir=DIR system admin executables [EPREFIX/sbin]
- --libexecdir=DIR program executables [EPREFIX/libexec]
- --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
- --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
- --localstatedir=DIR modifiable single-machine data [PREFIX/var]
- --libdir=DIR object code libraries [EPREFIX/lib]
- --includedir=DIR C header files [PREFIX/include]
- --oldincludedir=DIR C header files for non-gcc [/usr/include]
- --datarootdir=DIR read-only arch.-independent data root [PREFIX/share]
- --datadir=DIR read-only architecture-independent data [DATAROOTDIR]
- --infodir=DIR info documentation [DATAROOTDIR/info]
- --localedir=DIR locale-dependent data [DATAROOTDIR/locale]
- --mandir=DIR man documentation [DATAROOTDIR/man]
- --docdir=DIR documentation root [DATAROOTDIR/doc/less]
- --htmldir=DIR html documentation [DOCDIR]
- --dvidir=DIR dvi documentation [DOCDIR]
- --pdfdir=DIR pdf documentation [DOCDIR]
- --psdir=DIR ps documentation [DOCDIR]
-_ACEOF
-
- cat <<\_ACEOF
-_ACEOF
-fi
-
-if test -n "$ac_init_help"; then
- case $ac_init_help in
- short | recursive ) echo "Configuration of less 1:";;
- esac
- cat <<\_ACEOF
-
-Optional Features:
- --disable-option-checking ignore unrecognized --enable/--with options
- --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
- --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
- --disable-largefile omit support for large files
-
-Optional Packages:
- --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
- --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
- --with-secure Compile in secure mode
- --with-no-float Do not use floating point
- --with-regex={auto,gnu,pcre,posix,regcmp,re_comp,regcomp,regcomp-local,none} Select a regular expression library auto
- --with-editor=PROGRAM use PROGRAM as the default editor vi
-
-Some influential environment variables:
- CC C compiler command
- CFLAGS C compiler flags
- LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
- nonstandard directory <lib dir>
- LIBS libraries to pass to the linker, e.g. -l<library>
- CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
- you have headers in a nonstandard directory <include dir>
- CPP C preprocessor
-
-Use these variables to override the choices made by `configure' or to help
-it to find libraries and programs with nonstandard names/locations.
-
-Report bugs to the package provider.
-_ACEOF
-ac_status=$?
-fi
-
-if test "$ac_init_help" = "recursive"; then
- # If there are subdirs, report their specific --help.
- for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
- test -d "$ac_dir" ||
- { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
- continue
- ac_builddir=.
-
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
- ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
- # A ".." for each directory in $ac_dir_suffix.
- ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
- case $ac_top_builddir_sub in
- "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
- *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
- esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
-
-case $srcdir in
- .) # We are building in place.
- ac_srcdir=.
- ac_top_srcdir=$ac_top_builddir_sub
- ac_abs_top_srcdir=$ac_pwd ;;
- [\\/]* | ?:[\\/]* ) # Absolute name.
- ac_srcdir=$srcdir$ac_dir_suffix;
- ac_top_srcdir=$srcdir
- ac_abs_top_srcdir=$srcdir ;;
- *) # Relative name.
- ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
- ac_top_srcdir=$ac_top_build_prefix$srcdir
- ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
- cd "$ac_dir" || { ac_status=$?; continue; }
- # Check for guested configure.
- if test -f "$ac_srcdir/configure.gnu"; then
- echo &&
- $SHELL "$ac_srcdir/configure.gnu" --help=recursive
- elif test -f "$ac_srcdir/configure"; then
- echo &&
- $SHELL "$ac_srcdir/configure" --help=recursive
- else
- $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
- fi || ac_status=$?
- cd "$ac_pwd" || { ac_status=$?; break; }
- done
-fi
-
-test -n "$ac_init_help" && exit $ac_status
-if $ac_init_version; then
- cat <<\_ACEOF
-less configure 1
-generated by GNU Autoconf 2.68
-
-Copyright (C) 2010 Free Software Foundation, Inc.
-This configure script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it.
-_ACEOF
- exit
-fi
-
-## ------------------------ ##
-## Autoconf initialization. ##
-## ------------------------ ##
-
-# ac_fn_c_try_compile LINENO
-# --------------------------
-# Try to compile conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_compile ()
-{
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- rm -f conftest.$ac_objext
- if { { ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_compile") 2>conftest.err
- ac_status=$?
- if test -s conftest.err; then
- grep -v '^ *+' conftest.err >conftest.er1
- cat conftest.er1 >&5
- mv -f conftest.er1 conftest.err
- fi
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then :
- ac_retval=0
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_retval=1
-fi
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
- as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_compile
-
-# ac_fn_c_try_link LINENO
-# -----------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_link ()
-{
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { { ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_link") 2>conftest.err
- ac_status=$?
- if test -s conftest.err; then
- grep -v '^ *+' conftest.err >conftest.er1
- cat conftest.er1 >&5
- mv -f conftest.er1 conftest.err
- fi
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then :
- ac_retval=0
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_retval=1
-fi
- # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
- # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
- # interfere with the next link command; also delete a directory that is
- # left behind by Apple's compiler. We do this before executing the actions.
- rm -rf conftest.dSYM conftest_ipa8_conftest.oo
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
- as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_link
-
-# ac_fn_c_try_cpp LINENO
-# ----------------------
-# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_cpp ()
-{
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- if { { ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
- ac_status=$?
- if test -s conftest.err; then
- grep -v '^ *+' conftest.err >conftest.er1
- cat conftest.er1 >&5
- mv -f conftest.er1 conftest.err
- fi
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; } > conftest.i && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then :
- ac_retval=0
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_retval=1
-fi
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
- as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_cpp
-
-# ac_fn_c_try_run LINENO
-# ----------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
-# that executables *can* be run.
-ac_fn_c_try_run ()
-{
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- if { { ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
- { { case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; }; then :
- ac_retval=0
-else
- $as_echo "$as_me: program exited with status $ac_status" >&5
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_retval=$ac_status
-fi
- rm -rf conftest.dSYM conftest_ipa8_conftest.oo
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
- as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_run
-
-# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
-# -------------------------------------------------------
-# Tests whether HEADER exists, giving a warning if it cannot be compiled using
-# the include files in INCLUDES and setting the cache variable VAR
-# accordingly.
-ac_fn_c_check_header_mongrel ()
-{
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- if eval \${$3+:} false; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
- $as_echo_n "(cached) " >&6
-fi
-eval ac_res=\$$3
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
- # Is the header compilable?
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
-$as_echo_n "checking $2 usability... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-$4
-#include <$2>
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_header_compiler=yes
-else
- ac_header_compiler=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
-$as_echo_n "checking $2 presence... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <$2>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
- ac_header_preproc=yes
-else
- ac_header_preproc=no
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
- yes:no: )
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
- ;;
- no:yes:* )
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;}
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
- ;;
-esac
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- eval "$3=\$ac_header_compiler"
-fi
-eval ac_res=\$$3
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-fi
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_check_header_mongrel
-
-# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
-# -------------------------------------------------------
-# Tests whether HEADER exists and can be compiled using the include files in
-# INCLUDES, setting the cache variable VAR accordingly.
-ac_fn_c_check_header_compile ()
-{
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-$4
-#include <$2>
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- eval "$3=yes"
-else
- eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$3
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_check_header_compile
-
-# ac_fn_c_check_type LINENO TYPE VAR INCLUDES
-# -------------------------------------------
-# Tests whether TYPE exists after having included INCLUDES, setting cache
-# variable VAR accordingly.
-ac_fn_c_check_type ()
-{
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- eval "$3=no"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-$4
-int
-main ()
-{
-if (sizeof ($2))
- return 0;
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-$4
-int
-main ()
-{
-if (sizeof (($2)))
- return 0;
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-else
- eval "$3=yes"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$3
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_check_type
-
-# ac_fn_c_check_func LINENO FUNC VAR
-# ----------------------------------
-# Tests whether FUNC exists, setting the cache variable VAR accordingly
-ac_fn_c_check_func ()
-{
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $2 innocuous_$2
-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $2 (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $2
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $2 ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined __stub_$2 || defined __stub___$2
-choke me
-#endif
-
-int
-main ()
-{
-return $2 ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- eval "$3=yes"
-else
- eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-fi
-eval ac_res=\$$3
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_check_func
-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 less $as_me 1, which was
-generated by GNU Autoconf 2.68. Invocation command line was
-
- $ $0 $@
-
-_ACEOF
-exec 5>>config.log
-{
-cat <<_ASUNAME
-## --------- ##
-## Platform. ##
-## --------- ##
-
-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
-/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown`
-
-/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown`
-/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown`
-/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown`
-/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown`
-/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown`
-
-_ASUNAME
-
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- $as_echo "PATH: $as_dir"
- done
-IFS=$as_save_IFS
-
-} >&5
-
-cat >&5 <<_ACEOF
-
-
-## ----------- ##
-## Core tests. ##
-## ----------- ##
-
-_ACEOF
-
-
-# Keep a trace of the command line.
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Strip out --silent because we don't want to record it for future runs.
-# Also quote any args containing shell meta-characters.
-# Make two passes to allow for proper duplicate-argument suppression.
-ac_configure_args=
-ac_configure_args0=
-ac_configure_args1=
-ac_must_keep_next=false
-for ac_pass in 1 2
-do
- for ac_arg
- do
- case $ac_arg in
- -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
- -q | -quiet | --quiet | --quie | --qui | --qu | --q \
- | -silent | --silent | --silen | --sile | --sil)
- continue ;;
- *\'*)
- ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
- esac
- case $ac_pass in
- 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
- 2)
- as_fn_append ac_configure_args1 " '$ac_arg'"
- if test $ac_must_keep_next = true; then
- ac_must_keep_next=false # Got value, back to normal.
- else
- case $ac_arg in
- *=* | --config-cache | -C | -disable-* | --disable-* \
- | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
- | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
- | -with-* | --with-* | -without-* | --without-* | --x)
- case "$ac_configure_args0 " in
- "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
- esac
- ;;
- -* ) ac_must_keep_next=true ;;
- esac
- fi
- as_fn_append ac_configure_args " '$ac_arg'"
- ;;
- esac
- done
-done
-{ ac_configure_args0=; unset ac_configure_args0;}
-{ ac_configure_args1=; unset ac_configure_args1;}
-
-# When interrupted or exit'd, cleanup temporary files, and complete
-# config.log. We remove comments because anyway the quotes in there
-# would cause problems or look ugly.
-# WARNING: Use '\'' to represent an apostrophe within the trap.
-# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
-trap 'exit_status=$?
- # Save into config.log some information that might help in debugging.
- {
- echo
-
- $as_echo "## ---------------- ##
-## Cache variables. ##
-## ---------------- ##"
- echo
- # The following way of writing the cache mishandles newlines in values,
-(
- for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
- eval ac_val=\$$ac_var
- case $ac_val in #(
- *${as_nl}*)
- case $ac_var in #(
- *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
- esac
- case $ac_var in #(
- _ | IFS | as_nl) ;; #(
- BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
- *) { eval $ac_var=; unset $ac_var;} ;;
- esac ;;
- esac
- done
- (set) 2>&1 |
- case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
- *${as_nl}ac_space=\ *)
- sed -n \
- "s/'\''/'\''\\\\'\'''\''/g;
- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
- ;; #(
- *)
- sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
- ;;
- esac |
- sort
-)
- echo
-
- $as_echo "## ----------------- ##
-## Output variables. ##
-## ----------------- ##"
- echo
- for ac_var in $ac_subst_vars
- do
- eval ac_val=\$$ac_var
- case $ac_val in
- *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
- esac
- $as_echo "$ac_var='\''$ac_val'\''"
- done | sort
- echo
-
- if test -n "$ac_subst_files"; then
- $as_echo "## ------------------- ##
-## File substitutions. ##
-## ------------------- ##"
- echo
- for ac_var in $ac_subst_files
- do
- eval ac_val=\$$ac_var
- case $ac_val in
- *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
- esac
- $as_echo "$ac_var='\''$ac_val'\''"
- done | sort
- echo
- fi
-
- if test -s confdefs.h; then
- $as_echo "## ----------- ##
-## confdefs.h. ##
-## ----------- ##"
- echo
- cat confdefs.h
- echo
- fi
- test "$ac_signal" != 0 &&
- $as_echo "$as_me: caught signal $ac_signal"
- $as_echo "$as_me: exit $exit_status"
- } >&5
- rm -f core *.core core.conftest.* &&
- rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
- exit $exit_status
-' 0
-for ac_signal in 1 2 13 15; do
- trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
-done
-ac_signal=0
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -f -r conftest* confdefs.h
-
-$as_echo "/* confdefs.h */" > confdefs.h
-
-# Predefined preprocessor variables.
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_NAME "$PACKAGE_NAME"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION "$PACKAGE_VERSION"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_STRING "$PACKAGE_STRING"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_URL "$PACKAGE_URL"
-_ACEOF
-
-
-# Let the site file select an alternate cache file if it wants to.
-# Prefer an explicitly selected file to automatically selected ones.
-ac_site_file1=NONE
-ac_site_file2=NONE
-if test -n "$CONFIG_SITE"; then
- # We do not want a PATH search for config.site.
- case $CONFIG_SITE in #((
- -*) ac_site_file1=./$CONFIG_SITE;;
- */*) ac_site_file1=$CONFIG_SITE;;
- *) ac_site_file1=./$CONFIG_SITE;;
- esac
-elif test "x$prefix" != xNONE; then
- ac_site_file1=$prefix/share/config.site
- ac_site_file2=$prefix/etc/config.site
-else
- ac_site_file1=$ac_default_prefix/share/config.site
- ac_site_file2=$ac_default_prefix/etc/config.site
-fi
-for ac_site_file in "$ac_site_file1" "$ac_site_file2"
-do
- test "x$ac_site_file" = xNONE && continue
- if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
-$as_echo "$as_me: loading site script $ac_site_file" >&6;}
- sed 's/^/| /' "$ac_site_file" >&5
- . "$ac_site_file" \
- || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "failed to load site script $ac_site_file
-See \`config.log' for more details" "$LINENO" 5 ; }
- fi
-done
-
-if test -r "$cache_file"; then
- # Some versions of bash will fail to source /dev/null (special files
- # actually), so we avoid doing that. DJGPP emulates it as a regular file.
- if test /dev/null != "$cache_file" && test -f "$cache_file"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
-$as_echo "$as_me: loading cache $cache_file" >&6;}
- case $cache_file in
- [\\/]* | ?:[\\/]* ) . "$cache_file";;
- *) . "./$cache_file";;
- esac
- fi
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
-$as_echo "$as_me: creating cache $cache_file" >&6;}
- >$cache_file
-fi
-
-# Check that the precious variables saved in the cache have kept the same
-# value.
-ac_cache_corrupted=false
-for ac_var in $ac_precious_vars; do
- eval ac_old_set=\$ac_cv_env_${ac_var}_set
- eval ac_new_set=\$ac_env_${ac_var}_set
- eval ac_old_val=\$ac_cv_env_${ac_var}_value
- eval ac_new_val=\$ac_env_${ac_var}_value
- case $ac_old_set,$ac_new_set in
- set,)
- { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
- ac_cache_corrupted=: ;;
- ,set)
- { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
- ac_cache_corrupted=: ;;
- ,);;
- *)
- if test "x$ac_old_val" != "x$ac_new_val"; then
- # differences in whitespace do not lead to failure.
- ac_old_val_w=`echo x $ac_old_val`
- ac_new_val_w=`echo x $ac_new_val`
- if test "$ac_old_val_w" != "$ac_new_val_w"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
-$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
- ac_cache_corrupted=:
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
-$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
- eval $ac_var=\$ac_old_val
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5
-$as_echo "$as_me: former value: \`$ac_old_val'" >&2;}
- { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5
-$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
- fi;;
- esac
- # Pass precious variables to config.status.
- if test "$ac_new_set" = set; then
- case $ac_new_val in
- *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
- *) ac_arg=$ac_var=$ac_new_val ;;
- esac
- case " $ac_configure_args " in
- *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy.
- *) as_fn_append ac_configure_args " '$ac_arg'" ;;
- esac
- fi
-done
-if $ac_cache_corrupted; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
-$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
- as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
-fi
-## -------------------- ##
-## Main body of script. ##
-## -------------------- ##
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-ac_config_headers="$ac_config_headers defines.h"
-
-
-# Checks for programs.
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_CC="${ac_tool_prefix}gcc"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_CC"; then
- ac_ct_CC=$CC
- # Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$ac_ct_CC"; then
- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_CC="gcc"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
- if test "x$ac_ct_CC" = x; then
- CC=""
- else
- case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
- CC=$ac_ct_CC
- fi
-else
- CC="$ac_cv_prog_CC"
-fi
-
-if test -z "$CC"; then
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_CC="${ac_tool_prefix}cc"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- fi
-fi
-if test -z "$CC"; then
- # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
-else
- ac_prog_rejected=no
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
- ac_prog_rejected=yes
- continue
- fi
- ac_cv_prog_CC="cc"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-if test $ac_prog_rejected = yes; then
- # We found a bogon in the path, so make sure we never use it.
- set dummy $ac_cv_prog_CC
- shift
- if test $# != 0; then
- # We chose a different compiler from the bogus one.
- # However, it has the same basename, so the bogon will be chosen
- # first if we set CC to just the basename; use the full file name.
- shift
- ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
- fi
-fi
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$CC"; then
- if test -n "$ac_tool_prefix"; then
- for ac_prog in cl.exe
- do
- # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- test -n "$CC" && break
- done
-fi
-if test -z "$CC"; then
- ac_ct_CC=$CC
- for ac_prog in cl.exe
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$ac_ct_CC"; then
- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_CC="$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- test -n "$ac_ct_CC" && break
-done
-
- if test "x$ac_ct_CC" = x; then
- CC=""
- else
- case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
- CC=$ac_ct_CC
- fi
-fi
-
-fi
-
-
-test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details" "$LINENO" 5 ; }
-
-# Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
-set X $ac_compile
-ac_compiler=$2
-for ac_option in --version -v -V -qversion; do
- { { ac_try="$ac_compiler $ac_option >&5"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_compiler $ac_option >&5") 2>conftest.err
- ac_status=$?
- if test -s conftest.err; then
- sed '10a\
-... rest of stderr output deleted ...
- 10q' conftest.err >conftest.er1
- cat conftest.er1 >&5
- fi
- rm -f conftest.er1 conftest.err
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }
-done
-
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
-# Try to create an executable without -o first, disregard a.out.
-# It will help us diagnose broken compilers, and finding out an intuition
-# of exeext.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
-$as_echo_n "checking whether the C compiler works... " >&6; }
-ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-
-# The possible output files:
-ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
-
-ac_rmfiles=
-for ac_file in $ac_files
-do
- case $ac_file in
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
- * ) ac_rmfiles="$ac_rmfiles $ac_file";;
- esac
-done
-rm -f $ac_rmfiles
-
-if { { ac_try="$ac_link_default"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_link_default") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then :
- # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
-# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
-# in a Makefile. We should not override ac_cv_exeext if it was cached,
-# so that the user can short-circuit this test for compilers unknown to
-# Autoconf.
-for ac_file in $ac_files ''
-do
- test -f "$ac_file" || continue
- case $ac_file in
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
- ;;
- [ab].out )
- # We found the default executable, but exeext='' is most
- # certainly right.
- break;;
- *.* )
- if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
- then :; else
- ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
- fi
- # We set ac_cv_exeext here because the later test for it is not
- # safe: cross compilers may not add the suffix if given an `-o'
- # argument, so we may need to know it at that point already.
- # Even if this section looks crufty: it has the advantage of
- # actually working.
- break;;
- * )
- break;;
- esac
-done
-test "$ac_cv_exeext" = no && ac_cv_exeext=
-
-else
- ac_file=''
-fi
-if test -z "$ac_file"; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "C compiler cannot create executables
-See \`config.log' for more details" "$LINENO" 5 ; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
-$as_echo_n "checking for C compiler default output file name... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
-$as_echo "$ac_file" >&6; }
-ac_exeext=$ac_cv_exeext
-
-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
-ac_clean_files=$ac_clean_files_save
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
-$as_echo_n "checking for suffix of executables... " >&6; }
-if { { ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then :
- # If both `conftest.exe' and `conftest' are `present' (well, observable)
-# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
-# work properly (i.e., refer to `conftest.exe'), while it won't with
-# `rm'.
-for ac_file in conftest.exe conftest conftest.*; do
- test -f "$ac_file" || continue
- case $ac_file in
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
- *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
- break;;
- * ) break;;
- esac
-done
-else
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details" "$LINENO" 5 ; }
-fi
-rm -f conftest conftest$ac_cv_exeext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
-$as_echo "$ac_cv_exeext" >&6; }
-
-rm -f conftest.$ac_ext
-EXEEXT=$ac_cv_exeext
-ac_exeext=$EXEEXT
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <stdio.h>
-int
-main ()
-{
-FILE *f = fopen ("conftest.out", "w");
- return ferror (f) || fclose (f) != 0;
-
- ;
- return 0;
-}
-_ACEOF
-ac_clean_files="$ac_clean_files conftest.out"
-# Check that the compiler produces executables we can run. If not, either
-# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
-$as_echo_n "checking whether we are cross compiling... " >&6; }
-if test "$cross_compiling" != yes; then
- { { ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }
- if { ac_try='./conftest$ac_cv_exeext'
- { { case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; }; then
- cross_compiling=no
- else
- if test "$cross_compiling" = maybe; then
- cross_compiling=yes
- else
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details" "$LINENO" 5 ; }
- fi
- fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
-$as_echo "$cross_compiling" >&6; }
-
-rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
-ac_clean_files=$ac_clean_files_save
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
-$as_echo_n "checking for suffix of object files... " >&6; }
-if ${ac_cv_objext+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.o conftest.obj
-if { { ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_compile") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then :
- for ac_file in conftest.o conftest.obj conftest.*; do
- test -f "$ac_file" || continue;
- case $ac_file in
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
- *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
- break;;
- esac
-done
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot compute suffix of object files: cannot compile
-See \`config.log' for more details" "$LINENO" 5 ; }
-fi
-rm -f conftest.$ac_cv_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
-$as_echo "$ac_cv_objext" >&6; }
-OBJEXT=$ac_cv_objext
-ac_objext=$OBJEXT
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
-$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if ${ac_cv_c_compiler_gnu+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-#ifndef __GNUC__
- choke me
-#endif
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_compiler_gnu=yes
-else
- ac_compiler_gnu=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_c_compiler_gnu=$ac_compiler_gnu
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
-$as_echo "$ac_cv_c_compiler_gnu" >&6; }
-if test $ac_compiler_gnu = yes; then
- GCC=yes
-else
- GCC=
-fi
-ac_test_CFLAGS=${CFLAGS+set}
-ac_save_CFLAGS=$CFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
-$as_echo_n "checking whether $CC accepts -g... " >&6; }
-if ${ac_cv_prog_cc_g+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_save_c_werror_flag=$ac_c_werror_flag
- ac_c_werror_flag=yes
- ac_cv_prog_cc_g=no
- CFLAGS="-g"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_prog_cc_g=yes
-else
- CFLAGS=""
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-else
- ac_c_werror_flag=$ac_save_c_werror_flag
- CFLAGS="-g"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_prog_cc_g=yes
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_c_werror_flag=$ac_save_c_werror_flag
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
-$as_echo "$ac_cv_prog_cc_g" >&6; }
-if test "$ac_test_CFLAGS" = set; then
- CFLAGS=$ac_save_CFLAGS
-elif test $ac_cv_prog_cc_g = yes; then
- if test "$GCC" = yes; then
- CFLAGS="-g -O2"
- else
- CFLAGS="-g"
- fi
-else
- if test "$GCC" = yes; then
- CFLAGS="-O2"
- else
- CFLAGS=
- fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
-$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if ${ac_cv_prog_cc_c89+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_cv_prog_cc_c89=no
-ac_save_CC=$CC
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <stdarg.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
-struct buf { int x; };
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
- char **p;
- int i;
-{
- return p[i];
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
- char *s;
- va_list v;
- va_start (v,p);
- s = g (p, va_arg (v,int));
- va_end (v);
- return s;
-}
-
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
- function prototypes and stuff, but not '\xHH' hex character constants.
- These don't provoke an error unfortunately, instead are silently treated
- as 'x'. The following induces an error, until -std is added to get
- proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
- array size at least. It's necessary to write '\x00'==0 to get something
- that's true only with -std. */
-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-
-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
- inside strings and character constants. */
-#define FOO(x) 'x'
-int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
-
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
-int
-main ()
-{
-return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
- ;
- return 0;
-}
-_ACEOF
-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
- -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-do
- CC="$ac_save_CC $ac_arg"
- if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_prog_cc_c89=$ac_arg
-fi
-rm -f core conftest.err conftest.$ac_objext
- test "x$ac_cv_prog_cc_c89" != "xno" && break
-done
-rm -f conftest.$ac_ext
-CC=$ac_save_CC
-
-fi
-# AC_CACHE_VAL
-case "x$ac_cv_prog_cc_c89" in
- x)
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-$as_echo "none needed" >&6; } ;;
- xno)
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-$as_echo "unsupported" >&6; } ;;
- *)
- CC="$CC $ac_cv_prog_cc_c89"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
-$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
-esac
-if test "x$ac_cv_prog_cc_c89" != xno; then :
-
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing strerror" >&5
-$as_echo_n "checking for library containing strerror... " >&6; }
-if ${ac_cv_search_strerror+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_func_search_save_LIBS=$LIBS
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char strerror ();
-int
-main ()
-{
-return strerror ();
- ;
- return 0;
-}
-_ACEOF
-for ac_lib in '' cposix; do
- if test -z "$ac_lib"; then
- ac_res="none required"
- else
- ac_res=-l$ac_lib
- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
- fi
- if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_search_strerror=$ac_res
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext
- if ${ac_cv_search_strerror+:} false; then :
- break
-fi
-done
-if ${ac_cv_search_strerror+:} false; then :
-
-else
- ac_cv_search_strerror=no
-fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_strerror" >&5
-$as_echo "$ac_cv_search_strerror" >&6; }
-ac_res=$ac_cv_search_strerror
-if test "$ac_res" != no; then :
- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
-$as_echo_n "checking how to run the C preprocessor... " >&6; }
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
- CPP=
-fi
-if test -z "$CPP"; then
- if ${ac_cv_prog_CPP+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- # Double quotes because CPP needs to be expanded
- for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
- do
- ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
- # Use a header file that comes with gcc, so configuring glibc
- # with a fresh cross-compiler works.
- # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- # <limits.h> exists even on freestanding compilers.
- # On the NeXT, cc -E runs the code through the compiler's parser,
- # not just through cpp. "Syntax error" is here to catch this case.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
- Syntax error
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-
-else
- # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
- # OK, works on sane cases. Now check whether nonexistent headers
- # can be detected and how.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <ac_nonexistent.h>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
- # Broken: success on invalid input.
-continue
-else
- # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
- break
-fi
-
- done
- ac_cv_prog_CPP=$CPP
-
-fi
- CPP=$ac_cv_prog_CPP
-else
- ac_cv_prog_CPP=$CPP
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
-$as_echo "$CPP" >&6; }
-ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
- # Use a header file that comes with gcc, so configuring glibc
- # with a fresh cross-compiler works.
- # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- # <limits.h> exists even on freestanding compilers.
- # On the NeXT, cc -E runs the code through the compiler's parser,
- # not just through cpp. "Syntax error" is here to catch this case.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
- Syntax error
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-
-else
- # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
- # OK, works on sane cases. Now check whether nonexistent headers
- # can be detected and how.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <ac_nonexistent.h>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
- # Broken: success on invalid input.
-continue
-else
- # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
-
-else
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5 ; }
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
-$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if ${ac_cv_path_GREP+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -z "$GREP"; then
- ac_path_GREP_found=false
- # Loop through the user's path and test for each of PROGNAME-LIST
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_prog in grep ggrep; do
- for ac_exec_ext in '' $ac_executable_extensions; do
- ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-# Check for GNU ac_path_GREP and select it if it is found.
- # Check for GNU $ac_path_GREP
-case `"$ac_path_GREP" --version 2>&1` in
-*GNU*)
- ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
-*)
- ac_count=0
- $as_echo_n 0123456789 >"conftest.in"
- while :
- do
- cat "conftest.in" "conftest.in" >"conftest.tmp"
- mv "conftest.tmp" "conftest.in"
- cp "conftest.in" "conftest.nl"
- $as_echo 'GREP' >> "conftest.nl"
- "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
- diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
- as_fn_arith $ac_count + 1 && ac_count=$as_val
- if test $ac_count -gt ${ac_path_GREP_max-0}; then
- # Best one so far, save it but keep looking for a better one
- ac_cv_path_GREP="$ac_path_GREP"
- ac_path_GREP_max=$ac_count
- fi
- # 10*(2^10) chars as input seems more than enough
- test $ac_count -gt 10 && break
- done
- rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
- $ac_path_GREP_found && break 3
- done
- done
- done
-IFS=$as_save_IFS
- if test -z "$ac_cv_path_GREP"; then
- as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
- fi
-else
- ac_cv_path_GREP=$GREP
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
-$as_echo "$ac_cv_path_GREP" >&6; }
- GREP="$ac_cv_path_GREP"
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
-$as_echo_n "checking for egrep... " >&6; }
-if ${ac_cv_path_EGREP+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
- then ac_cv_path_EGREP="$GREP -E"
- else
- if test -z "$EGREP"; then
- ac_path_EGREP_found=false
- # Loop through the user's path and test for each of PROGNAME-LIST
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_prog in egrep; do
- for ac_exec_ext in '' $ac_executable_extensions; do
- ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-# Check for GNU ac_path_EGREP and select it if it is found.
- # Check for GNU $ac_path_EGREP
-case `"$ac_path_EGREP" --version 2>&1` in
-*GNU*)
- ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
-*)
- ac_count=0
- $as_echo_n 0123456789 >"conftest.in"
- while :
- do
- cat "conftest.in" "conftest.in" >"conftest.tmp"
- mv "conftest.tmp" "conftest.in"
- cp "conftest.in" "conftest.nl"
- $as_echo 'EGREP' >> "conftest.nl"
- "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
- diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
- as_fn_arith $ac_count + 1 && ac_count=$as_val
- if test $ac_count -gt ${ac_path_EGREP_max-0}; then
- # Best one so far, save it but keep looking for a better one
- ac_cv_path_EGREP="$ac_path_EGREP"
- ac_path_EGREP_max=$ac_count
- fi
- # 10*(2^10) chars as input seems more than enough
- test $ac_count -gt 10 && break
- done
- rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
- $ac_path_EGREP_found && break 3
- done
- done
- done
-IFS=$as_save_IFS
- if test -z "$ac_cv_path_EGREP"; then
- as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
- fi
-else
- ac_cv_path_EGREP=$EGREP
-fi
-
- fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
-$as_echo "$ac_cv_path_EGREP" >&6; }
- EGREP="$ac_cv_path_EGREP"
-
-
-if test $ac_cv_c_compiler_gnu = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC needs -traditional" >&5
-$as_echo_n "checking whether $CC needs -traditional... " >&6; }
-if ${ac_cv_prog_gcc_traditional+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_pattern="Autoconf.*'x'"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <sgtty.h>
-Autoconf TIOCGETP
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "$ac_pattern" >/dev/null 2>&1; then :
- ac_cv_prog_gcc_traditional=yes
-else
- ac_cv_prog_gcc_traditional=no
-fi
-rm -f conftest*
-
-
- if test $ac_cv_prog_gcc_traditional = no; then
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <termio.h>
-Autoconf TCGETA
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "$ac_pattern" >/dev/null 2>&1; then :
- ac_cv_prog_gcc_traditional=yes
-fi
-rm -f conftest*
-
- fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_gcc_traditional" >&5
-$as_echo "$ac_cv_prog_gcc_traditional" >&6; }
- if test $ac_cv_prog_gcc_traditional = yes; then
- CC="$CC -traditional"
- fi
-fi
-
-ac_aux_dir=
-for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
- if test -f "$ac_dir/install-sh"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/install-sh -c"
- break
- elif test -f "$ac_dir/install.sh"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/install.sh -c"
- break
- elif test -f "$ac_dir/shtool"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/shtool install -c"
- break
- fi
-done
-if test -z "$ac_aux_dir"; then
- as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
-fi
-
-# These three variables are undocumented and unsupported,
-# and are intended to be withdrawn in a future Autoconf release.
-# They can cause serious problems if a builder's source tree is in a directory
-# whose full name contains unusual characters.
-ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var.
-ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var.
-ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
-
-
-# Find a good install program. We prefer a C program (faster),
-# so one script is as good as another. But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AmigaOS /C/install, which installs bootblocks on floppy discs
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# OS/2's system install, which has a completely different semantic
-# ./install, which can be erroneously created by make from ./install.sh.
-# Reject install programs that cannot install multiple files.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
-$as_echo_n "checking for a BSD-compatible install... " >&6; }
-if test -z "$INSTALL"; then
-if ${ac_cv_path_install+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in #((
- ./ | .// | /[cC]/* | \
- /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
- ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
- /usr/ucb/* ) ;;
- *)
- # OSF1 and SCO ODT 3.0 have their own names for install.
- # Don't use installbsd from OSF since it installs stuff as root
- # by default.
- for ac_prog in ginstall scoinst install; do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
- if test $ac_prog = install &&
- grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
- # AIX install. It has an incompatible calling convention.
- :
- elif test $ac_prog = install &&
- grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
- # program-specific install script used by HP pwplus--don't use.
- :
- else
- rm -rf conftest.one conftest.two conftest.dir
- echo one > conftest.one
- echo two > conftest.two
- mkdir conftest.dir
- if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
- test -s conftest.one && test -s conftest.two &&
- test -s conftest.dir/conftest.one &&
- test -s conftest.dir/conftest.two
- then
- ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
- break 3
- fi
- fi
- fi
- done
- done
- ;;
-esac
-
- done
-IFS=$as_save_IFS
-
-rm -rf conftest.one conftest.two conftest.dir
-
-fi
- if test "${ac_cv_path_install+set}" = set; then
- INSTALL=$ac_cv_path_install
- else
- # As a last resort, use the slow shell script. Don't cache a
- # value for INSTALL within a source directory, because that will
- # break other packages using the cache if that directory is
- # removed, or if the value is a relative name.
- INSTALL=$ac_install_sh
- fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
-$as_echo "$INSTALL" >&6; }
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-
-# Checks for compilation model.
-# Check whether --enable-largefile was given.
-if test "${enable_largefile+set}" = set; then :
- enableval=$enable_largefile;
-fi
-
-if test "$enable_largefile" != no; then
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5
-$as_echo_n "checking for special C compiler options needed for large files... " >&6; }
-if ${ac_cv_sys_largefile_CC+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_cv_sys_largefile_CC=no
- if test "$GCC" != yes; then
- ac_save_CC=$CC
- while :; do
- # IRIX 6.2 and later do not support large files by default,
- # so use the C compiler's -n32 option if that helps.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <sys/types.h>
- /* Check that off_t can represent 2**63 - 1 correctly.
- We can't simply define LARGE_OFF_T to be 9223372036854775807,
- since some C++ compilers masquerading as C compilers
- incorrectly reject 9223372036854775807. */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
- int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
- && LARGE_OFF_T % 2147483647 == 1)
- ? 1 : -1];
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
- if ac_fn_c_try_compile "$LINENO"; then :
- break
-fi
-rm -f core conftest.err conftest.$ac_objext
- CC="$CC -n32"
- if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_sys_largefile_CC=' -n32'; break
-fi
-rm -f core conftest.err conftest.$ac_objext
- break
- done
- CC=$ac_save_CC
- rm -f conftest.$ac_ext
- fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5
-$as_echo "$ac_cv_sys_largefile_CC" >&6; }
- if test "$ac_cv_sys_largefile_CC" != no; then
- CC=$CC$ac_cv_sys_largefile_CC
- fi
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5
-$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; }
-if ${ac_cv_sys_file_offset_bits+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- while :; do
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <sys/types.h>
- /* Check that off_t can represent 2**63 - 1 correctly.
- We can't simply define LARGE_OFF_T to be 9223372036854775807,
- since some C++ compilers masquerading as C compilers
- incorrectly reject 9223372036854775807. */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
- int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
- && LARGE_OFF_T % 2147483647 == 1)
- ? 1 : -1];
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_sys_file_offset_bits=no; break
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#define _FILE_OFFSET_BITS 64
-#include <sys/types.h>
- /* Check that off_t can represent 2**63 - 1 correctly.
- We can't simply define LARGE_OFF_T to be 9223372036854775807,
- since some C++ compilers masquerading as C compilers
- incorrectly reject 9223372036854775807. */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
- int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
- && LARGE_OFF_T % 2147483647 == 1)
- ? 1 : -1];
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_sys_file_offset_bits=64; break
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_cv_sys_file_offset_bits=unknown
- break
-done
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5
-$as_echo "$ac_cv_sys_file_offset_bits" >&6; }
-case $ac_cv_sys_file_offset_bits in #(
- no | unknown) ;;
- *)
-cat >>confdefs.h <<_ACEOF
-#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits
-_ACEOF
-;;
-esac
-rm -rf conftest*
- if test $ac_cv_sys_file_offset_bits = unknown; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5
-$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; }
-if ${ac_cv_sys_large_files+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- while :; do
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <sys/types.h>
- /* Check that off_t can represent 2**63 - 1 correctly.
- We can't simply define LARGE_OFF_T to be 9223372036854775807,
- since some C++ compilers masquerading as C compilers
- incorrectly reject 9223372036854775807. */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
- int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
- && LARGE_OFF_T % 2147483647 == 1)
- ? 1 : -1];
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_sys_large_files=no; break
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#define _LARGE_FILES 1
-#include <sys/types.h>
- /* Check that off_t can represent 2**63 - 1 correctly.
- We can't simply define LARGE_OFF_T to be 9223372036854775807,
- since some C++ compilers masquerading as C compilers
- incorrectly reject 9223372036854775807. */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
- int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
- && LARGE_OFF_T % 2147483647 == 1)
- ? 1 : -1];
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_sys_large_files=1; break
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_cv_sys_large_files=unknown
- break
-done
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5
-$as_echo "$ac_cv_sys_large_files" >&6; }
-case $ac_cv_sys_large_files in #(
- no | unknown) ;;
- *)
-cat >>confdefs.h <<_ACEOF
-#define _LARGE_FILES $ac_cv_sys_large_files
-_ACEOF
-;;
-esac
-rm -rf conftest*
- fi
-fi
-
-
-# Checks for general libraries.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgoto in -ltinfo" >&5
-$as_echo_n "checking for tgoto in -ltinfo... " >&6; }
-if ${ac_cv_lib_tinfo_tgoto+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-ltinfo $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char tgoto ();
-int
-main ()
-{
-return tgoto ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_tinfo_tgoto=yes
-else
- ac_cv_lib_tinfo_tgoto=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tinfo_tgoto" >&5
-$as_echo "$ac_cv_lib_tinfo_tgoto" >&6; }
-if test "x$ac_cv_lib_tinfo_tgoto" = xyes; then :
- have_tinfo=yes
-else
- have_tinfo=no
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for initscr in -lxcurses" >&5
-$as_echo_n "checking for initscr in -lxcurses... " >&6; }
-if ${ac_cv_lib_xcurses_initscr+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lxcurses $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char initscr ();
-int
-main ()
-{
-return initscr ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_xcurses_initscr=yes
-else
- ac_cv_lib_xcurses_initscr=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_xcurses_initscr" >&5
-$as_echo "$ac_cv_lib_xcurses_initscr" >&6; }
-if test "x$ac_cv_lib_xcurses_initscr" = xyes; then :
- have_xcurses=yes
-else
- have_xcurses=no
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for initscr in -lncursesw" >&5
-$as_echo_n "checking for initscr in -lncursesw... " >&6; }
-if ${ac_cv_lib_ncursesw_initscr+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lncursesw $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char initscr ();
-int
-main ()
-{
-return initscr ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_ncursesw_initscr=yes
-else
- ac_cv_lib_ncursesw_initscr=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncursesw_initscr" >&5
-$as_echo "$ac_cv_lib_ncursesw_initscr" >&6; }
-if test "x$ac_cv_lib_ncursesw_initscr" = xyes; then :
- have_ncursesw=yes
-else
- have_ncursesw=no
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for initscr in -lncurses" >&5
-$as_echo_n "checking for initscr in -lncurses... " >&6; }
-if ${ac_cv_lib_ncurses_initscr+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lncurses $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char initscr ();
-int
-main ()
-{
-return initscr ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_ncurses_initscr=yes
-else
- ac_cv_lib_ncurses_initscr=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncurses_initscr" >&5
-$as_echo "$ac_cv_lib_ncurses_initscr" >&6; }
-if test "x$ac_cv_lib_ncurses_initscr" = xyes; then :
- have_ncurses=yes
-else
- have_ncurses=no
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for initscr in -lcurses" >&5
-$as_echo_n "checking for initscr in -lcurses... " >&6; }
-if ${ac_cv_lib_curses_initscr+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lcurses $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char initscr ();
-int
-main ()
-{
-return initscr ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_curses_initscr=yes
-else
- ac_cv_lib_curses_initscr=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_curses_initscr" >&5
-$as_echo "$ac_cv_lib_curses_initscr" >&6; }
-if test "x$ac_cv_lib_curses_initscr" = xyes; then :
- have_curses=yes
-else
- have_curses=no
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -ltermcap" >&5
-$as_echo_n "checking for tgetent in -ltermcap... " >&6; }
-if ${ac_cv_lib_termcap_tgetent+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-ltermcap $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char tgetent ();
-int
-main ()
-{
-return tgetent ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_termcap_tgetent=yes
-else
- ac_cv_lib_termcap_tgetent=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_termcap_tgetent" >&5
-$as_echo "$ac_cv_lib_termcap_tgetent" >&6; }
-if test "x$ac_cv_lib_termcap_tgetent" = xyes; then :
- have_termcap=yes
-else
- have_termcap=no
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -ltermlib" >&5
-$as_echo_n "checking for tgetent in -ltermlib... " >&6; }
-if ${ac_cv_lib_termlib_tgetent+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-ltermlib $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char tgetent ();
-int
-main ()
-{
-return tgetent ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_termlib_tgetent=yes
-else
- ac_cv_lib_termlib_tgetent=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_termlib_tgetent" >&5
-$as_echo "$ac_cv_lib_termlib_tgetent" >&6; }
-if test "x$ac_cv_lib_termlib_tgetent" = xyes; then :
- have_termlib=yes
-else
- have_termlib=no
-fi
-
-# Regular expressions (regcmp) are in -lgen on Solaris 2, (but in libc
-# at least on Solaris 10 (2.10)) and in -lintl on SCO Unix.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing regcmp" >&5
-$as_echo_n "checking for library containing regcmp... " >&6; }
-if ${ac_cv_search_regcmp+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_func_search_save_LIBS=$LIBS
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char regcmp ();
-int
-main ()
-{
-return regcmp ();
- ;
- return 0;
-}
-_ACEOF
-for ac_lib in '' gen intl PW; do
- if test -z "$ac_lib"; then
- ac_res="none required"
- else
- ac_res=-l$ac_lib
- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
- fi
- if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_search_regcmp=$ac_res
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext
- if ${ac_cv_search_regcmp+:} false; then :
- break
-fi
-done
-if ${ac_cv_search_regcmp+:} false; then :
-
-else
- ac_cv_search_regcmp=no
-fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_regcmp" >&5
-$as_echo "$ac_cv_search_regcmp" >&6; }
-ac_res=$ac_cv_search_regcmp
-if test "$ac_res" != no; then :
- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-
-fi
-
-
-# Checks for terminal libraries
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working terminal libraries" >&5
-$as_echo_n "checking for working terminal libraries... " >&6; }
-TERMLIBS=
-
-# Check for systems where curses is broken.
-curses_broken=0
-if test x`uname -s` = "xHP-UX" >/dev/null 2>&1; then
-if test x`uname -r` = "xB.11.00" >/dev/null 2>&1; then
- curses_broken=1
-fi
-if test x`uname -r` = "xB.11.11" >/dev/null 2>&1; then
- curses_broken=1
-fi
-fi
-
-if test $curses_broken = 0; then
-
-# -- Try tinfo.
-if test "x$TERMLIBS" = x; then
- if test $have_tinfo = yes; then
- TERMLIBS="-ltinfo"
- SAVE_LIBS=$LIBS
- LIBS="$LIBS $TERMLIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- termok=yes
-else
- termok=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$SAVE_LIBS
- if test $termok = no; then TERMLIBS=""; fi
- fi
-fi
-
-# -- Try xcurses.
-if test "x$TERMLIBS" = x; then
- if test $have_xcurses = yes; then
- TERMLIBS="-lxcurses"
- SAVE_LIBS=$LIBS
- LIBS="$LIBS $TERMLIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- termok=yes
-else
- termok=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$SAVE_LIBS
- if test $termok = no; then TERMLIBS=""; fi
- fi
-fi
-
-# -- Try ncursesw.
-if test "x$TERMLIBS" = x; then
- if test $have_ncursesw = yes; then
- TERMLIBS="-lncursesw"
- SAVE_LIBS=$LIBS
- LIBS="$LIBS $TERMLIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- termok=yes
-else
- termok=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$SAVE_LIBS
- if test $termok = no; then TERMLIBS=""; fi
- fi
-fi
-
-# -- Try ncurses.
-if test "x$TERMLIBS" = x; then
- if test $have_ncurses = yes; then
- TERMLIBS="-lncurses"
- SAVE_LIBS=$LIBS
- LIBS="$LIBS $TERMLIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- termok=yes
-else
- termok=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$SAVE_LIBS
- if test $termok = no; then TERMLIBS=""; fi
- fi
-fi
-
-# -- Try curses.
-if test "x$TERMLIBS" = x; then
- if test $have_curses = yes; then
- TERMLIBS="-lcurses"
- SAVE_LIBS=$LIBS
- LIBS="$LIBS $TERMLIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- termok=yes
-else
- termok=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$SAVE_LIBS
- if test $termok = no; then TERMLIBS=""; fi
- fi
-fi
-
-# -- Try curses & termcap.
-if test "x$TERMLIBS" = x; then
- if test $have_curses = yes; then
- if test $have_termcap = yes; then
- TERMLIBS="-lcurses -ltermcap"
- SAVE_LIBS=$LIBS
- LIBS="$LIBS $TERMLIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- termok=yes
-else
- termok=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$SAVE_LIBS
- if test $termok = no; then TERMLIBS=""; fi
- fi
- fi
-fi
-fi
-
-# -- Try termcap.
-if test "x$TERMLIBS" = x; then
- if test $have_termcap = yes; then
- TERMLIBS="-ltermcap"
- SAVE_LIBS=$LIBS
- LIBS="$LIBS $TERMLIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- termok=yes
-else
- termok=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$SAVE_LIBS
- if test $termok = no; then TERMLIBS=""; fi
- fi
-fi
-
-# -- Try termlib.
-if test "x$TERMLIBS" = x; then
- if test $have_termlib = yes; then
- TERMLIBS="-lcurses -ltermlib"
- SAVE_LIBS=$LIBS
- LIBS="$LIBS $TERMLIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- termok=yes
-else
- termok=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$SAVE_LIBS
- if test $termok = no; then TERMLIBS=""; fi
- fi
-fi
-
-if test "x$TERMLIBS" = x; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: Cannot find terminal libraries - configure failed" >&5
-$as_echo "Cannot find terminal libraries - configure failed" >&6; }
- exit 1
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: using $TERMLIBS" >&5
-$as_echo "using $TERMLIBS" >&6; }
-LIBS="$LIBS $TERMLIBS"
-
-# Checks for header files.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
-$as_echo_n "checking for ANSI C header files... " >&6; }
-if ${ac_cv_header_stdc+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_header_stdc=yes
-else
- ac_cv_header_stdc=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-if test $ac_cv_header_stdc = yes; then
- # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <string.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "memchr" >/dev/null 2>&1; then :
-
-else
- ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
- # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <stdlib.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "free" >/dev/null 2>&1; then :
-
-else
- ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
- # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
- if test "$cross_compiling" = yes; then :
- :
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <ctype.h>
-#include <stdlib.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
- (('a' <= (c) && (c) <= 'i') \
- || ('j' <= (c) && (c) <= 'r') \
- || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
-
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int
-main ()
-{
- int i;
- for (i = 0; i < 256; i++)
- if (XOR (islower (i), ISLOWER (i))
- || toupper (i) != TOUPPER (i))
- return 2;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-
-else
- ac_cv_header_stdc=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
-$as_echo "$ac_cv_header_stdc" >&6; }
-if test $ac_cv_header_stdc = yes; then
-
-$as_echo "#define STDC_HEADERS 1" >>confdefs.h
-
-fi
-
-# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
- inttypes.h stdint.h unistd.h
-do :
- as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
-"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-for ac_header in ctype.h errno.h fcntl.h limits.h stdio.h stdlib.h string.h termcap.h termio.h termios.h time.h unistd.h values.h sys/ioctl.h sys/stream.h wctype.h
-do :
- as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-# Checks for typedefs, structures, and compiler characteristics.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat file-mode macros are broken" >&5
-$as_echo_n "checking whether stat file-mode macros are broken... " >&6; }
-if ${ac_cv_header_stat_broken+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#if defined S_ISBLK && defined S_IFDIR
-extern char c1[S_ISBLK (S_IFDIR) ? -1 : 1];
-#endif
-
-#if defined S_ISBLK && defined S_IFCHR
-extern char c2[S_ISBLK (S_IFCHR) ? -1 : 1];
-#endif
-
-#if defined S_ISLNK && defined S_IFREG
-extern char c3[S_ISLNK (S_IFREG) ? -1 : 1];
-#endif
-
-#if defined S_ISSOCK && defined S_IFREG
-extern char c4[S_ISSOCK (S_IFREG) ? -1 : 1];
-#endif
-
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_header_stat_broken=no
-else
- ac_cv_header_stat_broken=yes
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stat_broken" >&5
-$as_echo "$ac_cv_header_stat_broken" >&6; }
-if test $ac_cv_header_stat_broken = yes; then
-
-$as_echo "#define STAT_MACROS_BROKEN 1" >>confdefs.h
-
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
-$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
-if ${ac_cv_c_const+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-/* FIXME: Include the comments suggested by Paul. */
-#ifndef __cplusplus
- /* Ultrix mips cc rejects this. */
- typedef int charset[2];
- const charset cs;
- /* SunOS 4.1.1 cc rejects this. */
- char const *const *pcpcc;
- char **ppc;
- /* NEC SVR4.0.2 mips cc rejects this. */
- struct point {int x, y;};
- static struct point const zero = {0,0};
- /* AIX XL C 1.02.0.0 rejects this.
- It does not let you subtract one const X* pointer from another in
- an arm of an if-expression whose if-part is not a constant
- expression */
- const char *g = "string";
- pcpcc = &g + (g ? g-g : 0);
- /* HPUX 7.0 cc rejects these. */
- ++pcpcc;
- ppc = (char**) pcpcc;
- pcpcc = (char const *const *) ppc;
- { /* SCO 3.2v4 cc rejects this. */
- char *t;
- char const *s = 0 ? (char *) 0 : (char const *) 0;
-
- *t++ = 0;
- if (s) return 0;
- }
- { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */
- int x[] = {25, 17};
- const int *foo = &x[0];
- ++foo;
- }
- { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
- typedef const int *iptr;
- iptr p = 0;
- ++p;
- }
- { /* AIX XL C 1.02.0.0 rejects this saying
- "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
- struct s { int j; const int *ap[3]; };
- struct s *b; b->j = 5;
- }
- { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
- const int foo = 10;
- if (!foo) return 0;
- }
- return !cs[0] && !zero.x;
-#endif
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_c_const=yes
-else
- ac_cv_c_const=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5
-$as_echo "$ac_cv_c_const" >&6; }
-if test $ac_cv_c_const = no; then
-
-$as_echo "#define const /**/" >>confdefs.h
-
-fi
-
-ac_fn_c_check_type "$LINENO" "off_t" "ac_cv_type_off_t" "$ac_includes_default"
-if test "x$ac_cv_type_off_t" = xyes; then :
-
-else
-
-cat >>confdefs.h <<_ACEOF
-#define off_t long int
-_ACEOF
-
-fi
-
-ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
-if test "x$ac_cv_type_size_t" = xyes; then :
-
-else
-
-cat >>confdefs.h <<_ACEOF
-#define size_t unsigned int
-_ACEOF
-
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5
-$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; }
-if ${ac_cv_header_time+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <sys/types.h>
-#include <sys/time.h>
-#include <time.h>
-
-int
-main ()
-{
-if ((struct tm *) 0)
-return 0;
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_header_time=yes
-else
- ac_cv_header_time=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_time" >&5
-$as_echo "$ac_cv_header_time" >&6; }
-if test $ac_cv_header_time = yes; then
-
-$as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h
-
-fi
-
-
-# Autoheader templates for symbols defined later by AC_DEFINE.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-# Checks for identifiers.
-ac_fn_c_check_type "$LINENO" "off_t" "ac_cv_type_off_t" "$ac_includes_default"
-if test "x$ac_cv_type_off_t" = xyes; then :
-
-else
-
-cat >>confdefs.h <<_ACEOF
-#define off_t long int
-_ACEOF
-
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for void" >&5
-$as_echo_n "checking for void... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-void *foo = 0;
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }; $as_echo "#define HAVE_VOID 1" >>confdefs.h
-
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for const" >&5
-$as_echo_n "checking for const... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-const int foo = 0;
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }; $as_echo "#define HAVE_CONST 1" >>confdefs.h
-
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for time_t" >&5
-$as_echo_n "checking for time_t... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <time.h>
-int
-main ()
-{
-time_t t = 0;
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }; $as_echo "#define HAVE_TIME_T 1" >>confdefs.h
-
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for st_ino in struct stat" >&5
-$as_echo_n "checking for st_ino in struct stat... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <sys/types.h>
-#include <sys/stat.h>
-int
-main ()
-{
-struct stat s; dev_t dev = s.st_dev; ino_t ino = s.st_ino;
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }; $as_echo "#define HAVE_STAT_INO 1" >>confdefs.h
-
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-# Checks for library functions.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5
-$as_echo_n "checking return type of signal handlers... " >&6; }
-if ${ac_cv_type_signal+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <sys/types.h>
-#include <signal.h>
-
-int
-main ()
-{
-return *(signal (0, 0)) (0) == 1;
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_type_signal=int
-else
- ac_cv_type_signal=void
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_signal" >&5
-$as_echo "$ac_cv_type_signal" >&6; }
-
-cat >>confdefs.h <<_ACEOF
-#define RETSIGTYPE $ac_cv_type_signal
-_ACEOF
-
-
-for ac_func in fsync popen _setjmp sigprocmask sigsetmask snprintf stat system fchmod
-do :
- as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-
-# AC_CHECK_FUNCS may not work for inline functions, so test these separately.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for memcpy" >&5
-$as_echo_n "checking for memcpy... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-#if HAVE_STRING_H
-#include <string.h>
-#endif
-int
-main ()
-{
-memcpy(0,0,0);
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }; $as_echo "#define HAVE_MEMCPY 1" >>confdefs.h
-
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for strchr" >&5
-$as_echo_n "checking for strchr... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-#if HAVE_STRING_H
-#include <string.h>
-#endif
-int
-main ()
-{
-strchr("x",'x');
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }; $as_echo "#define HAVE_STRCHR 1" >>confdefs.h
-
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for strstr" >&5
-$as_echo_n "checking for strstr... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-#if HAVE_STRING_H
-#include <string.h>
-#endif
-int
-main ()
-{
-strstr("x","x");
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }; $as_echo "#define HAVE_STRSTR 1" >>confdefs.h
-
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-
-# Some systems have termios.h but not the corresponding functions.
-ac_fn_c_check_func "$LINENO" "tcgetattr" "ac_cv_func_tcgetattr"
-if test "x$ac_cv_func_tcgetattr" = xyes; then :
- $as_echo "#define HAVE_TERMIOS_FUNCS 1" >>confdefs.h
-
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fileno" >&5
-$as_echo_n "checking for fileno... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-#if HAVE_STDIO_H
-#include <stdio.h>
-#endif
-int
-main ()
-{
-static int x; x = fileno(stdin);
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }; $as_echo "#define HAVE_FILENO 1" >>confdefs.h
-
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for strerror" >&5
-$as_echo_n "checking for strerror... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-#if HAVE_STDIO_H
-#include <stdio.h>
-#endif
-#if HAVE_STRING_H
-#include <string.h>
-#endif
-#if HAVE_ERRNO_H
-#include <errno.h>
-#endif
-int
-main ()
-{
-static char *x; x = strerror(0);
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }; $as_echo "#define HAVE_STRERROR 1" >>confdefs.h
-
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sys_errlist" >&5
-$as_echo_n "checking for sys_errlist... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-extern char *sys_errlist[]; static char **x; x = sys_errlist;
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }; $as_echo "#define HAVE_SYS_ERRLIST 1" >>confdefs.h
-
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-
-ac_fn_c_check_type "$LINENO" "sigset_t" "ac_cv_type_sigset_t" "#include <signal.h>
-"
-if test "x$ac_cv_type_sigset_t" = xyes; then :
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_SIGSET_T 1
-_ACEOF
-
-
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sigemptyset" >&5
-$as_echo_n "checking for sigemptyset... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-#include <signal.h>
-
-int
-main ()
-{
-sigset_t s; sigemptyset(&s);
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }; $as_echo "#define HAVE_SIGEMPTYSET 1" >>confdefs.h
-
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-
-have_errno=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for errno" >&5
-$as_echo_n "checking for errno... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-#if HAVE_ERRNO_H
-#include <errno.h>
-#endif
-int
-main ()
-{
-static int x; x = errno;
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes - in errno.h" >&5
-$as_echo "yes - in errno.h" >&6; }; $as_echo "#define HAVE_ERRNO 1" >>confdefs.h
- have_errno=yes
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-if test $have_errno = no; then
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-#if HAVE_ERRNO_H
-#include <errno.h>
-#endif
-int
-main ()
-{
-extern int errno; static int x; x = errno;
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes - must define" >&5
-$as_echo "yes - must define" >&6; }; $as_echo "#define HAVE_ERRNO 1" >>confdefs.h
- $as_echo "#define MUST_DEFINE_ERRNO 1" >>confdefs.h
-
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for locale" >&5
-$as_echo_n "checking for locale... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <locale.h>
-#include <ctype.h>
-#include <langinfo.h>
-int
-main ()
-{
-setlocale(LC_CTYPE,""); isprint(0); iscntrl(0);
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }; $as_echo "#define HAVE_LOCALE 1" >>confdefs.h
-
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ctype functions" >&5
-$as_echo_n "checking for ctype functions... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-#if HAVE_CTYPE_H
-#include <ctype.h>
-#endif
-int
-main ()
-{
-static int x; x = isupper(x); x = tolower(x); x = toupper(x);
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }; $as_echo "#define HAVE_UPPER_LOWER 1" >>confdefs.h
-
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for wctype functions" >&5
-$as_echo_n "checking for wctype functions... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <wctype.h>
-int
-main ()
-{
-iswlower(0); iswupper(0); towlower(0); towupper(0);
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }; $as_echo "#define HAVE_WCTYPE 1" >>confdefs.h
-
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-
-# Checks for external variable ospeed in the termcap library.
-have_ospeed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking termcap for ospeed" >&5
-$as_echo_n "checking termcap for ospeed... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-#include <sys/types.h>
-#if HAVE_TERMIOS_H
-#include <termios.h>
-#endif
-#if HAVE_TERMCAP_H
-#include <termcap.h>
-#endif
-int
-main ()
-{
-ospeed = 0;
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes - in termcap.h" >&5
-$as_echo "yes - in termcap.h" >&6; }; $as_echo "#define HAVE_OSPEED 1" >>confdefs.h
- have_ospeed=yes
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-if test $have_ospeed = no; then
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-extern short ospeed; ospeed = 0;
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes - must define" >&5
-$as_echo "yes - must define" >&6; }; $as_echo "#define HAVE_OSPEED 1" >>confdefs.h
- $as_echo "#define MUST_DEFINE_OSPEED 1" >>confdefs.h
-
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-fi
-
-# Compile in secure mode?
-
-# Check whether --with-secure was given.
-if test "${with_secure+set}" = set; then :
- withval=$with_secure; $as_echo "#define SECURE_COMPILE 1" >>confdefs.h
-
-else
- $as_echo "#define SECURE_COMPILE 0" >>confdefs.h
-
-fi
-
-
-# Should we use floating point?
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for floating point" >&5
-$as_echo_n "checking for floating point... " >&6; }
-
-# Check whether --with-no-float was given.
-if test "${with_no_float+set}" = set; then :
- withval=$with_no_float; WANT_NO_FLOAT=1
-else
- WANT_NO_FLOAT=0
-fi
-
-if test $WANT_NO_FLOAT = 0; then
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-double f1 = 12.5; double f2 = f1*f1/2.5;
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }; $as_echo "#define HAVE_FLOAT 1" >>confdefs.h
-
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled by user" >&5
-$as_echo "disabled by user" >&6; }
-fi
-
-# Checks for regular expression functions.
-have_regex=no
-have_posix_regex=unknown
-supported_regex=""
-
-# Select a regular expression library.
-WANT_REGEX=auto
-
-# Check whether --with-regex was given.
-if test "${with_regex+set}" = set; then :
- withval=$with_regex; WANT_REGEX="$withval"
-fi
-
-
-if test $have_regex = no; then
-if test $WANT_REGEX = auto -o $WANT_REGEX = posix; then
-# Some versions of Solaris have a regcomp() function, but it doesn't work!
-# So we run a test program. If we're cross-compiling, do it the old way.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for POSIX regcomp" >&5
-$as_echo_n "checking for POSIX regcomp... " >&6; }
-if test "$cross_compiling" = yes; then :
- have_posix_regex=unknown
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-#include <sys/types.h>
-#include <regex.h>
-main() { regex_t r; regmatch_t rm; char *text = "xabcy";
-if (regcomp(&r, "abc", 0)) exit(1);
-if (regexec(&r, text, 1, &rm, 0)) exit(1);
-#ifndef __WATCOMC__
-if (rm.rm_so != 1) exit(1); /* check for correct offset */
-#else
-if (rm.rm_sp != text + 1) exit(1); /* check for correct offset */
-#endif
-exit(0); }
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
- have_posix_regex=yes
-else
- have_posix_regex=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-if test $have_posix_regex = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
- $as_echo "#define HAVE_POSIX_REGCOMP 1" >>confdefs.h
- supported_regex="$supported_regex posix"
- have_regex=yes
-elif test $have_posix_regex = unknown; then
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-#include <sys/types.h>
-#include <regex.h>
-int
-main ()
-{
-regex_t *r; regfree(r);
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
- $as_echo "#define HAVE_POSIX_REGCOMP 1" >>confdefs.h
- have_regex=yes; supported_regex="$supported_regex posix"
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-fi
-fi
-
-if test $have_regex = no; then
-if test $WANT_REGEX = auto -o $WANT_REGEX = pcre; then
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pcre_compile in -lpcre" >&5
-$as_echo_n "checking for pcre_compile in -lpcre... " >&6; }
-if ${ac_cv_lib_pcre_pcre_compile+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpcre $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char pcre_compile ();
-int
-main ()
-{
-return pcre_compile ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_pcre_pcre_compile=yes
-else
- ac_cv_lib_pcre_pcre_compile=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pcre_pcre_compile" >&5
-$as_echo "$ac_cv_lib_pcre_pcre_compile" >&6; }
-if test "x$ac_cv_lib_pcre_pcre_compile" = xyes; then :
- $as_echo "#define HAVE_PCRE 1" >>confdefs.h
- LIBS="$LIBS -lpcre" have_regex=yes; supported_regex="$supported_regex pcre"
-fi
-
-fi
-fi
-
-if test $have_regex = no; then
-if test $WANT_REGEX = auto -o $WANT_REGEX = gnu; then
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for re_compile_pattern in -lc" >&5
-$as_echo_n "checking for re_compile_pattern in -lc... " >&6; }
-if ${ac_cv_lib_c_re_compile_pattern+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lc $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char re_compile_pattern ();
-int
-main ()
-{
-return re_compile_pattern ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_c_re_compile_pattern=yes
-else
- ac_cv_lib_c_re_compile_pattern=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_re_compile_pattern" >&5
-$as_echo "$ac_cv_lib_c_re_compile_pattern" >&6; }
-if test "x$ac_cv_lib_c_re_compile_pattern" = xyes; then :
- $as_echo "#define HAVE_GNU_REGEX 1" >>confdefs.h
- have_regex=yes; supported_regex="$supported_regex gnu"
-fi
-
-fi
-fi
-
-if test $have_regex = no; then
-if test $WANT_REGEX = auto -o $WANT_REGEX = regcmp; then
-ac_fn_c_check_func "$LINENO" "regcmp" "ac_cv_func_regcmp"
-if test "x$ac_cv_func_regcmp" = xyes; then :
- $as_echo "#define HAVE_REGCMP 1" >>confdefs.h
- have_regex=yes; supported_regex="$supported_regex regcmp"
-fi
-
-fi
-fi
-
-if test $have_regex = no; then
-if test $WANT_REGEX = auto -o $WANT_REGEX = regcomp; then
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for V8 regcomp" >&5
-$as_echo_n "checking for V8 regcomp... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-#include "regexp.h"
-int
-main ()
-{
-regcomp("");
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }; $as_echo "#define HAVE_V8_REGCOMP 1" >>confdefs.h
- have_regex=yes; supported_regex="$supported_regex regcomp"
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-fi
-fi
-
-if test $have_regex = no && test -f ${srcdir}/regexp.c; then
-if test $WANT_REGEX = auto -o $WANT_REGEX = regcomp-local; then
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: using V8 regcomp -- local source" >&5
-$as_echo "using V8 regcomp -- local source" >&6; }; $as_echo "#define HAVE_V8_REGCOMP 1" >>confdefs.h
-
-supported_regex="$supported_regex regcomp-local"
-$as_echo "#define HAVE_REGEXEC2 1" >>confdefs.h
- REGEX_O='regexp.$(O)' have_regex=yes
-fi
-fi
-
-if test $have_regex = no; then
-if test $WANT_REGEX = auto -o $WANT_REGEX = re_comp; then
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for re_comp" >&5
-$as_echo_n "checking for re_comp... " >&6; }
-ac_fn_c_check_func "$LINENO" "re_comp" "ac_cv_func_re_comp"
-if test "x$ac_cv_func_re_comp" = xyes; then :
- $as_echo "#define HAVE_RE_COMP 1" >>confdefs.h
- have_regex=yes; supported_regex="$supported_regex re_comp"
-fi
-
-fi
-fi
-
-if test $have_regex = no; then
-if test $WANT_REGEX = auto -o $WANT_REGEX = none; then
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: using no regex" >&5
-$as_echo "using no regex" >&6; }
-else
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot find regular expression library" >&5
-$as_echo "$as_me: WARNING: cannot find regular expression library" >&2;}
-fi
-$as_echo "#define NO_REGEX 1" >>confdefs.h
- supported_regex="$supported_regex none"
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: regular expression library: $supported_regex" >&5
-$as_echo "regular expression library: $supported_regex" >&6; }
-
-
-# Check whether --with-editor was given.
-if test "${with_editor+set}" = set; then :
- withval=$with_editor; cat >>confdefs.h <<_ACEOF
-#define EDIT_PGM "$withval"
-_ACEOF
-
-else
- $as_echo "#define EDIT_PGM \"vi\"" >>confdefs.h
-
-fi
-
-
-
-
-ac_config_files="$ac_config_files Makefile"
-
-cat >confcache <<\_ACEOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs, see configure's option --config-cache.
-# It is not useful on other systems. If it contains results you don't
-# want to keep, you may remove or edit it.
-#
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
-#
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
-
-_ACEOF
-
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, we kill variables containing newlines.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(
- for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
- eval ac_val=\$$ac_var
- case $ac_val in #(
- *${as_nl}*)
- case $ac_var in #(
- *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
- esac
- case $ac_var in #(
- _ | IFS | as_nl) ;; #(
- BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
- *) { eval $ac_var=; unset $ac_var;} ;;
- esac ;;
- esac
- done
-
- (set) 2>&1 |
- case $as_nl`(ac_space=' '; set) 2>&1` in #(
- *${as_nl}ac_space=\ *)
- # `set' does not quote correctly, so add quotes: double-quote
- # substitution turns \\\\ into \\, and sed turns \\ into \.
- sed -n \
- "s/'/'\\\\''/g;
- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
- ;; #(
- *)
- # `set' quotes correctly as required by POSIX, so do not add quotes.
- sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
- ;;
- esac |
- sort
-) |
- sed '
- /^ac_cv_env_/b end
- t clear
- :clear
- s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
- t end
- s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
- :end' >>confcache
-if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
- if test -w "$cache_file"; then
- if test "x$cache_file" != "x/dev/null"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
-$as_echo "$as_me: updating cache $cache_file" >&6;}
- if test ! -f "$cache_file" || test -h "$cache_file"; then
- cat confcache >"$cache_file"
- else
- case $cache_file in #(
- */* | ?:*)
- mv -f confcache "$cache_file"$$ &&
- mv -f "$cache_file"$$ "$cache_file" ;; #(
- *)
- mv -f confcache "$cache_file" ;;
- esac
- fi
- fi
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
-$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
- fi
-fi
-rm -f confcache
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-DEFS=-DHAVE_CONFIG_H
-
-ac_libobjs=
-ac_ltlibobjs=
-U=
-for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
- # 1. Remove the extension, and $U if already installed.
- ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
- ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
- # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
- # will be set to the directory where LIBOBJS objects are built.
- as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
- as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
-done
-LIBOBJS=$ac_libobjs
-
-LTLIBOBJS=$ac_ltlibobjs
-
-
-
-: "${CONFIG_STATUS=./config.status}"
-ac_write_fail=0
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
-$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
-as_write_fail=0
-cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
-#! $SHELL
-# Generated by $as_me.
-# Run this file to recreate the current configuration.
-# Compiler output produced by configure, useful for debugging
-# configure, is in config.log if it exists.
-
-debug=false
-ac_cs_recheck=false
-ac_cs_silent=false
-
-SHELL=\${CONFIG_SHELL-$SHELL}
-export SHELL
-_ASEOF
-cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
-## -------------------- ##
-## M4sh Initialization. ##
-## -------------------- ##
-
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
- emulate sh
- NULLCMD=:
- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
- # is contrary to our usage. Disable this feature.
- alias -g '${1+"$@"}'='"$@"'
- setopt NO_GLOB_SUBST
-else
- case `(set -o) 2>/dev/null` in #(
- *posix*) :
- set -o posix ;; #(
- *) :
- ;;
-esac
-fi
-
-
-as_nl='
-'
-export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
- && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
- as_echo='print -r --'
- as_echo_n='print -rn --'
-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
- as_echo='printf %s\n'
- as_echo_n='printf %s'
-else
- if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
- as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
- as_echo_n='/usr/ucb/echo -n'
- else
- as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
- as_echo_n_body='eval
- arg=$1;
- case $arg in #(
- *"$as_nl"*)
- expr "X$arg" : "X\\(.*\\)$as_nl";
- arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
- esac;
- expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
- '
- export as_echo_n_body
- as_echo_n='sh -c $as_echo_n_body as_echo'
- fi
- export as_echo_body
- as_echo='sh -c $as_echo_body as_echo'
-fi
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
- PATH_SEPARATOR=:
- (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
- (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
- PATH_SEPARATOR=';'
- }
-fi
-
-
-# IFS
-# We need space, tab and new line, in precisely that order. Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-IFS=" "" $as_nl"
-
-# Find who we are. Look in the path if we contain no directory separator.
-as_myself=
-case $0 in #((
- *[\\/]* ) as_myself=$0 ;;
- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
- done
-IFS=$as_save_IFS
-
- ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
- as_myself=$0
-fi
-if test ! -f "$as_myself"; then
- $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
- exit 1
-fi
-
-# Unset variables that we do not need and which cause bugs (e.g. in
-# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1"
-# suppresses any "Segmentation fault" message there. '((' could
-# trigger a bug in pdksh 5.2.14.
-for as_var in BASH_ENV ENV MAIL MAILPATH
-do eval test x\${$as_var+set} = xset \
- && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-
-# as_fn_error STATUS ERROR [LINENO LOG_FD]
-# ----------------------------------------
-# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
-# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with STATUS, using 1 if that was 0.
-as_fn_error ()
-{
- as_status=$1; test $as_status -eq 0 && as_status=1
- if test "$4"; then
- as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
- fi
- $as_echo "$as_me: error: $2" >&2
- as_fn_exit $as_status
-} # as_fn_error
-
-
-# as_fn_set_status STATUS
-# -----------------------
-# Set $? to STATUS, without forking.
-as_fn_set_status ()
-{
- return $1
-} # as_fn_set_status
-
-# as_fn_exit STATUS
-# -----------------
-# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
-as_fn_exit ()
-{
- set +e
- as_fn_set_status $1
- exit $1
-} # as_fn_exit
-
-# as_fn_unset VAR
-# ---------------
-# Portably unset VAR.
-as_fn_unset ()
-{
- { eval $1=; unset $1;}
-}
-as_unset=as_fn_unset
-# as_fn_append VAR VALUE
-# ----------------------
-# Append the text in VALUE to the end of the definition contained in VAR. Take
-# advantage of any shell optimizations that allow amortized linear growth over
-# repeated appends, instead of the typical quadratic growth present in naive
-# implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
- eval 'as_fn_append ()
- {
- eval $1+=\$2
- }'
-else
- as_fn_append ()
- {
- eval $1=\$$1\$2
- }
-fi # as_fn_append
-
-# as_fn_arith ARG...
-# ------------------
-# Perform arithmetic evaluation on the ARGs, and store the result in the
-# global $as_val. Take advantage of shells that can avoid forks. The arguments
-# must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
- eval 'as_fn_arith ()
- {
- as_val=$(( $* ))
- }'
-else
- as_fn_arith ()
- {
- as_val=`expr "$@" || test $? -eq 1`
- }
-fi # as_fn_arith
-
-
-if expr a : '\(a\)' >/dev/null 2>&1 &&
- test "X`expr 00001 : '.*\(...\)'`" = X001; then
- as_expr=expr
-else
- as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
- as_basename=basename
-else
- as_basename=false
-fi
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
- as_dirname=dirname
-else
- as_dirname=false
-fi
-
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
- X"$0" : 'X\(//\)$' \| \
- X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
- sed '/^.*\/\([^/][^/]*\)\/*$/{
- s//\1/
- q
- }
- /^X\/\(\/\/\)$/{
- s//\1/
- q
- }
- /^X\/\(\/\).*/{
- s//\1/
- q
- }
- s/.*/./; q'`
-
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in #(((((
--n*)
- case `echo 'xy\c'` in
- *c*) ECHO_T=' ';; # ECHO_T is single tab character.
- xy) ECHO_C='\c';;
- *) echo `echo ksh88 bug on AIX 6.1` > /dev/null
- ECHO_T=' ';;
- esac;;
-*)
- ECHO_N='-n';;
-esac
-
-rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
- rm -f conf$$.dir/conf$$.file
-else
- rm -f conf$$.dir
- mkdir conf$$.dir 2>/dev/null
-fi
-if (echo >conf$$.file) 2>/dev/null; then
- if ln -s conf$$.file conf$$ 2>/dev/null; then
- as_ln_s='ln -s'
- # ... but there are two gotchas:
- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
- # In both cases, we have to default to `cp -p'.
- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
- as_ln_s='cp -p'
- elif ln conf$$.file conf$$ 2>/dev/null; then
- as_ln_s=ln
- else
- as_ln_s='cp -p'
- fi
-else
- as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
-
-
-# as_fn_mkdir_p
-# -------------
-# Create "$as_dir" as a directory, including parents if necessary.
-as_fn_mkdir_p ()
-{
-
- case $as_dir in #(
- -*) as_dir=./$as_dir;;
- esac
- test -d "$as_dir" || eval $as_mkdir_p || {
- as_dirs=
- while :; do
- case $as_dir in #(
- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
- *) as_qdir=$as_dir;;
- esac
- as_dirs="'$as_qdir' $as_dirs"
- as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$as_dir" : 'X\(//\)[^/]' \| \
- X"$as_dir" : 'X\(//\)$' \| \
- X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
- s//\1/
- q
- }
- /^X\(\/\/\)[^/].*/{
- s//\1/
- q
- }
- /^X\(\/\/\)$/{
- s//\1/
- q
- }
- /^X\(\/\).*/{
- s//\1/
- q
- }
- s/.*/./; q'`
- test -d "$as_dir" && break
- done
- test -z "$as_dirs" || eval "mkdir $as_dirs"
- } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
-
-
-} # as_fn_mkdir_p
-if mkdir -p . 2>/dev/null; then
- as_mkdir_p='mkdir -p "$as_dir"'
-else
- test -d ./-p && rmdir ./-p
- as_mkdir_p=false
-fi
-
-if test -x / >/dev/null 2>&1; then
- as_test_x='test -x'
-else
- if ls -dL / >/dev/null 2>&1; then
- as_ls_L_option=L
- else
- as_ls_L_option=
- fi
- as_test_x='
- eval sh -c '\''
- if test -d "$1"; then
- test -d "$1/.";
- else
- case $1 in #(
- -*)set "./$1";;
- esac;
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
- ???[sx]*):;;*)false;;esac;fi
- '\'' sh
- '
-fi
-as_executable_p=$as_test_x
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-exec 6>&1
-## ----------------------------------- ##
-## Main body of $CONFIG_STATUS script. ##
-## ----------------------------------- ##
-_ASEOF
-test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# Save the log message, to keep $0 and so on meaningful, and to
-# report actual input values of CONFIG_FILES etc. instead of their
-# values after options handling.
-ac_log="
-This file was extended by less $as_me 1, which was
-generated by GNU Autoconf 2.68. Invocation command line was
-
- CONFIG_FILES = $CONFIG_FILES
- CONFIG_HEADERS = $CONFIG_HEADERS
- CONFIG_LINKS = $CONFIG_LINKS
- CONFIG_COMMANDS = $CONFIG_COMMANDS
- $ $0 $@
-
-on `(hostname || uname -n) 2>/dev/null | sed 1q`
-"
-
-_ACEOF
-
-case $ac_config_files in *"
-"*) set x $ac_config_files; shift; ac_config_files=$*;;
-esac
-
-case $ac_config_headers in *"
-"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
-esac
-
-
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-# Files that config.status was made for.
-config_files="$ac_config_files"
-config_headers="$ac_config_headers"
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-ac_cs_usage="\
-\`$as_me' instantiates files and other configuration actions
-from templates according to the current configuration. Unless the files
-and actions are specified as TAGs, all are instantiated by default.
-
-Usage: $0 [OPTION]... [TAG]...
-
- -h, --help print this help, then exit
- -V, --version print version number and configuration settings, then exit
- --config print configuration, then exit
- -q, --quiet, --silent
- do not print progress messages
- -d, --debug don't remove temporary files
- --recheck update $as_me by reconfiguring in the same conditions
- --file=FILE[:TEMPLATE]
- instantiate the configuration file FILE
- --header=FILE[:TEMPLATE]
- instantiate the configuration header FILE
-
-Configuration files:
-$config_files
-
-Configuration headers:
-$config_headers
-
-Report bugs to the package provider."
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
-ac_cs_version="\\
-less config.status 1
-configured by $0, generated by GNU Autoconf 2.68,
- with options \\"\$ac_cs_config\\"
-
-Copyright (C) 2010 Free Software Foundation, Inc.
-This config.status script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it."
-
-ac_pwd='$ac_pwd'
-srcdir='$srcdir'
-INSTALL='$INSTALL'
-test -n "\$AWK" || AWK=awk
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# The default lists apply if the user does not specify any file.
-ac_need_defaults=:
-while test $# != 0
-do
- case $1 in
- --*=?*)
- ac_option=`expr "X$1" : 'X\([^=]*\)='`
- ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
- ac_shift=:
- ;;
- --*=)
- ac_option=`expr "X$1" : 'X\([^=]*\)='`
- ac_optarg=
- ac_shift=:
- ;;
- *)
- ac_option=$1
- ac_optarg=$2
- ac_shift=shift
- ;;
- esac
-
- case $ac_option in
- # Handling of the options.
- -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
- ac_cs_recheck=: ;;
- --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
- $as_echo "$ac_cs_version"; exit ;;
- --config | --confi | --conf | --con | --co | --c )
- $as_echo "$ac_cs_config"; exit ;;
- --debug | --debu | --deb | --de | --d | -d )
- debug=: ;;
- --file | --fil | --fi | --f )
- $ac_shift
- case $ac_optarg in
- *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
- '') as_fn_error $? "missing file argument" ;;
- esac
- as_fn_append CONFIG_FILES " '$ac_optarg'"
- ac_need_defaults=false;;
- --header | --heade | --head | --hea )
- $ac_shift
- case $ac_optarg in
- *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
- esac
- as_fn_append CONFIG_HEADERS " '$ac_optarg'"
- ac_need_defaults=false;;
- --he | --h)
- # Conflict between --help and --header
- as_fn_error $? "ambiguous option: \`$1'
-Try \`$0 --help' for more information.";;
- --help | --hel | -h )
- $as_echo "$ac_cs_usage"; exit ;;
- -q | -quiet | --quiet | --quie | --qui | --qu | --q \
- | -silent | --silent | --silen | --sile | --sil | --si | --s)
- ac_cs_silent=: ;;
-
- # This is an error.
- -*) as_fn_error $? "unrecognized option: \`$1'
-Try \`$0 --help' for more information." ;;
-
- *) as_fn_append ac_config_targets " $1"
- ac_need_defaults=false ;;
-
- esac
- shift
-done
-
-ac_configure_extra_args=
-
-if $ac_cs_silent; then
- exec 6>/dev/null
- ac_configure_extra_args="$ac_configure_extra_args --silent"
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-if \$ac_cs_recheck; then
- set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
- shift
- \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
- CONFIG_SHELL='$SHELL'
- export CONFIG_SHELL
- exec "\$@"
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-exec 5>>config.log
-{
- echo
- sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running $as_me. ##
-_ASBOX
- $as_echo "$ac_log"
-} >&5
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-
-# Handling of arguments.
-for ac_config_target in $ac_config_targets
-do
- case $ac_config_target in
- "defines.h") CONFIG_HEADERS="$CONFIG_HEADERS defines.h" ;;
- "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-
- *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
- esac
-done
-
-
-# If the user did not use the arguments to specify the items to instantiate,
-# then the envvar interface is used. Set only those that are not.
-# We use the long form for the default assignment because of an extremely
-# bizarre bug on SunOS 4.1.3.
-if $ac_need_defaults; then
- test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
- test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
-fi
-
-# Have a temporary directory for convenience. Make it in the build tree
-# simply because there is no reason against having it here, and in addition,
-# creating and moving files from /tmp can sometimes cause problems.
-# Hook for its removal unless debugging.
-# Note that there is a small window in which the directory will not be cleaned:
-# after its creation but before its name has been assigned to `$tmp'.
-$debug ||
-{
- tmp= ac_tmp=
- trap 'exit_status=$?
- : "${ac_tmp:=$tmp}"
- { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
-' 0
- trap 'as_fn_exit 1' 1 2 13 15
-}
-# Create a (secure) tmp directory for tmp files.
-
-{
- tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
- test -d "$tmp"
-} ||
-{
- tmp=./conf$$-$RANDOM
- (umask 077 && mkdir "$tmp")
-} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
-ac_tmp=$tmp
-
-# Set up the scripts for CONFIG_FILES section.
-# No need to generate them if there are no CONFIG_FILES.
-# This happens for instance with `./config.status config.h'.
-if test -n "$CONFIG_FILES"; then
-
-
-ac_cr=`echo X | tr X '\015'`
-# On cygwin, bash can eat \r inside `` if the user requested igncr.
-# But we know of no other shell where ac_cr would be empty at this
-# point, so we can use a bashism as a fallback.
-if test "x$ac_cr" = x; then
- eval ac_cr=\$\'\\r\'
-fi
-ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
-if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
- ac_cs_awk_cr='\\r'
-else
- ac_cs_awk_cr=$ac_cr
-fi
-
-echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
-_ACEOF
-
-
-{
- echo "cat >conf$$subs.awk <<_ACEOF" &&
- echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
- echo "_ACEOF"
-} >conf$$subs.sh ||
- as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
-ac_delim='%!_!# '
-for ac_last_try in false false false false false :; do
- . ./conf$$subs.sh ||
- as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-
- ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
- if test $ac_delim_n = $ac_delim_num; then
- break
- elif $ac_last_try; then
- as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
- else
- ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
- fi
-done
-rm -f conf$$subs.sh
-
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
-_ACEOF
-sed -n '
-h
-s/^/S["/; s/!.*/"]=/
-p
-g
-s/^[^!]*!//
-:repl
-t repl
-s/'"$ac_delim"'$//
-t delim
-:nl
-h
-s/\(.\{148\}\)..*/\1/
-t more1
-s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
-p
-n
-b repl
-:more1
-s/["\\]/\\&/g; s/^/"/; s/$/"\\/
-p
-g
-s/.\{148\}//
-t nl
-:delim
-h
-s/\(.\{148\}\)..*/\1/
-t more2
-s/["\\]/\\&/g; s/^/"/; s/$/"/
-p
-b
-:more2
-s/["\\]/\\&/g; s/^/"/; s/$/"\\/
-p
-g
-s/.\{148\}//
-t delim
-' <conf$$subs.awk | sed '
-/^[^""]/{
- N
- s/\n//
-}
-' >>$CONFIG_STATUS || ac_write_fail=1
-rm -f conf$$subs.awk
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-_ACAWK
-cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
- for (key in S) S_is_set[key] = 1
- FS = ""
-
-}
-{
- line = $ 0
- nfields = split(line, field, "@")
- substed = 0
- len = length(field[1])
- for (i = 2; i < nfields; i++) {
- key = field[i]
- keylen = length(key)
- if (S_is_set[key]) {
- value = S[key]
- line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
- len += length(value) + length(field[++i])
- substed = 1
- } else
- len += 1 + keylen
- }
-
- print line
-}
-
-_ACAWK
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
- sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
-else
- cat
-fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
- || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
-_ACEOF
-
-# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
-# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
-# trailing colons and then remove the whole line if VPATH becomes empty
-# (actually we leave an empty line to preserve line numbers).
-if test "x$srcdir" = x.; then
- ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{
-h
-s///
-s/^/:/
-s/[ ]*$/:/
-s/:\$(srcdir):/:/g
-s/:\${srcdir}:/:/g
-s/:@srcdir@:/:/g
-s/^:*//
-s/:*$//
-x
-s/\(=[ ]*\).*/\1/
-G
-s/\n//
-s/^[^=]*=[ ]*$//
-}'
-fi
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-fi # test -n "$CONFIG_FILES"
-
-# Set up the scripts for CONFIG_HEADERS section.
-# No need to generate them if there are no CONFIG_HEADERS.
-# This happens for instance with `./config.status Makefile'.
-if test -n "$CONFIG_HEADERS"; then
-cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
-BEGIN {
-_ACEOF
-
-# Transform confdefs.h into an awk script `defines.awk', embedded as
-# here-document in config.status, that substitutes the proper values into
-# config.h.in to produce config.h.
-
-# Create a delimiter string that does not exist in confdefs.h, to ease
-# handling of long lines.
-ac_delim='%!_!# '
-for ac_last_try in false false :; do
- ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
- if test -z "$ac_tt"; then
- break
- elif $ac_last_try; then
- as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
- else
- ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
- fi
-done
-
-# For the awk script, D is an array of macro values keyed by name,
-# likewise P contains macro parameters if any. Preserve backslash
-# newline sequences.
-
-ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
-sed -n '
-s/.\{148\}/&'"$ac_delim"'/g
-t rset
-:rset
-s/^[ ]*#[ ]*define[ ][ ]*/ /
-t def
-d
-:def
-s/\\$//
-t bsnl
-s/["\\]/\\&/g
-s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\
-D["\1"]=" \3"/p
-s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2"/p
-d
-:bsnl
-s/["\\]/\\&/g
-s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\
-D["\1"]=" \3\\\\\\n"\\/p
-t cont
-s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
-t cont
-d
-:cont
-n
-s/.\{148\}/&'"$ac_delim"'/g
-t clear
-:clear
-s/\\$//
-t bsnlc
-s/["\\]/\\&/g; s/^/"/; s/$/"/p
-d
-:bsnlc
-s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
-b cont
-' <confdefs.h | sed '
-s/'"$ac_delim"'/"\\\
-"/g' >>$CONFIG_STATUS || ac_write_fail=1
-
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
- for (key in D) D_is_set[key] = 1
- FS = ""
-}
-/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
- line = \$ 0
- split(line, arg, " ")
- if (arg[1] == "#") {
- defundef = arg[2]
- mac1 = arg[3]
- } else {
- defundef = substr(arg[1], 2)
- mac1 = arg[2]
- }
- split(mac1, mac2, "(") #)
- macro = mac2[1]
- prefix = substr(line, 1, index(line, defundef) - 1)
- if (D_is_set[macro]) {
- # Preserve the white space surrounding the "#".
- print prefix "define", macro P[macro] D[macro]
- next
- } else {
- # Replace #undef with comments. This is necessary, for example,
- # in the case of _POSIX_SOURCE, which is predefined and required
- # on some systems where configure will not decide to define it.
- if (defundef == "undef") {
- print "/*", prefix defundef, macro, "*/"
- next
- }
- }
-}
-{ print }
-_ACAWK
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
- as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
-fi # test -n "$CONFIG_HEADERS"
-
-
-eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS "
-shift
-for ac_tag
-do
- case $ac_tag in
- :[FHLC]) ac_mode=$ac_tag; continue;;
- esac
- case $ac_mode$ac_tag in
- :[FHL]*:*);;
- :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;
- :[FH]-) ac_tag=-:-;;
- :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
- esac
- ac_save_IFS=$IFS
- IFS=:
- set x $ac_tag
- IFS=$ac_save_IFS
- shift
- ac_file=$1
- shift
-
- case $ac_mode in
- :L) ac_source=$1;;
- :[FH])
- ac_file_inputs=
- for ac_f
- do
- case $ac_f in
- -) ac_f="$ac_tmp/stdin";;
- *) # Look for the file first in the build tree, then in the source tree
- # (if the path is not absolute). The absolute path cannot be DOS-style,
- # because $ac_f cannot contain `:'.
- test -f "$ac_f" ||
- case $ac_f in
- [\\/$]*) false;;
- *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
- esac ||
- as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;
- esac
- case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
- as_fn_append ac_file_inputs " '$ac_f'"
- done
-
- # Let's still pretend it is `configure' which instantiates (i.e., don't
- # use $as_me), people would be surprised to read:
- # /* config.h. Generated by config.status. */
- configure_input='Generated from '`
- $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
- `' by configure.'
- if test x"$ac_file" != x-; then
- configure_input="$ac_file. $configure_input"
- { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
-$as_echo "$as_me: creating $ac_file" >&6;}
- fi
- # Neutralize special characters interpreted by sed in replacement strings.
- case $configure_input in #(
- *\&* | *\|* | *\\* )
- ac_sed_conf_input=`$as_echo "$configure_input" |
- sed 's/[\\\\&|]/\\\\&/g'`;; #(
- *) ac_sed_conf_input=$configure_input;;
- esac
-
- case $ac_tag in
- *:-:* | *:-) cat >"$ac_tmp/stdin" \
- || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
- esac
- ;;
- esac
-
- ac_dir=`$as_dirname -- "$ac_file" ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$ac_file" : 'X\(//\)[^/]' \| \
- X"$ac_file" : 'X\(//\)$' \| \
- X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$ac_file" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
- s//\1/
- q
- }
- /^X\(\/\/\)[^/].*/{
- s//\1/
- q
- }
- /^X\(\/\/\)$/{
- s//\1/
- q
- }
- /^X\(\/\).*/{
- s//\1/
- q
- }
- s/.*/./; q'`
- as_dir="$ac_dir"; as_fn_mkdir_p
- ac_builddir=.
-
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
- ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
- # A ".." for each directory in $ac_dir_suffix.
- ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
- case $ac_top_builddir_sub in
- "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
- *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
- esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
-
-case $srcdir in
- .) # We are building in place.
- ac_srcdir=.
- ac_top_srcdir=$ac_top_builddir_sub
- ac_abs_top_srcdir=$ac_pwd ;;
- [\\/]* | ?:[\\/]* ) # Absolute name.
- ac_srcdir=$srcdir$ac_dir_suffix;
- ac_top_srcdir=$srcdir
- ac_abs_top_srcdir=$srcdir ;;
- *) # Relative name.
- ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
- ac_top_srcdir=$ac_top_build_prefix$srcdir
- ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-
- case $ac_mode in
- :F)
- #
- # CONFIG_FILE
- #
-
- case $INSTALL in
- [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
- *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
- esac
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# If the template does not know about datarootdir, expand it.
-# FIXME: This hack should be removed a few years after 2.60.
-ac_datarootdir_hack=; ac_datarootdir_seen=
-ac_sed_dataroot='
-/datarootdir/ {
- p
- q
-}
-/@datadir@/p
-/@docdir@/p
-/@infodir@/p
-/@localedir@/p
-/@mandir@/p'
-case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
-*datarootdir*) ac_datarootdir_seen=yes;;
-*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
- ac_datarootdir_hack='
- s&@datadir@&$datadir&g
- s&@docdir@&$docdir&g
- s&@infodir@&$infodir&g
- s&@localedir@&$localedir&g
- s&@mandir@&$mandir&g
- s&\\\${datarootdir}&$datarootdir&g' ;;
-esac
-_ACEOF
-
-# Neutralize VPATH when `$srcdir' = `.'.
-# Shell code in configure.ac might set extrasub.
-# FIXME: do we really want to maintain this feature?
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-ac_sed_extra="$ac_vpsub
-$extrasub
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-:t
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s|@configure_input@|$ac_sed_conf_input|;t t
-s&@top_builddir@&$ac_top_builddir_sub&;t t
-s&@top_build_prefix@&$ac_top_build_prefix&;t t
-s&@srcdir@&$ac_srcdir&;t t
-s&@abs_srcdir@&$ac_abs_srcdir&;t t
-s&@top_srcdir@&$ac_top_srcdir&;t t
-s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
-s&@builddir@&$ac_builddir&;t t
-s&@abs_builddir@&$ac_abs_builddir&;t t
-s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
-s&@INSTALL@&$ac_INSTALL&;t t
-$ac_datarootdir_hack
-"
-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
- >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
-
-test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
- { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
- { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \
- "$ac_tmp/out"`; test -z "$ac_out"; } &&
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined. Please make sure it is defined" >&5
-$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined. Please make sure it is defined" >&2;}
-
- rm -f "$ac_tmp/stdin"
- case $ac_file in
- -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
- *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
- esac \
- || as_fn_error $? "could not create $ac_file" "$LINENO" 5
- ;;
- :H)
- #
- # CONFIG_HEADER
- #
- if test x"$ac_file" != x-; then
- {
- $as_echo "/* $configure_input */" \
- && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
- } >"$ac_tmp/config.h" \
- || as_fn_error $? "could not create $ac_file" "$LINENO" 5
- if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
-$as_echo "$as_me: $ac_file is unchanged" >&6;}
- else
- rm -f "$ac_file"
- mv "$ac_tmp/config.h" "$ac_file" \
- || as_fn_error $? "could not create $ac_file" "$LINENO" 5
- fi
- else
- $as_echo "/* $configure_input */" \
- && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
- || as_fn_error $? "could not create -" "$LINENO" 5
- fi
- ;;
-
-
- esac
-
-done # for ac_tag
-
-
-as_fn_exit 0
-_ACEOF
-ac_clean_files=$ac_clean_files_save
-
-test $ac_write_fail = 0 ||
- as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
-
-
-# configure is writing to config.log, and then calls config.status.
-# config.status does its own redirection, appending to config.log.
-# Unfortunately, on DOS this fails, as config.log is still kept open
-# by configure, so config.status won't be able to write to it; its
-# output is simply discarded. So we exec the FD to /dev/null,
-# effectively closing config.log, so it can be properly (re)opened and
-# appended to by config.status. When coming back to configure, we
-# need to make the FD available again.
-if test "$no_create" != yes; then
- ac_cs_success=:
- ac_config_status_args=
- test "$silent" = yes &&
- ac_config_status_args="$ac_config_status_args --quiet"
- exec 5>/dev/null
- $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
- exec 5>>config.log
- # Use ||, not &&, to avoid exiting from the if with $? = 1, which
- # would make configure fail if this is the last instruction.
- $ac_cs_success || as_fn_exit 1
-fi
-if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
-$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
-fi
-
Deleted: trunk/contrib/less/configure.ac
===================================================================
--- trunk/contrib/less/configure.ac 2018-07-06 12:43:22 UTC (rev 11361)
+++ trunk/contrib/less/configure.ac 2018-07-06 12:46:07 UTC (rev 11362)
@@ -1,698 +0,0 @@
-# Process this file with autoconf to produce a configure script.
-
-# Copyright (C) 1984-2011 Mark Nudelman
-#
-# You may distribute under the terms of either the GNU General Public
-# License or the Less License, as specified in the README file.
-#
-# For more information about less, or for information on how to
-# contact the author, see the README file.
-
-# Autoconf initialization.
-AC_INIT(less, 1)
-AC_CONFIG_SRCDIR([forwback.c])
-AC_CONFIG_HEADER([defines.h])
-
-# Checks for programs.
-AC_PROG_CC
-AC_ISC_POSIX
-AC_PROG_GCC_TRADITIONAL
-AC_PROG_INSTALL
-
-# Checks for compilation model.
-AC_SYS_LARGEFILE
-
-# Checks for general libraries.
-AC_CHECK_LIB(tinfo, tgoto, [have_tinfo=yes], [have_tinfo=no])
-AC_CHECK_LIB(xcurses, initscr, [have_xcurses=yes], [have_xcurses=no])
-AC_CHECK_LIB(ncursesw, initscr, [have_ncursesw=yes], [have_ncursesw=no])
-AC_CHECK_LIB(ncurses, initscr, [have_ncurses=yes], [have_ncurses=no])
-AC_CHECK_LIB(curses, initscr, [have_curses=yes], [have_curses=no])
-AC_CHECK_LIB(termcap, tgetent, [have_termcap=yes], [have_termcap=no])
-AC_CHECK_LIB(termlib, tgetent, [have_termlib=yes], [have_termlib=no])
-# Regular expressions (regcmp) are in -lgen on Solaris 2, (but in libc
-# at least on Solaris 10 (2.10)) and in -lintl on SCO Unix.
-AC_SEARCH_LIBS([regcmp], [gen intl PW])
-
-# Checks for terminal libraries
-AC_MSG_CHECKING([for working terminal libraries])
-TERMLIBS=
-
-# Check for systems where curses is broken.
-curses_broken=0
-if test x`uname -s` = "xHP-UX" >/dev/null 2>&1; then
-if test x`uname -r` = "xB.11.00" >/dev/null 2>&1; then
- curses_broken=1
-fi
-if test x`uname -r` = "xB.11.11" >/dev/null 2>&1; then
- curses_broken=1
-fi
-fi
-
-if test $curses_broken = 0; then
-
-# -- Try tinfo.
-if test "x$TERMLIBS" = x; then
- if test $have_tinfo = yes; then
- TERMLIBS="-ltinfo"
- SAVE_LIBS=$LIBS
- LIBS="$LIBS $TERMLIBS"
- AC_TRY_LINK(, [tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);],
- [termok=yes], [termok=no])
- LIBS=$SAVE_LIBS
- if test $termok = no; then TERMLIBS=""; fi
- fi
-fi
-
-# -- Try xcurses.
-if test "x$TERMLIBS" = x; then
- if test $have_xcurses = yes; then
- TERMLIBS="-lxcurses"
- SAVE_LIBS=$LIBS
- LIBS="$LIBS $TERMLIBS"
- AC_TRY_LINK(, [tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);],
- [termok=yes], [termok=no])
- LIBS=$SAVE_LIBS
- if test $termok = no; then TERMLIBS=""; fi
- fi
-fi
-
-# -- Try ncursesw.
-if test "x$TERMLIBS" = x; then
- if test $have_ncursesw = yes; then
- TERMLIBS="-lncursesw"
- SAVE_LIBS=$LIBS
- LIBS="$LIBS $TERMLIBS"
- AC_TRY_LINK(, [tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);],
- [termok=yes], [termok=no])
- LIBS=$SAVE_LIBS
- if test $termok = no; then TERMLIBS=""; fi
- fi
-fi
-
-# -- Try ncurses.
-if test "x$TERMLIBS" = x; then
- if test $have_ncurses = yes; then
- TERMLIBS="-lncurses"
- SAVE_LIBS=$LIBS
- LIBS="$LIBS $TERMLIBS"
- AC_TRY_LINK(, [tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);],
- [termok=yes], [termok=no])
- LIBS=$SAVE_LIBS
- if test $termok = no; then TERMLIBS=""; fi
- fi
-fi
-
-# -- Try curses.
-if test "x$TERMLIBS" = x; then
- if test $have_curses = yes; then
- TERMLIBS="-lcurses"
- SAVE_LIBS=$LIBS
- LIBS="$LIBS $TERMLIBS"
- AC_TRY_LINK(, [tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);],
- [termok=yes], [termok=no])
- LIBS=$SAVE_LIBS
- if test $termok = no; then TERMLIBS=""; fi
- fi
-fi
-
-# -- Try curses & termcap.
-if test "x$TERMLIBS" = x; then
- if test $have_curses = yes; then
- if test $have_termcap = yes; then
- TERMLIBS="-lcurses -ltermcap"
- SAVE_LIBS=$LIBS
- LIBS="$LIBS $TERMLIBS"
- AC_TRY_LINK(, [tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);],
- [termok=yes], [termok=no])
- LIBS=$SAVE_LIBS
- if test $termok = no; then TERMLIBS=""; fi
- fi
- fi
-fi
-fi
-
-# -- Try termcap.
-if test "x$TERMLIBS" = x; then
- if test $have_termcap = yes; then
- TERMLIBS="-ltermcap"
- SAVE_LIBS=$LIBS
- LIBS="$LIBS $TERMLIBS"
- AC_TRY_LINK(, [tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);],
- [termok=yes], [termok=no])
- LIBS=$SAVE_LIBS
- if test $termok = no; then TERMLIBS=""; fi
- fi
-fi
-
-# -- Try termlib.
-if test "x$TERMLIBS" = x; then
- if test $have_termlib = yes; then
- TERMLIBS="-lcurses -ltermlib"
- SAVE_LIBS=$LIBS
- LIBS="$LIBS $TERMLIBS"
- AC_TRY_LINK(, [tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);],
- [termok=yes], [termok=no])
- LIBS=$SAVE_LIBS
- if test $termok = no; then TERMLIBS=""; fi
- fi
-fi
-
-if test "x$TERMLIBS" = x; then
- AC_MSG_RESULT(Cannot find terminal libraries - configure failed)
- exit 1
-fi
-AC_MSG_RESULT(using $TERMLIBS)
-LIBS="$LIBS $TERMLIBS"
-
-# Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS([ctype.h errno.h fcntl.h limits.h stdio.h stdlib.h string.h termcap.h termio.h termios.h time.h unistd.h values.h sys/ioctl.h sys/stream.h wctype.h])
-
-# Checks for typedefs, structures, and compiler characteristics.
-AC_HEADER_STAT
-AC_C_CONST
-AC_TYPE_OFF_T
-AC_TYPE_SIZE_T
-AC_HEADER_TIME
-
-# Autoheader templates for symbols defined later by AC_DEFINE.
-AH_TEMPLATE([HAVE_GNU_REGEX],
- [GNU regex library])
-AH_TEMPLATE([HAVE_POSIX_REGCOMP],
- [POSIX regcomp() and regex.h])
-AH_TEMPLATE([HAVE_PCRE],
- [PCRE (Perl-compatible regular expression) library])
-AH_TEMPLATE([HAVE_RE_COMP],
- [BSD re_comp()])
-AH_TEMPLATE([HAVE_REGCMP],
- [System V regcmp()])
-AH_TEMPLATE([HAVE_V8_REGCOMP],
- [Henry Spencer V8 regcomp() and regexp.h])
-AH_TEMPLATE([NO_REGEX],
- [pattern matching is supported, but without metacharacters.])
-AH_TEMPLATE([HAVE_REGEXEC2],
- [])
-AH_TEMPLATE([HAVE_VOID],
- [Define HAVE_VOID if your compiler supports the "void" type.])
-AH_TEMPLATE([HAVE_FLOAT],
- [Define HAVE_FLOAT if your compiler supports the "double" type.])
-AH_TEMPLATE([HAVE_CONST],
- [Define HAVE_CONST if your compiler supports the "const" modifier.])
-AH_TEMPLATE([HAVE_STAT_INO],
- [Define HAVE_STAT_INO if your struct stat has st_ino and st_dev.])
-AH_TEMPLATE([HAVE_TIME_T],
- [Define HAVE_TIME_T if your system supports the "time_t" type.])
-AH_TEMPLATE([HAVE_STRERROR],
- [Define HAVE_STRERROR if you have the strerror() function.])
-AH_TEMPLATE([HAVE_FILENO],
- [Define HAVE_FILENO if you have the fileno() macro.])
-AH_TEMPLATE([HAVE_ERRNO],
- [Define HAVE_ERRNO if you have the errno variable.])
-AH_TEMPLATE([MUST_DEFINE_ERRNO],
- [Define MUST_DEFINE_ERRNO if you have errno but it is not define in errno.h.])
-AH_TEMPLATE([HAVE_SYS_ERRLIST],
- [Define HAVE_SYS_ERRLIST if you have the sys_errlist[] variable.])
-AH_TEMPLATE([HAVE_OSPEED],
- [Define HAVE_OSPEED if your termcap library has the ospeed variable.])
-AH_TEMPLATE([MUST_DEFINE_OSPEED],
- [Define MUST_DEFINE_OSPEED if you have ospeed but it is not defined in termcap.h.])
-AH_TEMPLATE([HAVE_LOCALE],
- [Define HAVE_LOCALE if you have locale.h and setlocale.])
-AH_TEMPLATE([HAVE_TERMIOS_FUNCS],
- [Define HAVE_TERMIOS_FUNCS if you have tcgetattr/tcsetattr.])
-AH_TEMPLATE([HAVE_UPPER_LOWER],
- [Define HAVE_UPPER_LOWER if you have isupper, islower, toupper, tolower.])
-AH_TEMPLATE([HAVE_WCTYPE],
- [Define HAVE_WCTYPE if you have iswupper, iswlower, towupper, towlower.])
-AH_TEMPLATE([HAVE_SIGSET_T],
- [Define HAVE_SIGSET_T you have the sigset_t type.])
-AH_TEMPLATE([HAVE_SIGEMPTYSET],
- [Define HAVE_SIGEMPTYSET if you have the sigemptyset macro.])
-AH_TEMPLATE([EDIT_PGM],
- [Define EDIT_PGM to your editor.])
-AH_TEMPLATE([SECURE_COMPILE],
- [Define SECURE_COMPILE=1 to build a secure version of less.])
-
-# Checks for identifiers.
-AC_TYPE_OFF_T
-AC_MSG_CHECKING(for void)
-AC_TRY_COMPILE(, [void *foo = 0;],
- [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_VOID)], [AC_MSG_RESULT(no)])
-AC_MSG_CHECKING(for const)
-AC_TRY_COMPILE(, [const int foo = 0;],
- [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_CONST)], [AC_MSG_RESULT(no)])
-AC_MSG_CHECKING(for time_t)
-AC_TRY_COMPILE([#include <time.h>], [time_t t = 0;],
- [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_TIME_T)], [AC_MSG_RESULT(no)])
-AC_MSG_CHECKING(for st_ino in struct stat)
-AC_TRY_COMPILE([#include <sys/types.h>
-#include <sys/stat.h>],
- [struct stat s; dev_t dev = s.st_dev; ino_t ino = s.st_ino;],
- [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_STAT_INO)], [AC_MSG_RESULT(no)])
-
-# Checks for library functions.
-AC_TYPE_SIGNAL
-AC_CHECK_FUNCS([fsync popen _setjmp sigprocmask sigsetmask snprintf stat system fchmod])
-
-# AC_CHECK_FUNCS may not work for inline functions, so test these separately.
-AC_MSG_CHECKING(for memcpy)
-AC_TRY_LINK([
-#if HAVE_STRING_H
-#include <string.h>
-#endif], [memcpy(0,0,0);],
- [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_MEMCPY)], [AC_MSG_RESULT(no)])
-
-AC_MSG_CHECKING(for strchr)
-AC_TRY_LINK([
-#if HAVE_STRING_H
-#include <string.h>
-#endif], [strchr("x",'x');],
- [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_STRCHR)], [AC_MSG_RESULT(no)])
-
-AC_MSG_CHECKING(for strstr)
-AC_TRY_LINK([
-#if HAVE_STRING_H
-#include <string.h>
-#endif], [strstr("x","x");],
- [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_STRSTR)], [AC_MSG_RESULT(no)])
-
-# Some systems have termios.h but not the corresponding functions.
-AC_CHECK_FUNC(tcgetattr, AC_DEFINE(HAVE_TERMIOS_FUNCS))
-
-AC_MSG_CHECKING(for fileno)
-AC_TRY_LINK([
-#if HAVE_STDIO_H
-#include <stdio.h>
-#endif], [static int x; x = fileno(stdin);],
- [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_FILENO)], [AC_MSG_RESULT(no)])
-
-AC_MSG_CHECKING(for strerror)
-AC_TRY_LINK([
-#if HAVE_STDIO_H
-#include <stdio.h>
-#endif
-#if HAVE_STRING_H
-#include <string.h>
-#endif
-#if HAVE_ERRNO_H
-#include <errno.h>
-#endif], [static char *x; x = strerror(0);],
- [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_STRERROR)], [AC_MSG_RESULT(no)])
-
-AC_MSG_CHECKING(for sys_errlist)
-AC_TRY_LINK(, [extern char *sys_errlist[]; static char **x; x = sys_errlist;],
- [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_SYS_ERRLIST)], [AC_MSG_RESULT(no)])
-
-AC_CHECK_TYPES([sigset_t],,,[#include <signal.h>])
-
-AC_MSG_CHECKING(for sigemptyset)
-AC_TRY_LINK([
-#include <signal.h>
-], [sigset_t s; sigemptyset(&s);],
- [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_SIGEMPTYSET)], [AC_MSG_RESULT(no)])
-
-have_errno=no
-AC_MSG_CHECKING(for errno)
-AC_TRY_LINK([
-#if HAVE_ERRNO_H
-#include <errno.h>
-#endif], [static int x; x = errno;],
- [AC_MSG_RESULT(yes - in errno.h); AC_DEFINE(HAVE_ERRNO) have_errno=yes])
-if test $have_errno = no; then
-AC_TRY_LINK([
-#if HAVE_ERRNO_H
-#include <errno.h>
-#endif], [extern int errno; static int x; x = errno;],
- [AC_MSG_RESULT(yes - must define); AC_DEFINE(HAVE_ERRNO) AC_DEFINE(MUST_DEFINE_ERRNO)],
- [AC_MSG_RESULT(no)])
-fi
-
-AC_MSG_CHECKING(for locale)
-AC_TRY_LINK([#include <locale.h>
-#include <ctype.h>
-#include <langinfo.h>], [setlocale(LC_CTYPE,""); isprint(0); iscntrl(0);],
- [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_LOCALE)], [AC_MSG_RESULT(no)])
-
-AC_MSG_CHECKING(for ctype functions)
-AC_TRY_LINK([
-#if HAVE_CTYPE_H
-#include <ctype.h>
-#endif], [static int x; x = isupper(x); x = tolower(x); x = toupper(x);],
- [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_UPPER_LOWER)], [AC_MSG_RESULT(no)])
-
-AC_MSG_CHECKING(for wctype functions)
-AC_TRY_LINK([#include <wctype.h>], [iswlower(0); iswupper(0); towlower(0); towupper(0);],
- [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_WCTYPE)], [AC_MSG_RESULT(no)])
-
-# Checks for external variable ospeed in the termcap library.
-have_ospeed=no
-AC_MSG_CHECKING(termcap for ospeed)
-AC_TRY_LINK([
-#include <sys/types.h>
-#if HAVE_TERMIOS_H
-#include <termios.h>
-#endif
-#if HAVE_TERMCAP_H
-#include <termcap.h>
-#endif], [ospeed = 0;],
-[AC_MSG_RESULT(yes - in termcap.h); AC_DEFINE(HAVE_OSPEED) have_ospeed=yes])
-if test $have_ospeed = no; then
-AC_TRY_LINK(, [extern short ospeed; ospeed = 0;],
- [AC_MSG_RESULT(yes - must define); AC_DEFINE(HAVE_OSPEED) AC_DEFINE(MUST_DEFINE_OSPEED)],
- [AC_MSG_RESULT(no)])
-fi
-
-# Compile in secure mode?
-AC_ARG_WITH(secure,
- [ --with-secure Compile in secure mode],
- AC_DEFINE(SECURE_COMPILE, 1), AC_DEFINE(SECURE_COMPILE, 0))
-
-# Should we use floating point?
-AC_MSG_CHECKING(for floating point)
-AC_ARG_WITH(no-float,
- [ --with-no-float Do not use floating point],
- WANT_NO_FLOAT=1, WANT_NO_FLOAT=0)
-if test $WANT_NO_FLOAT = 0; then
- AC_TRY_LINK(, [double f1 = 12.5; double f2 = f1*f1/2.5;],
- [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_FLOAT)], [AC_MSG_RESULT(no)])
-else
- AC_MSG_RESULT(disabled by user)
-fi
-
-# Checks for regular expression functions.
-have_regex=no
-have_posix_regex=unknown
-supported_regex=""
-
-# Select a regular expression library.
-WANT_REGEX=auto
-AC_ARG_WITH(regex,
- [ --with-regex={auto,gnu,pcre,posix,regcmp,re_comp,regcomp,regcomp-local,none} Select a regular expression library [auto]],
- WANT_REGEX="$withval")
-
-if test $have_regex = no; then
-if test $WANT_REGEX = auto -o $WANT_REGEX = posix; then
-# Some versions of Solaris have a regcomp() function, but it doesn't work!
-# So we run a test program. If we're cross-compiling, do it the old way.
-AC_MSG_CHECKING(for POSIX regcomp)
-AC_TRY_RUN([
-#include <sys/types.h>
-#include <regex.h>
-main() { regex_t r; regmatch_t rm; char *text = "xabcy";
-if (regcomp(&r, "abc", 0)) exit(1);
-if (regexec(&r, text, 1, &rm, 0)) exit(1);
-#ifndef __WATCOMC__
-if (rm.rm_so != 1) exit(1); /* check for correct offset */
-#else
-if (rm.rm_sp != text + 1) exit(1); /* check for correct offset */
-#endif
-exit(0); }],
- have_posix_regex=yes, have_posix_regex=no, have_posix_regex=unknown)
-if test $have_posix_regex = yes; then
- AC_MSG_RESULT(yes)
- AC_DEFINE(HAVE_POSIX_REGCOMP) supported_regex="$supported_regex posix"
- have_regex=yes
-elif test $have_posix_regex = unknown; then
- AC_TRY_LINK([
-#include <sys/types.h>
-#include <regex.h>],
- [regex_t *r; regfree(r);],
- AC_MSG_RESULT(yes)
- AC_DEFINE(HAVE_POSIX_REGCOMP) have_regex=yes; supported_regex="$supported_regex posix")
-else
- AC_MSG_RESULT(no)
-fi
-fi
-fi
-
-if test $have_regex = no; then
-if test $WANT_REGEX = auto -o $WANT_REGEX = pcre; then
-AC_CHECK_LIB(pcre, pcre_compile,
-[AC_DEFINE(HAVE_PCRE) LIBS="$LIBS -lpcre" have_regex=yes; supported_regex="$supported_regex pcre"], [])
-fi
-fi
-
-if test $have_regex = no; then
-if test $WANT_REGEX = auto -o $WANT_REGEX = gnu; then
-AC_CHECK_LIB(c, re_compile_pattern,
-[AC_DEFINE(HAVE_GNU_REGEX) have_regex=yes; supported_regex="$supported_regex gnu"], [])
-fi
-fi
-
-if test $have_regex = no; then
-if test $WANT_REGEX = auto -o $WANT_REGEX = regcmp; then
-AC_CHECK_FUNC(regcmp,
-[AC_DEFINE(HAVE_REGCMP) have_regex=yes; supported_regex="$supported_regex regcmp"],[])
-fi
-fi
-
-if test $have_regex = no; then
-if test $WANT_REGEX = auto -o $WANT_REGEX = regcomp; then
-AC_MSG_CHECKING(for V8 regcomp)
-AC_TRY_LINK([
-#include "regexp.h"], [regcomp("");],
-[AC_MSG_RESULT(yes); AC_DEFINE(HAVE_V8_REGCOMP) have_regex=yes; supported_regex="$supported_regex regcomp"],[AC_MSG_RESULT(no)])
-fi
-fi
-
-if test $have_regex = no && test -f ${srcdir}/regexp.c; then
-if test $WANT_REGEX = auto -o $WANT_REGEX = regcomp-local; then
-AC_MSG_RESULT(using V8 regcomp -- local source); AC_DEFINE(HAVE_V8_REGCOMP)
-supported_regex="$supported_regex regcomp-local"
-AC_DEFINE(HAVE_REGEXEC2) REGEX_O='regexp.$(O)' AC_SUBST(REGEX_O) have_regex=yes
-fi
-fi
-
-if test $have_regex = no; then
-if test $WANT_REGEX = auto -o $WANT_REGEX = re_comp; then
-AC_MSG_CHECKING(for re_comp)
-AC_CHECK_FUNC(re_comp,
-[AC_DEFINE(HAVE_RE_COMP) have_regex=yes; supported_regex="$supported_regex re_comp"],[])
-fi
-fi
-
-if test $have_regex = no; then
-if test $WANT_REGEX = auto -o $WANT_REGEX = none; then
-AC_MSG_RESULT(using no regex)
-else
-AC_MSG_WARN(cannot find regular expression library)
-fi
-AC_DEFINE(NO_REGEX) supported_regex="$supported_regex none"
-fi
-
-AC_MSG_RESULT(regular expression library: $supported_regex)
-
-AC_ARG_WITH(editor,
- [ --with-editor=PROGRAM use PROGRAM as the default editor [vi]],
- AC_DEFINE_UNQUOTED(EDIT_PGM, "$withval"), AC_DEFINE(EDIT_PGM, "vi"))
-
-AH_TOP([
-/* Unix definition file for less. -*- C -*-
- *
- * This file has 3 sections:
- * User preferences.
- * Settings always true on Unix.
- * Settings automatically determined by configure.
- *
- * * * * * * WARNING * * * * * *
- * If you edit defines.h by hand, do "touch stamp-h" before you run make
- * so config.status doesn't overwrite your changes.
- */
-
-/* User preferences. */
-
-/*
- * SECURE is 1 if you wish to disable a bunch of features in order to
- * be safe to run by unprivileged users.
- * SECURE_COMPILE is set by the --with-secure configure option.
- */
-#define SECURE SECURE_COMPILE
-
-/*
- * SHELL_ESCAPE is 1 if you wish to allow shell escapes.
- * (This is possible only if your system supplies the system() function.)
- */
-#define SHELL_ESCAPE (!SECURE)
-
-/*
- * EXAMINE is 1 if you wish to allow examining files by name from within less.
- */
-#define EXAMINE (!SECURE)
-
-/*
- * TAB_COMPLETE_FILENAME is 1 if you wish to allow the TAB key
- * to complete filenames at prompts.
- */
-#define TAB_COMPLETE_FILENAME (!SECURE)
-
-/*
- * CMD_HISTORY is 1 if you wish to allow keys to cycle through
- * previous commands at prompts.
- */
-#define CMD_HISTORY 1
-
-/*
- * HILITE_SEARCH is 1 if you wish to have search targets to be
- * displayed in standout mode.
- */
-#define HILITE_SEARCH 1
-
-/*
- * EDITOR is 1 if you wish to allow editor invocation (the "v" command).
- * (This is possible only if your system supplies the system() function.)
- * EDIT_PGM is the name of the (default) editor to be invoked.
- */
-#define EDITOR (!SECURE)
-
-/*
- * TAGS is 1 if you wish to support tag files.
- */
-#define TAGS (!SECURE)
-
-/*
- * USERFILE is 1 if you wish to allow a .less file to specify
- * user-defined key bindings.
- */
-#define USERFILE (!SECURE)
-
-/*
- * GLOB is 1 if you wish to have shell metacharacters expanded in filenames.
- * This will generally work if your system provides the "popen" function
- * and the "echo" shell command.
- */
-#define GLOB (!SECURE)
-
-/*
- * PIPEC is 1 if you wish to have the "|" command
- * which allows the user to pipe data into a shell command.
- */
-#define PIPEC (!SECURE)
-
-/*
- * LOGFILE is 1 if you wish to allow the -l option (to create log files).
- */
-#define LOGFILE (!SECURE)
-
-/*
- * GNU_OPTIONS is 1 if you wish to support the GNU-style command
- * line options --help and --version.
- */
-#define GNU_OPTIONS 1
-
-/*
- * ONLY_RETURN is 1 if you want RETURN to be the only input which
- * will continue past an error message.
- * Otherwise, any key will continue past an error message.
- */
-#define ONLY_RETURN 0
-
-/*
- * LESSKEYFILE is the filename of the default lesskey output file
- * (in the HOME directory).
- * LESSKEYFILE_SYS is the filename of the system-wide lesskey output file.
- * DEF_LESSKEYINFILE is the filename of the default lesskey input
- * (in the HOME directory).
- * LESSHISTFILE is the filename of the history file
- * (in the HOME directory).
- */
-#define LESSKEYFILE ".less"
-#define LESSKEYFILE_SYS SYSDIR "/sysless"
-#define DEF_LESSKEYINFILE ".lesskey"
-#define LESSHISTFILE ".lesshst"
-
-
-/* Settings always true on Unix. */
-
-/*
- * Define MSDOS_COMPILER if compiling under Microsoft C.
- */
-#define MSDOS_COMPILER 0
-
-/*
- * Pathname separator character.
- */
-#define PATHNAME_SEP "/"
-
-/*
- * The value returned from tgetent on success.
- * Some HP-UX systems return 0 on success.
- */
-#define TGETENT_OK 1
-
-/*
- * HAVE_SYS_TYPES_H is 1 if your system has <sys/types.h>.
- */
-#define HAVE_SYS_TYPES_H 1
-
-/*
- * Define if you have the <sgstat.h> header file.
- */
-#undef HAVE_SGSTAT_H
-
-/*
- * HAVE_PERROR is 1 if your system has the perror() call.
- * (Actually, if it has sys_errlist, sys_nerr and errno.)
- */
-#define HAVE_PERROR 1
-
-/*
- * HAVE_TIME is 1 if your system has the time() call.
- */
-#define HAVE_TIME 1
-
-/*
- * HAVE_SHELL is 1 if your system supports a SHELL command interpreter.
- */
-#define HAVE_SHELL 1
-
-/*
- * Default shell metacharacters and meta-escape character.
- */
-#define DEF_METACHARS "; *?\t\n'\"()<>[]|&^`#\\$%=~"
-#define DEF_METAESCAPE "\\"
-
-/*
- * HAVE_DUP is 1 if your system has the dup() call.
- */
-#define HAVE_DUP 1
-
-/* Define to 1 if you have the memcpy() function. */
-#define HAVE_MEMCPY 1
-
-/* Define to 1 if you have the strchr() function. */
-#define HAVE_STRCHR 1
-
-/* Define to 1 if you have the strstr() function. */
-#define HAVE_STRSTR 1
-
-/*
- * Sizes of various buffers.
- */
-#if 0 /* old sizes for small memory machines */
-#define CMDBUF_SIZE 512 /* Buffer for multichar commands */
-#define UNGOT_SIZE 100 /* Max chars to unget() */
-#define LINEBUF_SIZE 1024 /* Max size of line in input file */
-#define OUTBUF_SIZE 1024 /* Output buffer */
-#define PROMPT_SIZE 200 /* Max size of prompt string */
-#define TERMBUF_SIZE 2048 /* Termcap buffer for tgetent */
-#define TERMSBUF_SIZE 1024 /* Buffer to hold termcap strings */
-#define TAGLINE_SIZE 512 /* Max size of line in tags file */
-#define TABSTOP_MAX 32 /* Max number of custom tab stops */
-#else /* more reasonable sizes for modern machines */
-#define CMDBUF_SIZE 2048 /* Buffer for multichar commands */
-#define UNGOT_SIZE 200 /* Max chars to unget() */
-#define LINEBUF_SIZE 1024 /* Initial max size of line in input file */
-#define OUTBUF_SIZE 1024 /* Output buffer */
-#define PROMPT_SIZE 2048 /* Max size of prompt string */
-#define TERMBUF_SIZE 2048 /* Termcap buffer for tgetent */
-#define TERMSBUF_SIZE 1024 /* Buffer to hold termcap strings */
-#define TAGLINE_SIZE 1024 /* Max size of line in tags file */
-#define TABSTOP_MAX 128 /* Max number of custom tab stops */
-#endif
-
-/* Settings automatically determined by configure. */
-])
-
-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT
Modified: trunk/contrib/less/cvt.c
===================================================================
--- trunk/contrib/less/cvt.c 2018-07-06 12:43:22 UTC (rev 11361)
+++ trunk/contrib/less/cvt.c 2018-07-06 12:46:07 UTC (rev 11362)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 1984-2012 Mark Nudelman
+ * Copyright (C) 1984-2017 Mark Nudelman
*
* You may distribute under the terms of either the GNU General Public
* License or the Less License, as specified in the README file.
@@ -65,7 +65,7 @@
char *dst;
char *edst = odst;
char *src;
- register char *src_end;
+ char *src_end;
LWCHAR ch;
if (lenp != NULL)
@@ -75,8 +75,8 @@
for (src = osrc, dst = odst; src < src_end; )
{
- int src_pos = src - osrc;
- int dst_pos = dst - odst;
+ int src_pos = (int) (src - osrc);
+ int dst_pos = (int) (dst - odst);
ch = step_char(&src, +1, src_end);
if ((ops & CVT_BS) && ch == '\b' && dst > odst)
{
@@ -83,7 +83,7 @@
/* Delete backspace and preceding char. */
do {
dst--;
- } while (dst > odst &&
+ } while (dst > odst && utf_mode &&
!IS_ASCII_OCTET(*dst) && !IS_UTF8_LEAD(*dst));
} else if ((ops & CVT_ANSI) && IS_CSI_START(ch))
{
@@ -109,6 +109,6 @@
edst--;
*edst = '\0';
if (lenp != NULL)
- *lenp = edst - odst;
+ *lenp = (int) (edst - odst);
/* FIXME: why was this here? if (chpos != NULL) chpos[dst - odst] = src - osrc; */
}
Modified: trunk/contrib/less/decode.c
===================================================================
--- trunk/contrib/less/decode.c 2018-07-06 12:43:22 UTC (rev 11361)
+++ trunk/contrib/less/decode.c 2018-07-06 12:46:07 UTC (rev 11362)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 1984-2012 Mark Nudelman
+ * Copyright (C) 1984-2017 Mark Nudelman
*
* You may distribute under the terms of either the GNU General Public
* License or the Less License, as specified in the README file.
@@ -94,8 +94,12 @@
ESC,']',0, A_RSHIFT,
ESC,'(',0, A_LSHIFT,
ESC,')',0, A_RSHIFT,
+ ESC,'{',0, A_LLSHIFT,
+ ESC,'}',0, A_RRSHIFT,
SK(SK_RIGHT_ARROW),0, A_RSHIFT,
SK(SK_LEFT_ARROW),0, A_LSHIFT,
+ SK(SK_CTL_RIGHT_ARROW),0, A_RRSHIFT,
+ SK(SK_CTL_LEFT_ARROW),0, A_LLSHIFT,
'{',0, A_F_BRACKET|A_EXTRA, '{','}',0,
'}',0, A_B_BRACKET|A_EXTRA, '{','}',0,
'(',0, A_F_BRACKET|A_EXTRA, '(',')',0,
@@ -105,6 +109,7 @@
ESC,CONTROL('F'),0, A_F_BRACKET,
ESC,CONTROL('B'),0, A_B_BRACKET,
'G',0, A_GOEND,
+ ESC,'G',0, A_GOEND_BUF,
ESC,'>',0, A_GOEND,
'>',0, A_GOEND,
SK(SK_END),0, A_GOEND,
@@ -135,6 +140,8 @@
ESC,'N',0, A_T_REVERSE_SEARCH,
'&',0, A_FILTER,
'm',0, A_SETMARK,
+ 'M',0, A_SETMARKBOT,
+ ESC,'m',0, A_CLRMARK,
'\'',0, A_GOMARK,
CONTROL('X'),CONTROL('X'),0, A_GOMARK,
'E',0, A_EXAMINE,
@@ -232,9 +239,9 @@
char *table;
int len;
{
- register char *fm;
- register char *to;
- register int a;
+ char *fm;
+ char *to;
+ int a;
char *repl;
int klen;
@@ -286,6 +293,33 @@
}
/*
+ * Expand special key abbreviations in a list of command tables.
+ */
+ static void
+expand_cmd_table(tlist)
+ struct tablelist *tlist;
+{
+ struct tablelist *t;
+ for (t = tlist; t != NULL; t = t->t_next)
+ {
+ expand_special_keys(t->t_start, t->t_end - t->t_start);
+ }
+}
+
+/*
+ * Expand special key abbreviations in all command tables.
+ */
+ public void
+expand_cmd_tables()
+{
+ expand_cmd_table(list_fcmd_tables);
+ expand_cmd_table(list_ecmd_tables);
+ expand_cmd_table(list_var_tables);
+ expand_cmd_table(list_sysvar_tables);
+}
+
+
+/*
* Initialize the command lists.
*/
public void
@@ -324,7 +358,7 @@
char *buf;
int len;
{
- register struct tablelist *t;
+ struct tablelist *t;
if (len == 0)
return (0);
@@ -337,7 +371,6 @@
{
return (-1);
}
- expand_special_keys(buf, len);
t->t_start = buf;
t->t_end = buf + len;
t->t_next = *tlist;
@@ -392,9 +425,9 @@
char *endtable;
char **sp;
{
- register char *p;
- register char *q;
- register int a;
+ char *p;
+ char *q;
+ int a;
*sp = NULL;
for (p = table, q = cmd; p < endtable; p++, q++)
@@ -483,8 +516,8 @@
char *cmd;
char **sp;
{
- register struct tablelist *t;
- register int action = A_INVALID;
+ struct tablelist *t;
+ int action = A_INVALID;
/*
* Search thru all the command tables.
@@ -594,8 +627,8 @@
int sysvar;
{
char *p;
- register int c;
- register int n;
+ int c;
+ int n;
/*
* New-style lesskey file.
@@ -646,10 +679,10 @@
char *filename;
int sysvar;
{
- register char *buf;
- register POSITION len;
- register long n;
- register int f;
+ char *buf;
+ POSITION len;
+ long n;
+ int f;
if (secure)
return (1);
@@ -656,9 +689,7 @@
/*
* Try to open the lesskey file.
*/
- filename = shell_unquote(filename);
f = open(filename, OPEN_READ);
- free(filename);
if (f < 0)
return (1);
Deleted: trunk/contrib/less/defines.ds
===================================================================
--- trunk/contrib/less/defines.ds 2018-07-06 12:43:22 UTC (rev 11361)
+++ trunk/contrib/less/defines.ds 2018-07-06 12:46:07 UTC (rev 11362)
@@ -1,414 +0,0 @@
-/*
- * Copyright (C) 1984-2012 Mark Nudelman
- *
- * You may distribute under the terms of either the GNU General Public
- * License or the Less License, as specified in the README file.
- *
- * For more information, see the README file.
- */
-
-
-/* DOS definition file for less. */
-/*
- * This file has 2 sections:
- * User preferences.
- * Settings always true for MS-DOS systems.
- */
-
-/* User preferences. */
-
-/*
- * SECURE is 1 if you wish to disable a bunch of features in order to
- * be safe to run by unprivileged users.
- */
-#define SECURE 0
-
-/*
- * SHELL_ESCAPE is 1 if you wish to allow shell escapes.
- * (This is possible only if your system supplies the system() function.)
- */
-#define SHELL_ESCAPE (!SECURE)
-
-/*
- * EXAMINE is 1 if you wish to allow examining files by name from within less.
- */
-#define EXAMINE (!SECURE)
-
-/*
- * TAB_COMPLETE_FILENAME is 1 if you wish to allow the TAB key
- * to complete filenames at prompts.
- */
-#define TAB_COMPLETE_FILENAME (!SECURE)
-
-/*
- * CMD_HISTORY is 1 if you wish to allow keys to cycle through
- * previous commands at prompts.
- */
-#define CMD_HISTORY 1
-
-/*
- * HILITE_SEARCH is 1 if you wish to have search targets to be
- * displayed in standout mode.
- */
-#define HILITE_SEARCH 1
-
-/*
- * EDITOR is 1 if you wish to allow editor invocation (the "v" command).
- * (This is possible only if your system supplies the system() function.)
- * EDIT_PGM is the name of the (default) editor to be invoked.
- */
-#define EDITOR (!SECURE)
-#define EDIT_PGM "vi"
-
-/*
- * TAGS is 1 if you wish to support tag files.
- */
-#define TAGS (!SECURE)
-
-/*
- * USERFILE is 1 if you wish to allow a .less file to specify
- * user-defined key bindings.
- */
-#define USERFILE (!SECURE)
-
-/*
- * GLOB is 1 if you wish to have shell metacharacters expanded in filenames.
- * This will generally work if your system provides the "popen" function
- * and the "echo" shell command.
- */
-#ifdef __DJGPP__
-#define GLOB (!SECURE)
-#else
-#define GLOB 0
-#endif
-
-/*
- * PIPEC is 1 if you wish to have the "|" command
- * which allows the user to pipe data into a shell command.
- */
-#ifdef __DJGPP__
-#define PIPEC (!SECURE)
-#else
-#define PIPEC 0
-#endif
-
-/*
- * LOGFILE is 1 if you wish to allow the -l option (to create log files).
- */
-#define LOGFILE (!SECURE)
-
-/*
- * GNU_OPTIONS is 1 if you wish to support the GNU-style command
- * line options --help and --version.
- */
-#define GNU_OPTIONS 1
-
-/*
- * ONLY_RETURN is 1 if you want RETURN to be the only input which
- * will continue past an error message.
- * Otherwise, any key will continue past an error message.
- */
-#define ONLY_RETURN 0
-
-/*
- * LESSKEYFILE is the filename of the default lesskey output file
- * (in the HOME directory).
- * LESSKEYFILE_SYS is the filename of the system-wide lesskey output file.
- * DEF_LESSKEYINFILE is the filename of the default lesskey input
- * (in the HOME directory).
- * LESSHISTFILE is the filename of the history file
- * (in the HOME directory).
- */
-#define LESSKEYFILE "_less"
-#define LESSKEYFILE_SYS "c:\\_sysless"
-#define DEF_LESSKEYINFILE "_lesskey"
-#define LESSHISTFILE "_lesshst"
-
-
-/* Settings always true for MS-DOS systems. */
-
-/*
- * Define MSDOS_COMPILER if compiling for MS-DOS.
- */
-#ifdef __DJGPP__
-#define MSDOS_COMPILER DJGPPC
-#else
-#ifdef __BORLANDC__
-#define MSDOS_COMPILER BORLANDC
-#else
-#define MSDOS_COMPILER MSOFTC
-#endif
-#endif
-
-/*
- * Pathname separator character.
- */
-#define PATHNAME_SEP "\\"
-
-/*
- * HAVE_SYS_TYPES_H is 1 if your system has <sys/types.h>.
- */
-#define HAVE_SYS_TYPES_H 1
-
-/*
- * Define if you have the <sgstat.h> header file.
- */
-#define HAVE_SGSTAT_H 0
-
-/*
- * HAVE_PERROR is 1 if your system has the perror() call.
- * (Actually, if it has sys_errlist, sys_nerr and errno.)
- */
-#define HAVE_PERROR 1
-
-/*
- * HAVE_TIME is 1 if your system has the time() call.
- */
-#define HAVE_TIME 1
-
-/*
- * HAVE_SHELL is 1 if your system supports a SHELL command interpreter.
- */
-#define HAVE_SHELL 0
-
-/*
- * Default shell metacharacters and meta-escape character.
- */
-#define DEF_METACHARS "; *?\t\n'\"()<>|&"
-#define DEF_METAESCAPE ""
-
-/*
- * HAVE_DUP is 1 if your system has the dup() call.
- */
-#define HAVE_DUP 1
-
-/*
- * Sizes of various buffers.
- */
-#if 0 /* old sizes for small memory machines
-#define CMDBUF_SIZE 512 /* Buffer for multichar commands */
-#define UNGOT_SIZE 100 /* Max chars to unget() */
-#define LINEBUF_SIZE 1024 /* Max size of line in input file */
-#define OUTBUF_SIZE 1024 /* Output buffer */
-#define PROMPT_SIZE 200 /* Max size of prompt string */
-#define TERMBUF_SIZE 2048 /* Termcap buffer for tgetent */
-#define TERMSBUF_SIZE 1024 /* Buffer to hold termcap strings */
-#define TAGLINE_SIZE 512 /* Max size of line in tags file */
-#define TABSTOP_MAX 32 /* Max number of custom tab stops */
-#else /* more reasonable sizes for modern machines */
-#define CMDBUF_SIZE 2048 /* Buffer for multichar commands */
-#define UNGOT_SIZE 200 /* Max chars to unget() */
-#define LINEBUF_SIZE 1024 /* Initial max size of line in input file */
-#define OUTBUF_SIZE 1024 /* Output buffer */
-#define PROMPT_SIZE 2048 /* Max size of prompt string */
-#define TERMBUF_SIZE 2048 /* Termcap buffer for tgetent */
-#define TERMSBUF_SIZE 1024 /* Buffer to hold termcap strings */
-#define TAGLINE_SIZE 1024 /* Max size of line in tags file */
-#define TABSTOP_MAX 128 /* Max number of custom tab stops */
-#endif
-
-/* Define to `long' if <sys/types.h> doesn't define. */
-#if MSDOS_COMPILER==BORLANDC
-#define off_t long
-#endif
-
-/* Define if you need to in order for stat and other things to work. */
-/* #undef _POSIX_SOURCE */
-
-/* Define as the return type of signal handlers (int or void). */
-#define RETSIGTYPE void
-
-
-/*
- * Regular expression library.
- * Define exactly one of the following to be 1:
- * HAVE_POSIX_REGCOMP: POSIX regcomp() and regex.h
- * HAVE_RE_COMP: BSD re_comp()
- * HAVE_REGCMP: System V regcmp()
- * HAVE_V8_REGCOMP: Henry Spencer V8 regcomp() and regexp.h
- * NO_REGEX: pattern matching is supported, but without metacharacters.
- */
-/* #undef HAVE_POSIX_REGCOMP */
-/* #undef HAVE_RE_COMP */
-/* #undef HAVE_REGCMP */
-/* #undef HAVE_V8_REGCOMP */
-#if MSDOS_COMPILER==DJGPPC
-#define HAVE_POSIX_REGCOMP 1
-#else
-#define NO_REGEX 1
-#endif
-
-/* Define HAVE_VOID if your compiler supports the "void" type. */
-#define HAVE_VOID 1
-
-/* Define HAVE_CONST if your compiler supports the "const" modifier. */
-#define HAVE_CONST 1
-
-/* Define HAVE_TIME_T if your system supports the "time_t" type. */
-#define HAVE_TIME_T 1
-
-/* Define HAVE_STRERROR if you have the strerror() function. */
-#define HAVE_STRERROR 1
-
-/* Define HAVE_FILENO if you have the fileno() macro. */
-#define HAVE_FILENO 1
-
-/* Define HAVE_ERRNO if you have the errno variable */
-/* Define MUST_DEFINE_ERRNO if you have errno but it is not defined
- * in errno.h */
-#if MSDOS_COMPILER==MSOFTC || MSDOS_COMPILER==DJGPPC
-#define HAVE_ERRNO 1
-#define MUST_DEFINE_ERRNO 0
-#else
-#define HAVE_ERRNO 1
-#define MUST_DEFINE_ERRNO 1
-#endif
-
-/* Define HAVE_SYS_ERRLIST if you have the sys_errlist[] variable */
-#define HAVE_SYS_ERRLIST 1
-
-/* Define HAVE_OSPEED if your termcap library has the ospeed variable */
-/* Define MUST_DEFINE_OSPEED if you have ospeed but it is not defined
- * in termcap.h. */
-#define HAVE_OSPEED 0
-#define MUST_DEFINE_OSPEED 0
-
-/* Define HAVE_LOCALE if you have locale.h and setlocale. */
-#define HAVE_LOCALE 0
-
-/* Define HAVE_TERMIOS_FUNCS if you have tcgetattr/tcsetattr */
-#define HAVE_TERMIOS_FUNCS 0
-
-/* Define HAVE_UPPER_LOWER if you have isupper, islower, toupper, tolower */
-#define HAVE_UPPER_LOWER 1
-
-/* Define if you have the _setjmp function. */
-#if MSDOS_COMPILER==MSOFTC || MSDOS_COMPILER==DJGPPC
-#define HAVE__SETJMP 0
-#else
-#define HAVE__SETJMP 1
-#endif
-
-/* Define if you have the memcpy function. */
-#define HAVE_MEMCPY 1
-
-/* Define if you have the popen function. */
-#if MSDOS_COMPILER==DJGPPC
-#define HAVE_POPEN 1
-#else
-#define HAVE_POPEN 0
-#endif
-
-/* Define if you have the sigsetmask function. */
-#define HAVE_SIGSETMASK 0
-
-/* Define if you have the sigprocmask function. */
-#define HAVE_SIGPROCMASK 0
-
-/* Define if you have the sigset_t type and sigemptyset macro */
-#define HAVE_SIGSET_T 0
-#define HAVE_SIGEMPTYSET 0
-
-/* Define if you have the stat function. */
-#define HAVE_STAT 1
-
-/* Define if you have the strchr function. */
-#define HAVE_STRCHR 1
-
-/* Define if you have the system function. */
-#define HAVE_SYSTEM 1
-
-/* Define if you have the snprintf function. */
-#define HAVE_SNPRINTF 0
-
-/* Define if you have the <ctype.h> header file. */
-#define HAVE_CTYPE_H 1
-
-/* Define if you have the <wctype.h> header file. */
-#define HAVE_WCTYPE_H 0
-
-/* Define if you have the <errno.h> header file. */
-#define HAVE_ERRNO_H 1
-
-/* Define if you have the <fcntl.h> header file. */
-#define HAVE_FCNTL_H 1
-
-/* Define HAVE_FLOAT if your compiler supports the "double" type. */
-#define HAVE_FLOAT 1
-
-/* Define if you have the <limits.h> header file. */
-#define HAVE_LIMITS_H 1
-
-/* Define if you have the <stdio.h> header file. */
-#define HAVE_STDIO_H 1
-
-/* Define if you have the <stdlib> header file. */
-#define HAVE_STDLIB_H 1
-
-/* Define if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
-/* Define if you have the <sys/ioctl.h> header file. */
-#define HAVE_SYS_IOCTL_H 0
-
-/* Define if you have the <sys/ptem.h> header file. */
-#define HAVE_SYS_PTEM_H 0
-
-/* Define if you have the <sys/stream.h> header file. */
-#define HAVE_SYS_STREAM_H 0
-
-/* Define if you have the <termcap.h> header file. */
-#define HAVE_TERMCAP_H 0
-
-/* Define if you have the <termio.h> header file. */
-#define HAVE_TERMIO_H 0
-
-/* Define if you have the <termios.h> header file. */
-#define HAVE_TERMIOS_H 0
-
-/* Define if you have the <time.h> header file. */
-#define HAVE_TIME_H 1
-
-/* Define if you have the <unistd.h> header file. */
-#if MSDOS_COMPILER==DJGPPC
-#define HAVE_UNISTD_H 1
-#else
-#define HAVE_UNISTD_H 0
-#endif
-
-/* Define if you have the <values.h> header file. */
-#if MSDOS_COMPILER==MSOFTC
-#define HAVE_VALUES_H 0
-#else
-#define HAVE_VALUES_H 1
-#endif
-
-#if MSDOS_COMPILER == MSOFTC && _MSC_VER >= 700
-/*
- * The names of these things changed in Microsoft C version 7.0.
- */
-#define videoconfig _videoconfig
-#define rccoord _rccoord
-#define O_RDONLY _O_RDONLY
-#define O_WRONLY _O_WRONLY
-#define O_APPEND _O_APPEND
-#define O_BINARY _O_BINARY
-#define O_TEXT _O_TEXT
-#define find_t _find_t
-#define stat _stat
-#define S_IFMT _S_IFMT
-#define S_IFDIR _S_IFDIR
-#define S_IFREG _S_IFREG
-#define dup _dup
-#define open _open
-#define lseek _lseek
-#define write _write
-#define creat _creat
-#define fstat _fstat
-#define isatty _isatty
-#define close _close
-#define read _read
-#define ungetch _ungetch
-#define kbhit _kbhit
-#define getch _getch
-#endif
Deleted: trunk/contrib/less/defines.h.in
===================================================================
--- trunk/contrib/less/defines.h.in 2018-07-06 12:43:22 UTC (rev 11361)
+++ trunk/contrib/less/defines.h.in 2018-07-06 12:46:07 UTC (rev 11362)
@@ -1,432 +0,0 @@
-/* defines.h.in. Generated from configure.ac by autoheader. */
-
-
-/* Unix definition file for less. -*- C -*-
- *
- * This file has 3 sections:
- * User preferences.
- * Settings always true on Unix.
- * Settings automatically determined by configure.
- *
- * * * * * * WARNING * * * * * *
- * If you edit defines.h by hand, do "touch stamp-h" before you run make
- * so config.status doesn't overwrite your changes.
- */
-
-/* User preferences. */
-
-/*
- * SECURE is 1 if you wish to disable a bunch of features in order to
- * be safe to run by unprivileged users.
- * SECURE_COMPILE is set by the --with-secure configure option.
- */
-#define SECURE SECURE_COMPILE
-
-/*
- * SHELL_ESCAPE is 1 if you wish to allow shell escapes.
- * (This is possible only if your system supplies the system() function.)
- */
-#define SHELL_ESCAPE (!SECURE)
-
-/*
- * EXAMINE is 1 if you wish to allow examining files by name from within less.
- */
-#define EXAMINE (!SECURE)
-
-/*
- * TAB_COMPLETE_FILENAME is 1 if you wish to allow the TAB key
- * to complete filenames at prompts.
- */
-#define TAB_COMPLETE_FILENAME (!SECURE)
-
-/*
- * CMD_HISTORY is 1 if you wish to allow keys to cycle through
- * previous commands at prompts.
- */
-#define CMD_HISTORY 1
-
-/*
- * HILITE_SEARCH is 1 if you wish to have search targets to be
- * displayed in standout mode.
- */
-#define HILITE_SEARCH 1
-
-/*
- * EDITOR is 1 if you wish to allow editor invocation (the "v" command).
- * (This is possible only if your system supplies the system() function.)
- * EDIT_PGM is the name of the (default) editor to be invoked.
- */
-#define EDITOR (!SECURE)
-
-/*
- * TAGS is 1 if you wish to support tag files.
- */
-#define TAGS (!SECURE)
-
-/*
- * USERFILE is 1 if you wish to allow a .less file to specify
- * user-defined key bindings.
- */
-#define USERFILE (!SECURE)
-
-/*
- * GLOB is 1 if you wish to have shell metacharacters expanded in filenames.
- * This will generally work if your system provides the "popen" function
- * and the "echo" shell command.
- */
-#define GLOB (!SECURE)
-
-/*
- * PIPEC is 1 if you wish to have the "|" command
- * which allows the user to pipe data into a shell command.
- */
-#define PIPEC (!SECURE)
-
-/*
- * LOGFILE is 1 if you wish to allow the -l option (to create log files).
- */
-#define LOGFILE (!SECURE)
-
-/*
- * GNU_OPTIONS is 1 if you wish to support the GNU-style command
- * line options --help and --version.
- */
-#define GNU_OPTIONS 1
-
-/*
- * ONLY_RETURN is 1 if you want RETURN to be the only input which
- * will continue past an error message.
- * Otherwise, any key will continue past an error message.
- */
-#define ONLY_RETURN 0
-
-/*
- * LESSKEYFILE is the filename of the default lesskey output file
- * (in the HOME directory).
- * LESSKEYFILE_SYS is the filename of the system-wide lesskey output file.
- * DEF_LESSKEYINFILE is the filename of the default lesskey input
- * (in the HOME directory).
- * LESSHISTFILE is the filename of the history file
- * (in the HOME directory).
- */
-#define LESSKEYFILE ".less"
-#define LESSKEYFILE_SYS SYSDIR "/sysless"
-#define DEF_LESSKEYINFILE ".lesskey"
-#define LESSHISTFILE ".lesshst"
-
-
-/* Settings always true on Unix. */
-
-/*
- * Define MSDOS_COMPILER if compiling under Microsoft C.
- */
-#define MSDOS_COMPILER 0
-
-/*
- * Pathname separator character.
- */
-#define PATHNAME_SEP "/"
-
-/*
- * The value returned from tgetent on success.
- * Some HP-UX systems return 0 on success.
- */
-#define TGETENT_OK 1
-
-/*
- * HAVE_SYS_TYPES_H is 1 if your system has <sys/types.h>.
- */
-#define HAVE_SYS_TYPES_H 1
-
-/*
- * Define if you have the <sgstat.h> header file.
- */
-#undef HAVE_SGSTAT_H
-
-/*
- * HAVE_PERROR is 1 if your system has the perror() call.
- * (Actually, if it has sys_errlist, sys_nerr and errno.)
- */
-#define HAVE_PERROR 1
-
-/*
- * HAVE_TIME is 1 if your system has the time() call.
- */
-#define HAVE_TIME 1
-
-/*
- * HAVE_SHELL is 1 if your system supports a SHELL command interpreter.
- */
-#define HAVE_SHELL 1
-
-/*
- * Default shell metacharacters and meta-escape character.
- */
-#define DEF_METACHARS "; *?\t\n'\"()<>[]|&^`#\\$%=~"
-#define DEF_METAESCAPE "\\"
-
-/*
- * HAVE_DUP is 1 if your system has the dup() call.
- */
-#define HAVE_DUP 1
-
-/* Define to 1 if you have the memcpy() function. */
-#define HAVE_MEMCPY 1
-
-/* Define to 1 if you have the strchr() function. */
-#define HAVE_STRCHR 1
-
-/* Define to 1 if you have the strstr() function. */
-#define HAVE_STRSTR 1
-
-/*
- * Sizes of various buffers.
- */
-#if 0 /* old sizes for small memory machines */
-#define CMDBUF_SIZE 512 /* Buffer for multichar commands */
-#define UNGOT_SIZE 100 /* Max chars to unget() */
-#define LINEBUF_SIZE 1024 /* Max size of line in input file */
-#define OUTBUF_SIZE 1024 /* Output buffer */
-#define PROMPT_SIZE 200 /* Max size of prompt string */
-#define TERMBUF_SIZE 2048 /* Termcap buffer for tgetent */
-#define TERMSBUF_SIZE 1024 /* Buffer to hold termcap strings */
-#define TAGLINE_SIZE 512 /* Max size of line in tags file */
-#define TABSTOP_MAX 32 /* Max number of custom tab stops */
-#else /* more reasonable sizes for modern machines */
-#define CMDBUF_SIZE 2048 /* Buffer for multichar commands */
-#define UNGOT_SIZE 200 /* Max chars to unget() */
-#define LINEBUF_SIZE 1024 /* Initial max size of line in input file */
-#define OUTBUF_SIZE 1024 /* Output buffer */
-#define PROMPT_SIZE 2048 /* Max size of prompt string */
-#define TERMBUF_SIZE 2048 /* Termcap buffer for tgetent */
-#define TERMSBUF_SIZE 1024 /* Buffer to hold termcap strings */
-#define TAGLINE_SIZE 1024 /* Max size of line in tags file */
-#define TABSTOP_MAX 128 /* Max number of custom tab stops */
-#endif
-
-/* Settings automatically determined by configure. */
-
-
-/* Define EDIT_PGM to your editor. */
-#undef EDIT_PGM
-
-/* Define HAVE_CONST if your compiler supports the "const" modifier. */
-#undef HAVE_CONST
-
-/* Define to 1 if you have the <ctype.h> header file. */
-#undef HAVE_CTYPE_H
-
-/* Define HAVE_ERRNO if you have the errno variable. */
-#undef HAVE_ERRNO
-
-/* Define to 1 if you have the <errno.h> header file. */
-#undef HAVE_ERRNO_H
-
-/* Define to 1 if you have the `fchmod' function. */
-#undef HAVE_FCHMOD
-
-/* Define to 1 if you have the <fcntl.h> header file. */
-#undef HAVE_FCNTL_H
-
-/* Define HAVE_FILENO if you have the fileno() macro. */
-#undef HAVE_FILENO
-
-/* Define HAVE_FLOAT if your compiler supports the "double" type. */
-#undef HAVE_FLOAT
-
-/* Define to 1 if you have the `fsync' function. */
-#undef HAVE_FSYNC
-
-/* GNU regex library */
-#undef HAVE_GNU_REGEX
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
-
-/* Define to 1 if you have the <limits.h> header file. */
-#undef HAVE_LIMITS_H
-
-/* Define HAVE_LOCALE if you have locale.h and setlocale. */
-#undef HAVE_LOCALE
-
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
-/* Define HAVE_OSPEED if your termcap library has the ospeed variable. */
-#undef HAVE_OSPEED
-
-/* PCRE (Perl-compatible regular expression) library */
-#undef HAVE_PCRE
-
-/* Define to 1 if you have the `popen' function. */
-#undef HAVE_POPEN
-
-/* POSIX regcomp() and regex.h */
-#undef HAVE_POSIX_REGCOMP
-
-/* System V regcmp() */
-#undef HAVE_REGCMP
-
-/* */
-#undef HAVE_REGEXEC2
-
-/* BSD re_comp() */
-#undef HAVE_RE_COMP
-
-/* Define HAVE_SIGEMPTYSET if you have the sigemptyset macro. */
-#undef HAVE_SIGEMPTYSET
-
-/* Define to 1 if you have the `sigprocmask' function. */
-#undef HAVE_SIGPROCMASK
-
-/* Define to 1 if you have the `sigsetmask' function. */
-#undef HAVE_SIGSETMASK
-
-/* Define to 1 if the system has the type `sigset_t'. */
-#undef HAVE_SIGSET_T
-
-/* Define to 1 if you have the `snprintf' function. */
-#undef HAVE_SNPRINTF
-
-/* Define to 1 if you have the `stat' function. */
-#undef HAVE_STAT
-
-/* Define HAVE_STAT_INO if your struct stat has st_ino and st_dev. */
-#undef HAVE_STAT_INO
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
-
-/* Define to 1 if you have the <stdio.h> header file. */
-#undef HAVE_STDIO_H
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
-
-/* Define HAVE_STRERROR if you have the strerror() function. */
-#undef HAVE_STRERROR
-
-/* Define to 1 if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
-
-/* Define to 1 if you have the <string.h> header file. */
-#undef HAVE_STRING_H
-
-/* Define to 1 if you have the `system' function. */
-#undef HAVE_SYSTEM
-
-/* Define HAVE_SYS_ERRLIST if you have the sys_errlist[] variable. */
-#undef HAVE_SYS_ERRLIST
-
-/* Define to 1 if you have the <sys/ioctl.h> header file. */
-#undef HAVE_SYS_IOCTL_H
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the <sys/stream.h> header file. */
-#undef HAVE_SYS_STREAM_H
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H
-
-/* Define to 1 if you have the <termcap.h> header file. */
-#undef HAVE_TERMCAP_H
-
-/* Define HAVE_TERMIOS_FUNCS if you have tcgetattr/tcsetattr. */
-#undef HAVE_TERMIOS_FUNCS
-
-/* Define to 1 if you have the <termios.h> header file. */
-#undef HAVE_TERMIOS_H
-
-/* Define to 1 if you have the <termio.h> header file. */
-#undef HAVE_TERMIO_H
-
-/* Define to 1 if you have the <time.h> header file. */
-#undef HAVE_TIME_H
-
-/* Define HAVE_TIME_T if your system supports the "time_t" type. */
-#undef HAVE_TIME_T
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
-
-/* Define HAVE_UPPER_LOWER if you have isupper, islower, toupper, tolower. */
-#undef HAVE_UPPER_LOWER
-
-/* Henry Spencer V8 regcomp() and regexp.h */
-#undef HAVE_V8_REGCOMP
-
-/* Define to 1 if you have the <values.h> header file. */
-#undef HAVE_VALUES_H
-
-/* Define HAVE_VOID if your compiler supports the "void" type. */
-#undef HAVE_VOID
-
-/* Define HAVE_WCTYPE if you have iswupper, iswlower, towupper, towlower. */
-#undef HAVE_WCTYPE
-
-/* Define to 1 if you have the <wctype.h> header file. */
-#undef HAVE_WCTYPE_H
-
-/* Define to 1 if you have the `_setjmp' function. */
-#undef HAVE__SETJMP
-
-/* Define MUST_DEFINE_ERRNO if you have errno but it is not define in errno.h.
- */
-#undef MUST_DEFINE_ERRNO
-
-/* Define MUST_DEFINE_OSPEED if you have ospeed but it is not defined in
- termcap.h. */
-#undef MUST_DEFINE_OSPEED
-
-/* pattern matching is supported, but without metacharacters. */
-#undef NO_REGEX
-
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
-/* Define to the home page for this package. */
-#undef PACKAGE_URL
-
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-
-/* Define as the return type of signal handlers (`int' or `void'). */
-#undef RETSIGTYPE
-
-/* Define SECURE_COMPILE=1 to build a secure version of less. */
-#undef SECURE_COMPILE
-
-/* Define to 1 if the `S_IS*' macros in <sys/stat.h> do not work properly. */
-#undef STAT_MACROS_BROKEN
-
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
-#undef TIME_WITH_SYS_TIME
-
-/* Number of bits in a file offset, on hosts where this is settable. */
-#undef _FILE_OFFSET_BITS
-
-/* Define for large files, on AIX-style hosts. */
-#undef _LARGE_FILES
-
-/* Define to empty if `const' does not conform to ANSI C. */
-#undef const
-
-/* Define to `long int' if <sys/types.h> does not define. */
-#undef off_t
-
-/* Define to `unsigned int' if <sys/types.h> does not define. */
-#undef size_t
Deleted: trunk/contrib/less/defines.o2
===================================================================
--- trunk/contrib/less/defines.o2 2018-07-06 12:43:22 UTC (rev 11361)
+++ trunk/contrib/less/defines.o2 2018-07-06 12:46:07 UTC (rev 11362)
@@ -1,339 +0,0 @@
-/*
- * Copyright (C) 1984-2012 Mark Nudelman
- *
- * You may distribute under the terms of either the GNU General Public
- * License or the Less License, as specified in the README file.
- *
- * For more information, see the README file.
- */
-
-
-/* OS/2 definition file for less. */
-/*
- * This file has 2 sections:
- * User preferences.
- * Settings always true for the emx compiler for OS/2 systems.
- */
-
-
-/* User preferences. */
-
-/*
- * SECURE is 1 if you wish to disable a bunch of features in order to
- * be safe to run by unprivileged users.
- */
-#define SECURE 0
-
-/*
- * SHELL_ESCAPE is 1 if you wish to allow shell escapes.
- * (This is possible only if your system supplies the system() function.)
- */
-#define SHELL_ESCAPE (!SECURE)
-
-/*
- * EXAMINE is 1 if you wish to allow examining files by name from within less.
- */
-#define EXAMINE (!SECURE)
-
-/*
- * TAB_COMPLETE_FILENAME is 1 if you wish to allow the TAB key
- * to complete filenames at prompts.
- */
-#define TAB_COMPLETE_FILENAME (!SECURE)
-
-/*
- * CMD_HISTORY is 1 if you wish to allow keys to cycle through
- * previous commands at prompts.
- */
-#define CMD_HISTORY 1
-
-/*
- * HILITE_SEARCH is 1 if you wish to have search targets to be
- * displayed in standout mode.
- */
-#define HILITE_SEARCH 1
-
-/*
- * EDITOR is 1 if you wish to allow editor invocation (the "v" command).
- * (This is possible only if your system supplies the system() function.)
- * EDIT_PGM is the name of the (default) editor to be invoked.
- */
-#define EDITOR (!SECURE)
-#define EDIT_PGM "vi"
-
-/*
- * TAGS is 1 if you wish to support tag files.
- */
-#define TAGS (!SECURE)
-
-/*
- * USERFILE is 1 if you wish to allow a .less file to specify
- * user-defined key bindings.
- */
-#define USERFILE (!SECURE)
-
-/*
- * GLOB is 1 if you wish to have shell metacharacters expanded in filenames.
- * This will generally work if your system provides the "popen" function
- * and the "echo" shell command.
- */
-#define GLOB (!SECURE)
-
-/*
- * PIPEC is 1 if you wish to have the "|" command
- * which allows the user to pipe data into a shell command.
- */
-#define PIPEC (!SECURE)
-
-/*
- * LOGFILE is 1 if you wish to allow the -l option (to create log files).
- */
-#define LOGFILE (!SECURE)
-
-/*
- * GNU_OPTIONS is 1 if you wish to support the GNU-style command
- * line options --help and --version.
- */
-#define GNU_OPTIONS 1
-
-/*
- * ONLY_RETURN is 1 if you want RETURN to be the only input which
- * will continue past an error message.
- * Otherwise, any key will continue past an error message.
- */
-#define ONLY_RETURN 0
-
-/*
- * LESSKEYFILE is the filename of the default lesskey output file
- * (in the HOME directory).
- * LESSKEYFILE_SYS is the filename of the system-wide lesskey output file.
- * DEF_LESSKEYINFILE is the filename of the default lesskey input
- * (in the HOME directory).
- * LESSHISTFILE is the filename of the history file
- * (in the HOME directory).
- */
-#define LESSKEYFILE "less.ini"
-#define LESSKEYFILE_SYS "C:\\sysless.ini"
-#define DEF_LESSKEYINFILE "lesskey.ini"
-#define LESSHISTFILE "lesshst.ini"
-
-
-/* Settings always true for the emx compiler for OS/2 systems. */
-#define OS2 1
-
-/*
- * Pathname separator character.
- */
-#define PATHNAME_SEP "\\"
-
-/*
- * HAVE_SYS_TYPES_H is 1 if your system has <sys/types.h>.
- */
-#define HAVE_SYS_TYPES_H 1
-
-/*
- * Define if you have the <sgstat.h> header file.
- */
-#define HAVE_SGSTAT_H 0
-
-/*
- * HAVE_PERROR is 1 if your system has the perror() call.
- * (Actually, if it has sys_errlist, sys_nerr and errno.)
- */
-#define HAVE_PERROR 1
-
-/*
- * HAVE_TIME is 1 if your system has the time() call.
- */
-#define HAVE_TIME 1
-
-/*
- * HAVE_SHELL is 1 if your system supports a SHELL command interpreter.
- */
-#define HAVE_SHELL 0
-
-/*
- * Default shell metacharacters and meta-escape character.
- */
-#define DEF_METACHARS "; *?\t\n'\"()<>|&"
-#define DEF_METAESCAPE ""
-
-/*
- * HAVE_DUP is 1 if your system has the dup() call.
- */
-#define HAVE_DUP 1
-
-/*
- * Sizes of various buffers.
- */
-#if 0 /* old sizes for small memory machines
-#define CMDBUF_SIZE 512 /* Buffer for multichar commands */
-#define UNGOT_SIZE 100 /* Max chars to unget() */
-#define LINEBUF_SIZE 1024 /* Max size of line in input file */
-#define OUTBUF_SIZE 1024 /* Output buffer */
-#define PROMPT_SIZE 200 /* Max size of prompt string */
-#define TERMBUF_SIZE 2048 /* Termcap buffer for tgetent */
-#define TERMSBUF_SIZE 1024 /* Buffer to hold termcap strings */
-#define TAGLINE_SIZE 512 /* Max size of line in tags file */
-#define TABSTOP_MAX 32 /* Max number of custom tab stops */
-#else /* more reasonable sizes for modern machines */
-#define CMDBUF_SIZE 2048 /* Buffer for multichar commands */
-#define UNGOT_SIZE 200 /* Max chars to unget() */
-#define LINEBUF_SIZE 1024 /* Initial max size of line in input file */
-#define OUTBUF_SIZE 1024 /* Output buffer */
-#define PROMPT_SIZE 2048 /* Max size of prompt string */
-#define TERMBUF_SIZE 2048 /* Termcap buffer for tgetent */
-#define TERMSBUF_SIZE 1024 /* Buffer to hold termcap strings */
-#define TAGLINE_SIZE 1024 /* Max size of line in tags file */
-#define TABSTOP_MAX 128 /* Max number of custom tab stops */
-#endif
-
-/* Define to `long' if <sys/types.h> doesn't define. */
-/* #define off_t long */
-
-/* Define if you need to in order for stat and other things to work. */
-/* #undef _POSIX_SOURCE */
-
-/* Define as the return type of signal handlers (int or void). */
-#define RETSIGTYPE void
-
-
-/*
- * Regular expression library.
- * Define exactly one of the following to be 1:
- * HAVE_POSIX_REGCOMP: POSIX regcomp() and regex.h
- * HAVE_RE_COMP: BSD re_comp()
- * HAVE_REGCMP: System V regcmp()
- * HAVE_V8_REGCOMP: Henry Spencer V8 regcomp() and regexp.h
- * NO_REGEX: pattern matching is supported, but without metacharacters.
- */
-/* #undef HAVE_POSIX_REGCOMP */
-/* #undef HAVE_RE_COMP */
-/* #undef HAVE_REGCMP */
-#define HAVE_V8_REGCOMP 1
-/* #undef NO_REGEX */
-#define HAVE_REGEXEC2 1
-
-/* Define HAVE_VOID if your compiler supports the "void" type. */
-#define HAVE_VOID 1
-
-/* Define HAVE_CONST if your compiler supports the "const" modifier. */
-#define HAVE_CONST 1
-
-/* Define HAVE_TIME_T if your system supports the "time_t" type. */
-#define HAVE_TIME_T 1
-
-/* Define HAVE_STRERROR if you have the strerror() function. */
-#define HAVE_STRERROR 1
-
-/* Define HAVE_FILENO if you have the fileno() macro. */
-#define HAVE_FILENO 1
-
-/* Define HAVE_ERRNO if you have the errno variable */
-/* Define MUST_DEFINE_ERRNO if you have errno but it is not define
- * in errno.h */
-#define HAVE_ERRNO 1
-/* #undef MUST_DEFINE_ERRNO */
-
-/* Define HAVE_SYS_ERRLIST if you have the sys_errlist[] variable */
-#define HAVE_SYS_ERRLIST 1
-
-/* Define HAVE_OSPEED if your termcap library has the ospeed variable */
-#define HAVE_OSPEED 1
-/* Define MUST_DEFINE_OSPEED if you have ospeed but it is not defined
- * in termcap.h. */
-#define MUST_DEFINE_OSPEED 0
-
-/* Define HAVE_LOCALE if you have locale.h and setlocale. */
-#define HAVE_LOCALE 1
-
-/* Define HAVE_TERMIOS_FUNCS if you have tcgetattr/tcsetattr */
-#define HAVE_TERMIOS_FUNCS 1
-
-/* Define HAVE_UPPER_LOWER if you have isupper, islower, toupper, tolower */
-#define HAVE_UPPER_LOWER 1
-
-/* Define if you have the _setjmp function. */
-#define HAVE__SETJMP 0
-
-/* Define if you have the memcpy function. */
-#define HAVE_MEMCPY 1
-
-/* Define if you have the popen function. */
-#define HAVE_POPEN 1
-
-/* Define if you have the sigsetmask function. */
-#define HAVE_SIGSETMASK 0
-
-/* Define if you have the sigprocmask function. */
-#define HAVE_SIGPROCMASK 1
-
-/* Define if you have the sigset_t type and sigemptyset macro */
-#define HAVE_SIGSET_T 1
-#define HAVE_SIGEMPTYSET 1
-
-/* Define if you have the stat function. */
-#define HAVE_STAT 1
-
-/* Define if you have the strchr function. */
-#define HAVE_STRCHR 1
-
-/* Define if you have the strstr function. */
-#define HAVE_STRSTR 1
-
-/* Define if you have the system function. */
-#define HAVE_SYSTEM 1
-
-/* Define if you have the snprintf function. */
-#define HAVE_SNPRINTF 0
-
-/* Define if you have the <ctype.h> header file. */
-#define HAVE_CTYPE_H 1
-
-/* Define if you have the <wctype.h> header file. */
-#define HAVE_WCTYPE_H 0
-
-/* Define if you have the <errno.h> header file. */
-#define HAVE_ERRNO_H 1
-
-/* Define if you have the <fcntl.h> header file. */
-#define HAVE_FCNTL_H 1
-
-/* Define if you have the <limits.h> header file. */
-#define HAVE_LIMITS_H 1
-
-/* Define if you have the <stdio.h> header file. */
-#define HAVE_STDIO_H 1
-
-/* Define if you have the <stdlib> header file. */
-#define HAVE_STDLIB_H 1
-
-/* Define if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
-/* Define if you have the <sys/ioctl.h> header file. */
-#define HAVE_SYS_IOCTL_H 1
-
-/* Define if you have the <sys/ptem.h> header file. */
-#define HAVE_SYS_PTEM_H 0
-
-/* Define if you have the <sys/stream.h> header file. */
-#define HAVE_SYS_STREAM_H 0
-
-/* Define if you have the <termcap.h> header file. */
-#define HAVE_TERMCAP_H 1
-
-/* Define if you have the <termio.h> header file. */
-#define HAVE_TERMIO_H 1
-
-/* Define if you have the <termios.h> header file. */
-#define HAVE_TERMIOS_H 1
-
-/* Define if you have the <time.h> header file. */
-#define HAVE_TIME_H 1
-
-/* Define if you have the <unistd.h> header file. */
-#define HAVE_UNISTD_H 1
-
-/* Define if you have the <values.h> header file. */
-#define HAVE_VALUES_H 0
Deleted: trunk/contrib/less/defines.o9
===================================================================
--- trunk/contrib/less/defines.o9 2018-07-06 12:43:22 UTC (rev 11361)
+++ trunk/contrib/less/defines.o9 2018-07-06 12:46:07 UTC (rev 11362)
@@ -1,351 +0,0 @@
-/*
- * Copyright (C) 1984-2012 Mark Nudelman
- *
- * You may distribute under the terms of either the GNU General Public
- * License or the Less License, as specified in the README file.
- *
- * For more information, see the README file.
- */
-
-
-/* OS/9 definition file for less. */
-/*
- * This file has 2 sections:
- * User preferences.
- * Settings always true for OS-9 systems.
- */
-
-/* User preferences. */
-
-/*
- * SECURE is 1 if you wish to disable a bunch of features in order to
- * be safe to run by unprivileged users.
- */
-#define SECURE 0
-
-/*
- * SHELL_ESCAPE is 1 if you wish to allow shell escapes.
- * (This is possible only if your system supplies the system() function.)
- */
-#define SHELL_ESCAPE (!SECURE)
-
-/*
- * EXAMINE is 1 if you wish to allow examining files by name from within less.
- */
-#define EXAMINE (!SECURE)
-
-/*
- * TAB_COMPLETE_FILENAME is 1 if you wish to allow the TAB key
- * to complete filenames at prompts.
- */
-#define TAB_COMPLETE_FILENAME 1
-
-/*
- * CMD_HISTORY is 1 if you wish to allow keys to cycle through
- * previous commands at prompts.
- */
-#define CMD_HISTORY 1
-
-/*
- * HILITE_SEARCH is 1 if you wish to have search targets to be
- * displayed in standout mode.
- */
-#define HILITE_SEARCH 1
-
-/*
- * EDITOR is 1 if you wish to allow editor invocation (the "v" command).
- * (This is possible only if your system supplies the system() function.)
- * EDIT_PGM is the name of the (default) editor to be invoked.
- */
-#define EDITOR (!SECURE)
-#define EDIT_PGM "umacs"
-
-/*
- * TAGS is 1 if you wish to support tag files.
- */
-#define TAGS (!SECURE)
-
-/*
- * USERFILE is 1 if you wish to allow a .less file to specify
- * user-defined key bindings.
- */
-#define USERFILE (!SECURE)
-
-/*
- * GLOB is 1 if you wish to have shell metacharacters expanded in filenames.
- * This will generally work if your system provides the "popen" function
- * and the "echo" shell command.
- */
-#define GLOB (!SECURE)
-
-/*
- * PIPEC is 1 if you wish to have the "|" command
- * which allows the user to pipe data into a shell command.
- */
-#define PIPEC (!SECURE)
-
-/*
- * LOGFILE is 1 if you wish to allow the -l option (to create log files).
- */
-#define LOGFILE (!SECURE)
-
-/*
- * GNU_OPTIONS is 1 if you wish to support the GNU-style command
- * line options --help and --version.
- */
-#define GNU_OPTIONS 1
-
-/*
- * ONLY_RETURN is 1 if you want RETURN to be the only input which
- * will continue past an error message.
- * Otherwise, any key will continue past an error message.
- */
-#define ONLY_RETURN 0
-
-/*
- * LESSKEYFILE is the filename of the default lesskey output file
- * (in the HOME directory).
- * LESSKEYFILE_SYS is the filename of the system-wide lesskey output file.
- * DEF_LESSKEYINFILE is the filename of the default lesskey input
- * (in the HOME directory).
- * LESSHISTFILE is the filename of the history file
- * (in the HOME directory).
- */
-#define LESSKEYFILE ".less"
-#define LESSKEYFILE_SYS "/.sysless"
-#define DEF_LESSKEYINFILE ".lesskey"
-#define LESSHISTFILE ".lesshst"
-
-
-/* Settings always true for OS-9. */
-
-/* This is not needed; it is defined by the compiler. */
-/* #define _OSK 1 */
-#define OS2 0
-#define MSDOS_COMPILER 0
-
-/*
- * Pathname separator character.
- */
-#define PATHNAME_SEP "/"
-
-/*
- * HAVE_SYS_TYPES_H is 1 if your system has <sys/types.h>.
- */
-#define HAVE_SYS_TYPES_H 0
-
-/*
- * Define if you have the <sgstat.h> header file.
- */
-#define HAVE_SGSTAT_H 1
-
-/*
- * HAVE_PERROR is 1 if your system has the perror() call.
- * (Actually, if it has sys_errlist, sys_nerr and errno.)
- */
-#if _OSK_MWC32
-#define HAVE_PERROR 0
-#else
-#define HAVE_PERROR 1
-#endif
-
-/*
- * HAVE_TIME is 1 if your system has the time() call.
- */
-#define HAVE_TIME 1
-
-/*
- * HAVE_SHELL is 1 if your system supports a SHELL command interpreter.
- */
-#define HAVE_SHELL 0
-
-/*
- * Default shell metacharacters and meta-escape character.
- */
-#define DEF_METACHARS "; \t\n'\"()<>|&^`#\\"
-#define DEF_METAESCAPE "\\"
-
-/*
- * HAVE_DUP is 1 if your system has the dup() call.
- */
-#define HAVE_DUP 0
-
-/*
- * Sizes of various buffers.
- */
-#if 0 /* old sizes for small memory machines
-#define CMDBUF_SIZE 512 /* Buffer for multichar commands */
-#define UNGOT_SIZE 100 /* Max chars to unget() */
-#define LINEBUF_SIZE 1024 /* Max size of line in input file */
-#define OUTBUF_SIZE 1024 /* Output buffer */
-#define PROMPT_SIZE 200 /* Max size of prompt string */
-#define TERMBUF_SIZE 2048 /* Termcap buffer for tgetent */
-#define TERMSBUF_SIZE 1024 /* Buffer to hold termcap strings */
-#define TAGLINE_SIZE 512 /* Max size of line in tags file */
-#define TABSTOP_MAX 32 /* Max number of custom tab stops */
-#else /* more reasonable sizes for modern machines */
-#define CMDBUF_SIZE 2048 /* Buffer for multichar commands */
-#define UNGOT_SIZE 200 /* Max chars to unget() */
-#define LINEBUF_SIZE 1024 /* Initial max size of line in input file */
-#define OUTBUF_SIZE 1024 /* Output buffer */
-#define PROMPT_SIZE 2048 /* Max size of prompt string */
-#define TERMBUF_SIZE 2048 /* Termcap buffer for tgetent */
-#define TERMSBUF_SIZE 1024 /* Buffer to hold termcap strings */
-#define TAGLINE_SIZE 1024 /* Max size of line in tags file */
-#define TABSTOP_MAX 128 /* Max number of custom tab stops */
-#endif
-
-/* Define to `long' if <sys/types.h> doesn't define. */
-#define off_t long
-
-/* Define if you need to in order for stat and other things to work. */
-#define _POSIX_SOURCE 0
-
-/* Define as the return type of signal handlers (int or void). */
-#if _OSK_MWC32
-#define RETSIGTYPE int
-#else
-#define RETSIGTYPE void
-#endif
-
-
-/*
- * Regular expression library.
- * Define exactly one of the following to be 1:
- * HAVE_POSIX_REGCOMP: POSIX regcomp() and regex.h
- * HAVE_RE_COMP: BSD re_comp()
- * HAVE_REGCMP: System V regcmp()
- * HAVE_V8_REGCOMP: Henry Spencer V8 regcomp() and regexp.h
- * NO_REGEX: pattern matching is supported, but without metacharacters.
- */
-#define HAVE_POSIX_REGCOMP 0
-#define HAVE_RE_COMP 0
-#define HAVE_REGCMP 0
-#define HAVE_V8_REGCOMP 1
-#define NO_REGEX 0
-#define HAVE_REGEXEC2 1
-
-/* Define HAVE_VOID if your compiler supports the "void" type. */
-#define HAVE_VOID 1
-
-/* Define HAVE_CONST if your compiler supports the "const" modifier. */
-#define HAVE_CONST 0
-
-/* Define HAVE_TIME_T if your system supports the "time_t" type. */
-#define HAVE_TIME_T 1
-
-/* Define HAVE_STRERROR if you have the strerror() function. */
-#define HAVE_STRERROR 0
-
-/* Define HAVE_FILENO if you have the fileno() macro. */
-#define HAVE_FILENO 1
-
-/* Define HAVE_ERRNO if you have the errno variable */
-/* Define MUST_DEFINE_ERRNO if you have errno but it is not define
- * in errno.h */
-#define HAVE_ERRNO 1
-#define MUST_DEFINE_ERRNO 0
-
-/* Define HAVE_SYS_ERRLIST if you have the sys_errlist[] variable */
-#define HAVE_SYS_ERRLIST 0
-
-/* Define HAVE_OSPEED if your termcap library has the ospeed variable */
-/* Define MUST_DEFINE_OSPEED if you have ospeed but it is not defined
- * in termcap.h. */
-#define HAVE_OSPEED 0
-#define MUST_DEFINE_OSPEED 0
-
-/* Define HAVE_LOCALE if you have locale.h and setlocale. */
-#define HAVE_LOCALE 0
-
-/* Define HAVE_TERMIOS_FUNCS if you have tcgetattr/tcsetattr */
-#define HAVE_TERMIOS_FUNCS 0
-
-/* Define HAVE_UPPER_LOWER if you have isupper, islower, toupper, tolower */
-#define HAVE_UPPER_LOWER 1
-
-/* Define if you have the _setjmp function. */
-#define HAVE__SETJMP 1
-
-/* Define if you have the memcpy function. */
-#define HAVE_MEMCPY 1
-
-/* Define if you have the popen function. */
-#define HAVE_POPEN 1
-
-/* Define if you have the sigsetmask function. */
-#define HAVE_SIGSETMASK 0
-
-/* Define if you have the sigprocmask function. */
-#define HAVE_SIGPROCMASK 0
-
-/* Define if you have the sigset_t type and sigemptyset macro */
-#define HAVE_SIGSET_T 0
-#define HAVE_SIGEMPTYSET 0
-
-/* Define if you have the stat function. */
-#define HAVE_STAT 0
-
-/* Define if you have the strchr function. */
-#define HAVE_STRCHR 0
-
-/* Define if you have the system function. */
-#define HAVE_SYSTEM 1
-
-/* Define if you have the snprintf function. */
-#define HAVE_SNPRINTF 0
-
-/* Define if you have the <ctype.h> header file. */
-#define HAVE_CTYPE_H 1
-
-/* Define if you have the <wctype.h> header file. */
-#define HAVE_WCTYPE_H 0
-
-/* Define if you have the <errno.h> header file. */
-#define HAVE_ERRNO_H 1
-
-/* Define if you have the <fcntl.h> header file. */
-#define HAVE_FCNTL_H 0
-
-/* Define if you have the <limits.h> header file. */
-#define HAVE_LIMITS_H 0
-
-/* Define if you have the <stdio.h> header file. */
-#define HAVE_STDIO_H 1
-
-/* Define if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
-/* Define if you have the <stdlib> header file. */
-#if _OSK_MWC32
-#define HAVE_STDLIB_H 0
-#else
-#define HAVE_STDLIB_H 1
-#endif
-
-/* Define if you have the <sys/ioctl.h> header file. */
-#define HAVE_SYS_IOCTL_H 0
-
-/* Define if you have the <sys/ptem.h> header file. */
-#define HAVE_SYS_PTEM_H 0
-
-/* Define if you have the <sys/stream.h> header file. */
-#define HAVE_SYS_STREAM_H 0
-
-/* Define if you have the <termcap.h> header file. */
-#define HAVE_TERMCAP_H 1
-
-/* Define if you have the <termio.h> header file. */
-#define HAVE_TERMIO_H 0
-
-/* Define if you have the <termios.h> header file. */
-#define HAVE_TERMIOS_H 0
-
-/* Define if you have the <time.h> header file. */
-#define HAVE_TIME_H 1
-
-/* Define if you have the <unistd.h> header file. */
-#define HAVE_UNISTD_H 0
-
-/* Define if you have the <values.h> header file. */
-#define HAVE_VALUES_H 0
Deleted: trunk/contrib/less/defines.wn
===================================================================
--- trunk/contrib/less/defines.wn 2018-07-06 12:43:22 UTC (rev 11361)
+++ trunk/contrib/less/defines.wn 2018-07-06 12:46:07 UTC (rev 11362)
@@ -1,350 +0,0 @@
-/*
- * Copyright (C) 1984-2012 Mark Nudelman
- *
- * You may distribute under the terms of either the GNU General Public
- * License or the Less License, as specified in the README file.
- *
- * For more information, see the README file.
- */
-
-
-/* Windows definition file for less. */
-/*
- * This file has 2 sections:
- * User preferences.
- * Settings always true for Windows systems.
- */
-
-
-/* User preferences. */
-
-/*
- * SECURE is 1 if you wish to disable a bunch of features in order to
- * be safe to run by unprivileged users.
- */
-#define SECURE 0
-
-/*
- * SHELL_ESCAPE is 1 if you wish to allow shell escapes.
- * (This is possible only if your system supplies the system() function.)
- */
-#define SHELL_ESCAPE (!SECURE)
-
-/*
- * EXAMINE is 1 if you wish to allow examining files by name from within less.
- */
-#define EXAMINE (!SECURE)
-
-/*
- * TAB_COMPLETE_FILENAME is 1 if you wish to allow the TAB key
- * to complete filenames at prompts.
- */
-#define TAB_COMPLETE_FILENAME (!SECURE)
-
-/*
- * CMD_HISTORY is 1 if you wish to allow keys to cycle through
- * previous commands at prompts.
- */
-#define CMD_HISTORY 1
-
-/*
- * HILITE_SEARCH is 1 if you wish to have search targets to be
- * displayed in standout mode.
- */
-#define HILITE_SEARCH 1
-
-/*
- * EDITOR is 1 if you wish to allow editor invocation (the "v" command).
- * (This is possible only if your system supplies the system() function.)
- * EDIT_PGM is the name of the (default) editor to be invoked.
- */
-#define EDITOR (!SECURE)
-#define EDIT_PGM "edit"
-
-/*
- * TAGS is 1 if you wish to support tag files.
- */
-#define TAGS (!SECURE)
-
-/*
- * USERFILE is 1 if you wish to allow a .less file to specify
- * user-defined key bindings.
- */
-#define USERFILE (!SECURE)
-
-/*
- * GLOB is 1 if you wish to have shell metacharacters expanded in filenames.
- * This will generally work if your system provides the "popen" function
- * and the "echo" shell command.
- */
-#define GLOB 0
-
-/*
- * PIPEC is 1 if you wish to have the "|" command
- * which allows the user to pipe data into a shell command.
- */
-#define PIPEC 1
-
-/*
- * LOGFILE is 1 if you wish to allow the -l option (to create log files).
- */
-#define LOGFILE (!SECURE)
-
-/*
- * GNU_OPTIONS is 1 if you wish to support the GNU-style command
- * line options --help and --version.
- */
-#define GNU_OPTIONS 1
-
-/*
- * ONLY_RETURN is 1 if you want RETURN to be the only input which
- * will continue past an error message.
- * Otherwise, any key will continue past an error message.
- */
-#define ONLY_RETURN 0
-
-/*
- * LESSKEYFILE is the filename of the default lesskey output file
- * (in the HOME directory).
- * LESSKEYFILE_SYS is the filename of the system-wide lesskey output file.
- * DEF_LESSKEYINFILE is the filename of the default lesskey input
- * (in the HOME directory).
- * LESSHISTFILE is the filename of the history file
- * (in the HOME directory).
- */
-#define LESSKEYFILE "_less"
-#define LESSKEYFILE_SYS "c:\\_sysless"
-#define DEF_LESSKEYINFILE "_lesskey"
-#define LESSHISTFILE "_lesshst"
-
-
-/* Settings always true for Windows systems. */
-
-#define MSDOS_COMPILER WIN32C
-
-/*
- * Pathname separator character.
- */
-#define PATHNAME_SEP "\\"
-
-/*
- * HAVE_SYS_TYPES_H is 1 if your system has <sys/types.h>.
- */
-#define HAVE_SYS_TYPES_H 1
-
-/*
- * Define if you have the <sgstat.h> header file.
- */
-#define HAVE_SGSTAT_H 0
-
-/*
- * HAVE_PERROR is 1 if your system has the perror() call.
- * (Actually, if it has sys_errlist, sys_nerr and errno.)
- */
-#define HAVE_PERROR 1
-
-/*
- * HAVE_TIME is 1 if your system has the time() call.
- */
-#define HAVE_TIME 1
-
-/*
- * HAVE_SHELL is 1 if your system supports a SHELL command interpreter.
- */
-#define HAVE_SHELL 0
-
-/*
- * Default shell metacharacters and meta-escape character.
- */
-#define DEF_METACHARS "; *?\t\n'\"()<>|&"
-#define DEF_METAESCAPE ""
-
-/*
- * HAVE_DUP is 1 if your system has the dup() call.
- */
-#define HAVE_DUP 1
-
-/*
- * Sizes of various buffers.
- */
-#if 0 /* old sizes for small memory machines
-#define CMDBUF_SIZE 512 /* Buffer for multichar commands */
-#define UNGOT_SIZE 100 /* Max chars to unget() */
-#define LINEBUF_SIZE 1024 /* Max size of line in input file */
-#define OUTBUF_SIZE 1024 /* Output buffer */
-#define PROMPT_SIZE 200 /* Max size of prompt string */
-#define TERMBUF_SIZE 2048 /* Termcap buffer for tgetent */
-#define TERMSBUF_SIZE 1024 /* Buffer to hold termcap strings */
-#define TAGLINE_SIZE 512 /* Max size of line in tags file */
-#define TABSTOP_MAX 32 /* Max number of custom tab stops */
-#else /* more reasonable sizes for modern machines */
-#define CMDBUF_SIZE 2048 /* Buffer for multichar commands */
-#define UNGOT_SIZE 200 /* Max chars to unget() */
-#define LINEBUF_SIZE 1024 /* Initial max size of line in input file */
-#define OUTBUF_SIZE 1024 /* Output buffer */
-#define PROMPT_SIZE 2048 /* Max size of prompt string */
-#define TERMBUF_SIZE 2048 /* Termcap buffer for tgetent */
-#define TERMSBUF_SIZE 1024 /* Buffer to hold termcap strings */
-#define TAGLINE_SIZE 1024 /* Max size of line in tags file */
-#define TABSTOP_MAX 128 /* Max number of custom tab stops */
-#endif
-
-/* Define to `long' if <sys/types.h> doesn't define. */
-/* #define off_t long */
-
-/* Define if you need to in order for stat and other things to work. */
-/* #undef _POSIX_SOURCE */
-
-/* Define as the return type of signal handlers (int or void). */
-#define RETSIGTYPE void
-
-
-/*
- * Regular expression library.
- * Define exactly one of the following to be 1:
- * HAVE_POSIX_REGCOMP: POSIX regcomp() and regex.h
- * HAVE_RE_COMP: BSD re_comp()
- * HAVE_REGCMP: System V regcmp()
- * HAVE_V8_REGCOMP: Henry Spencer V8 regcomp() and regexp.h
- * NO_REGEX: pattern matching is supported, but without metacharacters.
- */
-/* #undef HAVE_POSIX_REGCOMP */
-/* #undef HAVE_RE_COMP */
-/* #undef HAVE_REGCMP */
-#define HAVE_V8_REGCOMP 1
-/* #undef NO_REGEX */
-#define HAVE_REGEXEC2 1
-
-/* Define HAVE_VOID if your compiler supports the "void" type. */
-#define HAVE_VOID 1
-
-/* Define HAVE_CONST if your compiler supports the "const" modifier. */
-#define HAVE_CONST 1
-
-/* Define HAVE_TIME_T if your system supports the "time_t" type. */
-#define HAVE_TIME_T 1
-
-/* Define HAVE_STRERROR if you have the strerror() function. */
-#define HAVE_STRERROR 1
-
-/* Define HAVE_FILENO if you have the fileno() macro. */
-#define HAVE_FILENO 1
-
-/* Define HAVE_ERRNO if you have the errno variable */
-/* Define MUST_DEFINE_ERRNO if you have errno but it is not define
- * in errno.h */
-#define HAVE_ERRNO 1
-#define MUST_DEFINE_ERRNO 1
-
-/* Define HAVE_SYS_ERRLIST if you have the sys_errlist[] variable */
-#define HAVE_SYS_ERRLIST 1
-
-/* Define HAVE_OSPEED if your termcap library has the ospeed variable */
-#define HAVE_OSPEED 0
-/* Define MUST_DEFINE_OSPEED if you have ospeed but it is not defined
- * in termcap.h. */
-#define MUST_DEFINE_OSPEED 0
-
-/* Define HAVE_LOCALE if you have locale.h and setlocale. */
-#define HAVE_LOCALE 0
-
-/* Define HAVE_TERMIOS_FUNCS if you have tcgetattr/tcsetattr */
-#define HAVE_TERMIOS_FUNCS 0
-
-/* Define HAVE_UPPER_LOWER if you have isupper, islower, toupper, tolower */
-#define HAVE_UPPER_LOWER 1
-
-/* Define if you have the _setjmp function. */
-#define HAVE__SETJMP 1
-
-/* Define if you have the memcpy function. */
-#define HAVE_MEMCPY 1
-
-/* Define if you have the popen function. */
-#define HAVE_POPEN 1
-
-/* Define if you have the sigsetmask function. */
-#define HAVE_SIGSETMASK 0
-
-/* Define if you have the sigprocmask function. */
-#define HAVE_SIGPROCMASK 0
-
-/* Define if you have the sigset_t type and sigemptyset macro */
-#define HAVE_SIGSET_T 0
-#define HAVE_SIGEMPTYSET 0
-
-/* Define if you have the stat function. */
-#define HAVE_STAT 1
-
-/* Define if you have the strchr function. */
-#define HAVE_STRCHR 1
-
-/* Define if you have the system function. */
-#define HAVE_SYSTEM 1
-
-/* Define if you have the snprintf function. */
-#define HAVE_SNPRINTF 1
-
-/* Define if you have the <ctype.h> header file. */
-#define HAVE_CTYPE_H 1
-
-/* Define if you have the <wctype.h> header file. */
-#define HAVE_WCTYPE_H 1
-
-/* Define if you have the <errno.h> header file. */
-#define HAVE_ERRNO_H 1
-
-/* Define if you have the <fcntl.h> header file. */
-#define HAVE_FCNTL_H 1
-
-/* Define HAVE_FLOAT if your compiler supports the "double" type. */
-#define HAVE_FLOAT 1
-
-/* Define if you have the <limits.h> header file. */
-#define HAVE_LIMITS_H 1
-
-/* Define if you have the <stdio.h> header file. */
-#define HAVE_STDIO_H 1
-
-/* Define if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
-/* Define if you have the <stdlib> header file. */
-#define HAVE_STDLIB_H 1
-
-/* Define if you have the <sys/ioctl.h> header file. */
-#define HAVE_SYS_IOCTL_H 0
-
-/* Define if you have the <sys/ptem.h> header file. */
-#define HAVE_SYS_PTEM_H 0
-
-/* Define if you have the <sys/stream.h> header file. */
-#define HAVE_SYS_STREAM_H 0
-
-/* Define if you have the <termcap.h> header file. */
-#define HAVE_TERMCAP_H 0
-
-/* Define if you have the <termio.h> header file. */
-#define HAVE_TERMIO_H 0
-
-/* Define if you have the <termios.h> header file. */
-#define HAVE_TERMIOS_H 0
-
-/* Define if you have the <time.h> header file. */
-#define HAVE_TIME_H 1
-
-/* Define if you have the <unistd.h> header file. */
-#define HAVE_UNISTD_H 0
-
-/* Define if you have the <values.h> header file. */
-#ifdef _MSC_VER
-#define HAVE_VALUES_H 0
-#else
-#define HAVE_VALUES_H 1
-#endif
-
-#define popen _popen
-#define pclose _pclose
-#define snprintf _snprintf
-
-#pragma warning(disable:4996)
Modified: trunk/contrib/less/edit.c
===================================================================
--- trunk/contrib/less/edit.c 2018-07-06 12:43:22 UTC (rev 11361)
+++ trunk/contrib/less/edit.c 2018-07-06 12:46:07 UTC (rev 11362)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 1984-2012 Mark Nudelman
+ * Copyright (C) 1984-2017 Mark Nudelman
*
* You may distribute under the terms of either the GNU General Public
* License or the Less License, as specified in the README file.
@@ -9,9 +9,13 @@
#include "less.h"
+#include "position.h"
#if HAVE_STAT
#include <sys/stat.h>
#endif
+#if OS2
+#include <signal.h>
+#endif
public int fd0 = 0;
@@ -26,7 +30,7 @@
extern IFILE curr_ifile;
extern IFILE old_ifile;
extern struct scrpos initial_scrpos;
-extern void constant *ml_examine;
+extern void *ml_examine;
#if SPACES_IN_FILENAMES
extern char openquote;
extern char closequote;
@@ -43,10 +47,7 @@
public ino_t curr_ino;
#endif
-char *curr_altfilename = NULL;
-static void *curr_altpipe;
-
/*
* Textlist functions deal with a list of words separated by spaces.
* init_textlist sets up a textlist structure.
@@ -64,7 +65,7 @@
int meta_quoted = 0;
int delim_quoted = 0;
char *esc = get_meta_escape();
- int esclen = strlen(esc);
+ int esclen = (int) strlen(esc);
#endif
tlist->string = skipsp(str);
@@ -149,6 +150,24 @@
}
/*
+ * Close a pipe opened via popen.
+ */
+ static void
+close_pipe(FILE *pipefd)
+{
+ if (pipefd == NULL)
+ return;
+#if OS2
+ /*
+ * The pclose function of OS/2 emx sometimes fails.
+ * Send SIGINT to the piped process before closing it.
+ */
+ kill(pipefd->_pid, SIGINT);
+#endif
+ pclose(pipefd);
+}
+
+/*
* Close the current input file.
*/
static void
@@ -155,6 +174,9 @@
close_file()
{
struct scrpos scrpos;
+ int chflags;
+ FILE *altpipe;
+ char *altfilename;
if (curr_ifile == NULL_IFILE)
return;
@@ -163,7 +185,7 @@
* Save the current position so that we can return to
* the same position if we edit this file again.
*/
- get_scrpos(&scrpos);
+ get_scrpos(&scrpos, TOP);
if (scrpos.pos != NULL_POSITION)
{
store_pos(curr_ifile, &scrpos);
@@ -172,17 +194,23 @@
/*
* Close the file descriptor, unless it is a pipe.
*/
+ chflags = ch_getflags();
ch_close();
/*
* If we opened a file using an alternate name,
* do special stuff to close it.
*/
- if (curr_altfilename != NULL)
+ altfilename = get_altfilename(curr_ifile);
+ if (altfilename != NULL)
{
- close_altfile(curr_altfilename, get_filename(curr_ifile),
- curr_altpipe);
- free(curr_altfilename);
- curr_altfilename = NULL;
+ altpipe = get_altpipe(curr_ifile);
+ if (altpipe != NULL && !(chflags & CH_KEEPOPEN))
+ {
+ close_pipe(altpipe);
+ set_altpipe(curr_ifile, NULL);
+ }
+ close_altfile(altfilename, get_filename(curr_ifile));
+ set_altfilename(curr_ifile, NULL);
}
curr_ifile = NULL_IFILE;
#if HAVE_STAT_INO
@@ -218,9 +246,8 @@
int chflags;
char *filename;
char *open_filename;
- char *qopen_filename;
char *alt_filename;
- void *alt_pipe;
+ void *altpipe;
IFILE was_curr_ifile;
PARG parg;
@@ -270,107 +297,129 @@
}
filename = save(get_filename(ifile));
+
/*
* See if LESSOPEN specifies an "alternate" file to open.
*/
- alt_pipe = NULL;
- alt_filename = open_altfile(filename, &f, &alt_pipe);
- open_filename = (alt_filename != NULL) ? alt_filename : filename;
- qopen_filename = shell_unquote(open_filename);
-
- chflags = 0;
- if (alt_pipe != NULL)
+ altpipe = get_altpipe(ifile);
+ if (altpipe != NULL)
{
/*
- * The alternate "file" is actually a pipe.
- * f has already been set to the file descriptor of the pipe
- * in the call to open_altfile above.
- * Keep the file descriptor open because it was opened
- * via popen(), and pclose() wants to close it.
+ * File is already open.
+ * chflags and f are not used by ch_init if ifile has
+ * filestate which should be the case if we're here.
+ * Set them here to avoid uninitialized variable warnings.
*/
- chflags |= CH_POPENED;
- } else if (strcmp(open_filename, "-") == 0)
+ chflags = 0;
+ f = -1;
+ alt_filename = get_altfilename(ifile);
+ open_filename = (alt_filename != NULL) ? alt_filename : filename;
+ } else
{
- /*
- * Use standard input.
- * Keep the file descriptor open because we can't reopen it.
- */
- f = fd0;
- chflags |= CH_KEEPOPEN;
- /*
- * Must switch stdin to BINARY mode.
- */
- SET_BINARY(f);
+ if (strcmp(filename, FAKE_HELPFILE) == 0 ||
+ strcmp(filename, FAKE_EMPTYFILE) == 0)
+ alt_filename = NULL;
+ else
+ alt_filename = open_altfile(filename, &f, &altpipe);
+
+ open_filename = (alt_filename != NULL) ? alt_filename : filename;
+
+ chflags = 0;
+ if (altpipe != NULL)
+ {
+ /*
+ * The alternate "file" is actually a pipe.
+ * f has already been set to the file descriptor of the pipe
+ * in the call to open_altfile above.
+ * Keep the file descriptor open because it was opened
+ * via popen(), and pclose() wants to close it.
+ */
+ chflags |= CH_POPENED;
+ if (strcmp(filename, "-") == 0)
+ chflags |= CH_KEEPOPEN;
+ } else if (strcmp(filename, "-") == 0)
+ {
+ /*
+ * Use standard input.
+ * Keep the file descriptor open because we can't reopen it.
+ */
+ f = fd0;
+ chflags |= CH_KEEPOPEN;
+ /*
+ * Must switch stdin to BINARY mode.
+ */
+ SET_BINARY(f);
#if MSDOS_COMPILER==DJGPPC
- /*
- * Setting stdin to binary by default causes
- * Ctrl-C to not raise SIGINT. We must undo
- * that side-effect.
- */
- __djgpp_set_ctrl_c(1);
+ /*
+ * Setting stdin to binary by default causes
+ * Ctrl-C to not raise SIGINT. We must undo
+ * that side-effect.
+ */
+ __djgpp_set_ctrl_c(1);
#endif
- } else if (strcmp(open_filename, FAKE_EMPTYFILE) == 0)
- {
- f = -1;
- chflags |= CH_NODATA;
- } else if (strcmp(open_filename, FAKE_HELPFILE) == 0)
- {
- f = -1;
- chflags |= CH_HELPFILE;
- } else if ((parg.p_string = bad_file(open_filename)) != NULL)
- {
- /*
- * It looks like a bad file. Don't try to open it.
- */
- error("%s", &parg);
- free(parg.p_string);
- err1:
- if (alt_filename != NULL)
+ } else if (strcmp(open_filename, FAKE_EMPTYFILE) == 0)
{
- close_altfile(alt_filename, filename, alt_pipe);
- free(alt_filename);
- }
- del_ifile(ifile);
- free(qopen_filename);
- free(filename);
- /*
- * Re-open the current file.
- */
- if (was_curr_ifile == ifile)
+ f = -1;
+ chflags |= CH_NODATA;
+ } else if (strcmp(open_filename, FAKE_HELPFILE) == 0)
{
+ f = -1;
+ chflags |= CH_HELPFILE;
+ } else if ((parg.p_string = bad_file(open_filename)) != NULL)
+ {
/*
- * Whoops. The "current" ifile is the one we just deleted.
- * Just give up.
+ * It looks like a bad file. Don't try to open it.
*/
- quit(QUIT_ERROR);
- }
- reedit_ifile(was_curr_ifile);
- return (1);
- } else if ((f = open(qopen_filename, OPEN_READ)) < 0)
- {
- /*
- * Got an error trying to open it.
- */
- parg.p_string = errno_message(filename);
- error("%s", &parg);
- free(parg.p_string);
- goto err1;
- } else
- {
- chflags |= CH_CANSEEK;
- if (!force_open && !opened(ifile) && bin_file(f))
+ error("%s", &parg);
+ free(parg.p_string);
+ err1:
+ if (alt_filename != NULL)
+ {
+ close_pipe(altpipe);
+ close_altfile(alt_filename, filename);
+ free(alt_filename);
+ }
+ del_ifile(ifile);
+ free(filename);
+ /*
+ * Re-open the current file.
+ */
+ if (was_curr_ifile == ifile)
+ {
+ /*
+ * Whoops. The "current" ifile is the one we just deleted.
+ * Just give up.
+ */
+ quit(QUIT_ERROR);
+ }
+ reedit_ifile(was_curr_ifile);
+ return (1);
+ } else if ((f = open(open_filename, OPEN_READ)) < 0)
{
/*
- * Looks like a binary file.
- * Ask user if we should proceed.
+ * Got an error trying to open it.
*/
- parg.p_string = filename;
- answer = query("\"%s\" may be a binary file. See it anyway? ",
- &parg);
- if (answer != 'y' && answer != 'Y')
+ parg.p_string = errno_message(filename);
+ error("%s", &parg);
+ free(parg.p_string);
+ goto err1;
+ } else
+ {
+ chflags |= CH_CANSEEK;
+ if (!force_open && !opened(ifile) && bin_file(f))
{
- close(f);
- goto err1;
+ /*
+ * Looks like a binary file.
+ * Ask user if we should proceed.
+ */
+ parg.p_string = filename;
+ answer = query("\"%s\" may be a binary file. See it anyway? ",
+ &parg);
+ if (answer != 'y' && answer != 'Y')
+ {
+ close(f);
+ goto err1;
+ }
}
}
}
@@ -385,8 +434,8 @@
unsave_ifile(was_curr_ifile);
}
curr_ifile = ifile;
- curr_altfilename = alt_filename;
- curr_altpipe = alt_pipe;
+ set_altfilename(curr_ifile, alt_filename);
+ set_altpipe(curr_ifile, altpipe);
set_open(curr_ifile); /* File has been opened */
get_pos(curr_ifile, &initial_scrpos);
new_file = TRUE;
@@ -400,9 +449,10 @@
#endif
#if HAVE_STAT_INO
/* Remember the i-number and device of the opened file. */
+ if (strcmp(open_filename, "-") != 0)
{
struct stat statbuf;
- int r = stat(qopen_filename, &statbuf);
+ int r = stat(open_filename, &statbuf);
if (r == 0)
{
curr_ino = statbuf.st_ino;
@@ -411,10 +461,12 @@
}
#endif
if (every_first_cmd != NULL)
+ {
+ ungetcc(CHAR_END_COMMAND);
ungetsc(every_first_cmd);
+ }
}
- free(qopen_filename);
no_display = !any_display;
flush();
any_display = TRUE;
@@ -433,7 +485,8 @@
#if HILITE_SEARCH
clr_hilite();
#endif
- cmd_addhist(ml_examine, filename);
+ if (strcmp(filename, FAKE_HELPFILE) && strcmp(filename, FAKE_EMPTYFILE))
+ cmd_addhist(ml_examine, filename, 1);
if (no_display && errmsgs > 0)
{
/*
@@ -464,6 +517,7 @@
char *filename;
char *gfilelist;
char *gfilename;
+ char *qfilename;
struct textlist tl_files;
struct textlist tl_gfiles;
@@ -485,8 +539,10 @@
gfilename = NULL;
while ((gfilename = forw_textlist(&tl_gfiles, gfilename)) != NULL)
{
- if (edit(gfilename) == 0 && good_filename == NULL)
+ qfilename = shell_unquote(gfilename);
+ if (edit(qfilename) == 0 && good_filename == NULL)
good_filename = get_filename(curr_ifile);
+ free(qfilename);
}
free(gfilelist);
}
@@ -712,7 +768,7 @@
public void
cat_file()
{
- register int c;
+ int c;
while ((c = ch_forw_get()) != EOI)
putchr(c);
@@ -730,8 +786,8 @@
use_logfile(filename)
char *filename;
{
- register int exists;
- register int answer;
+ int exists;
+ int answer;
PARG parg;
if (ch_getflags() & CH_CANSEEK)
@@ -743,9 +799,9 @@
/*
* {{ We could use access() here. }}
*/
- filename = shell_unquote(filename);
exists = open(filename, OPEN_READ);
- close(exists);
+ if (exists >= 0)
+ close(exists);
exists = (exists >= 0);
/*
@@ -811,10 +867,8 @@
*/
parg.p_string = filename;
error("Cannot write to \"%s\"", &parg);
- free(filename);
return;
}
- free(filename);
SET_BINARY(logfile);
}
Modified: trunk/contrib/less/filename.c
===================================================================
--- trunk/contrib/less/filename.c 2018-07-06 12:43:22 UTC (rev 11361)
+++ trunk/contrib/less/filename.c 2018-07-06 12:46:07 UTC (rev 11362)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 1984-2012 Mark Nudelman
+ * Copyright (C) 1984-2017 Mark Nudelman
*
* You may distribute under the terms of either the GNU General Public
* License or the Less License, as specified in the README file.
@@ -32,9 +32,6 @@
#include <modes.h>
#endif
#endif
-#if OS2
-#include <signal.h>
-#endif
#if HAVE_STAT
#include <sys/stat.h>
@@ -46,7 +43,6 @@
#endif
#endif
-
extern int force_open;
extern int secure;
extern int use_lessopen;
@@ -86,7 +82,7 @@
} else
{
char *esc = get_meta_escape();
- int esclen = strlen(esc);
+ int esclen = (int) strlen(esc);
while (*str != '\0')
{
if (esclen > 0 && strncmp(str, esc, esclen) == 0)
@@ -150,7 +146,7 @@
char *newstr;
int len;
char *esc = get_meta_escape();
- int esclen = strlen(esc);
+ int esclen = (int) strlen(esc);
int use_quotes = 0;
int have_quotes = 0;
@@ -188,7 +184,7 @@
* We can't quote a string that contains quotes.
*/
return (NULL);
- len = strlen(s) + 3;
+ len = (int) strlen(s) + 3;
}
/*
* Allocate and construct the new string.
@@ -226,7 +222,6 @@
char *filename;
{
char *pathname;
- char *qpathname;
int len;
int f;
@@ -235,7 +230,7 @@
/*
* Construct the full pathname.
*/
- len= strlen(dirname) + strlen(filename) + 2;
+ len = (int) (strlen(dirname) + strlen(filename) + 2);
pathname = (char *) calloc(len, sizeof(char));
if (pathname == NULL)
return (NULL);
@@ -243,8 +238,7 @@
/*
* Make sure the file exists.
*/
- qpathname = shell_unquote(pathname);
- f = open(qpathname, OPEN_READ);
+ f = open(pathname, OPEN_READ);
if (f < 0)
{
free(pathname);
@@ -253,7 +247,6 @@
{
close(f);
}
- free(qpathname);
return (pathname);
}
@@ -264,7 +257,7 @@
homefile(filename)
char *filename;
{
- register char *pathname;
+ char *pathname;
/*
* Try $HOME/filename.
@@ -314,9 +307,9 @@
fexpand(s)
char *s;
{
- register char *fr, *to;
- register int n;
- register char *e;
+ char *fr, *to;
+ int n;
+ char *e;
IFILE ifile;
#define fchar_ifile(c) \
@@ -350,7 +343,7 @@
if (ifile == NULL_IFILE)
n++;
else
- n += strlen(get_filename(ifile));
+ n += (int) strlen(get_filename(ifile));
}
/*
* Else it is the first char in a string of
@@ -432,7 +425,7 @@
for (slash = s+strlen(s)-1; slash > s; slash--)
if (*slash == *PATHNAME_SEP || *slash == '/')
break;
- len = strlen(s) + 4;
+ len = (int) strlen(s) + 4;
fpat = (char *) ecalloc(len, sizeof(char));
if (strchr(slash, '.') == NULL)
SNPRINTF1(fpat, len, "%s*.*", s);
@@ -441,7 +434,7 @@
}
#else
{
- int len = strlen(s) + 2;
+ int len = (int) strlen(s) + 2;
fpat = (char *) ecalloc(len, sizeof(char));
SNPRINTF1(fpat, len, "%s*", s);
}
@@ -474,7 +467,7 @@
int bin_count = 0;
char data[256];
char* p;
- char* pend;
+ char* edata;
if (!seekable(f))
return (0);
@@ -481,17 +474,23 @@
if (lseek(f, (off_t)0, SEEK_SET) == BAD_LSEEK)
return (0);
n = read(f, data, sizeof(data));
- pend = &data[n];
- for (p = data; p < pend; )
+ if (n <= 0)
+ return (0);
+ edata = &data[n];
+ for (p = data; p < edata; )
{
- LWCHAR c = step_char(&p, +1, pend);
- if (ctldisp == OPT_ONPLUS && IS_CSI_START(c))
+ if (utf_mode && !is_utf8_well_formed(p, edata-data))
{
- do {
- c = step_char(&p, +1, pend);
- } while (p < pend && is_ansi_middle(c));
- } else if (binary_char(c))
bin_count++;
+ utf_skip_to_lead(&p, edata);
+ } else
+ {
+ LWCHAR c = step_char(&p, +1, edata);
+ if (ctldisp == OPT_ONPLUS && IS_CSI_START(c))
+ skip_ansi(&p, edata);
+ else if (binary_char(c))
+ bin_count++;
+ }
}
/*
* Call it a binary file if there are more than 5 binary characters
@@ -593,7 +592,7 @@
fd = popen(cmd, "r");
} else
{
- int len = strlen(shell) + strlen(esccmd) + 5;
+ int len = (int) (strlen(shell) + strlen(esccmd) + 5);
scmd = (char *) ecalloc(len, sizeof(char));
SNPRINTF3(scmd, len, "%s %s %s", shell, shell_coption(), esccmd);
free(esccmd);
@@ -624,12 +623,10 @@
char *filename;
{
char *gfilename;
- char *ofilename;
- ofilename = fexpand(filename);
+ filename = fexpand(filename);
if (secure)
- return (ofilename);
- filename = shell_unquote(ofilename);
+ return (filename);
#ifdef DECL_GLOB_LIST
{
@@ -644,8 +641,7 @@
GLOB_LIST(filename, list);
if (GLOB_LIST_FAILED(list))
{
- free(filename);
- return (ofilename);
+ return (filename);
}
length = 1; /* Room for trailing null byte */
for (SCAN_GLOB_LIST(list, p))
@@ -682,18 +678,17 @@
* The globbing function returns a single name, and
* is called multiple times to walk thru all names.
*/
- register char *p;
- register int len;
- register int n;
- char *pathname;
- char *qpathname;
+ char *p;
+ int len;
+ int n;
+ char *pfilename;
+ char *qfilename;
DECL_GLOB_NAME(fnd,drive,dir,fname,ext,handle)
GLOB_FIRST_NAME(filename, &fnd, handle);
if (GLOB_FIRST_FAILED(handle))
{
- free(filename);
- return (ofilename);
+ return (filename);
}
_splitpath(filename, drive, dir, fname, ext);
@@ -701,14 +696,14 @@
gfilename = (char *) ecalloc(len, sizeof(char));
p = gfilename;
do {
- n = strlen(drive) + strlen(dir) + strlen(fnd.GLOB_NAME) + 1;
- pathname = (char *) ecalloc(n, sizeof(char));
- SNPRINTF3(pathname, n, "%s%s%s", drive, dir, fnd.GLOB_NAME);
- qpathname = shell_quote(pathname);
- free(pathname);
- if (qpathname != NULL)
+ n = (int) (strlen(drive) + strlen(dir) + strlen(fnd.GLOB_NAME) + 1);
+ pfilename = (char *) ecalloc(n, sizeof(char));
+ SNPRINTF3(pfilename, n, "%s%s%s", drive, dir, fnd.GLOB_NAME);
+ qfilename = shell_quote(pfilename);
+ free(pfilename);
+ if (qfilename != NULL)
{
- n = strlen(qpathname);
+ n = (int) strlen(qfilename);
while (p - gfilename + n + 2 >= len)
{
/*
@@ -723,8 +718,8 @@
gfilename = p;
p = gfilename + strlen(gfilename);
}
- strcpy(p, qpathname);
- free(qpathname);
+ strcpy(p, qfilename);
+ free(qfilename);
p += n;
*p++ = ' ';
}
@@ -756,8 +751,7 @@
esc = shell_quote(esc);
if (esc == NULL)
{
- free(filename);
- return (ofilename);
+ return (filename);
}
lessecho = lgetenv("LESSECHO");
if (lessecho == NULL || *lessecho == '\0')
@@ -765,13 +759,13 @@
/*
* Invoke lessecho, and read its output (a globbed list of filenames).
*/
- len = strlen(lessecho) + strlen(ofilename) + (7*strlen(metachars())) + 24;
+ len = (int) (strlen(lessecho) + strlen(filename) + (7*strlen(metachars())) + 24);
cmd = (char *) ecalloc(len, sizeof(char));
SNPRINTF4(cmd, len, "%s -p0x%x -d0x%x -e%s ", lessecho, openquote, closequote, esc);
free(esc);
for (s = metachars(); *s != '\0'; s++)
sprintf(cmd + strlen(cmd), "-n0x%x ", *s);
- sprintf(cmd + strlen(cmd), "-- %s", ofilename);
+ sprintf(cmd + strlen(cmd), "-- %s", filename);
fd = shellcmd(cmd);
free(cmd);
if (fd == NULL)
@@ -780,8 +774,7 @@
* Cannot create the pipe.
* Just return the original (fexpanded) filename.
*/
- free(filename);
- return (ofilename);
+ return (filename);
}
gfilename = readfd(fd);
pclose(fd);
@@ -788,8 +781,7 @@
if (*gfilename == '\0')
{
free(gfilename);
- free(filename);
- return (ofilename);
+ return (save(filename));
}
}
#else
@@ -801,7 +793,6 @@
#endif
#endif
free(filename);
- free(ofilename);
return (gfilename);
}
@@ -813,15 +804,20 @@
num_pct_s(lessopen)
char *lessopen;
{
- int num;
+ int num = 0;
- for (num = 0;; num++)
+ while (*lessopen != '\0')
{
- lessopen = strchr(lessopen, '%');
- if (lessopen == NULL)
- break;
- if (*++lessopen != 's')
- return (999);
+ if (*lessopen == '%')
+ {
+ if (lessopen[1] == '%')
+ ++lessopen;
+ else if (lessopen[1] == 's')
+ ++num;
+ else
+ return (999);
+ }
+ ++lessopen;
}
return (num);
}
@@ -840,6 +836,7 @@
return (NULL);
#else
char *lessopen;
+ char *qfilename;
char *cmd;
int len;
FILE *fd;
@@ -866,24 +863,28 @@
returnfd++;
#endif
}
- if (*lessopen == '-') {
+ if (*lessopen == '-')
+ {
/*
* Lessopen preprocessor will accept "-" as a filename.
*/
lessopen++;
- } else {
+ } else
+ {
if (strcmp(filename, "-") == 0)
return (NULL);
}
- if (num_pct_s(lessopen) > 1)
+ if (num_pct_s(lessopen) != 1)
{
- error("Invalid LESSOPEN variable", NULL_PARG);
+ error("LESSOPEN ignored: must contain exactly one %%s", NULL_PARG);
return (NULL);
}
- len = strlen(lessopen) + strlen(filename) + 2;
+ qfilename = shell_quote(filename);
+ len = (int) (strlen(lessopen) + strlen(qfilename) + 2);
cmd = (char *) ecalloc(len, sizeof(char));
- SNPRINTF1(cmd, len, lessopen, filename);
+ SNPRINTF1(cmd, len, lessopen, qfilename);
+ free(qfilename);
fd = shellcmd(cmd);
free(cmd);
if (fd == NULL)
@@ -896,11 +897,12 @@
#if HAVE_FILENO
if (returnfd)
{
+ char c;
int f;
- char c;
/*
- * Read one char to see if the pipe will produce any data.
+ * The first time we open the file, read one char
+ * to see if the pipe will produce any data.
* If it does, push the char back on the pipe.
*/
f = fileno(fd);
@@ -943,10 +945,9 @@
* Close a replacement file.
*/
public void
-close_altfile(altfilename, filename, pipefd)
+close_altfile(altfilename, filename)
char *altfilename;
char *filename;
- void *pipefd;
{
#if HAVE_POPEN
char *lessclose;
@@ -956,25 +957,15 @@
if (secure)
return;
- if (pipefd != NULL)
- {
-#if OS2
- /*
- * The pclose function of OS/2 emx sometimes fails.
- * Send SIGINT to the piped process before closing it.
- */
- kill(((FILE*)pipefd)->_pid, SIGINT);
-#endif
- pclose((FILE*) pipefd);
- }
+ ch_ungetchar(-1);
if ((lessclose = lgetenv("LESSCLOSE")) == NULL)
return;
if (num_pct_s(lessclose) > 2)
{
- error("Invalid LESSCLOSE variable");
+ error("LESSCLOSE ignored; must contain no more than 2 %%s", NULL_PARG);
return;
}
- len = strlen(lessclose) + strlen(filename) + strlen(altfilename) + 2;
+ len = (int) (strlen(lessclose) + strlen(filename) + strlen(altfilename) + 2);
cmd = (char *) ecalloc(len, sizeof(char));
SNPRINTF2(cmd, len, lessclose, filename, altfilename);
fd = shellcmd(cmd);
@@ -993,7 +984,6 @@
{
int isdir = 0;
- filename = shell_unquote(filename);
#if HAVE_STAT
{
int r;
@@ -1005,7 +995,7 @@
#else
#ifdef _OSK
{
- register int f;
+ int f;
f = open(filename, S_IREAD | S_IFDIR);
if (f >= 0)
@@ -1014,7 +1004,6 @@
}
#endif
#endif
- free(filename);
return (isdir);
}
@@ -1027,9 +1016,8 @@
bad_file(filename)
char *filename;
{
- register char *m = NULL;
+ char *m = NULL;
- filename = shell_unquote(filename);
if (!force_open && is_dir(filename))
{
static char is_a_dir[] = " is a directory";
@@ -1061,7 +1049,6 @@
}
#endif
}
- free(filename);
return (m);
}
Copied: trunk/contrib/less/fmt.uni (from rev 11361, vendor/less/dist/fmt.uni)
===================================================================
--- trunk/contrib/less/fmt.uni (rev 0)
+++ trunk/contrib/less/fmt.uni 2018-07-06 12:46:07 UTC (rev 11362)
@@ -0,0 +1,19 @@
+/* Generated by "./mkutable -f2 Cf -- unicode/UnicodeData.txt" on Sun Nov 12 16:13:49 PST 2017 */
+ { 0x00ad, 0x00ad }, /* Cf */
+ { 0x0600, 0x0605 }, /* Cf */
+ { 0x061c, 0x061c }, /* Cf */
+ { 0x06dd, 0x06dd }, /* Cf */
+ { 0x070f, 0x070f }, /* Cf */
+ { 0x08e2, 0x08e2 }, /* Cf */
+ { 0x180e, 0x180e }, /* Cf */
+ { 0x200b, 0x200f }, /* Cf */
+ { 0x202a, 0x202e }, /* Cf */
+ { 0x2060, 0x2064 }, /* Cf */
+ { 0x2066, 0x206f }, /* Cf */
+ { 0xfeff, 0xfeff }, /* Cf */
+ { 0xfff9, 0xfffb }, /* Cf */
+ { 0x110bd, 0x110bd }, /* Cf */
+ { 0x1bca0, 0x1bca3 }, /* Cf */
+ { 0x1d173, 0x1d17a }, /* Cf */
+ { 0xe0001, 0xe0001 }, /* Cf */
+ { 0xe0020, 0xe007f }, /* Cf */
Modified: trunk/contrib/less/forwback.c
===================================================================
--- trunk/contrib/less/forwback.c 2018-07-06 12:43:22 UTC (rev 11361)
+++ trunk/contrib/less/forwback.c 2018-07-06 12:46:07 UTC (rev 11362)
@@ -1,6 +1,6 @@
-/* $FreeBSD: src/contrib/less/forwback.c,v 1.4.8.2 2007/07/03 05:12:41 delphij Exp $ */
+/* $FreeBSD: stable/10/contrib/less/forwback.c 330571 2018-03-07 06:39:00Z delphij $ */
/*
- * Copyright (C) 1984-2012 Mark Nudelman
+ * Copyright (C) 1984-2017 Mark Nudelman
*
* You may distribute under the terms of either the GNU General Public
* License or the Less License, as specified in the README file.
@@ -21,6 +21,7 @@
public int squished;
public int no_back_scroll = 0;
public int forw_prompt;
+public int same_pos_bell = 1;
extern int sigs;
extern int top_scroll;
@@ -34,6 +35,11 @@
extern int clear_bg;
extern int final_attr;
extern int oldbot;
+#if HILITE_SEARCH
+extern int size_linebuf;
+extern int hilite_search;
+extern int status_col;
+#endif
#if TAGS
extern char *tagoption;
#endif
@@ -120,13 +126,12 @@
*/
public void
forw(n, pos, force, only_last, nblank)
- register int n;
+ int n;
POSITION pos;
int force;
int only_last;
int nblank;
{
- int eof = 0;
int nlines = 0;
int do_repaint;
static int first_time = 1;
@@ -145,6 +150,13 @@
do_repaint = (only_last && n > sc_height-1) ||
(forw_scroll >= 0 && n > forw_scroll && n != sc_height-1);
+#if HILITE_SEARCH
+ if (hilite_search == OPT_ONPLUS || is_filtering() || status_col) {
+ prep_hilite(pos, pos + 4*size_linebuf, ignore_eoi ? 1 : -1);
+ pos = next_unfiltered(pos);
+ }
+#endif
+
if (!do_repaint)
{
if (top_scroll && n >= sc_height - 1 && pos != ch_length())
@@ -206,6 +218,9 @@
* Get the next line from the file.
*/
pos = forw_line(pos);
+#if HILITE_SEARCH
+ pos = next_unfiltered(pos);
+#endif
if (pos == NULL_POSITION)
{
/*
@@ -214,7 +229,6 @@
* Even if force is true, stop when the last
* line in the file reaches the top of screen.
*/
- eof = 1;
if (!force && position(TOP) != NULL_POSITION)
break;
if (!empty_lines(0, 0) &&
@@ -276,7 +290,7 @@
forw_prompt = 1;
}
- if (nlines == 0)
+ if (nlines == 0 && !ignore_eoi && same_pos_bell)
eof_bell();
else if (do_repaint)
repaint();
@@ -289,7 +303,7 @@
*/
public void
back(n, pos, force, only_last)
- register int n;
+ int n;
POSITION pos;
int force;
int only_last;
@@ -299,11 +313,20 @@
squish_check();
do_repaint = (n > get_back_scroll() || (only_last && n > sc_height-1));
+#if HILITE_SEARCH
+ if (hilite_search == OPT_ONPLUS || is_filtering() || status_col) {
+ prep_hilite((pos < 3*size_linebuf) ? 0 : pos - 3*size_linebuf, pos, -1);
+ }
+#endif
while (--n >= 0)
{
/*
* Get the previous line of input.
*/
+#if HILITE_SEARCH
+ pos = prev_unfiltered(pos);
+#endif
+
pos = back_line(pos);
if (pos == NULL_POSITION)
{
@@ -327,7 +350,7 @@
}
}
- if (nlines == 0)
+ if (nlines == 0 && same_pos_bell)
eof_bell();
else if (do_repaint)
repaint();
@@ -426,3 +449,21 @@
return (sc_height - 2);
return (10000); /* infinity */
}
+
+/*
+ * Return number of displayable lines in the file.
+ * Stop counting at screen height + 1.
+ */
+ public int
+get_line_count()
+{
+ int nlines;
+ POSITION pos = ch_zero();
+
+ for (nlines = 0; nlines <= sc_height; nlines++)
+ {
+ pos = forw_line(pos);
+ if (pos == NULL_POSITION) break;
+ }
+ return nlines;
+}
Modified: trunk/contrib/less/funcs.h
===================================================================
--- trunk/contrib/less/funcs.h 2018-07-06 12:43:22 UTC (rev 11361)
+++ trunk/contrib/less/funcs.h 2018-07-06 12:46:07 UTC (rev 11362)
@@ -1,292 +1,310 @@
- public char * save ();
- public VOID_POINTER ecalloc ();
- public char * skipsp ();
- public int sprefix ();
- public void quit ();
- public void raw_mode ();
- public void scrsize ();
- public char * special_key_str ();
- public void get_term ();
- public void init ();
- public void deinit ();
- public void home ();
- public void add_line ();
- public void remove_top ();
- public void win32_scroll_up ();
- public void lower_left ();
- public void line_left ();
- public void check_winch ();
- public void goto_line ();
- public void vbell ();
- public void bell ();
- public void clear ();
- public void clear_eol ();
- public void clear_bot ();
- public void at_enter ();
- public void at_exit ();
- public void at_switch ();
- public int is_at_equiv ();
- public int apply_at_specials ();
- public void backspace ();
- public void putbs ();
- public char WIN32getch ();
- public void WIN32setcolors ();
- public void WIN32textout ();
- public void match_brac ();
- public void ch_ungetchar ();
- public void end_logfile ();
- public void sync_logfile ();
- public int ch_seek ();
- public int ch_end_seek ();
- public int ch_beg_seek ();
- public POSITION ch_length ();
- public POSITION ch_tell ();
- public int ch_forw_get ();
- public int ch_back_get ();
- public void ch_setbufspace ();
- public void ch_flush ();
- public int seekable ();
- public void ch_set_eof ();
- public void ch_init ();
- public void ch_close ();
- public int ch_getflags ();
- public void ch_dump ();
- public void init_charset ();
- public int binary_char ();
- public int control_char ();
- public char * prchar ();
- public char * prutfchar ();
- public int utf_len ();
- public int is_utf8_well_formed ();
- public LWCHAR get_wchar ();
- public void put_wchar ();
- public LWCHAR step_char ();
- public int is_composing_char ();
- public int is_ubin_char ();
- public int is_wide_char ();
- public int is_combining_char ();
- public void cmd_reset ();
- public void clear_cmd ();
- public void cmd_putstr ();
- public int len_cmdbuf ();
- public void set_mlist ();
- public void cmd_addhist ();
- public void cmd_accept ();
- public int cmd_char ();
- public LINENUM cmd_int ();
- public char * get_cmdbuf ();
- public char * cmd_lastpattern ();
- public void init_cmdhist ();
- public void save_cmdhist ();
- public int in_mca ();
- public void dispversion ();
- public int getcc ();
- public void ungetcc ();
- public void ungetsc ();
- public void commands ();
- public int cvt_length ();
- public int * cvt_alloc_chpos ();
- public void cvt_text ();
- public void init_cmds ();
- public void add_fcmd_table ();
- public void add_ecmd_table ();
- public int fcmd_decode ();
- public int ecmd_decode ();
- public char * lgetenv ();
- public int lesskey ();
- public void add_hometable ();
- public int editchar ();
- public void init_textlist ();
- public char * forw_textlist ();
- public char * back_textlist ();
- public int edit ();
- public int edit_ifile ();
- public int edit_list ();
- public int edit_first ();
- public int edit_last ();
- public int edit_next ();
- public int edit_prev ();
- public int edit_index ();
- public IFILE save_curr_ifile ();
- public void unsave_ifile ();
- public void reedit_ifile ();
- public void reopen_curr_ifile ();
- public int edit_stdin ();
- public void cat_file ();
- public void use_logfile ();
- public char * shell_unquote ();
- public char * get_meta_escape ();
- public char * shell_quote ();
- public char * homefile ();
- public char * fexpand ();
- public char * fcomplete ();
- public int bin_file ();
- public char * lglob ();
- public char * open_altfile ();
- public void close_altfile ();
- public int is_dir ();
- public char * bad_file ();
- public POSITION filesize ();
- public char * shell_coption ();
- public char * last_component ();
- public int eof_displayed ();
- public int entire_file_displayed ();
- public void squish_check ();
- public void forw ();
- public void back ();
- public void forward ();
- public void backward ();
- public int get_back_scroll ();
- public void del_ifile ();
- public IFILE next_ifile ();
- public IFILE prev_ifile ();
- public IFILE getoff_ifile ();
- public int nifile ();
- public IFILE get_ifile ();
- public char * get_filename ();
- public int get_index ();
- public void store_pos ();
- public void get_pos ();
- public void set_open ();
- public int opened ();
- public void hold_ifile ();
- public int held_ifile ();
- public void * get_filestate ();
- public void set_filestate ();
- public void if_dump ();
- public POSITION forw_line ();
- public POSITION back_line ();
- public void set_attnpos ();
- public void jump_forw ();
- public void jump_back ();
- public void repaint ();
- public void jump_percent ();
- public void jump_line_loc ();
- public void jump_loc ();
- public void init_line ();
- public int is_ascii_char ();
- public void prewind ();
- public void plinenum ();
- public void pshift_all ();
- public int is_ansi_end ();
- public int is_ansi_middle ();
- public int pappend ();
- public int pflushmbc ();
- public void pdone ();
- public void set_status_col ();
- public int gline ();
- public void null_line ();
- public POSITION forw_raw_line ();
- public POSITION back_raw_line ();
- public void clr_linenum ();
- public void add_lnum ();
- public LINENUM find_linenum ();
- public POSITION find_pos ();
- public LINENUM currline ();
- public void lsystem ();
- public int pipe_mark ();
- public int pipe_data ();
- public void init_mark ();
- public int badmark ();
- public void setmark ();
- public void lastmark ();
- public void gomark ();
- public POSITION markpos ();
- public void unmark ();
- public void opt_o ();
- public void opt__O ();
- public void opt_j ();
- public void calc_jump_sline ();
- public void opt_shift ();
- public void calc_shift_count ();
- public void opt_k ();
- public void opt_t ();
- public void opt__T ();
- public void opt_p ();
- public void opt__P ();
- public void opt_b ();
- public void opt_i ();
- public void opt__V ();
- public void opt_D ();
- public void opt_x ();
- public void opt_quote ();
- public void opt_query ();
- public int get_swindow ();
- public char * propt ();
- public void scan_option ();
- public void toggle_option ();
- public int opt_has_param ();
- public char * opt_prompt ();
- public int isoptpending ();
- public void nopendopt ();
- public int getnum ();
- public long getfraction ();
- public int get_quit_at_eof ();
- public void init_option ();
- public struct loption * findopt ();
- public struct loption * findopt_name ();
- public int iread ();
- public void intread ();
- public long get_time ();
- public char * errno_message ();
- public int percentage ();
- public POSITION percent_pos ();
- public int os9_signal ();
- public void put_line ();
- public void flush ();
- public int putchr ();
- public void putstr ();
- public void get_return ();
- public void error ();
- public void ierror ();
- public int query ();
- public int compile_pattern ();
- public void uncompile_pattern ();
- public int is_null_pattern ();
- public int match_pattern ();
- public POSITION position ();
- public void add_forw_pos ();
- public void add_back_pos ();
- public void pos_clear ();
- public void pos_init ();
- public int onscreen ();
- public int empty_screen ();
- public int empty_lines ();
- public void get_scrpos ();
- public int adjsline ();
- public void init_prompt ();
- public char * pr_expand ();
- public char * eq_message ();
- public char * pr_string ();
- public char * wait_message ();
- public void init_search ();
- public void repaint_hilite ();
- public void clear_attn ();
- public void undo_search ();
- public void clr_hlist ();
- public void clr_hilite ();
- public void clr_filter ();
- public int is_filtered ();
- public int is_hilited ();
- public void chg_caseless ();
- public void chg_hilite ();
- public int search ();
- public void prep_hilite ();
- public void set_filter_pattern ();
- public int is_filtering ();
- public RETSIGTYPE winch ();
- public RETSIGTYPE winch ();
- public void init_signals ();
- public void psignals ();
- public void cleantags ();
- public int gettagtype ();
- public void findtag ();
- public POSITION tagsearch ();
- public char * nexttag ();
- public char * prevtag ();
- public int ntags ();
- public int curr_tag ();
- public int edit_tagfile ();
- public void open_getchr ();
- public void close_getchr ();
- public int getchr ();
+public char * save LESSPARAMS ((constant char *s));
+public VOID_POINTER ecalloc LESSPARAMS ((int count, unsigned int size));
+public char * skipsp LESSPARAMS ((char *s));
+public int sprefix LESSPARAMS ((char *ps, char *s, int uppercase));
+public void quit LESSPARAMS ((int status));
+public void raw_mode LESSPARAMS ((int on));
+public void scrsize LESSPARAMS ((VOID_PARAM));
+public char * special_key_str LESSPARAMS ((int key));
+public void get_term LESSPARAMS ((VOID_PARAM));
+public void init LESSPARAMS ((VOID_PARAM));
+public void deinit LESSPARAMS ((VOID_PARAM));
+public void home LESSPARAMS ((VOID_PARAM));
+public void add_line LESSPARAMS ((VOID_PARAM));
+public void remove_top LESSPARAMS ((int n));
+public void win32_scroll_up LESSPARAMS ((int n));
+public void lower_left LESSPARAMS ((VOID_PARAM));
+public void line_left LESSPARAMS ((VOID_PARAM));
+public void check_winch LESSPARAMS ((VOID_PARAM));
+public void goto_line LESSPARAMS ((int sindex));
+public void vbell LESSPARAMS ((VOID_PARAM));
+public void bell LESSPARAMS ((VOID_PARAM));
+public void clear LESSPARAMS ((VOID_PARAM));
+public void clear_eol LESSPARAMS ((VOID_PARAM));
+public void clear_bot LESSPARAMS ((VOID_PARAM));
+public void at_enter LESSPARAMS ((int attr));
+public void at_exit LESSPARAMS ((VOID_PARAM));
+public void at_switch LESSPARAMS ((int attr));
+public int is_at_equiv LESSPARAMS ((int attr1, int attr2));
+public int apply_at_specials LESSPARAMS ((int attr));
+public void backspace LESSPARAMS ((VOID_PARAM));
+public void putbs LESSPARAMS ((VOID_PARAM));
+public char WIN32getch LESSPARAMS ((int tty));
+public void WIN32setcolors LESSPARAMS ((int fg, int bg));
+public void WIN32textout LESSPARAMS ((char *text, int len));
+public void match_brac LESSPARAMS ((int obrac, int cbrac, int forwdir, int n));
+public void ch_ungetchar LESSPARAMS ((int c));
+public void end_logfile LESSPARAMS ((VOID_PARAM));
+public void sync_logfile LESSPARAMS ((VOID_PARAM));
+public int ch_seek LESSPARAMS ((POSITION pos));
+public int ch_end_seek LESSPARAMS ((VOID_PARAM));
+public int ch_end_buffer_seek LESSPARAMS ((VOID_PARAM));
+public int ch_beg_seek LESSPARAMS ((VOID_PARAM));
+public POSITION ch_length LESSPARAMS ((VOID_PARAM));
+public POSITION ch_tell LESSPARAMS ((VOID_PARAM));
+public int ch_forw_get LESSPARAMS ((VOID_PARAM));
+public int ch_back_get LESSPARAMS ((VOID_PARAM));
+public void ch_setbufspace LESSPARAMS ((int bufspace));
+public void ch_flush LESSPARAMS ((VOID_PARAM));
+public int seekable LESSPARAMS ((int f));
+public void ch_set_eof LESSPARAMS ((VOID_PARAM));
+public void ch_init LESSPARAMS ((int f, int flags));
+public void ch_close LESSPARAMS ((VOID_PARAM));
+public int ch_getflags LESSPARAMS ((VOID_PARAM));
+public void ch_dump LESSPARAMS ((VOID_PARAM));
+public void setfmt LESSPARAMS ((char *s, char **fmtvarptr, int *attrptr, char *default_fmt));
+public void init_charset LESSPARAMS ((VOID_PARAM));
+public int binary_char LESSPARAMS ((LWCHAR c));
+public int control_char LESSPARAMS ((LWCHAR c));
+public char * prchar LESSPARAMS ((LWCHAR c));
+public char * prutfchar LESSPARAMS ((LWCHAR ch));
+public int utf_len LESSPARAMS ((unsigned char ch));
+public int is_utf8_well_formed LESSPARAMS ((char *ss, int slen));
+public void utf_skip_to_lead LESSPARAMS ((char **pp, char *limit));
+public LWCHAR get_wchar LESSPARAMS ((constant char *p));
+public void put_wchar LESSPARAMS ((char **pp, LWCHAR ch));
+public LWCHAR step_char LESSPARAMS ((char **pp, signed int dir, constant char *limit));
+public int is_composing_char LESSPARAMS ((LWCHAR ch));
+public int is_ubin_char LESSPARAMS ((LWCHAR ch));
+public int is_wide_char LESSPARAMS ((LWCHAR ch));
+public int is_combining_char LESSPARAMS ((LWCHAR ch1, LWCHAR ch2));
+public void cmd_reset LESSPARAMS ((VOID_PARAM));
+public void clear_cmd LESSPARAMS ((VOID_PARAM));
+public void cmd_putstr LESSPARAMS ((constant char *s));
+public int len_cmdbuf LESSPARAMS ((VOID_PARAM));
+public void set_mlist LESSPARAMS ((void *mlist, int cmdflags));
+public void cmd_addhist LESSPARAMS ((struct mlist *mlist, constant char *cmd, int modified));
+public void cmd_accept LESSPARAMS ((VOID_PARAM));
+public int cmd_char LESSPARAMS ((int c));
+public LINENUM cmd_int LESSPARAMS ((long *frac));
+public char * get_cmdbuf LESSPARAMS ((VOID_PARAM));
+public char * cmd_lastpattern LESSPARAMS ((VOID_PARAM));
+public void init_cmdhist LESSPARAMS ((VOID_PARAM));
+public void save_cmdhist LESSPARAMS ((VOID_PARAM));
+public int in_mca LESSPARAMS ((VOID_PARAM));
+public void dispversion LESSPARAMS ((VOID_PARAM));
+public int getcc LESSPARAMS ((VOID_PARAM));
+public void ungetcc LESSPARAMS ((LWCHAR c));
+public void ungetsc LESSPARAMS ((char *s));
+public LWCHAR peekcc LESSPARAMS ((VOID_PARAM));
+public void commands LESSPARAMS ((VOID_PARAM));
+public int cvt_length LESSPARAMS ((int len, int ops));
+public int * cvt_alloc_chpos LESSPARAMS ((int len));
+public void cvt_text LESSPARAMS ((char *odst, char *osrc, int *chpos, int *lenp, int ops));
+public void expand_cmd_tables LESSPARAMS ((VOID_PARAM));
+public void init_cmds LESSPARAMS ((VOID_PARAM));
+public void add_fcmd_table LESSPARAMS ((char *buf, int len));
+public void add_ecmd_table LESSPARAMS ((char *buf, int len));
+public int fcmd_decode LESSPARAMS ((char *cmd, char **sp));
+public int ecmd_decode LESSPARAMS ((char *cmd, char **sp));
+public char * lgetenv LESSPARAMS ((char *var));
+public int lesskey LESSPARAMS ((char *filename, int sysvar));
+public void add_hometable LESSPARAMS ((char *envname, char *def_filename, int sysvar));
+public int editchar LESSPARAMS ((int c, int flags));
+public void init_textlist LESSPARAMS ((struct textlist *tlist, char *str));
+public char * forw_textlist LESSPARAMS ((struct textlist *tlist, char *prev));
+public char * back_textlist LESSPARAMS ((struct textlist *tlist, char *prev));
+public int edit LESSPARAMS ((char *filename));
+public int edit_ifile LESSPARAMS ((IFILE ifile));
+public int edit_list LESSPARAMS ((char *filelist));
+public int edit_first LESSPARAMS ((VOID_PARAM));
+public int edit_last LESSPARAMS ((VOID_PARAM));
+public int edit_next LESSPARAMS ((int n));
+public int edit_prev LESSPARAMS ((int n));
+public int edit_index LESSPARAMS ((int n));
+public IFILE save_curr_ifile LESSPARAMS ((VOID_PARAM));
+public void unsave_ifile LESSPARAMS ((IFILE save_ifile));
+public void reedit_ifile LESSPARAMS ((IFILE save_ifile));
+public void reopen_curr_ifile LESSPARAMS ((VOID_PARAM));
+public int edit_stdin LESSPARAMS ((VOID_PARAM));
+public void cat_file LESSPARAMS ((VOID_PARAM));
+public void use_logfile LESSPARAMS ((char *filename));
+public char * shell_unquote LESSPARAMS ((char *str));
+public char * get_meta_escape LESSPARAMS ((VOID_PARAM));
+public char * shell_quote LESSPARAMS ((char *s));
+public char * homefile LESSPARAMS ((char *filename));
+public char * fexpand LESSPARAMS ((char *s));
+public char * fcomplete LESSPARAMS ((char *s));
+public int bin_file LESSPARAMS ((int f));
+public char * lglob LESSPARAMS ((char *filename));
+public char * open_altfile LESSPARAMS ((char *filename, int *pf, void **pfd));
+public void close_altfile LESSPARAMS ((char *altfilename, char *filename));
+public int is_dir LESSPARAMS ((char *filename));
+public char * bad_file LESSPARAMS ((char *filename));
+public POSITION filesize LESSPARAMS ((int f));
+public char * shell_coption LESSPARAMS ((VOID_PARAM));
+public char * last_component LESSPARAMS ((char *name));
+public int eof_displayed LESSPARAMS ((VOID_PARAM));
+public int entire_file_displayed LESSPARAMS ((VOID_PARAM));
+public void squish_check LESSPARAMS ((VOID_PARAM));
+public void forw LESSPARAMS ((int n, POSITION pos, int force, int only_last, int nblank));
+public void back LESSPARAMS ((int n, POSITION pos, int force, int only_last));
+public void forward LESSPARAMS ((int n, int force, int only_last));
+public void backward LESSPARAMS ((int n, int force, int only_last));
+public int get_back_scroll LESSPARAMS ((VOID_PARAM));
+public int get_line_count LESSPARAMS ((VOID_PARAM));
+public void del_ifile LESSPARAMS ((IFILE h));
+public IFILE next_ifile LESSPARAMS ((IFILE h));
+public IFILE prev_ifile LESSPARAMS ((IFILE h));
+public IFILE getoff_ifile LESSPARAMS ((IFILE ifile));
+public int nifile LESSPARAMS ((VOID_PARAM));
+public IFILE get_ifile LESSPARAMS ((char *filename, IFILE prev));
+public char * get_filename LESSPARAMS ((IFILE ifile));
+public int get_index LESSPARAMS ((IFILE ifile));
+public void store_pos LESSPARAMS ((IFILE ifile, struct scrpos *scrpos));
+public void get_pos LESSPARAMS ((IFILE ifile, struct scrpos *scrpos));
+public void set_open LESSPARAMS ((IFILE ifile));
+public int opened LESSPARAMS ((IFILE ifile));
+public void hold_ifile LESSPARAMS ((IFILE ifile, int incr));
+public int held_ifile LESSPARAMS ((IFILE ifile));
+public void * get_filestate LESSPARAMS ((IFILE ifile));
+public void set_filestate LESSPARAMS ((IFILE ifile, void *filestate));
+public void set_altpipe LESSPARAMS ((IFILE ifile, void *p));
+public void * get_altpipe LESSPARAMS ((IFILE ifile));
+public void set_altfilename LESSPARAMS ((IFILE ifile, char *altfilename));
+public char * get_altfilename LESSPARAMS ((IFILE ifile));
+public void if_dump LESSPARAMS ((VOID_PARAM));
+public POSITION forw_line LESSPARAMS ((POSITION curr_pos));
+public POSITION back_line LESSPARAMS ((POSITION curr_pos));
+public void set_attnpos LESSPARAMS ((POSITION pos));
+public void jump_forw LESSPARAMS ((VOID_PARAM));
+public void jump_forw_buffered LESSPARAMS ((VOID_PARAM));
+public void jump_back LESSPARAMS ((LINENUM linenum));
+public void repaint LESSPARAMS ((VOID_PARAM));
+public void jump_percent LESSPARAMS ((int percent, long fraction));
+public void jump_line_loc LESSPARAMS ((POSITION pos, int sline));
+public void jump_loc LESSPARAMS ((POSITION pos, int sline));
+public void init_line LESSPARAMS ((VOID_PARAM));
+public int is_ascii_char LESSPARAMS ((LWCHAR ch));
+public void prewind LESSPARAMS ((VOID_PARAM));
+public void plinenum LESSPARAMS ((POSITION pos));
+public void pshift_all LESSPARAMS ((VOID_PARAM));
+public int is_ansi_end LESSPARAMS ((LWCHAR ch));
+public int is_ansi_middle LESSPARAMS ((LWCHAR ch));
+public void skip_ansi LESSPARAMS ((char **pp, constant char *limit));
+public int pappend LESSPARAMS ((unsigned char c, POSITION pos));
+public int pflushmbc LESSPARAMS ((VOID_PARAM));
+public void pdone LESSPARAMS ((int endline, int chopped, int forw));
+public void set_status_col LESSPARAMS ((char c));
+public int gline LESSPARAMS ((int i, int *ap));
+public void null_line LESSPARAMS ((VOID_PARAM));
+public POSITION forw_raw_line LESSPARAMS ((POSITION curr_pos, char **linep, int *line_lenp));
+public POSITION back_raw_line LESSPARAMS ((POSITION curr_pos, char **linep, int *line_lenp));
+public int rrshift LESSPARAMS ((VOID_PARAM));
+public void clr_linenum LESSPARAMS ((VOID_PARAM));
+public void add_lnum LESSPARAMS ((LINENUM linenum, POSITION pos));
+public LINENUM find_linenum LESSPARAMS ((POSITION pos));
+public POSITION find_pos LESSPARAMS ((LINENUM linenum));
+public LINENUM currline LESSPARAMS ((int where));
+public void lsystem LESSPARAMS ((char *cmd, char *donemsg));
+public int pipe_mark LESSPARAMS ((int c, char *cmd));
+public int pipe_data LESSPARAMS ((char *cmd, POSITION spos, POSITION epos));
+public void init_mark LESSPARAMS ((VOID_PARAM));
+public int badmark LESSPARAMS ((int c));
+public void setmark LESSPARAMS ((int c, int where));
+public void clrmark LESSPARAMS ((int c));
+public void lastmark LESSPARAMS ((VOID_PARAM));
+public void gomark LESSPARAMS ((int c));
+public POSITION markpos LESSPARAMS ((int c));
+public char posmark LESSPARAMS ((POSITION pos));
+public void unmark LESSPARAMS ((IFILE ifile));
+public void opt_o LESSPARAMS ((int type, char *s));
+public void opt__O LESSPARAMS ((int type, char *s));
+public void opt_j LESSPARAMS ((int type, char *s));
+public void calc_jump_sline LESSPARAMS ((VOID_PARAM));
+public void opt_shift LESSPARAMS ((int type, char *s));
+public void calc_shift_count LESSPARAMS ((VOID_PARAM));
+public void opt_k LESSPARAMS ((int type, char *s));
+public void opt_t LESSPARAMS ((int type, char *s));
+public void opt__T LESSPARAMS ((int type, char *s));
+public void opt_p LESSPARAMS ((int type, char *s));
+public void opt__P LESSPARAMS ((int type, char *s));
+public void opt_b LESSPARAMS ((int type, char *s));
+public void opt_i LESSPARAMS ((int type, char *s));
+public void opt__V LESSPARAMS ((int type, char *s));
+public void opt_D LESSPARAMS ((int type, char *s));
+public void opt_x LESSPARAMS ((int type, char *s));
+public void opt_quote LESSPARAMS ((int type, char *s));
+public void opt_rscroll LESSPARAMS ((int type, char *s));
+public void opt_query LESSPARAMS ((int type, char *s));
+public int get_swindow LESSPARAMS ((VOID_PARAM));
+public char * propt LESSPARAMS ((int c));
+public void scan_option LESSPARAMS ((char *s));
+public void toggle_option LESSPARAMS ((struct loption *o, int lower, char *s, int how_toggle));
+public int opt_has_param LESSPARAMS ((struct loption *o));
+public char * opt_prompt LESSPARAMS ((struct loption *o));
+public int isoptpending LESSPARAMS ((VOID_PARAM));
+public void nopendopt LESSPARAMS ((VOID_PARAM));
+public int getnum LESSPARAMS ((char **sp, char *printopt, int *errp));
+public long getfraction LESSPARAMS ((char **sp, char *printopt, int *errp));
+public int get_quit_at_eof LESSPARAMS ((VOID_PARAM));
+public void init_option LESSPARAMS ((VOID_PARAM));
+public struct loption * findopt LESSPARAMS ((int c));
+public struct loption * findopt_name LESSPARAMS ((char **p_optname, char **p_oname, int *p_err));
+public int iread LESSPARAMS ((int fd, unsigned char *buf, unsigned int len));
+public void intread LESSPARAMS ((VOID_PARAM));
+public time_type get_time LESSPARAMS ((VOID_PARAM));
+public char * errno_message LESSPARAMS ((char *filename));
+public int percentage LESSPARAMS ((POSITION num, POSITION den));
+public POSITION percent_pos LESSPARAMS ((POSITION pos, int percent, long fraction));
+public int os9_signal LESSPARAMS ((int type, RETSIGTYPE (*handler)()));
+public void put_line LESSPARAMS ((VOID_PARAM));
+public void flush LESSPARAMS ((VOID_PARAM));
+public int putchr LESSPARAMS ((int c));
+public void putstr LESSPARAMS ((constant char *s));
+public void get_return LESSPARAMS ((VOID_PARAM));
+public void error LESSPARAMS ((char *fmt, PARG *parg));
+public void ierror LESSPARAMS ((char *fmt, PARG *parg));
+public int query LESSPARAMS ((char *fmt, PARG *parg));
+public int compile_pattern LESSPARAMS ((char *pattern, int search_type, PATTERN_TYPE *comp_pattern));
+public void uncompile_pattern LESSPARAMS ((PATTERN_TYPE *pattern));
+public int valid_pattern LESSPARAMS ((char *pattern));
+public int is_null_pattern LESSPARAMS ((PATTERN_TYPE pattern));
+public int match_pattern LESSPARAMS ((PATTERN_TYPE pattern, char *tpattern, char *line, int line_len, char **sp, char **ep, int notbol, int search_type));
+public POSITION position LESSPARAMS ((int sindex));
+public void add_forw_pos LESSPARAMS ((POSITION pos));
+public void add_back_pos LESSPARAMS ((POSITION pos));
+public void pos_clear LESSPARAMS ((VOID_PARAM));
+public void pos_init LESSPARAMS ((VOID_PARAM));
+public int onscreen LESSPARAMS ((POSITION pos));
+public int empty_screen LESSPARAMS ((VOID_PARAM));
+public int empty_lines LESSPARAMS ((int s, int e));
+public void get_scrpos LESSPARAMS ((struct scrpos *scrpos, int where));
+public int sindex_from_sline LESSPARAMS ((int sline));
+public void init_prompt LESSPARAMS ((VOID_PARAM));
+public char * pr_expand LESSPARAMS ((constant char *proto, int maxwidth));
+public char * eq_message LESSPARAMS ((VOID_PARAM));
+public char * pr_string LESSPARAMS ((VOID_PARAM));
+public char * wait_message LESSPARAMS ((VOID_PARAM));
+public void init_search LESSPARAMS ((VOID_PARAM));
+public void repaint_hilite LESSPARAMS ((int on));
+public void clear_attn LESSPARAMS ((VOID_PARAM));
+public void undo_search LESSPARAMS ((VOID_PARAM));
+public void clr_hlist LESSPARAMS ((struct hilite_tree *anchor));
+public void clr_hilite LESSPARAMS ((VOID_PARAM));
+public void clr_filter LESSPARAMS ((VOID_PARAM));
+public int is_filtered LESSPARAMS ((POSITION pos));
+public POSITION next_unfiltered LESSPARAMS ((POSITION pos));
+public POSITION prev_unfiltered LESSPARAMS ((POSITION pos));
+public int is_hilited LESSPARAMS ((POSITION pos, POSITION epos, int nohide, int *p_matches));
+public void chg_hilite LESSPARAMS ((VOID_PARAM));
+public void chg_caseless LESSPARAMS ((VOID_PARAM));
+public int search LESSPARAMS ((int search_type, char *pattern, int n));
+public void prep_hilite LESSPARAMS ((POSITION spos, POSITION epos, int maxlines));
+public void set_filter_pattern LESSPARAMS ((char *pattern, int search_type));
+public int is_filtering LESSPARAMS ((VOID_PARAM));
+public RETSIGTYPE winch LESSPARAMS ((int type));
+public void init_signals LESSPARAMS ((int on));
+public void psignals LESSPARAMS ((VOID_PARAM));
+public void cleantags LESSPARAMS ((VOID_PARAM));
+public int gettagtype LESSPARAMS ((VOID_PARAM));
+public void findtag LESSPARAMS ((char *tag));
+public POSITION tagsearch LESSPARAMS ((VOID_PARAM));
+public char * nexttag LESSPARAMS ((int n));
+public char * prevtag LESSPARAMS ((int n));
+public int ntags LESSPARAMS ((VOID_PARAM));
+public int curr_tag LESSPARAMS ((VOID_PARAM));
+public int edit_tagfile LESSPARAMS ((VOID_PARAM));
+public void open_getchr LESSPARAMS ((VOID_PARAM));
+public void close_getchr LESSPARAMS ((VOID_PARAM));
+public int getchr LESSPARAMS ((VOID_PARAM));
Modified: trunk/contrib/less/help.c
===================================================================
--- trunk/contrib/less/help.c 2018-07-06 12:43:22 UTC (rev 11361)
+++ trunk/contrib/less/help.c 2018-07-06 12:46:07 UTC (rev 11362)
@@ -1,4 +1,4 @@
-/* This file was generated by mkhelp from less.hlp */
+/* This file was generated by mkhelp.pl from less.hlp at 22:56 on 2017/12/5 */
#include "less.h"
constant char helpdata[] = {
'\n',
@@ -23,9 +23,12 @@
' ',' ','E','S','C','-','S','P','A','C','E',' ',' ',' ',' ',' ',' ',' ',' ',' ','*',' ',' ','F','o','r','w','a','r','d',' ',' ','o','n','e',' ','w','i','n','d','o','w',',',' ','b','u','t',' ','d','o','n','\'','t',' ','s','t','o','p',' ','a','t',' ','e','n','d','-','o','f','-','f','i','l','e','.','\n',
' ',' ','d',' ',' ','^','D',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ','*',' ',' ','F','o','r','w','a','r','d',' ',' ','o','n','e',' ','h','a','l','f','-','w','i','n','d','o','w',' ','(','a','n','d',' ','s','e','t',' ','h','a','l','f','-','w','i','n','d','o','w',' ','t','o',' ','_','\b','N',')','.','\n',
' ',' ','u',' ',' ','^','U',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ','*',' ',' ','B','a','c','k','w','a','r','d',' ','o','n','e',' ','h','a','l','f','-','w','i','n','d','o','w',' ','(','a','n','d',' ','s','e','t',' ','h','a','l','f','-','w','i','n','d','o','w',' ','t','o',' ','_','\b','N',')','.','\n',
-' ',' ','E','S','C','-',')',' ',' ','R','i','g','h','t','A','r','r','o','w',' ','*',' ',' ','L','e','f','t',' ',' ','o','n','e',' ','h','a','l','f',' ','s','c','r','e','e','n',' ','w','i','d','t','h',' ','(','o','r',' ','_','\b','N',' ','p','o','s','i','t','i','o','n','s',')','.','\n',
-' ',' ','E','S','C','-','(',' ',' ','L','e','f','t','A','r','r','o','w',' ',' ','*',' ',' ','R','i','g','h','t',' ','o','n','e',' ','h','a','l','f',' ','s','c','r','e','e','n',' ','w','i','d','t','h',' ','(','o','r',' ','_','\b','N',' ','p','o','s','i','t','i','o','n','s',')','.','\n',
+' ',' ','E','S','C','-',')',' ',' ','R','i','g','h','t','A','r','r','o','w',' ','*',' ',' ','R','i','g','h','t',' ','o','n','e',' ','h','a','l','f',' ','s','c','r','e','e','n',' ','w','i','d','t','h',' ','(','o','r',' ','_','\b','N',' ','p','o','s','i','t','i','o','n','s',')','.','\n',
+' ',' ','E','S','C','-','(',' ',' ','L','e','f','t','A','r','r','o','w',' ',' ','*',' ',' ','L','e','f','t',' ',' ','o','n','e',' ','h','a','l','f',' ','s','c','r','e','e','n',' ','w','i','d','t','h',' ','(','o','r',' ','_','\b','N',' ','p','o','s','i','t','i','o','n','s',')','.','\n',
+' ',' ','E','S','C','-','}',' ',' ','^','R','i','g','h','t','A','r','r','o','w',' ',' ',' ','R','i','g','h','t',' ','t','o',' ','l','a','s','t',' ','c','o','l','u','m','n',' ','d','i','s','p','l','a','y','e','d','.','\n',
+' ',' ','E','S','C','-','{',' ',' ','^','L','e','f','t','A','r','r','o','w',' ',' ',' ',' ','L','e','f','t',' ',' ','t','o',' ','f','i','r','s','t',' ','c','o','l','u','m','n','.','\n',
' ',' ','F',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ','F','o','r','w','a','r','d',' ','f','o','r','e','v','e','r',';',' ','l','i','k','e',' ','"','t','a','i','l',' ','-','f','"','.','\n',
+' ',' ','E','S','C','-','F',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ','L','i','k','e',' ','F',' ','b','u','t',' ','s','t','o','p',' ','w','h','e','n',' ','s','e','a','r','c','h',' ','p','a','t','t','e','r','n',' ','i','s',' ','f','o','u','n','d','.','\n',
' ',' ','r',' ',' ','^','R',' ',' ','^','L',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ','R','e','p','a','i','n','t',' ','s','c','r','e','e','n','.','\n',
' ',' ','R',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ','R','e','p','a','i','n','t',' ','s','c','r','e','e','n',',',' ','d','i','s','c','a','r','d','i','n','g',' ','b','u','f','f','e','r','e','d',' ','i','n','p','u','t','.','\n',
' ',' ',' ',' ',' ',' ',' ',' ','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','\n',
@@ -69,10 +72,12 @@
' ',' ',' ',' ',' ',' ',' ',' ','E','a','c','h',' ','"','f','i','n','d',' ','o','p','e','n',' ','b','r','a','c','k','e','t','"',' ','c','o','m','m','a','n','d',' ','g','o','e','s',' ','b','a','c','k','w','a','r','d',' ','t','o',' ','t','h','e',' ','o','p','e','n',' ','b','r','a','c','k','e','t',' ','\n',
' ',' ',' ',' ',' ',' ',' ',' ',' ',' ','m','a','t','c','h','i','n','g',' ','t','h','e',' ','(','_','\b','N','-','t','h',')',' ','c','l','o','s','e',' ','b','r','a','c','k','e','t',' ','i','n',' ','t','h','e',' ','b','o','t','t','o','m',' ','l','i','n','e','.','\n',
'\n',
-' ',' ','m','_','\b','<','_','\b','l','_','\b','e','_','\b','t','_','\b','t','_','\b','e','_','\b','r','_','\b','>',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ','M','a','r','k',' ','t','h','e',' ','c','u','r','r','e','n','t',' ','p','o','s','i','t','i','o','n',' ','w','i','t','h',' ','<','l','e','t','t','e','r','>','.','\n',
+' ',' ','m','_','\b','<','_','\b','l','_','\b','e','_','\b','t','_','\b','t','_','\b','e','_','\b','r','_','\b','>',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ','M','a','r','k',' ','t','h','e',' ','c','u','r','r','e','n','t',' ','t','o','p',' ','l','i','n','e',' ','w','i','t','h',' ','<','l','e','t','t','e','r','>','.','\n',
+' ',' ','M','_','\b','<','_','\b','l','_','\b','e','_','\b','t','_','\b','t','_','\b','e','_','\b','r','_','\b','>',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ','M','a','r','k',' ','t','h','e',' ','c','u','r','r','e','n','t',' ','b','o','t','t','o','m',' ','l','i','n','e',' ','w','i','t','h',' ','<','l','e','t','t','e','r','>','.','\n',
' ',' ','\'','_','\b','<','_','\b','l','_','\b','e','_','\b','t','_','\b','t','_','\b','e','_','\b','r','_','\b','>',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ','G','o',' ','t','o',' ','a',' ','p','r','e','v','i','o','u','s','l','y',' ','m','a','r','k','e','d',' ','p','o','s','i','t','i','o','n','.','\n',
' ',' ','\'','\'',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ','G','o',' ','t','o',' ','t','h','e',' ','p','r','e','v','i','o','u','s',' ','p','o','s','i','t','i','o','n','.','\n',
' ',' ','^','X','^','X',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ','S','a','m','e',' ','a','s',' ','\'','.','\n',
+' ',' ','E','S','C','-','M','_','\b','<','_','\b','l','_','\b','e','_','\b','t','_','\b','t','_','\b','e','_','\b','r','_','\b','>',' ',' ',' ',' ',' ',' ',' ',' ','C','l','e','a','r',' ','a',' ','m','a','r','k','.','\n',
' ',' ',' ',' ',' ',' ',' ',' ','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','\n',
' ',' ',' ',' ',' ',' ',' ',' ','A',' ','m','a','r','k',' ','i','s',' ','a','n','y',' ','u','p','p','e','r','-','c','a','s','e',' ','o','r',' ','l','o','w','e','r','-','c','a','s','e',' ','l','e','t','t','e','r','.','\n',
' ',' ',' ',' ',' ',' ',' ',' ','C','e','r','t','a','i','n',' ','m','a','r','k','s',' ','a','r','e',' ','p','r','e','d','e','f','i','n','e','d',':','\n',
@@ -101,6 +106,7 @@
'\n',
' ',' ','!','_','\b','c','_','\b','o','_','\b','m','_','\b','m','_','\b','a','_','\b','n','_','\b','d',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ','E','x','e','c','u','t','e',' ','t','h','e',' ','s','h','e','l','l',' ','c','o','m','m','a','n','d',' ','w','i','t','h',' ','$','S','H','E','L','L','.','\n',
' ',' ','|','X','\b','X','_','\b','c','_','\b','o','_','\b','m','_','\b','m','_','\b','a','_','\b','n','_','\b','d',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ','P','i','p','e',' ','f','i','l','e',' ','b','e','t','w','e','e','n',' ','c','u','r','r','e','n','t',' ','p','o','s',' ','&',' ','m','a','r','k',' ','X','\b','X',' ','t','o',' ','s','h','e','l','l',' ','c','o','m','m','a','n','d','.','\n',
+' ',' ','s',' ','_','\b','f','_','\b','i','_','\b','l','_','\b','e',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ','S','a','v','e',' ','i','n','p','u','t',' ','t','o',' ','a',' ','f','i','l','e','.','\n',
' ',' ','v',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ','E','d','i','t',' ','t','h','e',' ','c','u','r','r','e','n','t',' ','f','i','l','e',' ','w','i','t','h',' ','$','V','I','S','U','A','L',' ','o','r',' ','$','E','D','I','T','O','R','.','\n',
' ',' ','V',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ','P','r','i','n','t',' ','v','e','r','s','i','o','n',' ','n','u','m','b','e','r',' ','o','f',' ','"','l','e','s','s','"','.','\n',
' ','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','\n',
@@ -204,6 +210,8 @@
' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ','D','o','n','\'','t',' ','s','e','n','d',' ','t','e','r','m','c','a','p',' ','k','e','y','p','a','d',' ','i','n','i','t','/','d','e','i','n','i','t',' ','s','t','r','i','n','g','s','.','\n',
' ',' ',' ',' ',' ',' ','.','.','.','.','.','.','.','.',' ',' ','-','-','f','o','l','l','o','w','-','n','a','m','e','\n',
' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ','T','h','e',' ','F',' ','c','o','m','m','a','n','d',' ','c','h','a','n','g','e','s',' ','f','i','l','e','s',' ','i','f',' ','t','h','e',' ','i','n','p','u','t',' ','f','i','l','e',' ','i','s',' ','r','e','n','a','m','e','d','.','\n',
+' ',' ',' ',' ',' ',' ','.','.','.','.','.','.','.','.',' ',' ','-','-','u','s','e','-','b','a','c','k','s','l','a','s','h','\n',
+' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ','S','u','b','s','e','q','u','e','n','t',' ','o','p','t','i','o','n','s',' ','u','s','e',' ','b','a','c','k','s','l','a','s','h',' ','a','s',' ','e','s','c','a','p','e',' ','c','h','a','r','.','\n',
'\n',
'\n',
' ','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','\n',
@@ -213,22 +221,22 @@
' ',' ',' ',' ',' ',' ',' ',' ','T','h','e','s','e',' ','k','e','y','s',' ','c','a','n',' ','b','e',' ','u','s','e','d',' ','t','o',' ','e','d','i','t',' ','t','e','x','t',' ','b','e','i','n','g',' ','e','n','t','e','r','e','d',' ','\n',
' ',' ',' ',' ',' ',' ',' ',' ','o','n',' ','t','h','e',' ','"','c','o','m','m','a','n','d',' ','l','i','n','e','"',' ','a','t',' ','t','h','e',' ','b','o','t','t','o','m',' ','o','f',' ','t','h','e',' ','s','c','r','e','e','n','.','\n',
'\n',
-' ','R','i','g','h','t','A','r','r','o','w',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ','E','S','C','-','l',' ',' ',' ',' ',' ','M','o','v','e',' ','c','u','r','s','o','r',' ','r','i','g','h','t',' ','o','n','e',' ','c','h','a','r','a','c','t','e','r','.','\n',
-' ','L','e','f','t','A','r','r','o','w',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ','E','S','C','-','h',' ',' ',' ',' ',' ','M','o','v','e',' ','c','u','r','s','o','r',' ','l','e','f','t',' ','o','n','e',' ','c','h','a','r','a','c','t','e','r','.','\n',
-' ','c','t','r','l','-','R','i','g','h','t','A','r','r','o','w',' ',' ','E','S','C','-','R','i','g','h','t','A','r','r','o','w',' ',' ','E','S','C','-','w',' ',' ',' ',' ',' ','M','o','v','e',' ','c','u','r','s','o','r',' ','r','i','g','h','t',' ','o','n','e',' ','w','o','r','d','.','\n',
-' ','c','t','r','l','-','L','e','f','t','A','r','r','o','w',' ',' ',' ','E','S','C','-','L','e','f','t','A','r','r','o','w',' ',' ',' ','E','S','C','-','b',' ',' ',' ',' ',' ','M','o','v','e',' ','c','u','r','s','o','r',' ','l','e','f','t',' ','o','n','e',' ','w','o','r','d','.','\n',
-' ','H','O','M','E',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ','E','S','C','-','0',' ',' ',' ',' ',' ','M','o','v','e',' ','c','u','r','s','o','r',' ','t','o',' ','s','t','a','r','t',' ','o','f',' ','l','i','n','e','.','\n',
-' ','E','N','D',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ','E','S','C','-','$',' ',' ',' ',' ',' ','M','o','v','e',' ','c','u','r','s','o','r',' ','t','o',' ','e','n','d',' ','o','f',' ','l','i','n','e','.','\n',
-' ','B','A','C','K','S','P','A','C','E',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ','D','e','l','e','t','e',' ','c','h','a','r',' ','t','o',' ','l','e','f','t',' ','o','f',' ','c','u','r','s','o','r','.','\n',
-' ','D','E','L','E','T','E',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ','E','S','C','-','x',' ',' ',' ',' ',' ','D','e','l','e','t','e',' ','c','h','a','r',' ','u','n','d','e','r',' ','c','u','r','s','o','r','.','\n',
-' ','c','t','r','l','-','B','A','C','K','S','P','A','C','E',' ',' ',' ','E','S','C','-','B','A','C','K','S','P','A','C','E',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ','D','e','l','e','t','e',' ','w','o','r','d',' ','t','o',' ','l','e','f','t',' ','o','f',' ','c','u','r','s','o','r','.','\n',
-' ','c','t','r','l','-','D','E','L','E','T','E',' ',' ',' ',' ',' ',' ','E','S','C','-','D','E','L','E','T','E',' ',' ',' ',' ',' ',' ','E','S','C','-','X',' ',' ',' ',' ',' ','D','e','l','e','t','e',' ','w','o','r','d',' ','u','n','d','e','r',' ','c','u','r','s','o','r','.','\n',
-' ','c','t','r','l','-','U',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ','E','S','C',' ','(','M','S','-','D','O','S',' ','o','n','l','y',')',' ',' ',' ',' ',' ',' ',' ',' ',' ','D','e','l','e','t','e',' ','e','n','t','i','r','e',' ','l','i','n','e','.','\n',
-' ','U','p','A','r','r','o','w',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ','E','S','C','-','k',' ',' ',' ',' ',' ','R','e','t','r','i','e','v','e',' ','p','r','e','v','i','o','u','s',' ','c','o','m','m','a','n','d',' ','l','i','n','e','.','\n',
-' ','D','o','w','n','A','r','r','o','w',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ','E','S','C','-','j',' ',' ',' ',' ',' ','R','e','t','r','i','e','v','e',' ','n','e','x','t',' ','c','o','m','m','a','n','d',' ','l','i','n','e','.','\n',
-' ','T','A','B',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ','C','o','m','p','l','e','t','e',' ','f','i','l','e','n','a','m','e',' ','&',' ','c','y','c','l','e','.','\n',
-' ','S','H','I','F','T','-','T','A','B',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ','E','S','C','-','T','A','B',' ',' ',' ','C','o','m','p','l','e','t','e',' ','f','i','l','e','n','a','m','e',' ','&',' ','r','e','v','e','r','s','e',' ','c','y','c','l','e','.','\n',
-' ','c','t','r','l','-','L',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ','C','o','m','p','l','e','t','e',' ','f','i','l','e','n','a','m','e',',',' ','l','i','s','t',' ','a','l','l','.','\n',
+' ','R','i','g','h','t','A','r','r','o','w',' ','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.',' ','E','S','C','-','l',' ','.','.','.',' ','M','o','v','e',' ','c','u','r','s','o','r',' ','r','i','g','h','t',' ','o','n','e',' ','c','h','a','r','a','c','t','e','r','.','\n',
+' ','L','e','f','t','A','r','r','o','w',' ','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.',' ','E','S','C','-','h',' ','.','.','.',' ','M','o','v','e',' ','c','u','r','s','o','r',' ','l','e','f','t',' ','o','n','e',' ','c','h','a','r','a','c','t','e','r','.','\n',
+' ','c','t','r','l','-','R','i','g','h','t','A','r','r','o','w',' ',' ','E','S','C','-','R','i','g','h','t','A','r','r','o','w',' ',' ','E','S','C','-','w',' ','.','.','.',' ','M','o','v','e',' ','c','u','r','s','o','r',' ','r','i','g','h','t',' ','o','n','e',' ','w','o','r','d','.','\n',
+' ','c','t','r','l','-','L','e','f','t','A','r','r','o','w',' ',' ',' ','E','S','C','-','L','e','f','t','A','r','r','o','w',' ',' ',' ','E','S','C','-','b',' ','.','.','.',' ','M','o','v','e',' ','c','u','r','s','o','r',' ','l','e','f','t',' ','o','n','e',' ','w','o','r','d','.','\n',
+' ','H','O','M','E',' ','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.',' ','E','S','C','-','0',' ','.','.','.',' ','M','o','v','e',' ','c','u','r','s','o','r',' ','t','o',' ','s','t','a','r','t',' ','o','f',' ','l','i','n','e','.','\n',
+' ','E','N','D',' ','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.',' ','E','S','C','-','$',' ','.','.','.',' ','M','o','v','e',' ','c','u','r','s','o','r',' ','t','o',' ','e','n','d',' ','o','f',' ','l','i','n','e','.','\n',
+' ','B','A','C','K','S','P','A','C','E',' ','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.',' ','D','e','l','e','t','e',' ','c','h','a','r',' ','t','o',' ','l','e','f','t',' ','o','f',' ','c','u','r','s','o','r','.','\n',
+' ','D','E','L','E','T','E',' ','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.',' ','E','S','C','-','x',' ','.','.','.',' ','D','e','l','e','t','e',' ','c','h','a','r',' ','u','n','d','e','r',' ','c','u','r','s','o','r','.','\n',
+' ','c','t','r','l','-','B','A','C','K','S','P','A','C','E',' ',' ',' ','E','S','C','-','B','A','C','K','S','P','A','C','E',' ','.','.','.','.','.','.','.','.','.','.','.',' ','D','e','l','e','t','e',' ','w','o','r','d',' ','t','o',' ','l','e','f','t',' ','o','f',' ','c','u','r','s','o','r','.','\n',
+' ','c','t','r','l','-','D','E','L','E','T','E',' ','.','.','.','.',' ','E','S','C','-','D','E','L','E','T','E',' ','.','.','.','.',' ','E','S','C','-','X',' ','.','.','.',' ','D','e','l','e','t','e',' ','w','o','r','d',' ','u','n','d','e','r',' ','c','u','r','s','o','r','.','\n',
+' ','c','t','r','l','-','U',' ','.','.','.','.','.','.','.','.','.',' ','E','S','C',' ','(','M','S','-','D','O','S',' ','o','n','l','y',')',' ','.','.','.','.','.','.','.',' ','D','e','l','e','t','e',' ','e','n','t','i','r','e',' ','l','i','n','e','.','\n',
+' ','U','p','A','r','r','o','w',' ','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.',' ','E','S','C','-','k',' ','.','.','.',' ','R','e','t','r','i','e','v','e',' ','p','r','e','v','i','o','u','s',' ','c','o','m','m','a','n','d',' ','l','i','n','e','.','\n',
+' ','D','o','w','n','A','r','r','o','w',' ','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.',' ','E','S','C','-','j',' ','.','.','.',' ','R','e','t','r','i','e','v','e',' ','n','e','x','t',' ','c','o','m','m','a','n','d',' ','l','i','n','e','.','\n',
+' ','T','A','B',' ','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.',' ','C','o','m','p','l','e','t','e',' ','f','i','l','e','n','a','m','e',' ','&',' ','c','y','c','l','e','.','\n',
+' ','S','H','I','F','T','-','T','A','B',' ','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.',' ','E','S','C','-','T','A','B',' ',' ',' ','C','o','m','p','l','e','t','e',' ','f','i','l','e','n','a','m','e',' ','&',' ','r','e','v','e','r','s','e',' ','c','y','c','l','e','.','\n',
+' ','c','t','r','l','-','L',' ','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.',' ','C','o','m','p','l','e','t','e',' ','f','i','l','e','n','a','m','e',',',' ','l','i','s','t',' ','a','l','l','.','\n',
'\n',
'\n',
0 };
Modified: trunk/contrib/less/ifile.c
===================================================================
--- trunk/contrib/less/ifile.c 2018-07-06 12:43:22 UTC (rev 11361)
+++ trunk/contrib/less/ifile.c 2018-07-06 12:46:07 UTC (rev 11362)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 1984-2012 Mark Nudelman
+ * Copyright (C) 1984-2017 Mark Nudelman
*
* You may distribute under the terms of either the GNU General Public
* License or the Less License, as specified in the README file.
@@ -24,14 +24,16 @@
extern IFILE curr_ifile;
struct ifile {
- struct ifile *h_next; /* Links for command line list */
+ struct ifile *h_next; /* Links for command line list */
struct ifile *h_prev;
- char *h_filename; /* Name of the file */
- void *h_filestate; /* File state (used in ch.c) */
- int h_index; /* Index within command line list */
- int h_hold; /* Hold count */
- char h_opened; /* Has this ifile been opened? */
- struct scrpos h_scrpos; /* Saved position within the file */
+ char *h_filename; /* Name of the file */
+ void *h_filestate; /* File state (used in ch.c) */
+ int h_index; /* Index within command line list */
+ int h_hold; /* Hold count */
+ char h_opened; /* Has this ifile been opened? */
+ struct scrpos h_scrpos; /* Saved position within the file */
+ void *h_altpipe; /* Alt pipe */
+ char *h_altfilename; /* Alt filename */
};
/*
@@ -50,7 +52,7 @@
static void
incr_index(p, incr)
- register struct ifile *p;
+ struct ifile *p;
int incr;
{
for (; p != &anchor; p = p->h_next)
@@ -107,7 +109,7 @@
char *filename;
struct ifile *prev;
{
- register struct ifile *p;
+ struct ifile *p;
/*
* Allocate and initialize structure.
@@ -129,7 +131,7 @@
del_ifile(h)
IFILE h;
{
- register struct ifile *p;
+ struct ifile *p;
if (h == NULL_IFILE)
return;
@@ -153,7 +155,7 @@
next_ifile(h)
IFILE h;
{
- register struct ifile *p;
+ struct ifile *p;
p = (h == NULL_IFILE) ? &anchor : int_ifile(h);
if (p->h_next == &anchor)
@@ -168,7 +170,7 @@
prev_ifile(h)
IFILE h;
{
- register struct ifile *p;
+ struct ifile *p;
p = (h == NULL_IFILE) ? &anchor : int_ifile(h);
if (p->h_prev == &anchor)
@@ -208,7 +210,7 @@
find_ifile(filename)
char *filename;
{
- register struct ifile *p;
+ struct ifile *p;
for (p = anchor.h_next; p != &anchor; p = p->h_next)
if (strcmp(filename, p->h_filename) == 0)
@@ -226,7 +228,7 @@
char *filename;
IFILE prev;
{
- register struct ifile *p;
+ struct ifile *p;
if ((p = find_ifile(filename)) == NULL)
p = new_ifile(filename, int_ifile(prev));
@@ -328,11 +330,44 @@
int_ifile(ifile)->h_filestate = filestate;
}
+ public void
+set_altpipe(ifile, p)
+ IFILE ifile;
+ void *p;
+{
+ int_ifile(ifile)->h_altpipe = p;
+}
+
+ public void *
+get_altpipe(ifile)
+ IFILE ifile;
+{
+ return (int_ifile(ifile)->h_altpipe);
+}
+
+ public void
+set_altfilename(ifile, altfilename)
+ IFILE ifile;
+ char *altfilename;
+{
+ struct ifile *p = int_ifile(ifile);
+ if (p->h_altfilename != NULL)
+ free(p->h_altfilename);
+ p->h_altfilename = altfilename;
+}
+
+ public char *
+get_altfilename(ifile)
+ IFILE ifile;
+{
+ return (int_ifile(ifile)->h_altfilename);
+}
+
#if 0
public void
if_dump()
{
- register struct ifile *p;
+ struct ifile *p;
for (p = anchor.h_next; p != &anchor; p = p->h_next)
{
Modified: trunk/contrib/less/input.c
===================================================================
--- trunk/contrib/less/input.c 2018-07-06 12:43:22 UTC (rev 11361)
+++ trunk/contrib/less/input.c 2018-07-06 12:46:07 UTC (rev 11362)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 1984-2012 Mark Nudelman
+ * Copyright (C) 1984-2017 Mark Nudelman
*
* You may distribute under the terms of either the GNU General Public
* License or the Less License, as specified in the README file.
@@ -7,7 +7,6 @@
* For more information, see the README file.
*/
-
/*
* High level routines dealing with getting lines of input
* from the file being viewed.
@@ -47,9 +46,10 @@
{
POSITION base_pos;
POSITION new_pos;
- register int c;
+ int c;
int blankline;
int endline;
+ int chopped;
int backchars;
get_forw_line:
@@ -60,6 +60,7 @@
}
#if HILITE_SEARCH
if (hilite_search == OPT_ONPLUS || is_filtering() || status_col)
+ {
/*
* If we are ignoring EOI (command F), only prepare
* one line ahead, to avoid getting stuck waiting for
@@ -69,6 +70,8 @@
*/
prep_hilite(curr_pos, curr_pos + 3*size_linebuf,
ignore_eoi ? 1 : -1);
+ curr_pos = next_unfiltered(curr_pos);
+ }
#endif
if (ch_seek(curr_pos))
{
@@ -140,6 +143,7 @@
/*
* Read each character in the line and append to the line buffer.
*/
+ chopped = FALSE;
for (;;)
{
if (ABORT_SIGS())
@@ -190,6 +194,7 @@
new_pos = ch_tell();
endline = TRUE;
quit_if_one_screen = FALSE;
+ chopped = TRUE;
} else
{
new_pos = ch_tell() - backchars;
@@ -200,7 +205,7 @@
c = ch_forw_get();
}
- pdone(endline, 1);
+ pdone(endline, chopped, 1);
#if HILITE_SEARCH
if (is_filtered(base_pos))
@@ -252,6 +257,7 @@
POSITION new_pos, begin_new_pos, base_pos;
int c;
int endline;
+ int chopped;
int backchars;
get_back_line:
@@ -356,6 +362,7 @@
loop:
begin_new_pos = new_pos;
(void) ch_seek(new_pos);
+ chopped = FALSE;
do
{
@@ -388,6 +395,7 @@
if (chopline || hshift > 0)
{
endline = TRUE;
+ chopped = TRUE;
quit_if_one_screen = FALSE;
break;
}
@@ -402,7 +410,7 @@
}
} while (new_pos < curr_pos);
- pdone(endline, 0);
+ pdone(endline, chopped, 0);
#if HILITE_SEARCH
if (is_filtered(base_pos))
@@ -439,19 +447,22 @@
{
c = ch_forw_get();
if (c == EOI)
- return;
- if (c != '\n' && c != '\r')
break;
+ if (c == '\n' || c == '\r')
+ {
+ (void) ch_back_get();
+ break;
+ }
pos++;
}
+ end_attnpos = pos;
+ for (;;)
+ {
+ c = ch_back_get();
+ if (c == EOI || c == '\n' || c == '\r')
+ break;
+ pos--;
+ }
}
start_attnpos = pos;
- for (;;)
- {
- c = ch_forw_get();
- pos++;
- if (c == EOI || c == '\n' || c == '\r')
- break;
- }
- end_attnpos = pos;
}
Deleted: trunk/contrib/less/install.sh
===================================================================
--- trunk/contrib/less/install.sh 2018-07-06 12:43:22 UTC (rev 11361)
+++ trunk/contrib/less/install.sh 2018-07-06 12:46:07 UTC (rev 11362)
@@ -1,119 +0,0 @@
-#!/bin/sh
-
-#
-# install - install a program, script, or datafile
-# This comes from X11R5; it is not part of GNU.
-#
-# $XConsortium: install.sh,v 1.2 89/12/18 14:47:22 jim Exp $
-#
-# This script is compatible with the BSD install script, but was written
-# from scratch.
-#
-
-
-# set DOITPROG to echo to test this script
-
-# Don't use :- since 4.3BSD and earlier shells don't like it.
-doit="${DOITPROG-}"
-
-
-# put in absolute paths if you don't have them in your path; or use env. vars.
-
-mvprog="${MVPROG-mv}"
-cpprog="${CPPROG-cp}"
-chmodprog="${CHMODPROG-chmod}"
-chownprog="${CHOWNPROG-chown}"
-chgrpprog="${CHGRPPROG-chgrp}"
-stripprog="${STRIPPROG-strip}"
-rmprog="${RMPROG-rm}"
-
-instcmd="$mvprog"
-chmodcmd=""
-chowncmd=""
-chgrpcmd=""
-stripcmd=""
-rmcmd="$rmprog -f"
-mvcmd="$mvprog"
-src=""
-dst=""
-
-while [ x"$1" != x ]; do
- case $1 in
- -c) instcmd="$cpprog"
- shift
- continue;;
-
- -m) chmodcmd="$chmodprog $2"
- shift
- shift
- continue;;
-
- -o) chowncmd="$chownprog $2"
- shift
- shift
- continue;;
-
- -g) chgrpcmd="$chgrpprog $2"
- shift
- shift
- continue;;
-
- -s) stripcmd="$stripprog"
- shift
- continue;;
-
- *) if [ x"$src" = x ]
- then
- src=$1
- else
- dst=$1
- fi
- shift
- continue;;
- esac
-done
-
-if [ x"$src" = x ]
-then
- echo "install: no input file specified"
- exit 1
-fi
-
-if [ x"$dst" = x ]
-then
- echo "install: no destination specified"
- exit 1
-fi
-
-
-# If destination is a directory, append the input filename; if your system
-# does not like double slashes in filenames, you may need to add some logic
-
-if [ -d $dst ]
-then
- dst="$dst"/`basename $src`
-fi
-
-# Make a temp file name in the proper directory.
-
-dstdir=`dirname $dst`
-dsttmp=$dstdir/_inst.$$_
-
-# Move or copy the file name to the temp name
-
-$doit $instcmd $src $dsttmp
-
-# and set any options; do chmod last to preserve setuid bits
-
-if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; fi
-if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; fi
-if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; fi
-if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; fi
-
-# Now rename the file to the real destination.
-
-$doit $rmcmd $dst
-$doit $mvcmd $dsttmp $dst
-
-
-exit 0
Modified: trunk/contrib/less/jump.c
===================================================================
--- trunk/contrib/less/jump.c 2018-07-06 12:43:22 UTC (rev 11361)
+++ trunk/contrib/less/jump.c 2018-07-06 12:46:07 UTC (rev 11362)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 1984-2012 Mark Nudelman
+ * Copyright (C) 1984-2017 Mark Nudelman
*
* You may distribute under the terms of either the GNU General Public
* License or the Less License, as specified in the README file.
@@ -51,7 +51,7 @@
end_pos = ch_tell();
pos = back_line(end_pos);
if (pos == NULL_POSITION)
- jump_loc((POSITION)0, sc_height-1);
+ jump_loc(ch_zero(), sc_height-1);
else
{
jump_loc(pos, sc_height-1);
@@ -61,6 +61,24 @@
}
/*
+ * Jump to the last buffered line in the file.
+ */
+ public void
+jump_forw_buffered()
+{
+ POSITION end;
+
+ if (ch_end_buffer_seek())
+ {
+ error("Cannot seek to end of buffers", NULL_PARG);
+ return;
+ }
+ end = ch_tell();
+ if (end != NULL_POSITION && end > 0)
+ jump_line_loc(end-1, sc_height-1);
+}
+
+/*
* Jump to line n in the file.
*/
public void
@@ -104,9 +122,13 @@
* Start at the line currently at the top of the screen
* and redisplay the screen.
*/
- get_scrpos(&scrpos);
+ get_scrpos(&scrpos, TOP);
pos_clear();
- jump_loc(scrpos.pos, scrpos.ln);
+ if (scrpos.pos == NULL_POSITION)
+ /* Screen hasn't been drawn yet. */
+ jump_loc(ch_zero(), 1);
+ else
+ jump_loc(scrpos.pos, scrpos.ln);
}
/*
@@ -178,7 +200,8 @@
POSITION pos;
int sline;
{
- register int nline;
+ int nline;
+ int sindex;
POSITION tpos;
POSITION bpos;
@@ -185,7 +208,7 @@
/*
* Normalize sline.
*/
- sline = adjsline(sline);
+ sindex = sindex_from_sline(sline);
if ((nline = onscreen(pos)) >= 0)
{
@@ -193,10 +216,10 @@
* The line is currently displayed.
* Just scroll there.
*/
- nline -= sline;
+ nline -= sindex;
if (nline > 0)
forw(nline, position(BOTTOM_PLUS_ONE), 1, 0, 0);
- else
+ else if (nline < 0)
back(-nline, position(TOP), 1, 0);
#if HILITE_SEARCH
if (show_attn)
@@ -229,7 +252,7 @@
* call forw() and put the desired line at the
* sline-th line on the screen.
*/
- for (nline = 0; nline < sline; nline++)
+ for (nline = 0; nline < sindex; nline++)
{
if (bpos != NULL_POSITION && pos <= bpos)
{
@@ -238,7 +261,7 @@
* close enough to the current screen
* that we can just scroll there after all.
*/
- forw(sc_height-sline+nline-1, bpos, 1, 0, 0);
+ forw(sc_height-sindex+nline-1, bpos, 1, 0, 0);
#if HILITE_SEARCH
if (show_attn)
repaint_hilite(1);
@@ -260,7 +283,7 @@
lastmark();
squished = 0;
screen_trashed = 0;
- forw(sc_height-1, pos, 1, 0, sline-nline);
+ forw(sc_height-1, pos, 1, 0, sindex-nline);
} else
{
/*
@@ -267,9 +290,9 @@
* The desired line is before the current screen.
* Move forward in the file far enough so that we
* can call back() and put the desired line at the
- * sline-th line on the screen.
+ * sindex-th line on the screen.
*/
- for (nline = sline; nline < sc_height - 1; nline++)
+ for (nline = sindex; nline < sc_height - 1; nline++)
{
pos = forw_line(pos);
if (pos == NULL_POSITION)
@@ -281,6 +304,9 @@
*/
break;
}
+#if HILITE_SEARCH
+ pos = next_unfiltered(pos);
+#endif
if (pos >= tpos)
{
/*
Modified: trunk/contrib/less/less.h
===================================================================
--- trunk/contrib/less/less.h 2018-07-06 12:43:22 UTC (rev 11361)
+++ trunk/contrib/less/less.h 2018-07-06 12:46:07 UTC (rev 11362)
@@ -1,6 +1,6 @@
/* $FreeBSD: src/contrib/less/less.h,v 1.5.8.3.2.1 2007/12/04 22:41:44 delphij Exp $ */
/*
- * Copyright (C) 1984-2012 Mark Nudelman
+ * Copyright (C) 1984-2017 Mark Nudelman
*
* You may distribute under the terms of either the GNU General Public
* License or the Less License, as specified in the README file.
@@ -40,10 +40,17 @@
/*
* Language details.
*/
+#if HAVE_ANSI_PROTOS
+#define LESSPARAMS(a) a
+#else
+#define LESSPARAMS(a) ()
+#endif
#if HAVE_VOID
#define VOID_POINTER void *
+#define VOID_PARAM void
#else
#define VOID_POINTER char *
+#define VOID_PARAM
#define void int
#endif
#if HAVE_CONST
@@ -296,6 +303,15 @@
int ln;
};
+/*
+ * A mark is an ifile (input file) plus a position within the file.
+ */
+struct mark
+{
+ IFILE m_ifile;
+ struct scrpos m_scrpos;
+};
+
typedef union parg
{
char *p_string;
@@ -311,6 +327,17 @@
char *endstring;
};
+struct wchar_range
+{
+ LWCHAR first, last;
+};
+
+struct wchar_range_table
+{
+ struct wchar_range *table;
+ int count;
+};
+
#define EOI (-1)
#define READ_INTR (-2)
@@ -446,6 +473,7 @@
#define ESC CONTROL('[')
#define CSI ((unsigned char)'\233')
+#define CHAR_END_COMMAND 0x40000000
#if _OSK_MWC32
#define LSIGNAL(sig,func) os9_signal(sig,func)
@@ -487,7 +515,6 @@
#define CH_HELPFILE 010
#define CH_NODATA 020 /* Special case for zero length files */
-
#define ch_zero() ((POSITION)0)
#define FAKE_HELPFILE "@/\\less/\\help/\\file/\\@"
@@ -499,9 +526,19 @@
#define CVT_CRLF 04 /* Remove CR after LF */
#define CVT_ANSI 010 /* Remove ANSI escape sequences */
+#if HAVE_TIME_T
+#define time_type time_t
+#else
+#define time_type long
+#endif
+
+struct mlist;
+struct loption;
+struct hilite_tree;
+#include "pattern.h"
#include "funcs.h"
/* Functions not included in funcs.h */
-void postoa();
-void linenumtoa();
-void inttoa();
+void postoa LESSPARAMS ((POSITION, char*));
+void linenumtoa LESSPARAMS ((LINENUM, char*));
+void inttoa LESSPARAMS ((int, char*));
Modified: trunk/contrib/less/less.hlp
===================================================================
--- trunk/contrib/less/less.hlp 2018-07-06 12:43:22 UTC (rev 11361)
+++ trunk/contrib/less/less.hlp 2018-07-06 12:46:07 UTC (rev 11362)
@@ -20,9 +20,12 @@
ESC-SPACE * Forward one window, but don't stop at end-of-file.
d ^D * Forward one half-window (and set half-window to _N).
u ^U * Backward one half-window (and set half-window to _N).
- ESC-) RightArrow * Left one half screen width (or _N positions).
- ESC-( LeftArrow * Right one half screen width (or _N positions).
+ ESC-) RightArrow * Right one half screen width (or _N positions).
+ ESC-( LeftArrow * Left one half screen width (or _N positions).
+ ESC-} ^RightArrow Right to last column displayed.
+ ESC-{ ^LeftArrow Left to first column.
F Forward forever; like "tail -f".
+ ESC-F Like F but stop when search pattern is found.
r ^R ^L Repaint screen.
R Repaint screen, discarding buffered input.
---------------------------------------------------
@@ -66,10 +69,12 @@
Each "find open bracket" command goes backward to the open bracket
matching the (_N-th) close bracket in the bottom line.
- m_<_l_e_t_t_e_r_> Mark the current position with <letter>.
+ m_<_l_e_t_t_e_r_> Mark the current top line with <letter>.
+ M_<_l_e_t_t_e_r_> Mark the current bottom line with <letter>.
'_<_l_e_t_t_e_r_> Go to a previously marked position.
'' Go to the previous position.
^X^X Same as '.
+ ESC-M_<_l_e_t_t_e_r_> Clear a mark.
---------------------------------------------------
A mark is any upper-case or lower-case letter.
Certain marks are predefined:
@@ -98,6 +103,7 @@
!_c_o_m_m_a_n_d Execute the shell command with $SHELL.
|XX_c_o_m_m_a_n_d Pipe file between current pos & mark XX to shell command.
+ s _f_i_l_e Save input to a file.
v Edit the current file with $VISUAL or $EDITOR.
V Print version number of "less".
---------------------------------------------------------------------------
@@ -201,6 +207,8 @@
Don't send termcap keypad init/deinit strings.
........ --follow-name
The F command changes files if the input file is renamed.
+ ........ --use-backslash
+ Subsequent options use backslash as escape char.
---------------------------------------------------------------------------
@@ -210,21 +218,21 @@
These keys can be used to edit text being entered
on the "command line" at the bottom of the screen.
- RightArrow ESC-l Move cursor right one character.
- LeftArrow ESC-h Move cursor left one character.
- ctrl-RightArrow ESC-RightArrow ESC-w Move cursor right one word.
- ctrl-LeftArrow ESC-LeftArrow ESC-b Move cursor left one word.
- HOME ESC-0 Move cursor to start of line.
- END ESC-$ Move cursor to end of line.
- BACKSPACE Delete char to left of cursor.
- DELETE ESC-x Delete char under cursor.
- ctrl-BACKSPACE ESC-BACKSPACE Delete word to left of cursor.
- ctrl-DELETE ESC-DELETE ESC-X Delete word under cursor.
- ctrl-U ESC (MS-DOS only) Delete entire line.
- UpArrow ESC-k Retrieve previous command line.
- DownArrow ESC-j Retrieve next command line.
- TAB Complete filename & cycle.
- SHIFT-TAB ESC-TAB Complete filename & reverse cycle.
- ctrl-L Complete filename, list all.
+ RightArrow ..................... ESC-l ... Move cursor right one character.
+ LeftArrow ...................... ESC-h ... Move cursor left one character.
+ ctrl-RightArrow ESC-RightArrow ESC-w ... Move cursor right one word.
+ ctrl-LeftArrow ESC-LeftArrow ESC-b ... Move cursor left one word.
+ HOME ........................... ESC-0 ... Move cursor to start of line.
+ END ............................ ESC-$ ... Move cursor to end of line.
+ BACKSPACE ................................ Delete char to left of cursor.
+ DELETE ......................... ESC-x ... Delete char under cursor.
+ ctrl-BACKSPACE ESC-BACKSPACE ........... Delete word to left of cursor.
+ ctrl-DELETE .... ESC-DELETE .... ESC-X ... Delete word under cursor.
+ ctrl-U ......... ESC (MS-DOS only) ....... Delete entire line.
+ UpArrow ........................ ESC-k ... Retrieve previous command line.
+ DownArrow ...................... ESC-j ... Retrieve next command line.
+ TAB ...................................... Complete filename & cycle.
+ SHIFT-TAB ...................... ESC-TAB Complete filename & reverse cycle.
+ ctrl-L ................................... Complete filename, list all.
Deleted: trunk/contrib/less/less.man
===================================================================
--- trunk/contrib/less/less.man 2018-07-06 12:43:22 UTC (rev 11361)
+++ trunk/contrib/less/less.man 2018-07-06 12:46:07 UTC (rev 11362)
@@ -1,1621 +0,0 @@
-LESS(1) LESS(1)
-
-
-
-[1mNAME[0m
- less - opposite of more
-
-[1mSYNOPSIS[0m
- [1mless -?[0m
- [1mless --help[0m
- [1mless -V[0m
- [1mless --version[0m
- [1mless [-[+]aABcCdeEfFgGiIJKLmMnNqQrRsSuUVwWX~][0m
- [1m[-b [4m[22mspace[24m[1m] [-h [4m[22mlines[24m[1m] [-j [4m[22mline[24m[1m] [-k [4m[22mkeyfile[24m[1m][0m
- [1m[-{oO} [4m[22mlogfile[24m[1m] [-p [4m[22mpattern[24m[1m] [-P [4m[22mprompt[24m[1m] [-t [4m[22mtag[24m[1m][0m
- [1m[-T [4m[22mtagsfile[24m[1m] [-x [4m[22mtab[24m[1m,...] [-y [4m[22mlines[24m[1m] [-[z] [4m[22mlines[24m[1m][0m
- [1m[-# [4m[22mshift[24m[1m] [+[+][4m[22mcmd[24m[1m] [--] [[4m[22mfilename[24m[1m]...[0m
- (See the OPTIONS section for alternate option syntax with long option
- names.)
-
-
-[1mDESCRIPTION[0m
- [4mLess[24m is a program similar to [4mmore[24m (1), but which allows backward move-
- ment in the file as well as forward movement. Also, [4mless[24m does not have
- to read the entire input file before starting, so with large input
- files it starts up faster than text editors like [4mvi[24m (1). [4mLess[24m uses
- termcap (or terminfo on some systems), so it can run on a variety of
- terminals. There is even limited support for hardcopy terminals. (On
- a hardcopy terminal, lines which should be printed at the top of the
- screen are prefixed with a caret.)
-
- Commands are based on both [4mmore[24m and [4mvi.[24m Commands may be preceded by a
- decimal number, called N in the descriptions below. The number is used
- by some commands, as indicated.
-
-
-[1mCOMMANDS[0m
- In the following descriptions, ^X means control-X. ESC stands for the
- ESCAPE key; for example ESC-v means the two character sequence
- "ESCAPE", then "v".
-
- h or H Help: display a summary of these commands. If you forget all
- the other commands, remember this one.
-
- SPACE or ^V or f or ^F
- Scroll forward N lines, default one window (see option -z
- below). If N is more than the screen size, only the final
- screenful is displayed. Warning: some systems use ^V as a spe-
- cial literalization character.
-
- z Like SPACE, but if N is specified, it becomes the new window
- size.
-
- ESC-SPACE
- Like SPACE, but scrolls a full screenful, even if it reaches
- end-of-file in the process.
-
- ENTER or RETURN or ^N or e or ^E or j or ^J
- Scroll forward N lines, default 1. The entire N lines are dis-
- played, even if N is more than the screen size.
-
- d or ^D
- Scroll forward N lines, default one half of the screen size. If
- N is specified, it becomes the new default for subsequent d and
- u commands.
-
- b or ^B or ESC-v
- Scroll backward N lines, default one window (see option -z
- below). If N is more than the screen size, only the final
- screenful is displayed.
-
- w Like ESC-v, but if N is specified, it becomes the new window
- size.
-
- y or ^Y or ^P or k or ^K
- Scroll backward N lines, default 1. The entire N lines are dis-
- played, even if N is more than the screen size. Warning: some
- systems use ^Y as a special job control character.
-
- u or ^U
- Scroll backward N lines, default one half of the screen size.
- If N is specified, it becomes the new default for subsequent d
- and u commands.
-
- ESC-) or RIGHTARROW
- Scroll horizontally right N characters, default half the screen
- width (see the -# option). If a number N is specified, it
- becomes the default for future RIGHTARROW and LEFTARROW com-
- mands. While the text is scrolled, it acts as though the -S
- option (chop lines) were in effect.
-
- ESC-( or LEFTARROW
- Scroll horizontally left N characters, default half the screen
- width (see the -# option). If a number N is specified, it
- becomes the default for future RIGHTARROW and LEFTARROW com-
- mands.
-
- r or ^R or ^L
- Repaint the screen.
-
- R Repaint the screen, discarding any buffered input. Useful if
- the file is changing while it is being viewed.
-
- F Scroll forward, and keep trying to read when the end of file is
- reached. Normally this command would be used when already at
- the end of the file. It is a way to monitor the tail of a file
- which is growing while it is being viewed. (The behavior is
- similar to the "tail -f" command.)
-
- ESC-F Like F, but as soon as a line is found which matches the last
- search pattern, the terminal bell is rung and forward scrolling
- stops.
-
- g or < or ESC-<
- Go to line N in the file, default 1 (beginning of file). (Warn-
- ing: this may be slow if N is large.)
-
- G or > or ESC->
- Go to line N in the file, default the end of the file. (Warn-
- ing: this may be slow if N is large, or if N is not specified
- and standard input, rather than a file, is being read.)
-
- p or % Go to a position N percent into the file. N should be between 0
- and 100, and may contain a decimal point.
-
- P Go to the line containing byte offset N in the file.
-
- { If a left curly bracket appears in the top line displayed on the
- screen, the { command will go to the matching right curly
- bracket. The matching right curly bracket is positioned on the
- bottom line of the screen. If there is more than one left curly
- bracket on the top line, a number N may be used to specify the
- N-th bracket on the line.
-
- } If a right curly bracket appears in the bottom line displayed on
- the screen, the } command will go to the matching left curly
- bracket. The matching left curly bracket is positioned on the
- top line of the screen. If there is more than one right curly
- bracket on the top line, a number N may be used to specify the
- N-th bracket on the line.
-
- ( Like {, but applies to parentheses rather than curly brackets.
-
- ) Like }, but applies to parentheses rather than curly brackets.
-
- [ Like {, but applies to square brackets rather than curly brack-
- ets.
-
- ] Like }, but applies to square brackets rather than curly brack-
- ets.
-
- ESC-^F Followed by two characters, acts like {, but uses the two char-
- acters as open and close brackets, respectively. For example,
- "ESC ^F < >" could be used to go forward to the > which matches
- the < in the top displayed line.
-
- ESC-^B Followed by two characters, acts like }, but uses the two char-
- acters as open and close brackets, respectively. For example,
- "ESC ^B < >" could be used to go backward to the < which matches
- the > in the bottom displayed line.
-
- m Followed by any lowercase letter, marks the current position
- with that letter.
-
- ' (Single quote.) Followed by any lowercase letter, returns to
- the position which was previously marked with that letter. Fol-
- lowed by another single quote, returns to the position at which
- the last "large" movement command was executed. Followed by a ^
- or $, jumps to the beginning or end of the file respectively.
- Marks are preserved when a new file is examined, so the ' com-
- mand can be used to switch between input files.
-
- ^X^X Same as single quote.
-
- /pattern
- Search forward in the file for the N-th line containing the pat-
- tern. N defaults to 1. The pattern is a regular expression, as
- recognized by the regular expression library supplied by your
- system. The search starts at the first line displayed (but see
- the -a and -j options, which change this).
-
- Certain characters are special if entered at the beginning of
- the pattern; they modify the type of search rather than become
- part of the pattern:
-
- ^N or !
- Search for lines which do NOT match the pattern.
-
- ^E or *
- Search multiple files. That is, if the search reaches
- the END of the current file without finding a match, the
- search continues in the next file in the command line
- list.
-
- ^F or @
- Begin the search at the first line of the FIRST file in
- the command line list, regardless of what is currently
- displayed on the screen or the settings of the -a or -j
- options.
-
- ^K Highlight any text which matches the pattern on the cur-
- rent screen, but don't move to the first match (KEEP cur-
- rent position).
-
- ^R Don't interpret regular expression metacharacters; that
- is, do a simple textual comparison.
-
- ?pattern
- Search backward in the file for the N-th line containing the
- pattern. The search starts at the line immediately before the
- top line displayed.
-
- Certain characters are special as in the / command:
-
- ^N or !
- Search for lines which do NOT match the pattern.
-
- ^E or *
- Search multiple files. That is, if the search reaches
- the beginning of the current file without finding a
- match, the search continues in the previous file in the
- command line list.
-
- ^F or @
- Begin the search at the last line of the last file in the
- command line list, regardless of what is currently dis-
- played on the screen or the settings of the -a or -j
- options.
-
- ^K As in forward searches.
-
- ^R As in forward searches.
-
- ESC-/pattern
- Same as "/*".
-
- ESC-?pattern
- Same as "?*".
-
- n Repeat previous search, for N-th line containing the last pat-
- tern. If the previous search was modified by ^N, the search is
- made for the N-th line NOT containing the pattern. If the pre-
- vious search was modified by ^E, the search continues in the
- next (or previous) file if not satisfied in the current file.
- If the previous search was modified by ^R, the search is done
- without using regular expressions. There is no effect if the
- previous search was modified by ^F or ^K.
-
- N Repeat previous search, but in the reverse direction.
-
- ESC-n Repeat previous search, but crossing file boundaries. The
- effect is as if the previous search were modified by *.
-
- ESC-N Repeat previous search, but in the reverse direction and cross-
- ing file boundaries.
-
- ESC-u Undo search highlighting. Turn off highlighting of strings
- matching the current search pattern. If highlighting is already
- off because of a previous ESC-u command, turn highlighting back
- on. Any search command will also turn highlighting back on.
- (Highlighting can also be disabled by toggling the -G option; in
- that case search commands do not turn highlighting back on.)
-
- &pattern
- Display only lines which match the pattern; lines which do not
- match the pattern are not displayed. If pattern is empty (if
- you type & immediately followed by ENTER), any filtering is
- turned off, and all lines are displayed. While filtering is in
- effect, an ampersand is displayed at the beginning of the
- prompt, as a reminder that some lines in the file may be hidden.
-
- Certain characters are special as in the / command:
-
- ^N or !
- Display only lines which do NOT match the pattern.
-
- ^R Don't interpret regular expression metacharacters; that
- is, do a simple textual comparison.
-
- :e [filename]
- Examine a new file. If the filename is missing, the "current"
- file (see the :n and :p commands below) from the list of files
- in the command line is re-examined. A percent sign (%) in the
- filename is replaced by the name of the current file. A pound
- sign (#) is replaced by the name of the previously examined
- file. However, two consecutive percent signs are simply
- replaced with a single percent sign. This allows you to enter a
- filename that contains a percent sign in the name. Similarly,
- two consecutive pound signs are replaced with a single pound
- sign. The filename is inserted into the command line list of
- files so that it can be seen by subsequent :n and :p commands.
- If the filename consists of several files, they are all inserted
- into the list of files and the first one is examined. If the
- filename contains one or more spaces, the entire filename should
- be enclosed in double quotes (also see the -" option).
-
- ^X^V or E
- Same as :e. Warning: some systems use ^V as a special literal-
- ization character. On such systems, you may not be able to use
- ^V.
-
- :n Examine the next file (from the list of files given in the com-
- mand line). If a number N is specified, the N-th next file is
- examined.
-
- :p Examine the previous file in the command line list. If a number
- N is specified, the N-th previous file is examined.
-
- :x Examine the first file in the command line list. If a number N
- is specified, the N-th file in the list is examined.
-
- :d Remove the current file from the list of files.
-
- t Go to the next tag, if there were more than one matches for the
- current tag. See the -t option for more details about tags.
-
- T Go to the previous tag, if there were more than one matches for
- the current tag.
-
- = or ^G or :f
- Prints some information about the file being viewed, including
- its name and the line number and byte offset of the bottom line
- being displayed. If possible, it also prints the length of the
- file, the number of lines in the file and the percent of the
- file above the last displayed line.
-
- - Followed by one of the command line option letters (see OPTIONS
- below), this will change the setting of that option and print a
- message describing the new setting. If a ^P (CONTROL-P) is
- entered immediately after the dash, the setting of the option is
- changed but no message is printed. If the option letter has a
- numeric value (such as -b or -h), or a string value (such as -P
- or -t), a new value may be entered after the option letter. If
- no new value is entered, a message describing the current set-
- ting is printed and nothing is changed.
-
- -- Like the - command, but takes a long option name (see OPTIONS
- below) rather than a single option letter. You must press ENTER
- or RETURN after typing the option name. A ^P immediately after
- the second dash suppresses printing of a message describing the
- new setting, as in the - command.
-
- -+ Followed by one of the command line option letters this will
- reset the option to its default setting and print a message
- describing the new setting. (The "-+[4mX[24m" command does the same
- thing as "-+[4mX[24m" on the command line.) This does not work for
- string-valued options.
-
- --+ Like the -+ command, but takes a long option name rather than a
- single option letter.
-
- -! Followed by one of the command line option letters, this will
- reset the option to the "opposite" of its default setting and
- print a message describing the new setting. This does not work
- for numeric or string-valued options.
-
- --! Like the -! command, but takes a long option name rather than a
- single option letter.
-
- _ (Underscore.) Followed by one of the command line option let-
- ters, this will print a message describing the current setting
- of that option. The setting of the option is not changed.
-
- __ (Double underscore.) Like the _ (underscore) command, but takes
- a long option name rather than a single option letter. You must
- press ENTER or RETURN after typing the option name.
-
- +cmd Causes the specified cmd to be executed each time a new file is
- examined. For example, +G causes [4mless[24m to initially display each
- file starting at the end rather than the beginning.
-
- V Prints the version number of [4mless[24m being run.
-
- q or Q or :q or :Q or ZZ
- Exits [4mless.[0m
-
- The following four commands may or may not be valid, depending on your
- particular installation.
-
- v Invokes an editor to edit the current file being viewed. The
- editor is taken from the environment variable VISUAL if defined,
- or EDITOR if VISUAL is not defined, or defaults to "vi" if nei-
- ther VISUAL nor EDITOR is defined. See also the discussion of
- LESSEDIT under the section on PROMPTS below.
-
- ! shell-command
- Invokes a shell to run the shell-command given. A percent sign
- (%) in the command is replaced by the name of the current file.
- A pound sign (#) is replaced by the name of the previously exam-
- ined file. "!!" repeats the last shell command. "!" with no
- shell command simply invokes a shell. On Unix systems, the
- shell is taken from the environment variable SHELL, or defaults
- to "sh". On MS-DOS and OS/2 systems, the shell is the normal
- command processor.
-
- | <m> shell-command
- <m> represents any mark letter. Pipes a section of the input
- file to the given shell command. The section of the file to be
- piped is between the first line on the current screen and the
- position marked by the letter. <m> may also be ^ or $ to indi-
- cate beginning or end of file respectively. If <m> is . or new-
- line, the current screen is piped.
-
- s filename
- Save the input to a file. This only works if the input is a
- pipe, not an ordinary file.
-
-[1mOPTIONS[0m
- Command line options are described below. Most options may be changed
- while [4mless[24m is running, via the "-" command.
-
- Most options may be given in one of two forms: either a dash followed
- by a single letter, or two dashes followed by a long option name. A
- long option name may be abbreviated as long as the abbreviation is
- unambiguous. For example, --quit-at-eof may be abbreviated --quit, but
- not --qui, since both --quit-at-eof and --quiet begin with --qui. Some
- long option names are in uppercase, such as --QUIT-AT-EOF, as distinct
- from --quit-at-eof. Such option names need only have their first let-
- ter capitalized; the remainder of the name may be in either case. For
- example, --Quit-at-eof is equivalent to --QUIT-AT-EOF.
-
- Options are also taken from the environment variable "LESS". For exam-
- ple, to avoid typing "less -options ..." each time [4mless[24m is invoked, you
- might tell [4mcsh:[0m
-
- setenv LESS "-options"
-
- or if you use [4msh:[0m
-
- LESS="-options"; export LESS
-
- On MS-DOS, you don't need the quotes, but you should replace any per-
- cent signs in the options string by double percent signs.
-
- The environment variable is parsed before the command line, so command
- line options override the LESS environment variable. If an option
- appears in the LESS variable, it can be reset to its default value on
- the command line by beginning the command line option with "-+".
-
- Some options like -k or -D require a string to follow the option let-
- ter. The string for that option is considered to end when a dollar
- sign ($) is found. For example, you can set two -D options on MS-DOS
- like this:
-
- LESS="Dn9.1$Ds4.1"
-
- If the --use-backslash option appears earlier in the options, then a
- dollar sign or backslash may be included literally in an option string
- by preceding it with a backslash. If the --use-backslash option is not
- in effect, then backslashes are not treated specially, and there is no
- way to include a dollar sign in the option string.
-
- -? or --help
- This option displays a summary of the commands accepted by [4mless[0m
- (the same as the h command). (Depending on how your shell
- interprets the question mark, it may be necessary to quote the
- question mark, thus: "-\?".)
-
- -a or --search-skip-screen
- By default, forward searches start at the top of the displayed
- screen and backwards searches start at the bottom of the dis-
- played screen (except for repeated searches invoked by the n or
- N commands, which start after or before the "target" line
- respectively; see the -j option for more about the target line).
- The -a option causes forward searches to instead start at the
- bottom of the screen and backward searches to start at the top
- of the screen, thus skipping all lines displayed on the screen.
-
- -A or --SEARCH-SKIP-SCREEN
- Causes all forward searches (not just non-repeated searches) to
- start just after the target line, and all backward searches to
- start just before the target line. Thus, forward searches will
- skip part of the displayed screen (from the first line up to and
- including the target line). Similarly backwards searches will
- skip the displayed screen from the last line up to and including
- the target line. This was the default behavior in less versions
- prior to 441.
-
- -b[4mn[24m or --buffers=[4mn[0m
- Specifies the amount of buffer space [4mless[24m will use for each
- file, in units of kilobytes (1024 bytes). By default 64K of
- buffer space is used for each file (unless the file is a pipe;
- see the -B option). The -b option specifies instead that [4mn[0m
- kilobytes of buffer space should be used for each file. If [4mn[24m is
- -1, buffer space is unlimited; that is, the entire file can be
- read into memory.
-
- -B or --auto-buffers
- By default, when data is read from a pipe, buffers are allocated
- automatically as needed. If a large amount of data is read from
- the pipe, this can cause a large amount of memory to be allo-
- cated. The -B option disables this automatic allocation of buf-
- fers for pipes, so that only 64K (or the amount of space speci-
- fied by the -b option) is used for the pipe. Warning: use of -B
- can result in erroneous display, since only the most recently
- viewed part of the piped data is kept in memory; any earlier
- data is lost.
-
- -c or --clear-screen
- Causes full screen repaints to be painted from the top line
- down. By default, full screen repaints are done by scrolling
- from the bottom of the screen.
-
- -C or --CLEAR-SCREEN
- Same as -c, for compatibility with older versions of [4mless.[0m
-
- -d or --dumb
- The -d option suppresses the error message normally displayed if
- the terminal is dumb; that is, lacks some important capability,
- such as the ability to clear the screen or scroll backward. The
- -d option does not otherwise change the behavior of [4mless[24m on a
- dumb terminal.
-
- -D[1mx[4m[22mcolor[24m or --color=[1mx[4m[22mcolor[0m
- [MS-DOS only] Sets the color of the text displayed. [1mx [22mis a sin-
- gle character which selects the type of text whose color is
- being set: n=normal, s=standout, d=bold, u=underlined, k=blink.
- [4mcolor[24m is a pair of numbers separated by a period. The first
- number selects the foreground color and the second selects the
- background color of the text. A single number [4mN[24m is the same as
- [4mN.M[24m, where [4mM[24m is the normal background color.
-
-
- -e or --quit-at-eof
- Causes [4mless[24m to automatically exit the second time it reaches
- end-of-file. By default, the only way to exit [4mless[24m is via the
- "q" command.
-
- -E or --QUIT-AT-EOF
- Causes [4mless[24m to automatically exit the first time it reaches end-
- of-file.
-
- -f or --force
- Forces non-regular files to be opened. (A non-regular file is a
- directory or a device special file.) Also suppresses the warn-
- ing message when a binary file is opened. By default, [4mless[24m will
- refuse to open non-regular files. Note that some operating sys-
- tems will not allow directories to be read, even if -f is set.
-
- -F or --quit-if-one-screen
- Causes [4mless[24m to automatically exit if the entire file can be dis-
- played on the first screen.
-
- -g or --hilite-search
- Normally, [4mless[24m will highlight ALL strings which match the last
- search command. The -g option changes this behavior to high-
- light only the particular string which was found by the last
- search command. This can cause [4mless[24m to run somewhat faster than
- the default.
-
- -G or --HILITE-SEARCH
- The -G option suppresses all highlighting of strings found by
- search commands.
-
- -h[4mn[24m or --max-back-scroll=[4mn[0m
- Specifies a maximum number of lines to scroll backward. If it
- is necessary to scroll backward more than [4mn[24m lines, the screen is
- repainted in a forward direction instead. (If the terminal does
- not have the ability to scroll backward, -h0 is implied.)
-
- -i or --ignore-case
- Causes searches to ignore case; that is, uppercase and lowercase
- are considered identical. This option is ignored if any upper-
- case letters appear in the search pattern; in other words, if a
- pattern contains uppercase letters, then that search does not
- ignore case.
-
- -I or --IGNORE-CASE
- Like -i, but searches ignore case even if the pattern contains
- uppercase letters.
-
- -j[4mn[24m or --jump-target=[4mn[0m
- Specifies a line on the screen where the "target" line is to be
- positioned. The target line is the line specified by any com-
- mand to search for a pattern, jump to a line number, jump to a
- file percentage or jump to a tag. The screen line may be speci-
- fied by a number: the top line on the screen is 1, the next is
- 2, and so on. The number may be negative to specify a line rel-
- ative to the bottom of the screen: the bottom line on the screen
- is -1, the second to the bottom is -2, and so on. Alternately,
- the screen line may be specified as a fraction of the height of
- the screen, starting with a decimal point: .5 is in the middle
- of the screen, .3 is three tenths down from the first line, and
- so on. If the line is specified as a fraction, the actual line
- number is recalculated if the terminal window is resized, so
- that the target line remains at the specified fraction of the
- screen height. If any form of the -j option is used, forward
- searches begin at the line immediately after the target line,
- and backward searches begin at the target line, unless changed
- by -a or -A. For example, if "-j4" is used, the target line is
- the fourth line on the screen, so forward searches begin at the
- fifth line on the screen.
-
- -J or --status-column
- Displays a status column at the left edge of the screen. The
- status column shows the lines that matched the current search.
- The status column is also used if the -w or -W option is in
- effect.
-
- -k[4mfilename[24m or --lesskey-file=[4mfilename[0m
- Causes [4mless[24m to open and interpret the named file as a [4mlesskey[0m
- (1) file. Multiple -k options may be specified. If the LESSKEY
- or LESSKEY_SYSTEM environment variable is set, or if a lesskey
- file is found in a standard place (see KEY BINDINGS), it is also
- used as a [4mlesskey[24m file.
-
- -K or --quit-on-intr
- Causes [4mless[24m to exit immediately (with status 2) when an inter-
- rupt character (usually ^C) is typed. Normally, an interrupt
- character causes [4mless[24m to stop whatever it is doing and return to
- its command prompt. Note that use of this option makes it
- impossible to return to the command prompt from the "F" command.
-
- -L or --no-lessopen
- Ignore the LESSOPEN environment variable (see the INPUT PRE-
- PROCESSOR section below). This option can be set from within
- [4mless[24m, but it will apply only to files opened subsequently, not
- to the file which is currently open.
-
- -m or --long-prompt
- Causes [4mless[24m to prompt verbosely (like [4mmore[24m), with the percent
- into the file. By default, [4mless[24m prompts with a colon.
-
- -M or --LONG-PROMPT
- Causes [4mless[24m to prompt even more verbosely than [4mmore.[0m
-
- -n or --line-numbers
- Suppresses line numbers. The default (to use line numbers) may
- cause [4mless[24m to run more slowly in some cases, especially with a
- very large input file. Suppressing line numbers with the -n
- option will avoid this problem. Using line numbers means: the
- line number will be displayed in the verbose prompt and in the =
- command, and the v command will pass the current line number to
- the editor (see also the discussion of LESSEDIT in PROMPTS
- below).
-
- -N or --LINE-NUMBERS
- Causes a line number to be displayed at the beginning of each
- line in the display.
-
- -o[4mfilename[24m or --log-file=[4mfilename[0m
- Causes [4mless[24m to copy its input to the named file as it is being
- viewed. This applies only when the input file is a pipe, not an
- ordinary file. If the file already exists, [4mless[24m will ask for
- confirmation before overwriting it.
-
- -O[4mfilename[24m or --LOG-FILE=[4mfilename[0m
- The -O option is like -o, but it will overwrite an existing file
- without asking for confirmation.
-
- If no log file has been specified, the -o and -O options can be
- used from within [4mless[24m to specify a log file. Without a file
- name, they will simply report the name of the log file. The "s"
- command is equivalent to specifying -o from within [4mless.[0m
-
- -p[4mpattern[24m or --pattern=[4mpattern[0m
- The -p option on the command line is equivalent to specifying
- +/[4mpattern[24m; that is, it tells [4mless[24m to start at the first occur-
- rence of [4mpattern[24m in the file.
-
- -P[4mprompt[24m or --prompt=[4mprompt[0m
- Provides a way to tailor the three prompt styles to your own
- preference. This option would normally be put in the LESS envi-
- ronment variable, rather than being typed in with each [4mless[24m com-
- mand. Such an option must either be the last option in the LESS
- variable, or be terminated by a dollar sign. -Ps followed by a
- string changes the default (short) prompt to that string. -Pm
- changes the medium (-m) prompt. -PM changes the long (-M)
- prompt. -Ph changes the prompt for the help screen. -P=
- changes the message printed by the = command. -Pw changes the
- message printed while waiting for data (in the F command). All
- prompt strings consist of a sequence of letters and special
- escape sequences. See the section on PROMPTS for more details.
-
- -q or --quiet or --silent
- Causes moderately "quiet" operation: the terminal bell is not
- rung if an attempt is made to scroll past the end of the file or
- before the beginning of the file. If the terminal has a "visual
- bell", it is used instead. The bell will be rung on certain
- other errors, such as typing an invalid character. The default
- is to ring the terminal bell in all such cases.
-
- -Q or --QUIET or --SILENT
- Causes totally "quiet" operation: the terminal bell is never
- rung.
-
- -r or --raw-control-chars
- Causes "raw" control characters to be displayed. The default is
- to display control characters using the caret notation; for
- example, a control-A (octal 001) is displayed as "^A". Warning:
- when the -r option is used, [4mless[24m cannot keep track of the actual
- appearance of the screen (since this depends on how the screen
- responds to each type of control character). Thus, various dis-
- play problems may result, such as long lines being split in the
- wrong place.
-
- -R or --RAW-CONTROL-CHARS
- Like -r, but only ANSI "color" escape sequences are output in
- "raw" form. Unlike -r, the screen appearance is maintained cor-
- rectly in most cases. ANSI "color" escape sequences are
- sequences of the form:
-
- ESC [ ... m
-
- where the "..." is zero or more color specification characters
- For the purpose of keeping track of screen appearance, ANSI
- color escape sequences are assumed to not move the cursor. You
- can make [4mless[24m think that characters other than "m" can end ANSI
- color escape sequences by setting the environment variable
- LESSANSIENDCHARS to the list of characters which can end a color
- escape sequence. And you can make [4mless[24m think that characters
- other than the standard ones may appear between the ESC and the
- m by setting the environment variable LESSANSIMIDCHARS to the
- list of characters which can appear.
-
- -s or --squeeze-blank-lines
- Causes consecutive blank lines to be squeezed into a single
- blank line. This is useful when viewing [4mnroff[24m output.
-
- -S or --chop-long-lines
- Causes lines longer than the screen width to be chopped (trun-
- cated) rather than wrapped. That is, the portion of a long line
- that does not fit in the screen width is not shown. The default
- is to wrap long lines; that is, display the remainder on the
- next line.
-
- -t[4mtag[24m or --tag=[4mtag[0m
- The -t option, followed immediately by a TAG, will edit the file
- containing that tag. For this to work, tag information must be
- available; for example, there may be a file in the current
- directory called "tags", which was previously built by [4mctags[24m (1)
- or an equivalent command. If the environment variable LESSGLOB-
- ALTAGS is set, it is taken to be the name of a command compati-
- ble with [4mglobal[24m (1), and that command is executed to find the
- tag. (See http://www.gnu.org/software/global/global.html). The
- -t option may also be specified from within [4mless[24m (using the -
- command) as a way of examining a new file. The command ":t" is
- equivalent to specifying -t from within [4mless.[0m
-
- -T[4mtagsfile[24m or --tag-file=[4mtagsfile[0m
- Specifies a tags file to be used instead of "tags".
-
- -u or --underline-special
- Causes backspaces and carriage returns to be treated as print-
- able characters; that is, they are sent to the terminal when
- they appear in the input.
-
- -U or --UNDERLINE-SPECIAL
- Causes backspaces, tabs and carriage returns to be treated as
- control characters; that is, they are handled as specified by
- the -r option.
-
- By default, if neither -u nor -U is given, backspaces which
- appear adjacent to an underscore character are treated spe-
- cially: the underlined text is displayed using the terminal's
- hardware underlining capability. Also, backspaces which appear
- between two identical characters are treated specially: the
- overstruck text is printed using the terminal's hardware bold-
- face capability. Other backspaces are deleted, along with the
- preceding character. Carriage returns immediately followed by a
- newline are deleted. Other carriage returns are handled as
- specified by the -r option. Text which is overstruck or under-
- lined can be searched for if neither -u nor -U is in effect.
-
- -V or --version
- Displays the version number of [4mless.[0m
-
- -w or --hilite-unread
- Temporarily highlights the first "new" line after a forward
- movement of a full page. The first "new" line is the line imme-
- diately following the line previously at the bottom of the
- screen. Also highlights the target line after a g or p command.
- The highlight is removed at the next command which causes move-
- ment. The entire line is highlighted, unless the -J option is
- in effect, in which case only the status column is highlighted.
-
- -W or --HILITE-UNREAD
- Like -w, but temporarily highlights the first new line after any
- forward movement command larger than one line.
-
- -x[4mn[24m,... or --tabs=[4mn[24m,...
- Sets tab stops. If only one [4mn[24m is specified, tab stops are set
- at multiples of [4mn[24m. If multiple values separated by commas are
- specified, tab stops are set at those positions, and then con-
- tinue with the same spacing as the last two. For example,
- [4m-x9,17[24m will set tabs at positions 9, 17, 25, 33, etc. The
- default for [4mn[24m is 8.
-
- -X or --no-init
- Disables sending the termcap initialization and deinitialization
- strings to the terminal. This is sometimes desirable if the
- deinitialization string does something unnecessary, like clear-
- ing the screen.
-
- -y[4mn[24m or --max-forw-scroll=[4mn[0m
- Specifies a maximum number of lines to scroll forward. If it is
- necessary to scroll forward more than [4mn[24m lines, the screen is
- repainted instead. The -c or -C option may be used to repaint
- from the top of the screen if desired. By default, any forward
- movement causes scrolling.
-
- -[z][4mn[24m or --window=[4mn[0m
- Changes the default scrolling window size to [4mn[24m lines. The
- default is one screenful. The z and w commands can also be used
- to change the window size. The "z" may be omitted for compati-
- bility with some versions of [4mmore.[24m If the number [4mn[24m is negative,
- it indicates [4mn[24m lines less than the current screen size. For
- example, if the screen is 24 lines, [4m-z-4[24m sets the scrolling win-
- dow to 20 lines. If the screen is resized to 40 lines, the
- scrolling window automatically changes to 36 lines.
-
- -[4m"cc[24m or --quotes=[4mcc[0m
- Changes the filename quoting character. This may be necessary
- if you are trying to name a file which contains both spaces and
- quote characters. Followed by a single character, this changes
- the quote character to that character. Filenames containing a
- space should then be surrounded by that character rather than by
- double quotes. Followed by two characters, changes the open
- quote to the first character, and the close quote to the second
- character. Filenames containing a space should then be preceded
- by the open quote character and followed by the close quote
- character. Note that even after the quote characters are
- changed, this option remains -" (a dash followed by a double
- quote).
-
- -~ or --tilde
- Normally lines after end of file are displayed as a single tilde
- (~). This option causes lines after end of file to be displayed
- as blank lines.
-
- -# or --shift
- Specifies the default number of positions to scroll horizontally
- in the RIGHTARROW and LEFTARROW commands. If the number speci-
- fied is zero, it sets the default number of positions to one
- half of the screen width. Alternately, the number may be speci-
- fied as a fraction of the width of the screen, starting with a
- decimal point: .5 is half of the screen width, .3 is three
- tenths of the screen width, and so on. If the number is speci-
- fied as a fraction, the actual number of scroll positions is
- recalculated if the terminal window is resized, so that the
- actual scroll remains at the specified fraction of the screen
- width.
-
- --follow-name
- Normally, if the input file is renamed while an F command is
- executing, [4mless[24m will continue to display the contents of the
- original file despite its name change. If --follow-name is
- specified, during an F command [4mless[24m will periodically attempt to
- reopen the file by name. If the reopen succeeds and the file is
- a different file from the original (which means that a new file
- has been created with the same name as the original (now
- renamed) file), [4mless[24m will display the contents of that new file.
-
- --no-keypad
- Disables sending the keypad initialization and deinitialization
- strings to the terminal. This is sometimes useful if the keypad
- strings make the numeric keypad behave in an undesirable manner.
-
- --use-backslash
- This option changes the interpretations of options which follow
- this one. After the --use-backslash option, any backslash in an
- option string is removed and the following character is taken
- literally. This allows a dollar sign to be included in option
- strings.
-
- -- A command line argument of "--" marks the end of option argu-
- ments. Any arguments following this are interpreted as file-
- names. This can be useful when viewing a file whose name begins
- with a "-" or "+".
-
- + If a command line option begins with [1m+[22m, the remainder of that
- option is taken to be an initial command to [4mless.[24m For example,
- +G tells [4mless[24m to start at the end of the file rather than the
- beginning, and +/xyz tells it to start at the first occurrence
- of "xyz" in the file. As a special case, +<number> acts like
- +<number>g; that is, it starts the display at the specified line
- number (however, see the caveat under the "g" command above).
- If the option starts with ++, the initial command applies to
- every file being viewed, not just the first one. The + command
- described previously may also be used to set (or change) an ini-
- tial command for every file.
-
-
-[1mLINE EDITING[0m
- When entering command line at the bottom of the screen (for example, a
- filename for the :e command, or the pattern for a search command), cer-
- tain keys can be used to manipulate the command line. Most commands
- have an alternate form in [ brackets ] which can be used if a key does
- not exist on a particular keyboard. (Note that the forms beginning
- with ESC do not work in some MS-DOS and Windows systems because ESC is
- the line erase character.) Any of these special keys may be entered
- literally by preceding it with the "literal" character, either ^V or
- ^A. A backslash itself may also be entered literally by entering two
- backslashes.
-
- LEFTARROW [ ESC-h ]
- Move the cursor one space to the left.
-
- RIGHTARROW [ ESC-l ]
- Move the cursor one space to the right.
-
- ^LEFTARROW [ ESC-b or ESC-LEFTARROW ]
- (That is, CONTROL and LEFTARROW simultaneously.) Move the cur-
- sor one word to the left.
-
- ^RIGHTARROW [ ESC-w or ESC-RIGHTARROW ]
- (That is, CONTROL and RIGHTARROW simultaneously.) Move the cur-
- sor one word to the right.
-
- HOME [ ESC-0 ]
- Move the cursor to the beginning of the line.
-
- END [ ESC-$ ]
- Move the cursor to the end of the line.
-
- BACKSPACE
- Delete the character to the left of the cursor, or cancel the
- command if the command line is empty.
-
- DELETE or [ ESC-x ]
- Delete the character under the cursor.
-
- ^BACKSPACE [ ESC-BACKSPACE ]
- (That is, CONTROL and BACKSPACE simultaneously.) Delete the
- word to the left of the cursor.
-
- ^DELETE [ ESC-X or ESC-DELETE ]
- (That is, CONTROL and DELETE simultaneously.) Delete the word
- under the cursor.
-
- UPARROW [ ESC-k ]
- Retrieve the previous command line. If you first enter some
- text and then press UPARROW, it will retrieve the previous com-
- mand which begins with that text.
-
- DOWNARROW [ ESC-j ]
- Retrieve the next command line. If you first enter some text
- and then press DOWNARROW, it will retrieve the next command
- which begins with that text.
-
- TAB Complete the partial filename to the left of the cursor. If it
- matches more than one filename, the first match is entered into
- the command line. Repeated TABs will cycle thru the other
- matching filenames. If the completed filename is a directory, a
- "/" is appended to the filename. (On MS-DOS systems, a "\" is
- appended.) The environment variable LESSSEPARATOR can be used
- to specify a different character to append to a directory name.
-
- BACKTAB [ ESC-TAB ]
- Like, TAB, but cycles in the reverse direction thru the matching
- filenames.
-
- ^L Complete the partial filename to the left of the cursor. If it
- matches more than one filename, all matches are entered into the
- command line (if they fit).
-
- ^U (Unix and OS/2) or ESC (MS-DOS)
- Delete the entire command line, or cancel the command if the
- command line is empty. If you have changed your line-kill char-
- acter in Unix to something other than ^U, that character is used
- instead of ^U.
-
- ^G Delete the entire command line and return to the main prompt.
-
-
-[1mKEY BINDINGS[0m
- You may define your own [4mless[24m commands by using the program [4mlesskey[24m (1)
- to create a lesskey file. This file specifies a set of command keys
- and an action associated with each key. You may also use [4mlesskey[24m to
- change the line-editing keys (see LINE EDITING), and to set environment
- variables. If the environment variable LESSKEY is set, [4mless[24m uses that
- as the name of the lesskey file. Otherwise, [4mless[24m looks in a standard
- place for the lesskey file: On Unix systems, [4mless[24m looks for a lesskey
- file called "$HOME/.less". On MS-DOS and Windows systems, [4mless[24m looks
- for a lesskey file called "$HOME/_less", and if it is not found there,
- then looks for a lesskey file called "_less" in any directory specified
- in the PATH environment variable. On OS/2 systems, [4mless[24m looks for a
- lesskey file called "$HOME/less.ini", and if it is not found, then
- looks for a lesskey file called "less.ini" in any directory specified
- in the INIT environment variable, and if it not found there, then looks
- for a lesskey file called "less.ini" in any directory specified in the
- PATH environment variable. See the [4mlesskey[24m manual page for more
- details.
-
- A system-wide lesskey file may also be set up to provide key bindings.
- If a key is defined in both a local lesskey file and in the system-wide
- file, key bindings in the local file take precedence over those in the
- system-wide file. If the environment variable LESSKEY_SYSTEM is set,
- [4mless[24m uses that as the name of the system-wide lesskey file. Otherwise,
- [4mless[24m looks in a standard place for the system-wide lesskey file: On
- Unix systems, the system-wide lesskey file is /usr/local/etc/sysless.
- (However, if [4mless[24m was built with a different sysconf directory than
- /usr/local/etc, that directory is where the sysless file is found.) On
- MS-DOS and Windows systems, the system-wide lesskey file is c:\_sys-
- less. On OS/2 systems, the system-wide lesskey file is c:\sysless.ini.
-
-
-[1mINPUT PREPROCESSOR[0m
- You may define an "input preprocessor" for [4mless.[24m Before [4mless[24m opens a
- file, it first gives your input preprocessor a chance to modify the way
- the contents of the file are displayed. An input preprocessor is sim-
- ply an executable program (or shell script), which writes the contents
- of the file to a different file, called the replacement file. The con-
- tents of the replacement file are then displayed in place of the con-
- tents of the original file. However, it will appear to the user as if
- the original file is opened; that is, [4mless[24m will display the original
- filename as the name of the current file.
-
- An input preprocessor receives one command line argument, the original
- filename, as entered by the user. It should create the replacement
- file, and when finished, print the name of the replacement file to its
- standard output. If the input preprocessor does not output a replace-
- ment filename, [4mless[24m uses the original file, as normal. The input pre-
- processor is not called when viewing standard input. To set up an
- input preprocessor, set the LESSOPEN environment variable to a command
- line which will invoke your input preprocessor. This command line
- should include one occurrence of the string "%s", which will be
- replaced by the filename when the input preprocessor command is
- invoked.
-
- When [4mless[24m closes a file opened in such a way, it will call another pro-
- gram, called the input postprocessor, which may perform any desired
- clean-up action (such as deleting the replacement file created by
- LESSOPEN). This program receives two command line arguments, the orig-
- inal filename as entered by the user, and the name of the replacement
- file. To set up an input postprocessor, set the LESSCLOSE environment
- variable to a command line which will invoke your input postprocessor.
- It may include two occurrences of the string "%s"; the first is
- replaced with the original name of the file and the second with the
- name of the replacement file, which was output by LESSOPEN.
-
- For example, on many Unix systems, these two scripts will allow you to
- keep files in compressed format, but still let [4mless[24m view them directly:
-
- lessopen.sh:
- #! /bin/sh
- case "$1" in
- *.Z) uncompress -
- if [ -s /tmp/less.$$ ]; then
- echo /tmp/less.$$
- else
- rm -f /tmp/less.$$
- fi
- ;;
- esac
-
- lessclose.sh:
- #! /bin/sh
- rm $2
-
- To use these scripts, put them both where they can be executed and set
- LESSOPEN="lessopen.sh %s", and LESSCLOSE="lessclose.sh %s %s". More
- complex LESSOPEN and LESSCLOSE scripts may be written to accept other
- types of compressed files, and so on.
-
- It is also possible to set up an input preprocessor to pipe the file
- data directly to [4mless,[24m rather than putting the data into a replacement
- file. This avoids the need to decompress the entire file before start-
- ing to view it. An input preprocessor that works this way is called an
- input pipe. An input pipe, instead of writing the name of a replace-
- ment file on its standard output, writes the entire contents of the
- replacement file on its standard output. If the input pipe does not
- write any characters on its standard output, then there is no replace-
- ment file and [4mless[24m uses the original file, as normal. To use an input
- pipe, make the first character in the LESSOPEN environment variable a
- vertical bar (|) to signify that the input preprocessor is an input
- pipe.
-
- For example, on many Unix systems, this script will work like the pre-
- vious example scripts:
-
- lesspipe.sh:
- #! /bin/sh
- case "$1" in
- *.Z) uncompress -c $1 2>/dev/null
- *) exit 1
- ;;
- esac
- exit $?
-
- To use this script, put it where it can be executed and set
- LESSOPEN="|lesspipe.sh %s".
-
- Note that a preprocessor cannot output an empty file, since that is
- interpreted as meaning there is no replacement, and the original file
- is used. To avoid this, if LESSOPEN starts with two vertical bars, the
- exit status of the script becomes meaningful. If the exit status is
- zero, the output is considered to be replacement text, even if it
- empty. If the exit status is nonzero, any output is ignored and the
- original file is used. For compatibility with previous versions of
- [4mless,[24m if LESSOPEN starts with only one vertical bar, the exit status of
- the preprocessor is ignored.
-
- When an input pipe is used, a LESSCLOSE postprocessor can be used, but
- it is usually not necessary since there is no replacement file to clean
- up. In this case, the replacement file name passed to the LESSCLOSE
- postprocessor is "-".
-
- For compatibility with previous versions of [4mless,[24m the input preproces-
- sor or pipe is not used if [4mless[24m is viewing standard input. However, if
- the first character of LESSOPEN is a dash (-), the input preprocessor
- is used on standard input as well as other files. In this case, the
- dash is not considered to be part of the preprocessor command. If
- standard input is being viewed, the input preprocessor is passed a file
- name consisting of a single dash. Similarly, if the first two charac-
- ters of LESSOPEN are vertical bar and dash (|-) or two vertical bars
- and a dash (||-), the input pipe is used on standard input as well as
- other files. Again, in this case the dash is not considered to be part
- of the input pipe command.
-
-
-[1mNATIONAL CHARACTER SETS[0m
- There are three types of characters in the input file:
-
- normal characters
- can be displayed directly to the screen.
-
- control characters
- should not be displayed directly, but are expected to be found
- in ordinary text files (such as backspace and tab).
-
- binary characters
- should not be displayed directly and are not expected to be
- found in text files.
-
- A "character set" is simply a description of which characters are to be
- considered normal, control, and binary. The LESSCHARSET environment
- variable may be used to select a character set. Possible values for
- LESSCHARSET are:
-
- ascii BS, TAB, NL, CR, and formfeed are control characters, all chars
- with values between 32 and 126 are normal, and all others are
- binary.
-
- iso8859
- Selects an ISO 8859 character set. This is the same as ASCII,
- except characters between 160 and 255 are treated as normal
- characters.
-
- latin1 Same as iso8859.
-
- latin9 Same as iso8859.
-
- dos Selects a character set appropriate for MS-DOS.
-
- ebcdic Selects an EBCDIC character set.
-
- IBM-1047
- Selects an EBCDIC character set used by OS/390 Unix Services.
- This is the EBCDIC analogue of latin1. You get similar results
- by setting either LESSCHARSET=IBM-1047 or LC_CTYPE=en_US in your
- environment.
-
- koi8-r Selects a Russian character set.
-
- next Selects a character set appropriate for NeXT computers.
-
- utf-8 Selects the UTF-8 encoding of the ISO 10646 character set.
- UTF-8 is special in that it supports multi-byte characters in
- the input file. It is the only character set that supports
- multi-byte characters.
-
- windows
- Selects a character set appropriate for Microsoft Windows (cp
- 1251).
-
- In rare cases, it may be desired to tailor [4mless[24m to use a character set
- other than the ones definable by LESSCHARSET. In this case, the envi-
- ronment variable LESSCHARDEF can be used to define a character set. It
- should be set to a string where each character in the string represents
- one character in the character set. The character "." is used for a
- normal character, "c" for control, and "b" for binary. A decimal num-
- ber may be used for repetition. For example, "bccc4b." would mean
- character 0 is binary, 1, 2 and 3 are control, 4, 5, 6 and 7 are
- binary, and 8 is normal. All characters after the last are taken to be
- the same as the last, so characters 9 through 255 would be normal.
- (This is an example, and does not necessarily represent any real char-
- acter set.)
-
- This table shows the value of LESSCHARDEF which is equivalent to each
- of the possible values for LESSCHARSET:
-
- ascii 8bcccbcc18b95.b
- dos 8bcccbcc12bc5b95.b.
- ebcdic 5bc6bcc7bcc41b.9b7.9b5.b..8b6.10b6.b9.7b
- 9.8b8.17b3.3b9.7b9.8b8.6b10.b.b.b.
- IBM-1047 4cbcbc3b9cbccbccbb4c6bcc5b3cbbc4bc4bccbc
- 191.b
- iso8859 8bcccbcc18b95.33b.
- koi8-r 8bcccbcc18b95.b128.
- latin1 8bcccbcc18b95.33b.
- next 8bcccbcc18b95.bb125.bb
-
- If neither LESSCHARSET nor LESSCHARDEF is set, but any of the strings
- "UTF-8", "UTF8", "utf-8" or "utf8" is found in the LC_ALL, LC_CTYPE or
- LANG environment variables, then the default character set is utf-8.
-
- If that string is not found, but your system supports the [4msetlocale[0m
- interface, [4mless[24m will use setlocale to determine the character set.
- setlocale is controlled by setting the LANG or LC_CTYPE environment
- variables.
-
- Finally, if the [4msetlocale[24m interface is also not available, the default
- character set is latin1.
-
- Control and binary characters are displayed in standout (reverse
- video). Each such character is displayed in caret notation if possible
- (e.g. ^A for control-A). Caret notation is used only if inverting the
- 0100 bit results in a normal printable character. Otherwise, the char-
- acter is displayed as a hex number in angle brackets. This format can
- be changed by setting the LESSBINFMT environment variable. LESSBINFMT
- may begin with a "*" and one character to select the display attribute:
- "*k" is blinking, "*d" is bold, "*u" is underlined, "*s" is standout,
- and "*n" is normal. If LESSBINFMT does not begin with a "*", normal
- attribute is assumed. The remainder of LESSBINFMT is a string which
- may include one printf-style escape sequence (a % followed by x, X, o,
- d, etc.). For example, if LESSBINFMT is "*u[%x]", binary characters
- are displayed in underlined hexadecimal surrounded by brackets. The
- default if no LESSBINFMT is specified is "*s<%02X>". Warning: the
- result of expanding the character via LESSBINFMT must be less than 31
- characters.
-
- When the character set is utf-8, the LESSUTFBINFMT environment variable
- acts similarly to LESSBINFMT but it applies to Unicode code points that
- were successfully decoded but are unsuitable for display (e.g., unas-
- signed code points). Its default value is "<U+%04lX>". Note that
- LESSUTFBINFMT and LESSBINFMT share their display attribute setting
- ("*x") so specifying one will affect both; LESSUTFBINFMT is read after
- LESSBINFMT so its setting, if any, will have priority. Problematic
- octets in a UTF-8 file (octets of a truncated sequence, octets of a
- complete but non-shortest form sequence, illegal octets, and stray
- trailing octets) are displayed individually using LESSBINFMT so as to
- facilitate diagnostic of how the UTF-8 file is ill-formed.
-
-
-[1mPROMPTS[0m
- The -P option allows you to tailor the prompt to your preference. The
- string given to the -P option replaces the specified prompt string.
- Certain characters in the string are interpreted specially. The prompt
- mechanism is rather complicated to provide flexibility, but the ordi-
- nary user need not understand the details of constructing personalized
- prompt strings.
-
- A percent sign followed by a single character is expanded according to
- what the following character is:
-
- %b[4mX[24m Replaced by the byte offset into the current input file. The b
- is followed by a single character (shown as [4mX[24m above) which spec-
- ifies the line whose byte offset is to be used. If the charac-
- ter is a "t", the byte offset of the top line in the display is
- used, an "m" means use the middle line, a "b" means use the bot-
- tom line, a "B" means use the line just after the bottom line,
- and a "j" means use the "target" line, as specified by the -j
- option.
-
- %B Replaced by the size of the current input file.
-
- %c Replaced by the column number of the text appearing in the first
- column of the screen.
-
- %d[4mX[24m Replaced by the page number of a line in the input file. The
- line to be used is determined by the [4mX[24m, as with the %b option.
-
- %D Replaced by the number of pages in the input file, or equiva-
- lently, the page number of the last line in the input file.
-
- %E Replaced by the name of the editor (from the VISUAL environment
- variable, or the EDITOR environment variable if VISUAL is not
- defined). See the discussion of the LESSEDIT feature below.
-
- %f Replaced by the name of the current input file.
-
- %F Replaced by the last component of the name of the current input
- file.
-
- %i Replaced by the index of the current file in the list of input
- files.
-
- %l[4mX[24m Replaced by the line number of a line in the input file. The
- line to be used is determined by the [4mX[24m, as with the %b option.
-
- %L Replaced by the line number of the last line in the input file.
-
- %m Replaced by the total number of input files.
-
- %p[4mX[24m Replaced by the percent into the current input file, based on
- byte offsets. The line used is determined by the [4mX[24m as with the
- %b option.
-
- %P[4mX[24m Replaced by the percent into the current input file, based on
- line numbers. The line used is determined by the [4mX[24m as with the
- %b option.
-
- %s Same as %B.
-
- %t Causes any trailing spaces to be removed. Usually used at the
- end of the string, but may appear anywhere.
-
- %x Replaced by the name of the next input file in the list.
-
- If any item is unknown (for example, the file size if input is a pipe),
- a question mark is printed instead.
-
- The format of the prompt string can be changed depending on certain
- conditions. A question mark followed by a single character acts like
- an "IF": depending on the following character, a condition is evalu-
- ated. If the condition is true, any characters following the question
- mark and condition character, up to a period, are included in the
- prompt. If the condition is false, such characters are not included.
- A colon appearing between the question mark and the period can be used
- to establish an "ELSE": any characters between the colon and the period
- are included in the string if and only if the IF condition is false.
- Condition characters (which follow a question mark) may be:
-
- ?a True if any characters have been included in the prompt so far.
-
- ?b[4mX[24m True if the byte offset of the specified line is known.
-
- ?B True if the size of current input file is known.
-
- ?c True if the text is horizontally shifted (%c is not zero).
-
- ?d[4mX[24m True if the page number of the specified line is known.
-
- ?e True if at end-of-file.
-
- ?f True if there is an input filename (that is, if input is not a
- pipe).
-
- ?l[4mX[24m True if the line number of the specified line is known.
-
- ?L True if the line number of the last line in the file is known.
-
- ?m True if there is more than one input file.
-
- ?n True if this is the first prompt in a new input file.
-
- ?p[4mX[24m True if the percent into the current input file, based on byte
- offsets, of the specified line is known.
-
- ?P[4mX[24m True if the percent into the current input file, based on line
- numbers, of the specified line is known.
-
- ?s Same as "?B".
-
- ?x True if there is a next input file (that is, if the current
- input file is not the last one).
-
- Any characters other than the special ones (question mark, colon,
- period, percent, and backslash) become literally part of the prompt.
- Any of the special characters may be included in the prompt literally
- by preceding it with a backslash.
-
- Some examples:
-
- ?f%f:Standard input.
-
- This prompt prints the filename, if known; otherwise the string "Stan-
- dard input".
-
- ?f%f .?ltLine %lt:?pt%pt\%:?btByte %bt:-...
-
- This prompt would print the filename, if known. The filename is fol-
- lowed by the line number, if known, otherwise the percent if known,
- otherwise the byte offset if known. Otherwise, a dash is printed.
- Notice how each question mark has a matching period, and how the %
- after the %pt is included literally by escaping it with a backslash.
-
- ?n?f%f .?m(file %i of %m) ..?e(END) ?x- Next\: %x..%t
-
- This prints the filename if this is the first prompt in a file, fol-
- lowed by the "file N of N" message if there is more than one input
- file. Then, if we are at end-of-file, the string "(END)" is printed
- followed by the name of the next file, if there is one. Finally, any
- trailing spaces are truncated. This is the default prompt. For refer-
- ence, here are the defaults for the other two prompts (-m and -M
- respectively). Each is broken into two lines here for readability
- only.
-
- ?n?f%f .?m(file %i of %m) ..?e(END) ?x- Next\: %x.:
- ?pB%pB\%:byte %bB?s/%s...%t
-
- ?f%f .?n?m(file %i of %m) ..?ltlines %lt-%lb?L/%L. :
- byte %bB?s/%s. .?e(END) ?x- Next\: %x.:?pB%pB\%..%t
-
- And here is the default message produced by the = command:
-
- ?f%f .?m(file %i of %m) .?ltlines %lt-%lb?L/%L. .
- byte %bB?s/%s. ?e(END) :?pB%pB\%..%t
-
- The prompt expansion features are also used for another purpose: if an
- environment variable LESSEDIT is defined, it is used as the command to
- be executed when the v command is invoked. The LESSEDIT string is
- expanded in the same way as the prompt strings. The default value for
- LESSEDIT is:
-
- %E ?lm+%lm. %f
-
- Note that this expands to the editor name, followed by a + and the line
- number, followed by the file name. If your editor does not accept the
- "+linenumber" syntax, or has other differences in invocation syntax,
- the LESSEDIT variable can be changed to modify this default.
-
-
-[1mSECURITY[0m
- When the environment variable LESSSECURE is set to 1, [4mless[24m runs in a
- "secure" mode. This means these features are disabled:
-
- ! the shell command
-
- | the pipe command
-
- :e the examine command.
-
- v the editing command
-
- s -o log files
-
- -k use of lesskey files
-
- -t use of tags files
-
- metacharacters in filenames, such as *
-
- filename completion (TAB, ^L)
-
- Less can also be compiled to be permanently in "secure" mode.
-
-
-[1mCOMPATIBILITY WITH MORE[0m
- If the environment variable LESS_IS_MORE is set to 1, or if the program
- is invoked via a file link named "more", [4mless[24m behaves (mostly) in con-
- formance with the POSIX "more" command specification. In this mode,
- less behaves differently in these ways:
-
- The -e option works differently. If the -e option is not set, [4mless[0m
- behaves as if the -E option were set. If the -e option is set, [4mless[0m
- behaves as if the -e and -F options were set.
-
- The -m option works differently. If the -m option is not set, the
- medium prompt is used, and it is prefixed with the string "--More--".
- If the -m option is set, the short prompt is used.
-
- The -n option acts like the -z option. The normal behavior of the -n
- option is unavailable in this mode.
-
- The parameter to the -p option is taken to be a [4mless[24m command rather
- than a search pattern.
-
- The LESS environment variable is ignored, and the MORE environment
- variable is used in its place.
-
-
-[1mENVIRONMENT VARIABLES[0m
- Environment variables may be specified either in the system environment
- as usual, or in a [4mlesskey[24m (1) file. If environment variables are
- defined in more than one place, variables defined in a local lesskey
- file take precedence over variables defined in the system environment,
- which take precedence over variables defined in the system-wide lesskey
- file.
-
- COLUMNS
- Sets the number of columns on the screen. Takes precedence over
- the number of columns specified by the TERM variable. (But if
- you have a windowing system which supports TIOCGWINSZ or
- WIOCGETD, the window system's idea of the screen size takes
- precedence over the LINES and COLUMNS environment variables.)
-
- EDITOR The name of the editor (used for the v command).
-
- HOME Name of the user's home directory (used to find a lesskey file
- on Unix and OS/2 systems).
-
- HOMEDRIVE, HOMEPATH
- Concatenation of the HOMEDRIVE and HOMEPATH environment vari-
- ables is the name of the user's home directory if the HOME vari-
- able is not set (only in the Windows version).
-
- INIT Name of the user's init directory (used to find a lesskey file
- on OS/2 systems).
-
- LANG Language for determining the character set.
-
- LC_CTYPE
- Language for determining the character set.
-
- LESS Options which are passed to [4mless[24m automatically.
-
- LESSANSIENDCHARS
- Characters which may end an ANSI color escape sequence (default
- "m").
-
- LESSANSIMIDCHARS
- Characters which may appear between the ESC character and the
- end character in an ANSI color escape sequence (default
- "0123456789;[?!"'#%()*+ ".
-
- LESSBINFMT
- Format for displaying non-printable, non-control characters.
-
- LESSCHARDEF
- Defines a character set.
-
- LESSCHARSET
- Selects a predefined character set.
-
- LESSCLOSE
- Command line to invoke the (optional) input-postprocessor.
-
- LESSECHO
- Name of the lessecho program (default "lessecho"). The lessecho
- program is needed to expand metacharacters, such as * and ?, in
- filenames on Unix systems.
-
- LESSEDIT
- Editor prototype string (used for the v command). See discus-
- sion under PROMPTS.
-
- LESSGLOBALTAGS
- Name of the command used by the -t option to find global tags.
- Normally should be set to "global" if your system has the [4mglobal[0m
- (1) command. If not set, global tags are not used.
-
- LESSHISTFILE
- Name of the history file used to remember search commands and
- shell commands between invocations of [4mless.[24m If set to "-" or
- "/dev/null", a history file is not used. The default is
- "$HOME/.lesshst" on Unix systems, "$HOME/_lesshst" on DOS and
- Windows systems, or "$HOME/lesshst.ini" or "$INIT/lesshst.ini"
- on OS/2 systems.
-
- LESSHISTSIZE
- The maximum number of commands to save in the history file. The
- default is 100.
-
- LESSKEY
- Name of the default lesskey(1) file.
-
- LESSKEY_SYSTEM
- Name of the default system-wide lesskey(1) file.
-
- LESSMETACHARS
- List of characters which are considered "metacharacters" by the
- shell.
-
- LESSMETAESCAPE
- Prefix which less will add before each metacharacter in a com-
- mand sent to the shell. If LESSMETAESCAPE is an empty string,
- commands containing metacharacters will not be passed to the
- shell.
-
- LESSOPEN
- Command line to invoke the (optional) input-preprocessor.
-
- LESSSECURE
- Runs less in "secure" mode. See discussion under SECURITY.
-
- LESSSEPARATOR
- String to be appended to a directory name in filename comple-
- tion.
-
- LESSUTFBINFMT
- Format for displaying non-printable Unicode code points.
-
- LESS_IS_MORE
- Emulate the [4mmore[24m (1) command.
-
- LINES Sets the number of lines on the screen. Takes precedence over
- the number of lines specified by the TERM variable. (But if you
- have a windowing system which supports TIOCGWINSZ or WIOCGETD,
- the window system's idea of the screen size takes precedence
- over the LINES and COLUMNS environment variables.)
-
- MORE Options which are passed to [4mless[24m automatically when running in
- [4mmore[24m compatible mode.
-
- PATH User's search path (used to find a lesskey file on MS-DOS and
- OS/2 systems).
-
- SHELL The shell used to execute the ! command, as well as to expand
- filenames.
-
- TERM The type of terminal on which [4mless[24m is being run.
-
- VISUAL The name of the editor (used for the v command).
-
-
-[1mSEE ALSO[0m
- lesskey(1)
-
-
-[1mCOPYRIGHT[0m
- Copyright (C) 1984-2012 Mark Nudelman
-
- less is part of the GNU project and is free software. You can redis-
- tribute it and/or modify it under the terms of either (1) the GNU Gen-
- eral Public License as published by the Free Software Foundation; or
- (2) the Less License. See the file README in the less distribution for
- more details regarding redistribution. You should have received a copy
- of the GNU General Public License along with the source for less; see
- the file COPYING. If not, write to the Free Software Foundation, 59
- Temple Place, Suite 330, Boston, MA 02111-1307, USA. You should also
- have received a copy of the Less License; see the file LICENSE.
-
- less is distributed in the hope that it will be useful, but WITHOUT ANY
- WARRANTY; without even the implied warranty of MERCHANTABILITY or FIT-
- NESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- more details.
-
-
-[1mAUTHOR[0m
- Mark Nudelman
- Send bug reports or comments to <bug-less at gnu.org>
- See http://www.greenwoodsoftware.com/less/bugs.html for the latest list
- of known bugs in less.
- For more information, see the less homepage at
- http://www.greenwoodsoftware.com/less.
-
-
-
- Version 458: 04 Apr 2013 LESS(1)
Modified: trunk/contrib/less/less.nro
===================================================================
--- trunk/contrib/less/less.nro 2018-07-06 12:43:22 UTC (rev 11361)
+++ trunk/contrib/less/less.nro 2018-07-06 12:46:07 UTC (rev 11362)
@@ -1,4 +1,4 @@
-.TH LESS 1 "Version 458: 04 Apr 2013"
+.TH LESS 1 "Version 530: 05 Dec 2017"
.SH NAME
less \- opposite of more
.SH SYNOPSIS
@@ -12,19 +12,19 @@
.br
.B "less [\-[+]aABcCdeEfFgGiIJKLmMnNqQrRsSuUVwWX~]"
.br
-.B " [\-b \fIspace\fP] [\-h \fIlines\fP] [\-j \fIline\fP] [\-k \fIkeyfile\fP]"
+.B " [\-b \fIspace\/\fP] [\-h \fIlines\/\fP] [\-j \fIline\/\fP] [\-k \fIkeyfile\/\fP]"
.br
-.B " [\-{oO} \fIlogfile\fP] [\-p \fIpattern\fP] [\-P \fIprompt\fP] [\-t \fItag\fP]"
+.B " [\-{oO} \fIlogfile\/\fP] [\-p \fIpattern\/\fP] [\-P \fIprompt\/\fP] [\-t \fItag\/\fP]"
.br
-.B " [\-T \fItagsfile\fP] [\-x \fItab\fP,...] [\-y \fIlines\fP] [\-[z] \fIlines\fP]"
+.B " [\-T \fItagsfile\/\fP] [\-x \fItab\/\fP,...] [\-y \fIlines\/\fP] [\-[z] \fIlines\/\fP]"
.br
-.B " [\-# \fIshift\fP] [+[+]\fIcmd\fP] [\-\-] [\fIfilename\fP]..."
+.B " [\-# \fIshift\/\fP] [+[+]\fIcmd\/\fP] [\-\-] [\fIfilename\/\fP]..."
.br
(See the OPTIONS section for alternate option syntax with long option names.)
.SH DESCRIPTION
.I Less
-is a program similar to
+is a program similar to
.I more
(1), but which allows backward movement
in the file as well as forward movement.
@@ -44,8 +44,8 @@
Commands are based on both
.I more
and
-.I vi.
-Commands may be preceded by a decimal number,
+.IR vi .
+Commands may be preceded by a decimal number,
called N in the descriptions below.
The number is used by some commands, as indicated.
@@ -70,7 +70,7 @@
The entire N lines are displayed, even if N is more than the screen size.
.IP "d or ^D"
Scroll forward N lines, default one half of the screen size.
-If N is specified, it becomes the new default for
+If N is specified, it becomes the new default for
subsequent d and u commands.
.IP "b or ^B or ESC-v"
Scroll backward N lines, default one window (see option \-z below).
@@ -83,8 +83,12 @@
Warning: some systems use ^Y as a special job control character.
.IP "u or ^U"
Scroll backward N lines, default one half of the screen size.
-If N is specified, it becomes the new default for
+If N is specified, it becomes the new default for
subsequent d and u commands.
+.IP "J"
+Like j, but continues to scroll beyond the end of the file.
+.IP "K or Y"
+Like k, but continues to scroll beyond the beginning of the file.
.IP "ESC-) or RIGHTARROW"
Scroll horizontally right N characters, default half the screen width
(see the \-# option).
@@ -97,6 +101,10 @@
(see the \-# option).
If a number N is specified, it becomes the default for future RIGHTARROW
and LEFTARROW commands.
+.IP "ESC-} or ^RIGHTARROW"
+Scroll horizontally right to show the end of the longest displayed line.
+.IP "ESC-{ or ^LEFTARROW"
+Scroll horizontally left back to the first column.
.IP "r or ^R or ^L"
Repaint the screen.
.IP R
@@ -111,7 +119,7 @@
(The behavior is similar to the "tail \-f" command.)
.IP "ESC-F"
Like F, but as soon as a line is found which matches
-the last search pattern, the terminal bell is rung
+the last search pattern, the terminal bell is rung
and forward scrolling stops.
.IP "g or < or ESC-<"
Go to line N in the file, default 1 (beginning of file).
@@ -121,6 +129,9 @@
(Warning: this may be slow if N is large,
or if N is not specified and
standard input, rather than a file, is being read.)
+.IP "ESC-G"
+Same as G, except if no number N is specified and the input is standard input,
+goes to the last line which is currently buffered.
.IP "p or %"
Go to a position N percent into the file.
N should be between 0 and 100, and may contain a decimal point.
@@ -154,20 +165,25 @@
Followed by two characters,
acts like {, but uses the two characters as open and close brackets,
respectively.
-For example, "ESC ^F < >" could be used to
+For example, "ESC ^F < >" could be used to
go forward to the > which matches the < in the top displayed line.
.IP "ESC-^B"
Followed by two characters,
acts like }, but uses the two characters as open and close brackets,
respectively.
-For example, "ESC ^B < >" could be used to
+For example, "ESC ^B < >" could be used to
go backward to the < which matches the > in the bottom displayed line.
.IP m
-Followed by any lowercase letter,
-marks the current position with that letter.
+Followed by any lowercase or uppercase letter,
+marks the first displayed line with that letter.
+If the status column is enabled via the \-J option,
+the status column shows the marked line.
+.IP M
+Acts like m, except the last displayed line is marked
+rather than the first displayed line.
.IP "'"
(Single quote.)
-Followed by any lowercase letter, returns to the position which
+Followed by any lowercase or uppercase letter, returns to the position which
was previously marked with that letter.
Followed by another single quote, returns to the position at
which the last "large" movement command was executed.
@@ -177,6 +193,9 @@
so the ' command can be used to switch between input files.
.IP "^X^X"
Same as single quote.
+.IP "ESC-m"
+Followed by any lowercase or uppercase letter,
+clears the mark identified by that letter.
.IP /pattern
Search forward in the file for the N-th line containing the pattern.
N defaults to 1.
@@ -193,7 +212,7 @@
Search for lines which do NOT match the pattern.
.IP "^E or *"
Search multiple files.
-That is, if the search reaches the END of the current file
+That is, if the search reaches the END of the current file
without finding a match,
the search continues in the next file in the command line list.
.IP "^F or @"
@@ -202,7 +221,7 @@
regardless of what is currently displayed on the screen
or the settings of the \-a or \-j options.
.IP "^K"
-Highlight any text which matches the pattern on the current screen,
+Highlight any text which matches the pattern on the current screen,
but don't move to the first match (KEEP current position).
.IP "^R"
Don't interpret regular expression metacharacters;
@@ -210,7 +229,8 @@
.RE
.IP ?pattern
Search backward in the file for the N-th line containing the pattern.
-The search starts at the line immediately before the top line displayed.
+The search starts at the last line displayed
+(but see the \-a and \-j options, which change this).
.sp
Certain characters are special as in the / command:
.RS
@@ -218,7 +238,7 @@
Search for lines which do NOT match the pattern.
.IP "^E or *"
Search multiple files.
-That is, if the search reaches the beginning of the current file
+That is, if the search reaches the beginning of the current file
without finding a match,
the search continues in the previous file in the command line list.
.IP "^F or @"
@@ -254,7 +274,7 @@
and crossing file boundaries.
.IP "ESC-u"
Undo search highlighting.
-Turn off highlighting of strings matching the current search pattern.
+Turn off highlighting of strings matching the current search pattern.
If highlighting is already off because of a previous ESC-u command,
turn highlighting back on.
Any search command will also turn highlighting back on.
@@ -282,10 +302,10 @@
If the filename is missing, the "current" file (see the :n and :p commands
below) from the list of files in the command line is re-examined.
A percent sign (%) in the filename is replaced by the name of the
-current file.
+current file.
A pound sign (#) is replaced by the name of the previously examined file.
-However, two consecutive percent signs are simply
-replaced with a single percent sign.
+However, two consecutive percent signs are simply
+replaced with a single percent sign.
This allows you to enter a filename that contains a percent sign
in the name.
Similarly, two consecutive pound signs are replaced with a single pound sign.
@@ -338,7 +358,7 @@
Like the \- command, but takes a long option name (see OPTIONS below)
rather than a single option letter.
You must press ENTER or RETURN after typing the option name.
-A ^P immediately after the second dash suppresses printing of a
+A ^P immediately after the second dash suppresses printing of a
message describing the new setting, as in the \- command.
.IP \-+
Followed by one of the command line option letters
@@ -370,19 +390,19 @@
You must press ENTER or RETURN after typing the option name.
.IP +cmd
Causes the specified cmd to be executed each time a new file is examined.
-For example, +G causes
+For example, +G causes
.I less
-to initially display each file starting at the end
+to initially display each file starting at the end
rather than the beginning.
.IP V
-Prints the version number of
-.I less
+Prints the version number of
+.I less
being run.
.IP "q or Q or :q or :Q or ZZ"
Exits
-.I less.
+.IR less .
.PP
-The following
+The following
four
commands may or may not be valid, depending on your particular installation.
.PP
@@ -395,7 +415,7 @@
.IP "! shell-command"
Invokes a shell to run the shell-command given.
A percent sign (%) in the command is replaced by the name of the
-current file.
+current file.
A pound sign (#) is replaced by the name of the previously examined file.
"!!" repeats the last shell command.
"!" with no shell command simply invokes a shell.
@@ -405,10 +425,12 @@
.IP "| <m> shell-command"
<m> represents any mark letter.
Pipes a section of the input file to the given shell command.
-The section of the file to be piped is between the first line on
-the current screen and the position marked by the letter.
+The section of the file to be piped is between the position marked by
+the letter and the current screen.
+The entire current screen is included, regardless of whether the
+marked position is before or after the current screen.
<m> may also be ^ or $ to indicate beginning or end of file respectively.
-If <m> is . or newline, the current screen is piped.
+If <m> is \&.\& or newline, the current screen is piped.
.IP "s filename"
Save the input to a file.
This only works if the input is a pipe, not an ordinary file.
@@ -416,16 +438,16 @@
.SH OPTIONS
Command line options are described below.
Most options may be changed while
-.I less
+.I less
is running, via the "\-" command.
.PP
-Most options may be given in one of two forms:
+Most options may be given in one of two forms:
either a dash followed by a single letter,
or two dashes followed by a long option name.
A long option name may be abbreviated as long as
the abbreviation is unambiguous.
For example, \-\-quit-at-eof may be abbreviated \-\-quit, but not
---qui, since both \-\-quit-at-eof and \-\-quiet begin with \-\-qui.
+\-\-qui, since both \-\-quit-at-eof and \-\-quiet begin with \-\-qui.
Some long option names are in uppercase, such as \-\-QUIT-AT-EOF, as
distinct from \-\-quit-at-eof.
Such option names need only have their first letter capitalized;
@@ -433,20 +455,20 @@
For example, \-\-Quit-at-eof is equivalent to \-\-QUIT-AT-EOF.
.PP
Options are also taken from the environment variable "LESS".
-For example,
-to avoid typing "less \-options ..." each time
-.I less
-is invoked, you might tell
-.I csh:
+For example,
+to avoid typing "less \-options \&...\&" each time
+.I less
+is invoked, you might tell
+.IR csh :
.sp
-setenv LESS "-options"
+setenv LESS "\-options"
.sp
-or if you use
-.I sh:
+or if you use
+.IR sh :
.sp
-LESS="-options"; export LESS
+LESS="\-options"; export LESS
.sp
-On MS-DOS, you don't need the quotes, but you should replace any
+On MS-DOS, you don't need the quotes, but you should replace any
percent signs in the options string by double percent signs.
.sp
The environment variable is parsed before the command line,
@@ -461,11 +483,11 @@
.sp
LESS="Dn9.1$Ds4.1"
.sp
-If the --use-backslash option appears earlier in the options, then
+If the \-\-use-backslash option appears earlier in the options, then
a dollar sign or backslash may be included literally in an option string
by preceding it with a backslash.
-If the --use-backslash option is not in effect, then backslashes are
-not treated specially, and there is no way to include a dollar sign
+If the \-\-use-backslash option is not in effect, then backslashes are
+not treated specially, and there is no way to include a dollar sign
in the option string.
.IP "\-? or \-\-help"
This option displays a summary of the commands accepted by
@@ -484,8 +506,8 @@
and backward searches to start at the top of the screen,
thus skipping all lines displayed on the screen.
.IP "\-A or \-\-SEARCH-SKIP-SCREEN"
-Causes all forward searches (not just non-repeated searches)
-to start just after the target line, and all backward searches
+Causes all forward searches (not just non-repeated searches)
+to start just after the target line, and all backward searches
to start just before the target line.
Thus, forward searches will skip part of the displayed screen
(from the first line up to and including the target line).
@@ -496,9 +518,9 @@
Specifies the amount of buffer space
.I less
will use for each file, in units of kilobytes (1024 bytes).
-By default 64K of buffer space is used for each file
+By default 64\ K of buffer space is used for each file
(unless the file is a pipe; see the \-B option).
-The \-b option specifies instead that \fIn\fP kilobytes of
+The \-b option specifies instead that \fIn\fP kilobytes of
buffer space should be used for each file.
If \fIn\fP is \-1, buffer space is unlimited; that is,
the entire file can be read into memory.
@@ -508,11 +530,11 @@
If a large amount of data is read from the pipe, this can cause
a large amount of memory to be allocated.
The \-B option disables this automatic allocation of buffers for pipes,
-so that only 64K
+so that only 64\ K
(or the amount of space specified by the \-b option)
is used for the pipe.
Warning: use of \-B can result in erroneous display, since only the
-most recently viewed part of the piped data is kept in memory;
+most recently viewed part of the piped data is kept in memory;
any earlier data is lost.
.IP "\-c or \-\-clear-screen"
Causes full screen repaints to be painted from the top line down.
@@ -519,8 +541,8 @@
By default,
full screen repaints are done by scrolling from the bottom of the screen.
.IP "\-C or \-\-CLEAR-SCREEN"
-Same as \-c, for compatibility with older versions of
-.I less.
+Same as \-c, for compatibility with older versions of
+.IR less .
.IP "\-d or \-\-dumb"
The \-d option suppresses the error message
normally displayed if the terminal is dumb;
@@ -532,24 +554,27 @@
.IP "\-D\fBx\fP\fIcolor\fP or \-\-color=\fBx\fP\fIcolor\fP"
[MS-DOS only]
Sets the color of the text displayed.
-\fBx\fP is a single character which selects the type of text whose color is
+\fBx\fP is a single character which selects the type of text whose color is
being set: n=normal, s=standout, d=bold, u=underlined, k=blink.
-\fIcolor\fP is a pair of numbers separated by a period.
-The first number selects the foreground color and the second selects
+\fIcolor\fP is a pair of numbers separated by a period.
+The first number selects the foreground color and the second selects
the background color of the text.
A single number \fIN\fP is the same as \fIN.M\fP,
where \fIM\fP is the normal background color.
+The color may start or end with \fBu\fP to use underline (with the normal
+color, if by itself), if the system supports it (Windows only).
+\fBx\fP may also be \fBa\fP to toggle strict ANSI sequence rendering (SGR mode).
.IP "\-e or \-\-quit-at-eof"
-Causes
-.I less
+Causes
+.I less
to automatically exit
the second time it reaches end-of-file.
-By default, the only way to exit
+By default, the only way to exit
.I less
is via the "q" command.
.IP "\-E or \-\-QUIT-AT-EOF"
-Causes
+Causes
.I less
to automatically exit the first time it reaches end-of-file.
.IP "\-f or \-\-force"
@@ -567,13 +592,13 @@
to automatically exit
if the entire file can be displayed on the first screen.
.IP "\-g or \-\-hilite-search"
-Normally,
-.I less
+Normally,
+.I less
will highlight ALL strings which match the last search command.
-The \-g option changes this behavior to highlight only the particular string
+The \-g option changes this behavior to highlight only the particular string
which was found by the last search command.
-This can cause
-.I less
+This can cause
+.I less
to run somewhat faster than the default.
.IP "\-G or \-\-HILITE-SEARCH"
The \-G option suppresses all highlighting of strings found by search commands.
@@ -587,11 +612,11 @@
Causes searches to ignore case; that is,
uppercase and lowercase are considered identical.
This option is ignored if any uppercase letters
-appear in the search pattern;
+appear in the search pattern;
in other words,
if a pattern contains uppercase letters, then that search does not ignore case.
.IP "\-I or \-\-IGNORE-CASE"
-Like \-i, but searches ignore case even if
+Like \-i, but searches ignore case even if
the pattern contains uppercase letters.
.IP "\-j\fIn\fP or \-\-jump-target=\fIn\fP"
Specifies a line on the screen where the "target" line
@@ -605,21 +630,25 @@
of the screen: the bottom line on the screen is \-1, the second
to the bottom is \-2, and so on.
Alternately, the screen line may be specified as a fraction of the height
-of the screen, starting with a decimal point: .5 is in the middle of the
-screen, .3 is three tenths down from the first line, and so on.
+of the screen, starting with a decimal point: \&.5 is in the middle of the
+screen, \&.3 is three tenths down from the first line, and so on.
If the line is specified as a fraction, the actual line number
is recalculated if the terminal window is resized, so that the
target line remains at the specified fraction of the screen height.
-If any form of the \-j option is used,
-forward searches begin at the line immediately after the target line,
-and backward searches begin at the target line,
+If any form of the \-j option is used,
+repeated forward searches (invoked with "n" or "N")
+begin at the line immediately after the target line,
+and repeated backward searches begin at the target line,
unless changed by \-a or \-A.
For example, if "\-j4" is used, the target line is the
fourth line on the screen, so forward searches begin at the fifth line
on the screen.
+However nonrepeated searches (invoked with "/" or "?")
+always begin at the start or end of the current screen respectively.
.IP "\-J or \-\-status-column"
Displays a status column at the left edge of the screen.
-The status column shows the lines that matched the current search.
+The status column shows the lines that matched the current search,
+and any lines that are marked (via the m or M command).
The status column is also used if the \-w or \-W option is in effect.
.IP "\-k\fIfilename\fP or \-\-lesskey-file=\fIfilename\fP"
Causes
@@ -630,7 +659,7 @@
Multiple \-k options may be specified.
If the LESSKEY or LESSKEY_SYSTEM environment variable is set, or
if a lesskey file is found in a standard place (see KEY BINDINGS),
-it is also used as a
+it is also used as a
.I lesskey
file.
.IP "\-K or \-\-quit-on-intr"
@@ -641,16 +670,16 @@
Normally, an interrupt character causes
.I less
to stop whatever it is doing and return to its command prompt.
-Note that use of this option makes it impossible to return to the
+Note that use of this option makes it impossible to return to the
command prompt from the "F" command.
.IP "\-L or \-\-no-lessopen"
Ignore the LESSOPEN environment variable
(see the INPUT PREPROCESSOR section below).
-This option can be set from within \fIless\fP,
-but it will apply only to files opened subsequently, not to the
+This option can be set from within \fIless\fP,
+but it will apply only to files opened subsequently, not to the
file which is currently open.
.IP "\-m or \-\-long-prompt"
-Causes
+Causes
.I less
to prompt verbosely (like \fImore\fP),
with the percent into the file.
@@ -658,10 +687,10 @@
.I less
prompts with a colon.
.IP "\-M or \-\-LONG-PROMPT"
-Causes
+Causes
.I less
-to prompt even more verbosely than
-.I more.
+to prompt even more verbosely than
+.IR more .
.IP "\-n or \-\-line-numbers"
Suppresses line numbers.
The default (to use line numbers) may cause
@@ -681,7 +710,7 @@
to copy its input to the named file as it is being viewed.
This applies only when the input file is a pipe,
not an ordinary file.
-If the file already exists,
+If the file already exists,
.I less
will ask for confirmation before overwriting it.
.IP "\-O\fIfilename\fP or \-\-LOG-FILE=\fIfilename\fP"
@@ -689,14 +718,14 @@
file without asking for confirmation.
.sp
If no log file has been specified,
-the \-o and \-O options can be used from within
+the \-o and \-O options can be used from within
.I less
to specify a log file.
Without a file name, they will simply report the name of the log file.
The "s" command is equivalent to specifying \-o from within
-.I less.
+.IR less .
.IP "\-p\fIpattern\fP or \-\-pattern=\fIpattern\fP"
-The \-p option on the command line is equivalent to
+The \-p option on the command line is equivalent to
specifying +/\fIpattern\fP;
that is, it tells
.I less
@@ -705,24 +734,25 @@
Provides a way to tailor the three prompt
styles to your own preference.
This option would normally be put in the LESS environment
-variable, rather than being typed in with each
+variable, rather than being typed in with each
.I less
command.
Such an option must either be the last option in the LESS variable,
or be terminated by a dollar sign.
--Ps followed by a string changes the default (short) prompt
+ \-Ps followed by a string changes the default (short) prompt
to that string.
--Pm changes the medium (\-m) prompt.
--PM changes the long (\-M) prompt.
--Ph changes the prompt for the help screen.
--P= changes the message printed by the = command.
--Pw changes the message printed while waiting for data (in the F command).
-All prompt strings consist of a sequence of
+ \-Pm changes the medium (\-m) prompt.
+ \-PM changes the long (\-M) prompt.
+ \-Ph changes the prompt for the help screen.
+ \-P= changes the message printed by the = command.
+ \-Pw changes the message printed while waiting for data (in the F command).
+
+All prompt strings consist of a sequence of
letters and special escape sequences.
See the section on PROMPTS for more details.
.IP "\-q or \-\-quiet or \-\-silent"
Causes moderately "quiet" operation:
-the terminal bell is not rung
+the terminal bell is not rung
if an attempt is made to scroll past the end of the file
or before the beginning of the file.
If the terminal has a "visual bell", it is used instead.
@@ -748,9 +778,9 @@
Unlike \-r, the screen appearance is maintained correctly in most cases.
ANSI "color" escape sequences are sequences of the form:
.sp
- ESC [ ... m
+ ESC [ \&...\& m
.sp
-where the "..." is zero or more color specification characters
+where the "...\&" is zero or more color specification characters
For the purpose of keeping track of screen appearance,
ANSI color escape sequences are assumed to not move the cursor.
You can make
@@ -758,9 +788,9 @@
think that characters other than "m" can end ANSI color escape sequences
by setting the environment variable LESSANSIENDCHARS to the list of
characters which can end a color escape sequence.
-And you can make
-.I less
-think that characters other than the standard ones may appear between
+And you can make
+.I less
+think that characters other than the standard ones may appear between
the ESC and the m by setting the environment variable LESSANSIMIDCHARS
to the list of characters which can appear.
.IP "\-s or \-\-squeeze-blank-lines"
@@ -780,19 +810,19 @@
will edit the file containing that tag.
For this to work, tag information must be available;
for example, there may be a file in the current directory called "tags",
-which was previously built by
+which was previously built by
.I ctags
(1) or an equivalent command.
If the environment variable LESSGLOBALTAGS is set, it is taken to be
-the name of a command compatible with
+the name of a command compatible with
.I global
(1), and that command is executed to find the tag.
(See http://www.gnu.org/software/global/global.html).
-The \-t option may also be specified from within
-.I less
+The \-t option may also be specified from within
+.I less
(using the \- command) as a way of examining a new file.
The command ":t" is equivalent to specifying \-t from within
-.I less.
+.IR less .
.IP "\-T\fItagsfile\fP or \-\-tag-file=\fItagsfile\fP"
Specifies a tags file to be used instead of "tags".
.IP "\-u or \-\-underline-special"
@@ -799,18 +829,18 @@
Causes backspaces and carriage returns to be treated as printable characters;
that is, they are sent to the terminal when they appear in the input.
.IP "\-U or \-\-UNDERLINE-SPECIAL"
-Causes backspaces, tabs and carriage returns to be
-treated as control characters;
+Causes backspaces, tabs, carriage returns and "formatting characters"
+(as defined by Unicode) to be treated as control characters;
that is, they are handled as specified by the \-r option.
.sp
By default, if neither \-u nor \-U is given,
backspaces which appear adjacent to an underscore character
are treated specially:
-the underlined text is displayed
+the underlined text is displayed
using the terminal's hardware underlining capability.
Also, backspaces which appear between two identical characters
-are treated specially:
-the overstruck text is printed
+are treated specially:
+the overstruck text is printed
using the terminal's hardware boldface capability.
Other backspaces are deleted, along with the preceding character.
Carriage returns immediately followed by a newline are deleted.
@@ -818,8 +848,8 @@
Text which is overstruck or underlined can be searched for
if neither \-u nor \-U is in effect.
.IP "\-V or \-\-version"
-Displays the version number of
-.I less.
+Displays the version number of
+.IR less .
.IP "\-w or \-\-hilite-unread"
Temporarily highlights the first "new" line after a forward movement
of a full page.
@@ -830,9 +860,9 @@
The entire line is highlighted, unless the \-J option is in effect,
in which case only the status column is highlighted.
.IP "\-W or \-\-HILITE-UNREAD"
-Like \-w, but temporarily highlights the first new line after any
+Like \-w, but temporarily highlights the first new line after any
forward movement command larger than one line.
-.IP "\-x\fIn\fP,... or \-\-tabs=\fIn\fP,..."
+.IP "\-x\fIn\fP,...\& or \-\-tabs=\fIn\fP,..."
Sets tab stops.
If only one \fIn\fP is specified, tab stops are set at multiples of \fIn\fP.
If multiple values separated by commas are specified, tab stops
@@ -852,21 +882,21 @@
The \-c or \-C option may be used to repaint from the top of
the screen if desired.
By default, any forward movement causes scrolling.
-.IP "\-[z]\fIn\fP or \-\-window=\fIn\fP"
+.IP "\-z\fIn\fP or \-\-window=\fIn\fP or \-\fIn\fP"
Changes the default scrolling window size to \fIn\fP lines.
The default is one screenful.
The z and w commands can also be used to change the window size.
-The "z" may be omitted for compatibility with some versions of
-.I more.
+The "z" may be omitted for compatibility with some versions of
+.IR more .
If the number
.I n
-is negative, it indicates
+is negative, it indicates
.I n
lines less than the current screen size.
-For example, if the screen is 24 lines, \fI\-z-4\fP sets the
+For example, if the screen is 24 lines, \fI\-z\-4\fP sets the
scrolling window to 20 lines. If the screen is resized to 40 lines,
the scrolling window automatically changes to 36 lines.
-.IP "\-\fI\(dqcc\fP\ or\ \-\-quotes=\fIcc\fP"
+.IP "\-\(dq\fIcc\fP\ or\ \-\-quotes=\fIcc\fP"
Changes the filename quoting character.
This may be necessary if you are trying to name a file
which contains both spaces and quote characters.
@@ -889,14 +919,14 @@
If the number specified is zero, it sets the default number of
positions to one half of the screen width.
Alternately, the number may be specified as a fraction of the width
-of the screen, starting with a decimal point: .5 is half of the
-screen width, .3 is three tenths of the screen width, and so on.
-If the number is specified as a fraction, the actual number of
-scroll positions is recalculated if the terminal window is resized,
-so that the actual scroll remains at the specified fraction
+of the screen, starting with a decimal point: \&.5 is half of the
+screen width, \&.3 is three tenths of the screen width, and so on.
+If the number is specified as a fraction, the actual number of
+scroll positions is recalculated if the terminal window is resized,
+so that the actual scroll remains at the specified fraction
of the screen width.
.IP "\-\-follow-name"
-Normally, if the input file is renamed while an F command is executing,
+Normally, if the input file is renamed while an F command is executing,
.I less
will continue to display the contents of the original file despite
its name change.
@@ -904,7 +934,7 @@
.I less
will periodically attempt to reopen the file by name.
If the reopen succeeds and the file is a different file from the original
-(which means that a new file has been created
+(which means that a new file has been created
with the same name as the original (now renamed) file),
.I less
will display the contents of that new file.
@@ -918,6 +948,11 @@
After the \-\-use-backslash option, any backslash in an option string is
removed and the following character is taken literally.
This allows a dollar sign to be included in option strings.
+.IP "\-\-rscroll"
+This option changes the character used to mark truncated lines.
+It may begin with a two-character attribute indicator like LESSBINFMT does.
+If there is no attribute indicator, standout is used.
+If set to "-", truncated lines are not marked.
.IP \-\-
A command line argument of "\-\-" marks the end of option arguments.
Any arguments following this are interpreted as filenames.
@@ -925,12 +960,12 @@
.IP +
If a command line option begins with \fB+\fP,
the remainder of that option is taken to be an initial command to
-.I less.
+.IR less .
For example, +G tells
.I less
to start at the end of the file rather than the beginning,
and +/xyz tells it to start at the first occurrence of "xyz" in the file.
-As a special case, +<number> acts like +<number>g;
+As a special case, +<number> acts like +<number>g;
that is, it starts the display at the specified line number
(however, see the caveat under the "g" command above).
If the option starts with ++, the initial command applies to
@@ -944,8 +979,8 @@
or the pattern for a search command),
certain keys can be used to manipulate the command line.
Most commands have an alternate form in [ brackets ] which can be used if
-a key does not exist on a particular keyboard.
-(Note that the forms beginning with ESC do not work
+a key does not exist on a particular keyboard.
+(Note that the forms beginning with ESC do not work
in some MS-DOS and Windows systems because ESC is the line erase character.)
Any of these special keys may be entered literally by preceding
it with the "literal" character, either ^V or ^A.
@@ -990,7 +1025,7 @@
Repeated TABs will cycle thru the other matching filenames.
If the completed filename is a directory, a "/" is appended to the filename.
(On MS-DOS systems, a "\e" is appended.)
-The environment variable LESSSEPARATOR can be used to specify a
+The environment variable LESSSEPARATOR can be used to specify a
different character to append to a directory name.
.IP "BACKTAB [ ESC-TAB ]"
Like, TAB, but cycles in the reverse direction thru the matching filenames.
@@ -1007,9 +1042,9 @@
Delete the entire command line and return to the main prompt.
.SH "KEY BINDINGS"
-You may define your own
+You may define your own
.I less
-commands by using the program
+commands by using the program
.I lesskey
(1)
to create a lesskey file.
@@ -1022,7 +1057,7 @@
If the environment variable LESSKEY is set,
.I less
uses that as the name of the lesskey file.
-Otherwise,
+Otherwise,
.I less
looks in a standard place for the lesskey file:
On Unix systems,
@@ -1046,17 +1081,17 @@
.P
A system-wide lesskey file may also be set up to provide key bindings.
If a key is defined in both a local lesskey file and in the
-system-wide file, key bindings in the local file take precedence over
+system-wide file, key bindings in the local file take precedence over
those in the system-wide file.
If the environment variable LESSKEY_SYSTEM is set,
.I less
uses that as the name of the system-wide lesskey file.
Otherwise,
-.I less
+.I less
looks in a standard place for the system-wide lesskey file:
On Unix systems, the system-wide lesskey file is /usr/local/etc/sysless.
-(However, if
-.I less
+(However, if
+.I less
was built with a different sysconf directory than /usr/local/etc,
that directory is where the sysless file is found.)
On MS-DOS and Windows systems, the system-wide lesskey file is c:\e_sysless.
@@ -1063,8 +1098,8 @@
On OS/2 systems, the system-wide lesskey file is c:\esysless.ini.
.SH "INPUT PREPROCESSOR"
-You may define an "input preprocessor" for
-.I less.
+You may define an "input preprocessor" for
+.IR less .
Before
.I less
opens a file, it first gives your input preprocessor a chance to modify the
@@ -1072,10 +1107,10 @@
An input preprocessor is simply an executable program (or shell script),
which writes the contents of the file to a different file,
called the replacement file.
-The contents of the replacement file are then displayed
+The contents of the replacement file are then displayed
in place of the contents of the original file.
However, it will appear to the user as if the original file is opened;
-that is,
+that is,
.I less
will display the original filename as the name of the current file.
.PP
@@ -1083,17 +1118,17 @@
as entered by the user.
It should create the replacement file, and when finished,
print the name of the replacement file to its standard output.
-If the input preprocessor does not output a replacement filename,
+If the input preprocessor does not output a replacement filename,
.I less
uses the original file, as normal.
The input preprocessor is not called when viewing standard input.
To set up an input preprocessor, set the LESSOPEN environment variable
to a command line which will invoke your input preprocessor.
-This command line should include one occurrence of the string "%s",
+This command line should include one occurrence of the string "%s",
which will be replaced by the filename
when the input preprocessor command is invoked.
.PP
-When
+When
.I less
closes a file opened in such a way, it will call another program,
called the input postprocessor,
@@ -1101,11 +1136,11 @@
replacement file created by LESSOPEN).
This program receives two command line arguments, the original filename
as entered by the user, and the name of the replacement file.
-To set up an input postprocessor, set the LESSCLOSE environment variable
+To set up an input postprocessor, set the LESSCLOSE environment variable
to a command line which will invoke your input postprocessor.
-It may include two occurrences of the string "%s";
-the first is replaced with the original name of the file and
-the second with the name of the replacement file,
+It may include two occurrences of the string "%s";
+the first is replaced with the original name of the file and
+the second with the name of the replacement file,
which was output by LESSOPEN.
.PP
For example, on many Unix systems, these two scripts will allow you
@@ -1119,9 +1154,9 @@
.br
case "$1" in
.br
- *.Z) uncompress -\c $1 >/tmp/less.$$ 2>/dev/null
+ *.Z) uncompress \-c $1 >/tmp/less.$$ 2>/dev/null
.br
- if [ \-s /tmp/less.$$ ]; then
+ if [ \-s /tmp/less.$$ ]; then
.br
echo /tmp/less.$$
.br
@@ -1148,10 +1183,10 @@
to accept other types of compressed files, and so on.
.PP
It is also possible to set up an input preprocessor to
-pipe the file data directly to
-.I less,
+pipe the file data directly to
+.IR less ,
rather than putting the data into a replacement file.
-This avoids the need to decompress the entire file before
+This avoids the need to decompress the entire file before
starting to view it.
An input preprocessor that works this way is called an input pipe.
An input pipe, instead of writing the name of a replacement file on
@@ -1158,12 +1193,14 @@
its standard output,
writes the entire contents of the replacement file on its standard output.
If the input pipe does not write any characters on its standard output,
-then there is no replacement file and
+then there is no replacement file and
.I less
uses the original file, as normal.
To use an input pipe,
-make the first character in the LESSOPEN environment variable a
+make the first character in the LESSOPEN environment variable a
vertical bar (|) to signify that the input preprocessor is an input pipe.
+As with non-pipe input preprocessors, the command string must contain one
+occurrence of %s, which is replaced with the filename of the input file.
.PP
For example, on many Unix systems, this script will work like the
previous example scripts:
@@ -1189,16 +1226,16 @@
LESSOPEN="|lesspipe.sh %s".
.PP
Note that a preprocessor cannot output an empty file, since that
-is interpreted as meaning there is no replacement, and
+is interpreted as meaning there is no replacement, and
the original file is used.
To avoid this, if LESSOPEN starts with two vertical bars,
the exit status of the script becomes meaningful.
-If the exit status is zero, the output is considered to be
-replacement text, even if it empty.
+If the exit status is zero, the output is considered to be
+replacement text, even if it is empty.
If the exit status is nonzero, any output is ignored and the
original file is used.
For compatibility with previous versions of
-.I less,
+.IR less ,
if LESSOPEN starts with only one vertical bar, the exit status
of the preprocessor is ignored.
.PP
@@ -1209,20 +1246,20 @@
postprocessor is "\-".
.PP
For compatibility with previous versions of
-.I less,
+.IR less ,
the input preprocessor or pipe is not used if
.I less
-is viewing standard input.
+is viewing standard input.
However, if the first character of LESSOPEN is a dash (\-),
the input preprocessor is used on standard input as well as other files.
-In this case, the dash is not considered to be part of
+In this case, the dash is not considered to be part of
the preprocessor command.
If standard input is being viewed, the input preprocessor is passed
a file name consisting of a single dash.
Similarly, if the first two characters of LESSOPEN are vertical bar and dash
-(|\-) or two vertical bars and a dash (||\-),
+(|\-) or two vertical bars and a dash (||\-),
the input pipe is used on standard input as well as other files.
-Again, in this case the dash is not considered to be part of
+Again, in this case the dash is not considered to be part of
the input pipe command.
.SH "NATIONAL CHARACTER SETS"
@@ -1282,11 +1319,11 @@
The character "." is used for a normal character, "c" for control,
and "b" for binary.
A decimal number may be used for repetition.
-For example, "bccc4b." would mean character 0 is binary,
+For example, "bccc4b.\&" would mean character 0 is binary,
1, 2 and 3 are control, 4, 5, 6 and 7 are binary, and 8 is normal.
All characters after the last are taken to be the same as the last,
so characters 9 through 255 would be normal.
-(This is an example, and does not necessarily
+(This is an example, and does not necessarily
represent any real character set.)
.PP
This table shows the value of LESSCHARDEF which is equivalent
@@ -1313,7 +1350,7 @@
next\ \ 8bcccbcc18b95.bb125.bb
.PP
If neither LESSCHARSET nor LESSCHARDEF is set,
-but any of the strings "UTF-8", "UTF8", "utf-8" or "utf8"
+but any of the strings "UTF-8", "UTF8", "utf-8" or "utf8"
is found in the LC_ALL, LC_CTYPE or LANG
environment variables, then the default character set is utf-8.
.PP
@@ -1331,12 +1368,12 @@
.PP
Control and binary characters are displayed in standout (reverse video).
Each such character is displayed in caret notation if possible
-(e.g. ^A for control-A). Caret notation is used only if
+(e.g.\& ^A for control-A). Caret notation is used only if
inverting the 0100 bit results in a normal printable character.
Otherwise, the character is displayed as a hex number in angle brackets.
-This format can be changed by
+This format can be changed by
setting the LESSBINFMT environment variable.
-LESSBINFMT may begin with a "*" and one character to select
+LESSBINFMT may begin with a "*" and one character to select
the display attribute:
"*k" is blinking, "*d" is bold, "*u" is underlined, "*s" is standout,
and "*n" is normal.
@@ -1354,12 +1391,12 @@
that were successfully decoded but are unsuitable for display (e.g.,
unassigned code points).
Its default value is "<U+%04lX>".
-Note that LESSUTFBINFMT and LESSBINFMT share their display attribute
-setting ("*x") so specifying one will affect both;
+Note that LESSUTFBINFMT and LESSBINFMT share their display attribute
+setting ("*x") so specifying one will affect both;
LESSUTFBINFMT is read after LESSBINFMT so its setting, if any,
-will have priority.
+will have priority.
Problematic octets in a UTF-8 file (octets of a truncated sequence,
-octets of a complete but non-shortest form sequence, illegal octets,
+octets of a complete but non-shortest form sequence, illegal octets,
and stray trailing octets)
are displayed individually using LESSBINFMT so as to facilitate diagnostic
of how the UTF-8 file is ill-formed.
@@ -1424,6 +1461,9 @@
.IP "%t"
Causes any trailing spaces to be removed.
Usually used at the end of the string, but may appear anywhere.
+.IP "%T"
+Normally expands to the word "file".
+However if viewing files via a tags list using the \-t option, it expands to the word "tag".
.IP "%x"
Replaced by the name of the next input file in the list.
.PP
@@ -1490,7 +1530,7 @@
This prompt prints the filename, if known;
otherwise the string "Standard input".
.sp
-?f%f .?ltLine %lt:?pt%pt\e%:?btByte %bt:-...
+?f%f \&.?ltLine %lt:?pt%pt\e%:?btByte %bt:-...
.sp
This prompt would print the filename, if known.
The filename is followed by the line number, if known,
@@ -1500,7 +1540,7 @@
and how the % after the %pt
is included literally by escaping it with a backslash.
.sp
-?n?f%f\ .?m(file\ %i\ of\ %m)\ ..?e(END)\ ?x-\ Next\e:\ %x..%t
+?n?f%f\ .?m(%T %i of %m)\ ..?e(END)\ ?x-\ Next\e:\ %x..%t";
.sp
This prints the filename if this is the first prompt in a file,
followed by the "file N of N" message if there is more
@@ -1514,10 +1554,10 @@
Each is broken into two lines here for readability only.
.nf
.sp
-?n?f%f\ .?m(file\ %i\ of\ %m)\ ..?e(END)\ ?x-\ Next\e:\ %x.:
+?n?f%f\ .?m(%T\ %i\ of\ %m)\ ..?e(END)\ ?x-\ Next\e:\ %x.:
?pB%pB\e%:byte\ %bB?s/%s...%t
.sp
-?f%f\ .?n?m(file\ %i\ of\ %m)\ ..?ltlines\ %lt-%lb?L/%L.\ :
+?f%f\ .?n?m(%T\ %i\ of\ %m)\ ..?ltlines\ %lt-%lb?L/%L.\ :
byte\ %bB?s/%s.\ .?e(END)\ ?x-\ Next\e:\ %x.:?pB%pB\e%..%t
.sp
.fi
@@ -1524,7 +1564,7 @@
And here is the default message produced by the = command:
.nf
.sp
-?f%f\ .?m(file\ %i\ of\ %m)\ .?ltlines\ %lt-%lb?L/%L.\ .
+?f%f\ .?m(%T\ %i\ of\ %m)\ .?ltlines\ %lt-%lb?L/%L.\ .
byte\ %bB?s/%s.\ ?e(END)\ :?pB%pB\e%..%t
.fi
.PP
@@ -1541,7 +1581,7 @@
Note that this expands to the editor name, followed by a + and the
line number, followed by the file name.
If your editor does not accept the "+linenumber" syntax, or has other
-differences in invocation syntax, the LESSEDIT variable can be
+differences in invocation syntax, the LESSEDIT variable can be
changed to modify this default.
.SH SECURITY
@@ -1580,12 +1620,12 @@
In this mode, less behaves differently in these ways:
.PP
The \-e option works differently.
-If the \-e option is not set,
+If the \-e option is not set,
.I less
+behaves as if the \-e option were set.
+If the \-e option is set,
+.I less
behaves as if the \-E option were set.
-If the \-e option is set,
-.I less
-behaves as if the \-e and \-F options were set.
.PP
The \-m option works differently.
If the \-m option is not set, the medium prompt is used,
@@ -1595,7 +1635,7 @@
The \-n option acts like the \-z option.
The normal behavior of the \-n option is unavailable in this mode.
.PP
-The parameter to the \-p option is taken to be a
+The parameter to the \-p option is taken to be a
.I less
command rather than a search pattern.
.PP
@@ -1604,10 +1644,10 @@
.SH "ENVIRONMENT VARIABLES"
Environment variables may be specified either in the system environment
-as usual, or in a
+as usual, or in a
.I lesskey
(1) file.
-If environment variables are defined in more than one place,
+If environment variables are defined in more than one place,
variables defined in a local lesskey file take precedence over
variables defined in the system environment, which take precedence
over variables defined in the system-wide lesskey file.
@@ -1633,7 +1673,7 @@
.IP LC_CTYPE
Language for determining the character set.
.IP LESS
-Options which are passed to
+Options which are passed to
.I less
automatically.
.IP LESSANSIENDCHARS
@@ -1642,7 +1682,7 @@
.IP LESSANSIMIDCHARS
Characters which may appear between the ESC character and the
end character in an ANSI color escape sequence
-(default "0123456789;[?!"'#%()*+\ ".
+(default "0123456789:;[?!"'#%()*+\ ".
.IP LESSBINFMT
Format for displaying non-printable, non-control characters.
.IP LESSCHARDEF
@@ -1665,11 +1705,11 @@
(1) command. If not set, global tags are not used.
.IP LESSHISTFILE
Name of the history file used to remember search commands and
-shell commands between invocations of
-.I less.
+shell commands between invocations of
+.IR less .
If set to "\-" or "/dev/null", a history file is not used.
The default is "$HOME/.lesshst" on Unix systems, "$HOME/_lesshst" on
-DOS and Windows systems, or "$HOME/lesshst.ini" or "$INIT/lesshst.ini"
+DOS and Windows systems, or "$HOME/lesshst.ini" or "$INIT/lesshst.ini"
on OS/2 systems.
.IP LESSHISTSIZE
The maximum number of commands to save in the history file.
@@ -1695,7 +1735,7 @@
.IP LESSUTFBINFMT
Format for displaying non-printable Unicode code points.
.IP LESS_IS_MORE
-Emulate the
+Emulate the
.I more
(1) command.
.IP LINES
@@ -1707,11 +1747,11 @@
.IP MORE
Options which are passed to
.I less
-automatically when running in
+automatically when running in
.I more
compatible mode.
.IP PATH
-User's search path (used to find a lesskey file
+User's search path (used to find a lesskey file
on MS-DOS and OS/2 systems).
.IP SHELL
The shell used to execute the ! command, as well as to expand filenames.
@@ -1726,7 +1766,7 @@
lesskey(1)
.SH COPYRIGHT
-Copyright (C) 1984-2012 Mark Nudelman
+Copyright (C) 1984-2017 Mark Nudelman
.PP
less is part of the GNU project and is free software.
You can redistribute it and/or modify it
@@ -1735,7 +1775,7 @@
the Free Software Foundation; or (2) the Less License.
See the file README in the less distribution for more details
regarding redistribution.
-You should have received a copy of the GNU General Public License
+You should have received a copy of the GNU General Public License
along with the source for less; see the file COPYING.
If not, write to the Free Software Foundation, 59 Temple Place,
Suite 330, Boston, MA 02111-1307, USA.
@@ -1749,12 +1789,12 @@
.SH AUTHOR
.PP
-Mark Nudelman
+Mark Nudelman
.br
Send bug reports or comments to <bug-less at gnu.org>
.br
See http://www.greenwoodsoftware.com/less/bugs.html for the latest list of known bugs in less.
.br
-For more information, see the less homepage at
+For more information, see the less homepage at
.br
http://www.greenwoodsoftware.com/less.
Modified: trunk/contrib/less/lessecho.c
===================================================================
--- trunk/contrib/less/lessecho.c 2018-07-06 12:43:22 UTC (rev 11361)
+++ trunk/contrib/less/lessecho.c 2018-07-06 12:46:07 UTC (rev 11362)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 1984-2012 Mark Nudelman
+ * Copyright (C) 1984-2017 Mark Nudelman
*
* You may distribute under the terms of either the GNU General Public
* License or the Less License, as specified in the README file.
Deleted: trunk/contrib/less/lessecho.man
===================================================================
--- trunk/contrib/less/lessecho.man 2018-07-06 12:43:22 UTC (rev 11361)
+++ trunk/contrib/less/lessecho.man 2018-07-06 12:46:07 UTC (rev 11362)
@@ -1,54 +0,0 @@
-LESSECHO(1) LESSECHO(1)
-
-
-
-[1mNAME[0m
- lessecho - expand metacharacters
-
-[1mSYNOPSIS[0m
- [1mlessecho [4m[22m[-ox][24m [4m[-cx][24m [4m[-pn][24m [4m[-dn][24m [4m[-mx][24m [4m[-nn][24m [4m[-ex][24m [4m[-a][24m [4mfile[24m [4m...[0m
-
-[1mDESCRIPTION[0m
- [4mlessecho[24m is a program that simply echos its arguments on standard out-
- put. But any metacharacter in the output is preceded by an "escape"
- character, which by default is a backslash.
-
-[1mOPTIONS[0m
- A summary of options is included below.
-
- [1m-ex [22mSpecifies "x", rather than backslash, to be the escape char for
- metachars. If x is "-", no escape char is used and arguments
- containing metachars are surrounded by quotes instead.
-
- [1m-ox [22mSpecifies "x", rather than double-quote, to be the open quote
- character, which is used if the -e- option is specified.
-
- [1m-cx [22mSpecifies "x" to be the close quote character.
-
- [1m-pn [22mSpecifies "n" to be the open quote character, as an integer.
-
- [1m-dn [22mSpecifies "n" to be the close quote character, as an integer.
-
- [1m-mx [22mSpecifies "x" to be a metachar. By default, no characters are
- considered metachars.
-
- [1m-nn [22mSpecifies "n" to be a metachar, as an integer.
-
- [1m-fn [22mSpecifies "n" to be the escape char for metachars, as an inte-
- ger.
-
- [1m-a [22mSpecifies that all arguments are to be quoted. The default is
- that only arguments containing metacharacters are quoted
-
-[1mSEE ALSO[0m
- less(1)
-
-[1mAUTHOR[0m
- This manual page was written by Thomas Schoepf <schoepf at debian.org>,
- for the Debian GNU/Linux system (but may be used by others).
-
- Send bug reports or comments to bug-less at gnu.org.
-
-
-
- Version 458: 04 Apr 2013 LESSECHO(1)
Modified: trunk/contrib/less/lessecho.nro
===================================================================
--- trunk/contrib/less/lessecho.nro 2018-07-06 12:43:22 UTC (rev 11361)
+++ trunk/contrib/less/lessecho.nro 2018-07-06 12:46:07 UTC (rev 11362)
@@ -1,4 +1,4 @@
-.TH LESSECHO 1 "Version 458: 04 Apr 2013"
+.TH LESSECHO 1 "Version 530: 05 Dec 2017"
.SH NAME
lessecho \- expand metacharacters
.SH SYNOPSIS
Modified: trunk/contrib/less/lesskey.c
===================================================================
--- trunk/contrib/less/lesskey.c 2018-07-06 12:43:22 UTC (rev 11361)
+++ trunk/contrib/less/lesskey.c 2018-07-06 12:46:07 UTC (rev 11362)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 1984-2012 Mark Nudelman
+ * Copyright (C) 1984-2017 Mark Nudelman
*
* You may distribute under the terms of either the GNU General Public
* License or the Less License, as specified in the README file.
@@ -99,11 +99,13 @@
{ "back-scroll", A_B_SCROLL },
{ "back-search", A_B_SEARCH },
{ "back-window", A_B_WINDOW },
+ { "clear-mark", A_CLRMARK },
{ "debug", A_DEBUG },
{ "digit", A_DIGIT },
{ "display-flag", A_DISP_OPTION },
{ "display-option", A_DISP_OPTION },
{ "end", A_GOEND },
+ { "end-scroll", A_RRSHIFT },
{ "examine", A_EXAMINE },
{ "filter", A_FILTER },
{ "first-cmd", A_FIRSTCMD },
@@ -120,6 +122,7 @@
{ "forw-search", A_F_SEARCH },
{ "forw-window", A_F_WINDOW },
{ "goto-end", A_GOEND },
+ { "goto-end-buffered", A_GOEND_BUF },
{ "goto-line", A_GOLINE },
{ "goto-mark", A_GOMARK },
{ "help", A_HELP },
@@ -129,6 +132,7 @@
{ "next-file", A_NEXT_FILE },
{ "next-tag", A_NEXT_TAG },
{ "noaction", A_NOACTION },
+ { "no-scroll", A_LLSHIFT },
{ "percent", A_PERCENT },
{ "pipe", A_PIPE },
{ "prev-file", A_PREV_FILE },
@@ -143,6 +147,7 @@
{ "reverse-search-all", A_T_REVERSE_SEARCH },
{ "right-scroll", A_RSHIFT },
{ "set-mark", A_SETMARK },
+ { "set-mark-bottom", A_SETMARKBOT },
{ "shell", A_SHELL },
{ "status", A_STAT },
{ "toggle-flag", A_OPT_TOGGLE },
@@ -358,9 +363,9 @@
char **pp;
int xlate;
{
- register char *p;
- register char ch;
- register int i;
+ char *p;
+ char ch;
+ int i;
static char buf[10];
static char tstr_control_k[] =
{ SK_SPECIAL_KEY, SK_CONTROL_K, 6, 1, 1, 1, '\0' };
@@ -420,7 +425,7 @@
case 'e': ch = SK_END; break;
case 'x': ch = SK_DELETE; break;
default:
- error("illegal char after \\k");
+ error("illegal char after \\k", NULL_PARG);
*pp = p+1;
return ("");
}
@@ -471,7 +476,7 @@
*/
public char *
skipsp(s)
- register char *s;
+ char *s;
{
while (*s == ' ' || *s == '\t')
s++;
@@ -483,7 +488,7 @@
*/
public char *
skipnsp(s)
- register char *s;
+ char *s;
{
while (*s != '\0' && *s != ' ' && *s != '\t')
s++;
@@ -498,7 +503,7 @@
clean_line(s)
char *s;
{
- register int i;
+ int i;
s = skipsp(s);
for (i = 0; s[i] != '\n' && s[i] != '\r' && s[i] != '\0'; i++)
@@ -517,7 +522,7 @@
{
if (currtable->pbuffer >= currtable->buffer + MAX_USERCMD)
{
- error("too many commands");
+ error("too many commands", NULL_PARG);
exit(1);
}
*(currtable->pbuffer)++ = c;
@@ -617,16 +622,18 @@
for (i = 0; currtable->names[i].cn_name != NULL; i++)
if (strcmp(currtable->names[i].cn_name, actname) == 0)
return (currtable->names[i].cn_action);
- error("unknown action");
+ error("unknown action", NULL_PARG);
return (A_INVALID);
}
void
-error(s)
+error(s, parg)
char *s;
+ PARG *parg;
{
fprintf(stderr, "line %d: %s\n", linenum, s);
errors++;
+ (void) parg;
}
@@ -647,9 +654,9 @@
do
{
s = tstr(&p, 1);
- cmdlen += strlen(s);
+ cmdlen += (int) strlen(s);
if (cmdlen > MAX_CMDLEN)
- error("command too long");
+ error("command too long", NULL_PARG);
else
add_cmd_str(s);
} while (*p != ' ' && *p != '\t' && *p != '\0');
@@ -666,7 +673,7 @@
p = skipsp(p);
if (*p == '\0')
{
- error("missing action");
+ error("missing action", NULL_PARG);
return;
}
actname = p;
@@ -719,7 +726,7 @@
p = skipsp(p);
if (*p++ != '=')
{
- error("missing =");
+ error("missing =", NULL_PARG);
return;
}
Modified: trunk/contrib/less/lesskey.h
===================================================================
--- trunk/contrib/less/lesskey.h 2018-07-06 12:43:22 UTC (rev 11361)
+++ trunk/contrib/less/lesskey.h 2018-07-06 12:46:07 UTC (rev 11362)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 1984-2012 Mark Nudelman
+ * Copyright (C) 1984-2017 Mark Nudelman
*
* You may distribute under the terms of either the GNU General Public
* License or the Less License, as specified in the README file.
Deleted: trunk/contrib/less/lesskey.man
===================================================================
--- trunk/contrib/less/lesskey.man 2018-07-06 12:43:22 UTC (rev 11361)
+++ trunk/contrib/less/lesskey.man 2018-07-06 12:46:07 UTC (rev 11362)
@@ -1,356 +0,0 @@
-LESSKEY(1) LESSKEY(1)
-
-
-
-[1mNAME[0m
- lesskey - specify key bindings for less
-
-[1mSYNOPSIS[0m
- [1mlesskey [-o output] [--] [input][0m
- [1mlesskey [--output=output] [--] [input][0m
- [1mlesskey -V[0m
- [1mlesskey --version[0m
-
-[1mDESCRIPTION[0m
- [4mLesskey[24m is used to specify a set of key bindings to be used by [4mless.[0m
- The input file is a text file which describes the key bindings. If the
- input file is "-", standard input is read. If no input file is speci-
- fied, a standard filename is used as the name of the input file, which
- depends on the system being used: On Unix systems, $HOME/.lesskey is
- used; on MS-DOS systems, $HOME/_lesskey is used; and on OS/2 systems
- $HOME/lesskey.ini is used, or $INIT/lesskey.ini if $HOME is undefined.
- The output file is a binary file which is used by [4mless.[24m If no output
- file is specified, and the environment variable LESSKEY is set, the
- value of LESSKEY is used as the name of the output file. Otherwise, a
- standard filename is used as the name of the output file, which depends
- on the system being used: On Unix and OS-9 systems, $HOME/.less is
- used; on MS-DOS systems, $HOME/_less is used; and on OS/2 systems,
- $HOME/less.ini is used, or $INIT/less.ini if $HOME is undefined. If
- the output file already exists, [4mlesskey[24m will overwrite it.
-
- The -V or --version option causes [4mlesskey[24m to print its version number
- and immediately exit. If -V or --version is present, other options and
- arguments are ignored.
-
- The input file consists of one or more [4msections.[24m Each section starts
- with a line that identifies the type of section. Possible sections
- are:
-
- #command
- Defines new command keys.
-
- #line-edit
- Defines new line-editing keys.
-
- #env Defines environment variables.
-
- Blank lines and lines which start with a pound sign (#) are ignored,
- except for the special section header lines.
-
-
-[1mCOMMAND SECTION[0m
- The command section begins with the line
-
- #command
-
- If the command section is the first section in the file, this line may
- be omitted. The command section consists of lines of the form:
-
- [4mstring[24m <whitespace> [4maction[24m [extra-string] <newline>
-
- Whitespace is any sequence of one or more spaces and/or tabs. The
- [4mstring[24m is the command key(s) which invoke the action. The [4mstring[24m may
- be a single command key, or a sequence of up to 15 keys. The [4maction[24m is
- the name of the less action, from the list below. The characters in
- the [4mstring[24m may appear literally, or be prefixed by a caret to indicate
- a control key. A backslash followed by one to three octal digits may
- be used to specify a character by its octal value. A backslash fol-
- lowed by certain characters specifies input characters as follows:
-
- \b BACKSPACE
-
- \e ESCAPE
-
- \n NEWLINE
-
- \r RETURN
-
- \t TAB
-
- \ku UP ARROW
-
- \kd DOWN ARROW
-
- \kr RIGHT ARROW
-
- \kl LEFT ARROW
-
- \kU PAGE UP
-
- \kD PAGE DOWN
-
- \kh HOME
-
- \ke END
-
- \kx DELETE
-
- A backslash followed by any other character indicates that character is
- to be taken literally. Characters which must be preceded by backslash
- include caret, space, tab and the backslash itself.
-
- An action may be followed by an "extra" string. When such a command is
- entered while running [4mless,[24m the action is performed, and then the extra
- string is parsed, just as if it were typed in to [4mless.[24m This feature
- can be used in certain cases to extend the functionality of a command.
- For example, see the "{" and ":t" commands in the example below. The
- extra string has a special meaning for the "quit" action: when [4mless[0m
- quits, first character of the extra string is used as its exit status.
-
-
-[1mEXAMPLE[0m
- The following input file describes the set of default command keys used
- by less:
-
- #command
- \r forw-line
- \n forw-line
- e forw-line
- j forw-line
- \kd forw-line
- ^E forw-line
- ^N forw-line
- k back-line
- y back-line
- ^Y back-line
- ^K back-line
- ^P back-line
- J forw-line-force
- K back-line-force
- Y back-line-force
- d forw-scroll
- ^D forw-scroll
- u back-scroll
- ^U back-scroll
- \40 forw-screen
- f forw-screen
- ^F forw-screen
- ^V forw-screen
- \kD forw-screen
- b back-screen
- ^B back-screen
- \ev back-screen
- \kU back-screen
- z forw-window
- w back-window
- \e\40 forw-screen-force
- F forw-forever
- \eF forw-until-hilite
- R repaint-flush
- r repaint
- ^R repaint
- ^L repaint
- \eu undo-hilite
- g goto-line
- \kh goto-line
- < goto-line
- \e< goto-line
- p percent
- % percent
- \e[ left-scroll
- \e] right-scroll
- \e( left-scroll
- \e) right-scroll
- { forw-bracket {}
- } back-bracket {}
- ( forw-bracket ()
- ) back-bracket ()
- [ forw-bracket []
- ] back-bracket []
- \e^F forw-bracket
- \e^B back-bracket
- G goto-end
- \e> goto-end
- > goto-end
- \ke goto-end
- = status
- ^G status
- :f status
- / forw-search
- ? back-search
- \e/ forw-search *
- \e? back-search *
- n repeat-search
- \en repeat-search-all
- N reverse-search
- \eN reverse-search-all
- & filter
- m set-mark
- ' goto-mark
- ^X^X goto-mark
- E examine
- :e examine
- ^X^V examine
- :n next-file
- :p prev-file
- t next-tag
- T prev-tag
- :x index-file
- :d remove-file
- - toggle-option
- :t toggle-option t
- s toggle-option o
- _ display-option
- | pipe
- v visual
- ! shell
- + firstcmd
- H help
- h help
- V version
- 0 digit
- 1 digit
- 2 digit
- 3 digit
- 4 digit
- 5 digit
- 6 digit
- 7 digit
- 8 digit
- 9 digit
- q quit
- Q quit
- :q quit
- :Q quit
- ZZ quit
-
-
-[1mPRECEDENCE[0m
- Commands specified by [4mlesskey[24m take precedence over the default com-
- mands. A default command key may be disabled by including it in the
- input file with the action "invalid". Alternatively, a key may be
- defined to do nothing by using the action "noaction". "noaction" is
- similar to "invalid", but [4mless[24m will give an error beep for an "invalid"
- command, but not for a "noaction" command. In addition, ALL default
- commands may be disabled by adding this control line to the input file:
-
- #stop
-
- This will cause all default commands to be ignored. The #stop line
- should be the last line in that section of the file.
-
- Be aware that #stop can be dangerous. Since all default commands are
- disabled, you must provide sufficient commands before the #stop line to
- enable all necessary actions. For example, failure to provide a "quit"
- command can lead to frustration.
-
-
-[1mLINE EDITING SECTION[0m
- The line-editing section begins with the line:
-
- #line-edit
-
- This section specifies new key bindings for the line editing commands,
- in a manner similar to the way key bindings for ordinary commands are
- specified in the #command section. The line-editing section consists
- of a list of keys and actions, one per line as in the example below.
-
-
-[1mEXAMPLE[0m
- The following input file describes the set of default line-editing keys
- used by less:
-
- #line-edit
- \t forw-complete
- \17 back-complete
- \e\t back-complete
- ^L expand
- ^V literal
- ^A literal
- \el right
- \kr right
- \eh left
- \kl left
- \eb word-left
- \e\kl word-left
- \ew word-right
- \e\kr word-right
- \ei insert
- \ex delete
- \kx delete
- \eX word-delete
- \ekx word-delete
- \e\b word-backspace
- \e0 home
- \kh home
- \e$ end
- \ke end
- \ek up
- \ku up
- \ej down
- ^G abort
-
-
-
-[1mLESS ENVIRONMENT VARIABLES[0m
- The environment variable section begins with the line
-
- #env
-
- Following this line is a list of environment variable assignments.
- Each line consists of an environment variable name, an equals sign (=)
- and the value to be assigned to the environment variable. White space
- before and after the equals sign is ignored. Variables assigned in
- this way are visible only to [4mless.[24m If a variable is specified in the
- system environment and also in a lesskey file, the value in the lesskey
- file takes precedence. Although the lesskey file can be used to over-
- ride variables set in the environment, the main purpose of assigning
- variables in the lesskey file is simply to have all [4mless[24m configuration
- information stored in one file.
-
-
-[1mEXAMPLE[0m
- The following input file sets the -i option whenever [4mless[24m is run, and
- specifies the character set to be "latin1":
-
- #env
- LESS = -i
- LESSCHARSET = latin1
-
-
-
-[1mSEE ALSO[0m
- less(1)
-
-
-[1mWARNINGS[0m
- On MS-DOS and OS/2 systems, certain keys send a sequence of characters
- which start with a NUL character (0). This NUL character should be
- represented as \340 in a lesskey file.
-
-
-[1mCOPYRIGHT[0m
- Copyright (C) 2000-2012 Mark Nudelman
-
- lesskey is part of the GNU project and is free software; you can redis-
- tribute it and/or modify it under the terms of the GNU General Public
- License as published by the Free Software Foundation; either version 2,
- or (at your option) any later version.
-
- lesskey 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 lesskey; see the file COPYING. If not, write to the Free Software
- Foundation, 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
-
-
-[1mAUTHOR[0m
- Mark Nudelman <bug-less at gnu.org>
- Send bug reports or comments to bug-less at gnu.org.
-
-
-
- Version 458: 04 Apr 2013 LESSKEY(1)
Modified: trunk/contrib/less/lesskey.nro
===================================================================
--- trunk/contrib/less/lesskey.nro 2018-07-06 12:43:22 UTC (rev 11361)
+++ trunk/contrib/less/lesskey.nro 2018-07-06 12:46:07 UTC (rev 11362)
@@ -1,4 +1,4 @@
-.TH LESSKEY 1 "Version 458: 04 Apr 2013"
+.TH LESSKEY 1 "Version 530: 05 Dec 2017"
.SH NAME
lesskey \- specify key bindings for less
.SH SYNOPSIS
@@ -134,7 +134,7 @@
\en forw-line
e forw-line
j forw-line
- \ekd forw-line
+ \ekd forw-line
^E forw-line
^N forw-line
k back-line
@@ -149,15 +149,15 @@
^D forw-scroll
u back-scroll
^U back-scroll
- \e40 forw-screen
+ \e40 forw-screen
f forw-screen
^F forw-screen
^V forw-screen
- \ekD forw-screen
+ \ekD forw-screen
b back-screen
^B back-screen
\eev back-screen
- \ekU back-screen
+ \ekU back-screen
z forw-window
w back-window
\ee\e40 forw-screen-force
@@ -169,7 +169,7 @@
^L repaint
\eeu undo-hilite
g goto-line
- \ekh goto-line
+ \ekh goto-line
< goto-line
\ee< goto-line
p percent
@@ -178,6 +178,10 @@
\ee] right-scroll
\ee( left-scroll
\ee) right-scroll
+ \ekl left-scroll
+ \ekr right-scroll
+ \ee{ no-scroll
+ \ee} end-scroll
{ forw-bracket {}
} back-bracket {}
( forw-bracket ()
@@ -189,7 +193,8 @@
G goto-end
\ee> goto-end
> goto-end
- \eke goto-end
+ \eke goto-end
+ \eeG goto-end-buffered
= status
^G status
:f status
@@ -203,6 +208,8 @@
\eeN reverse-search-all
& filter
m set-mark
+ M set-mark-bottom
+ \eem clear-mark
' goto-mark
^X^X goto-mark
E examine
@@ -356,26 +363,29 @@
This NUL character should be represented as \e340 in a lesskey file.
.SH COPYRIGHT
-Copyright (C) 2000-2012 Mark Nudelman
+Copyright (C) 1984-2017 Mark Nudelman
.PP
-lesskey is part of the GNU project and is free software;
-you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by
-the Free Software Foundation;
-either version 2, or (at your option) any later version.
+less is part of the GNU project and is free software.
+You can redistribute it and/or modify it
+under the terms of either
+(1) the GNU General Public License as published by
+the Free Software Foundation; or (2) the Less License.
+See the file README in the less distribution for more details
+regarding redistribution.
+You should have received a copy of the GNU General Public License
+along with the source for less; see the file COPYING.
+If not, write to the Free Software Foundation, 59 Temple Place,
+Suite 330, Boston, MA 02111-1307, USA.
+You should also have received a copy of the Less License;
+see the file LICENSE.
.PP
-lesskey is distributed in the hope that it will be useful, but
+less 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.
-.PP
-You should have received a copy of the GNU General Public License
-along with lesskey; see the file COPYING.
-If not, write to the Free Software Foundation, 59 Temple Place,
-Suite 330, Boston, MA 02111-1307, USA.
.SH AUTHOR
.PP
-Mark Nudelman <bug-less at gnu.org>
+Mark Nudelman
.br
-Send bug reports or comments to bug-less at gnu.org.
+Send bug reports or comments to <bug-less at gnu.org>.
Modified: trunk/contrib/less/lglob.h
===================================================================
--- trunk/contrib/less/lglob.h 2018-07-06 12:43:22 UTC (rev 11361)
+++ trunk/contrib/less/lglob.h 2018-07-06 12:46:07 UTC (rev 11362)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 1984-2012 Mark Nudelman
+ * Copyright (C) 1984-2017 Mark Nudelman
*
* You may distribute under the terms of either the GNU General Public
* License or the Less License, as specified in the README file.
Modified: trunk/contrib/less/line.c
===================================================================
--- trunk/contrib/less/line.c 2018-07-06 12:43:22 UTC (rev 11361)
+++ trunk/contrib/less/line.c 2018-07-06 12:46:07 UTC (rev 11362)
@@ -1,6 +1,6 @@
/* $FreeBSD: src/contrib/less/line.c,v 1.1.1.4.8.4.2.1 2007/12/04 22:41:44 delphij Exp $ */
/*
- * Copyright (C) 1984-2012 Mark Nudelman
+ * Copyright (C) 1984-2017 Mark Nudelman
*
* You may distribute under the terms of either the GNU General Public
* License or the Less License, as specified in the README file.
@@ -8,7 +8,6 @@
* For more information, see the README file.
*/
-
/*
* Routines to manipulate the "line buffer".
* The line buffer holds a line of output as it is being built
@@ -17,7 +16,13 @@
#include "less.h"
#include "charset.h"
+#include "position.h"
+#if MSDOS_COMPILER==WIN32C
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#endif
+
static char *linebuf = NULL; /* Buffer which holds the current output line */
static char *attr = NULL; /* Extension of linebuf to hold attributes */
public int size_linebuf = 0; /* Size of line buffer (and attr buffer) */
@@ -32,18 +37,20 @@
static int curr; /* Index into linebuf */
static int column; /* Printable length, accounting for
backspaces, etc. */
+static int right_curr;
+static int right_column;
static int overstrike; /* Next char should overstrike previous char */
static int last_overstrike = AT_NORMAL;
static int is_null_line; /* There is no current line */
static int lmargin; /* Left margin */
-static char pendc;
+static LWCHAR pendc;
static POSITION pendpos;
static char *end_ansi_chars;
static char *mid_ansi_chars;
-static int attr_swidth();
-static int attr_ewidth();
-static int do_append();
+static int attr_swidth LESSPARAMS ((int a));
+static int attr_ewidth LESSPARAMS ((int a));
+static int do_append LESSPARAMS ((LWCHAR ch, char *rep, POSITION pos));
extern int sigs;
extern int bs_mode;
@@ -61,6 +68,8 @@
extern int utf_mode;
extern POSITION start_attnpos;
extern POSITION end_attnpos;
+extern LWCHAR rscroll_char;
+extern int rscroll_attr;
static char mbc_buf[MAX_UTF_CHAR_LEN];
static int mbc_buf_len = 0;
@@ -79,7 +88,7 @@
mid_ansi_chars = lgetenv("LESSANSIMIDCHARS");
if (mid_ansi_chars == NULL || *mid_ansi_chars == '\0')
- mid_ansi_chars = "0123456789;[?!\"'#%()*+ ";
+ mid_ansi_chars = "0123456789:;[?!\"'#%()*+ ";
linebuf = (char *) ecalloc(LINEBUF_SIZE, sizeof(char));
attr = (char *) ecalloc(LINEBUF_SIZE, sizeof(char));
@@ -152,6 +161,8 @@
{
curr = 0;
column = 0;
+ right_curr = 0;
+ right_column = 0;
cshift = 0;
overstrike = 0;
last_overstrike = AT_NORMAL;
@@ -160,10 +171,36 @@
pendc = '\0';
lmargin = 0;
if (status_col)
- lmargin += 1;
+ lmargin += 2;
}
/*
+ * Set a character in the line buffer.
+ */
+ static void
+set_linebuf(n, ch, a)
+ int n;
+ LWCHAR ch;
+ char a;
+{
+ linebuf[n] = ch;
+ attr[n] = a;
+}
+
+/*
+ * Append a character to the line buffer.
+ */
+ static void
+add_linebuf(ch, a, w)
+ LWCHAR ch;
+ char a;
+ int w;
+{
+ set_linebuf(curr++, ch, a);
+ column += w;
+}
+
+/*
* Insert the line number (of the given position) into the line buffer.
*/
public void
@@ -170,8 +207,8 @@
plinenum(pos)
POSITION pos;
{
- register LINENUM linenum = 0;
- register int i;
+ LINENUM linenum = 0;
+ int i;
if (linenums == OPT_ONPLUS)
{
@@ -191,15 +228,21 @@
*/
if (status_col)
{
- linebuf[curr] = ' ';
- if (start_attnpos != NULL_POSITION &&
- pos >= start_attnpos && pos < end_attnpos)
- attr[curr] = AT_NORMAL|AT_HILITE;
- else
- attr[curr] = AT_NORMAL;
- curr++;
- column++;
+ int a = AT_NORMAL;
+ char c = posmark(pos);
+ if (c != 0)
+ a |= AT_HILITE;
+ else
+ {
+ c = ' ';
+ if (start_attnpos != NULL_POSITION &&
+ pos >= start_attnpos && pos <= end_attnpos)
+ a |= AT_HILITE;
+ }
+ add_linebuf(c, a, 1); /* column 0: status */
+ add_linebuf(' ', AT_NORMAL, 1); /* column 1: empty */
}
+
/*
* Display the line number at the start of each line
* if the -N option is set.
@@ -206,30 +249,27 @@
*/
if (linenums == OPT_ONPLUS)
{
- char buf[INT_STRLEN_BOUND(pos) + 2];
+ char buf[INT_STRLEN_BOUND(linenum) + 2];
+ int pad = 0;
int n;
linenumtoa(linenum, buf);
- n = strlen(buf);
+ n = (int) strlen(buf);
if (n < MIN_LINENUM_WIDTH)
- n = MIN_LINENUM_WIDTH;
- sprintf(linebuf+curr, "%*s ", n, buf);
- n++; /* One space after the line number. */
+ pad = MIN_LINENUM_WIDTH - n;
+ for (i = 0; i < pad; i++)
+ add_linebuf(' ', AT_NORMAL, 1);
for (i = 0; i < n; i++)
- attr[curr+i] = AT_NORMAL;
- curr += n;
- column += n;
- lmargin += n;
+ add_linebuf(buf[i], AT_BOLD, 1);
+ add_linebuf(' ', AT_NORMAL, 1);
+ lmargin += n + pad + 1;
}
-
/*
* Append enough spaces to bring us to the lmargin.
*/
while (column < lmargin)
{
- linebuf[curr] = ' ';
- attr[curr++] = AT_NORMAL;
- column++;
+ add_linebuf(' ', AT_NORMAL, 1);
}
}
@@ -492,7 +532,7 @@
&& column > lmargin
&& (!(attr[curr - 1] & (AT_ANSI|AT_BINARY))))
{
- curr = p - linebuf;
+ curr = (int) (p - linebuf);
prev_ch = step_char(&p, -1, linebuf + lmargin);
width = pwidth(ch, attr[curr], prev_ch);
column -= width;
@@ -540,7 +580,7 @@
}
/*
- *
+ * Can a char appear in an ANSI escape sequence, before the end char?
*/
public int
is_ansi_middle(ch)
@@ -554,6 +594,23 @@
}
/*
+ * Skip past an ANSI escape sequence.
+ * pp is initially positioned just after the CSI_START char.
+ */
+ public void
+skip_ansi(pp, limit)
+ char **pp;
+ constant char *limit;
+{
+ LWCHAR c;
+ do {
+ c = step_char(pp, +1, limit);
+ } while (*pp < limit && is_ansi_middle(c));
+ /* Note that we discard final char, for which is_ansi_middle is false. */
+}
+
+
+/*
* Append a character and attribute to the line buffer.
*/
#define STORE_CHAR(ch,a,rep,pos) \
@@ -605,7 +662,7 @@
do {
bch = step_char(&p, -1, linebuf);
} while (p > linebuf && !IS_CSI_START(bch));
- curr = p - linebuf;
+ curr = (int) (p - linebuf);
return 0;
}
a = AT_ANSI; /* Will force re-AT_'ing around it. */
@@ -648,11 +705,15 @@
return (1);
}
+ if (column > right_column && w > 0)
+ {
+ right_column = column;
+ right_curr = curr;
+ }
+
while (replen-- > 0)
{
- linebuf[curr] = *rep++;
- attr[curr] = a;
- curr++;
+ add_linebuf(*rep++, a, 0);
}
column += w;
return (0);
@@ -698,7 +759,7 @@
static int
store_prchar(c, pos)
- char c;
+ LWCHAR c;
POSITION pos;
{
char *s;
@@ -742,7 +803,7 @@
*/
public int
pappend(c, pos)
- char c;
+ unsigned char c;
POSITION pos;
{
int r;
@@ -749,6 +810,8 @@
if (pendc)
{
+ if (c == '\r' && pendc == '\r')
+ return (0);
if (do_append(pendc, NULL, pendpos))
/*
* Oops. We've probably lost the char which
@@ -782,7 +845,7 @@
if (!utf_mode)
{
- r = do_append((LWCHAR) c, NULL, pos);
+ r = do_append(c, NULL, pos);
} else
{
/* Perform strict validation in all possible cases. */
@@ -792,7 +855,7 @@
mbc_buf_index = 1;
*mbc_buf = c;
if (IS_ASCII_OCTET(c))
- r = do_append((LWCHAR) c, NULL, pos);
+ r = do_append(c, NULL, pos);
else if (IS_UTF8_LEAD(c))
{
mbc_buf_len = utf_len(c);
@@ -806,7 +869,7 @@
mbc_buf[mbc_buf_index++] = c;
if (mbc_buf_index < mbc_buf_len)
return (0);
- if (is_utf8_well_formed(mbc_buf))
+ if (is_utf8_well_formed(mbc_buf, mbc_buf_index))
r = do_append(get_wchar(mbc_buf), mbc_buf, mbc_pos);
else
/* Complete, but not shortest form, sequence. */
@@ -849,7 +912,7 @@
char *rep;
POSITION pos;
{
- register int a;
+ int a;
LWCHAR prev_ch;
a = AT_NORMAL;
@@ -886,8 +949,14 @@
* or just deletion of the character in the buffer.
*/
overstrike = utf_mode ? -1 : 0;
- /* To be correct, this must be a base character. */
- prev_ch = get_wchar(linebuf + curr);
+ if (utf_mode)
+ {
+ /* To be correct, this must be a base character. */
+ prev_ch = get_wchar(linebuf + curr);
+ } else
+ {
+ prev_ch = (unsigned char) linebuf[curr];
+ }
a = attr[curr];
if (ch == prev_ch)
{
@@ -992,11 +1061,26 @@
}
/*
+ * Switch to normal attribute at end of line.
+ */
+ static void
+add_attr_normal()
+{
+ char *p = "\033[m";
+
+ if (ctldisp != OPT_ONPLUS || !is_ansi_end('m'))
+ return;
+ for ( ; *p != '\0'; p++)
+ add_linebuf(*p, AT_ANSI, 0);
+}
+
+/*
* Terminate the line in the line buffer.
*/
public void
-pdone(endline, forw)
+pdone(endline, chopped, forw)
int endline;
+ int chopped;
int forw;
{
(void) pflushmbc();
@@ -1015,15 +1099,34 @@
if (cshift < hshift)
pshift(hshift - cshift);
- if (ctldisp == OPT_ONPLUS && is_ansi_end('m'))
+ if (chopped && rscroll_char)
{
- /* Switch to normal attribute at end of line. */
- char *p = "\033[m";
- for ( ; *p != '\0'; p++)
+ /*
+ * Display the right scrolling char.
+ * If we've already filled the rightmost screen char
+ * (in the buffer), overwrite it.
+ */
+ if (column >= sc_width)
{
- linebuf[curr] = *p;
- attr[curr++] = AT_ANSI;
+ /* We've already written in the rightmost char. */
+ column = right_column;
+ curr = right_curr;
}
+ add_attr_normal();
+ while (column < sc_width-1)
+ {
+ /*
+ * Space to last (rightmost) char on screen.
+ * This may be necessary if the char we overwrote
+ * was double-width.
+ */
+ add_linebuf(' ', AT_NORMAL, 1);
+ }
+ /* Print rscroll char. It must be single-width. */
+ add_linebuf(rscroll_char, rscroll_attr, 1);
+ } else
+ {
+ add_attr_normal();
}
/*
@@ -1041,9 +1144,7 @@
*/
if (column < sc_width || !auto_wrap || (endline && ignaw) || ctldisp == OPT_ON)
{
- linebuf[curr] = '\n';
- attr[curr] = AT_NORMAL;
- curr++;
+ add_linebuf('\n', AT_NORMAL, 0);
}
else if (ignaw && column >= sc_width && forw)
{
@@ -1061,13 +1162,10 @@
* char on the next line. We don't need to do this "nudge"
* at the top of the screen anyway.
*/
- linebuf[curr] = ' ';
- attr[curr++] = AT_NORMAL;
- linebuf[curr] = '\b';
- attr[curr++] = AT_NORMAL;
+ add_linebuf(' ', AT_NORMAL, 1);
+ add_linebuf('\b', AT_NORMAL, -1);
}
- linebuf[curr] = '\0';
- attr[curr] = AT_NORMAL;
+ set_linebuf(curr, '\0', AT_NORMAL);
}
/*
@@ -1077,8 +1175,7 @@
set_status_col(c)
char c;
{
- linebuf[0] = c;
- attr[0] = AT_NORMAL|AT_HILITE;
+ set_linebuf(0, c, AT_NORMAL|AT_HILITE);
}
/*
@@ -1088,8 +1185,8 @@
*/
public int
gline(i, ap)
- register int i;
- register int *ap;
+ int i;
+ int *ap;
{
if (is_null_line)
{
@@ -1136,8 +1233,8 @@
char **linep;
int *line_lenp;
{
- register int n;
- register int c;
+ int n;
+ int c;
POSITION new_pos;
if (curr_pos == NULL_POSITION || ch_seek(curr_pos) ||
@@ -1185,8 +1282,8 @@
char **linep;
int *line_lenp;
{
- register int n;
- register int c;
+ int n;
+ int c;
POSITION new_pos;
if (curr_pos == NULL_POSITION || curr_pos <= ch_zero() ||
@@ -1248,3 +1345,30 @@
*line_lenp = size_linebuf - 1 - n;
return (new_pos);
}
+
+/*
+ * Find the shift necessary to show the end of the longest displayed line.
+ */
+ public int
+rrshift()
+{
+ POSITION pos;
+ int save_width;
+ int line;
+ int longest = 0;
+
+ save_width = sc_width;
+ sc_width = INT_MAX;
+ hshift = 0;
+ pos = position(TOP);
+ for (line = 0; line < sc_height && pos != NULL_POSITION; line++)
+ {
+ pos = forw_line(pos);
+ if (column > longest)
+ longest = column;
+ }
+ sc_width = save_width;
+ if (longest < sc_width)
+ return 0;
+ return longest - sc_width;
+}
Modified: trunk/contrib/less/linenum.c
===================================================================
--- trunk/contrib/less/linenum.c 2018-07-06 12:43:22 UTC (rev 11361)
+++ trunk/contrib/less/linenum.c 2018-07-06 12:46:07 UTC (rev 11362)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 1984-2012 Mark Nudelman
+ * Copyright (C) 1984-2017 Mark Nudelman
*
* You may distribute under the terms of either the GNU General Public
* License or the Less License, as specified in the README file.
@@ -75,7 +75,7 @@
public void
clr_linenum()
{
- register struct linenum_info *p;
+ struct linenum_info *p;
/*
* Put all the entries on the free list.
@@ -102,7 +102,7 @@
*/
static void
calcgap(p)
- register struct linenum_info *p;
+ struct linenum_info *p;
{
/*
* Don't bother to compute a gap for the anchor.
@@ -125,11 +125,11 @@
LINENUM linenum;
POSITION pos;
{
- register struct linenum_info *p;
- register struct linenum_info *new;
- register struct linenum_info *nextp;
- register struct linenum_info *prevp;
- register POSITION mingap;
+ struct linenum_info *p;
+ struct linenum_info *new;
+ struct linenum_info *nextp;
+ struct linenum_info *prevp;
+ POSITION mingap;
/*
* Find the proper place in the list for the new one.
@@ -216,7 +216,7 @@
static int loopcount;
#if HAVE_TIME
-static long startime;
+static time_type startime;
#endif
static void
@@ -265,8 +265,8 @@
find_linenum(pos)
POSITION pos;
{
- register struct linenum_info *p;
- register LINENUM linenum;
+ struct linenum_info *p;
+ LINENUM linenum;
POSITION cpos;
if (!linenums)
@@ -380,7 +380,7 @@
find_pos(linenum)
LINENUM linenum;
{
- register struct linenum_info *p;
+ struct linenum_info *p;
POSITION cpos;
LINENUM clinenum;
Modified: trunk/contrib/less/lsystem.c
===================================================================
--- trunk/contrib/less/lsystem.c 2018-07-06 12:43:22 UTC (rev 11361)
+++ trunk/contrib/less/lsystem.c 2018-07-06 12:46:07 UTC (rev 11362)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 1984-2012 Mark Nudelman
+ * Copyright (C) 1984-2017 Mark Nudelman
*
* You may distribute under the terms of either the GNU General Public
* License or the Less License, as specified in the README file.
@@ -42,10 +42,10 @@
char *cmd;
char *donemsg;
{
- register int inp;
+ int inp;
#if HAVE_SHELL
- register char *shell;
- register char *p;
+ char *shell;
+ char *p;
#endif
IFILE save_ifile;
#if MSDOS_COMPILER && MSDOS_COMPILER!=WIN32C
@@ -137,7 +137,7 @@
char *esccmd = shell_quote(cmd);
if (esccmd != NULL)
{
- int len = strlen(shell) + strlen(esccmd) + 5;
+ int len = (int) (strlen(shell) + strlen(esccmd) + 5);
p = (char *) ecalloc(len, sizeof(char));
SNPRINTF3(p, len, "%s %s %s", shell, shell_coption(), esccmd);
free(esccmd);
@@ -289,8 +289,8 @@
POSITION spos;
POSITION epos;
{
- register FILE *f;
- register int c;
+ FILE *f;
+ int c;
extern FILE *popen();
/*
Modified: trunk/contrib/less/main.c
===================================================================
--- trunk/contrib/less/main.c 2018-07-06 12:43:22 UTC (rev 11361)
+++ trunk/contrib/less/main.c 2018-07-06 12:46:07 UTC (rev 11362)
@@ -1,6 +1,6 @@
-/* $FreeBSD: src/contrib/less/main.c,v 1.4.8.3 2007/09/05 15:47:07 delphij Exp $ */
+/* $FreeBSD: stable/10/contrib/less/main.c 330571 2018-03-07 06:39:00Z delphij $ */
/*
- * Copyright (C) 1984-2012 Mark Nudelman
+ * Copyright (C) 1984-2017 Mark Nudelman
*
* You may distribute under the terms of either the GNU General Public
* License or the Less License, as specified in the README file.
@@ -54,12 +54,13 @@
static char consoleTitle[256];
#endif
+public int line_count;
extern int less_is_more;
extern int missing_cap;
extern int know_dumb;
-extern int quit_if_one_screen;
extern int no_init;
extern int pr_type;
+extern int quit_if_one_screen;
/*
@@ -114,8 +115,9 @@
* Command line arguments override environment arguments.
*/
is_tty = isatty(1);
+ init_cmds();
get_term();
- init_cmds();
+ expand_cmd_tables();
init_charset();
init_line();
init_cmdhist();
@@ -167,8 +169,6 @@
if (less_is_more)
no_init = TRUE;
- if (less_is_more && get_quit_at_eof())
- quit_if_one_screen = TRUE;
#if EDITOR
editor = lgetenv("VISUAL");
@@ -192,7 +192,6 @@
ifile = get_ifile(FAKE_HELPFILE, ifile);
while (argc-- > 0)
{
- char *filename;
#if (MSDOS_COMPILER && MSDOS_COMPILER != DJGPPC)
/*
* Because the "shell" doesn't expand filename patterns,
@@ -201,7 +200,9 @@
* Expand the pattern and iterate over the expanded list.
*/
struct textlist tlist;
+ char *filename;
char *gfilename;
+ char *qfilename;
gfilename = lglob(*argv++);
init_textlist(&tlist, gfilename);
@@ -208,18 +209,15 @@
filename = NULL;
while ((filename = forw_textlist(&tlist, filename)) != NULL)
{
- (void) get_ifile(filename, ifile);
+ qfilename = shell_unquote(filename);
+ (void) get_ifile(qfilename, ifile);
+ free(qfilename);
ifile = prev_ifile(NULL_IFILE);
}
free(gfilename);
#else
- filename = shell_quote(*argv);
- if (filename == NULL)
- filename = *argv;
- argv++;
- (void) get_ifile(filename, ifile);
+ (void) get_ifile(*argv++, ifile);
ifile = prev_ifile(NULL_IFILE);
- free(filename);
#endif
}
/*
@@ -286,10 +284,19 @@
{
if (edit_stdin()) /* Edit standard input */
quit(QUIT_ERROR);
+ if (quit_if_one_screen)
+ line_count = get_line_count();
} else
{
if (edit_first()) /* Edit first valid file in cmd line */
quit(QUIT_ERROR);
+ if (quit_if_one_screen)
+ {
+ if (nifile() == 1)
+ line_count = get_line_count();
+ else /* If more than one file, -F can not be used */
+ quit_if_one_screen = FALSE;
+ }
}
init();
@@ -305,9 +312,9 @@
*/
public char *
save(s)
- char *s;
+ constant char *s;
{
- register char *p;
+ char *p;
p = (char *) ecalloc(strlen(s)+1, sizeof(char));
strcpy(p, s);
@@ -323,7 +330,7 @@
int count;
unsigned int size;
{
- register VOID_POINTER p;
+ VOID_POINTER p;
p = (VOID_POINTER) calloc(count, size);
if (p != NULL)
@@ -339,7 +346,7 @@
*/
public char *
skipsp(s)
- register char *s;
+ char *s;
{
while (*s == ' ' || *s == '\t')
s++;
@@ -357,9 +364,9 @@
char *s;
int uppercase;
{
- register int c;
- register int sc;
- register int len = 0;
+ int c;
+ int sc;
+ int len = 0;
for ( ; *s != '\0'; s++, ps++)
{
Modified: trunk/contrib/less/mark.c
===================================================================
--- trunk/contrib/less/mark.c 2018-07-06 12:43:22 UTC (rev 11361)
+++ trunk/contrib/less/mark.c 2018-07-06 12:46:07 UTC (rev 11362)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 1984-2012 Mark Nudelman
+ * Copyright (C) 1984-2017 Mark Nudelman
*
* You may distribute under the terms of either the GNU General Public
* License or the Less License, as specified in the README file.
@@ -9,6 +9,7 @@
#include "less.h"
+#include "position.h"
extern IFILE curr_ifile;
extern int sc_height;
@@ -15,14 +16,6 @@
extern int jump_sline;
/*
- * A mark is an ifile (input file) plus a position within the file.
- */
-struct mark {
- IFILE m_ifile;
- struct scrpos m_scrpos;
-};
-
-/*
* The table of marks.
* Each mark is identified by a lowercase or uppercase letter.
* The final one is lmark, for the "last mark"; addressed by the apostrophe.
@@ -69,7 +62,7 @@
getmark(c)
int c;
{
- register struct mark *m;
+ struct mark *m;
static struct mark sm;
switch (c)
@@ -94,7 +87,7 @@
}
m = &sm;
m->m_scrpos.pos = ch_tell();
- m->m_scrpos.ln = sc_height-1;
+ m->m_scrpos.ln = sc_height;
m->m_ifile = curr_ifile;
break;
case '.':
@@ -102,7 +95,7 @@
* Current position in the current file.
*/
m = &sm;
- get_scrpos(&m->m_scrpos);
+ get_scrpos(&m->m_scrpos, TOP);
m->m_ifile = curr_ifile;
break;
case '\'':
@@ -142,21 +135,37 @@
* Set a user-defined mark.
*/
public void
-setmark(c)
+setmark(c, where)
int c;
+ int where;
{
- register struct mark *m;
+ struct mark *m;
struct scrpos scrpos;
m = getumark(c);
if (m == NULL)
return;
- get_scrpos(&scrpos);
+ get_scrpos(&scrpos, where);
m->m_scrpos = scrpos;
m->m_ifile = curr_ifile;
}
/*
+ * Clear a user-defined mark.
+ */
+ public void
+clrmark(c)
+ int c;
+{
+ struct mark *m;
+
+ m = getumark(c);
+ if (m == NULL)
+ return;
+ m->m_scrpos.pos = NULL_POSITION;
+}
+
+/*
* Set lmark (the mark named by the apostrophe).
*/
public void
@@ -166,7 +175,7 @@
if (ch_getflags() & CH_HELPFILE)
return;
- get_scrpos(&scrpos);
+ get_scrpos(&scrpos, TOP);
if (scrpos.pos == NULL_POSITION)
return;
marks[LASTMARK].m_scrpos = scrpos;
@@ -180,7 +189,7 @@
gomark(c)
int c;
{
- register struct mark *m;
+ struct mark *m;
struct scrpos scrpos;
m = getmark(c);
@@ -228,7 +237,7 @@
markpos(c)
int c;
{
- register struct mark *m;
+ struct mark *m;
m = getmark(c);
if (m == NULL)
@@ -243,6 +252,27 @@
}
/*
+ * Return the mark associated with a given position, if any.
+ */
+ public char
+posmark(pos)
+ POSITION pos;
+{
+ int i;
+
+ /* Only lower case and upper case letters */
+ for (i = 0; i < 26*2; i++)
+ {
+ if (marks[i].m_ifile == curr_ifile && marks[i].m_scrpos.pos == pos)
+ {
+ if (i < 26) return 'a' + i;
+ return 'A' + i - 26;
+ }
+ }
+ return 0;
+}
+
+/*
* Clear the marks associated with a specified ifile.
*/
public void
Deleted: trunk/contrib/less/mkfuncs.awk
===================================================================
--- trunk/contrib/less/mkfuncs.awk 2018-07-06 12:43:22 UTC (rev 11361)
+++ trunk/contrib/less/mkfuncs.awk 2018-07-06 12:46:07 UTC (rev 11362)
@@ -1,9 +0,0 @@
-BEGIN { FS="("; state = 0 }
-
-/^ public/ { ftype = $0; state = 1 }
-
-{ if (state == 1)
- state = 2
- else if (state == 2)
- { print ftype,$1,"();"; state = 0 }
-}
Deleted: trunk/contrib/less/mkhelp.c
===================================================================
--- trunk/contrib/less/mkhelp.c 2018-07-06 12:43:22 UTC (rev 11361)
+++ trunk/contrib/less/mkhelp.c 2018-07-06 12:46:07 UTC (rev 11362)
@@ -1,68 +0,0 @@
-/*
- * Copyright (C) 1984-2012 Mark Nudelman
- *
- * You may distribute under the terms of either the GNU General Public
- * License or the Less License, as specified in the README file.
- *
- * For more information, see the README file.
- */
-
-
-/*
- * Silly little program to generate the help.c source file
- * from the less.hlp text file.
- * help.c just contains a char array whose contents are
- * the contents of less.hlp.
- */
-
-#include <stdio.h>
-
- int
-main(argc, argv)
- int argc;
- char *argv[];
-{
- int ch;
- int prevch;
-
- printf("/* This file was generated by mkhelp from less.hlp */\n");
- printf("#include \"less.h\"\n");
- printf("constant char helpdata[] = {\n");
- ch = 0;
- while (prevch = ch, (ch = getchar()) != EOF)
- {
- switch (ch)
- {
- case '\'':
- printf("'\\'',");
- break;
- case '\\':
- printf("'\\\\',");
- break;
- case '\b':
- printf("'\\b',");
- break;
- case '\t':
- printf("'\\t',");
- break;
- case '\n':
- if (prevch != '\r')
- printf("'\\n',\n");
- break;
- case '\r':
- if (prevch != '\n')
- printf("'\\n',\n");
- break;
- default:
- if (ch >= ' ' && ch < 0x7f)
- printf("'%c',", ch);
- else
- printf("0x%02x,", ch);
- break;
- }
- }
- /* Add an extra null char to avoid having a trailing comma. */
- printf(" 0 };\n");
- printf("constant int size_helpdata = sizeof(helpdata) - 1;\n");
- return (0);
-}
Deleted: trunk/contrib/less/mkinstalldirs
===================================================================
--- trunk/contrib/less/mkinstalldirs 2018-07-06 12:43:22 UTC (rev 11361)
+++ trunk/contrib/less/mkinstalldirs 2018-07-06 12:46:07 UTC (rev 11362)
@@ -1,32 +0,0 @@
-#!/bin/sh
-# mkinstalldirs --- make directory hierarchy
-# Author: Noah Friedman <friedman at prep.ai.mit.edu>
-# Created: 1993-05-16
-# Last modified: 1994-03-25
-# Public domain
-
-errstatus=0
-
-for file in ${1+"$@"} ; do
- set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
- shift
-
- pathcomp=
- for d in ${1+"$@"} ; do
- pathcomp="$pathcomp$d"
- case "$pathcomp" in
- -* ) pathcomp=./$pathcomp ;;
- esac
-
- if test ! -d "$pathcomp"; then
- echo "mkdir $pathcomp" 1>&2
- mkdir "$pathcomp" || errstatus=$?
- fi
-
- pathcomp="$pathcomp/"
- done
-done
-
-exit $errstatus
-
-# mkinstalldirs ends here
Copied: trunk/contrib/less/mkutable (from rev 11361, vendor/less/dist/mkutable)
===================================================================
--- trunk/contrib/less/mkutable (rev 0)
+++ trunk/contrib/less/mkutable 2018-07-06 12:46:07 UTC (rev 11362)
@@ -0,0 +1,96 @@
+#! /usr/bin/perl
+use strict;
+
+my $USAGE = <<__EOF__;
+ usage: mkutable [-n] [-f#] type... [--] [<] UnicodeData.txt
+ -n = take non-matching types
+ -f = zero-based type field (default 2)
+__EOF__
+
+use vars qw( $opt_f $opt_n );
+use Getopt::Std;
+my $type_field = 2;
+
+# Override Unicode tables for certain control chars
+# that are expected to be found in normal text files.
+my %force_space = (
+ 0x08 => 1, # backspace
+ 0x09 => 1, # tab
+ 0x0a => 1, # newline
+ 0x0c => 1, # form feed
+ 0x0d => 1, # carriage return
+);
+
+exit (main() ? 0 : 1);
+
+sub main {
+ my $date = `date`;
+ chomp $date;
+ my $args = join ' ', @ARGV;
+ my $header = "/* Generated by \"$0 $args\" on $date */\n";
+
+ die $USAGE if not getopts('f:n');
+ $type_field = $opt_f if $opt_f;
+ my %types;
+ my $arg;
+ while ($arg = shift @ARGV) {
+ last if $arg eq '--';
+ $types{$arg} = 1;
+ }
+ my %out = ( 'types' => \%types );
+
+ print $header;
+ my $last_code = 0;
+ while (<>) {
+ chomp;
+ s/#.*//;
+ my @fields = split /;/;
+ next if not @fields;
+ my ($lo_code, $hi_code);
+ my $codes = $fields[0];
+ if ($codes =~ /(\w+)\.\.(\w+)/) {
+ $lo_code = hex $1;
+ $hi_code = hex $2;
+ } else {
+ $lo_code = $hi_code = hex $fields[0];
+ }
+ my $type = $fields[$type_field];
+ $type =~ s/\s//g;
+ for ($last_code = $lo_code; $last_code <= $hi_code; ++$last_code) {
+ $type = 'Zs' if $force_space{$last_code};
+ output(\%out, $last_code, $type);
+ }
+ }
+ output(\%out, $last_code);
+ return 1;
+}
+
+sub output {
+ my ($out, $code, $type) = @_;
+ my $type_ok = ($type and ${${$out}{types}}{$type});
+ $type_ok = not $type_ok if $opt_n;
+ my $prev_code = $$out{prev_code};
+
+ if (not $type_ok) {
+ end_run($out, $prev_code);
+ } elsif (not $$out{in_run} or $type ne $$out{run_type} or $code != $prev_code+1) {
+ end_run($out, $prev_code);
+ start_run($out, $code, $type);
+ }
+ $$out{prev_code} = $code;
+}
+
+sub start_run {
+ my ($out, $code, $type) = @_;
+ $$out{start_code} = $code;
+ $$out{prev_code} = $code;
+ $$out{run_type} = $type;
+ $$out{in_run} = 1;
+}
+
+sub end_run {
+ my ($out, $code) = @_;
+ return if not $$out{in_run};
+ printf "\t{ 0x%04x, 0x%04x }, /* %s */\n", $$out{start_code}, $code, $$out{run_type};
+ $$out{in_run} = 0;
+}
Modified: trunk/contrib/less/optfunc.c
===================================================================
--- trunk/contrib/less/optfunc.c 2018-07-06 12:43:22 UTC (rev 11361)
+++ trunk/contrib/less/optfunc.c 2018-07-06 12:46:07 UTC (rev 11362)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 1984-2012 Mark Nudelman
+ * Copyright (C) 1984-2017 Mark Nudelman
*
* You may distribute under the terms of either the GNU General Public
* License or the Less License, as specified in the README file.
@@ -43,12 +43,15 @@
extern char *eqproto;
extern char *hproto;
extern char *wproto;
+extern char *every_first_cmd;
extern IFILE curr_ifile;
extern char version[];
extern int jump_sline;
-extern int jump_sline_fraction;
+extern long jump_sline_fraction;
extern int shift_count;
-extern int shift_count_fraction;
+extern long shift_count_fraction;
+extern LWCHAR rscroll_char;
+extern int rscroll_attr;
extern int less_is_more;
#if LOGFILE
extern char *namelogfile;
@@ -58,6 +61,7 @@
#if TAGS
public char *tagoption = NULL;
extern char *tags;
+extern char ztags[];
#endif
#if MSDOS_COMPILER
extern int nm_fg_color, nm_bg_color;
@@ -65,7 +69,13 @@
extern int ul_fg_color, ul_bg_color;
extern int so_fg_color, so_bg_color;
extern int bl_fg_color, bl_bg_color;
+extern int sgr_mode;
+#if MSDOS_COMPILER==WIN32C
+#ifndef COMMON_LVB_UNDERSCORE
+#define COMMON_LVB_UNDERSCORE 0x8000
#endif
+#endif
+#endif
#if LOGFILE
@@ -78,6 +88,7 @@
char *s;
{
PARG parg;
+ char *filename;
if (secure)
{
@@ -87,7 +98,7 @@
switch (type)
{
case INIT:
- namelogfile = s;
+ namelogfile = save(s);
break;
case TOGGLE:
if (ch_getflags() & CH_CANSEEK)
@@ -101,7 +112,11 @@
return;
}
s = skipsp(s);
- namelogfile = lglob(s);
+ if (namelogfile != NULL)
+ free(namelogfile);
+ filename = lglob(s);
+ namelogfile = shell_unquote(filename);
+ free(filename);
use_logfile(namelogfile);
sync_logfile();
break;
@@ -175,8 +190,8 @@
} else
{
- sprintf(buf, ".%06d", jump_sline_fraction);
- len = strlen(buf);
+ sprintf(buf, ".%06ld", jump_sline_fraction);
+ len = (int) strlen(buf);
while (len > 2 && buf[len-1] == '0')
len--;
buf[len] = '\0';
@@ -240,8 +255,8 @@
} else
{
- sprintf(buf, ".%06d", shift_count_fraction);
- len = strlen(buf);
+ sprintf(buf, ".%06ld", shift_count_fraction);
+ len = (int) strlen(buf);
while (len > 2 && buf[len-1] == '0')
len--;
buf[len] = '\0';
@@ -295,7 +310,7 @@
switch (type)
{
case INIT:
- tagoption = s;
+ tagoption = save(s);
/* Do the rest in main() */
break;
case TOGGLE:
@@ -331,15 +346,20 @@
char *s;
{
PARG parg;
+ char *filename;
switch (type)
{
case INIT:
- tags = s;
+ tags = save(s);
break;
case TOGGLE:
s = skipsp(s);
- tags = lglob(s);
+ if (tags != NULL && tags != ztags)
+ free(tags);
+ filename = lglob(s);
+ tags = shell_unquote(filename);
+ free(filename);
break;
case QUERY:
parg.p_string = tags;
@@ -355,24 +375,32 @@
public void
opt_p(type, s)
int type;
- register char *s;
+ char *s;
{
switch (type)
{
case INIT:
/*
- * Unget a search command for the specified string.
- * {{ This won't work if the "/" command is
- * changed or invalidated by a .lesskey file. }}
+ * Unget a command for the specified string.
*/
- plusoption = TRUE;
- ungetsc(s);
- /*
- * In "more" mode, the -p argument is a command,
- * not a search string, so we don't need a slash.
- */
- if (!less_is_more)
+ if (less_is_more)
+ {
+ /*
+ * In "more" mode, the -p argument is a command,
+ * not a search string, so we don't need a slash.
+ */
+ every_first_cmd = save(s);
+ } else
+ {
+ plusoption = TRUE;
+ ungetcc(CHAR_END_COMMAND);
+ ungetsc(s);
+ /*
+ * {{ This won't work if the "/" command is
+ * changed or invalidated by a .lesskey file. }}
+ */
ungetsc("/");
+ }
break;
}
}
@@ -383,9 +411,9 @@
public void
opt__P(type, s)
int type;
- register char *s;
+ char *s;
{
- register char **proto;
+ char **proto;
PARG parg;
switch (type)
@@ -503,7 +531,7 @@
putstr("no ");
#endif
putstr("regular expressions)\n");
- putstr("Copyright (C) 1984-2012 Mark Nudelman\n\n");
+ putstr("Copyright (C) 1984-2017 Mark Nudelman\n\n");
putstr("less comes with NO WARRANTY, to the extent permitted by law.\n");
putstr("For information about the terms of redistribution,\n");
putstr("see the file named README in the less distribution.\n");
@@ -525,12 +553,27 @@
{
int fg, bg;
int err;
-
+#if MSDOS_COMPILER==WIN32C
+ int ul = 0;
+
+ if (*s == 'u')
+ {
+ ul = COMMON_LVB_UNDERSCORE;
+ ++s;
+ }
+#endif
fg = getnum(&s, "D", &err);
if (err)
{
- error("Missing fg color in -D", NULL_PARG);
- return;
+#if MSDOS_COMPILER==WIN32C
+ if (ul)
+ fg = nm_fg_color;
+ else
+#endif
+ {
+ error("Missing fg color in -D", NULL_PARG);
+ return;
+ }
}
if (*s != '.')
bg = nm_bg_color;
@@ -544,6 +587,14 @@
return;
}
}
+#if MSDOS_COMPILER==WIN32C
+ if (*s == 'u')
+ {
+ ul = COMMON_LVB_UNDERSCORE;
+ ++s;
+ }
+ fg |= ul;
+#endif
if (*s != '\0')
error("Extra characters at end of -D option", NULL_PARG);
*fg_color = fg;
@@ -559,6 +610,8 @@
int type;
char *s;
{
+ PARG p;
+
switch (type)
{
case INIT:
@@ -580,8 +633,11 @@
case 's':
colordesc(s, &so_fg_color, &so_bg_color);
break;
+ case 'a':
+ sgr_mode = !sgr_mode;
+ break;
default:
- error("-D must be followed by n, d, u, k or s", NULL_PARG);
+ error("-D must be followed by n, d, u, k, s or a", NULL_PARG);
break;
}
if (type == TOGGLE)
@@ -591,6 +647,8 @@
}
break;
case QUERY:
+ p.p_string = (sgr_mode) ? "on" : "off";
+ error("SGR mode is %s", &p);
break;
}
}
@@ -602,7 +660,7 @@
public void
opt_x(type, s)
int type;
- register char *s;
+ char *s;
{
extern int tabstops[];
extern int ntabstops;
@@ -660,7 +718,7 @@
public void
opt_quote(type, s)
int type;
- register char *s;
+ char *s;
{
char buf[3];
PARG parg;
@@ -696,6 +754,40 @@
}
/*
+ * Handler for the --rscroll option.
+ */
+ /*ARGSUSED*/
+ public void
+opt_rscroll(type, s)
+ int type;
+ char *s;
+{
+ PARG p;
+
+ switch (type)
+ {
+ case INIT:
+ case TOGGLE: {
+ char *fmt;
+ int attr = AT_STANDOUT;
+ setfmt(s, &fmt, &attr, "*s>");
+ if (strcmp(fmt, "-") == 0)
+ {
+ rscroll_char = 0;
+ } else
+ {
+ rscroll_char = *fmt ? *fmt : '>';
+ rscroll_attr = attr;
+ }
+ break; }
+ case QUERY: {
+ p.p_string = rscroll_char ? prchar(rscroll_char) : "-";
+ error("rscroll char is %s", &p);
+ break; }
+ }
+}
+
+/*
* "-?" means display a help message.
* If from the command line, exit immediately.
*/
Modified: trunk/contrib/less/option.c
===================================================================
--- trunk/contrib/less/option.c 2018-07-06 12:43:22 UTC (rev 11361)
+++ trunk/contrib/less/option.c 2018-07-06 12:46:07 UTC (rev 11362)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 1984-2012 Mark Nudelman
+ * Copyright (C) 1984-2017 Mark Nudelman
*
* You may distribute under the terms of either the GNU General Public
* License or the Less License, as specified in the README file.
@@ -69,8 +69,8 @@
scan_option(s)
char *s;
{
- register struct loption *o;
- register int optc;
+ struct loption *o;
+ int optc;
char *optname;
char *printopt;
char *str;
@@ -152,7 +152,10 @@
if (*str == '+')
every_first_cmd = save(str+1);
else
+ {
+ ungetcc(CHAR_END_COMMAND);
ungetsc(str);
+ }
free(str);
continue;
case '0': case '1': case '2': case '3': case '4':
@@ -302,7 +305,7 @@
char *s;
int how_toggle;
{
- register int num;
+ int num;
int no_prompt;
int err;
PARG parg;
@@ -565,8 +568,8 @@
char *printopt;
char *validchars;
{
- register char *p;
- register char *out;
+ char *p;
+ char *out;
if (*s == '\0')
{
@@ -629,9 +632,9 @@
char *printopt;
int *errp;
{
- register char *s;
- register int n;
- register int neg;
+ char *s;
+ int n;
+ int neg;
s = skipsp(*sp);
neg = FALSE;
@@ -666,7 +669,7 @@
char *printopt;
int *errp;
{
- register char *s;
+ char *s;
long frac = 0;
int fraclen = 0;
@@ -701,5 +704,5 @@
if (!less_is_more)
return quit_at_eof;
/* When less_is_more is set, the -e flag semantics are different. */
- return quit_at_eof ? OPT_ON : OPT_ONPLUS;
+ return quit_at_eof ? OPT_ONPLUS : OPT_ON;
}
Modified: trunk/contrib/less/option.h
===================================================================
--- trunk/contrib/less/option.h 2018-07-06 12:43:22 UTC (rev 11361)
+++ trunk/contrib/less/option.h 2018-07-06 12:46:07 UTC (rev 11362)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 1984-2012 Mark Nudelman
+ * Copyright (C) 1984-2017 Mark Nudelman
*
* You may distribute under the terms of either the GNU General Public
* License or the Less License, as specified in the README file.
@@ -60,7 +60,7 @@
int otype; /* Type of the option */
int odefault; /* Default value */
int *ovar; /* Pointer to the associated variable */
- void (*ofunc)(); /* Pointer to special handling function */
+ void (*ofunc) LESSPARAMS ((int, char*)); /* Pointer to special handling function */
char *odesc[3]; /* Description of each value */
};
Modified: trunk/contrib/less/opttbl.c
===================================================================
--- trunk/contrib/less/opttbl.c 2018-07-06 12:43:22 UTC (rev 11361)
+++ trunk/contrib/less/opttbl.c 2018-07-06 12:46:07 UTC (rev 11362)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 1984-2012 Mark Nudelman
+ * Copyright (C) 1984-2017 Mark Nudelman
*
* You may distribute under the terms of either the GNU General Public
* License or the Less License, as specified in the README file.
@@ -53,6 +53,8 @@
public int follow_mode; /* F cmd Follows file desc or file name? */
public int oldbot; /* Old bottom of screen behavior {{REMOVE}} */
public int opt_use_backslash; /* Use backslash escaping in option parsing */
+public LWCHAR rscroll_char; /* Char which marks chopped lines with -S */
+public int rscroll_attr; /* Attribute of rscroll_char */
#if HILITE_SEARCH
public int hilite_search; /* Highlight matched search patterns? */
#endif
@@ -117,6 +119,7 @@
static struct optname oldbot_optname = { "old-bot", NULL };
static struct optname follow_optname = { "follow-name", NULL };
static struct optname use_backslash_optname = { "use-backslash", NULL };
+static struct optname rscroll_optname = { "rscroll", NULL };
/*
@@ -176,10 +179,10 @@
},
#if MSDOS_COMPILER
{ 'D', &D__optname,
- STRING|REPAINT|NO_QUERY, 0, NULL, opt_D,
+ STRING|REPAINT, 0, NULL, opt_D,
{
"color desc: ",
- "Ddknsu0123456789.",
+ "Dadknsu0123456789.",
NULL
}
},
@@ -456,6 +459,10 @@
NULL
}
},
+ { OLETTER_NONE, &rscroll_optname,
+ STRING|REPAINT|INIT_HANDLER, 0, NULL, opt_rscroll,
+ { "right scroll character: ", NULL, NULL }
+ },
{ '\0', NULL, NOVAR, 0, NULL, NULL, { NULL, NULL, NULL } }
};
@@ -466,7 +473,7 @@
public void
init_option()
{
- register struct loption *o;
+ struct loption *o;
char *p;
p = lgetenv("LESS_IS_MORE");
@@ -492,7 +499,7 @@
findopt(c)
int c;
{
- register struct loption *o;
+ struct loption *o;
for (o = option; o->oletter != '\0'; o++)
{
@@ -533,9 +540,9 @@
int *p_err;
{
char *optname = *p_optname;
- register struct loption *o;
- register struct optname *oname;
- register int len;
+ struct loption *o;
+ struct optname *oname;
+ int len;
int uppercase;
struct loption *maxo = NULL;
struct optname *maxoname = NULL;
Modified: trunk/contrib/less/os.c
===================================================================
--- trunk/contrib/less/os.c 2018-07-06 12:43:22 UTC (rev 11361)
+++ trunk/contrib/less/os.c 2018-07-06 12:46:07 UTC (rev 11362)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 1984-2012 Mark Nudelman
+ * Copyright (C) 1984-2017 Mark Nudelman
*
* You may distribute under the terms of either the GNU General Public
* License or the Less License, as specified in the README file.
@@ -33,12 +33,6 @@
#include <values.h>
#endif
-#if HAVE_TIME_T
-#define time_type time_t
-#else
-#define time_type long
-#endif
-
/*
* BSD setjmp() saves (and longjmp() restores) the signal mask.
* This costs a system call or two per setjmp(), so if possible we clear the
@@ -68,10 +62,10 @@
public int
iread(fd, buf, len)
int fd;
- char *buf;
+ unsigned char *buf;
unsigned int len;
{
- register int n;
+ int n;
start:
#if MSDOS_COMPILER==WIN32C
@@ -191,7 +185,7 @@
* Return the current time.
*/
#if HAVE_TIME
- public long
+ public time_type
get_time()
{
time_type t;
@@ -232,8 +226,8 @@
errno_message(filename)
char *filename;
{
- register char *p;
- register char *m;
+ char *p;
+ char *m;
int len;
#if HAVE_ERRNO
#if MUST_DEFINE_ERRNO
@@ -243,7 +237,7 @@
#else
p = "cannot open";
#endif
- len = strlen(filename) + strlen(p) + 3;
+ len = (int) (strlen(filename) + strlen(p) + 3);
m = (char *) ecalloc(len, sizeof(char));
SNPRINTF2(m, len, "%s: %s", filename, p);
return (m);
@@ -277,7 +271,8 @@
*/
public int
percentage(num, den)
- POSITION num, den;
+ POSITION num;
+ POSITION den;
{
return (int) muldiv(num, (POSITION) 100, den);
}
Modified: trunk/contrib/less/output.c
===================================================================
--- trunk/contrib/less/output.c 2018-07-06 12:43:22 UTC (rev 11361)
+++ trunk/contrib/less/output.c 2018-07-06 12:46:07 UTC (rev 11362)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 1984-2012 Mark Nudelman
+ * Copyright (C) 1984-2017 Mark Nudelman
*
* You may distribute under the terms of either the GNU General Public
* License or the Less License, as specified in the README file.
@@ -15,7 +15,10 @@
#include "less.h"
#if MSDOS_COMPILER==WIN32C
#include "windows.h"
+#ifndef COMMON_LVB_UNDERSCORE
+#define COMMON_LVB_UNDERSCORE 0x8000
#endif
+#endif
public int errmsgs; /* Count of messages displayed by error() */
public int need_clr;
@@ -37,7 +40,11 @@
extern int ul_fg_color, ul_bg_color;
extern int so_fg_color, so_bg_color;
extern int bl_fg_color, bl_bg_color;
+extern int sgr_mode;
+#if MSDOS_COMPILER==WIN32C
+extern int have_ul;
#endif
+#endif
/*
* Display the line which is in the line buffer.
@@ -45,8 +52,8 @@
public void
put_line()
{
- register int c;
- register int i;
+ int c;
+ int i;
int a;
if (ABORT_SIGS())
@@ -95,10 +102,10 @@
public void
flush()
{
- register int n;
- register int fd;
+ int n;
+ int fd;
- n = ob - obuf;
+ n = (int) (ob - obuf);
if (n == 0)
return;
@@ -126,8 +133,9 @@
* the -D command-line option.
*/
char *anchor, *p, *p_next;
- unsigned char fg, bg;
- static unsigned char at;
+ static int fg, fgi, bg, bgi;
+ static int at;
+ int f, b;
#if MSDOS_COMPILER==WIN32C
/* Screen colors used by 3x and 4x SGR commands. */
static unsigned char screen_color[] = {
@@ -147,6 +155,13 @@
};
#endif
+ if (fg == 0 && bg == 0)
+ {
+ fg = nm_fg_color & 7;
+ fgi = nm_fg_color & 8;
+ bg = nm_bg_color & 7;
+ bgi = nm_bg_color & 8;
+ }
for (anchor = p_next = obuf;
(p_next = memchr(p_next, ESC, ob - p_next)) != NULL; )
{
@@ -173,18 +188,21 @@
*/
p++;
anchor = p_next = p;
- at = 0;
+ fg = nm_fg_color & 7;
+ fgi = nm_fg_color & 8;
+ bg = nm_bg_color & 7;
+ bgi = nm_bg_color & 8;
+ at = 0;
WIN32setcolors(nm_fg_color, nm_bg_color);
continue;
}
p_next = p;
+ at &= ~32;
/*
* Select foreground/background colors
* based on the escape sequence.
*/
- fg = nm_fg_color;
- bg = nm_bg_color;
while (!is_ansi_end(*p))
{
char *q;
@@ -197,7 +215,7 @@
* Leave it unprocessed
* in the buffer.
*/
- int slop = q - anchor;
+ int slop = (int) (q - anchor);
/* {{ strcpy args overlap! }} */
strcpy(obuf, anchor);
ob = &obuf[slop];
@@ -212,17 +230,35 @@
break;
}
if (*q == ';')
+ {
q++;
+ at |= 32;
+ }
switch (code)
{
default:
/* case 0: all attrs off */
- fg = nm_fg_color;
- bg = nm_bg_color;
- at = 0;
+ fg = nm_fg_color & 7;
+ bg = nm_bg_color & 7;
+ at &= 32;
+ /*
+ * \e[0m use normal
+ * intensities, but
+ * \e[0;...m resets them
+ */
+ if (at & 32)
+ {
+ fgi = 0;
+ bgi = 0;
+ } else
+ {
+ fgi = nm_fg_color & 8;
+ bgi = nm_bg_color & 8;
+ }
break;
case 1: /* bold on */
+ fgi = 8;
at |= 1;
break;
case 3: /* italic on */
@@ -229,17 +265,25 @@
case 7: /* inverse on */
at |= 2;
break;
- case 4: /* underline on */
+ case 4: /* underline on */
+#if MSDOS_COMPILER==WIN32C
+ if (have_ul)
+ bgi = COMMON_LVB_UNDERSCORE >> 4;
+ else
+#endif
+ bgi = 8;
at |= 4;
break;
case 5: /* slow blink on */
case 6: /* fast blink on */
+ bgi = 8;
at |= 8;
break;
case 8: /* concealed on */
- fg = (bg & 7) | 8;
+ at |= 16;
break;
case 22: /* bold off */
+ fgi = 0;
at &= ~1;
break;
case 23: /* italic off */
@@ -247,23 +291,31 @@
at &= ~2;
break;
case 24: /* underline off */
+ bgi = 0;
at &= ~4;
break;
+ case 28: /* concealed off */
+ at &= ~16;
+ break;
case 30: case 31: case 32:
case 33: case 34: case 35:
case 36: case 37:
- fg = (fg & 8) | (screen_color[code - 30]);
+ fg = screen_color[code - 30];
+ at |= 32;
break;
case 39: /* default fg */
- fg = nm_fg_color;
+ fg = nm_fg_color & 7;
+ at |= 32;
break;
case 40: case 41: case 42:
case 43: case 44: case 45:
case 46: case 47:
- bg = (bg & 8) | (screen_color[code - 40]);
+ bg = screen_color[code - 40];
+ at |= 32;
break;
- case 49: /* default fg */
- bg = nm_bg_color;
+ case 49: /* default bg */
+ bg = nm_bg_color & 7;
+ at |= 32;
break;
}
p = q;
@@ -270,39 +322,57 @@
}
if (!is_ansi_end(*p) || p == p_next)
break;
- if (at & 1)
+ /*
+ * In SGR mode, the ANSI sequence is
+ * always honored; otherwise if an attr
+ * is used by itself ("\e[1m" versus
+ * "\e[1;33m", for example), set the
+ * color assigned to that attribute.
+ */
+ if (sgr_mode || (at & 32))
{
- /*
- * If \e[1m use defined bold
- * color, else set intensity.
- */
- if (p[-2] == '[')
+ if (at & 2)
{
+ f = bg | bgi;
+ b = fg | fgi;
+ } else
+ {
+ f = fg | fgi;
+ b = bg | bgi;
+ }
+ } else
+ {
+ if (at & 1)
+ {
+ f = bo_fg_color;
+ b = bo_bg_color;
+ } else if (at & 2)
+ {
+ f = so_fg_color;
+ b = so_bg_color;
+ } else if (at & 4)
+ {
+ f = ul_fg_color;
+ b = ul_bg_color;
+ } else if (at & 8)
+ {
+ f = bl_fg_color;
+ b = bl_bg_color;
+ } else
+ {
+ f = nm_fg_color;
+ b = nm_bg_color;
+ }
+ }
+ if (at & 16)
+ f = b ^ 8;
+ f &= 0xf;
#if MSDOS_COMPILER==WIN32C
- fg |= FOREGROUND_INTENSITY;
- bg |= BACKGROUND_INTENSITY;
+ b &= 0xf | (COMMON_LVB_UNDERSCORE >> 4);
#else
- fg = bo_fg_color;
- bg = bo_bg_color;
+ b &= 0xf;
#endif
- } else
- fg |= 8;
- } else if (at & 2)
- {
- fg = so_fg_color;
- bg = so_bg_color;
- } else if (at & 4)
- {
- fg = ul_fg_color;
- bg = ul_bg_color;
- } else if (at & 8)
- {
- fg = bl_fg_color;
- bg = bl_bg_color;
- }
- fg &= 0xf;
- bg &= 0xf;
- WIN32setcolors(fg, bg);
+ WIN32setcolors(f, b);
p_next = anchor = p + 1;
} else
p_next++;
@@ -381,7 +451,7 @@
*/
public void
putstr(s)
- register char *s;
+ constant char *s;
{
while (*s != '\0')
putchr(*s++);
@@ -398,7 +468,7 @@
{ \
int neg = (num < 0); \
char tbuf[INT_STRLEN_BOUND(num)+2]; \
- register char *s = tbuf + sizeof(tbuf); \
+ char *s = tbuf + sizeof(tbuf); \
if (neg) num = -num; \
*--s = '\0'; \
do { \
@@ -423,7 +493,7 @@
inttoa(num, buf);
putstr(buf);
- return (strlen(buf));
+ return ((int) strlen(buf));
}
/*
@@ -437,7 +507,7 @@
linenumtoa(num, buf);
putstr(buf);
- return (strlen(buf));
+ return ((int) strlen(buf));
}
/*
@@ -446,11 +516,11 @@
*/
static int
less_printf(fmt, parg)
- register char *fmt;
+ char *fmt;
PARG *parg;
{
- register char *s;
- register int col;
+ char *s;
+ int col;
col = 0;
while (*fmt != '\0')
@@ -481,6 +551,9 @@
col += iprint_linenum(parg->p_linenum);
parg++;
break;
+ case '%':
+ putchr('%');
+ break;
}
}
}
@@ -545,7 +618,7 @@
get_return();
lower_left();
- clear_eol();
+ clear_eol();
if (col >= sc_width)
/*
@@ -590,7 +663,7 @@
char *fmt;
PARG *parg;
{
- register int c;
+ int c;
int col = 0;
if (any_display && is_tty)
Modified: trunk/contrib/less/pattern.c
===================================================================
--- trunk/contrib/less/pattern.c 2018-07-06 12:43:22 UTC (rev 11361)
+++ trunk/contrib/less/pattern.c 2018-07-06 12:46:07 UTC (rev 11362)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 1984-2012 Mark Nudelman
+ * Copyright (C) 1984-2017 Mark Nudelman
*
* You may distribute under the terms of either the GNU General Public
* License or the Less License, as specified in the README file.
@@ -12,19 +12,18 @@
*/
#include "less.h"
-#include "pattern.h"
extern int caseless;
-extern int less_is_more;
/*
* Compile a search pattern, for future use by match_pattern.
*/
static int
-compile_pattern2(pattern, search_type, comp_pattern)
+compile_pattern2(pattern, search_type, comp_pattern, show_error)
char *pattern;
int search_type;
- void **comp_pattern;
+ PATTERN_TYPE *comp_pattern;
+ int show_error;
{
if (search_type & SRCH_NO_REGEX)
return (0);
@@ -32,35 +31,39 @@
#if HAVE_GNU_REGEX
struct re_pattern_buffer *comp = (struct re_pattern_buffer *)
ecalloc(1, sizeof(struct re_pattern_buffer));
- struct re_pattern_buffer **pcomp =
- (struct re_pattern_buffer **) comp_pattern;
re_set_syntax(RE_SYNTAX_POSIX_EXTENDED);
if (re_compile_pattern(pattern, strlen(pattern), comp))
{
free(comp);
- error("Invalid pattern", NULL_PARG);
+ if (show_error)
+ error("Invalid pattern", NULL_PARG);
return (-1);
}
- if (*pcomp != NULL)
- regfree(*pcomp);
- *pcomp = comp;
+ if (*comp_pattern != NULL)
+ {
+ regfree(*comp_pattern);
+ free(*comp_pattern);
+ }
+ *comp_pattern = comp;
#endif
#if HAVE_POSIX_REGCOMP
regex_t *comp = (regex_t *) ecalloc(1, sizeof(regex_t));
- regex_t **pcomp = (regex_t **) comp_pattern;
if (regcomp(comp, pattern, REGCOMP_FLAG))
{
free(comp);
- error("Invalid pattern", NULL_PARG);
+ if (show_error)
+ error("Invalid pattern", NULL_PARG);
return (-1);
}
- if (*pcomp != NULL)
- regfree(*pcomp);
- *pcomp = comp;
+ if (*comp_pattern != NULL)
+ {
+ regfree(*comp_pattern);
+ free(*comp_pattern);
+ }
+ *comp_pattern = comp;
#endif
#if HAVE_PCRE
pcre *comp;
- pcre **pcomp = (pcre **) comp_pattern;
constant char *errstring;
int erroffset;
PARG parg;
@@ -69,37 +72,40 @@
if (comp == NULL)
{
parg.p_string = (char *) errstring;
- error("%s", &parg);
+ if (show_error)
+ error("%s", &parg);
return (-1);
}
- *pcomp = comp;
+ *comp_pattern = comp;
#endif
#if HAVE_RE_COMP
PARG parg;
- int *pcomp = (int *) comp_pattern;
if ((parg.p_string = re_comp(pattern)) != NULL)
{
- error("%s", &parg);
+ if (show_error)
+ error("%s", &parg);
return (-1);
}
- *pcomp = 1;
+ *comp_pattern = 1;
#endif
#if HAVE_REGCMP
char *comp;
- char **pcomp = (char **) comp_pattern;
if ((comp = regcmp(pattern, 0)) == NULL)
{
- error("Invalid pattern", NULL_PARG);
+ if (show_error)
+ error("Invalid pattern", NULL_PARG);
return (-1);
}
- if (pcomp != NULL)
- free(*pcomp);
- *pcomp = comp;
+ if (comp_pattern != NULL)
+ free(*comp_pattern);
+ *comp_pattern = comp;
#endif
#if HAVE_V8_REGCOMP
struct regexp *comp;
- struct regexp **pcomp = (struct regexp **) comp_pattern;
- if ((comp = regcomp(pattern)) == NULL)
+ reg_show_error = show_error;
+ comp = regcomp(pattern);
+ reg_show_error = 1;
+ if (comp == NULL)
{
/*
* regcomp has already printed an error message
@@ -107,9 +113,9 @@
*/
return (-1);
}
- if (*pcomp != NULL)
- free(*pcomp);
- *pcomp = comp;
+ if (*comp_pattern != NULL)
+ free(*comp_pattern);
+ *comp_pattern = comp;
#endif
}
return (0);
@@ -122,7 +128,7 @@
compile_pattern(pattern, search_type, comp_pattern)
char *pattern;
int search_type;
- void **comp_pattern;
+ PATTERN_TYPE *comp_pattern;
{
char *cvt_pattern;
int result;
@@ -134,7 +140,7 @@
cvt_pattern = (char*) ecalloc(1, cvt_length(strlen(pattern), CVT_TO_LC));
cvt_text(cvt_pattern, pattern, (int *)NULL, (int *)NULL, CVT_TO_LC);
}
- result = compile_pattern2(cvt_pattern, search_type, comp_pattern);
+ result = compile_pattern2(cvt_pattern, search_type, comp_pattern, 1);
if (cvt_pattern != pattern)
free(cvt_pattern);
return (result);
@@ -145,50 +151,68 @@
*/
public void
uncompile_pattern(pattern)
- void **pattern;
+ PATTERN_TYPE *pattern;
{
#if HAVE_GNU_REGEX
- struct re_pattern_buffer **pcomp = (struct re_pattern_buffer **) pattern;
- if (*pcomp != NULL)
- regfree(*pcomp);
- *pcomp = NULL;
+ if (*pattern != NULL)
+ {
+ regfree(*pattern);
+ free(*pattern);
+ }
+ *pattern = NULL;
#endif
#if HAVE_POSIX_REGCOMP
- regex_t **pcomp = (regex_t **) pattern;
- if (*pcomp != NULL)
- regfree(*pcomp);
- *pcomp = NULL;
+ if (*pattern != NULL)
+ {
+ regfree(*pattern);
+ free(*pattern);
+ }
+ *pattern = NULL;
#endif
#if HAVE_PCRE
- pcre **pcomp = (pcre **) pattern;
- if (*pcomp != NULL)
- pcre_free(*pcomp);
- *pcomp = NULL;
+ if (*pattern != NULL)
+ pcre_free(*pattern);
+ *pattern = NULL;
#endif
#if HAVE_RE_COMP
- int *pcomp = (int *) pattern;
- *pcomp = 0;
+ *pattern = 0;
#endif
#if HAVE_REGCMP
- char **pcomp = (char **) pattern;
- if (*pcomp != NULL)
- free(*pcomp);
- *pcomp = NULL;
+ if (*pattern != NULL)
+ free(*pattern);
+ *pattern = NULL;
#endif
#if HAVE_V8_REGCOMP
- struct regexp **pcomp = (struct regexp **) pattern;
- if (*pcomp != NULL)
- free(*pcomp);
- *pcomp = NULL;
+ if (*pattern != NULL)
+ free(*pattern);
+ *pattern = NULL;
#endif
}
/*
+ * Can a pattern be successfully compiled?
+ */
+ public int
+valid_pattern(pattern)
+ char *pattern;
+{
+ PATTERN_TYPE comp_pattern;
+ int result;
+
+ CLEAR_PATTERN(comp_pattern);
+ result = compile_pattern2(pattern, 0, &comp_pattern, 0);
+ if (result != 0)
+ return (0);
+ uncompile_pattern(&comp_pattern);
+ return (1);
+}
+
+/*
* Is a compiled pattern null?
*/
public int
is_null_pattern(pattern)
- void *pattern;
+ PATTERN_TYPE pattern;
{
#if HAVE_GNU_REGEX
return (pattern == NULL);
@@ -208,6 +232,9 @@
#if HAVE_V8_REGCOMP
return (pattern == NULL);
#endif
+#if NO_REGEX
+ return (pattern == NULL);
+#endif
}
/*
@@ -222,15 +249,23 @@
int buf_len;
char **pfound, **pend;
{
- register char *pp, *lp;
- register char *pattern_end = pattern + pattern_len;
- register char *buf_end = buf + buf_len;
+ char *pp, *lp;
+ char *pattern_end = pattern + pattern_len;
+ char *buf_end = buf + buf_len;
for ( ; buf < buf_end; buf++)
{
- for (pp = pattern, lp = buf; *pp == *lp; pp++, lp++)
+ for (pp = pattern, lp = buf; ; pp++, lp++)
+ {
+ char cp = *pp;
+ char cl = *lp;
+ if (caseless == OPT_ONPLUS && ASCII_IS_UPPER(cp))
+ cp = ASCII_TO_LOWER(cp);
+ if (cp != cl)
+ break;
if (pp == pattern_end || lp == buf_end)
break;
+ }
if (pp == pattern_end)
{
if (pfound != NULL)
@@ -249,7 +284,7 @@
*/
public int
match_pattern(pattern, tpattern, line, line_len, sp, ep, notbol, search_type)
- void *pattern;
+ PATTERN_TYPE pattern;
char *tpattern;
char *line;
int line_len;
@@ -259,25 +294,8 @@
int search_type;
{
int matched;
-#if HAVE_GNU_REGEX
- struct re_pattern_buffer *spattern = (struct re_pattern_buffer *) pattern;
-#endif
-#if HAVE_POSIX_REGCOMP
- regex_t *spattern = (regex_t *) pattern;
-#endif
-#if HAVE_PCRE
- pcre *spattern = (pcre *) pattern;
-#endif
-#if HAVE_RE_COMP
- int spattern = (int) pattern;
-#endif
-#if HAVE_REGCMP
- char *spattern = (char *) pattern;
-#endif
-#if HAVE_V8_REGCOMP
- struct regexp *spattern = (struct regexp *) pattern;
-#endif
+ *sp = *ep = NULL;
#if NO_REGEX
search_type |= SRCH_NO_REGEX;
#endif
@@ -288,18 +306,14 @@
#if HAVE_GNU_REGEX
{
struct re_registers search_regs;
- regoff_t *starts = (regoff_t *) ecalloc(1, sizeof (regoff_t));
- regoff_t *ends = (regoff_t *) ecalloc(1, sizeof (regoff_t));
- spattern->not_bol = notbol;
- re_set_registers(spattern, &search_regs, 1, starts, ends);
- matched = re_search(spattern, line, line_len, 0, line_len, &search_regs) >= 0;
+ pattern->not_bol = notbol;
+ pattern->regs_allocated = REGS_UNALLOCATED;
+ matched = re_search(pattern, line, line_len, 0, line_len, &search_regs) >= 0;
if (matched)
{
*sp = line + search_regs.start[0];
*ep = line + search_regs.end[0];
}
- free(starts);
- free(ends);
}
#endif
#if HAVE_POSIX_REGCOMP
@@ -306,7 +320,12 @@
{
regmatch_t rm;
int flags = (notbol) ? REG_NOTBOL : 0;
- matched = !regexec(spattern, line, 1, &rm, flags);
+#ifdef REG_STARTEND
+ flags |= REG_STARTEND;
+ rm.rm_so = 0;
+ rm.rm_eo = line_len;
+#endif
+ matched = !regexec(pattern, line, 1, &rm, flags);
if (matched)
{
#ifndef __WATCOMC__
@@ -323,7 +342,7 @@
{
int flags = (notbol) ? PCRE_NOTBOL : 0;
int ovector[3];
- matched = pcre_exec(spattern, NULL, line, line_len,
+ matched = pcre_exec(pattern, NULL, line, line_len,
0, flags, ovector, 3) >= 0;
if (matched)
{
@@ -340,7 +359,7 @@
*sp = *ep = NULL;
#endif
#if HAVE_REGCMP
- *ep = regex(spattern, line);
+ *ep = regex(pattern, line);
matched = (*ep != NULL);
if (matched)
*sp = __loc1;
@@ -347,14 +366,14 @@
#endif
#if HAVE_V8_REGCOMP
#if HAVE_REGEXEC2
- matched = regexec2(spattern, line, notbol);
+ matched = regexec2(pattern, line, notbol);
#else
- matched = regexec(spattern, line);
+ matched = regexec(pattern, line);
#endif
if (matched)
{
- *sp = spattern->startp[0];
- *ep = spattern->endp[0];
+ *sp = pattern->startp[0];
+ *ep = pattern->endp[0];
}
#endif
}
Modified: trunk/contrib/less/pattern.h
===================================================================
--- trunk/contrib/less/pattern.h 2018-07-06 12:43:22 UTC (rev 11361)
+++ trunk/contrib/less/pattern.h 2018-07-06 12:46:07 UTC (rev 11362)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 1984-2012 Mark Nudelman
+ * Copyright (C) 1984-2017 Mark Nudelman
*
* You may distribute under the terms of either the GNU General Public
* License or the Less License, as specified in the README file.
@@ -10,7 +10,7 @@
#if HAVE_GNU_REGEX
#define __USE_GNU 1
#include <regex.h>
-#define DEFINE_PATTERN(name) struct re_pattern_buffer *name
+#define PATTERN_TYPE struct re_pattern_buffer *
#define CLEAR_PATTERN(name) name = NULL
#endif
@@ -17,42 +17,44 @@
#if HAVE_POSIX_REGCOMP
#include <regex.h>
#ifdef REG_EXTENDED
+extern int less_is_more;
#define REGCOMP_FLAG (less_is_more ? 0 : REG_EXTENDED)
#else
-#define REGCOMP_FLAG 0
+#define REGCOMP_FLAG 0
#endif
-#define DEFINE_PATTERN(name) regex_t *name
+#define PATTERN_TYPE regex_t *
#define CLEAR_PATTERN(name) name = NULL
#endif
#if HAVE_PCRE
#include <pcre.h>
-#define DEFINE_PATTERN(name) pcre *name
+#define PATTERN_TYPE pcre *
#define CLEAR_PATTERN(name) name = NULL
#endif
#if HAVE_RE_COMP
-char *re_comp();
-int re_exec();
-#define DEFINE_PATTERN(name) int name
+char *re_comp LESSPARAMS ((char*));
+int re_exec LESSPARAMS ((char*));
+#define PATTERN_TYPE int
#define CLEAR_PATTERN(name) name = 0
#endif
#if HAVE_REGCMP
-char *regcmp();
-char *regex();
+char *regcmp LESSPARAMS ((char*));
+char *regex LESSPARAMS ((char**, char*));
extern char *__loc1;
-#define DEFINE_PATTERN(name) char *name
+#define PATTERN_TYPE char **
#define CLEAR_PATTERN(name) name = NULL
#endif
#if HAVE_V8_REGCOMP
#include "regexp.h"
-#define DEFINE_PATTERN(name) struct regexp *name
+extern int reg_show_error;
+#define PATTERN_TYPE struct regexp *
#define CLEAR_PATTERN(name) name = NULL
#endif
#if NO_REGEX
-#define DEFINE_PATTERN(name)
+#define PATTERN_TYPE void *
#define CLEAR_PATTERN(name)
#endif
Modified: trunk/contrib/less/pckeys.h
===================================================================
--- trunk/contrib/less/pckeys.h 2018-07-06 12:43:22 UTC (rev 11361)
+++ trunk/contrib/less/pckeys.h 2018-07-06 12:46:07 UTC (rev 11362)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 1984-2012 Mark Nudelman
+ * Copyright (C) 1984-2017 Mark Nudelman
*
* You may distribute under the terms of either the GNU General Public
* License or the Less License, as specified in the README file.
Modified: trunk/contrib/less/position.c
===================================================================
--- trunk/contrib/less/position.c 2018-07-06 12:43:22 UTC (rev 11361)
+++ trunk/contrib/less/position.c 2018-07-06 12:46:07 UTC (rev 11362)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 1984-2012 Mark Nudelman
+ * Copyright (C) 1984-2017 Mark Nudelman
*
* You may distribute under the terms of either the GNU General Public
* License or the Less License, as specified in the README file.
@@ -36,21 +36,22 @@
* the line after the bottom line on the screen
*/
public POSITION
-position(where)
- int where;
+position(sindex)
+ int sindex;
{
- switch (where)
+ switch (sindex)
{
case BOTTOM:
- where = sc_height - 2;
+ sindex = sc_height - 2;
break;
case BOTTOM_PLUS_ONE:
- where = sc_height - 1;
+ sindex = sc_height - 1;
break;
case MIDDLE:
- where = (sc_height - 1) / 2;
+ sindex = (sc_height - 1) / 2;
+ break;
}
- return (table[where]);
+ return (table[sindex]);
}
/*
@@ -60,7 +61,7 @@
add_forw_pos(pos)
POSITION pos;
{
- register int i;
+ int i;
/*
* Scroll the position table up.
@@ -77,7 +78,7 @@
add_back_pos(pos)
POSITION pos;
{
- register int i;
+ int i;
/*
* Scroll the position table down.
@@ -93,7 +94,7 @@
public void
pos_clear()
{
- register int i;
+ int i;
for (i = 0; i < sc_height; i++)
table[i] = NULL_POSITION;
@@ -115,7 +116,7 @@
*/
if (table != NULL)
{
- get_scrpos(&scrpos);
+ get_scrpos(&scrpos, TOP);
free((char*)table);
} else
scrpos.pos = NULL_POSITION;
@@ -135,7 +136,7 @@
onscreen(pos)
POSITION pos;
{
- register int i;
+ int i;
if (pos < table[0])
return (-1);
@@ -159,7 +160,7 @@
int s;
int e;
{
- register int i;
+ int i;
for (i = s; i <= e; i++)
if (table[i] != NULL_POSITION && table[i] != 0)
@@ -176,16 +177,26 @@
* the screen line to a number > 0.
*/
public void
-get_scrpos(scrpos)
+get_scrpos(scrpos, where)
struct scrpos *scrpos;
+ int where;
{
- register int i;
+ int i;
+ int dir;
+ int last;
+ switch (where)
+ {
+ case TOP: i = 0; dir = +1; last = sc_height-2; break;
+ default: i = sc_height-2; dir = -1; last = 0; break;
+ }
+
/*
* Find the first line on the screen which has something on it,
* and return the screen line number and the file position.
*/
- for (i = 0; i < sc_height; i++)
+ for (;; i += dir)
+ {
if (table[i] != NULL_POSITION)
{
scrpos->ln = i+1;
@@ -192,6 +203,8 @@
scrpos->pos = table[i];
return;
}
+ if (i == last) break;
+ }
/*
* The screen is empty.
*/
@@ -208,7 +221,7 @@
* relative to the bottom of the screen.
*/
public int
-adjsline(sline)
+sindex_from_sline(sline)
int sline;
{
/*
@@ -218,12 +231,12 @@
if (sline < 0)
sline += sc_height;
/*
- * Can't be less than 1 or greater than sc_height-1.
+ * Can't be less than 1 or greater than sc_height.
*/
if (sline <= 0)
sline = 1;
- if (sline >= sc_height)
- sline = sc_height - 1;
+ if (sline > sc_height)
+ sline = sc_height;
/*
* Return zero-based line number, not one-based.
*/
Modified: trunk/contrib/less/position.h
===================================================================
--- trunk/contrib/less/position.h 2018-07-06 12:43:22 UTC (rev 11361)
+++ trunk/contrib/less/position.h 2018-07-06 12:46:07 UTC (rev 11362)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 1984-2012 Mark Nudelman
+ * Copyright (C) 1984-2017 Mark Nudelman
*
* You may distribute under the terms of either the GNU General Public
* License or the Less License, as specified in the README file.
Modified: trunk/contrib/less/prompt.c
===================================================================
--- trunk/contrib/less/prompt.c 2018-07-06 12:43:22 UTC (rev 11361)
+++ trunk/contrib/less/prompt.c 2018-07-06 12:46:07 UTC (rev 11362)
@@ -1,6 +1,6 @@
/* $FreeBSD: src/contrib/less/prompt.c,v 1.4.8.2 2007/07/03 05:12:41 delphij Exp $ */
/*
- * Copyright (C) 1984-2012 Mark Nudelman
+ * Copyright (C) 1984-2017 Mark Nudelman
*
* You may distribute under the terms of either the GNU General Public
* License or the Less License, as specified in the README file.
@@ -86,9 +86,9 @@
{
int len;
- len = strlen(s);
+ len = (int) strlen(s);
if (mp + len >= message + PROMPT_SIZE)
- len = message + PROMPT_SIZE - mp - 1;
+ len = (int) (message + PROMPT_SIZE - mp - 1);
strncpy(mp, s, len);
mp += len;
*mp = '\0';
@@ -395,9 +395,9 @@
*/
static constant char *
skipcond(p)
- register constant char *p;
+ constant char *p;
{
- register int iflevel;
+ int iflevel;
/*
* We came in here after processing a ? or :,
@@ -465,7 +465,7 @@
case 'm': *wp = MIDDLE; break;
case 'b': *wp = BOTTOM; break;
case 'B': *wp = BOTTOM_PLUS_ONE; break;
- case 'j': *wp = adjsline(jump_sline); break;
+ case 'j': *wp = sindex_from_sline(jump_sline); break;
default: *wp = TOP; p--; break;
}
}
@@ -480,8 +480,8 @@
constant char *proto;
int maxwidth;
{
- register constant char *p;
- register int c;
+ constant char *p;
+ int c;
int where;
mp = message;
Modified: trunk/contrib/less/regexp.c
===================================================================
--- trunk/contrib/less/regexp.c 2018-07-06 12:43:22 UTC (rev 11361)
+++ trunk/contrib/less/regexp.c 2018-07-06 12:46:07 UTC (rev 11362)
@@ -243,7 +243,10 @@
regcode = r->program;
regc(MAGIC);
if (reg(0, &flags) == NULL)
+ {
+ free(r);
return(NULL);
+ }
/* Dig out information for optimizations. */
r->regstart = '\0'; /* Worst-case defaults. */
@@ -274,7 +277,7 @@
for (; scan != NULL; scan = regnext(scan))
if (OP(scan) == EXACTLY && ((int) strlen(OPERAND(scan))) >= len) {
longest = OPERAND(scan);
- len = strlen(OPERAND(scan));
+ len = (int) strlen(OPERAND(scan));
}
r->regmust = longest;
r->regmlen = len;
@@ -554,7 +557,7 @@
register char ender;
regparse--;
- len = strcspn(regparse, META);
+ len = (int) strcspn(regparse, META);
if (len <= 0)
FAIL("internal disaster");
ender = *(regparse+len);
@@ -670,9 +673,9 @@
}
if (OP(scan) == BACK)
- offset = scan - val;
+ offset = (int) (scan - val);
else
- offset = val - scan;
+ offset = (int) (val - scan);
*(scan+1) = (offset>>8)&0377;
*(scan+2) = offset&0377;
}
@@ -870,7 +873,7 @@
/* Inline the first character, for speed. */
if (*opnd != *reginput)
return(0);
- len = strlen(opnd);
+ len = (int) strlen(opnd);
if (len > 1 && strncmp(opnd, reginput, len) != 0)
return(0);
reginput += len;
@@ -1034,7 +1037,7 @@
opnd = OPERAND(p);
switch (OP(p)) {
case ANY:
- count = strlen(scan);
+ count = (int) strlen(scan);
scan += count;
break;
case EXACTLY:
Modified: trunk/contrib/less/screen.c
===================================================================
--- trunk/contrib/less/screen.c 2018-07-06 12:43:22 UTC (rev 11361)
+++ trunk/contrib/less/screen.c 2018-07-06 12:46:07 UTC (rev 11362)
@@ -1,6 +1,6 @@
/* $FreeBSD: src/contrib/less/screen.c,v 1.4.8.2.2.1 2007/12/04 22:41:44 delphij Exp $ */
/*
- * Copyright (C) 1984-2012 Mark Nudelman
+ * Copyright (C) 1984-2017 Mark Nudelman
*
* You may distribute under the terms of either the GNU General Public
* License or the Less License, as specified in the README file.
@@ -127,16 +127,21 @@
static HANDLE con_out_ours = INVALID_HANDLE_VALUE; /* our own */
HANDLE con_out = INVALID_HANDLE_VALUE; /* current console */
+extern int utf_mode;
extern int quitting;
static void win32_init_term();
static void win32_deinit_term();
+#ifndef ENABLE_VIRTUAL_TERMINAL_PROCESSING
+#define ENABLE_VIRTUAL_TERMINAL_PROCESSING 4
+#endif
+
#define FG_COLORS (FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE | FOREGROUND_INTENSITY)
#define BG_COLORS (BACKGROUND_RED | BACKGROUND_GREEN | BACKGROUND_BLUE | BACKGROUND_INTENSITY)
#define MAKEATTR(fg,bg) ((WORD)((fg)|((bg)<<4)))
#define SETCOLORS(fg,bg) { curr_attr = MAKEATTR(fg,bg); \
if (SetConsoleTextAttribute(con_out, curr_attr) == 0) \
- error("SETCOLORS failed"); }
+ error("SETCOLORS failed", NULL_PARG); }
#endif
#if MSDOS_COMPILER
@@ -152,7 +157,10 @@
public int bl_bg_color;
static int sy_fg_color; /* Color of system text (before less) */
static int sy_bg_color;
-
+public int sgr_mode; /* Honor ANSI sequences rather than using above */
+#if MSDOS_COMPILER==WIN32C
+public int have_ul; /* Is underline available? */
+#endif
#else
/*
@@ -201,9 +209,11 @@
public int can_goto_line; /* Can move cursor to any line */
public int clear_bg; /* Clear fills with background color */
public int missing_cap = 0; /* Some capability is missing */
+public char *kent = NULL; /* Keypad ENTER sequence */
static int attrmode = AT_NORMAL;
extern int binattr;
+extern int line_count;
#if !MSDOS_COMPILER
static char *cheaper();
@@ -233,6 +243,7 @@
extern int screen_trashed;
extern int tty;
extern int top_scroll;
+extern int quit_if_one_screen;
extern int oldbot;
#if HILITE_SEARCH
extern int hilite_search;
@@ -694,7 +705,7 @@
public void
scrsize()
{
- register char *s;
+ char *s;
int sys_height;
int sys_width;
#if !MSDOS_COMPILER
@@ -1107,6 +1118,7 @@
so_bg_color = 9;
bl_fg_color = 15;
bl_bg_color = 0;
+ sgr_mode = 0;
/*
* Get size of the screen.
@@ -1118,7 +1130,7 @@
#else /* !MSDOS_COMPILER */
char *sp;
- register char *t1, *t2;
+ char *t1, *t2;
char *term;
char termbuf[TERMBUF_SIZE];
@@ -1207,7 +1219,8 @@
sc_e_keypad = ltgetstr("ke", &sp);
if (sc_e_keypad == NULL)
sc_e_keypad = "";
-
+ kent = ltgetstr("@8", &sp);
+
sc_init = ltgetstr("ti", &sp);
if (sc_init == NULL)
sc_init = "";
@@ -1449,6 +1462,9 @@
static void
initcolor()
{
+#if MSDOS_COMPILER==BORLANDC || MSDOS_COMPILER==DJGPPC
+ intensevideo();
+#endif
SETCOLORS(nm_fg_color, nm_bg_color);
#if 0
/*
@@ -1492,6 +1508,8 @@
if (con_out_ours == INVALID_HANDLE_VALUE)
{
+ DWORD output_mode;
+
/*
* Create our own screen buffer, so that we
* may restore the original when done.
@@ -1502,6 +1520,12 @@
(LPSECURITY_ATTRIBUTES) NULL,
CONSOLE_TEXTMODE_BUFFER,
(LPVOID) NULL);
+ /*
+ * Enable underline, if available.
+ */
+ GetConsoleMode(con_out_ours, &output_mode);
+ have_ul = SetConsoleMode(con_out_ours,
+ output_mode | ENABLE_VIRTUAL_TERMINAL_PROCESSING);
}
size.X = scr.srWindow.Right - scr.srWindow.Left + 1;
@@ -1534,7 +1558,9 @@
init()
{
#if !MSDOS_COMPILER
- if (!no_init)
+ if (quit_if_one_screen && line_count >= sc_height)
+ quit_if_one_screen = FALSE;
+ if (!no_init && !quit_if_one_screen)
tputs(sc_init, sc_height, putchr);
if (!no_keypad)
tputs(sc_s_keypad, sc_height, putchr);
@@ -1574,7 +1600,7 @@
#if !MSDOS_COMPILER
if (!no_keypad)
tputs(sc_e_keypad, sc_height, putchr);
- if (!no_init)
+ if (!no_init && !quit_if_one_screen)
tputs(sc_deinit, sc_height, putchr);
#else
/* Restore system colors. */
@@ -1820,6 +1846,8 @@
public void
lower_left()
{
+ if (!init_done)
+ return;
#if !MSDOS_COMPILER
tputs(sc_lower_left, 1, putchr);
#else
@@ -1894,14 +1922,14 @@
* Goto a specific line on the screen.
*/
public void
-goto_line(slinenum)
- int slinenum;
+goto_line(sindex)
+ int sindex;
{
#if !MSDOS_COMPILER
- tputs(tgoto(sc_move, 0, slinenum), 1, putchr);
+ tputs(tgoto(sc_move, 0, sindex), 1, putchr);
#else
flush();
- _settextposition(slinenum+1, 1);
+ _settextposition(sindex+1, 1);
#endif
}
@@ -1942,7 +1970,7 @@
}
#else
#if MSDOS_COMPILER==BORLANDC
- register int n;
+ int n;
whitescreen = (unsigned short *)
malloc(sc_width * sc_height * sizeof(short));
@@ -1952,7 +1980,7 @@
whitescreen[n] = 0x7020;
#else
#if MSDOS_COMPILER==WIN32C
- register int n;
+ int n;
whitescreen = (WORD *)
malloc(sc_height * sc_width * sizeof(WORD));
@@ -2433,7 +2461,16 @@
currentKey.scan = PCK_CTL_DELETE;
break;
}
+ } else if (ip.Event.KeyEvent.dwControlKeyState & SHIFT_PRESSED)
+ {
+ switch (currentKey.scan)
+ {
+ case PCK_SHIFT_TAB: /* tab */
+ currentKey.ascii = 0;
+ break;
+ }
}
+
return (TRUE);
}
@@ -2491,7 +2528,18 @@
{
#if MSDOS_COMPILER==WIN32C
DWORD written;
- WriteConsole(con_out, text, len, &written, NULL);
+ if (utf_mode == 2)
+ {
+ /*
+ * We've got UTF-8 text in a non-UTF-8 console. Convert it to
+ * wide and use WriteConsoleW.
+ */
+ WCHAR wtext[1024];
+ len = MultiByteToWideChar(CP_UTF8, 0, text, len, wtext,
+ sizeof(wtext)/sizeof(*wtext));
+ WriteConsoleW(con_out, wtext, len, &written, NULL);
+ } else
+ WriteConsole(con_out, text, len, &written, NULL);
#else
char c = text[len];
text[len] = '\0';
Modified: trunk/contrib/less/scrsize.c
===================================================================
--- trunk/contrib/less/scrsize.c 2018-07-06 12:43:22 UTC (rev 11361)
+++ trunk/contrib/less/scrsize.c 2018-07-06 12:46:07 UTC (rev 11362)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 1984-2012 Mark Nudelman
+ * Copyright (C) 1984-2017 Mark Nudelman
*
* You may distribute under the terms of either the GNU General Public
* License or the Less License, as specified in the README file.
Modified: trunk/contrib/less/search.c
===================================================================
--- trunk/contrib/less/search.c 2018-07-06 12:43:22 UTC (rev 11361)
+++ trunk/contrib/less/search.c 2018-07-06 12:46:07 UTC (rev 11362)
@@ -1,6 +1,6 @@
/* $FreeBSD: src/contrib/less/search.c,v 1.5.8.3.2.1 2007/12/04 22:41:44 delphij Exp $ */
/*
- * Copyright (C) 1984-2012 Mark Nudelman
+ * Copyright (C) 1984-2017 Mark Nudelman
*
* You may distribute under the terms of either the GNU General Public
* License or the Less License, as specified in the README file.
@@ -14,7 +14,6 @@
*/
#include "less.h"
-#include "pattern.h"
#include "position.h"
#include "charset.h"
@@ -28,10 +27,9 @@
extern int sc_height;
extern int jump_sline;
extern int bs_mode;
-extern int less_is_more;
extern int ctldisp;
extern int status_col;
-extern void * constant ml_search;
+extern void *ml_search;
extern POSITION start_attnpos;
extern POSITION end_attnpos;
extern int utf_mode;
@@ -47,15 +45,57 @@
static int is_caseless;
static int is_ucase_pattern;
+/*
+ * Structures for maintaining a set of ranges for hilites and filtered-out
+ * lines. Each range is stored as a node within a red-black tree, and we
+ * try to extend existing ranges (without creating overlaps) rather than
+ * create new nodes if possible. We remember the last node found by a
+ * search for constant-time lookup if the next search is near enough to
+ * the previous. To aid that, we overlay a secondary doubly-linked list
+ * on top of the red-black tree so we can find the preceding/succeeding
+ * nodes also in constant time.
+ *
+ * Each node is allocated from a series of pools, each pool double the size
+ * of the previous (for amortised constant time allocation). Since our only
+ * tree operations are clear and node insertion, not node removal, we don't
+ * need to maintain a usage bitmap or freelist and can just return nodes
+ * from the pool in-order until capacity is reached.
+ */
struct hilite
{
- struct hilite *hl_next;
POSITION hl_startpos;
POSITION hl_endpos;
};
-static struct hilite hilite_anchor = { NULL, NULL_POSITION, NULL_POSITION };
-static struct hilite filter_anchor = { NULL, NULL_POSITION, NULL_POSITION };
-#define hl_first hl_next
+struct hilite_node
+{
+ struct hilite_node *parent;
+ struct hilite_node *left;
+ struct hilite_node *right;
+ struct hilite_node *prev;
+ struct hilite_node *next;
+ int red;
+ struct hilite r;
+};
+struct hilite_storage
+{
+ int capacity;
+ int used;
+ struct hilite_storage *next;
+ struct hilite_node *nodes;
+};
+struct hilite_tree
+{
+ struct hilite_storage *first;
+ struct hilite_storage *current;
+ struct hilite_node *root;
+ struct hilite_node *lookaside;
+};
+#define HILITE_INITIALIZER() { NULL, NULL, NULL, NULL }
+#define HILITE_LOOKASIDE_STEPS 2
+
+static struct hilite_tree hilite_anchor = HILITE_INITIALIZER();
+static struct hilite_tree filter_anchor = HILITE_INITIALIZER();
+
#endif
/*
@@ -63,7 +103,7 @@
* search pattern and filter pattern.
*/
struct pattern_info {
- DEFINE_PATTERN(compiled);
+ PATTERN_TYPE compiled;
char* text;
int search_type;
};
@@ -219,9 +259,8 @@
repaint_hilite(on)
int on;
{
- int slinenum;
+ int sindex;
POSITION pos;
- POSITION epos;
int save_hide_hilite;
if (squished)
@@ -242,14 +281,13 @@
return;
}
- for (slinenum = TOP; slinenum < TOP + sc_height-1; slinenum++)
+ for (sindex = TOP; sindex < TOP + sc_height-1; sindex++)
{
- pos = position(slinenum);
+ pos = position(sindex);
if (pos == NULL_POSITION)
continue;
- epos = position(slinenum+1);
(void) forw_line(pos);
- goto_line(slinenum);
+ goto_line(sindex);
put_line();
}
lower_left();
@@ -262,7 +300,7 @@
public void
clear_attn()
{
- int slinenum;
+ int sindex;
POSITION old_start_attnpos;
POSITION old_end_attnpos;
POSITION pos;
@@ -283,17 +321,17 @@
if (squished)
repaint();
- for (slinenum = TOP; slinenum < TOP + sc_height-1; slinenum++)
+ for (sindex = TOP; sindex < TOP + sc_height-1; sindex++)
{
- pos = position(slinenum);
+ pos = position(sindex);
if (pos == NULL_POSITION)
continue;
- epos = position(slinenum+1);
- if (pos < old_end_attnpos &&
+ epos = position(sindex+1);
+ if (pos <= old_end_attnpos &&
(epos == NULL_POSITION || epos > old_start_attnpos))
{
(void) forw_line(pos);
- goto_line(slinenum);
+ goto_line(sindex);
put_line();
moved = 1;
}
@@ -311,9 +349,14 @@
{
if (!prev_pattern(&search_info))
{
- error("No previous regular expression", NULL_PARG);
- return;
+ if (hilite_anchor.first == NULL)
+ {
+ error("No previous regular expression", NULL_PARG);
+ return;
+ }
+ clr_hilite(); /* Next time, hilite_anchor.first will be NULL. */
}
+ clear_pattern(&search_info);
#if HILITE_SEARCH
hide_hilite = !hide_hilite;
repaint_hilite(1);
@@ -326,17 +369,23 @@
*/
public void
clr_hlist(anchor)
- struct hilite *anchor;
+ struct hilite_tree *anchor;
{
- struct hilite *hl;
- struct hilite *nexthl;
+ struct hilite_storage *hls;
+ struct hilite_storage *nexthls;
- for (hl = anchor->hl_first; hl != NULL; hl = nexthl)
+ for (hls = anchor->first; hls != NULL; hls = nexthls)
{
- nexthl = hl->hl_next;
- free((void*)hl);
+ nexthls = hls->next;
+ free((void*)hls->nodes);
+ free((void*)hls);
}
- anchor->hl_first = NULL;
+ anchor->first = NULL;
+ anchor->current = NULL;
+ anchor->root = NULL;
+
+ anchor->lookaside = NULL;
+
prep_startpos = prep_endpos = NULL_POSITION;
}
@@ -352,7 +401,127 @@
clr_hlist(&filter_anchor);
}
+ struct hilite_node*
+hlist_last(anchor)
+ struct hilite_tree *anchor;
+{
+ struct hilite_node *n = anchor->root;
+ while (n != NULL && n->right != NULL)
+ n = n->right;
+ return n;
+}
+
+ struct hilite_node*
+hlist_next(n)
+ struct hilite_node *n;
+{
+ return n->next;
+}
+
+ struct hilite_node*
+hlist_prev(n)
+ struct hilite_node *n;
+{
+ return n->prev;
+}
+
/*
+ * Find the node covering pos, or the node after it if no node covers it,
+ * or return NULL if pos is after the last range. Remember the found node,
+ * to speed up subsequent searches for the same or similar positions (if
+ * we return NULL, remember the last node.)
+ */
+ struct hilite_node*
+hlist_find(anchor, pos)
+ struct hilite_tree *anchor;
+ POSITION pos;
+{
+ struct hilite_node *n, *m;
+
+ if (anchor->lookaside)
+ {
+ int steps = 0;
+ int hit = 0;
+
+ n = anchor->lookaside;
+
+ for (;;)
+ {
+ if (pos < n->r.hl_endpos)
+ {
+ if (n->prev == NULL || pos >= n->prev->r.hl_endpos)
+ {
+ hit = 1;
+ break;
+ }
+ } else if (n->next == NULL)
+ {
+ n = NULL;
+ hit = 1;
+ break;
+ }
+
+ /*
+ * If we don't find the right node within a small
+ * distance, don't keep doing a linear search!
+ */
+ if (steps >= HILITE_LOOKASIDE_STEPS)
+ break;
+ steps++;
+
+ if (pos < n->r.hl_endpos)
+ anchor->lookaside = n = n->prev;
+ else
+ anchor->lookaside = n = n->next;
+ }
+
+ if (hit)
+ return n;
+ }
+
+ n = anchor->root;
+ m = NULL;
+
+ while (n != NULL)
+ {
+ if (pos < n->r.hl_startpos)
+ {
+ if (n->left != NULL)
+ {
+ m = n;
+ n = n->left;
+ continue;
+ }
+ break;
+ }
+ if (pos >= n->r.hl_endpos)
+ {
+ if (n->right != NULL)
+ {
+ n = n->right;
+ continue;
+ }
+ if (m != NULL)
+ {
+ n = m;
+ } else
+ {
+ m = n;
+ n = NULL;
+ }
+ }
+ break;
+ }
+
+ if (n != NULL)
+ anchor->lookaside = n;
+ else if (m != NULL)
+ anchor->lookaside = m;
+
+ return n;
+}
+
+/*
* Should any characters in a specified range be highlighted?
*/
static int
@@ -360,18 +529,8 @@
POSITION pos;
POSITION epos;
{
- struct hilite *hl;
-
- /*
- * Look at each highlight and see if any part of it falls in the range.
- */
- for (hl = hilite_anchor.hl_first; hl != NULL; hl = hl->hl_next)
- {
- if (hl->hl_endpos > pos &&
- (epos == NULL_POSITION || epos > hl->hl_startpos))
- return (1);
- }
- return (0);
+ struct hilite_node *n = hlist_find(&hilite_anchor, pos);
+ return (n != NULL && (epos == NULL_POSITION || epos > n->r.hl_startpos));
}
/*
@@ -381,24 +540,64 @@
is_filtered(pos)
POSITION pos;
{
- struct hilite *hl;
+ struct hilite_node *n;
if (ch_getflags() & CH_HELPFILE)
return (0);
- /*
- * Look at each filter and see if the start position
- * equals the start position of the line.
- */
- for (hl = filter_anchor.hl_first; hl != NULL; hl = hl->hl_next)
+ n = hlist_find(&filter_anchor, pos);
+ return (n != NULL && pos >= n->r.hl_startpos);
+}
+
+/*
+ * If pos is hidden, return the next position which isn't, otherwise
+ * just return pos.
+ */
+ public POSITION
+next_unfiltered(pos)
+ POSITION pos;
+{
+ struct hilite_node *n;
+
+ if (ch_getflags() & CH_HELPFILE)
+ return (pos);
+
+ n = hlist_find(&filter_anchor, pos);
+ while (n != NULL && pos >= n->r.hl_startpos)
{
- if (hl->hl_startpos == pos)
- return (1);
+ pos = n->r.hl_endpos;
+ n = n->next;
}
- return (0);
+ return (pos);
}
/*
+ * If pos is hidden, return the previous position which isn't or 0 if
+ * we're filtered right to the beginning, otherwise just return pos.
+ */
+ public POSITION
+prev_unfiltered(pos)
+ POSITION pos;
+{
+ struct hilite_node *n;
+
+ if (ch_getflags() & CH_HELPFILE)
+ return (pos);
+
+ n = hlist_find(&filter_anchor, pos);
+ while (n != NULL && pos >= n->r.hl_startpos)
+ {
+ pos = n->r.hl_startpos;
+ if (pos == 0)
+ break;
+ pos--;
+ n = n->prev;
+ }
+ return (pos);
+}
+
+
+/*
* Should any characters in a specified range be highlighted?
* If nohide is nonzero, don't consider hide_hilite.
*/
@@ -427,12 +626,19 @@
if (!match)
return (0);
- if (p_matches != NULL)
+ if (p_matches == NULL)
/*
- * Report matches, even if we're hiding highlights.
+ * Kinda kludgy way to recognize that caller is checking for
+ * hilite in status column. In this case we want to return
+ * hilite status even if hiliting is disabled or hidden.
*/
- *p_matches = 1;
+ return (1);
+ /*
+ * Report matches, even if we're hiding highlights.
+ */
+ *p_matches = 1;
+
if (hilite_search == 0)
/*
* Not doing highlighting.
@@ -449,43 +655,288 @@
}
/*
+ * Tree node storage: get the current block of nodes if it has spare
+ * capacity, or create a new one if not.
+ */
+ static struct hilite_storage*
+hlist_getstorage(anchor)
+ struct hilite_tree *anchor;
+{
+ int capacity = 1;
+ struct hilite_storage *s;
+
+ if (anchor->current)
+ {
+ if (anchor->current->used < anchor->current->capacity)
+ return anchor->current;
+ capacity = anchor->current->capacity * 2;
+ }
+
+ s = (struct hilite_storage *) ecalloc(1, sizeof(struct hilite_storage));
+ s->nodes = (struct hilite_node *) ecalloc(capacity, sizeof(struct hilite_node));
+ s->capacity = capacity;
+ s->used = 0;
+ s->next = NULL;
+ if (anchor->current)
+ anchor->current->next = s;
+ else
+ anchor->first = s;
+ anchor->current = s;
+ return s;
+}
+
+/*
+ * Tree node storage: retrieve a new empty node to be inserted into the
+ * tree.
+ */
+ static struct hilite_node*
+hlist_getnode(anchor)
+ struct hilite_tree *anchor;
+{
+ struct hilite_storage *s = hlist_getstorage(anchor);
+ return &s->nodes[s->used++];
+}
+
+/*
+ * Rotate the tree left around a pivot node.
+ */
+ static void
+hlist_rotate_left(anchor, n)
+ struct hilite_tree *anchor;
+ struct hilite_node *n;
+{
+ struct hilite_node *np = n->parent;
+ struct hilite_node *nr = n->right;
+ struct hilite_node *nrl = n->right->left;
+
+ if (np != NULL)
+ {
+ if (n == np->left)
+ np->left = nr;
+ else
+ np->right = nr;
+ } else
+ {
+ anchor->root = nr;
+ }
+ nr->left = n;
+ n->right = nrl;
+
+ nr->parent = np;
+ n->parent = nr;
+ if (nrl != NULL)
+ nrl->parent = n;
+}
+
+/*
+ * Rotate the tree right around a pivot node.
+ */
+ static void
+hlist_rotate_right(anchor, n)
+ struct hilite_tree *anchor;
+ struct hilite_node *n;
+{
+ struct hilite_node *np = n->parent;
+ struct hilite_node *nl = n->left;
+ struct hilite_node *nlr = n->left->right;
+
+ if (np != NULL)
+ {
+ if (n == np->right)
+ np->right = nl;
+ else
+ np->left = nl;
+ } else
+ {
+ anchor->root = nl;
+ }
+ nl->right = n;
+ n->left = nlr;
+
+ nl->parent = np;
+ n->parent = nl;
+ if (nlr != NULL)
+ nlr->parent = n;
+}
+
+
+/*
* Add a new hilite to a hilite list.
*/
static void
add_hilite(anchor, hl)
- struct hilite *anchor;
+ struct hilite_tree *anchor;
struct hilite *hl;
{
- struct hilite *ihl;
+ struct hilite_node *p, *n, *u;
+ /* Ignore empty ranges. */
+ if (hl->hl_startpos >= hl->hl_endpos)
+ return;
+
+ p = anchor->root;
+
+ /* Inserting the very first node is trivial. */
+ if (p == NULL)
+ {
+ n = hlist_getnode(anchor);
+ n->r = *hl;
+ anchor->root = n;
+ anchor->lookaside = n;
+ return;
+ }
+
/*
- * Hilites are sorted in the list; find where new one belongs.
- * Insert new one after ihl.
+ * Find our insertion point. If we come across any overlapping
+ * or adjoining existing ranges, shrink our range and discard
+ * if it become empty.
*/
- for (ihl = anchor; ihl->hl_next != NULL; ihl = ihl->hl_next)
+ for (;;)
{
- if (ihl->hl_next->hl_startpos > hl->hl_startpos)
+ if (hl->hl_startpos < p->r.hl_startpos)
+ {
+ if (hl->hl_endpos > p->r.hl_startpos)
+ hl->hl_endpos = p->r.hl_startpos;
+ if (p->left != NULL)
+ {
+ p = p->left;
+ continue;
+ }
break;
+ }
+ if (hl->hl_startpos < p->r.hl_endpos) {
+ hl->hl_startpos = p->r.hl_endpos;
+ if (hl->hl_startpos >= hl->hl_endpos)
+ return;
+ }
+ if (p->right != NULL)
+ {
+ p = p->right;
+ continue;
+ }
+ break;
}
/*
- * Truncate hilite so it doesn't overlap any existing ones
- * above and below it.
+ * Now we're at the right leaf, again check for contiguous ranges
+ * and extend the existing node if possible to avoid the
+ * insertion. Otherwise insert a new node at the leaf.
*/
- if (ihl != anchor)
- hl->hl_startpos = MAXPOS(hl->hl_startpos, ihl->hl_endpos);
- if (ihl->hl_next != NULL)
- hl->hl_endpos = MINPOS(hl->hl_endpos, ihl->hl_next->hl_startpos);
- if (hl->hl_startpos >= hl->hl_endpos)
+ if (hl->hl_startpos < p->r.hl_startpos) {
+ if (hl->hl_endpos == p->r.hl_startpos)
+ {
+ p->r.hl_startpos = hl->hl_startpos;
+ return;
+ }
+ if (p->prev != NULL && p->prev->r.hl_endpos == hl->hl_startpos)
+ {
+ p->prev->r.hl_endpos = hl->hl_endpos;
+ return;
+ }
+
+ p->left = n = hlist_getnode(anchor);
+ n->next = p;
+ if (p->prev != NULL)
+ {
+ n->prev = p->prev;
+ p->prev->next = n;
+ }
+ p->prev = n;
+ } else {
+ if (p->r.hl_endpos == hl->hl_startpos)
+ {
+ p->r.hl_endpos = hl->hl_endpos;
+ return;
+ }
+ if (p->next != NULL && hl->hl_endpos == p->next->r.hl_startpos) {
+ p->next->r.hl_startpos = hl->hl_startpos;
+ return;
+ }
+
+ p->right = n = hlist_getnode(anchor);
+ n->prev = p;
+ if (p->next != NULL)
+ {
+ n->next = p->next;
+ p->next->prev = n;
+ }
+ p->next = n;
+ }
+ n->parent = p;
+ n->red = 1;
+ n->r = *hl;
+
+ /*
+ * The tree is in the correct order and covers the right ranges
+ * now, but may have become unbalanced. Rebalance it using the
+ * standard red-black tree constraints and operations.
+ */
+ for (;;)
{
+ /* case 1 - current is root, root is always black */
+ if (n->parent == NULL)
+ {
+ n->red = 0;
+ break;
+ }
+
+ /* case 2 - parent is black, we can always be red */
+ if (!n->parent->red)
+ break;
+
/*
- * Hilite was truncated out of existence.
+ * constraint: because the root must be black, if our
+ * parent is red it cannot be the root therefore we must
+ * have a grandparent
*/
- free(hl);
- return;
+
+ /*
+ * case 3 - parent and uncle are red, repaint them black,
+ * the grandparent red, and start again at the grandparent.
+ */
+ u = n->parent->parent->left;
+ if (n->parent == u)
+ u = n->parent->parent->right;
+ if (u != NULL && u->red)
+ {
+ n->parent->red = 0;
+ u->red = 0;
+ n = n->parent->parent;
+ n->red = 1;
+ continue;
+ }
+
+ /*
+ * case 4 - parent is red but uncle is black, parent and
+ * grandparent on opposite sides. We need to start
+ * changing the structure now. This and case 5 will shorten
+ * our branch and lengthen the sibling, between them
+ * restoring balance.
+ */
+ if (n == n->parent->right &&
+ n->parent == n->parent->parent->left)
+ {
+ hlist_rotate_left(anchor, n->parent);
+ n = n->left;
+ } else if (n == n->parent->left &&
+ n->parent == n->parent->parent->right)
+ {
+ hlist_rotate_right(anchor, n->parent);
+ n = n->right;
+ }
+
+ /*
+ * case 5 - parent is red but uncle is black, parent and
+ * grandparent on same side
+ */
+ n->parent->red = 0;
+ n->parent->parent->red = 1;
+ if (n == n->parent->left)
+ hlist_rotate_right(anchor, n->parent->parent);
+ else
+ hlist_rotate_left(anchor, n->parent->parent);
+ break;
}
- hl->hl_next = ihl->hl_next;
- ihl->hl_next = hl;
}
/*
@@ -498,12 +949,11 @@
int end_index;
int *chpos;
{
- struct hilite *hl;
+ struct hilite hl;
int i;
/* Start the first hilite. */
- hl = (struct hilite *) ecalloc(1, sizeof(struct hilite));
- hl->hl_startpos = linepos + chpos[start_index];
+ hl.hl_startpos = linepos + chpos[start_index];
/*
* Step through the displayed chars.
@@ -517,13 +967,12 @@
{
if (chpos[i] != chpos[i-1] + 1 || i == end_index)
{
- hl->hl_endpos = linepos + chpos[i-1] + 1;
- add_hilite(&hilite_anchor, hl);
+ hl.hl_endpos = linepos + chpos[i-1] + 1;
+ add_hilite(&hilite_anchor, &hl);
/* Start new hilite unless this is the last char. */
if (i < end_index)
{
- hl = (struct hilite *) ecalloc(1, sizeof(struct hilite));
- hl->hl_startpos = linepos + chpos[i];
+ hl.hl_startpos = linepos + chpos[i];
}
}
}
@@ -547,8 +996,6 @@
char *searchp;
char *line_end = line + line_len;
- if (sp == NULL || ep == NULL)
- return;
/*
* sp and ep delimit the first match in the line.
* Mark the corresponding file positions, then
@@ -561,6 +1008,8 @@
*/
searchp = line;
do {
+ if (sp == NULL || ep == NULL)
+ return;
create_hilites(linepos, sp-line, ep-line, chpos);
/*
* If we matched more than zero characters,
@@ -578,27 +1027,6 @@
}
#endif
-/*
- * Change the caseless-ness of searches.
- * Updates the internal search state to reflect a change in the -i flag.
- */
- public void
-chg_caseless()
-{
- if (!is_ucase_pattern)
- /*
- * Pattern did not have uppercase.
- * Just set the search caselessness to the global caselessness.
- */
- is_caseless = caseless;
- else
- /*
- * Pattern did have uppercase.
- * Discard the pattern; we can't change search caselessness now.
- */
- clear_pattern(&search_info);
-}
-
#if HILITE_SEARCH
/*
* Find matching text which is currently on screen and highlight it.
@@ -608,7 +1036,7 @@
{
struct scrpos scrpos;
- get_scrpos(&scrpos);
+ get_scrpos(&scrpos, TOP);
if (scrpos.pos == NULL_POSITION)
return;
prep_hilite(scrpos.pos, position(BOTTOM_PLUS_ONE), -1);
@@ -643,7 +1071,7 @@
int search_type;
{
POSITION pos;
- int linenum;
+ int sindex;
if (empty_screen())
{
@@ -666,7 +1094,7 @@
pos = ch_length();
}
}
- linenum = 0;
+ sindex = 0;
} else
{
int add_one = 0;
@@ -677,9 +1105,9 @@
* Search does not include current screen.
*/
if (search_type & SRCH_FORW)
- linenum = BOTTOM_PLUS_ONE;
+ sindex = sc_height-1; /* BOTTOM_PLUS_ONE */
else
- linenum = TOP;
+ sindex = 0; /* TOP */
} else if (how_search == OPT_ONPLUS && !(search_type & SRCH_AFTER_TARGET))
{
/*
@@ -686,9 +1114,9 @@
* Search includes all of displayed screen.
*/
if (search_type & SRCH_FORW)
- linenum = TOP;
+ sindex = 0; /* TOP */
else
- linenum = BOTTOM_PLUS_ONE;
+ sindex = sc_height-1; /* BOTTOM_PLUS_ONE */
} else
{
/*
@@ -696,12 +1124,11 @@
* It starts at the jump target (if searching backwards),
* or at the jump target plus one (if forwards).
*/
- linenum = jump_sline;
+ sindex = sindex_from_sline(jump_sline);
if (search_type & SRCH_FORW)
- add_one = 1;
+ add_one = 1;
}
- linenum = adjsline(linenum);
- pos = position(linenum);
+ pos = position(sindex);
if (add_one)
pos = forw_raw_line(pos, (char **)NULL, (int *)NULL);
}
@@ -711,20 +1138,20 @@
*/
if (search_type & SRCH_FORW)
{
- while (pos == NULL_POSITION)
- {
- if (++linenum >= sc_height)
- break;
- pos = position(linenum);
- }
+ while (pos == NULL_POSITION)
+ {
+ if (++sindex >= sc_height)
+ break;
+ pos = position(sindex);
+ }
} else
{
- while (pos == NULL_POSITION)
- {
- if (--linenum < 0)
- break;
- pos = position(linenum);
- }
+ while (pos == NULL_POSITION)
+ {
+ if (--sindex < 0)
+ break;
+ pos = position(sindex);
+ }
}
return (pos);
}
@@ -844,16 +1271,21 @@
* Check to see if the line matches the filter pattern.
* If so, add an entry to the filter list.
*/
- if ((search_type & SRCH_FIND_ALL) && prev_pattern(&filter_info)) {
+ if (((search_type & SRCH_FIND_ALL) ||
+ prep_startpos == NULL_POSITION ||
+ linepos < prep_startpos || linepos >= prep_endpos) &&
+ prev_pattern(&filter_info)) {
int line_filter = match_pattern(info_compiled(&filter_info), filter_info.text,
cline, line_len, &sp, &ep, 0, filter_info.search_type);
if (line_filter)
{
- struct hilite *hl = (struct hilite *)
- ecalloc(1, sizeof(struct hilite));
- hl->hl_startpos = linepos;
- hl->hl_endpos = pos;
- add_hilite(&filter_anchor, hl);
+ struct hilite hl;
+ hl.hl_startpos = linepos;
+ hl.hl_endpos = pos;
+ add_hilite(&filter_anchor, &hl);
+ free(cline);
+ free(chpos);
+ continue;
}
}
#endif
@@ -942,6 +1374,30 @@
}
/*
+ * Change the caseless-ness of searches.
+ * Updates the internal search state to reflect a change in the -i flag.
+ */
+ public void
+chg_caseless()
+{
+ if (!is_ucase_pattern)
+ /*
+ * Pattern did not have uppercase.
+ * Just set the search caselessness to the global caselessness.
+ */
+ is_caseless = caseless;
+ else
+ {
+ /*
+ * Pattern did have uppercase.
+ * Regenerate the pattern using the new state.
+ */
+ clear_pattern(&search_info);
+ hist_pattern(search_info.search_type);
+ }
+}
+
+/*
* Search for the n-th occurrence of a specified pattern,
* either forward or backward.
* Return the number of matches not yet found in this file
@@ -976,7 +1432,7 @@
return -1;
}
#if HILITE_SEARCH
- if (hilite_search == OPT_ON)
+ if (hilite_search == OPT_ON || status_col)
{
/*
* Erase the highlights currently on screen.
@@ -1003,7 +1459,7 @@
if (set_pattern(&search_info, pattern, search_type) < 0)
return (-1);
#if HILITE_SEARCH
- if (hilite_search)
+ if (hilite_search || status_col)
{
/*
* Erase the highlights currently on screen.
@@ -1013,7 +1469,7 @@
hide_hilite = 0;
clr_hilite();
}
- if (hilite_search == OPT_ONPLUS)
+ if (hilite_search == OPT_ONPLUS || status_col)
{
/*
* Highlight any matches currently on screen,
@@ -1035,7 +1491,8 @@
*/
if (search_type & SRCH_PAST_EOF)
return (n);
- /* repaint(); -- why was this here? */
+ if (hilite_search == OPT_ON || status_col)
+ repaint_hilite(1);
error("Nothing to search", NULL_PARG);
return (-1);
}
@@ -1048,7 +1505,7 @@
* Search was unsuccessful.
*/
#if HILITE_SEARCH
- if (hilite_search == OPT_ON && n > 0)
+ if ((hilite_search == OPT_ON || status_col) && n > 0)
/*
* Redisplay old hilites.
*/
@@ -1066,7 +1523,7 @@
}
#if HILITE_SEARCH
- if (hilite_search == OPT_ON)
+ if (hilite_search == OPT_ON || status_col)
/*
* Display new hilites in the matching line.
*/
@@ -1110,6 +1567,12 @@
return;
/*
+ * Make sure our prep region always starts at the beginning of
+ * a line. (search_range takes care of the end boundary below.)
+ */
+ spos = back_raw_line(spos+1, (char **)NULL, (int *)NULL);
+
+ /*
* If we're limited to a max number of lines, figure out the
* file position we should stop at.
*/
@@ -1201,12 +1664,48 @@
{
int search_type = SRCH_FORW | SRCH_FIND_ALL;
search_type |= (search_info.search_type & SRCH_NO_REGEX);
- result = search_range(spos, epos, search_type, 0,
- maxlines, (POSITION*)NULL, &new_epos);
- if (result < 0)
- return;
- if (prep_endpos == NULL_POSITION || new_epos > prep_endpos)
- nprep_endpos = new_epos;
+ for (;;)
+ {
+ result = search_range(spos, epos, search_type, 0, maxlines, (POSITION*)NULL, &new_epos);
+ if (result < 0)
+ return;
+ if (prep_endpos == NULL_POSITION || new_epos > prep_endpos)
+ nprep_endpos = new_epos;
+
+ /*
+ * Check both ends of the resulting prep region to
+ * make sure they're not filtered. If they are,
+ * keep going at least one more line until we find
+ * something that isn't filtered, or hit the end.
+ */
+ if (prep_endpos == NULL_POSITION || nprep_endpos > prep_endpos)
+ {
+ if (new_epos >= nprep_endpos && is_filtered(new_epos-1))
+ {
+ spos = nprep_endpos;
+ epos = forw_raw_line(nprep_endpos, (char **)NULL, (int *)NULL);
+ if (epos == NULL_POSITION)
+ break;
+ maxlines = 1;
+ continue;
+ }
+ }
+
+ if (prep_startpos == NULL_POSITION || nprep_startpos < prep_startpos)
+ {
+ if (nprep_startpos > 0 && is_filtered(nprep_startpos))
+ {
+ epos = nprep_startpos;
+ spos = back_raw_line(nprep_startpos, (char **)NULL, (int *)NULL);
+ if (spos == NULL_POSITION)
+ break;
+ nprep_startpos = spos;
+ maxlines = 1;
+ continue;
+ }
+ }
+ break;
+ }
}
prep_startpos = nprep_startpos;
prep_endpos = nprep_endpos;
@@ -1245,6 +1744,8 @@
* This function is called by the V8 regcomp to report
* errors in regular expressions.
*/
+public int reg_show_error = 1;
+
void
regerror(s)
char *s;
@@ -1251,6 +1752,8 @@
{
PARG parg;
+ if (!reg_show_error)
+ return;
parg.p_string = s;
error("%s", &parg);
}
Modified: trunk/contrib/less/signal.c
===================================================================
--- trunk/contrib/less/signal.c 2018-07-06 12:43:22 UTC (rev 11361)
+++ trunk/contrib/less/signal.c 2018-07-06 12:46:07 UTC (rev 11362)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 1984-2012 Mark Nudelman
+ * Copyright (C) 1984-2017 Mark Nudelman
*
* You may distribute under the terms of either the GNU General Public
* License or the Less License, as specified in the README file.
@@ -7,7 +7,7 @@
* For more information, see the README file.
*/
-/* $FreeBSD: src/contrib/less/signal.c,v 1.3.8.3 2007/10/11 18:51:44 delphij Exp $ */
+/* $FreeBSD: stable/10/contrib/less/signal.c 330571 2018-03-07 06:39:00Z delphij $ */
/*
* Routines dealing with signals.
@@ -82,22 +82,16 @@
}
#endif
+#undef SIG_LESSWINDOW
#ifdef SIGWINCH
-/*
- * "Window" change handler
- */
- /* ARGSUSED*/
- public RETSIGTYPE
-winch(type)
- int type;
-{
- LSIGNAL(SIGWINCH, winch);
- sigs |= S_WINCH;
- if (reading)
- intread();
-}
+#define SIG_LESSWINDOW SIGWINCH
#else
#ifdef SIGWIND
+#define SIG_LESSWINDOW SIGWIND
+#endif
+#endif
+
+#ifdef SIG_LESSWINDOW
/*
* "Window" change handler
*/
@@ -106,13 +100,12 @@
winch(type)
int type;
{
- LSIGNAL(SIGWIND, winch);
+ LSIGNAL(SIG_LESSWINDOW, winch);
sigs |= S_WINCH;
if (reading)
intread();
}
#endif
-#endif
#if MSDOS_COMPILER==WIN32C
/*
@@ -137,6 +130,13 @@
}
#endif
+ static RETSIGTYPE
+terminate(type)
+ int type;
+{
+ quit(15);
+}
+
/*
* Set up the signal handlers.
*/
@@ -165,6 +165,9 @@
#ifdef SIGQUIT
(void) LSIGNAL(SIGQUIT, SIG_IGN);
#endif
+#ifdef SIGTERM
+ (void) LSIGNAL(SIGTERM, terminate);
+#endif
} else
{
/*
@@ -186,6 +189,9 @@
#ifdef SIGQUIT
(void) LSIGNAL(SIGQUIT, SIG_DFL);
#endif
+#ifdef SIGTERM
+ (void) LSIGNAL(SIGTERM, SIG_DFL);
+#endif
}
}
@@ -196,7 +202,7 @@
public void
psignals()
{
- register int tsignals;
+ int tsignals;
if ((tsignals = sigs) == 0)
return;
Modified: trunk/contrib/less/tags.c
===================================================================
--- trunk/contrib/less/tags.c 2018-07-06 12:43:22 UTC (rev 11361)
+++ trunk/contrib/less/tags.c 2018-07-06 12:46:07 UTC (rev 11362)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 1984-2012 Mark Nudelman
+ * Copyright (C) 1984-2017 Mark Nudelman
*
* You may distribute under the terms of either the GNU General Public
* License or the Less License, as specified in the README file.
@@ -14,7 +14,8 @@
#if TAGS
-public char *tags = "tags";
+public char ztags[] = "tags";
+public char *tags = ztags;
static int total;
static int curseq;
@@ -21,6 +22,7 @@
extern int linenums;
extern int sigs;
+extern int ctldisp;
enum tag_result {
TAG_FOUND,
@@ -62,8 +64,6 @@
struct tag *tl_first;
struct tag *tl_last;
};
-#define TAG_END ((struct tag *) &taglist)
-static struct taglist taglist = { TAG_END, TAG_END };
struct tag {
struct tag *next, *prev; /* List links */
char *tag_file; /* Source file containing the tag */
@@ -71,6 +71,8 @@
char *tag_pattern; /* Pattern used to find the tag */
char tag_endline; /* True if the pattern includes '$' */
};
+#define TAG_END ((struct tag *) &taglist)
+static struct taglist taglist = { TAG_END, TAG_END };
static struct tag *curtag;
#define TAG_INS(tp) \
@@ -89,7 +91,7 @@
public void
cleantags()
{
- register struct tag *tp;
+ struct tag *tp;
/*
* Delete any existing tag list.
@@ -99,6 +101,8 @@
while ((tp = taglist.tl_first) != TAG_END)
{
TAG_RM(tp);
+ free(tp->tag_file);
+ free(tp->tag_pattern);
free(tp);
}
curtag = NULL;
@@ -116,7 +120,7 @@
char *pattern;
int endline;
{
- register struct tag *tp;
+ struct tag *tp;
tp = (struct tag *) ecalloc(sizeof(struct tag), 1);
tp->tag_file = (char *) ecalloc(strlen(file) + 1, sizeof(char));
@@ -169,7 +173,7 @@
*/
public void
findtag(tag)
- register char *tag;
+ char *tag;
{
int type = gettagtype();
enum tag_result result;
@@ -265,11 +269,11 @@
*/
static enum tag_result
findctag(tag)
- register char *tag;
+ char *tag;
{
char *p;
- register FILE *f;
- register int taglen;
+ FILE *f;
+ int taglen;
LINENUM taglinenum;
char *tagfile;
char *tagpattern;
@@ -287,7 +291,7 @@
cleantags();
total = 0;
- taglen = strlen(tag);
+ taglen = (int) strlen(tag);
/*
* Search the tags file for the desired tag.
@@ -383,6 +387,26 @@
return (edit(curtag->tag_file));
}
+ static int
+curtag_match(char const *line, POSITION linepos)
+{
+ /*
+ * Test the line to see if we have a match.
+ * Use strncmp because the pattern may be
+ * truncated (in the tags file) if it is too long.
+ * If tagendline is set, make sure we match all
+ * the way to end of line (no extra chars after the match).
+ */
+ int len = (int) strlen(curtag->tag_pattern);
+ if (strncmp(curtag->tag_pattern, line, len) == 0 &&
+ (!curtag->tag_endline || line[len] == '\0' || line[len] == '\r'))
+ {
+ curtag->tag_linenum = find_linenum(linepos);
+ return 1;
+ }
+ return 0;
+}
+
/*
* Search for a tag.
* This is a stripped-down version of search().
@@ -397,13 +421,14 @@
{
POSITION pos, linepos;
LINENUM linenum;
- int len;
+ int line_len;
char *line;
+ int found;
pos = ch_zero();
linenum = find_linenum(pos);
- for (;;)
+ for (found = 0; !found;)
{
/*
* Get lines until we find a matching one or
@@ -417,7 +442,7 @@
* starting position of that line in linepos.
*/
linepos = pos;
- pos = forw_raw_line(pos, &line, (int *)NULL);
+ pos = forw_raw_line(pos, &line, &line_len);
if (linenum != 0)
linenum++;
@@ -438,19 +463,21 @@
if (linenums)
add_lnum(linenum, pos);
- /*
- * Test the line to see if we have a match.
- * Use strncmp because the pattern may be
- * truncated (in the tags file) if it is too long.
- * If tagendline is set, make sure we match all
- * the way to end of line (no extra chars after the match).
- */
- len = strlen(curtag->tag_pattern);
- if (strncmp(curtag->tag_pattern, line, len) == 0 &&
- (!curtag->tag_endline || line[len] == '\0' || line[len] == '\r'))
+ if (ctldisp != OPT_ONPLUS)
{
- curtag->tag_linenum = find_linenum(linepos);
- break;
+ if (curtag_match(line, linepos))
+ found = 1;
+ } else
+ {
+ int cvt_ops = CVT_ANSI;
+ int cvt_len = cvt_length(line_len, cvt_ops);
+ int *chpos = cvt_alloc_chpos(cvt_len);
+ char *cline = (char *) ecalloc(1, cvt_len);
+ cvt_text(cline, line, chpos, &line_len, cvt_ops);
+ if (curtag_match(cline, linepos))
+ found = 1;
+ free(chpos);
+ free(cline);
}
}
@@ -491,7 +518,7 @@
{
fp = stdin;
/* Set tag default because we cannot read stdin again. */
- tags = "tags";
+ tags = ztags;
} else
{
#if !HAVE_POPEN
@@ -551,7 +578,7 @@
#endif
return TAG_INTR;
}
- len = strlen(buf);
+ len = (int) strlen(buf);
if (len > 0 && buf[len-1] == '\n')
buf[len-1] = '\0';
else
Modified: trunk/contrib/less/ttyin.c
===================================================================
--- trunk/contrib/less/ttyin.c 2018-07-06 12:43:22 UTC (rev 11361)
+++ trunk/contrib/less/ttyin.c 2018-07-06 12:46:07 UTC (rev 11362)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 1984-2012 Mark Nudelman
+ * Copyright (C) 1984-2017 Mark Nudelman
*
* You may distribute under the terms of either the GNU General Public
* License or the Less License, as specified in the README file.
@@ -120,7 +120,11 @@
if (c == '\003')
return (READ_INTR);
#else
- result = iread(tty, &c, sizeof(char));
+ {
+ unsigned char uc;
+ result = iread(tty, &uc, sizeof(char));
+ c = (char) uc;
+ }
if (result == READ_INTR)
return (READ_INTR);
if (result < 0)
@@ -135,8 +139,8 @@
#if 0 /* allow entering arbitrary hex chars for testing */
/* ctrl-A followed by two hex chars makes a byte */
{
- int hex_in = 0;
- int hex_value = 0;
+ static int hex_in = 0;
+ static int hex_value = 0;
if (c == CONTROL('A'))
{
hex_in = 2;
Copied: trunk/contrib/less/ubin.uni (from rev 11361, vendor/less/dist/ubin.uni)
===================================================================
--- trunk/contrib/less/ubin.uni (rev 0)
+++ trunk/contrib/less/ubin.uni 2018-07-06 12:46:07 UTC (rev 11362)
@@ -0,0 +1,17 @@
+/* Generated by "./mkutable -f2 Cc Cs Co Zl Zp -- unicode/UnicodeData.txt" on Tue Jul 25 09:04:35 PDT 2017 */
+ { 0x0000, 0x0007 }, /* Cc */
+ { 0x000b, 0x000b }, /* Cc */
+ { 0x000e, 0x001f }, /* Cc */
+ { 0x007f, 0x009f }, /* Cc */
+ { 0x2028, 0x2028 }, /* Zl */
+ { 0x2029, 0x2029 }, /* Zp */
+ { 0xd800, 0xd800 }, /* Cs */
+ { 0xdb7f, 0xdb80 }, /* Cs */
+ { 0xdbff, 0xdc00 }, /* Cs */
+ { 0xdfff, 0xdfff }, /* Cs */
+ { 0xe000, 0xe000 }, /* Co */
+ { 0xf8ff, 0xf8ff }, /* Co */
+ { 0xf0000, 0xf0000 }, /* Co */
+ { 0xffffd, 0xffffd }, /* Co */
+ { 0x100000, 0x100000 }, /* Co */
+ { 0x10fffd, 0x10fffd }, /* Co */
Modified: trunk/contrib/less/version.c
===================================================================
--- trunk/contrib/less/version.c 2018-07-06 12:43:22 UTC (rev 11361)
+++ trunk/contrib/less/version.c 2018-07-06 12:46:07 UTC (rev 11362)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 1984-2012 Mark Nudelman
+ * Copyright (C) 1984-2017 Mark Nudelman
*
* You may distribute under the terms of either the GNU General Public
* License or the Less License, as specified in the README file.
@@ -762,6 +762,97 @@
v456 11/8/12 Fix option string incompatibility.
v457 12/8/12 Use new option string syntax only after --use-backslash.
v458 4/4/13 Fix display bug in using up/down in cmd buffer.
+-----------------------------------------------------------------
+v459 5/6/13 Fix ++ bug.
+v460 6/19/13 Automate construction of Unicode tables.
+v461 6/21/13 Collapse multiple CRs before LF.
+v462 11/26/13 Don't overwrite history file, just append to it.
+v463 7/13/14 Misc. fixes.
+v464 7/19/14 Fix bugs & improve performance in & filtering
+ (thanks to John Sullivan).
+v465 8/9/14 More fixes from John Sullivan.
+v466 8/23/14 Add colon to LESSANSIMIDCHARS.
+v467 9/18/14 Misc. fixes.
+v468 9/18/14 Fix typo
+v469 10/2/14 Allow extra string in command to append to a multichar
+ cmd without executing it; fix bug using GNU regex.
+v470 10/5/14 Fix some compiler warnings.
+v471 12/14/14 Fix unget issues with prompt. Allow disabling history
+ when compiled value of LESSHISTFILE = "-".
+v473 12/19/14 Fix prompt bug with stdin and -^P in lesskey extra string.
+v474 1/30/15 Fix bug in backwards search with match on bottom line.
+ Make follow mode reopen file if file shrinks.
+v475 3/2/15 Fix possible buffer overrun with invalid UTF-8;
+ fix bug when compiled with no regex; fix non-match search.
+v476 5/3/15 Update man pages.
+v477 5/19/15 Fix off-by-one in jump_forw_buffered;
+ don't add FAKE_* files to cmd history.
+v478 5/21/15 Fix nonportable pointer usage in hilite tree.
+v479 7/6/15 Allow %% escapes in LESSOPEN variable.
+v480 7/24/15 Fix bug in no-regex searches; support MSVC v1900.
+v481 8/20/15 Fix broken -g option.
+-----------------------------------------------------------------
+v482 2/25/16 Update Unicode database to "2015-06-16, 20:24:00 GMT [KW]".
+v483 2/27/16 Regenerate hilite when change search caselessness.
+ (Thanks to Jason Hood)
+ Fix bug when terminal has no "cm". (Thanks to Noel Cragg)
+v484 9/20/16 Update to Unicode 9.0.0 database.
+v485 10/21/16 Fix "nothing to search" bug when top/bottom line is empty;
+ Display line numbers in bold. (thanks to Jason Hood);
+ Fix incorrect display when entering double-width chars in
+ search string.
+v486 10/22/16 New commands ESC-{ and ESC-} to shift to start/end of
+ displayed lines; new option -Da in Windows version to
+ enable SGR mode (thanks to Jason Hood).
+v487 10/23/16 configure --help formatting.
+-----------------------------------------------------------------
+v488 2/23/17 Fix memory leaks in search (thanks to John Brooks).
+v489 3/30/17 Make -F not do init/deinit if file fits on one screen
+ (thanks to Jindrich Novy).
+v490 4/5/17 Switch to ANSI prototypes in funcs.h; remove "register".
+v491 4/7/17 Fix signed char bug.
+v492 4/21/17 Handle SIGTERM.
+v493 6/22/17 Fix bug initializing charset in MSDOS build.
+v494 6/26/17 Update Unicode tables; make Cf chars composing not binary.
+v495 7/3/17 Improve binary file detection (thanks to Bela Lubkin);
+ do -R filter when matching tags (thanks to Matthew Malcomson).
+v496 7/5/17 Add LESSRSCROLL marker.
+v497 7/5/17 Sync.
+v498 7/7/17 Fix early truncation of text if last char is double-width.
+v499 7/10/17 Misc fixes.
+v500 7/11/17 Fix bug where certain env variables couldn't be set in lesskey.
+v501 7/12/17 Make sure rscroll char is standout by default.
+v502 7/13/17 Control rscroll char via command line option not env variable.
+v503 7/13/17 Switch to git.
+v504 7/13/17 Call opt_rscroll at startup; change mkhelp.c to mkhelp.pl.
+v505 7/17/17 Add M and ESC-M commands;
+ fix buffer handling with stdin and LESSOPEN.
+v506 7/17/17 On Windows, convert UTF-8 to multibyte if console is not UTF-8;
+ handle extended chars on input (thanks to Jason Hood).
+v507 7/18/17 Fix some bugs handling filenames containing shell metachars.
+v508 7/19/17 Fix bugs when using LESSOPEN to read stdin.
+v509 7/19/17 Fix another stdin bug.
+v510 7/20/17 Fix bug in determining when to reopen a file.
+v511 7/25/17 Fix bugs in recent MSDOS changes (thanks to Jason Hood).
+v512 7/26/17 Fix MSDOS build.
+v513 7/26/17 Fix switch to normal attr at end of line with -R and rscroll.
+v514 7/27/17 Fix bug in fcomplete when pattern does not match a file.
+v515 7/28/17 Allow 'u' in -D option on Windows.
+v516 7/29/17 Fix bug using LESSOPEN with filename containing metachars.
+v517 7/30/17 Status column shows matches even if hiliting is disabled via -G.
+v518 8/1/17 Use underline in sgr mode in MSDOS (thanks to Jason Hood).
+v519 8/10/17 Fix rscroll bug when last char of line starts coloration.
+v520 9/3/17 Fix compiler warning.
+v521 10/20/17 Fix binary file warning in UTF-8 files with SGI sequences.
+v522 10/20/17 Handle keypad ENTER key properly.
+v523 10/23/17 Cleanup.
+v524 10/24/17 Fix getcc bug.
+v525 10/24/17 Change M command to mark last displayed line.
+v526 10/25/17 Fix search hilite bug introduced in v517.
+v527 10/30/17 Fix search hilite bug on last page with -a.
+v528 11/3/17 Make second ESC-u clear status column.
+v529 11/12/17 Display Unicode formatting chars in hex if -U is set.
+v530 12/2/17 Minor doc change and add missing VOID_PARAM.
*/
-char version[] = "458";
+char version[] = "530";
Copied: trunk/contrib/less/wide.uni (from rev 11361, vendor/less/dist/wide.uni)
===================================================================
--- trunk/contrib/less/wide.uni (rev 0)
+++ trunk/contrib/less/wide.uni 2018-07-06 12:46:07 UTC (rev 11362)
@@ -0,0 +1,108 @@
+/* Generated by "./mkutable -f1 W F -- unicode/EastAsianWidth.txt" on Tue Jul 25 09:04:35 PDT 2017 */
+ { 0x1100, 0x115f }, /* W */
+ { 0x231a, 0x231b }, /* W */
+ { 0x2329, 0x232a }, /* W */
+ { 0x23e9, 0x23ec }, /* W */
+ { 0x23f0, 0x23f0 }, /* W */
+ { 0x23f3, 0x23f3 }, /* W */
+ { 0x25fd, 0x25fe }, /* W */
+ { 0x2614, 0x2615 }, /* W */
+ { 0x2648, 0x2653 }, /* W */
+ { 0x267f, 0x267f }, /* W */
+ { 0x2693, 0x2693 }, /* W */
+ { 0x26a1, 0x26a1 }, /* W */
+ { 0x26aa, 0x26ab }, /* W */
+ { 0x26bd, 0x26be }, /* W */
+ { 0x26c4, 0x26c5 }, /* W */
+ { 0x26ce, 0x26ce }, /* W */
+ { 0x26d4, 0x26d4 }, /* W */
+ { 0x26ea, 0x26ea }, /* W */
+ { 0x26f2, 0x26f3 }, /* W */
+ { 0x26f5, 0x26f5 }, /* W */
+ { 0x26fa, 0x26fa }, /* W */
+ { 0x26fd, 0x26fd }, /* W */
+ { 0x2705, 0x2705 }, /* W */
+ { 0x270a, 0x270b }, /* W */
+ { 0x2728, 0x2728 }, /* W */
+ { 0x274c, 0x274c }, /* W */
+ { 0x274e, 0x274e }, /* W */
+ { 0x2753, 0x2755 }, /* W */
+ { 0x2757, 0x2757 }, /* W */
+ { 0x2795, 0x2797 }, /* W */
+ { 0x27b0, 0x27b0 }, /* W */
+ { 0x27bf, 0x27bf }, /* W */
+ { 0x2b1b, 0x2b1c }, /* W */
+ { 0x2b50, 0x2b50 }, /* W */
+ { 0x2b55, 0x2b55 }, /* W */
+ { 0x2e80, 0x2e99 }, /* W */
+ { 0x2e9b, 0x2ef3 }, /* W */
+ { 0x2f00, 0x2fd5 }, /* W */
+ { 0x2ff0, 0x2ffb }, /* W */
+ { 0x3000, 0x3000 }, /* F */
+ { 0x3001, 0x303e }, /* W */
+ { 0x3041, 0x3096 }, /* W */
+ { 0x3099, 0x30ff }, /* W */
+ { 0x3105, 0x312e }, /* W */
+ { 0x3131, 0x318e }, /* W */
+ { 0x3190, 0x31ba }, /* W */
+ { 0x31c0, 0x31e3 }, /* W */
+ { 0x31f0, 0x321e }, /* W */
+ { 0x3220, 0x3247 }, /* W */
+ { 0x3250, 0x32fe }, /* W */
+ { 0x3300, 0x4dbf }, /* W */
+ { 0x4e00, 0xa48c }, /* W */
+ { 0xa490, 0xa4c6 }, /* W */
+ { 0xa960, 0xa97c }, /* W */
+ { 0xac00, 0xd7a3 }, /* W */
+ { 0xf900, 0xfaff }, /* W */
+ { 0xfe10, 0xfe19 }, /* W */
+ { 0xfe30, 0xfe52 }, /* W */
+ { 0xfe54, 0xfe66 }, /* W */
+ { 0xfe68, 0xfe6b }, /* W */
+ { 0xff01, 0xff60 }, /* F */
+ { 0xffe0, 0xffe6 }, /* F */
+ { 0x16fe0, 0x16fe1 }, /* W */
+ { 0x17000, 0x187ec }, /* W */
+ { 0x18800, 0x18af2 }, /* W */
+ { 0x1b000, 0x1b11e }, /* W */
+ { 0x1b170, 0x1b2fb }, /* W */
+ { 0x1f004, 0x1f004 }, /* W */
+ { 0x1f0cf, 0x1f0cf }, /* W */
+ { 0x1f18e, 0x1f18e }, /* W */
+ { 0x1f191, 0x1f19a }, /* W */
+ { 0x1f200, 0x1f202 }, /* W */
+ { 0x1f210, 0x1f23b }, /* W */
+ { 0x1f240, 0x1f248 }, /* W */
+ { 0x1f250, 0x1f251 }, /* W */
+ { 0x1f260, 0x1f265 }, /* W */
+ { 0x1f300, 0x1f320 }, /* W */
+ { 0x1f32d, 0x1f335 }, /* W */
+ { 0x1f337, 0x1f37c }, /* W */
+ { 0x1f37e, 0x1f393 }, /* W */
+ { 0x1f3a0, 0x1f3ca }, /* W */
+ { 0x1f3cf, 0x1f3d3 }, /* W */
+ { 0x1f3e0, 0x1f3f0 }, /* W */
+ { 0x1f3f4, 0x1f3f4 }, /* W */
+ { 0x1f3f8, 0x1f43e }, /* W */
+ { 0x1f440, 0x1f440 }, /* W */
+ { 0x1f442, 0x1f4fc }, /* W */
+ { 0x1f4ff, 0x1f53d }, /* W */
+ { 0x1f54b, 0x1f54e }, /* W */
+ { 0x1f550, 0x1f567 }, /* W */
+ { 0x1f57a, 0x1f57a }, /* W */
+ { 0x1f595, 0x1f596 }, /* W */
+ { 0x1f5a4, 0x1f5a4 }, /* W */
+ { 0x1f5fb, 0x1f64f }, /* W */
+ { 0x1f680, 0x1f6c5 }, /* W */
+ { 0x1f6cc, 0x1f6cc }, /* W */
+ { 0x1f6d0, 0x1f6d2 }, /* W */
+ { 0x1f6eb, 0x1f6ec }, /* W */
+ { 0x1f6f4, 0x1f6f8 }, /* W */
+ { 0x1f910, 0x1f93e }, /* W */
+ { 0x1f940, 0x1f94c }, /* W */
+ { 0x1f950, 0x1f96b }, /* W */
+ { 0x1f980, 0x1f997 }, /* W */
+ { 0x1f9c0, 0x1f9c0 }, /* W */
+ { 0x1f9d0, 0x1f9e6 }, /* W */
+ { 0x20000, 0x2fffd }, /* W */
+ { 0x30000, 0x3fffd }, /* W */
More information about the Midnightbsd-cvs
mailing list