Update to less v429.
This commit is contained in:
commit
7374caaaed
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=191930
@ -1,284 +1,625 @@
|
|||||||
GNU GENERAL PUBLIC LICENSE
|
GNU GENERAL PUBLIC LICENSE
|
||||||
Version 2, June 1991
|
Version 3, 29 June 2007
|
||||||
|
|
||||||
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
|
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
|
||||||
59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
||||||
Everyone is permitted to copy and distribute verbatim copies
|
Everyone is permitted to copy and distribute verbatim copies
|
||||||
of this license document, but changing it is not allowed.
|
of this license document, but changing it is not allowed.
|
||||||
|
|
||||||
Preamble
|
Preamble
|
||||||
|
|
||||||
The licenses for most software are designed to take away your
|
The GNU General Public License is a free, copyleft license for
|
||||||
freedom to share and change it. By contrast, the GNU General Public
|
software and other kinds of works.
|
||||||
License is intended to guarantee your freedom to share and change free
|
|
||||||
software--to make sure the software is free for all its users. This
|
The licenses for most software and other practical works are designed
|
||||||
General Public License applies to most of the Free Software
|
to take away your freedom to share and change the works. By contrast,
|
||||||
Foundation's software and to any other program whose authors commit to
|
the GNU General Public License is intended to guarantee your freedom to
|
||||||
using it. (Some other Free Software Foundation software is covered by
|
share and change all versions of a program--to make sure it remains free
|
||||||
the GNU Library General Public License instead.) You can apply it to
|
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.
|
your programs, too.
|
||||||
|
|
||||||
When we speak of free software, we are referring to freedom, not
|
When we speak of free software, we are referring to freedom, not
|
||||||
price. Our General Public Licenses are designed to make sure that you
|
price. Our General Public Licenses are designed to make sure that you
|
||||||
have the freedom to distribute copies of free software (and charge for
|
have the freedom to distribute copies of free software (and charge for
|
||||||
this service if you wish), that you receive source code or can get it
|
them if you wish), that you receive source code or can get it if you
|
||||||
if you want it, that you can change the software or use pieces of it
|
want it, that you can change the software or use pieces of it in new
|
||||||
in new free programs; and that you know you can do these things.
|
free programs, and that you know you can do these things.
|
||||||
|
|
||||||
To protect your rights, we need to make restrictions that forbid
|
To protect your rights, we need to prevent others from denying you
|
||||||
anyone to deny you these rights or to ask you to surrender the rights.
|
these rights or asking you to surrender the rights. Therefore, you have
|
||||||
These restrictions translate to certain responsibilities for you if you
|
certain responsibilities if you distribute copies of the software, or if
|
||||||
distribute copies of the software, or if you modify it.
|
you modify it: responsibilities to respect the freedom of others.
|
||||||
|
|
||||||
For example, if you distribute copies of such a program, whether
|
For example, if you distribute copies of such a program, whether
|
||||||
gratis or for a fee, you must give the recipients all the rights that
|
gratis or for a fee, you must pass on to the recipients the same
|
||||||
you have. You must make sure that they, too, receive or can get the
|
freedoms that you received. You must make sure that they, too, receive
|
||||||
source code. And you must show them these terms so they know their
|
or can get the source code. And you must show them these terms so they
|
||||||
rights.
|
know their rights.
|
||||||
|
|
||||||
We protect your rights with two steps: (1) copyright the software, and
|
Developers that use the GNU GPL protect your rights with two steps:
|
||||||
(2) offer you this license which gives you legal permission to copy,
|
(1) assert copyright on the software, and (2) offer you this License
|
||||||
distribute and/or modify the software.
|
giving you legal permission to copy, distribute and/or modify it.
|
||||||
|
|
||||||
Also, for each author's protection and ours, we want to make certain
|
For the developers' and authors' protection, the GPL clearly explains
|
||||||
that everyone understands that there is no warranty for this free
|
that there is no warranty for this free software. For both users' and
|
||||||
software. If the software is modified by someone else and passed on, we
|
authors' sake, the GPL requires that modified versions be marked as
|
||||||
want its recipients to know that what they have is not the original, so
|
changed, so that their problems will not be attributed erroneously to
|
||||||
that any problems introduced by others will not reflect on the original
|
authors of previous versions.
|
||||||
authors' reputations.
|
|
||||||
|
|
||||||
Finally, any free program is threatened constantly by software
|
Some devices are designed to deny users access to install or run
|
||||||
patents. We wish to avoid the danger that redistributors of a free
|
modified versions of the software inside them, although the manufacturer
|
||||||
program will individually obtain patent licenses, in effect making the
|
can do so. This is fundamentally incompatible with the aim of
|
||||||
program proprietary. To prevent this, we have made it clear that any
|
protecting users' freedom to change the software. The systematic
|
||||||
patent must be licensed for everyone's free use or not licensed at all.
|
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
|
The precise terms and conditions for copying, distribution and
|
||||||
modification follow.
|
modification follow.
|
||||||
|
|
||||||
GNU GENERAL PUBLIC LICENSE
|
|
||||||
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
|
|
||||||
|
|
||||||
0. This License applies to any program or other work which contains
|
TERMS AND CONDITIONS
|
||||||
a notice placed by the copyright holder saying it may be distributed
|
|
||||||
under the terms of this General Public License. The "Program", below,
|
|
||||||
refers to any such program or work, and a "work based on the Program"
|
|
||||||
means either the Program or any derivative work under copyright law:
|
|
||||||
that is to say, a work containing the Program or a portion of it,
|
|
||||||
either verbatim or with modifications and/or translated into another
|
|
||||||
language. (Hereinafter, translation is included without limitation in
|
|
||||||
the term "modification".) Each licensee is addressed as "you".
|
|
||||||
|
|
||||||
Activities other than copying, distribution and modification are not
|
0. Definitions.
|
||||||
covered by this License; they are outside its scope. The act of
|
|
||||||
running the Program is not restricted, and the output from the Program
|
|
||||||
is covered only if its contents constitute a work based on the
|
|
||||||
Program (independent of having been made by running the Program).
|
|
||||||
Whether that is true depends on what the Program does.
|
|
||||||
|
|
||||||
1. You may copy and distribute verbatim copies of the Program's
|
"This License" refers to version 3 of the GNU General Public License.
|
||||||
source code as you receive it, in any medium, provided that you
|
|
||||||
conspicuously and appropriately publish on each copy an appropriate
|
|
||||||
copyright notice and disclaimer of warranty; keep intact all the
|
|
||||||
notices that refer to this License and to the absence of any warranty;
|
|
||||||
and give any other recipients of the Program a copy of this License
|
|
||||||
along with the Program.
|
|
||||||
|
|
||||||
You may charge a fee for the physical act of transferring a copy, and
|
"Copyright" also means copyright-like laws that apply to other kinds of
|
||||||
you may at your option offer warranty protection in exchange for a fee.
|
works, such as semiconductor masks.
|
||||||
|
|
||||||
2. You may modify your copy or copies of the Program or any portion
|
"The Program" refers to any copyrightable work licensed under this
|
||||||
of it, thus forming a work based on the Program, and copy and
|
License. Each licensee is addressed as "you". "Licensees" and
|
||||||
distribute such modifications or work under the terms of Section 1
|
"recipients" may be individuals or organizations.
|
||||||
above, provided that you also meet all of these conditions:
|
|
||||||
|
|
||||||
a) You must cause the modified files to carry prominent notices
|
To "modify" a work means to copy from or adapt all or part of the work
|
||||||
stating that you changed the files and the date of any change.
|
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.
|
||||||
|
|
||||||
b) You must cause any work that you distribute or publish, that in
|
A "covered work" means either the unmodified Program or a work based
|
||||||
whole or in part contains or is derived from the Program or any
|
on the Program.
|
||||||
part thereof, to be licensed as a whole at no charge to all third
|
|
||||||
parties under the terms of this License.
|
|
||||||
|
|
||||||
c) If the modified program normally reads commands interactively
|
To "propagate" a work means to do anything with it that, without
|
||||||
when run, you must cause it, when started running for such
|
permission, would make you directly or secondarily liable for
|
||||||
interactive use in the most ordinary way, to print or display an
|
infringement under applicable copyright law, except executing it on a
|
||||||
announcement including an appropriate copyright notice and a
|
computer or modifying a private copy. Propagation includes copying,
|
||||||
notice that there is no warranty (or else, saying that you provide
|
distribution (with or without modification), making available to the
|
||||||
a warranty) and that users may redistribute the program under
|
public, and in some countries other activities as well.
|
||||||
these conditions, and telling the user how to view a copy of this
|
|
||||||
License. (Exception: if the Program itself is interactive but
|
|
||||||
does not normally print such an announcement, your work based on
|
|
||||||
the Program is not required to print an announcement.)
|
|
||||||
|
|
||||||
These requirements apply to the modified work as a whole. If
|
|
||||||
identifiable sections of that work are not derived from the Program,
|
|
||||||
and can be reasonably considered independent and separate works in
|
|
||||||
themselves, then this License, and its terms, do not apply to those
|
|
||||||
sections when you distribute them as separate works. But when you
|
|
||||||
distribute the same sections as part of a whole which is a work based
|
|
||||||
on the Program, the distribution of the whole must be on the terms of
|
|
||||||
this License, whose permissions for other licensees extend to the
|
|
||||||
entire whole, and thus to each and every part regardless of who wrote it.
|
|
||||||
|
|
||||||
Thus, it is not the intent of this section to claim rights or contest
|
To "convey" a work means any kind of propagation that enables other
|
||||||
your rights to work written entirely by you; rather, the intent is to
|
parties to make or receive copies. Mere interaction with a user through
|
||||||
exercise the right to control the distribution of derivative or
|
a computer network, with no transfer of a copy, is not conveying.
|
||||||
collective works based on the Program.
|
|
||||||
|
|
||||||
In addition, mere aggregation of another work not based on the Program
|
An interactive user interface displays "Appropriate Legal Notices"
|
||||||
with the Program (or with a work based on the Program) on a volume of
|
to the extent that it includes a convenient and prominently visible
|
||||||
a storage or distribution medium does not bring the other work under
|
feature that (1) displays an appropriate copyright notice, and (2)
|
||||||
the scope of this License.
|
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.
|
||||||
|
|
||||||
3. You may copy and distribute the Program (or a work based on it,
|
1. Source Code.
|
||||||
under Section 2) in object code or executable form under the terms of
|
|
||||||
Sections 1 and 2 above provided that you also do one of the following:
|
|
||||||
|
|
||||||
a) Accompany it with the complete corresponding machine-readable
|
The "source code" for a work means the preferred form of the work
|
||||||
source code, which must be distributed under the terms of Sections
|
for making modifications to it. "Object code" means any non-source
|
||||||
1 and 2 above on a medium customarily used for software interchange; or,
|
form of a work.
|
||||||
|
|
||||||
b) Accompany it with a written offer, valid for at least three
|
A "Standard Interface" means an interface that either is an official
|
||||||
years, to give any third party, for a charge no more than your
|
standard defined by a recognized standards body, or, in the case of
|
||||||
cost of physically performing source distribution, a complete
|
interfaces specified for a particular programming language, one that
|
||||||
machine-readable copy of the corresponding source code, to be
|
is widely used among developers working in that language.
|
||||||
distributed under the terms of Sections 1 and 2 above on a medium
|
|
||||||
customarily used for software interchange; or,
|
|
||||||
|
|
||||||
c) Accompany it with the information you received as to the offer
|
The "System Libraries" of an executable work include anything, other
|
||||||
to distribute corresponding source code. (This alternative is
|
than the work as a whole, that (a) is included in the normal form of
|
||||||
allowed only for noncommercial distribution and only if you
|
packaging a Major Component, but which is not part of that Major
|
||||||
received the program in object code or executable form with such
|
Component, and (b) serves only to enable use of the work with that
|
||||||
an offer, in accord with Subsection b above.)
|
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 source code for a work means the preferred form of the work for
|
The "Corresponding Source" for a work in object code form means all
|
||||||
making modifications to it. For an executable work, complete source
|
the source code needed to generate, install, and (for an executable
|
||||||
code means all the source code for all modules it contains, plus any
|
work) run the object code and to modify the work, including scripts to
|
||||||
associated interface definition files, plus the scripts used to
|
control those activities. However, it does not include the work's
|
||||||
control compilation and installation of the executable. However, as a
|
System Libraries, or general-purpose tools or generally available free
|
||||||
special exception, the source code distributed need not include
|
programs which are used unmodified in performing those activities but
|
||||||
anything that is normally distributed (in either source or binary
|
which are not part of the work. For example, Corresponding Source
|
||||||
form) with the major components (compiler, kernel, and so on) of the
|
includes interface definition files associated with source files for
|
||||||
operating system on which the executable runs, unless that component
|
the work, and the source code for shared libraries and dynamically
|
||||||
itself accompanies the executable.
|
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.
|
||||||
|
|
||||||
If distribution of executable or object code is made by offering
|
The Corresponding Source need not include anything that users
|
||||||
access to copy from a designated place, then offering equivalent
|
can regenerate automatically from other parts of the Corresponding
|
||||||
access to copy the source code from the same place counts as
|
Source.
|
||||||
distribution of the source code, even though third parties are not
|
|
||||||
compelled to copy the source along with the object code.
|
|
||||||
|
|
||||||
4. You may not copy, modify, sublicense, or distribute the Program
|
|
||||||
except as expressly provided under this License. Any attempt
|
|
||||||
otherwise to copy, modify, sublicense or distribute the Program is
|
|
||||||
void, and will automatically terminate your rights under this License.
|
|
||||||
However, parties who have received copies, or rights, from you under
|
|
||||||
this License will not have their licenses terminated so long as such
|
|
||||||
parties remain in full compliance.
|
|
||||||
|
|
||||||
5. You are not required to accept this License, since you have not
|
The Corresponding Source for a work in source code form is that
|
||||||
signed it. However, nothing else grants you permission to modify or
|
same work.
|
||||||
distribute the Program or its derivative works. These actions are
|
|
||||||
prohibited by law if you do not accept this License. Therefore, by
|
|
||||||
modifying or distributing the Program (or any work based on the
|
|
||||||
Program), you indicate your acceptance of this License to do so, and
|
|
||||||
all its terms and conditions for copying, distributing or modifying
|
|
||||||
the Program or works based on it.
|
|
||||||
|
|
||||||
6. Each time you redistribute the Program (or any work based on the
|
2. Basic Permissions.
|
||||||
Program), the recipient automatically receives a license from the
|
|
||||||
original licensor to copy, distribute or modify the Program subject to
|
All rights granted under this License are granted for the term of
|
||||||
these terms and conditions. You may not impose any further
|
copyright on the Program, and are irrevocable provided the stated
|
||||||
restrictions on the recipients' exercise of the rights granted herein.
|
conditions are met. This License explicitly affirms your unlimited
|
||||||
You are not responsible for enforcing compliance by third parties to
|
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.
|
this License.
|
||||||
|
|
||||||
7. If, as a consequence of a court judgment or allegation of patent
|
Each contributor grants you a non-exclusive, worldwide, royalty-free
|
||||||
infringement or for any other reason (not limited to patent issues),
|
patent license under the contributor's essential patent claims, to
|
||||||
conditions are imposed on you (whether by court order, agreement or
|
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
|
otherwise) that contradict the conditions of this License, they do not
|
||||||
excuse you from the conditions of this License. If you cannot
|
excuse you from the conditions of this License. If you cannot convey a
|
||||||
distribute so as to satisfy simultaneously your obligations under this
|
covered work so as to satisfy simultaneously your obligations under this
|
||||||
License and any other pertinent obligations, then as a consequence you
|
License and any other pertinent obligations, then as a consequence you may
|
||||||
may not distribute the Program at all. For example, if a patent
|
not convey it at all. For example, if you agree to terms that obligate you
|
||||||
license would not permit royalty-free redistribution of the Program by
|
to collect a royalty for further conveying from those to whom you convey
|
||||||
all those who receive copies directly or indirectly through you, then
|
the Program, the only way you could satisfy both those terms and this
|
||||||
the only way you could satisfy both it and this License would be to
|
License would be to refrain entirely from conveying the Program.
|
||||||
refrain entirely from distribution of the Program.
|
|
||||||
|
|
||||||
If any portion of this section is held invalid or unenforceable under
|
13. Use with the GNU Affero General Public License.
|
||||||
any particular circumstance, the balance of the section is intended to
|
|
||||||
apply and the section as a whole is intended to apply in other
|
|
||||||
circumstances.
|
|
||||||
|
|
||||||
It is not the purpose of this section to induce you to infringe any
|
Notwithstanding any other provision of this License, you have
|
||||||
patents or other property right claims or to contest validity of any
|
permission to link or combine any covered work with a work licensed
|
||||||
such claims; this section has the sole purpose of protecting the
|
under version 3 of the GNU Affero General Public License into a single
|
||||||
integrity of the free software distribution system, which is
|
combined work, and to convey the resulting work. The terms of this
|
||||||
implemented by public license practices. Many people have made
|
License will continue to apply to the part which is the covered work,
|
||||||
generous contributions to the wide range of software distributed
|
but the special requirements of the GNU Affero General Public License,
|
||||||
through that system in reliance on consistent application of that
|
section 13, concerning interaction through a network will apply to the
|
||||||
system; it is up to the author/donor to decide if he or she is willing
|
combination as such.
|
||||||
to distribute software through any other system and a licensee cannot
|
|
||||||
impose that choice.
|
|
||||||
|
|
||||||
This section is intended to make thoroughly clear what is believed to
|
14. Revised Versions of this License.
|
||||||
be a consequence of the rest of this License.
|
|
||||||
|
|
||||||
8. If the distribution and/or use of the Program is restricted in
|
|
||||||
certain countries either by patents or by copyrighted interfaces, the
|
|
||||||
original copyright holder who places the Program under this License
|
|
||||||
may add an explicit geographical distribution limitation excluding
|
|
||||||
those countries, so that distribution is permitted only in or among
|
|
||||||
countries not thus excluded. In such case, this License incorporates
|
|
||||||
the limitation as if written in the body of this License.
|
|
||||||
|
|
||||||
9. The Free Software Foundation may publish revised and/or new versions
|
The Free Software Foundation may publish revised and/or new versions of
|
||||||
of the General Public License from time to time. Such new versions will
|
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
|
be similar in spirit to the present version, but may differ in detail to
|
||||||
address new problems or concerns.
|
address new problems or concerns.
|
||||||
|
|
||||||
Each version is given a distinguishing version number. If the Program
|
Each version is given a distinguishing version number. If the
|
||||||
specifies a version number of this License which applies to it and "any
|
Program specifies that a certain numbered version of the GNU General
|
||||||
later version", you have the option of following the terms and conditions
|
Public License "or any later version" applies to it, you have the
|
||||||
either of that version or of any later version published by the Free
|
option of following the terms and conditions either of that numbered
|
||||||
Software Foundation. If the Program does not specify a version number of
|
version or of any later version published by the Free Software
|
||||||
this License, you may choose any version ever published by the Free Software
|
Foundation. If the Program does not specify a version number of the
|
||||||
Foundation.
|
GNU General Public License, you may choose any version ever published
|
||||||
|
by the Free Software Foundation.
|
||||||
|
|
||||||
10. If you wish to incorporate parts of the Program into other free
|
If the Program specifies that a proxy can decide which future
|
||||||
programs whose distribution conditions are different, write to the author
|
versions of the GNU General Public License can be used, that proxy's
|
||||||
to ask for permission. For software which is copyrighted by the Free
|
public statement of acceptance of a version permanently authorizes you
|
||||||
Software Foundation, write to the Free Software Foundation; we sometimes
|
to choose that version for the Program.
|
||||||
make exceptions for this. Our decision will be guided by the two goals
|
|
||||||
of preserving the free status of all derivatives of our free software and
|
|
||||||
of promoting the sharing and reuse of software generally.
|
|
||||||
|
|
||||||
NO WARRANTY
|
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.
|
||||||
|
|
||||||
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
|
15. Disclaimer of 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.
|
|
||||||
|
|
||||||
12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
|
||||||
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
|
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
|
||||||
REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
|
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
|
||||||
INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
|
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
|
||||||
OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
|
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||||
TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
|
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
|
||||||
YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
|
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
|
||||||
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
|
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
|
||||||
POSSIBILITY OF SUCH DAMAGES.
|
|
||||||
|
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
|
END OF TERMS AND CONDITIONS
|
||||||
|
|
||||||
How to Apply These Terms to Your New Programs
|
How to Apply These Terms to Your New Programs
|
||||||
|
|
||||||
If you develop a new program, and you want it to be of the greatest
|
If you develop a new program, and you want it to be of the greatest
|
||||||
@ -287,15 +628,15 @@ 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 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
|
to attach them to the start of each source file to most effectively
|
||||||
convey the exclusion of warranty; and each file should have at least
|
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.
|
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.>
|
<one line to give the program's name and a brief idea of what it does.>
|
||||||
Copyright (C) <year> <name of author>
|
Copyright (C) <year> <name of author>
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or modify
|
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
|
it under the terms of the GNU General Public License as published by
|
||||||
the Free Software Foundation; either version 2 of the License, or
|
the Free Software Foundation, either version 3 of the License, or
|
||||||
(at your option) any later version.
|
(at your option) any later version.
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
This program is distributed in the hope that it will be useful,
|
||||||
@ -304,37 +645,30 @@ the "copyright" line and a pointer to where the full notice is found.
|
|||||||
GNU General Public License for more details.
|
GNU General Public License for more details.
|
||||||
|
|
||||||
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 this program; if not, write to the Free Software
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
||||||
|
|
||||||
|
|
||||||
Also add information on how to contact you by electronic and paper mail.
|
Also add information on how to contact you by electronic and paper mail.
|
||||||
|
|
||||||
If the program is interactive, make it output a short notice like this
|
If the program does terminal interaction, make it output a short
|
||||||
when it starts in an interactive mode:
|
notice like this when it starts in an interactive mode:
|
||||||
|
|
||||||
Gnomovision version 69, Copyright (C) year name of author
|
<program> Copyright (C) <year> <name of author>
|
||||||
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
||||||
This is free software, and you are welcome to redistribute it
|
This is free software, and you are welcome to redistribute it
|
||||||
under certain conditions; type `show c' for details.
|
under certain conditions; type `show c' for details.
|
||||||
|
|
||||||
The hypothetical commands `show w' and `show c' should show the appropriate
|
The hypothetical commands `show w' and `show c' should show the appropriate
|
||||||
parts of the General Public License. Of course, the commands you use may
|
parts of the General Public License. Of course, your program's commands
|
||||||
be called something other than `show w' and `show c'; they could even be
|
might be different; for a GUI interface, you would use an "about box".
|
||||||
mouse-clicks or menu items--whatever suits your program.
|
|
||||||
|
|
||||||
You should also get your employer (if you work as a programmer) or your
|
You should also get your employer (if you work as a programmer) or school,
|
||||||
school, if any, to sign a "copyright disclaimer" for the program, if
|
if any, to sign a "copyright disclaimer" for the program, if necessary.
|
||||||
necessary. Here is a sample; alter the names:
|
For more information on this, and how to apply and follow the GNU GPL, see
|
||||||
|
<http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
Yoyodyne, Inc., hereby disclaims all copyright interest in the program
|
The GNU General Public License does not permit incorporating your program
|
||||||
`Gnomovision' (which makes passes at compilers) written by James Hacker.
|
into proprietary programs. If your program is a subroutine library, you
|
||||||
|
may consider it more useful to permit linking proprietary applications with
|
||||||
<signature of Ty Coon>, 1 April 1989
|
the library. If this is what you want to do, use the GNU Lesser General
|
||||||
Ty Coon, President of Vice
|
Public License instead of this License. But first, please read
|
||||||
|
<http://www.gnu.org/philosophy/why-not-lgpl.html>.
|
||||||
This 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 Library General
|
|
||||||
Public License instead of this License.
|
|
||||||
|
@ -2,23 +2,26 @@ $FreeBSD$
|
|||||||
|
|
||||||
1. Download latest less(1) tarball. The homepage of less(1) is at:
|
1. Download latest less(1) tarball. The homepage of less(1) is at:
|
||||||
http://www.greenwoodsoftware.com/less/
|
http://www.greenwoodsoftware.com/less/
|
||||||
2. Export the tarball into a directory, (say "v-less").
|
2. Checkout $FSVN/vendor/less/ into less/
|
||||||
3. Checkout our contrib/less code into another directory (say "f-less"),
|
3. Extract new code to, say, less/lessv429
|
||||||
with -rLESS.
|
4. cd less/dist
|
||||||
4. Copy v-less/ files over f-less, check if there is any files that is
|
5. svn list -R | grep -v '/$' | sort >../old
|
||||||
removed by vendor, or newly added, note them.
|
6. cd ../lessv429
|
||||||
5. do cvs up -A in f-less, resolve the conflicts.
|
7. find . -type f | cut -c 3- | sort >../new
|
||||||
6. Regenerate defines.h:
|
8. tar cf - . | tar xf - -C ../dist
|
||||||
|
9. cd ../dist
|
||||||
|
10. comm -23 ../old ../new | xargs svn rm
|
||||||
|
11. comm -13 ../old ../new | xargs svn add
|
||||||
|
12. Check svn status output and make sure that all changes are appropriate.
|
||||||
|
13. Commit and tag the result.
|
||||||
|
14. Resolve any conflicts that happen in head/contrib/less.
|
||||||
|
15. Regenerate defines.h:
|
||||||
./configure --prefix=/ --bindir=/usr/bin --sbindir=/usr/sbin \
|
./configure --prefix=/ --bindir=/usr/bin --sbindir=/usr/sbin \
|
||||||
--libexecdir=/usr/libexec --datarootdir=/usr/share
|
--libexecdir=/usr/libexec --datarootdir=/usr/share
|
||||||
7. Manually merge changes into src/usr.bin/less/defines.h; adjust
|
16. Manually merge changes into src/usr.bin/less/defines.h; adjust
|
||||||
Makefile glue to reflect added/removed files.
|
Makefile glue to reflect added/removed files.
|
||||||
8. Replace your src/contrib/less with the merged copy, and do a ``make
|
17. Replace your src/contrib/less with the merged copy, and do a ``make
|
||||||
universe'' to make sure that nothing was broken;
|
universe'' to make sure that nothing was broken;
|
||||||
9. If everything goes well, do the actual import from v-less:
|
18. Commit the result.
|
||||||
cvs -n import src/contrib/less LESS v<version>
|
|
||||||
Seems everything is fine? Go with:
|
|
||||||
cvs import src/contrib/less LESS v<version>
|
|
||||||
10. Resolve the conflicts with the patchset found in step 5.
|
|
||||||
|
|
||||||
delphij@FreeBSD.org - Nov 13th, 2007
|
delphij@FreeBSD.org - May 08, 2009
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
------------
|
------------
|
||||||
|
|
||||||
Less
|
Less
|
||||||
Copyright (C) 1984-2007 Mark Nudelman
|
Copyright (C) 1984-2008 Mark Nudelman
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without
|
Redistribution and use in source and binary forms, with or without
|
||||||
modification, are permitted provided that the following conditions
|
modification, are permitted provided that the following conditions
|
||||||
|
@ -14,6 +14,7 @@ CFLAGS = @CFLAGS@
|
|||||||
CFLAGS_COMPILE_ONLY = -c
|
CFLAGS_COMPILE_ONLY = -c
|
||||||
LDFLAGS = @LDFLAGS@
|
LDFLAGS = @LDFLAGS@
|
||||||
CPPFLAGS = @CPPFLAGS@
|
CPPFLAGS = @CPPFLAGS@
|
||||||
|
EXEEXT = @EXEEXT@
|
||||||
O=o
|
O=o
|
||||||
|
|
||||||
LIBS = @LIBS@
|
LIBS = @LIBS@
|
||||||
@ -49,23 +50,23 @@ OBJ = main.${O} screen.${O} brac.${O} ch.${O} charset.${O} cmdbuf.${O} \
|
|||||||
output.${O} position.${O} prompt.${O} search.${O} signal.${O} \
|
output.${O} position.${O} prompt.${O} search.${O} signal.${O} \
|
||||||
tags.${O} ttyin.${O} version.${O} @REGEX_O@
|
tags.${O} ttyin.${O} version.${O} @REGEX_O@
|
||||||
|
|
||||||
all: less lesskey lessecho
|
all: less$(EXEEXT) lesskey$(EXEEXT) lessecho$(EXEEXT)
|
||||||
|
|
||||||
less: ${OBJ}
|
less$(EXEEXT): ${OBJ}
|
||||||
${CC} ${LDFLAGS} -o $@ ${OBJ} ${LIBS}
|
${CC} ${LDFLAGS} -o $@ ${OBJ} ${LIBS}
|
||||||
|
|
||||||
lesskey: lesskey.${O} version.${O}
|
lesskey$(EXEEXT): lesskey.${O} version.${O}
|
||||||
${CC} ${LDFLAGS} -o $@ lesskey.${O} version.${O}
|
${CC} ${LDFLAGS} -o $@ lesskey.${O} version.${O}
|
||||||
|
|
||||||
lessecho: lessecho.${O} version.${O}
|
lessecho$(EXEEXT): lessecho.${O} version.${O}
|
||||||
${CC} ${LDFLAGS} -o $@ lessecho.${O} version.${O}
|
${CC} ${LDFLAGS} -o $@ lessecho.${O} version.${O}
|
||||||
|
|
||||||
${OBJ}: ${srcdir}/less.h ${srcdir}/funcs.h defines.h
|
${OBJ}: ${srcdir}/less.h ${srcdir}/funcs.h defines.h
|
||||||
|
|
||||||
install: all ${srcdir}/less.nro ${srcdir}/lesskey.nro ${srcdir}/lessecho.nro installdirs
|
install: all ${srcdir}/less.nro ${srcdir}/lesskey.nro ${srcdir}/lessecho.nro installdirs
|
||||||
${INSTALL_PROGRAM} less ${DESTDIR}${bindir}/${binprefix}less
|
${INSTALL_PROGRAM} less$(EXEEXT) ${DESTDIR}${bindir}/${binprefix}less$(EXEEXT)
|
||||||
${INSTALL_PROGRAM} lesskey ${DESTDIR}${bindir}/${binprefix}lesskey
|
${INSTALL_PROGRAM} lesskey$(EXEEXT) ${DESTDIR}${bindir}/${binprefix}lesskey$(EXEEXT)
|
||||||
${INSTALL_PROGRAM} lessecho ${DESTDIR}${bindir}/${binprefix}lessecho
|
${INSTALL_PROGRAM} lessecho$(EXEEXT) ${DESTDIR}${bindir}/${binprefix}lessecho$(EXEEXT)
|
||||||
${INSTALL_DATA} ${srcdir}/less.nro ${DESTDIR}${mandir}/man${manext}/${manprefix}less.${manext}
|
${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}/lesskey.nro ${DESTDIR}${mandir}/man${manext}/${manprefix}lesskey.${manext}
|
||||||
${INSTALL_DATA} ${srcdir}/lessecho.nro ${DESTDIR}${mandir}/man${manext}/${manprefix}lessecho.${manext}
|
${INSTALL_DATA} ${srcdir}/lessecho.nro ${DESTDIR}${mandir}/man${manext}/${manprefix}lessecho.${manext}
|
||||||
@ -77,9 +78,9 @@ installdirs: mkinstalldirs
|
|||||||
${srcdir}/mkinstalldirs ${DESTDIR}${bindir} ${DESTDIR}${mandir}/man${manext}
|
${srcdir}/mkinstalldirs ${DESTDIR}${bindir} ${DESTDIR}${mandir}/man${manext}
|
||||||
|
|
||||||
uninstall:
|
uninstall:
|
||||||
rm -f ${DESTDIR}${bindir}/${binprefix}less
|
rm -f ${DESTDIR}${bindir}/${binprefix}less$(EXEEXT)
|
||||||
rm -f ${DESTDIR}${bindir}/${binprefix}lesskey
|
rm -f ${DESTDIR}${bindir}/${binprefix}lesskey$(EXEEXT)
|
||||||
rm -f ${DESTDIR}${bindir}/${binprefix}lessecho
|
rm -f ${DESTDIR}${bindir}/${binprefix}lessecho$(EXEEXT)
|
||||||
rm -f ${DESTDIR}${mandir}/man${manext}/${manprefix}less.${manext}
|
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}lesskey.${manext}
|
||||||
rm -f ${DESTDIR}${mandir}/man${manext}/${manprefix}lessecho.${manext}
|
rm -f ${DESTDIR}${mandir}/man${manext}/${manprefix}lessecho.${manext}
|
||||||
@ -108,7 +109,7 @@ ${srcdir}/configure: ${srcdir}/configure.ac
|
|||||||
cd ${srcdir}; autoheader; autoconf
|
cd ${srcdir}; autoheader; autoconf
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -f *.${O} core less lesskey lessecho
|
rm -f *.${O} core less$(EXEEXT) lesskey$(EXEEXT) lessecho$(EXEEXT)
|
||||||
|
|
||||||
mostlyclean: clean
|
mostlyclean: clean
|
||||||
|
|
||||||
|
@ -12,6 +12,62 @@
|
|||||||
|
|
||||||
======================================================================
|
======================================================================
|
||||||
|
|
||||||
|
Major changes between "less" versions 424 and 429
|
||||||
|
|
||||||
|
* LESSOPEN pipe will now be used on standard input, if the LESSOPEN
|
||||||
|
environment variable begins with "|-".
|
||||||
|
|
||||||
|
* The -D option with one number now means use the normal background color.
|
||||||
|
|
||||||
|
* Don't change permissions on history file if it is not a regular file.
|
||||||
|
|
||||||
|
* Fix non-ANSI-compliant code that caused problems with some compilers.
|
||||||
|
|
||||||
|
* Fix binary file detection in UTF-8 mode.
|
||||||
|
|
||||||
|
* Fix display problems with long lines on "ignaw" terminals.
|
||||||
|
|
||||||
|
* Fix problem interrupting the line number calculation for initial prompt.
|
||||||
|
|
||||||
|
* Fix SGR emulation when dealing with multiple attributes (eg. bold+underline).
|
||||||
|
|
||||||
|
* Fix highlight bug when searching for underlined/overstruck text.
|
||||||
|
|
||||||
|
======================================================================
|
||||||
|
|
||||||
|
Major changes between "less" versions 418 and 424
|
||||||
|
|
||||||
|
* New "&" command allows filtering of lines based on a pattern.
|
||||||
|
|
||||||
|
* Status column now displays a search match, even if the matched
|
||||||
|
string is scrolled off screen because -S is in effect.
|
||||||
|
|
||||||
|
* Improve behavior of -F option.
|
||||||
|
|
||||||
|
* Allow CSI character (0x9B) to work in UTF-8 mode.
|
||||||
|
|
||||||
|
* Output carriage return at startup in case terminal doesn't default
|
||||||
|
to column 1.
|
||||||
|
|
||||||
|
* Fix bug in '' (quote, quote) command after G command.
|
||||||
|
|
||||||
|
======================================================================
|
||||||
|
|
||||||
|
Major changes between "less" versions 416 and 418
|
||||||
|
|
||||||
|
* Color escape sequences are now supported in WIN32 build.
|
||||||
|
|
||||||
|
* Makefile now uses EXEEXT feature of autoconf.
|
||||||
|
|
||||||
|
* Fix search bug when using -R and text contains ANSI color escape sequences.
|
||||||
|
|
||||||
|
* Fix crash when using -r with UTF-8 text containing 0x9B bytes.
|
||||||
|
|
||||||
|
* Fix display bug when using ' command to move less than one page forward.
|
||||||
|
|
||||||
|
* Update GPL to version 3.
|
||||||
|
|
||||||
|
======================================================================
|
||||||
|
|
||||||
Major changes between "less" versions 409 and 416
|
Major changes between "less" versions 409 and 416
|
||||||
|
|
||||||
|
@ -1,26 +1,20 @@
|
|||||||
|
|
||||||
Less, version 416
|
Less, version 429
|
||||||
|
|
||||||
This is the distribution of less, version 416, released 22 Nov 2007.
|
This is the distribution of less, version 429, released 11 Apr 2009.
|
||||||
This program is part of the GNU project (http://www.gnu.org).
|
This program is part of the GNU project (http://www.gnu.org).
|
||||||
|
|
||||||
This program is free software. You may redistribute it and/or
|
This program is free software. You may redistribute it and/or
|
||||||
modify it under the terms of either:
|
modify it under the terms of either:
|
||||||
|
|
||||||
1. The GNU General Public License, as published by the Free
|
1. The GNU General Public License, as published by the Free
|
||||||
Software Foundation; either version 2, or (at your option) any
|
Software Foundation; either version 3, or (at your option) any
|
||||||
later version. A copy of this license is in the file COPYING.
|
later version. A copy of this license is in the file COPYING.
|
||||||
or
|
or
|
||||||
2. The Less License, in the file LICENSE.
|
2. The Less License, in the file LICENSE.
|
||||||
|
|
||||||
Please report any problems to bug-less@gnu.org or markn@greenwoodsoftware.com.
|
Please report any problems to bug-less@gnu.org or markn@greenwoodsoftware.com.
|
||||||
See http://www.greenwoodsoftware.com/less for the latest info.
|
See http://www.greenwoodsoftware.com/less for the latest info.
|
||||||
You may also contact the author at:
|
|
||||||
Mark Nudelman
|
|
||||||
Greenwood Software
|
|
||||||
PO Box 2402
|
|
||||||
El Granada, CA 94018
|
|
||||||
USA
|
|
||||||
|
|
||||||
=========================================================================
|
=========================================================================
|
||||||
|
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (C) 1984-2007 Mark Nudelman
|
* Copyright (C) 1984-2008 Mark Nudelman
|
||||||
*
|
*
|
||||||
* You may distribute under the terms of either the GNU General Public
|
* You may distribute under the terms of either the GNU General Public
|
||||||
* License or the Less License, as specified in the README file.
|
* License or the Less License, as specified in the README file.
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (C) 1984-2007 Mark Nudelman
|
* Copyright (C) 1984-2008 Mark Nudelman
|
||||||
*
|
*
|
||||||
* You may distribute under the terms of either the GNU General Public
|
* You may distribute under the terms of either the GNU General Public
|
||||||
* License or the Less License, as specified in the README file.
|
* License or the Less License, as specified in the README file.
|
||||||
@ -37,20 +37,19 @@ public int ignore_eoi;
|
|||||||
* in order from most- to least-recently used.
|
* in order from most- to least-recently used.
|
||||||
* The circular list is anchored by the file state "thisfile".
|
* The circular list is anchored by the file state "thisfile".
|
||||||
*/
|
*/
|
||||||
|
struct bufnode {
|
||||||
|
struct bufnode *next, *prev;
|
||||||
|
struct bufnode *hnext, *hprev;
|
||||||
|
};
|
||||||
|
|
||||||
#define LBUFSIZE 8192
|
#define LBUFSIZE 8192
|
||||||
struct buf {
|
struct buf {
|
||||||
struct buf *next, *prev;
|
struct bufnode node;
|
||||||
struct buf *hnext, *hprev;
|
|
||||||
BLOCKNUM block;
|
BLOCKNUM block;
|
||||||
unsigned int datasize;
|
unsigned int datasize;
|
||||||
unsigned char data[LBUFSIZE];
|
unsigned char data[LBUFSIZE];
|
||||||
};
|
};
|
||||||
|
#define bufnode_buf(bn) ((struct buf *) bn)
|
||||||
struct buflist {
|
|
||||||
/* -- Following members must match struct buf */
|
|
||||||
struct buf *buf_next, *buf_prev;
|
|
||||||
struct buf *buf_hnext, *buf_hprev;
|
|
||||||
};
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* The file state is maintained in a filestate structure.
|
* The file state is maintained in a filestate structure.
|
||||||
@ -58,8 +57,8 @@ struct buflist {
|
|||||||
*/
|
*/
|
||||||
#define BUFHASH_SIZE 64
|
#define BUFHASH_SIZE 64
|
||||||
struct filestate {
|
struct filestate {
|
||||||
struct buf *buf_next, *buf_prev;
|
struct bufnode buflist;
|
||||||
struct buflist hashtbl[BUFHASH_SIZE];
|
struct bufnode hashtbl[BUFHASH_SIZE];
|
||||||
int file;
|
int file;
|
||||||
int flags;
|
int flags;
|
||||||
POSITION fpos;
|
POSITION fpos;
|
||||||
@ -69,8 +68,8 @@ struct filestate {
|
|||||||
POSITION fsize;
|
POSITION fsize;
|
||||||
};
|
};
|
||||||
|
|
||||||
#define ch_bufhead thisfile->buf_next
|
#define ch_bufhead thisfile->buflist.next
|
||||||
#define ch_buftail thisfile->buf_prev
|
#define ch_buftail thisfile->buflist.prev
|
||||||
#define ch_nbufs thisfile->nbufs
|
#define ch_nbufs thisfile->nbufs
|
||||||
#define ch_block thisfile->block
|
#define ch_block thisfile->block
|
||||||
#define ch_offset thisfile->offset
|
#define ch_offset thisfile->offset
|
||||||
@ -79,23 +78,48 @@ struct filestate {
|
|||||||
#define ch_flags thisfile->flags
|
#define ch_flags thisfile->flags
|
||||||
#define ch_file thisfile->file
|
#define ch_file thisfile->file
|
||||||
|
|
||||||
#define END_OF_CHAIN ((struct buf *)&thisfile->buf_next)
|
#define END_OF_CHAIN (&thisfile->buflist)
|
||||||
#define END_OF_HCHAIN(h) ((struct buf *)&thisfile->hashtbl[h])
|
#define END_OF_HCHAIN(h) (&thisfile->hashtbl[h])
|
||||||
#define BUFHASH(blk) ((blk) & (BUFHASH_SIZE-1))
|
#define BUFHASH(blk) ((blk) & (BUFHASH_SIZE-1))
|
||||||
|
|
||||||
#define FOR_BUFS_IN_CHAIN(h,bp) \
|
/*
|
||||||
for (bp = thisfile->hashtbl[h].buf_hnext; \
|
* Macros to manipulate the list of buffers in thisfile->buflist.
|
||||||
bp != END_OF_HCHAIN(h); bp = bp->hnext)
|
*/
|
||||||
|
#define FOR_BUFS(bn) \
|
||||||
|
for (bn = ch_bufhead; bn != END_OF_CHAIN; bn = bn->next)
|
||||||
|
|
||||||
#define HASH_RM(bp) \
|
#define BUF_RM(bn) \
|
||||||
(bp)->hnext->hprev = (bp)->hprev; \
|
(bn)->next->prev = (bn)->prev; \
|
||||||
(bp)->hprev->hnext = (bp)->hnext;
|
(bn)->prev->next = (bn)->next;
|
||||||
|
|
||||||
#define HASH_INS(bp,h) \
|
#define BUF_INS_HEAD(bn) \
|
||||||
(bp)->hnext = thisfile->hashtbl[h].buf_hnext; \
|
(bn)->next = ch_bufhead; \
|
||||||
(bp)->hprev = END_OF_HCHAIN(h); \
|
(bn)->prev = END_OF_CHAIN; \
|
||||||
thisfile->hashtbl[h].buf_hnext->hprev = (bp); \
|
ch_bufhead->prev = (bn); \
|
||||||
thisfile->hashtbl[h].buf_hnext = (bp);
|
ch_bufhead = (bn);
|
||||||
|
|
||||||
|
#define BUF_INS_TAIL(bn) \
|
||||||
|
(bn)->next = END_OF_CHAIN; \
|
||||||
|
(bn)->prev = ch_buftail; \
|
||||||
|
ch_buftail->next = (bn); \
|
||||||
|
ch_buftail = (bn);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Macros to manipulate the list of buffers in thisfile->hashtbl[n].
|
||||||
|
*/
|
||||||
|
#define FOR_BUFS_IN_CHAIN(h,bn) \
|
||||||
|
for (bn = thisfile->hashtbl[h].hnext; \
|
||||||
|
bn != END_OF_HCHAIN(h); bn = bn->hnext)
|
||||||
|
|
||||||
|
#define BUF_HASH_RM(bn) \
|
||||||
|
(bn)->hnext->hprev = (bn)->hprev; \
|
||||||
|
(bn)->hprev->hnext = (bn)->hnext;
|
||||||
|
|
||||||
|
#define BUF_HASH_INS(bn,h) \
|
||||||
|
(bn)->hnext = thisfile->hashtbl[h].hnext; \
|
||||||
|
(bn)->hprev = END_OF_HCHAIN(h); \
|
||||||
|
thisfile->hashtbl[h].hnext->hprev = (bn); \
|
||||||
|
thisfile->hashtbl[h].hnext = (bn);
|
||||||
|
|
||||||
static struct filestate *thisfile;
|
static struct filestate *thisfile;
|
||||||
static int ch_ungotchar = -1;
|
static int ch_ungotchar = -1;
|
||||||
@ -119,17 +143,12 @@ static int ch_addbuf();
|
|||||||
|
|
||||||
/*
|
/*
|
||||||
* Get the character pointed to by the read pointer.
|
* Get the character pointed to by the read pointer.
|
||||||
* ch_get() is a macro which is more efficient to call
|
|
||||||
* than fch_get (the function), in the usual case
|
|
||||||
* that the block desired is at the head of the chain.
|
|
||||||
*/
|
*/
|
||||||
#define ch_get() ((ch_block == ch_bufhead->block && \
|
|
||||||
ch_offset < ch_bufhead->datasize) ? \
|
|
||||||
ch_bufhead->data[ch_offset] : fch_get())
|
|
||||||
int
|
int
|
||||||
fch_get()
|
ch_get()
|
||||||
{
|
{
|
||||||
register struct buf *bp;
|
register struct buf *bp;
|
||||||
|
register struct bufnode *bn;
|
||||||
register int n;
|
register int n;
|
||||||
register int slept;
|
register int slept;
|
||||||
register int h;
|
register int h;
|
||||||
@ -139,24 +158,38 @@ fch_get()
|
|||||||
if (thisfile == NULL)
|
if (thisfile == NULL)
|
||||||
return (EOI);
|
return (EOI);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Quick check for the common case where
|
||||||
|
* the desired char is in the head buffer.
|
||||||
|
*/
|
||||||
|
if (ch_bufhead != END_OF_CHAIN)
|
||||||
|
{
|
||||||
|
bp = bufnode_buf(ch_bufhead);
|
||||||
|
if (ch_block == bp->block && ch_offset < bp->datasize)
|
||||||
|
return bp->data[ch_offset];
|
||||||
|
}
|
||||||
|
|
||||||
slept = FALSE;
|
slept = FALSE;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Look for a buffer holding the desired block.
|
* Look for a buffer holding the desired block.
|
||||||
*/
|
*/
|
||||||
h = BUFHASH(ch_block);
|
h = BUFHASH(ch_block);
|
||||||
FOR_BUFS_IN_CHAIN(h, bp)
|
FOR_BUFS_IN_CHAIN(h, bn)
|
||||||
{
|
{
|
||||||
|
bp = bufnode_buf(bn);
|
||||||
if (bp->block == ch_block)
|
if (bp->block == ch_block)
|
||||||
{
|
{
|
||||||
if (ch_offset >= bp->datasize)
|
if (ch_offset >= bp->datasize)
|
||||||
/*
|
/*
|
||||||
* Need more data in this buffer.
|
* Need more data in this buffer.
|
||||||
*/
|
*/
|
||||||
goto read_more;
|
break;
|
||||||
goto found;
|
goto found;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (bn == END_OF_HCHAIN(h))
|
||||||
|
{
|
||||||
/*
|
/*
|
||||||
* Block is not in a buffer.
|
* Block is not in a buffer.
|
||||||
* Take the least recently used buffer
|
* Take the least recently used buffer
|
||||||
@ -164,7 +197,8 @@ fch_get()
|
|||||||
* If the LRU buffer has data in it,
|
* If the LRU buffer has data in it,
|
||||||
* then maybe allocate a new buffer.
|
* then maybe allocate a new buffer.
|
||||||
*/
|
*/
|
||||||
if (ch_buftail == END_OF_CHAIN || ch_buftail->block != -1)
|
if (ch_buftail == END_OF_CHAIN ||
|
||||||
|
bufnode_buf(ch_buftail)->block != -1)
|
||||||
{
|
{
|
||||||
/*
|
/*
|
||||||
* There is no empty buffer to use.
|
* There is no empty buffer to use.
|
||||||
@ -180,11 +214,13 @@ fch_get()
|
|||||||
*/
|
*/
|
||||||
autobuf = OPT_OFF;
|
autobuf = OPT_OFF;
|
||||||
}
|
}
|
||||||
bp = ch_buftail;
|
bn = ch_buftail;
|
||||||
HASH_RM(bp); /* Remove from old hash chain. */
|
bp = bufnode_buf(bn);
|
||||||
|
BUF_HASH_RM(bn); /* Remove from old hash chain. */
|
||||||
bp->block = ch_block;
|
bp->block = ch_block;
|
||||||
bp->datasize = 0;
|
bp->datasize = 0;
|
||||||
HASH_INS(bp, h); /* Insert into new hash chain. */
|
BUF_HASH_INS(bn, h); /* Insert into new hash chain. */
|
||||||
|
}
|
||||||
|
|
||||||
read_more:
|
read_more:
|
||||||
pos = (ch_block * LBUFSIZE) + bp->datasize;
|
pos = (ch_block * LBUFSIZE) + bp->datasize;
|
||||||
@ -309,24 +345,20 @@ fch_get()
|
|||||||
}
|
}
|
||||||
|
|
||||||
found:
|
found:
|
||||||
if (ch_bufhead != bp)
|
if (ch_bufhead != bn)
|
||||||
{
|
{
|
||||||
/*
|
/*
|
||||||
* Move the buffer to the head of the buffer chain.
|
* Move the buffer to the head of the buffer chain.
|
||||||
* This orders the buffer chain, most- to least-recently used.
|
* This orders the buffer chain, most- to least-recently used.
|
||||||
*/
|
*/
|
||||||
bp->next->prev = bp->prev;
|
BUF_RM(bn);
|
||||||
bp->prev->next = bp->next;
|
BUF_INS_HEAD(bn);
|
||||||
bp->next = ch_bufhead;
|
|
||||||
bp->prev = END_OF_CHAIN;
|
|
||||||
ch_bufhead->prev = bp;
|
|
||||||
ch_bufhead = bp;
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Move to head of hash chain too.
|
* Move to head of hash chain too.
|
||||||
*/
|
*/
|
||||||
HASH_RM(bp);
|
BUF_HASH_RM(bn);
|
||||||
HASH_INS(bp, h);
|
BUF_HASH_INS(bn, h);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (ch_offset >= bp->datasize)
|
if (ch_offset >= bp->datasize)
|
||||||
@ -386,6 +418,7 @@ end_logfile()
|
|||||||
sync_logfile()
|
sync_logfile()
|
||||||
{
|
{
|
||||||
register struct buf *bp;
|
register struct buf *bp;
|
||||||
|
register struct bufnode *bn;
|
||||||
int warned = FALSE;
|
int warned = FALSE;
|
||||||
BLOCKNUM block;
|
BLOCKNUM block;
|
||||||
BLOCKNUM nblocks;
|
BLOCKNUM nblocks;
|
||||||
@ -393,24 +426,23 @@ sync_logfile()
|
|||||||
nblocks = (ch_fpos + LBUFSIZE - 1) / LBUFSIZE;
|
nblocks = (ch_fpos + LBUFSIZE - 1) / LBUFSIZE;
|
||||||
for (block = 0; block < nblocks; block++)
|
for (block = 0; block < nblocks; block++)
|
||||||
{
|
{
|
||||||
for (bp = ch_bufhead; ; bp = bp->next)
|
int wrote = FALSE;
|
||||||
|
FOR_BUFS(bn)
|
||||||
{
|
{
|
||||||
if (bp == END_OF_CHAIN)
|
bp = bufnode_buf(bn);
|
||||||
|
if (bp->block == block)
|
||||||
{
|
{
|
||||||
if (!warned)
|
write(logfile, (char *) bp->data, bp->datasize);
|
||||||
|
wrote = TRUE;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (!wrote && !warned)
|
||||||
{
|
{
|
||||||
error("Warning: log file is incomplete",
|
error("Warning: log file is incomplete",
|
||||||
NULL_PARG);
|
NULL_PARG);
|
||||||
warned = TRUE;
|
warned = TRUE;
|
||||||
}
|
}
|
||||||
break;
|
|
||||||
}
|
|
||||||
if (bp->block == block)
|
|
||||||
{
|
|
||||||
write(logfile, (char *) bp->data, bp->datasize);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -424,11 +456,13 @@ buffered(block)
|
|||||||
BLOCKNUM block;
|
BLOCKNUM block;
|
||||||
{
|
{
|
||||||
register struct buf *bp;
|
register struct buf *bp;
|
||||||
|
register struct bufnode *bn;
|
||||||
register int h;
|
register int h;
|
||||||
|
|
||||||
h = BUFHASH(block);
|
h = BUFHASH(block);
|
||||||
FOR_BUFS_IN_CHAIN(h, bp)
|
FOR_BUFS_IN_CHAIN(h, bn)
|
||||||
{
|
{
|
||||||
|
bp = bufnode_buf(bn);
|
||||||
if (bp->block == block)
|
if (bp->block == block)
|
||||||
return (TRUE);
|
return (TRUE);
|
||||||
}
|
}
|
||||||
@ -510,7 +544,8 @@ ch_end_seek()
|
|||||||
public int
|
public int
|
||||||
ch_beg_seek()
|
ch_beg_seek()
|
||||||
{
|
{
|
||||||
register struct buf *bp, *firstbp;
|
register struct bufnode *bn;
|
||||||
|
register struct bufnode *firstbn;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Try a plain ch_seek first.
|
* Try a plain ch_seek first.
|
||||||
@ -522,13 +557,15 @@ ch_beg_seek()
|
|||||||
* Can't get to position 0.
|
* Can't get to position 0.
|
||||||
* Look thru the buffers for the one closest to position 0.
|
* Look thru the buffers for the one closest to position 0.
|
||||||
*/
|
*/
|
||||||
firstbp = bp = ch_bufhead;
|
firstbn = ch_bufhead;
|
||||||
if (bp == END_OF_CHAIN)
|
if (firstbn == END_OF_CHAIN)
|
||||||
return (1);
|
return (1);
|
||||||
while ((bp = bp->next) != END_OF_CHAIN)
|
FOR_BUFS(bn)
|
||||||
if (bp->block < firstbp->block)
|
{
|
||||||
firstbp = bp;
|
if (bufnode_buf(bn)->block < bufnode_buf(firstbn)->block)
|
||||||
ch_block = firstbp->block;
|
firstbn = bn;
|
||||||
|
}
|
||||||
|
ch_block = bufnode_buf(firstbn)->block;
|
||||||
ch_offset = 0;
|
ch_offset = 0;
|
||||||
return (0);
|
return (0);
|
||||||
}
|
}
|
||||||
@ -628,7 +665,7 @@ ch_setbufspace(bufspace)
|
|||||||
public void
|
public void
|
||||||
ch_flush()
|
ch_flush()
|
||||||
{
|
{
|
||||||
register struct buf *bp;
|
register struct bufnode *bn;
|
||||||
|
|
||||||
if (thisfile == NULL)
|
if (thisfile == NULL)
|
||||||
return;
|
return;
|
||||||
@ -646,8 +683,10 @@ ch_flush()
|
|||||||
/*
|
/*
|
||||||
* Initialize all the buffers.
|
* Initialize all the buffers.
|
||||||
*/
|
*/
|
||||||
for (bp = ch_bufhead; bp != END_OF_CHAIN; bp = bp->next)
|
FOR_BUFS(bn)
|
||||||
bp->block = -1;
|
{
|
||||||
|
bufnode_buf(bn)->block = -1;
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Figure out the size of the file, if we can.
|
* Figure out the size of the file, if we can.
|
||||||
@ -694,6 +733,7 @@ ch_flush()
|
|||||||
ch_addbuf()
|
ch_addbuf()
|
||||||
{
|
{
|
||||||
register struct buf *bp;
|
register struct buf *bp;
|
||||||
|
register struct bufnode *bn;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Allocate and initialize a new buffer and link it
|
* Allocate and initialize a new buffer and link it
|
||||||
@ -704,11 +744,10 @@ ch_addbuf()
|
|||||||
return (1);
|
return (1);
|
||||||
ch_nbufs++;
|
ch_nbufs++;
|
||||||
bp->block = -1;
|
bp->block = -1;
|
||||||
bp->next = END_OF_CHAIN;
|
bn = &bp->node;
|
||||||
bp->prev = ch_buftail;
|
|
||||||
ch_buftail->next = bp;
|
BUF_INS_TAIL(bn);
|
||||||
ch_buftail = bp;
|
BUF_HASH_INS(bn, 0);
|
||||||
HASH_INS(bp, 0);
|
|
||||||
return (0);
|
return (0);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -722,8 +761,8 @@ init_hashtbl()
|
|||||||
|
|
||||||
for (h = 0; h < BUFHASH_SIZE; h++)
|
for (h = 0; h < BUFHASH_SIZE; h++)
|
||||||
{
|
{
|
||||||
thisfile->hashtbl[h].buf_hnext = END_OF_HCHAIN(h);
|
thisfile->hashtbl[h].hnext = END_OF_HCHAIN(h);
|
||||||
thisfile->hashtbl[h].buf_hprev = END_OF_HCHAIN(h);
|
thisfile->hashtbl[h].hprev = END_OF_HCHAIN(h);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -733,14 +772,13 @@ init_hashtbl()
|
|||||||
static void
|
static void
|
||||||
ch_delbufs()
|
ch_delbufs()
|
||||||
{
|
{
|
||||||
register struct buf *bp;
|
register struct bufnode *bn;
|
||||||
|
|
||||||
while (ch_bufhead != END_OF_CHAIN)
|
while (ch_bufhead != END_OF_CHAIN)
|
||||||
{
|
{
|
||||||
bp = ch_bufhead;
|
bn = ch_bufhead;
|
||||||
bp->next->prev = bp->prev;
|
BUF_RM(bn);
|
||||||
bp->prev->next = bp->next;
|
free(bufnode_buf(bn));
|
||||||
free(bp);
|
|
||||||
}
|
}
|
||||||
ch_nbufs = 0;
|
ch_nbufs = 0;
|
||||||
init_hashtbl();
|
init_hashtbl();
|
||||||
@ -786,7 +824,7 @@ ch_init(f, flags)
|
|||||||
*/
|
*/
|
||||||
thisfile = (struct filestate *)
|
thisfile = (struct filestate *)
|
||||||
calloc(1, sizeof(struct filestate));
|
calloc(1, sizeof(struct filestate));
|
||||||
thisfile->buf_next = thisfile->buf_prev = END_OF_CHAIN;
|
thisfile->buflist.next = thisfile->buflist.prev = END_OF_CHAIN;
|
||||||
thisfile->nbufs = 0;
|
thisfile->nbufs = 0;
|
||||||
thisfile->flags = 0;
|
thisfile->flags = 0;
|
||||||
thisfile->fpos = 0;
|
thisfile->fpos = 0;
|
||||||
@ -867,6 +905,7 @@ ch_getflags()
|
|||||||
ch_dump(struct filestate *fs)
|
ch_dump(struct filestate *fs)
|
||||||
{
|
{
|
||||||
struct buf *bp;
|
struct buf *bp;
|
||||||
|
struct bufnode *bn;
|
||||||
unsigned char *s;
|
unsigned char *s;
|
||||||
|
|
||||||
if (fs == NULL)
|
if (fs == NULL)
|
||||||
@ -878,8 +917,9 @@ ch_dump(struct filestate *fs)
|
|||||||
fs->file, fs->flags, fs->fpos,
|
fs->file, fs->flags, fs->fpos,
|
||||||
fs->fsize, fs->block, fs->offset);
|
fs->fsize, fs->block, fs->offset);
|
||||||
printf(" %d bufs:\n", fs->nbufs);
|
printf(" %d bufs:\n", fs->nbufs);
|
||||||
for (bp = fs->buf_next; bp != (struct buf *)fs; bp = bp->next)
|
for (bn = fs->next; bn != &fs->buflist; bn = bn->next)
|
||||||
{
|
{
|
||||||
|
bp = bufnode_buf(bn);
|
||||||
printf("%x: blk %x, size %x \"",
|
printf("%x: blk %x, size %x \"",
|
||||||
bp, bp->block, bp->datasize);
|
bp, bp->block, bp->datasize);
|
||||||
for (s = bp->data; s < bp->data + 30; s++)
|
for (s = bp->data; s < bp->data + 30; s++)
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (C) 1984-2007 Mark Nudelman
|
* Copyright (C) 1984-2008 Mark Nudelman
|
||||||
*
|
*
|
||||||
* You may distribute under the terms of either the GNU General Public
|
* You may distribute under the terms of either the GNU General Public
|
||||||
* License or the Less License, as specified in the README file.
|
* License or the Less License, as specified in the README file.
|
||||||
@ -393,8 +393,10 @@ init_charset()
|
|||||||
*/
|
*/
|
||||||
public int
|
public int
|
||||||
binary_char(c)
|
binary_char(c)
|
||||||
unsigned char c;
|
LWCHAR c;
|
||||||
{
|
{
|
||||||
|
if (utf_mode)
|
||||||
|
return (is_ubin_char(c));
|
||||||
c &= 0377;
|
c &= 0377;
|
||||||
return (chardef[c] & IS_BINARY_CHAR);
|
return (chardef[c] & IS_BINARY_CHAR);
|
||||||
}
|
}
|
||||||
@ -404,7 +406,7 @@ binary_char(c)
|
|||||||
*/
|
*/
|
||||||
public int
|
public int
|
||||||
control_char(c)
|
control_char(c)
|
||||||
int c;
|
LWCHAR c;
|
||||||
{
|
{
|
||||||
c &= 0377;
|
c &= 0377;
|
||||||
return (chardef[c] & IS_CONTROL_CHAR);
|
return (chardef[c] & IS_CONTROL_CHAR);
|
||||||
@ -416,7 +418,7 @@ control_char(c)
|
|||||||
*/
|
*/
|
||||||
public char *
|
public char *
|
||||||
prchar(c)
|
prchar(c)
|
||||||
int c;
|
LWCHAR c;
|
||||||
{
|
{
|
||||||
/* {{ This buffer can be overrun if LESSBINFMT is a long string. }} */
|
/* {{ This buffer can be overrun if LESSBINFMT is a long string. }} */
|
||||||
static char buf[32];
|
static char buf[32];
|
||||||
@ -811,7 +813,11 @@ static struct wchar_range comb_table[] = {
|
|||||||
* dated 2005-11-30T00:58:48Z
|
* dated 2005-11-30T00:58:48Z
|
||||||
*/
|
*/
|
||||||
static struct wchar_range ubin_table[] = {
|
static struct wchar_range ubin_table[] = {
|
||||||
{ 0x0000, 0x001F} /* Cc */, { 0x007F, 0x009F} /* Cc */,
|
{ 0x0000, 0x0007} /* Cc */,
|
||||||
|
{ 0x000B, 0x000C} /* Cc */,
|
||||||
|
{ 0x000E, 0x001A} /* Cc */,
|
||||||
|
{ 0x001C, 0x001F} /* Cc */,
|
||||||
|
{ 0x007F, 0x009F} /* Cc */,
|
||||||
#if 0
|
#if 0
|
||||||
{ 0x00AD, 0x00AD} /* Cf */,
|
{ 0x00AD, 0x00AD} /* Cf */,
|
||||||
#endif
|
#endif
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (C) 2005-2007 Mark Nudelman
|
* Copyright (C) 2005-2008 Mark Nudelman
|
||||||
*
|
*
|
||||||
* You may distribute under the terms of either the GNU General Public
|
* You may distribute under the terms of either the GNU General Public
|
||||||
* License or the Less License, as specified in the README file.
|
* License or the Less License, as specified in the README file.
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (C) 1984-2007 Mark Nudelman
|
* Copyright (C) 1984-2008 Mark Nudelman
|
||||||
*
|
*
|
||||||
* You may distribute under the terms of either the GNU General Public
|
* You may distribute under the terms of either the GNU General Public
|
||||||
* License or the Less License, as specified in the README file.
|
* License or the Less License, as specified in the README file.
|
||||||
@ -65,6 +65,7 @@
|
|||||||
#define A_REMOVE_FILE 52
|
#define A_REMOVE_FILE 52
|
||||||
#define A_NEXT_TAG 53
|
#define A_NEXT_TAG 53
|
||||||
#define A_PREV_TAG 54
|
#define A_PREV_TAG 54
|
||||||
|
#define A_FILTER 55
|
||||||
|
|
||||||
#define A_INVALID 100
|
#define A_INVALID 100
|
||||||
#define A_NOACTION 101
|
#define A_NOACTION 101
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (C) 1984-2007 Mark Nudelman
|
* Copyright (C) 1984-2008 Mark Nudelman
|
||||||
*
|
*
|
||||||
* You may distribute under the terms of either the GNU General Public
|
* You may distribute under the terms of either the GNU General Public
|
||||||
* License or the Less License, as specified in the README file.
|
* License or the Less License, as specified in the README file.
|
||||||
@ -662,12 +662,14 @@ set_mlist(mlist, cmdflags)
|
|||||||
void *mlist;
|
void *mlist;
|
||||||
int cmdflags;
|
int cmdflags;
|
||||||
{
|
{
|
||||||
|
#if CMD_HISTORY
|
||||||
curr_mlist = (struct mlist *) mlist;
|
curr_mlist = (struct mlist *) mlist;
|
||||||
curr_cmdflags = cmdflags;
|
curr_cmdflags = cmdflags;
|
||||||
|
|
||||||
/* Make sure the next up-arrow moves to the last string in the mlist. */
|
/* Make sure the next up-arrow moves to the last string in the mlist. */
|
||||||
if (curr_mlist != NULL)
|
if (curr_mlist != NULL)
|
||||||
curr_mlist->curr_mp = curr_mlist;
|
curr_mlist->curr_mp = curr_mlist;
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
#if CMD_HISTORY
|
#if CMD_HISTORY
|
||||||
@ -1303,6 +1305,7 @@ get_cmdbuf()
|
|||||||
return (cmdbuf);
|
return (cmdbuf);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if CMD_HISTORY
|
||||||
/*
|
/*
|
||||||
* Return the last (most recent) string in the current command history.
|
* Return the last (most recent) string in the current command history.
|
||||||
*/
|
*/
|
||||||
@ -1313,6 +1316,7 @@ cmd_lastpattern()
|
|||||||
return (NULL);
|
return (NULL);
|
||||||
return (curr_mlist->curr_mp->prev->string);
|
return (curr_mlist->curr_mp->prev->string);
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
#if CMD_HISTORY
|
#if CMD_HISTORY
|
||||||
/*
|
/*
|
||||||
@ -1465,8 +1469,19 @@ save_cmdhist()
|
|||||||
if (f == NULL)
|
if (f == NULL)
|
||||||
return;
|
return;
|
||||||
#if HAVE_FCHMOD
|
#if HAVE_FCHMOD
|
||||||
|
{
|
||||||
/* Make history file readable only by owner. */
|
/* Make history file readable only by owner. */
|
||||||
|
int do_chmod = 1;
|
||||||
|
#if HAVE_STAT
|
||||||
|
struct stat statbuf;
|
||||||
|
int r = fstat(fileno(f), &statbuf);
|
||||||
|
if (r < 0 || !S_ISREG(statbuf.st_mode))
|
||||||
|
/* Don't chmod if not a regular file. */
|
||||||
|
do_chmod = 0;
|
||||||
|
#endif
|
||||||
|
if (do_chmod)
|
||||||
fchmod(fileno(f), 0600);
|
fchmod(fileno(f), 0600);
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
fprintf(f, "%s\n", HISTFILE_FIRST_LINE);
|
fprintf(f, "%s\n", HISTFILE_FIRST_LINE);
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/* $FreeBSD$ */
|
/* $FreeBSD$ */
|
||||||
/*
|
/*
|
||||||
* Copyright (C) 1984-2007 Mark Nudelman
|
* Copyright (C) 1984-2008 Mark Nudelman
|
||||||
*
|
*
|
||||||
* You may distribute under the terms of either the GNU General Public
|
* You may distribute under the terms of either the GNU General Public
|
||||||
* License or the Less License, as specified in the README file.
|
* License or the Less License, as specified in the README file.
|
||||||
@ -26,7 +26,6 @@ extern int erase_char, erase2_char, kill_char;
|
|||||||
extern int sigs;
|
extern int sigs;
|
||||||
extern int quit_if_one_screen;
|
extern int quit_if_one_screen;
|
||||||
extern int squished;
|
extern int squished;
|
||||||
extern int hit_eof;
|
|
||||||
extern int sc_width;
|
extern int sc_width;
|
||||||
extern int sc_height;
|
extern int sc_height;
|
||||||
extern int swindow;
|
extern int swindow;
|
||||||
@ -86,7 +85,9 @@ static void multi_search();
|
|||||||
static void
|
static void
|
||||||
cmd_exec()
|
cmd_exec()
|
||||||
{
|
{
|
||||||
|
#if HILITE_SEARCH
|
||||||
clear_attn();
|
clear_attn();
|
||||||
|
#endif
|
||||||
clear_bot();
|
clear_bot();
|
||||||
flush();
|
flush();
|
||||||
}
|
}
|
||||||
@ -120,6 +121,11 @@ in_mca()
|
|||||||
static void
|
static void
|
||||||
mca_search()
|
mca_search()
|
||||||
{
|
{
|
||||||
|
#if HILITE_SEARCH
|
||||||
|
if (search_type & SRCH_FILTER)
|
||||||
|
mca = A_FILTER;
|
||||||
|
else
|
||||||
|
#endif
|
||||||
if (search_type & SRCH_FORW)
|
if (search_type & SRCH_FORW)
|
||||||
mca = A_F_SEARCH;
|
mca = A_F_SEARCH;
|
||||||
else
|
else
|
||||||
@ -139,6 +145,11 @@ mca_search()
|
|||||||
if (search_type & SRCH_NO_REGEX)
|
if (search_type & SRCH_NO_REGEX)
|
||||||
cmd_putstr("Regex-off ");
|
cmd_putstr("Regex-off ");
|
||||||
|
|
||||||
|
#if HILITE_SEARCH
|
||||||
|
if (search_type & SRCH_FILTER)
|
||||||
|
cmd_putstr("&/");
|
||||||
|
else
|
||||||
|
#endif
|
||||||
if (search_type & SRCH_FORW)
|
if (search_type & SRCH_FORW)
|
||||||
cmd_putstr("/");
|
cmd_putstr("/");
|
||||||
else
|
else
|
||||||
@ -197,6 +208,12 @@ exec_mca()
|
|||||||
case A_B_SEARCH:
|
case A_B_SEARCH:
|
||||||
multi_search(cbuf, (int) number);
|
multi_search(cbuf, (int) number);
|
||||||
break;
|
break;
|
||||||
|
#if HILITE_SEARCH
|
||||||
|
case A_FILTER:
|
||||||
|
search_type ^= SRCH_NO_MATCH;
|
||||||
|
set_filter_pattern(cbuf, search_type);
|
||||||
|
break;
|
||||||
|
#endif
|
||||||
case A_FIRSTCMD:
|
case A_FIRSTCMD:
|
||||||
/*
|
/*
|
||||||
* Skip leading spaces or + signs in the string.
|
* Skip leading spaces or + signs in the string.
|
||||||
@ -469,6 +486,7 @@ mca_char(c)
|
|||||||
|
|
||||||
case A_F_SEARCH:
|
case A_F_SEARCH:
|
||||||
case A_B_SEARCH:
|
case A_B_SEARCH:
|
||||||
|
case A_FILTER:
|
||||||
/*
|
/*
|
||||||
* Special case for search commands.
|
* Special case for search commands.
|
||||||
* Certain characters as the first char of
|
* Certain characters as the first char of
|
||||||
@ -490,15 +508,18 @@ mca_char(c)
|
|||||||
if (less_is_more)
|
if (less_is_more)
|
||||||
break;
|
break;
|
||||||
case CONTROL('E'): /* ignore END of file */
|
case CONTROL('E'): /* ignore END of file */
|
||||||
|
if (mca != A_FILTER)
|
||||||
flag = SRCH_PAST_EOF;
|
flag = SRCH_PAST_EOF;
|
||||||
break;
|
break;
|
||||||
case '@':
|
case '@':
|
||||||
if (less_is_more)
|
if (less_is_more)
|
||||||
break;
|
break;
|
||||||
case CONTROL('F'): /* FIRST file */
|
case CONTROL('F'): /* FIRST file */
|
||||||
|
if (mca != A_FILTER)
|
||||||
flag = SRCH_FIRST_FILE;
|
flag = SRCH_FIRST_FILE;
|
||||||
break;
|
break;
|
||||||
case CONTROL('K'): /* KEEP position */
|
case CONTROL('K'): /* KEEP position */
|
||||||
|
if (mca != A_FILTER)
|
||||||
flag = SRCH_NO_MOVE;
|
flag = SRCH_NO_MOVE;
|
||||||
break;
|
break;
|
||||||
case CONTROL('R'): /* Don't use REGULAR EXPRESSIONS */
|
case CONTROL('R'): /* Don't use REGULAR EXPRESSIONS */
|
||||||
@ -636,25 +657,20 @@ prompt()
|
|||||||
bottompos = position(BOTTOM_PLUS_ONE);
|
bottompos = position(BOTTOM_PLUS_ONE);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* If we've hit EOF on the last file, and the -E flag is set
|
* If we've hit EOF on the last file and the -E flag is set, quit.
|
||||||
* (or -F is set and this is the first prompt), then quit.
|
|
||||||
* {{ Relying on "first prompt" to detect a single-screen file
|
|
||||||
* fails if +G is used, for example. }}
|
|
||||||
*/
|
*/
|
||||||
if ((get_quit_at_eof() == OPT_ONPLUS || quit_if_one_screen) &&
|
if (get_quit_at_eof() == OPT_ONPLUS &&
|
||||||
hit_eof && !(ch_getflags() & CH_HELPFILE) &&
|
eof_displayed() && !(ch_getflags() & CH_HELPFILE) &&
|
||||||
next_ifile(curr_ifile) == NULL_IFILE)
|
next_ifile(curr_ifile) == NULL_IFILE)
|
||||||
quit(QUIT_OK);
|
quit(QUIT_OK);
|
||||||
quit_if_one_screen = FALSE;
|
|
||||||
#if 0 /* This doesn't work well because some "te"s clear the screen. */
|
|
||||||
/*
|
/*
|
||||||
* If the -e flag is set and we've hit EOF on the last file,
|
* If the entire file is displayed and the -F flag is set, quit.
|
||||||
* and the file is squished (shorter than the screen), quit.
|
|
||||||
*/
|
*/
|
||||||
if (get_quit_at_eof() && squished &&
|
if (quit_if_one_screen &&
|
||||||
|
entire_file_displayed() && !(ch_getflags() & CH_HELPFILE) &&
|
||||||
next_ifile(curr_ifile) == NULL_IFILE)
|
next_ifile(curr_ifile) == NULL_IFILE)
|
||||||
quit(QUIT_OK);
|
quit(QUIT_OK);
|
||||||
#endif
|
|
||||||
|
|
||||||
#if MSDOS_COMPILER==WIN32C
|
#if MSDOS_COMPILER==WIN32C
|
||||||
/*
|
/*
|
||||||
@ -681,6 +697,8 @@ prompt()
|
|||||||
clear_cmd();
|
clear_cmd();
|
||||||
forw_prompt = 0;
|
forw_prompt = 0;
|
||||||
p = pr_string();
|
p = pr_string();
|
||||||
|
if (is_filtering())
|
||||||
|
putstr("& ");
|
||||||
if (p == NULL || *p == '\0')
|
if (p == NULL || *p == '\0')
|
||||||
putchr(':');
|
putchr(':');
|
||||||
else
|
else
|
||||||
@ -1137,7 +1155,6 @@ commands()
|
|||||||
cmd_exec();
|
cmd_exec();
|
||||||
jump_forw();
|
jump_forw();
|
||||||
ignore_eoi = 1;
|
ignore_eoi = 1;
|
||||||
hit_eof = 0;
|
|
||||||
while (!sigs)
|
while (!sigs)
|
||||||
{
|
{
|
||||||
make_display();
|
make_display();
|
||||||
@ -1314,6 +1331,17 @@ commands()
|
|||||||
c = getcc();
|
c = getcc();
|
||||||
goto again;
|
goto again;
|
||||||
|
|
||||||
|
case A_FILTER:
|
||||||
|
#if HILITE_SEARCH
|
||||||
|
search_type = SRCH_FORW | SRCH_FILTER;
|
||||||
|
mca_search();
|
||||||
|
c = getcc();
|
||||||
|
goto again;
|
||||||
|
#else
|
||||||
|
error("Command not available", NULL_PARG);
|
||||||
|
break;
|
||||||
|
#endif
|
||||||
|
|
||||||
case A_AGAIN_SEARCH:
|
case A_AGAIN_SEARCH:
|
||||||
/*
|
/*
|
||||||
* Repeat previous search.
|
* Repeat previous search.
|
||||||
@ -1438,7 +1466,7 @@ commands()
|
|||||||
number = 1;
|
number = 1;
|
||||||
if (edit_next((int) number))
|
if (edit_next((int) number))
|
||||||
{
|
{
|
||||||
if (get_quit_at_eof() && hit_eof &&
|
if (get_quit_at_eof() && eof_displayed() &&
|
||||||
!(ch_getflags() & CH_HELPFILE))
|
!(ch_getflags() & CH_HELPFILE))
|
||||||
quit(QUIT_OK);
|
quit(QUIT_OK);
|
||||||
parg.p_string = (number > 1) ? "(N-th) " : "";
|
parg.p_string = (number > 1) ? "(N-th) " : "";
|
||||||
@ -1602,6 +1630,7 @@ commands()
|
|||||||
if (c == erase_char || c == erase2_char ||
|
if (c == erase_char || c == erase2_char ||
|
||||||
c == kill_char || c == '\n' || c == '\r')
|
c == kill_char || c == '\n' || c == '\r')
|
||||||
break;
|
break;
|
||||||
|
cmd_exec();
|
||||||
gomark(c);
|
gomark(c);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
3315
contrib/less/configure
vendored
3315
contrib/less/configure
vendored
File diff suppressed because it is too large
Load Diff
@ -1,6 +1,6 @@
|
|||||||
# Process this file with autoconf to produce a configure script.
|
# Process this file with autoconf to produce a configure script.
|
||||||
|
|
||||||
# Copyright (C) 1984-2007 Mark Nudelman
|
# Copyright (C) 1984-2008 Mark Nudelman
|
||||||
#
|
#
|
||||||
# You may distribute under the terms of either the GNU General Public
|
# You may distribute under the terms of either the GNU General Public
|
||||||
# License or the Less License, as specified in the README file.
|
# License or the Less License, as specified in the README file.
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (C) 1984-2007 Mark Nudelman
|
* Copyright (C) 1984-2008 Mark Nudelman
|
||||||
*
|
*
|
||||||
* You may distribute under the terms of either the GNU General Public
|
* You may distribute under the terms of either the GNU General Public
|
||||||
* License or the Less License, as specified in the README file.
|
* License or the Less License, as specified in the README file.
|
||||||
@ -133,6 +133,7 @@ static unsigned char cmdtable[] =
|
|||||||
ESC,'n',0, A_T_AGAIN_SEARCH,
|
ESC,'n',0, A_T_AGAIN_SEARCH,
|
||||||
'N',0, A_REVERSE_SEARCH,
|
'N',0, A_REVERSE_SEARCH,
|
||||||
ESC,'N',0, A_T_REVERSE_SEARCH,
|
ESC,'N',0, A_T_REVERSE_SEARCH,
|
||||||
|
'&',0, A_FILTER,
|
||||||
'm',0, A_SETMARK,
|
'm',0, A_SETMARK,
|
||||||
'\'',0, A_GOMARK,
|
'\'',0, A_GOMARK,
|
||||||
CONTROL('X'),CONTROL('X'),0, A_GOMARK,
|
CONTROL('X'),CONTROL('X'),0, A_GOMARK,
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (C) 1984-2007 Mark Nudelman
|
* Copyright (C) 1984-2008 Mark Nudelman
|
||||||
*
|
*
|
||||||
* You may distribute under the terms of either the GNU General Public
|
* You may distribute under the terms of either the GNU General Public
|
||||||
* License or the Less License, as specified in the README file.
|
* License or the Less License, as specified in the README file.
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (C) 1984-2007 Mark Nudelman
|
* Copyright (C) 1984-2008 Mark Nudelman
|
||||||
*
|
*
|
||||||
* You may distribute under the terms of either the GNU General Public
|
* You may distribute under the terms of either the GNU General Public
|
||||||
* License or the Less License, as specified in the README file.
|
* License or the Less License, as specified in the README file.
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (C) 1984-2007 Mark Nudelman
|
* Copyright (C) 1984-2008 Mark Nudelman
|
||||||
*
|
*
|
||||||
* You may distribute under the terms of either the GNU General Public
|
* You may distribute under the terms of either the GNU General Public
|
||||||
* License or the Less License, as specified in the README file.
|
* License or the Less License, as specified in the README file.
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (C) 1984-2007 Mark Nudelman
|
* Copyright (C) 1984-2008 Mark Nudelman
|
||||||
*
|
*
|
||||||
* You may distribute under the terms of either the GNU General Public
|
* You may distribute under the terms of either the GNU General Public
|
||||||
* License or the Less License, as specified in the README file.
|
* License or the Less License, as specified in the README file.
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (C) 1984-2007 Mark Nudelman
|
* Copyright (C) 1984-2008 Mark Nudelman
|
||||||
*
|
*
|
||||||
* You may distribute under the terms of either the GNU General Public
|
* You may distribute under the terms of either the GNU General Public
|
||||||
* License or the Less License, as specified in the README file.
|
* License or the Less License, as specified in the README file.
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (C) 1984-2007 Mark Nudelman
|
* Copyright (C) 1984-2008 Mark Nudelman
|
||||||
*
|
*
|
||||||
* You may distribute under the terms of either the GNU General Public
|
* You may distribute under the terms of either the GNU General Public
|
||||||
* License or the Less License, as specified in the README file.
|
* License or the Less License, as specified in the README file.
|
||||||
@ -52,6 +52,7 @@ extern int force_open;
|
|||||||
extern int secure;
|
extern int secure;
|
||||||
extern int use_lessopen;
|
extern int use_lessopen;
|
||||||
extern int ctldisp;
|
extern int ctldisp;
|
||||||
|
extern int utf_mode;
|
||||||
extern IFILE curr_ifile;
|
extern IFILE curr_ifile;
|
||||||
extern IFILE old_ifile;
|
extern IFILE old_ifile;
|
||||||
#if SPACES_IN_FILENAMES
|
#if SPACES_IN_FILENAMES
|
||||||
@ -469,23 +470,26 @@ fcomplete(s)
|
|||||||
bin_file(f)
|
bin_file(f)
|
||||||
int f;
|
int f;
|
||||||
{
|
{
|
||||||
int i;
|
|
||||||
int n;
|
int n;
|
||||||
int bin_count = 0;
|
int bin_count = 0;
|
||||||
unsigned char data[256];
|
char data[256];
|
||||||
|
char* p;
|
||||||
|
char* pend;
|
||||||
|
|
||||||
if (!seekable(f))
|
if (!seekable(f))
|
||||||
return (0);
|
return (0);
|
||||||
if (lseek(f, (off_t)0, SEEK_SET) == BAD_LSEEK)
|
if (lseek(f, (off_t)0, SEEK_SET) == BAD_LSEEK)
|
||||||
return (0);
|
return (0);
|
||||||
n = read(f, data, sizeof(data));
|
n = read(f, data, sizeof(data));
|
||||||
for (i = 0; i < n; i++)
|
pend = &data[n];
|
||||||
|
for (p = data; p < pend; )
|
||||||
{
|
{
|
||||||
char c = data[i];
|
LWCHAR c = step_char(&p, +1, pend);
|
||||||
if (ctldisp == OPT_ONPLUS && IS_CSI_START(c))
|
if (ctldisp == OPT_ONPLUS && IS_CSI_START(c))
|
||||||
{
|
{
|
||||||
while (++i < n && is_ansi_middle(data[i]))
|
do {
|
||||||
continue;
|
c = step_char(&p, +1, pend);
|
||||||
|
} while (p < pend && is_ansi_middle(c));
|
||||||
} else if (binary_char(c))
|
} else if (binary_char(c))
|
||||||
bin_count++;
|
bin_count++;
|
||||||
}
|
}
|
||||||
@ -827,20 +831,27 @@ open_altfile(filename, pf, pfd)
|
|||||||
ch_ungetchar(-1);
|
ch_ungetchar(-1);
|
||||||
if ((lessopen = lgetenv("LESSOPEN")) == NULL)
|
if ((lessopen = lgetenv("LESSOPEN")) == NULL)
|
||||||
return (NULL);
|
return (NULL);
|
||||||
if (strcmp(filename, "-") == 0)
|
|
||||||
return (NULL);
|
|
||||||
if (*lessopen == '|')
|
if (*lessopen == '|')
|
||||||
{
|
{
|
||||||
/*
|
/*
|
||||||
* If LESSOPEN starts with a |, it indicates
|
* If LESSOPEN starts with a |, it indicates
|
||||||
* a "pipe preprocessor".
|
* a "pipe preprocessor".
|
||||||
*/
|
*/
|
||||||
#if HAVE_FILENO
|
#if !HAVE_FILENO
|
||||||
lessopen++;
|
|
||||||
returnfd = 1;
|
|
||||||
#else
|
|
||||||
error("LESSOPEN pipe is not supported", NULL_PARG);
|
error("LESSOPEN pipe is not supported", NULL_PARG);
|
||||||
return (NULL);
|
return (NULL);
|
||||||
|
#else
|
||||||
|
lessopen++;
|
||||||
|
returnfd = 1;
|
||||||
|
if (*lessopen == '-') {
|
||||||
|
/*
|
||||||
|
* Lessopen preprocessor will accept "-" as a filename.
|
||||||
|
*/
|
||||||
|
lessopen++;
|
||||||
|
} else {
|
||||||
|
if (strcmp(filename, "-") == 0)
|
||||||
|
return (NULL);
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/* $FreeBSD$ */
|
/* $FreeBSD$ */
|
||||||
/*
|
/*
|
||||||
* Copyright (C) 1984-2007 Mark Nudelman
|
* Copyright (C) 1984-2008 Mark Nudelman
|
||||||
*
|
*
|
||||||
* You may distribute under the terms of either the GNU General Public
|
* You may distribute under the terms of either the GNU General Public
|
||||||
* License or the Less License, as specified in the README file.
|
* License or the Less License, as specified in the README file.
|
||||||
@ -18,7 +18,6 @@
|
|||||||
#include "less.h"
|
#include "less.h"
|
||||||
#include "position.h"
|
#include "position.h"
|
||||||
|
|
||||||
public int hit_eof; /* Keeps track of how many times we hit end of file */
|
|
||||||
public int screen_trashed;
|
public int screen_trashed;
|
||||||
public int squished;
|
public int squished;
|
||||||
public int no_back_scroll = 0;
|
public int no_back_scroll = 0;
|
||||||
@ -53,25 +52,47 @@ eof_bell()
|
|||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Check to see if the end of file is currently "displayed".
|
* Check to see if the end of file is currently displayed.
|
||||||
*/
|
*/
|
||||||
static void
|
public int
|
||||||
eof_check()
|
eof_displayed()
|
||||||
{
|
{
|
||||||
POSITION pos;
|
POSITION pos;
|
||||||
|
|
||||||
if (ignore_eoi)
|
if (ignore_eoi)
|
||||||
return;
|
return (0);
|
||||||
if (ABORT_SIGS())
|
|
||||||
return;
|
if (ch_length() == NULL_POSITION)
|
||||||
|
/*
|
||||||
|
* If the file length is not known,
|
||||||
|
* we can't possibly be displaying EOF.
|
||||||
|
*/
|
||||||
|
return (0);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* If the bottom line is empty, we are at EOF.
|
* If the bottom line is empty, we are at EOF.
|
||||||
* If the bottom line ends at the file length,
|
* If the bottom line ends at the file length,
|
||||||
* we must be just at EOF.
|
* we must be just at EOF.
|
||||||
*/
|
*/
|
||||||
pos = position(BOTTOM_PLUS_ONE);
|
pos = position(BOTTOM_PLUS_ONE);
|
||||||
if (pos == NULL_POSITION || pos == ch_length())
|
return (pos == NULL_POSITION || pos == ch_length());
|
||||||
hit_eof++;
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Check to see if the entire file is currently displayed.
|
||||||
|
*/
|
||||||
|
public int
|
||||||
|
entire_file_displayed()
|
||||||
|
{
|
||||||
|
POSITION pos;
|
||||||
|
|
||||||
|
/* Make sure last line of file is displayed. */
|
||||||
|
if (!eof_displayed())
|
||||||
|
return (0);
|
||||||
|
|
||||||
|
/* Make sure first line of file is displayed. */
|
||||||
|
pos = position(0);
|
||||||
|
return (pos == NULL_POSITION || pos == 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@ -256,12 +277,6 @@ forw(n, pos, force, only_last, nblank)
|
|||||||
forw_prompt = 1;
|
forw_prompt = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (ignore_eoi)
|
|
||||||
hit_eof = 0;
|
|
||||||
else if (eof && !ABORT_SIGS())
|
|
||||||
hit_eof++;
|
|
||||||
else
|
|
||||||
eof_check();
|
|
||||||
if (nlines == 0)
|
if (nlines == 0)
|
||||||
eof_bell();
|
eof_bell();
|
||||||
else if (do_repaint)
|
else if (do_repaint)
|
||||||
@ -285,7 +300,6 @@ back(n, pos, force, only_last)
|
|||||||
|
|
||||||
squish_check();
|
squish_check();
|
||||||
do_repaint = (n > get_back_scroll() || (only_last && n > sc_height-1));
|
do_repaint = (n > get_back_scroll() || (only_last && n > sc_height-1));
|
||||||
hit_eof = 0;
|
|
||||||
while (--n >= 0)
|
while (--n >= 0)
|
||||||
{
|
{
|
||||||
/*
|
/*
|
||||||
@ -314,7 +328,6 @@ back(n, pos, force, only_last)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
eof_check();
|
|
||||||
if (nlines == 0)
|
if (nlines == 0)
|
||||||
eof_bell();
|
eof_bell();
|
||||||
else if (do_repaint)
|
else if (do_repaint)
|
||||||
@ -336,7 +349,7 @@ forward(n, force, only_last)
|
|||||||
{
|
{
|
||||||
POSITION pos;
|
POSITION pos;
|
||||||
|
|
||||||
if (get_quit_at_eof() && hit_eof && !(ch_getflags() & CH_HELPFILE))
|
if (get_quit_at_eof() && eof_displayed() && !(ch_getflags() & CH_HELPFILE))
|
||||||
{
|
{
|
||||||
/*
|
/*
|
||||||
* If the -e flag is set and we're trying to go
|
* If the -e flag is set and we're trying to go
|
||||||
@ -370,7 +383,6 @@ forward(n, force, only_last)
|
|||||||
} else
|
} else
|
||||||
{
|
{
|
||||||
eof_bell();
|
eof_bell();
|
||||||
hit_eof++;
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -30,6 +30,8 @@
|
|||||||
public void backspace ();
|
public void backspace ();
|
||||||
public void putbs ();
|
public void putbs ();
|
||||||
public char WIN32getch ();
|
public char WIN32getch ();
|
||||||
|
public void WIN32setcolors ();
|
||||||
|
public void WIN32textout ();
|
||||||
public void match_brac ();
|
public void match_brac ();
|
||||||
public void ch_ungetchar ();
|
public void ch_ungetchar ();
|
||||||
public void end_logfile ();
|
public void end_logfile ();
|
||||||
@ -122,6 +124,8 @@
|
|||||||
public char * bad_file ();
|
public char * bad_file ();
|
||||||
public POSITION filesize ();
|
public POSITION filesize ();
|
||||||
public char * shell_coption ();
|
public char * shell_coption ();
|
||||||
|
public int eof_displayed ();
|
||||||
|
public int entire_file_displayed ();
|
||||||
public void squish_check ();
|
public void squish_check ();
|
||||||
public void forw ();
|
public void forw ();
|
||||||
public void back ();
|
public void back ();
|
||||||
@ -164,6 +168,7 @@
|
|||||||
public int pappend ();
|
public int pappend ();
|
||||||
public int pflushmbc ();
|
public int pflushmbc ();
|
||||||
public void pdone ();
|
public void pdone ();
|
||||||
|
public void set_status_col ();
|
||||||
public int gline ();
|
public int gline ();
|
||||||
public void null_line ();
|
public void null_line ();
|
||||||
public POSITION forw_raw_line ();
|
public POSITION forw_raw_line ();
|
||||||
@ -246,12 +251,17 @@
|
|||||||
public void repaint_hilite ();
|
public void repaint_hilite ();
|
||||||
public void clear_attn ();
|
public void clear_attn ();
|
||||||
public void undo_search ();
|
public void undo_search ();
|
||||||
|
public void clr_hlist ();
|
||||||
public void clr_hilite ();
|
public void clr_hilite ();
|
||||||
|
public void clr_filter ();
|
||||||
|
public int is_filtered ();
|
||||||
public int is_hilited ();
|
public int is_hilited ();
|
||||||
public void chg_caseless ();
|
public void chg_caseless ();
|
||||||
public void chg_hilite ();
|
public void chg_hilite ();
|
||||||
public int search ();
|
public int search ();
|
||||||
public void prep_hilite ();
|
public void prep_hilite ();
|
||||||
|
public void set_filter_pattern ();
|
||||||
|
public int is_filtering ();
|
||||||
public RETSIGTYPE winch ();
|
public RETSIGTYPE winch ();
|
||||||
public RETSIGTYPE winch ();
|
public RETSIGTYPE winch ();
|
||||||
public void init_signals ();
|
public void init_signals ();
|
||||||
|
@ -41,6 +41,7 @@ constant char helpdata[] = {
|
|||||||
' ',' ','E','S','C','-','n',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ','*',' ',' ','R','e','p','e','a','t',' ','p','r','e','v','i','o','u','s',' ','s','e','a','r','c','h',',',' ','s','p','a','n','n','i','n','g',' ','f','i','l','e','s','.','\n',
|
' ',' ','E','S','C','-','n',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ','*',' ',' ','R','e','p','e','a','t',' ','p','r','e','v','i','o','u','s',' ','s','e','a','r','c','h',',',' ','s','p','a','n','n','i','n','g',' ','f','i','l','e','s','.','\n',
|
||||||
' ',' ','E','S','C','-','N',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ','*',' ',' ','R','e','p','e','a','t',' ','p','r','e','v','i','o','u','s',' ','s','e','a','r','c','h',',',' ','r','e','v','e','r','s','e',' ','d','i','r','.',' ','&',' ','s','p','a','n','n','i','n','g',' ','f','i','l','e','s','.','\n',
|
' ',' ','E','S','C','-','N',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ','*',' ',' ','R','e','p','e','a','t',' ','p','r','e','v','i','o','u','s',' ','s','e','a','r','c','h',',',' ','r','e','v','e','r','s','e',' ','d','i','r','.',' ','&',' ','s','p','a','n','n','i','n','g',' ','f','i','l','e','s','.','\n',
|
||||||
' ',' ','E','S','C','-','u',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ','U','n','d','o',' ','(','t','o','g','g','l','e',')',' ','s','e','a','r','c','h',' ','h','i','g','h','l','i','g','h','t','i','n','g','.','\n',
|
' ',' ','E','S','C','-','u',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ','U','n','d','o',' ','(','t','o','g','g','l','e',')',' ','s','e','a','r','c','h',' ','h','i','g','h','l','i','g','h','t','i','n','g','.','\n',
|
||||||
|
' ',' ','&','_','\b','p','_','\b','a','_','\b','t','_','\b','t','_','\b','e','_','\b','r','_','\b','n',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ','*',' ',' ','D','i','s','p','l','a','y',' ','o','n','l','y',' ','m','a','t','c','h','i','n','g',' ','l','i','n','e','s','\n',
|
||||||
' ',' ',' ',' ',' ',' ',' ',' ','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','\n',
|
' ',' ',' ',' ',' ',' ',' ',' ','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','\n',
|
||||||
' ',' ',' ',' ',' ',' ',' ',' ','S','e','a','r','c','h',' ','p','a','t','t','e','r','n','s',' ','m','a','y',' ','b','e',' ','m','o','d','i','f','i','e','d',' ','b','y',' ','o','n','e',' ','o','r',' ','m','o','r','e',' ','o','f',':','\n',
|
' ',' ',' ',' ',' ',' ',' ',' ','S','e','a','r','c','h',' ','p','a','t','t','e','r','n','s',' ','m','a','y',' ','b','e',' ','m','o','d','i','f','i','e','d',' ','b','y',' ','o','n','e',' ','o','r',' ','m','o','r','e',' ','o','f',':','\n',
|
||||||
' ',' ',' ',' ',' ',' ',' ',' ','^','N',' ','o','r',' ','!',' ',' ','S','e','a','r','c','h',' ','f','o','r',' ','N','O','N','-','m','a','t','c','h','i','n','g',' ','l','i','n','e','s','.','\n',
|
' ',' ',' ',' ',' ',' ',' ',' ','^','N',' ','o','r',' ','!',' ',' ','S','e','a','r','c','h',' ','f','o','r',' ','N','O','N','-','m','a','t','c','h','i','n','g',' ','l','i','n','e','s','.','\n',
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (C) 1984-2007 Mark Nudelman
|
* Copyright (C) 1984-2008 Mark Nudelman
|
||||||
*
|
*
|
||||||
* You may distribute under the terms of either the GNU General Public
|
* You may distribute under the terms of either the GNU General Public
|
||||||
* License or the Less License, as specified in the README file.
|
* License or the Less License, as specified in the README file.
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (C) 1984-2007 Mark Nudelman
|
* Copyright (C) 1984-2008 Mark Nudelman
|
||||||
*
|
*
|
||||||
* You may distribute under the terms of either the GNU General Public
|
* You may distribute under the terms of either the GNU General Public
|
||||||
* License or the Less License, as specified in the README file.
|
* License or the Less License, as specified in the README file.
|
||||||
@ -53,13 +53,14 @@ forw_line(curr_pos)
|
|||||||
int endline;
|
int endline;
|
||||||
int backchars;
|
int backchars;
|
||||||
|
|
||||||
|
get_forw_line:
|
||||||
if (curr_pos == NULL_POSITION)
|
if (curr_pos == NULL_POSITION)
|
||||||
{
|
{
|
||||||
null_line();
|
null_line();
|
||||||
return (NULL_POSITION);
|
return (NULL_POSITION);
|
||||||
}
|
}
|
||||||
#if HILITE_SEARCH
|
#if HILITE_SEARCH
|
||||||
if (hilite_search == OPT_ONPLUS || status_col)
|
if (hilite_search == OPT_ONPLUS || is_filtering() || status_col)
|
||||||
/*
|
/*
|
||||||
* If we are ignoring EOI (command F), only prepare
|
* If we are ignoring EOI (command F), only prepare
|
||||||
* one line ahead, to avoid getting stuck waiting for
|
* one line ahead, to avoid getting stuck waiting for
|
||||||
@ -76,6 +77,9 @@ forw_line(curr_pos)
|
|||||||
return (NULL_POSITION);
|
return (NULL_POSITION);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Step back to the beginning of the line.
|
||||||
|
*/
|
||||||
base_pos = curr_pos;
|
base_pos = curr_pos;
|
||||||
for (;;)
|
for (;;)
|
||||||
{
|
{
|
||||||
@ -95,10 +99,14 @@ forw_line(curr_pos)
|
|||||||
--base_pos;
|
--base_pos;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Read forward again to the position we should start at.
|
||||||
|
*/
|
||||||
prewind();
|
prewind();
|
||||||
plinenum(base_pos);
|
plinenum(base_pos);
|
||||||
(void) ch_seek(base_pos);
|
(void) ch_seek(base_pos);
|
||||||
while (base_pos < curr_pos)
|
new_pos = base_pos;
|
||||||
|
while (new_pos < curr_pos)
|
||||||
{
|
{
|
||||||
if (ABORT_SIGS())
|
if (ABORT_SIGS())
|
||||||
{
|
{
|
||||||
@ -106,12 +114,12 @@ forw_line(curr_pos)
|
|||||||
return (NULL_POSITION);
|
return (NULL_POSITION);
|
||||||
}
|
}
|
||||||
c = ch_forw_get();
|
c = ch_forw_get();
|
||||||
backchars = pappend(c, base_pos);
|
backchars = pappend(c, new_pos);
|
||||||
base_pos++;
|
new_pos++;
|
||||||
if (backchars > 0)
|
if (backchars > 0)
|
||||||
{
|
{
|
||||||
pshift_all();
|
pshift_all();
|
||||||
base_pos -= backchars;
|
new_pos -= backchars;
|
||||||
while (--backchars >= 0)
|
while (--backchars >= 0)
|
||||||
(void) ch_back_get();
|
(void) ch_back_get();
|
||||||
}
|
}
|
||||||
@ -119,6 +127,9 @@ forw_line(curr_pos)
|
|||||||
(void) pflushmbc();
|
(void) pflushmbc();
|
||||||
pshift_all();
|
pshift_all();
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Read the first character to display.
|
||||||
|
*/
|
||||||
c = ch_forw_get();
|
c = ch_forw_get();
|
||||||
if (c == EOI)
|
if (c == EOI)
|
||||||
{
|
{
|
||||||
@ -127,6 +138,9 @@ forw_line(curr_pos)
|
|||||||
}
|
}
|
||||||
blankline = (c == '\n' || c == '\r');
|
blankline = (c == '\n' || c == '\r');
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Read each character in the line and append to the line buffer.
|
||||||
|
*/
|
||||||
for (;;)
|
for (;;)
|
||||||
{
|
{
|
||||||
if (ABORT_SIGS())
|
if (ABORT_SIGS())
|
||||||
@ -181,7 +195,23 @@ forw_line(curr_pos)
|
|||||||
}
|
}
|
||||||
c = ch_forw_get();
|
c = ch_forw_get();
|
||||||
}
|
}
|
||||||
pdone(endline);
|
|
||||||
|
pdone(endline, c);
|
||||||
|
|
||||||
|
#if HILITE_SEARCH
|
||||||
|
if (is_filtered(base_pos))
|
||||||
|
{
|
||||||
|
/*
|
||||||
|
* We don't want to display this line.
|
||||||
|
* Get the next line.
|
||||||
|
*/
|
||||||
|
curr_pos = new_pos;
|
||||||
|
goto get_forw_line;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (status_col && is_hilited(base_pos, ch_tell()-1, 1, NULL))
|
||||||
|
set_status_col('*');
|
||||||
|
#endif
|
||||||
|
|
||||||
if (squeeze && blankline)
|
if (squeeze && blankline)
|
||||||
{
|
{
|
||||||
@ -215,18 +245,19 @@ forw_line(curr_pos)
|
|||||||
back_line(curr_pos)
|
back_line(curr_pos)
|
||||||
POSITION curr_pos;
|
POSITION curr_pos;
|
||||||
{
|
{
|
||||||
POSITION new_pos, begin_new_pos;
|
POSITION new_pos, begin_new_pos, base_pos;
|
||||||
int c;
|
int c;
|
||||||
int endline;
|
int endline;
|
||||||
int backchars;
|
int backchars;
|
||||||
|
|
||||||
|
get_back_line:
|
||||||
if (curr_pos == NULL_POSITION || curr_pos <= ch_zero())
|
if (curr_pos == NULL_POSITION || curr_pos <= ch_zero())
|
||||||
{
|
{
|
||||||
null_line();
|
null_line();
|
||||||
return (NULL_POSITION);
|
return (NULL_POSITION);
|
||||||
}
|
}
|
||||||
#if HILITE_SEARCH
|
#if HILITE_SEARCH
|
||||||
if (hilite_search == OPT_ONPLUS || status_col)
|
if (hilite_search == OPT_ONPLUS || is_filtering() || status_col)
|
||||||
prep_hilite((curr_pos < 3*size_linebuf) ?
|
prep_hilite((curr_pos < 3*size_linebuf) ?
|
||||||
0 : curr_pos - 3*size_linebuf, curr_pos, -1);
|
0 : curr_pos - 3*size_linebuf, curr_pos, -1);
|
||||||
#endif
|
#endif
|
||||||
@ -285,7 +316,7 @@ back_line(curr_pos)
|
|||||||
* This is the newline ending the previous line.
|
* This is the newline ending the previous line.
|
||||||
* We have hit the beginning of the line.
|
* We have hit the beginning of the line.
|
||||||
*/
|
*/
|
||||||
new_pos = ch_tell() + 1;
|
base_pos = ch_tell() + 1;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
if (c == EOI)
|
if (c == EOI)
|
||||||
@ -295,7 +326,7 @@ back_line(curr_pos)
|
|||||||
* This must be the first line in the file.
|
* This must be the first line in the file.
|
||||||
* This must, of course, be the beginning of the line.
|
* This must, of course, be the beginning of the line.
|
||||||
*/
|
*/
|
||||||
new_pos = ch_tell();
|
base_pos = ch_tell();
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -309,6 +340,7 @@ back_line(curr_pos)
|
|||||||
* are much longer than the screen width,
|
* are much longer than the screen width,
|
||||||
* but I don't know of any better way. }}
|
* but I don't know of any better way. }}
|
||||||
*/
|
*/
|
||||||
|
new_pos = base_pos;
|
||||||
if (ch_seek(new_pos))
|
if (ch_seek(new_pos))
|
||||||
{
|
{
|
||||||
null_line();
|
null_line();
|
||||||
@ -366,7 +398,22 @@ back_line(curr_pos)
|
|||||||
}
|
}
|
||||||
} while (new_pos < curr_pos);
|
} while (new_pos < curr_pos);
|
||||||
|
|
||||||
pdone(endline);
|
pdone(endline, ch_forw_get());
|
||||||
|
|
||||||
|
#if HILITE_SEARCH
|
||||||
|
if (is_filtered(base_pos))
|
||||||
|
{
|
||||||
|
/*
|
||||||
|
* We don't want to display this line.
|
||||||
|
* Get the previous line.
|
||||||
|
*/
|
||||||
|
curr_pos = begin_new_pos;
|
||||||
|
goto get_back_line;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (status_col && is_hilited(base_pos, ch_tell()-1, 1, NULL))
|
||||||
|
set_status_col('*');
|
||||||
|
#endif
|
||||||
|
|
||||||
return (begin_new_pos);
|
return (begin_new_pos);
|
||||||
}
|
}
|
||||||
|
@ -97,7 +97,7 @@ fi
|
|||||||
# Make a temp file name in the proper directory.
|
# Make a temp file name in the proper directory.
|
||||||
|
|
||||||
dstdir=`dirname $dst`
|
dstdir=`dirname $dst`
|
||||||
dsttmp=$dstdir/#inst.$$#
|
dsttmp=$dstdir/_inst.$$_
|
||||||
|
|
||||||
# Move or copy the file name to the temp name
|
# Move or copy the file name to the temp name
|
||||||
|
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (C) 1984-2007 Mark Nudelman
|
* Copyright (C) 1984-2008 Mark Nudelman
|
||||||
*
|
*
|
||||||
* You may distribute under the terms of either the GNU General Public
|
* You may distribute under the terms of either the GNU General Public
|
||||||
* License or the Less License, as specified in the README file.
|
* License or the Less License, as specified in the README file.
|
||||||
@ -16,7 +16,6 @@
|
|||||||
#include "less.h"
|
#include "less.h"
|
||||||
#include "position.h"
|
#include "position.h"
|
||||||
|
|
||||||
extern int hit_eof;
|
|
||||||
extern int jump_sline;
|
extern int jump_sline;
|
||||||
extern int squished;
|
extern int squished;
|
||||||
extern int screen_trashed;
|
extern int screen_trashed;
|
||||||
@ -38,6 +37,12 @@ jump_forw()
|
|||||||
error("Cannot seek to end of file", NULL_PARG);
|
error("Cannot seek to end of file", NULL_PARG);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
/*
|
||||||
|
* Note; lastmark will be called later by jump_loc, but it fails
|
||||||
|
* because the position table has been cleared by pos_clear below.
|
||||||
|
* So call it here before calling pos_clear.
|
||||||
|
*/
|
||||||
|
lastmark();
|
||||||
/*
|
/*
|
||||||
* Position the last line in the file at the last screen line.
|
* Position the last line in the file at the last screen line.
|
||||||
* Go back one line from the end of the file
|
* Go back one line from the end of the file
|
||||||
@ -194,8 +199,10 @@ jump_loc(pos, sline)
|
|||||||
forw(nline, position(BOTTOM_PLUS_ONE), 1, 0, 0);
|
forw(nline, position(BOTTOM_PLUS_ONE), 1, 0, 0);
|
||||||
else
|
else
|
||||||
back(-nline, position(TOP), 1, 0);
|
back(-nline, position(TOP), 1, 0);
|
||||||
|
#if HILITE_SEARCH
|
||||||
if (show_attn)
|
if (show_attn)
|
||||||
repaint_hilite(1);
|
repaint_hilite(1);
|
||||||
|
#endif
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -233,8 +240,10 @@ jump_loc(pos, sline)
|
|||||||
* that we can just scroll there after all.
|
* that we can just scroll there after all.
|
||||||
*/
|
*/
|
||||||
forw(sc_height-sline+nline-1, bpos, 1, 0, 0);
|
forw(sc_height-sline+nline-1, bpos, 1, 0, 0);
|
||||||
|
#if HILITE_SEARCH
|
||||||
if (show_attn)
|
if (show_attn)
|
||||||
repaint_hilite(1);
|
repaint_hilite(1);
|
||||||
|
#endif
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
pos = back_line(pos);
|
pos = back_line(pos);
|
||||||
@ -250,7 +259,6 @@ jump_loc(pos, sline)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
lastmark();
|
lastmark();
|
||||||
hit_eof = 0;
|
|
||||||
squished = 0;
|
squished = 0;
|
||||||
screen_trashed = 0;
|
screen_trashed = 0;
|
||||||
forw(sc_height-1, pos, 1, 0, sline-nline);
|
forw(sc_height-1, pos, 1, 0, sline-nline);
|
||||||
@ -282,8 +290,10 @@ jump_loc(pos, sline)
|
|||||||
* that we can just scroll there after all.
|
* that we can just scroll there after all.
|
||||||
*/
|
*/
|
||||||
back(nline+1, tpos, 1, 0);
|
back(nline+1, tpos, 1, 0);
|
||||||
|
#if HILITE_SEARCH
|
||||||
if (show_attn)
|
if (show_attn)
|
||||||
repaint_hilite(1);
|
repaint_hilite(1);
|
||||||
|
#endif
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/* $FreeBSD$ */
|
/* $FreeBSD$ */
|
||||||
/*
|
/*
|
||||||
* Copyright (C) 1984-2007 Mark Nudelman
|
* Copyright (C) 1984-2008 Mark Nudelman
|
||||||
*
|
*
|
||||||
* You may distribute under the terms of either the GNU General Public
|
* You may distribute under the terms of either the GNU General Public
|
||||||
* License or the Less License, as specified in the README file.
|
* License or the Less License, as specified in the README file.
|
||||||
@ -160,7 +160,7 @@ void free();
|
|||||||
#define IS_DIGIT(c) ((c) >= '0' && (c) <= '9')
|
#define IS_DIGIT(c) ((c) >= '0' && (c) <= '9')
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define IS_CSI_START(c) ((c) == ESC || ((unsigned char)(c)) == CSI)
|
#define IS_CSI_START(c) (((LWCHAR)(c)) == ESC || (((LWCHAR)(c)) == CSI))
|
||||||
|
|
||||||
#ifndef NULL
|
#ifndef NULL
|
||||||
#define NULL 0
|
#define NULL 0
|
||||||
@ -344,6 +344,7 @@ struct textlist
|
|||||||
#define SRCH_PAST_EOF (1 << 9) /* Search past end-of-file, into next file */
|
#define SRCH_PAST_EOF (1 << 9) /* Search past end-of-file, into next file */
|
||||||
#define SRCH_FIRST_FILE (1 << 10) /* Search starting at the first file */
|
#define SRCH_FIRST_FILE (1 << 10) /* Search starting at the first file */
|
||||||
#define SRCH_NO_REGEX (1 << 12) /* Don't use regular expressions */
|
#define SRCH_NO_REGEX (1 << 12) /* Don't use regular expressions */
|
||||||
|
#define SRCH_FILTER (1 << 13) /* Search is for '&' (filter) command */
|
||||||
|
|
||||||
#define SRCH_REVERSE(t) (((t) & SRCH_FORW) ? \
|
#define SRCH_REVERSE(t) (((t) & SRCH_FORW) ? \
|
||||||
(((t) & ~SRCH_FORW) | SRCH_BACK) : \
|
(((t) & ~SRCH_FORW) | SRCH_BACK) : \
|
||||||
|
@ -38,6 +38,7 @@
|
|||||||
ESC-n * Repeat previous search, spanning files.
|
ESC-n * Repeat previous search, spanning files.
|
||||||
ESC-N * Repeat previous search, reverse dir. & spanning files.
|
ESC-N * Repeat previous search, reverse dir. & spanning files.
|
||||||
ESC-u Undo (toggle) search highlighting.
|
ESC-u Undo (toggle) search highlighting.
|
||||||
|
&_p_a_t_t_e_r_n * Display only matching lines
|
||||||
---------------------------------------------------
|
---------------------------------------------------
|
||||||
Search patterns may be modified by one or more of:
|
Search patterns may be modified by one or more of:
|
||||||
^N or ! Search for NON-matching lines.
|
^N or ! Search for NON-matching lines.
|
||||||
|
@ -195,8 +195,8 @@ LESS(1) LESS(1)
|
|||||||
options.
|
options.
|
||||||
|
|
||||||
^K Highlight any text which matches the pattern on the cur-
|
^K Highlight any text which matches the pattern on the cur-
|
||||||
rent screen, but don't move to the first match (KEEP
|
rent screen, but don't move to the first match (KEEP cur-
|
||||||
current position).
|
rent position).
|
||||||
|
|
||||||
^R Don't interpret regular expression metacharacters; that
|
^R Don't interpret regular expression metacharacters; that
|
||||||
is, do a simple textual comparison.
|
is, do a simple textual comparison.
|
||||||
@ -257,6 +257,22 @@ LESS(1) LESS(1)
|
|||||||
(Highlighting can also be disabled by toggling the -G option; in
|
(Highlighting can also be disabled by toggling the -G option; in
|
||||||
that case search commands do not turn highlighting back on.)
|
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]
|
:e [filename]
|
||||||
Examine a new file. If the filename is missing, the "current"
|
Examine a new file. If the filename is missing, the "current"
|
||||||
file (see the :n and :p commands below) from the list of files
|
file (see the :n and :p commands below) from the list of files
|
||||||
@ -481,7 +497,8 @@ LESS(1) LESS(1)
|
|||||||
[4mcolor[24m is a pair of numbers separated by a period. The first
|
[4mcolor[24m is a pair of numbers separated by a period. The first
|
||||||
number selects the foreground color and the second selects the
|
number selects the foreground color and the second selects the
|
||||||
background color of the text. A single number [4mN[24m is the same as
|
background color of the text. A single number [4mN[24m is the same as
|
||||||
[4mN.0[24m.
|
[4mN.M[24m, where [4mM[24m is the normal background color.
|
||||||
|
|
||||||
|
|
||||||
-e or --quit-at-eof
|
-e or --quit-at-eof
|
||||||
Causes [4mless[24m to automatically exit the second time it reaches
|
Causes [4mless[24m to automatically exit the second time it reaches
|
||||||
@ -573,10 +590,10 @@ LESS(1) LESS(1)
|
|||||||
return to the command prompt from the "F" command.
|
return to the command prompt from the "F" command.
|
||||||
|
|
||||||
-L or --no-lessopen
|
-L or --no-lessopen
|
||||||
Ignore the LESSOPEN environment variable (see the INPUT PREPRO-
|
Ignore the LESSOPEN environment variable (see the INPUT PRE-
|
||||||
CESSOR section below). This option can be set from within [4mless[24m,
|
PROCESSOR section below). This option can be set from within
|
||||||
but it will apply only to files opened subsequently, not to the
|
[4mless[24m, but it will apply only to files opened subsequently, not
|
||||||
file which is currently open.
|
to the file which is currently open.
|
||||||
|
|
||||||
-m or --long-prompt
|
-m or --long-prompt
|
||||||
Causes [4mless[24m to prompt verbosely (like [4mmore[24m), with the percent
|
Causes [4mless[24m to prompt verbosely (like [4mmore[24m), with the percent
|
||||||
@ -832,11 +849,12 @@ LESS(1) LESS(1)
|
|||||||
filename for the :e command, or the pattern for a search command), cer-
|
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
|
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
|
have an alternate form in [ brackets ] which can be used if a key does
|
||||||
not exist on a particular keyboard. (The bracketed forms do not work
|
not exist on a particular keyboard. (Note that the forms beginning
|
||||||
in the MS-DOS version.) Any of these special keys may be entered lit-
|
with ESC do not work in some MS-DOS and Windows systems because ESC is
|
||||||
erally by preceding it with the "literal" character, either ^V or ^A.
|
the line erase character.) Any of these special keys may be entered
|
||||||
A backslash itself may also be entered literally by entering two back-
|
literally by preceding it with the "literal" character, either ^V or
|
||||||
slashes.
|
^A. A backslash itself may also be entered literally by entering two
|
||||||
|
backslashes.
|
||||||
|
|
||||||
LEFTARROW [ ESC-h ]
|
LEFTARROW [ ESC-h ]
|
||||||
Move the cursor one space to the left.
|
Move the cursor one space to the left.
|
||||||
@ -1021,6 +1039,11 @@ LESS(1) LESS(1)
|
|||||||
is no replacement file to clean up. In this case, the replacement file
|
is no replacement file to clean up. In this case, the replacement file
|
||||||
name passed to the LESSCLOSE postprocessor is "-".
|
name passed to the LESSCLOSE postprocessor is "-".
|
||||||
|
|
||||||
|
For compatibility with previous versions of [4mless,[24m the input pipe is not
|
||||||
|
used if [4mless[24m is viewing standard input. However, if the character
|
||||||
|
after the vertical bar is a dash (-), the input pipe is used on stan-
|
||||||
|
dard input as well as other files.
|
||||||
|
|
||||||
|
|
||||||
[1mNATIONAL CHARACTER SETS[0m
|
[1mNATIONAL CHARACTER SETS[0m
|
||||||
There are three types of characters in the input file:
|
There are three types of characters in the input file:
|
||||||
@ -1077,13 +1100,13 @@ LESS(1) LESS(1)
|
|||||||
Selects a character set appropriate for Microsoft Windows (cp
|
Selects a character set appropriate for Microsoft Windows (cp
|
||||||
1251).
|
1251).
|
||||||
|
|
||||||
In special cases, it may be desired to tailor [4mless[24m to use a character
|
In rare cases, it may be desired to tailor [4mless[24m to use a character set
|
||||||
set other than the ones definable by LESSCHARSET. In this case, the
|
other than the ones definable by LESSCHARSET. In this case, the envi-
|
||||||
environment variable LESSCHARDEF can be used to define a character set.
|
ronment variable LESSCHARDEF can be used to define a character set. It
|
||||||
It should be set to a string where each character in the string repre-
|
should be set to a string where each character in the string represents
|
||||||
sents one character in the character set. The character "." is used
|
one character in the character set. The character "." is used for a
|
||||||
for a normal character, "c" for control, and "b" for binary. A decimal
|
normal character, "c" for control, and "b" for binary. A decimal num-
|
||||||
number may be used for repetition. For example, "bccc4b." would mean
|
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
|
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
|
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.
|
the same as the last, so characters 9 through 255 would be normal.
|
||||||
@ -1496,40 +1519,8 @@ LESS(1) LESS(1)
|
|||||||
lesskey(1)
|
lesskey(1)
|
||||||
|
|
||||||
|
|
||||||
[1mWARNINGS[0m
|
|
||||||
The = command and prompts (unless changed by -P) report the line num-
|
|
||||||
bers of the lines at the top and bottom of the screen, but the byte and
|
|
||||||
percent of the line after the one at the bottom of the screen.
|
|
||||||
|
|
||||||
On certain older terminals (the so-called "magic cookie" terminals),
|
|
||||||
search highlighting will cause an erroneous display. On such termi-
|
|
||||||
nals, search highlighting is disabled by default to avoid possible
|
|
||||||
problems.
|
|
||||||
|
|
||||||
When searching in a binary file, text which follows a null byte may not
|
|
||||||
be found. This problem does not occur when searching with regular
|
|
||||||
expressions turned off via ^R, and also does not occur when [4mless[24m is
|
|
||||||
compiled to use the PCRE regular expression library.
|
|
||||||
|
|
||||||
In certain cases, when search highlighting is enabled and a search pat-
|
|
||||||
tern begins with a ^, more text than the matching string may be high-
|
|
||||||
lighted. (This problem does not occur when less is compiled to use the
|
|
||||||
POSIX regular expression package.)
|
|
||||||
|
|
||||||
On some systems, [4msetlocale[24m claims that ASCII characters 0 thru 31 are
|
|
||||||
control characters rather than binary characters. This causes [4mless[24m to
|
|
||||||
treat some binary files as ordinary, non-binary files. To workaround
|
|
||||||
this problem, set the environment variable LESSCHARSET to "ascii" (or
|
|
||||||
whatever character set is appropriate).
|
|
||||||
|
|
||||||
This manual is too long.
|
|
||||||
|
|
||||||
See http://www.greenwoodsoftware.com/less for the latest list of known
|
|
||||||
bugs in less.
|
|
||||||
|
|
||||||
|
|
||||||
[1mCOPYRIGHT[0m
|
[1mCOPYRIGHT[0m
|
||||||
Copyright (C) 1984-2007 Mark Nudelman
|
Copyright (C) 1984-2008 Mark Nudelman
|
||||||
|
|
||||||
less is part of the GNU project and is free software. You can redis-
|
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-
|
tribute it and/or modify it under the terms of either (1) the GNU Gen-
|
||||||
@ -1549,6 +1540,8 @@ LESS(1) LESS(1)
|
|||||||
|
|
||||||
[1mAUTHOR[0m
|
[1mAUTHOR[0m
|
||||||
Mark Nudelman <markn@greenwoodsoftware.com>
|
Mark Nudelman <markn@greenwoodsoftware.com>
|
||||||
|
See http://www.greenwoodsoftware.com/less/bugs.html for the latest list
|
||||||
|
of known bugs in less.
|
||||||
Send bug reports or comments to the above address or to
|
Send bug reports or comments to the above address or to
|
||||||
bug-less@gnu.org.
|
bug-less@gnu.org.
|
||||||
For more information, see the less homepage at
|
For more information, see the less homepage at
|
||||||
@ -1556,4 +1549,4 @@ LESS(1) LESS(1)
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
Version 416: 22 Nov 2007 LESS(1)
|
Version 429: 11 Apr 2009 LESS(1)
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
.TH LESS 1 "Version 416: 22 Nov 2007"
|
.TH LESS 1 "Version 429: 11 Apr 2009"
|
||||||
.SH NAME
|
.SH NAME
|
||||||
less \- opposite of more
|
less \- opposite of more
|
||||||
.SH SYNOPSIS
|
.SH SYNOPSIS
|
||||||
@ -256,6 +256,23 @@ turn highlighting back on.
|
|||||||
Any search command will also turn highlighting back on.
|
Any search command will also turn highlighting back on.
|
||||||
(Highlighting can also be disabled by toggling the \-G option;
|
(Highlighting can also be disabled by toggling the \-G option;
|
||||||
in that case search commands do not turn highlighting back on.)
|
in that case search commands do not turn highlighting back on.)
|
||||||
|
.IP "&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.
|
||||||
|
.sp
|
||||||
|
Certain characters are special as in the / command:
|
||||||
|
.RS
|
||||||
|
.IP "^N or !"
|
||||||
|
Display only lines which do NOT match the pattern.
|
||||||
|
.IP "^R"
|
||||||
|
Don't interpret regular expression metacharacters;
|
||||||
|
that is, do a simple textual comparison.
|
||||||
|
.RE
|
||||||
.IP ":e [filename]"
|
.IP ":e [filename]"
|
||||||
Examine a new file.
|
Examine a new file.
|
||||||
If the filename is missing, the "current" file (see the :n and :p commands
|
If the filename is missing, the "current" file (see the :n and :p commands
|
||||||
@ -498,7 +515,9 @@ being set: n=normal, s=standout, d=bold, u=underlined, k=blink.
|
|||||||
\fIcolor\fP is a pair of numbers separated by a period.
|
\fIcolor\fP is a pair of numbers separated by a period.
|
||||||
The first number selects the foreground color and the second selects
|
The first number selects the foreground color and the second selects
|
||||||
the background color of the text.
|
the background color of the text.
|
||||||
A single number \fIN\fP is the same as \fIN.0\fP.
|
A single number \fIN\fP is the same as \fIN.M\fP,
|
||||||
|
where \fIM\fP is the normal background color.
|
||||||
|
|
||||||
.IP "\-e or \-\-quit-at-eof"
|
.IP "\-e or \-\-quit-at-eof"
|
||||||
Causes
|
Causes
|
||||||
.I less
|
.I less
|
||||||
@ -890,7 +909,8 @@ or the pattern for a search command),
|
|||||||
certain keys can be used to manipulate the command line.
|
certain keys can be used to manipulate the command line.
|
||||||
Most commands have an alternate form in [ brackets ] which can be used if
|
Most commands have an alternate form in [ brackets ] which can be used if
|
||||||
a key does not exist on a particular keyboard.
|
a key does not exist on a particular keyboard.
|
||||||
(The bracketed forms do not work in the MS-DOS version.)
|
(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
|
Any of these special keys may be entered literally by preceding
|
||||||
it with the "literal" character, either ^V or ^A.
|
it with the "literal" character, either ^V or ^A.
|
||||||
A backslash itself may also be entered literally by entering two backslashes.
|
A backslash itself may also be entered literally by entering two backslashes.
|
||||||
@ -1126,6 +1146,14 @@ but it is usually not necessary since there is no replacement file
|
|||||||
to clean up.
|
to clean up.
|
||||||
In this case, the replacement file name passed to the LESSCLOSE
|
In this case, the replacement file name passed to the LESSCLOSE
|
||||||
postprocessor is "\-".
|
postprocessor is "\-".
|
||||||
|
.PP
|
||||||
|
For compatibility with previous versions of
|
||||||
|
.I less,
|
||||||
|
the input pipe is not used if
|
||||||
|
.I less
|
||||||
|
is viewing standard input.
|
||||||
|
However, if the character after the vertical bar is a dash (\-),
|
||||||
|
the input pipe is used on standard input as well as other files.
|
||||||
|
|
||||||
.SH "NATIONAL CHARACTER SETS"
|
.SH "NATIONAL CHARACTER SETS"
|
||||||
There are three types of characters in the input file:
|
There are three types of characters in the input file:
|
||||||
@ -1174,7 +1202,7 @@ It is the only character set that supports multi-byte characters.
|
|||||||
.IP windows
|
.IP windows
|
||||||
Selects a character set appropriate for Microsoft Windows (cp 1251).
|
Selects a character set appropriate for Microsoft Windows (cp 1251).
|
||||||
.PP
|
.PP
|
||||||
In special cases, it may be desired to tailor
|
In rare cases, it may be desired to tailor
|
||||||
.I less
|
.I less
|
||||||
to use a character set other than the ones definable by LESSCHARSET.
|
to use a character set other than the ones definable by LESSCHARSET.
|
||||||
In this case, the environment variable LESSCHARDEF can be used
|
In this case, the environment variable LESSCHARDEF can be used
|
||||||
@ -1620,45 +1648,8 @@ The name of the editor (used for the v command).
|
|||||||
.SH "SEE ALSO"
|
.SH "SEE ALSO"
|
||||||
lesskey(1)
|
lesskey(1)
|
||||||
|
|
||||||
.SH WARNINGS
|
|
||||||
The = command and prompts (unless changed by \-P)
|
|
||||||
report the line numbers of the lines at the top and bottom of the screen,
|
|
||||||
but the byte and percent of the line after the one at the bottom of the screen.
|
|
||||||
.PP
|
|
||||||
On certain older terminals (the so-called "magic cookie" terminals),
|
|
||||||
search highlighting will cause an erroneous display.
|
|
||||||
On such terminals, search highlighting is disabled by default
|
|
||||||
to avoid possible problems.
|
|
||||||
.PP
|
|
||||||
When searching in a binary file, text which follows a null byte
|
|
||||||
may not be found.
|
|
||||||
This problem does not occur when searching with regular expressions turned
|
|
||||||
off via ^R, and also does not occur when
|
|
||||||
.I less
|
|
||||||
is compiled to use the PCRE regular expression library.
|
|
||||||
.PP
|
|
||||||
In certain cases, when search highlighting is enabled and
|
|
||||||
a search pattern begins with a ^,
|
|
||||||
more text than the matching string may be highlighted.
|
|
||||||
(This problem does not occur when less is compiled to use the POSIX
|
|
||||||
regular expression package.)
|
|
||||||
.PP
|
|
||||||
On some systems,
|
|
||||||
.I setlocale
|
|
||||||
claims that ASCII characters 0 thru 31 are control characters
|
|
||||||
rather than binary characters.
|
|
||||||
This causes
|
|
||||||
.I less
|
|
||||||
to treat some binary files as ordinary, non-binary files.
|
|
||||||
To workaround this problem, set the environment variable
|
|
||||||
LESSCHARSET to "ascii" (or whatever character set is appropriate).
|
|
||||||
.PP
|
|
||||||
This manual is too long.
|
|
||||||
.PP
|
|
||||||
See http://www.greenwoodsoftware.com/less for the latest list of known bugs in less.
|
|
||||||
|
|
||||||
.SH COPYRIGHT
|
.SH COPYRIGHT
|
||||||
Copyright (C) 1984-2007 Mark Nudelman
|
Copyright (C) 1984-2008 Mark Nudelman
|
||||||
.PP
|
.PP
|
||||||
less is part of the GNU project and is free software.
|
less is part of the GNU project and is free software.
|
||||||
You can redistribute it and/or modify it
|
You can redistribute it and/or modify it
|
||||||
@ -1683,6 +1674,8 @@ See the GNU General Public License for more details.
|
|||||||
.PP
|
.PP
|
||||||
Mark Nudelman <markn@greenwoodsoftware.com>
|
Mark Nudelman <markn@greenwoodsoftware.com>
|
||||||
.br
|
.br
|
||||||
|
See http://www.greenwoodsoftware.com/less/bugs.html for the latest list of known bugs in less.
|
||||||
|
.br
|
||||||
Send bug reports or comments to the above address or to
|
Send bug reports or comments to the above address or to
|
||||||
.br
|
.br
|
||||||
bug-less@gnu.org.
|
bug-less@gnu.org.
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (C) 1984-2007 Mark Nudelman
|
* Copyright (C) 1984-2008 Mark Nudelman
|
||||||
*
|
*
|
||||||
* You may distribute under the terms of either the GNU General Public
|
* You may distribute under the terms of either the GNU General Public
|
||||||
* License or the Less License, as specified in the README file.
|
* License or the Less License, as specified in the README file.
|
||||||
@ -28,7 +28,7 @@
|
|||||||
|
|
||||||
#include "less.h"
|
#include "less.h"
|
||||||
|
|
||||||
static char *version = "$Revision: 1.11 $";
|
static char *version = "$Revision: 1.12 $";
|
||||||
|
|
||||||
static int quote_all = 0;
|
static int quote_all = 0;
|
||||||
static char openquote = '"';
|
static char openquote = '"';
|
||||||
|
@ -46,4 +46,4 @@ LESSECHO(1) LESSECHO(1)
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
Version 416: 22 Nov 2007 LESSECHO(1)
|
Version 429: 11 Apr 2009 LESSECHO(1)
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
.TH LESSECHO 1 "Version 416: 22 Nov 2007"
|
.TH LESSECHO 1 "Version 429: 11 Apr 2009"
|
||||||
.SH NAME
|
.SH NAME
|
||||||
lessecho \- expand metacharacters
|
lessecho \- expand metacharacters
|
||||||
.SH SYNOPSIS
|
.SH SYNOPSIS
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (C) 1984-2007 Mark Nudelman
|
* Copyright (C) 1984-2008 Mark Nudelman
|
||||||
*
|
*
|
||||||
* You may distribute under the terms of either the GNU General Public
|
* You may distribute under the terms of either the GNU General Public
|
||||||
* License or the Less License, as specified in the README file.
|
* License or the Less License, as specified in the README file.
|
||||||
@ -106,6 +106,7 @@ struct cmdname cmdnames[] =
|
|||||||
{ "display-option", A_DISP_OPTION },
|
{ "display-option", A_DISP_OPTION },
|
||||||
{ "end", A_GOEND },
|
{ "end", A_GOEND },
|
||||||
{ "examine", A_EXAMINE },
|
{ "examine", A_EXAMINE },
|
||||||
|
{ "filter", A_FILTER },
|
||||||
{ "first-cmd", A_FIRSTCMD },
|
{ "first-cmd", A_FIRSTCMD },
|
||||||
{ "firstcmd", A_FIRSTCMD },
|
{ "firstcmd", A_FIRSTCMD },
|
||||||
{ "flush-repaint", A_FREPAINT },
|
{ "flush-repaint", A_FREPAINT },
|
||||||
@ -539,7 +540,7 @@ add_cmd_str(s)
|
|||||||
control_line(s)
|
control_line(s)
|
||||||
char *s;
|
char *s;
|
||||||
{
|
{
|
||||||
#define PREFIX(str,pat) (strncmp(str,pat,strlen(pat)-1) == 0)
|
#define PREFIX(str,pat) (strncmp(str,pat,strlen(pat)) == 0)
|
||||||
|
|
||||||
if (PREFIX(s, "#line-edit"))
|
if (PREFIX(s, "#line-edit"))
|
||||||
{
|
{
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (C) 1984-2007 Mark Nudelman
|
* Copyright (C) 1984-2008 Mark Nudelman
|
||||||
*
|
*
|
||||||
* You may distribute under the terms of either the GNU General Public
|
* You may distribute under the terms of either the GNU General Public
|
||||||
* License or the Less License, as specified in the README file.
|
* License or the Less License, as specified in the README file.
|
||||||
|
@ -183,6 +183,7 @@ LESSKEY(1) LESSKEY(1)
|
|||||||
\en repeat-search-all
|
\en repeat-search-all
|
||||||
N reverse-search
|
N reverse-search
|
||||||
\eN reverse-search-all
|
\eN reverse-search-all
|
||||||
|
& filter
|
||||||
m set-mark
|
m set-mark
|
||||||
' goto-mark
|
' goto-mark
|
||||||
^X^X goto-mark
|
^X^X goto-mark
|
||||||
@ -332,7 +333,7 @@ LESSKEY(1) LESSKEY(1)
|
|||||||
|
|
||||||
|
|
||||||
[1mCOPYRIGHT[0m
|
[1mCOPYRIGHT[0m
|
||||||
Copyright (C) 2000-2007 Mark Nudelman
|
Copyright (C) 2000-2008 Mark Nudelman
|
||||||
|
|
||||||
lesskey is part of the GNU project and is free software; you can redis-
|
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
|
tribute it and/or modify it under the terms of the GNU General Public
|
||||||
@ -357,4 +358,4 @@ LESSKEY(1) LESSKEY(1)
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
Version 416: 22 Nov 2007 LESSKEY(1)
|
Version 429: 11 Apr 2009 LESSKEY(1)
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
.TH LESSKEY 1 "Version 416: 22 Nov 2007"
|
.TH LESSKEY 1 "Version 429: 11 Apr 2009"
|
||||||
.SH NAME
|
.SH NAME
|
||||||
lesskey \- specify key bindings for less
|
lesskey \- specify key bindings for less
|
||||||
.SH SYNOPSIS
|
.SH SYNOPSIS
|
||||||
@ -200,6 +200,7 @@ default command keys used by less:
|
|||||||
\een repeat-search-all
|
\een repeat-search-all
|
||||||
N reverse-search
|
N reverse-search
|
||||||
\eeN reverse-search-all
|
\eeN reverse-search-all
|
||||||
|
& filter
|
||||||
m set-mark
|
m set-mark
|
||||||
' goto-mark
|
' goto-mark
|
||||||
^X^X goto-mark
|
^X^X goto-mark
|
||||||
@ -358,7 +359,7 @@ which start with a NUL character (0).
|
|||||||
This NUL character should be represented as \e340 in a lesskey file.
|
This NUL character should be represented as \e340 in a lesskey file.
|
||||||
|
|
||||||
.SH COPYRIGHT
|
.SH COPYRIGHT
|
||||||
Copyright (C) 2000-2007 Mark Nudelman
|
Copyright (C) 2000-2008 Mark Nudelman
|
||||||
.PP
|
.PP
|
||||||
lesskey is part of the GNU project and is free software;
|
lesskey is part of the GNU project and is free software;
|
||||||
you can redistribute it and/or modify it
|
you can redistribute it and/or modify it
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (C) 1984-2007 Mark Nudelman
|
* Copyright (C) 1984-2008 Mark Nudelman
|
||||||
*
|
*
|
||||||
* You may distribute under the terms of either the GNU General Public
|
* You may distribute under the terms of either the GNU General Public
|
||||||
* License or the Less License, as specified in the README file.
|
* License or the Less License, as specified in the README file.
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/* $FreeBSD$ */
|
/* $FreeBSD$ */
|
||||||
/*
|
/*
|
||||||
* Copyright (C) 1984-2007 Mark Nudelman
|
* Copyright (C) 1984-2008 Mark Nudelman
|
||||||
*
|
*
|
||||||
* You may distribute under the terms of either the GNU General Public
|
* You may distribute under the terms of either the GNU General Public
|
||||||
* License or the Less License, as specified in the README file.
|
* License or the Less License, as specified in the README file.
|
||||||
@ -36,7 +36,6 @@ static int overstrike; /* Next char should overstrike previous char */
|
|||||||
static int last_overstrike = AT_NORMAL;
|
static int last_overstrike = AT_NORMAL;
|
||||||
static int is_null_line; /* There is no current line */
|
static int is_null_line; /* There is no current line */
|
||||||
static int lmargin; /* Left margin */
|
static int lmargin; /* Left margin */
|
||||||
static int line_matches; /* Number of search matches in this line */
|
|
||||||
static char pendc;
|
static char pendc;
|
||||||
static POSITION pendpos;
|
static POSITION pendpos;
|
||||||
static char *end_ansi_chars;
|
static char *end_ansi_chars;
|
||||||
@ -60,7 +59,6 @@ extern int bl_s_width, bl_e_width;
|
|||||||
extern int so_s_width, so_e_width;
|
extern int so_s_width, so_e_width;
|
||||||
extern int sc_width, sc_height;
|
extern int sc_width, sc_height;
|
||||||
extern int utf_mode;
|
extern int utf_mode;
|
||||||
extern int oldbot;
|
|
||||||
extern POSITION start_attnpos;
|
extern POSITION start_attnpos;
|
||||||
extern POSITION end_attnpos;
|
extern POSITION end_attnpos;
|
||||||
|
|
||||||
@ -163,9 +161,6 @@ prewind()
|
|||||||
lmargin = 0;
|
lmargin = 0;
|
||||||
if (status_col)
|
if (status_col)
|
||||||
lmargin += 1;
|
lmargin += 1;
|
||||||
#if HILITE_SEARCH
|
|
||||||
line_matches = 0;
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@ -593,7 +588,6 @@ store_char(ch, a, rep, pos)
|
|||||||
if (a != AT_ANSI)
|
if (a != AT_ANSI)
|
||||||
a |= AT_HILITE;
|
a |= AT_HILITE;
|
||||||
}
|
}
|
||||||
line_matches += matches;
|
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@ -601,11 +595,12 @@ store_char(ch, a, rep, pos)
|
|||||||
{
|
{
|
||||||
if (!is_ansi_end(ch) && !is_ansi_middle(ch)) {
|
if (!is_ansi_end(ch) && !is_ansi_middle(ch)) {
|
||||||
/* Remove whole unrecognized sequence. */
|
/* Remove whole unrecognized sequence. */
|
||||||
while (curr) {
|
char *p = &linebuf[curr];
|
||||||
--curr;
|
LWCHAR bch;
|
||||||
if (IS_CSI_START(linebuf[curr]))
|
do {
|
||||||
break;
|
bch = step_char(&p, -1, linebuf);
|
||||||
}
|
} while (p > linebuf && !IS_CSI_START(bch));
|
||||||
|
curr = p - linebuf;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
a = AT_ANSI; /* Will force re-AT_'ing around it. */
|
a = AT_ANSI; /* Will force re-AT_'ing around it. */
|
||||||
@ -995,8 +990,9 @@ pflushmbc()
|
|||||||
* Terminate the line in the line buffer.
|
* Terminate the line in the line buffer.
|
||||||
*/
|
*/
|
||||||
public void
|
public void
|
||||||
pdone(endline)
|
pdone(endline, nextc)
|
||||||
int endline;
|
int endline;
|
||||||
|
int nextc;
|
||||||
{
|
{
|
||||||
int nl;
|
int nl;
|
||||||
|
|
||||||
@ -1040,43 +1036,44 @@ pdone(endline)
|
|||||||
* the next line is blank. In that case the single newline output for
|
* the next line is blank. In that case the single newline output for
|
||||||
* that blank line would be ignored!)
|
* that blank line would be ignored!)
|
||||||
*/
|
*/
|
||||||
if (!oldbot)
|
if (column < sc_width || !auto_wrap || (endline && ignaw) || ctldisp == OPT_ON)
|
||||||
nl = (column < sc_width || !auto_wrap || (endline && ignaw) || ctldisp == OPT_ON);
|
|
||||||
else
|
|
||||||
nl = (column < sc_width || !auto_wrap || ignaw || ctldisp == OPT_ON);
|
|
||||||
if (nl)
|
|
||||||
{
|
{
|
||||||
linebuf[curr] = '\n';
|
linebuf[curr] = '\n';
|
||||||
attr[curr] = AT_NORMAL;
|
attr[curr] = AT_NORMAL;
|
||||||
curr++;
|
curr++;
|
||||||
}
|
}
|
||||||
else if (ignaw && !auto_wrap && column >= sc_width)
|
else if (ignaw && column >= sc_width)
|
||||||
{
|
{
|
||||||
/*
|
/*
|
||||||
* Big horrible kludge.
|
* Terminals with "ignaw" don't wrap until they *really* need
|
||||||
* No-wrap terminals are too hard to deal with when they get in
|
* to, i.e. when the character *after* the last one to fit on a
|
||||||
* the state where a full screen width of characters have been
|
* line is output. But they are too hard to deal with when they
|
||||||
* output but the cursor is sitting on the right edge instead
|
* get in the state where a full screen width of characters
|
||||||
* of at the start of the next line.
|
* have been output but the cursor is sitting on the right edge
|
||||||
* So after we output a full line, we output an extra
|
* instead of at the start of the next line.
|
||||||
* space and backspace to force the cursor to the
|
* So we nudge them into wrapping by outputting the next
|
||||||
* beginning of the next line, like a sane terminal.
|
* character plus a backspace. (This wouldn't be right for
|
||||||
|
* "!auto_wrap" terminals, but they always end up in the
|
||||||
|
* branch above.)
|
||||||
*/
|
*/
|
||||||
linebuf[curr] = ' ';
|
linebuf[curr] = nextc;
|
||||||
attr[curr++] = AT_NORMAL;
|
attr[curr++] = AT_NORMAL;
|
||||||
linebuf[curr] = '\b';
|
linebuf[curr] = '\b';
|
||||||
attr[curr++] = AT_NORMAL;
|
attr[curr++] = AT_NORMAL;
|
||||||
}
|
}
|
||||||
linebuf[curr] = '\0';
|
linebuf[curr] = '\0';
|
||||||
attr[curr] = AT_NORMAL;
|
attr[curr] = AT_NORMAL;
|
||||||
|
}
|
||||||
|
|
||||||
#if HILITE_SEARCH
|
/*
|
||||||
if (status_col && line_matches > 0)
|
*
|
||||||
{
|
*/
|
||||||
linebuf[0] = '*';
|
public void
|
||||||
|
set_status_col(c)
|
||||||
|
char c;
|
||||||
|
{
|
||||||
|
linebuf[0] = c;
|
||||||
attr[0] = AT_NORMAL|AT_HILITE;
|
attr[0] = AT_NORMAL|AT_HILITE;
|
||||||
}
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (C) 1984-2007 Mark Nudelman
|
* Copyright (C) 1984-2008 Mark Nudelman
|
||||||
*
|
*
|
||||||
* You may distribute under the terms of either the GNU General Public
|
* You may distribute under the terms of either the GNU General Public
|
||||||
* License or the Less License, as specified in the README file.
|
* License or the Less License, as specified in the README file.
|
||||||
@ -56,12 +56,10 @@ struct linenum_info
|
|||||||
* when we have a new one to insert and the table is full.
|
* when we have a new one to insert and the table is full.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define NPOOL 50 /* Size of line number pool */
|
#define NPOOL 200 /* Size of line number pool */
|
||||||
|
|
||||||
#define LONGTIME (2) /* In seconds */
|
#define LONGTIME (2) /* In seconds */
|
||||||
|
|
||||||
public int lnloop = 0; /* Are we in the line num loop? */
|
|
||||||
|
|
||||||
static struct linenum_info anchor; /* Anchor of the list */
|
static struct linenum_info anchor; /* Anchor of the list */
|
||||||
static struct linenum_info *freelist; /* Anchor of the unused entries */
|
static struct linenum_info *freelist; /* Anchor of the unused entries */
|
||||||
static struct linenum_info pool[NPOOL]; /* The pool itself */
|
static struct linenum_info pool[NPOOL]; /* The pool itself */
|
||||||
@ -70,6 +68,7 @@ static struct linenum_info *spare; /* We always keep one spare entry */
|
|||||||
extern int linenums;
|
extern int linenums;
|
||||||
extern int sigs;
|
extern int sigs;
|
||||||
extern int sc_height;
|
extern int sc_height;
|
||||||
|
extern int screen_trashed;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Initialize the line number structures.
|
* Initialize the line number structures.
|
||||||
@ -214,12 +213,6 @@ add_lnum(linenum, pos)
|
|||||||
longloopmessage()
|
longloopmessage()
|
||||||
{
|
{
|
||||||
ierror("Calculating line numbers", NULL_PARG);
|
ierror("Calculating line numbers", NULL_PARG);
|
||||||
/*
|
|
||||||
* Set the lnloop flag here, so if the user interrupts while
|
|
||||||
* we are calculating line numbers, the signal handler will
|
|
||||||
* turn off line numbers (linenums=0).
|
|
||||||
*/
|
|
||||||
lnloop = 1;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static int loopcount;
|
static int loopcount;
|
||||||
@ -249,6 +242,22 @@ longish()
|
|||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Turn off line numbers because the user has interrupted
|
||||||
|
* a lengthy line number calculation.
|
||||||
|
*/
|
||||||
|
static void
|
||||||
|
abort_long()
|
||||||
|
{
|
||||||
|
if (linenums == OPT_ONPLUS)
|
||||||
|
/*
|
||||||
|
* We were displaying line numbers, so need to repaint.
|
||||||
|
*/
|
||||||
|
screen_trashed = 1;
|
||||||
|
linenums = 0;
|
||||||
|
error("Line numbers turned off", NULL_PARG);
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Find the line number associated with a given position.
|
* Find the line number associated with a given position.
|
||||||
* Return 0 if we can't figure it out.
|
* Return 0 if we can't figure it out.
|
||||||
@ -315,11 +324,14 @@ find_linenum(pos)
|
|||||||
* Allow a signal to abort this loop.
|
* Allow a signal to abort this loop.
|
||||||
*/
|
*/
|
||||||
cpos = forw_raw_line(cpos, (char **)NULL, (int *)NULL);
|
cpos = forw_raw_line(cpos, (char **)NULL, (int *)NULL);
|
||||||
if (ABORT_SIGS() || cpos == NULL_POSITION)
|
if (ABORT_SIGS()) {
|
||||||
|
abort_long();
|
||||||
|
return (0);
|
||||||
|
}
|
||||||
|
if (cpos == NULL_POSITION)
|
||||||
return (0);
|
return (0);
|
||||||
longish();
|
longish();
|
||||||
}
|
}
|
||||||
lnloop = 0;
|
|
||||||
/*
|
/*
|
||||||
* We might as well cache it.
|
* We might as well cache it.
|
||||||
*/
|
*/
|
||||||
@ -344,11 +356,14 @@ find_linenum(pos)
|
|||||||
* Allow a signal to abort this loop.
|
* Allow a signal to abort this loop.
|
||||||
*/
|
*/
|
||||||
cpos = back_raw_line(cpos, (char **)NULL, (int *)NULL);
|
cpos = back_raw_line(cpos, (char **)NULL, (int *)NULL);
|
||||||
if (ABORT_SIGS() || cpos == NULL_POSITION)
|
if (ABORT_SIGS()) {
|
||||||
|
abort_long();
|
||||||
|
return (0);
|
||||||
|
}
|
||||||
|
if (cpos == NULL_POSITION)
|
||||||
return (0);
|
return (0);
|
||||||
longish();
|
longish();
|
||||||
}
|
}
|
||||||
lnloop = 0;
|
|
||||||
/*
|
/*
|
||||||
* We might as well cache it.
|
* We might as well cache it.
|
||||||
*/
|
*/
|
||||||
@ -399,7 +414,9 @@ find_pos(linenum)
|
|||||||
* Allow a signal to abort this loop.
|
* Allow a signal to abort this loop.
|
||||||
*/
|
*/
|
||||||
cpos = forw_raw_line(cpos, (char **)NULL, (int *)NULL);
|
cpos = forw_raw_line(cpos, (char **)NULL, (int *)NULL);
|
||||||
if (ABORT_SIGS() || cpos == NULL_POSITION)
|
if (ABORT_SIGS())
|
||||||
|
return (NULL_POSITION);
|
||||||
|
if (cpos == NULL_POSITION)
|
||||||
return (NULL_POSITION);
|
return (NULL_POSITION);
|
||||||
}
|
}
|
||||||
} else
|
} else
|
||||||
@ -415,7 +432,9 @@ find_pos(linenum)
|
|||||||
* Allow a signal to abort this loop.
|
* Allow a signal to abort this loop.
|
||||||
*/
|
*/
|
||||||
cpos = back_raw_line(cpos, (char **)NULL, (int *)NULL);
|
cpos = back_raw_line(cpos, (char **)NULL, (int *)NULL);
|
||||||
if (ABORT_SIGS() || cpos == NULL_POSITION)
|
if (ABORT_SIGS())
|
||||||
|
return (NULL_POSITION);
|
||||||
|
if (cpos == NULL_POSITION)
|
||||||
return (NULL_POSITION);
|
return (NULL_POSITION);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (C) 1984-2007 Mark Nudelman
|
* Copyright (C) 1984-2008 Mark Nudelman
|
||||||
*
|
*
|
||||||
* You may distribute under the terms of either the GNU General Public
|
* You may distribute under the terms of either the GNU General Public
|
||||||
* License or the Less License, as specified in the README file.
|
* License or the Less License, as specified in the README file.
|
||||||
@ -49,7 +49,7 @@ lsystem(cmd, donemsg)
|
|||||||
register char *p;
|
register char *p;
|
||||||
#endif
|
#endif
|
||||||
IFILE save_ifile;
|
IFILE save_ifile;
|
||||||
#if MSDOS_COMPILER
|
#if MSDOS_COMPILER && MSDOS_COMPILER!=WIN32C
|
||||||
char cwd[FILENAME_MAX+1];
|
char cwd[FILENAME_MAX+1];
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@ -68,6 +68,10 @@ lsystem(cmd, donemsg)
|
|||||||
}
|
}
|
||||||
|
|
||||||
#if MSDOS_COMPILER
|
#if MSDOS_COMPILER
|
||||||
|
#if MSDOS_COMPILER==WIN32C
|
||||||
|
if (*cmd == '\0')
|
||||||
|
cmd = getenv("COMSPEC");
|
||||||
|
#else
|
||||||
/*
|
/*
|
||||||
* Working directory is global on MSDOS.
|
* Working directory is global on MSDOS.
|
||||||
* The child might change the working directory, so we
|
* The child might change the working directory, so we
|
||||||
@ -76,6 +80,7 @@ lsystem(cmd, donemsg)
|
|||||||
* try to "reedit_ifile" it.
|
* try to "reedit_ifile" it.
|
||||||
*/
|
*/
|
||||||
getcwd(cwd, FILENAME_MAX);
|
getcwd(cwd, FILENAME_MAX);
|
||||||
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@ -192,7 +197,7 @@ lsystem(cmd, donemsg)
|
|||||||
init();
|
init();
|
||||||
screen_trashed = 1;
|
screen_trashed = 1;
|
||||||
|
|
||||||
#if MSDOS_COMPILER
|
#if MSDOS_COMPILER && MSDOS_COMPILER!=WIN32C
|
||||||
/*
|
/*
|
||||||
* Restore the previous directory (possibly
|
* Restore the previous directory (possibly
|
||||||
* changed by the child program we just ran).
|
* changed by the child program we just ran).
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/* $FreeBSD$ */
|
/* $FreeBSD$ */
|
||||||
/*
|
/*
|
||||||
* Copyright (C) 1984-2007 Mark Nudelman
|
* Copyright (C) 1984-2008 Mark Nudelman
|
||||||
*
|
*
|
||||||
* You may distribute under the terms of either the GNU General Public
|
* You may distribute under the terms of either the GNU General Public
|
||||||
* License or the Less License, as specified in the README file.
|
* License or the Less License, as specified in the README file.
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (C) 1984-2007 Mark Nudelman
|
* Copyright (C) 1984-2008 Mark Nudelman
|
||||||
*
|
*
|
||||||
* You may distribute under the terms of either the GNU General Public
|
* You may distribute under the terms of either the GNU General Public
|
||||||
* License or the Less License, as specified in the README file.
|
* License or the Less License, as specified in the README file.
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (C) 1984-2007 Mark Nudelman
|
* Copyright (C) 1984-2008 Mark Nudelman
|
||||||
*
|
*
|
||||||
* You may distribute under the terms of either the GNU General Public
|
* You may distribute under the terms of either the GNU General Public
|
||||||
* License or the Less License, as specified in the README file.
|
* License or the Less License, as specified in the README file.
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (C) 1984-2007 Mark Nudelman
|
* Copyright (C) 1984-2008 Mark Nudelman
|
||||||
*
|
*
|
||||||
* You may distribute under the terms of either the GNU General Public
|
* You may distribute under the terms of either the GNU General Public
|
||||||
* License or the Less License, as specified in the README file.
|
* License or the Less License, as specified in the README file.
|
||||||
@ -442,7 +442,7 @@ opt__V(type, s)
|
|||||||
any_display = 1;
|
any_display = 1;
|
||||||
putstr("less ");
|
putstr("less ");
|
||||||
putstr(version);
|
putstr(version);
|
||||||
putstr("\nCopyright (C) 1984-2007 Mark Nudelman\n\n");
|
putstr("\nCopyright (C) 1984-2008 Mark Nudelman\n\n");
|
||||||
putstr("less comes with NO WARRANTY, to the extent permitted by law.\n");
|
putstr("less comes with NO WARRANTY, to the extent permitted by law.\n");
|
||||||
putstr("For information about the terms of redistribution,\n");
|
putstr("For information about the terms of redistribution,\n");
|
||||||
putstr("see the file named README in the less distribution.\n");
|
putstr("see the file named README in the less distribution.\n");
|
||||||
@ -472,14 +472,14 @@ colordesc(s, fg_color, bg_color)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (*s != '.')
|
if (*s != '.')
|
||||||
bg = 0;
|
bg = nm_bg_color;
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
s++;
|
s++;
|
||||||
bg = getnum(&s, "D", &err);
|
bg = getnum(&s, "D", &err);
|
||||||
if (err)
|
if (err)
|
||||||
{
|
{
|
||||||
error("Missing fg color in -D", NULL_PARG);
|
error("Missing bg color in -D", NULL_PARG);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (C) 1984-2007 Mark Nudelman
|
* Copyright (C) 1984-2008 Mark Nudelman
|
||||||
*
|
*
|
||||||
* You may distribute under the terms of either the GNU General Public
|
* You may distribute under the terms of either the GNU General Public
|
||||||
* License or the Less License, as specified in the README file.
|
* License or the Less License, as specified in the README file.
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (C) 1984-2007 Mark Nudelman
|
* Copyright (C) 1984-2008 Mark Nudelman
|
||||||
*
|
*
|
||||||
* You may distribute under the terms of either the GNU General Public
|
* You may distribute under the terms of either the GNU General Public
|
||||||
* License or the Less License, as specified in the README file.
|
* License or the Less License, as specified in the README file.
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (C) 1984-2007 Mark Nudelman
|
* Copyright (C) 1984-2008 Mark Nudelman
|
||||||
*
|
*
|
||||||
* You may distribute under the terms of either the GNU General Public
|
* You may distribute under the terms of either the GNU General Public
|
||||||
* License or the Less License, as specified in the README file.
|
* License or the Less License, as specified in the README file.
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (C) 1984-2007 Mark Nudelman
|
* Copyright (C) 1984-2008 Mark Nudelman
|
||||||
*
|
*
|
||||||
* You may distribute under the terms of either the GNU General Public
|
* You may distribute under the terms of either the GNU General Public
|
||||||
* License or the Less License, as specified in the README file.
|
* License or the Less License, as specified in the README file.
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (C) 1984-2007 Mark Nudelman
|
* Copyright (C) 1984-2008 Mark Nudelman
|
||||||
*
|
*
|
||||||
* You may distribute under the terms of either the GNU General Public
|
* You may distribute under the terms of either the GNU General Public
|
||||||
* License or the Less License, as specified in the README file.
|
* License or the Less License, as specified in the README file.
|
||||||
@ -31,7 +31,7 @@ extern int any_display;
|
|||||||
extern int is_tty;
|
extern int is_tty;
|
||||||
extern int oldbot;
|
extern int oldbot;
|
||||||
|
|
||||||
#if MSDOS_COMPILER==BORLANDC || MSDOS_COMPILER==DJGPPC
|
#if MSDOS_COMPILER==WIN32C || MSDOS_COMPILER==BORLANDC || MSDOS_COMPILER==DJGPPC
|
||||||
extern int ctldisp;
|
extern int ctldisp;
|
||||||
extern int nm_fg_color, nm_bg_color;
|
extern int nm_fg_color, nm_bg_color;
|
||||||
extern int bo_fg_color, bo_bg_color;
|
extern int bo_fg_color, bo_bg_color;
|
||||||
@ -102,53 +102,7 @@ flush()
|
|||||||
n = ob - obuf;
|
n = ob - obuf;
|
||||||
if (n == 0)
|
if (n == 0)
|
||||||
return;
|
return;
|
||||||
#if MSDOS_COMPILER==WIN32C
|
|
||||||
if (is_tty && any_display)
|
|
||||||
{
|
|
||||||
char *op;
|
|
||||||
DWORD nwritten = 0;
|
|
||||||
CONSOLE_SCREEN_BUFFER_INFO scr;
|
|
||||||
int row;
|
|
||||||
int col;
|
|
||||||
int olen;
|
|
||||||
extern HANDLE con_out;
|
|
||||||
|
|
||||||
olen = ob - obuf;
|
|
||||||
/*
|
|
||||||
* There is a bug in Win32 WriteConsole() if we're
|
|
||||||
* writing in the last cell with a different color.
|
|
||||||
* To avoid color problems in the bottom line,
|
|
||||||
* we scroll the screen manually, before writing.
|
|
||||||
*/
|
|
||||||
GetConsoleScreenBufferInfo(con_out, &scr);
|
|
||||||
col = scr.dwCursorPosition.X;
|
|
||||||
row = scr.dwCursorPosition.Y;
|
|
||||||
for (op = obuf; op < obuf + olen; op++)
|
|
||||||
{
|
|
||||||
if (*op == '\n')
|
|
||||||
{
|
|
||||||
col = 0;
|
|
||||||
row++;
|
|
||||||
} else if (*op == '\r')
|
|
||||||
{
|
|
||||||
col = 0;
|
|
||||||
} else
|
|
||||||
{
|
|
||||||
col++;
|
|
||||||
if (col >= sc_width)
|
|
||||||
{
|
|
||||||
col = 0;
|
|
||||||
row++;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (row > scr.srWindow.Bottom)
|
|
||||||
win32_scroll_up(row - scr.srWindow.Bottom);
|
|
||||||
WriteConsole(con_out, obuf, olen, &nwritten, NULL);
|
|
||||||
ob = obuf;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
#else
|
|
||||||
#if MSDOS_COMPILER==MSOFTC
|
#if MSDOS_COMPILER==MSOFTC
|
||||||
if (is_tty && any_display)
|
if (is_tty && any_display)
|
||||||
{
|
{
|
||||||
@ -158,12 +112,12 @@ flush()
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
#if MSDOS_COMPILER==BORLANDC || MSDOS_COMPILER==DJGPPC
|
#if MSDOS_COMPILER==WIN32C || MSDOS_COMPILER==BORLANDC || MSDOS_COMPILER==DJGPPC
|
||||||
if (is_tty && any_display)
|
if (is_tty && any_display)
|
||||||
{
|
{
|
||||||
*ob = '\0';
|
*ob = '\0';
|
||||||
if (ctldisp != OPT_ONPLUS)
|
if (ctldisp != OPT_ONPLUS)
|
||||||
cputs(obuf);
|
WIN32textout(obuf, ob - obuf);
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
/*
|
/*
|
||||||
@ -173,64 +127,70 @@ flush()
|
|||||||
* the -D command-line option.
|
* the -D command-line option.
|
||||||
*/
|
*/
|
||||||
char *anchor, *p, *p_next;
|
char *anchor, *p, *p_next;
|
||||||
int buflen = ob - obuf;
|
unsigned char fg, bg;
|
||||||
unsigned char fg, bg, norm_attr;
|
static unsigned char at;
|
||||||
/*
|
#if MSDOS_COMPILER==WIN32C
|
||||||
* Only dark colors mentioned here, so that
|
/* Screen colors used by 3x and 4x SGR commands. */
|
||||||
* bold has visible effect.
|
static unsigned char screen_color[] = {
|
||||||
*/
|
0, /* BLACK */
|
||||||
|
FOREGROUND_RED,
|
||||||
|
FOREGROUND_GREEN,
|
||||||
|
FOREGROUND_RED|FOREGROUND_GREEN,
|
||||||
|
FOREGROUND_BLUE,
|
||||||
|
FOREGROUND_BLUE|FOREGROUND_RED,
|
||||||
|
FOREGROUND_BLUE|FOREGROUND_GREEN,
|
||||||
|
FOREGROUND_BLUE|FOREGROUND_GREEN|FOREGROUND_RED
|
||||||
|
};
|
||||||
|
#else
|
||||||
static enum COLORS screen_color[] = {
|
static enum COLORS screen_color[] = {
|
||||||
BLACK, RED, GREEN, BROWN,
|
BLACK, RED, GREEN, BROWN,
|
||||||
BLUE, MAGENTA, CYAN, LIGHTGRAY
|
BLUE, MAGENTA, CYAN, LIGHTGRAY
|
||||||
};
|
};
|
||||||
|
#endif
|
||||||
|
|
||||||
/* Normal text colors are used as baseline. */
|
|
||||||
bg = nm_bg_color & 0xf;
|
|
||||||
fg = nm_fg_color & 0xf;
|
|
||||||
norm_attr = (bg << 4) | fg;
|
|
||||||
for (anchor = p_next = obuf;
|
for (anchor = p_next = obuf;
|
||||||
(p_next = memchr (p_next, ESC,
|
(p_next = memchr(p_next, ESC, ob - p_next)) != NULL; )
|
||||||
buflen - (p_next - obuf)))
|
|
||||||
!= NULL; )
|
|
||||||
{
|
{
|
||||||
p = p_next;
|
p = p_next;
|
||||||
|
if (p[1] == '[') /* "ESC-[" sequence */
|
||||||
/*
|
|
||||||
* Handle the null escape sequence
|
|
||||||
* (ESC-[m), which is used to restore
|
|
||||||
* the original color.
|
|
||||||
*/
|
|
||||||
if (p[1] == '[' && is_ansi_end(p[2]))
|
|
||||||
{
|
{
|
||||||
textattr(norm_attr);
|
if (p > anchor)
|
||||||
p += 3;
|
|
||||||
anchor = p_next = p;
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (p[1] == '[') /* "Esc-[" sequence */
|
|
||||||
{
|
{
|
||||||
/*
|
/*
|
||||||
* If some chars seen since
|
* If some chars seen since
|
||||||
* the last escape sequence,
|
* the last escape sequence,
|
||||||
* write it out to the screen
|
* write them out to the screen.
|
||||||
* using current text attributes.
|
|
||||||
*/
|
*/
|
||||||
if (p > anchor)
|
WIN32textout(anchor, p-anchor);
|
||||||
{
|
|
||||||
*p = '\0';
|
|
||||||
cputs (anchor);
|
|
||||||
*p = ESC;
|
|
||||||
anchor = p;
|
anchor = p;
|
||||||
}
|
}
|
||||||
p += 2;
|
p += 2; /* Skip the "ESC-[" */
|
||||||
|
if (is_ansi_end(*p))
|
||||||
|
{
|
||||||
|
/*
|
||||||
|
* Handle null escape sequence
|
||||||
|
* "ESC[m", which restores
|
||||||
|
* the normal color.
|
||||||
|
*/
|
||||||
|
p++;
|
||||||
|
anchor = p_next = p;
|
||||||
|
WIN32setcolors(nm_fg_color, nm_bg_color);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
p_next = p;
|
p_next = p;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Select foreground/background colors
|
||||||
|
* based on the escape sequence.
|
||||||
|
*/
|
||||||
|
fg = nm_fg_color;
|
||||||
|
bg = nm_bg_color;
|
||||||
while (!is_ansi_end(*p))
|
while (!is_ansi_end(*p))
|
||||||
{
|
{
|
||||||
char *q;
|
char *q;
|
||||||
long code = strtol(p, &q, 10);
|
long code = strtol(p, &q, 10);
|
||||||
|
|
||||||
if (!*q)
|
if (*q == '\0')
|
||||||
{
|
{
|
||||||
/*
|
/*
|
||||||
* Incomplete sequence.
|
* Incomplete sequence.
|
||||||
@ -238,15 +198,15 @@ flush()
|
|||||||
* in the buffer.
|
* in the buffer.
|
||||||
*/
|
*/
|
||||||
int slop = q - anchor;
|
int slop = q - anchor;
|
||||||
|
/* {{ strcpy args overlap! }} */
|
||||||
strcpy(obuf, anchor);
|
strcpy(obuf, anchor);
|
||||||
ob = &obuf[slop];
|
ob = &obuf[slop];
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (q == p
|
if (q == p ||
|
||||||
|| code > 49 || code < 0
|
code > 49 || code < 0 ||
|
||||||
|| (!is_ansi_end(*q)
|
(!is_ansi_end(*q) && *q != ';'))
|
||||||
&& *q != ';'))
|
|
||||||
{
|
{
|
||||||
p_next = q;
|
p_next = q;
|
||||||
break;
|
break;
|
||||||
@ -256,27 +216,38 @@ flush()
|
|||||||
|
|
||||||
switch (code)
|
switch (code)
|
||||||
{
|
{
|
||||||
|
default:
|
||||||
|
/* case 0: all attrs off */
|
||||||
|
fg = nm_fg_color;
|
||||||
|
bg = nm_bg_color;
|
||||||
|
at = 0;
|
||||||
|
break;
|
||||||
case 1: /* bold on */
|
case 1: /* bold on */
|
||||||
fg = bo_fg_color;
|
at |= 1;
|
||||||
bg = bo_bg_color;
|
|
||||||
break;
|
break;
|
||||||
case 3: /* italic on */
|
case 3: /* italic on */
|
||||||
fg = so_fg_color;
|
case 7: /* inverse on */
|
||||||
bg = so_bg_color;
|
at |= 2;
|
||||||
break;
|
break;
|
||||||
case 4: /* underline on */
|
case 4: /* underline on */
|
||||||
fg = ul_fg_color;
|
at |= 4;
|
||||||
bg = ul_bg_color;
|
break;
|
||||||
|
case 5: /* slow blink on */
|
||||||
|
case 6: /* fast blink on */
|
||||||
|
at |= 8;
|
||||||
break;
|
break;
|
||||||
case 8: /* concealed on */
|
case 8: /* concealed on */
|
||||||
fg = (bg & 7) | 8;
|
fg = (bg & 7) | 8;
|
||||||
break;
|
break;
|
||||||
case 0: /* all attrs off */
|
case 22: /* bold off */
|
||||||
case 22:/* bold off */
|
at &= ~1;
|
||||||
case 23:/* italic off */
|
break;
|
||||||
case 24:/* underline off */
|
case 23: /* italic off */
|
||||||
fg = nm_fg_color;
|
case 27: /* inverse off */
|
||||||
bg = nm_bg_color;
|
at &= ~2;
|
||||||
|
break;
|
||||||
|
case 24: /* underline off */
|
||||||
|
at &= ~4;
|
||||||
break;
|
break;
|
||||||
case 30: case 31: case 32:
|
case 30: case 31: case 32:
|
||||||
case 33: case 34: case 35:
|
case 33: case 34: case 35:
|
||||||
@ -297,26 +268,40 @@ flush()
|
|||||||
}
|
}
|
||||||
p = q;
|
p = q;
|
||||||
}
|
}
|
||||||
if (is_ansi_end(*p) && p > p_next)
|
if (!is_ansi_end(*p) || p == p_next)
|
||||||
{
|
|
||||||
bg &= 15;
|
|
||||||
fg &= 15;
|
|
||||||
textattr ((bg << 4)| fg);
|
|
||||||
p_next = anchor = p + 1;
|
|
||||||
} else
|
|
||||||
break;
|
break;
|
||||||
|
if (at & 1)
|
||||||
|
{
|
||||||
|
fg = bo_fg_color;
|
||||||
|
bg = bo_bg_color;
|
||||||
|
} 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);
|
||||||
|
p_next = anchor = p + 1;
|
||||||
} else
|
} else
|
||||||
p_next++;
|
p_next++;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Output what's left in the buffer. */
|
/* Output what's left in the buffer. */
|
||||||
cputs (anchor);
|
WIN32textout(anchor, ob - anchor);
|
||||||
}
|
}
|
||||||
ob = obuf;
|
ob = obuf;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
#endif
|
|
||||||
#endif
|
#endif
|
||||||
fd = (any_display) ? 1 : 2;
|
fd = (any_display) ? 1 : 2;
|
||||||
if (write(fd, obuf, n) != n)
|
if (write(fd, obuf, n) != n)
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (C) 1984-2007 Mark Nudelman
|
* Copyright (C) 1984-2008 Mark Nudelman
|
||||||
*
|
*
|
||||||
* You may distribute under the terms of either the GNU General Public
|
* You may distribute under the terms of either the GNU General Public
|
||||||
* License or the Less License, as specified in the README file.
|
* License or the Less License, as specified in the README file.
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (C) 1984-2007 Mark Nudelman
|
* Copyright (C) 1984-2008 Mark Nudelman
|
||||||
*
|
*
|
||||||
* You may distribute under the terms of either the GNU General Public
|
* You may distribute under the terms of either the GNU General Public
|
||||||
* License or the Less License, as specified in the README file.
|
* License or the Less License, as specified in the README file.
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (C) 1984-2007 Mark Nudelman
|
* Copyright (C) 1984-2008 Mark Nudelman
|
||||||
*
|
*
|
||||||
* You may distribute under the terms of either the GNU General Public
|
* You may distribute under the terms of either the GNU General Public
|
||||||
* License or the Less License, as specified in the README file.
|
* License or the Less License, as specified in the README file.
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/* $FreeBSD$ */
|
/* $FreeBSD$ */
|
||||||
/*
|
/*
|
||||||
* Copyright (C) 1984-2007 Mark Nudelman
|
* Copyright (C) 1984-2008 Mark Nudelman
|
||||||
*
|
*
|
||||||
* You may distribute under the terms of either the GNU General Public
|
* You may distribute under the terms of either the GNU General Public
|
||||||
* License or the Less License, as specified in the README file.
|
* License or the Less License, as specified in the README file.
|
||||||
@ -23,7 +23,6 @@
|
|||||||
#include "position.h"
|
#include "position.h"
|
||||||
|
|
||||||
extern int pr_type;
|
extern int pr_type;
|
||||||
extern int hit_eof;
|
|
||||||
extern int new_file;
|
extern int new_file;
|
||||||
extern int sc_width;
|
extern int sc_width;
|
||||||
extern int so_s_width, so_e_width;
|
extern int so_s_width, so_e_width;
|
||||||
@ -197,7 +196,7 @@ cond(c, where)
|
|||||||
case 'c':
|
case 'c':
|
||||||
return (hshift != 0);
|
return (hshift != 0);
|
||||||
case 'e': /* At end of file? */
|
case 'e': /* At end of file? */
|
||||||
return (hit_eof);
|
return (eof_displayed());
|
||||||
case 'f': /* Filename known? */
|
case 'f': /* Filename known? */
|
||||||
return (strcmp(get_filename(curr_ifile), "-") != 0);
|
return (strcmp(get_filename(curr_ifile), "-") != 0);
|
||||||
case 'l': /* Line number known? */
|
case 'l': /* Line number known? */
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/* $FreeBSD$ */
|
/* $FreeBSD$ */
|
||||||
/*
|
/*
|
||||||
* Copyright (C) 1984-2007 Mark Nudelman
|
* Copyright (C) 1984-2008 Mark Nudelman
|
||||||
*
|
*
|
||||||
* You may distribute under the terms of either the GNU General Public
|
* You may distribute under the terms of either the GNU General Public
|
||||||
* License or the Less License, as specified in the README file.
|
* License or the Less License, as specified in the README file.
|
||||||
@ -1551,7 +1551,8 @@ init()
|
|||||||
*/
|
*/
|
||||||
for (i = 1; i < sc_height; i++)
|
for (i = 1; i < sc_height; i++)
|
||||||
putchr('\n');
|
putchr('\n');
|
||||||
}
|
} else
|
||||||
|
line_left();
|
||||||
#else
|
#else
|
||||||
#if MSDOS_COMPILER==WIN32C
|
#if MSDOS_COMPILER==WIN32C
|
||||||
if (!no_init)
|
if (!no_init)
|
||||||
@ -1788,7 +1789,7 @@ win32_scroll_up(n)
|
|||||||
|
|
||||||
/* Move the source text to the top of the screen. */
|
/* Move the source text to the top of the screen. */
|
||||||
new_org.X = rcSrc.Left;
|
new_org.X = rcSrc.Left;
|
||||||
new_org.Y = 0;
|
/* new_org.Y = rcClip.top; -- doesn't compile under MSVC6 */
|
||||||
|
|
||||||
/* Fill the right character and attributes. */
|
/* Fill the right character and attributes. */
|
||||||
fillchar.Char.AsciiChar = ' ';
|
fillchar.Char.AsciiChar = ' ';
|
||||||
@ -2470,3 +2471,33 @@ WIN32getch(tty)
|
|||||||
return ((char)ascii);
|
return ((char)ascii);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if MSDOS_COMPILER
|
||||||
|
/*
|
||||||
|
*/
|
||||||
|
public void
|
||||||
|
WIN32setcolors(fg, bg)
|
||||||
|
int fg;
|
||||||
|
int bg;
|
||||||
|
{
|
||||||
|
SETCOLORS(fg, bg);
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
*/
|
||||||
|
public void
|
||||||
|
WIN32textout(text, len)
|
||||||
|
char *text;
|
||||||
|
int len;
|
||||||
|
{
|
||||||
|
#if MSDOS_COMPILER==WIN32C
|
||||||
|
DWORD written;
|
||||||
|
WriteConsole(con_out, text, len, &written, NULL);
|
||||||
|
#else
|
||||||
|
char c = text[len];
|
||||||
|
text[len] = '\0';
|
||||||
|
cputs(text);
|
||||||
|
text[len] = c;
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (C) 1984-2007 Mark Nudelman
|
* Copyright (C) 1984-2008 Mark Nudelman
|
||||||
*
|
*
|
||||||
* You may distribute under the terms of either the GNU General Public
|
* You may distribute under the terms of either the GNU General Public
|
||||||
* License or the Less License, as specified in the README file.
|
* License or the Less License, as specified in the README file.
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/* $FreeBSD$ */
|
/* $FreeBSD$ */
|
||||||
/*
|
/*
|
||||||
* Copyright (C) 1984-2007 Mark Nudelman
|
* Copyright (C) 1984-2008 Mark Nudelman
|
||||||
*
|
*
|
||||||
* You may distribute under the terms of either the GNU General Public
|
* You may distribute under the terms of either the GNU General Public
|
||||||
* License or the Less License, as specified in the README file.
|
* License or the Less License, as specified in the README file.
|
||||||
@ -60,13 +60,13 @@ extern int status_col;
|
|||||||
extern void * constant ml_search;
|
extern void * constant ml_search;
|
||||||
extern POSITION start_attnpos;
|
extern POSITION start_attnpos;
|
||||||
extern POSITION end_attnpos;
|
extern POSITION end_attnpos;
|
||||||
|
extern int utf_mode;
|
||||||
|
extern int screen_trashed;
|
||||||
#if HILITE_SEARCH
|
#if HILITE_SEARCH
|
||||||
extern int hilite_search;
|
extern int hilite_search;
|
||||||
extern int screen_trashed;
|
|
||||||
extern int size_linebuf;
|
extern int size_linebuf;
|
||||||
extern int squished;
|
extern int squished;
|
||||||
extern int can_goto_line;
|
extern int can_goto_line;
|
||||||
extern int utf_mode;
|
|
||||||
static int hide_hilite;
|
static int hide_hilite;
|
||||||
static int oldbot;
|
static int oldbot;
|
||||||
static POSITION prep_startpos;
|
static POSITION prep_startpos;
|
||||||
@ -79,6 +79,7 @@ struct hilite
|
|||||||
POSITION hl_endpos;
|
POSITION hl_endpos;
|
||||||
};
|
};
|
||||||
static struct hilite hilite_anchor = { NULL, NULL_POSITION, NULL_POSITION };
|
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
|
#define hl_first hl_next
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@ -87,24 +88,28 @@ static struct hilite hilite_anchor = { NULL, NULL_POSITION, NULL_POSITION };
|
|||||||
* search pattern.
|
* search pattern.
|
||||||
*/
|
*/
|
||||||
#if HAVE_POSIX_REGCOMP
|
#if HAVE_POSIX_REGCOMP
|
||||||
static regex_t *regpattern = NULL;
|
#define DEFINE_PATTERN(name) static regex_t *name = NULL
|
||||||
#endif
|
#endif
|
||||||
#if HAVE_PCRE
|
#if HAVE_PCRE
|
||||||
pcre *regpattern = NULL;
|
#define DEFINE_PATTERN(name) pcre *name = NULL;
|
||||||
#endif
|
#endif
|
||||||
#if HAVE_RE_COMP
|
#if HAVE_RE_COMP
|
||||||
int re_pattern = 0;
|
#define DEFINE_PATTERN(name) int name = 0;
|
||||||
#endif
|
#endif
|
||||||
#if HAVE_REGCMP
|
#if HAVE_REGCMP
|
||||||
static char *cpattern = NULL;
|
#define DEFINE_PATTERN(name) static char *name = NULL;
|
||||||
#endif
|
#endif
|
||||||
#if HAVE_V8_REGCOMP
|
#if HAVE_V8_REGCOMP
|
||||||
static struct regexp *regpattern = NULL;
|
#define DEFINE_PATTERN(name) static struct regexp *name = NULL;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
DEFINE_PATTERN(search_pattern);
|
||||||
|
DEFINE_PATTERN(filter_pattern);
|
||||||
|
|
||||||
static int is_caseless;
|
static int is_caseless;
|
||||||
static int is_ucase_pattern;
|
static int is_ucase_pattern;
|
||||||
static int last_search_type;
|
static int last_search_type;
|
||||||
|
static int last_filter_type;
|
||||||
static char *last_pattern = NULL;
|
static char *last_pattern = NULL;
|
||||||
|
|
||||||
#define CVT_TO_LC 01 /* Convert upper-case to lower-case */
|
#define CVT_TO_LC 01 /* Convert upper-case to lower-case */
|
||||||
@ -133,7 +138,7 @@ cvt_length(len, ops)
|
|||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Convert text. Perform one or more of these transformations:
|
* Convert text. Perform the transformations specified by ops.
|
||||||
*/
|
*/
|
||||||
static void
|
static void
|
||||||
cvt_text(odst, osrc, lenp, ops)
|
cvt_text(odst, osrc, lenp, ops)
|
||||||
@ -169,8 +174,9 @@ cvt_text(odst, osrc, lenp, ops)
|
|||||||
} else if ((ops & CVT_ANSI) && IS_CSI_START(ch))
|
} else if ((ops & CVT_ANSI) && IS_CSI_START(ch))
|
||||||
{
|
{
|
||||||
/* Skip to end of ANSI escape sequence. */
|
/* Skip to end of ANSI escape sequence. */
|
||||||
while (src + 1 != src_end)
|
src++; /* skip the CSI start char */
|
||||||
if (!is_ansi_middle(*++src))
|
while (src < src_end)
|
||||||
|
if (!is_ansi_middle(*src++))
|
||||||
break;
|
break;
|
||||||
} else
|
} else
|
||||||
/* Just copy. */
|
/* Just copy. */
|
||||||
@ -235,22 +241,22 @@ prev_pattern()
|
|||||||
if (last_search_type & SRCH_NO_REGEX)
|
if (last_search_type & SRCH_NO_REGEX)
|
||||||
return (last_pattern != NULL);
|
return (last_pattern != NULL);
|
||||||
#if HAVE_POSIX_REGCOMP
|
#if HAVE_POSIX_REGCOMP
|
||||||
return (regpattern != NULL);
|
return (search_pattern != NULL);
|
||||||
#endif
|
#endif
|
||||||
#if HAVE_PCRE
|
#if HAVE_PCRE
|
||||||
return (regpattern != NULL);
|
return (search_pattern != NULL);
|
||||||
#endif
|
#endif
|
||||||
#if HAVE_RE_COMP
|
#if HAVE_RE_COMP
|
||||||
return (re_pattern != 0);
|
return (search_pattern != 0);
|
||||||
#endif
|
#endif
|
||||||
#if HAVE_REGCMP
|
#if HAVE_REGCMP
|
||||||
return (cpattern != NULL);
|
return (search_pattern != NULL);
|
||||||
#endif
|
#endif
|
||||||
#if HAVE_V8_REGCOMP
|
#if HAVE_V8_REGCOMP
|
||||||
return (regpattern != NULL);
|
return (search_pattern != NULL);
|
||||||
#endif
|
#endif
|
||||||
#if NO_REGEX
|
#if NO_REGEX
|
||||||
return (last_pattern != NULL);
|
return (search_pattern != NULL);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -384,26 +390,29 @@ undo_search()
|
|||||||
* Compile a search pattern, for future use by match_pattern.
|
* Compile a search pattern, for future use by match_pattern.
|
||||||
*/
|
*/
|
||||||
static int
|
static int
|
||||||
compile_pattern2(pattern, search_type)
|
compile_pattern2(pattern, search_type, comp_pattern)
|
||||||
char *pattern;
|
char *pattern;
|
||||||
int search_type;
|
int search_type;
|
||||||
|
void **comp_pattern;
|
||||||
{
|
{
|
||||||
if ((search_type & SRCH_NO_REGEX) == 0)
|
if ((search_type & SRCH_NO_REGEX) == 0)
|
||||||
{
|
{
|
||||||
#if HAVE_POSIX_REGCOMP
|
#if HAVE_POSIX_REGCOMP
|
||||||
regex_t *s = (regex_t *) ecalloc(1, sizeof(regex_t));
|
regex_t *comp = (regex_t *) ecalloc(1, sizeof(regex_t));
|
||||||
if (regcomp(s, pattern, REGCOMP_FLAG))
|
regex_t **pcomp = (regex_t **) comp_pattern;
|
||||||
|
if (regcomp(comp, pattern, REGCOMP_FLAG))
|
||||||
{
|
{
|
||||||
free(s);
|
free(comp);
|
||||||
error("Invalid pattern", NULL_PARG);
|
error("Invalid pattern", NULL_PARG);
|
||||||
return (-1);
|
return (-1);
|
||||||
}
|
}
|
||||||
if (regpattern != NULL)
|
if (*pcomp != NULL)
|
||||||
regfree(regpattern);
|
regfree(*pcomp);
|
||||||
regpattern = s;
|
*pcomp = comp;
|
||||||
#endif
|
#endif
|
||||||
#if HAVE_PCRE
|
#if HAVE_PCRE
|
||||||
pcre *comp;
|
pcre *comp;
|
||||||
|
pcre **pcomp = (pcre **) comp_pattern;
|
||||||
const char *errstring;
|
const char *errstring;
|
||||||
int erroffset;
|
int erroffset;
|
||||||
PARG parg;
|
PARG parg;
|
||||||
@ -415,31 +424,34 @@ compile_pattern2(pattern, search_type)
|
|||||||
error("%s", &parg);
|
error("%s", &parg);
|
||||||
return (-1);
|
return (-1);
|
||||||
}
|
}
|
||||||
regpattern = comp;
|
*pcomp = comp;
|
||||||
#endif
|
#endif
|
||||||
#if HAVE_RE_COMP
|
#if HAVE_RE_COMP
|
||||||
PARG parg;
|
PARG parg;
|
||||||
|
int *pcomp = (int *) comp_pattern;
|
||||||
if ((parg.p_string = re_comp(pattern)) != NULL)
|
if ((parg.p_string = re_comp(pattern)) != NULL)
|
||||||
{
|
{
|
||||||
error("%s", &parg);
|
error("%s", &parg);
|
||||||
return (-1);
|
return (-1);
|
||||||
}
|
}
|
||||||
re_pattern = 1;
|
*pcomp = 1;
|
||||||
#endif
|
#endif
|
||||||
#if HAVE_REGCMP
|
#if HAVE_REGCMP
|
||||||
char *s;
|
char *comp;
|
||||||
if ((s = regcmp(pattern, 0)) == NULL)
|
char **pcomp = (char **) comp_pattern;
|
||||||
|
if ((comp = regcmp(pattern, 0)) == NULL)
|
||||||
{
|
{
|
||||||
error("Invalid pattern", NULL_PARG);
|
error("Invalid pattern", NULL_PARG);
|
||||||
return (-1);
|
return (-1);
|
||||||
}
|
}
|
||||||
if (cpattern != NULL)
|
if (pcomp != NULL)
|
||||||
free(cpattern);
|
free(*pcomp);
|
||||||
cpattern = s;
|
*pcomp = comp;
|
||||||
#endif
|
#endif
|
||||||
#if HAVE_V8_REGCOMP
|
#if HAVE_V8_REGCOMP
|
||||||
struct regexp *s;
|
struct regexp *comp;
|
||||||
if ((s = regcomp(pattern)) == NULL)
|
struct regexp **pcomp = (struct regexp **) comp_pattern;
|
||||||
|
if ((comp = regcomp(pattern)) == NULL)
|
||||||
{
|
{
|
||||||
/*
|
/*
|
||||||
* regcomp has already printed an error message
|
* regcomp has already printed an error message
|
||||||
@ -447,29 +459,35 @@ compile_pattern2(pattern, search_type)
|
|||||||
*/
|
*/
|
||||||
return (-1);
|
return (-1);
|
||||||
}
|
}
|
||||||
if (regpattern != NULL)
|
if (*pcomp != NULL)
|
||||||
free(regpattern);
|
free(*pcomp);
|
||||||
regpattern = s;
|
*pcomp = comp;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (comp_pattern == (void **) &search_pattern)
|
||||||
|
{
|
||||||
if (last_pattern != NULL)
|
if (last_pattern != NULL)
|
||||||
free(last_pattern);
|
free(last_pattern);
|
||||||
last_pattern = (char *) calloc(1, strlen(pattern)+1);
|
last_pattern = (char *) calloc(1, strlen(pattern)+1);
|
||||||
if (last_pattern != NULL)
|
if (last_pattern != NULL)
|
||||||
strcpy(last_pattern, pattern);
|
strcpy(last_pattern, pattern);
|
||||||
|
|
||||||
last_search_type = search_type;
|
last_search_type = search_type;
|
||||||
|
} else
|
||||||
|
{
|
||||||
|
last_filter_type = search_type;
|
||||||
|
}
|
||||||
return (0);
|
return (0);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Like compile_pattern, but convert the pattern to lowercase if necessary.
|
* Like compile_pattern2, but convert the pattern to lowercase if necessary.
|
||||||
*/
|
*/
|
||||||
static int
|
static int
|
||||||
compile_pattern(pattern, search_type)
|
compile_pattern(pattern, search_type, comp_pattern)
|
||||||
char *pattern;
|
char *pattern;
|
||||||
int search_type;
|
int search_type;
|
||||||
|
void **comp_pattern;
|
||||||
{
|
{
|
||||||
char *cvt_pattern;
|
char *cvt_pattern;
|
||||||
int result;
|
int result;
|
||||||
@ -481,7 +499,7 @@ compile_pattern(pattern, search_type)
|
|||||||
cvt_pattern = (char*) ecalloc(1, cvt_length(strlen(pattern), CVT_TO_LC));
|
cvt_pattern = (char*) ecalloc(1, cvt_length(strlen(pattern), CVT_TO_LC));
|
||||||
cvt_text(cvt_pattern, pattern, (int *)NULL, CVT_TO_LC);
|
cvt_text(cvt_pattern, pattern, (int *)NULL, CVT_TO_LC);
|
||||||
}
|
}
|
||||||
result = compile_pattern2(cvt_pattern, search_type);
|
result = compile_pattern2(cvt_pattern, search_type, comp_pattern);
|
||||||
if (cvt_pattern != pattern)
|
if (cvt_pattern != pattern)
|
||||||
free(cvt_pattern);
|
free(cvt_pattern);
|
||||||
return (result);
|
return (result);
|
||||||
@ -491,58 +509,117 @@ compile_pattern(pattern, search_type)
|
|||||||
* Forget that we have a compiled pattern.
|
* Forget that we have a compiled pattern.
|
||||||
*/
|
*/
|
||||||
static void
|
static void
|
||||||
uncompile_pattern()
|
uncompile_pattern(pattern)
|
||||||
|
void **pattern;
|
||||||
{
|
{
|
||||||
#if HAVE_POSIX_REGCOMP
|
#if HAVE_POSIX_REGCOMP
|
||||||
if (regpattern != NULL)
|
regex_t **pcomp = (regex_t **) pattern;
|
||||||
regfree(regpattern);
|
if (*pcomp != NULL)
|
||||||
regpattern = NULL;
|
regfree(*pcomp);
|
||||||
|
*pcomp = NULL;
|
||||||
#endif
|
#endif
|
||||||
#if HAVE_PCRE
|
#if HAVE_PCRE
|
||||||
if (regpattern != NULL)
|
pcre **pcomp = (pcre **) pattern;
|
||||||
pcre_free(regpattern);
|
if (*pcomp != NULL)
|
||||||
regpattern = NULL;
|
pcre_free(*pcomp);
|
||||||
|
*pcomp = NULL;
|
||||||
#endif
|
#endif
|
||||||
#if HAVE_RE_COMP
|
#if HAVE_RE_COMP
|
||||||
re_pattern = 0;
|
int *pcomp = (int *) pattern;
|
||||||
|
*pcomp = 0;
|
||||||
#endif
|
#endif
|
||||||
#if HAVE_REGCMP
|
#if HAVE_REGCMP
|
||||||
if (cpattern != NULL)
|
char **pcomp = (char **) pattern;
|
||||||
free(cpattern);
|
if (*pcomp != NULL)
|
||||||
cpattern = NULL;
|
free(*pcomp);
|
||||||
|
*pcomp = NULL;
|
||||||
#endif
|
#endif
|
||||||
#if HAVE_V8_REGCOMP
|
#if HAVE_V8_REGCOMP
|
||||||
if (regpattern != NULL)
|
struct regexp **pcomp = (struct regexp **) pattern;
|
||||||
free(regpattern);
|
if (*pcomp != NULL)
|
||||||
regpattern = NULL;
|
free(*pcomp);
|
||||||
|
*pcomp = NULL;
|
||||||
#endif
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
uncompile_search_pattern()
|
||||||
|
{
|
||||||
|
uncompile_pattern(&search_pattern);
|
||||||
last_pattern = NULL;
|
last_pattern = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
uncompile_filter_pattern()
|
||||||
|
{
|
||||||
|
uncompile_pattern(&filter_pattern);
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Is a compiled pattern null?
|
||||||
|
*/
|
||||||
|
static int
|
||||||
|
is_null_pattern(pattern)
|
||||||
|
void *pattern;
|
||||||
|
{
|
||||||
|
#if HAVE_POSIX_REGCOMP
|
||||||
|
return (pattern == NULL);
|
||||||
|
#endif
|
||||||
|
#if HAVE_PCRE
|
||||||
|
return (pattern == NULL);
|
||||||
|
#endif
|
||||||
|
#if HAVE_RE_COMP
|
||||||
|
return (pattern == 0);
|
||||||
|
#endif
|
||||||
|
#if HAVE_REGCMP
|
||||||
|
return (pattern == NULL);
|
||||||
|
#endif
|
||||||
|
#if HAVE_V8_REGCOMP
|
||||||
|
return (pattern == NULL);
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Perform a pattern match with the previously compiled pattern.
|
* Perform a pattern match with the previously compiled pattern.
|
||||||
* Set sp and ep to the start and end of the matched string.
|
* Set sp and ep to the start and end of the matched string.
|
||||||
*/
|
*/
|
||||||
static int
|
static int
|
||||||
match_pattern(line, line_len, sp, ep, notbol)
|
match_pattern(pattern, line, line_len, sp, ep, notbol, search_type)
|
||||||
|
void *pattern;
|
||||||
char *line;
|
char *line;
|
||||||
int line_len;
|
int line_len;
|
||||||
char **sp;
|
char **sp;
|
||||||
char **ep;
|
char **ep;
|
||||||
int notbol;
|
int notbol;
|
||||||
|
int search_type;
|
||||||
{
|
{
|
||||||
int matched;
|
int matched;
|
||||||
|
#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
|
||||||
|
|
||||||
if (last_search_type & SRCH_NO_REGEX)
|
if (search_type & SRCH_NO_REGEX)
|
||||||
return (match(last_pattern, strlen(last_pattern), line, line_len, sp, ep));
|
return (match(last_pattern, strlen(last_pattern), line, line_len, sp, ep));
|
||||||
|
|
||||||
#if HAVE_POSIX_REGCOMP
|
#if HAVE_POSIX_REGCOMP
|
||||||
{
|
{
|
||||||
regmatch_t rm;
|
regmatch_t rm;
|
||||||
int flags = (notbol) ? REG_NOTBOL : 0;
|
int flags = (notbol) ? REG_NOTBOL : 0;
|
||||||
matched = !regexec(regpattern, line, 1, &rm, flags);
|
matched = !regexec(spattern, line, 1, &rm, flags);
|
||||||
if (!matched)
|
if (matched)
|
||||||
return (0);
|
{
|
||||||
#ifndef __WATCOMC__
|
#ifndef __WATCOMC__
|
||||||
*sp = line + rm.rm_so;
|
*sp = line + rm.rm_so;
|
||||||
*ep = line + rm.rm_eo;
|
*ep = line + rm.rm_eo;
|
||||||
@ -551,18 +628,20 @@ match_pattern(line, line_len, sp, ep, notbol)
|
|||||||
*ep = rm.rm_ep;
|
*ep = rm.rm_ep;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
#if HAVE_PCRE
|
#if HAVE_PCRE
|
||||||
{
|
{
|
||||||
int flags = (notbol) ? PCRE_NOTBOL : 0;
|
int flags = (notbol) ? PCRE_NOTBOL : 0;
|
||||||
int ovector[3];
|
int ovector[3];
|
||||||
matched = pcre_exec(regpattern, NULL, line, line_len,
|
matched = pcre_exec(spattern, NULL, line, line_len,
|
||||||
0, flags, ovector, 3) >= 0;
|
0, flags, ovector, 3) >= 0;
|
||||||
if (!matched)
|
if (matched)
|
||||||
return (0);
|
{
|
||||||
*sp = line + ovector[0];
|
*sp = line + ovector[0];
|
||||||
*ep = line + ovector[1];
|
*ep = line + ovector[1];
|
||||||
}
|
}
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
#if HAVE_RE_COMP
|
#if HAVE_RE_COMP
|
||||||
matched = (re_exec(line) == 1);
|
matched = (re_exec(line) == 1);
|
||||||
@ -572,26 +651,28 @@ match_pattern(line, line_len, sp, ep, notbol)
|
|||||||
*sp = *ep = NULL;
|
*sp = *ep = NULL;
|
||||||
#endif
|
#endif
|
||||||
#if HAVE_REGCMP
|
#if HAVE_REGCMP
|
||||||
*ep = regex(cpattern, line);
|
*ep = regex(spattern, line);
|
||||||
matched = (*ep != NULL);
|
matched = (*ep != NULL);
|
||||||
if (!matched)
|
if (matched)
|
||||||
return (0);
|
|
||||||
*sp = __loc1;
|
*sp = __loc1;
|
||||||
#endif
|
#endif
|
||||||
#if HAVE_V8_REGCOMP
|
#if HAVE_V8_REGCOMP
|
||||||
#if HAVE_REGEXEC2
|
#if HAVE_REGEXEC2
|
||||||
matched = regexec2(regpattern, line, notbol);
|
matched = regexec2(spattern, line, notbol);
|
||||||
#else
|
#else
|
||||||
matched = regexec(regpattern, line);
|
matched = regexec(spattern, line);
|
||||||
#endif
|
#endif
|
||||||
if (!matched)
|
if (matched)
|
||||||
return (0);
|
{
|
||||||
*sp = regpattern->startp[0];
|
*sp = spattern->startp[0];
|
||||||
*ep = regpattern->endp[0];
|
*ep = spattern->endp[0];
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
#if NO_REGEX
|
#if NO_REGEX
|
||||||
matched = match(last_pattern, strlen(last_pattern), line, line_len, sp, ep);
|
matched = match(last_pattern, strlen(last_pattern), line, line_len, sp, ep);
|
||||||
#endif
|
#endif
|
||||||
|
matched = (!(search_type & SRCH_NO_MATCH) && matched) ||
|
||||||
|
((search_type & SRCH_NO_MATCH) && !matched);
|
||||||
return (matched);
|
return (matched);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -600,20 +681,33 @@ match_pattern(line, line_len, sp, ep, notbol)
|
|||||||
* Clear the hilite list.
|
* Clear the hilite list.
|
||||||
*/
|
*/
|
||||||
public void
|
public void
|
||||||
clr_hilite()
|
clr_hlist(anchor)
|
||||||
|
struct hilite *anchor;
|
||||||
{
|
{
|
||||||
struct hilite *hl;
|
struct hilite *hl;
|
||||||
struct hilite *nexthl;
|
struct hilite *nexthl;
|
||||||
|
|
||||||
for (hl = hilite_anchor.hl_first; hl != NULL; hl = nexthl)
|
for (hl = anchor->hl_first; hl != NULL; hl = nexthl)
|
||||||
{
|
{
|
||||||
nexthl = hl->hl_next;
|
nexthl = hl->hl_next;
|
||||||
free((void*)hl);
|
free((void*)hl);
|
||||||
}
|
}
|
||||||
hilite_anchor.hl_first = NULL;
|
anchor->hl_first = NULL;
|
||||||
prep_startpos = prep_endpos = NULL_POSITION;
|
prep_startpos = prep_endpos = NULL_POSITION;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void
|
||||||
|
clr_hilite()
|
||||||
|
{
|
||||||
|
clr_hlist(&hilite_anchor);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void
|
||||||
|
clr_filter()
|
||||||
|
{
|
||||||
|
clr_hlist(&filter_anchor);
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Should any characters in a specified range be highlighted?
|
* Should any characters in a specified range be highlighted?
|
||||||
*/
|
*/
|
||||||
@ -636,6 +730,30 @@ is_hilited_range(pos, epos)
|
|||||||
return (0);
|
return (0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Is a line "filtered" -- that is, should it be hidden?
|
||||||
|
*/
|
||||||
|
public int
|
||||||
|
is_filtered(pos)
|
||||||
|
POSITION pos;
|
||||||
|
{
|
||||||
|
struct hilite *hl;
|
||||||
|
|
||||||
|
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)
|
||||||
|
{
|
||||||
|
if (hl->hl_startpos == pos)
|
||||||
|
return (1);
|
||||||
|
}
|
||||||
|
return (0);
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Should any characters in a specified range be highlighted?
|
* Should any characters in a specified range be highlighted?
|
||||||
* If nohide is nonzero, don't consider hide_hilite.
|
* If nohide is nonzero, don't consider hide_hilite.
|
||||||
@ -743,6 +861,8 @@ adj_hilite(anchor, linepos, cvt_ops)
|
|||||||
int checkstart;
|
int checkstart;
|
||||||
POSITION opos;
|
POSITION opos;
|
||||||
POSITION npos;
|
POSITION npos;
|
||||||
|
POSITION hl_opos;
|
||||||
|
POSITION hl_npos;
|
||||||
LWCHAR ch;
|
LWCHAR ch;
|
||||||
int ncwidth;
|
int ncwidth;
|
||||||
|
|
||||||
@ -757,8 +877,12 @@ adj_hilite(anchor, linepos, cvt_ops)
|
|||||||
line_end = line + line_len;
|
line_end = line + line_len;
|
||||||
opos = npos = linepos;
|
opos = npos = linepos;
|
||||||
hl = anchor->hl_first;
|
hl = anchor->hl_first;
|
||||||
|
if (hl == NULL)
|
||||||
|
return;
|
||||||
|
hl_opos = hl_npos = hl->hl_startpos;
|
||||||
checkstart = TRUE;
|
checkstart = TRUE;
|
||||||
while (hl != NULL)
|
|
||||||
|
while (hl != NULL && line < line_end)
|
||||||
{
|
{
|
||||||
/*
|
/*
|
||||||
* See if we need to adjust the current hl_startpos or
|
* See if we need to adjust the current hl_startpos or
|
||||||
@ -767,22 +891,6 @@ adj_hilite(anchor, linepos, cvt_ops)
|
|||||||
* The hilite list must be sorted thus:
|
* The hilite list must be sorted thus:
|
||||||
* startpos[0] < endpos[0] <= startpos[1] < endpos[1] <= etc.
|
* startpos[0] < endpos[0] <= startpos[1] < endpos[1] <= etc.
|
||||||
*/
|
*/
|
||||||
if (checkstart && hl->hl_startpos == opos)
|
|
||||||
{
|
|
||||||
hl->hl_startpos = npos;
|
|
||||||
checkstart = FALSE;
|
|
||||||
continue; /* {{ not really necessary }} */
|
|
||||||
} else if (!checkstart && hl->hl_endpos == opos)
|
|
||||||
{
|
|
||||||
hl->hl_endpos = npos;
|
|
||||||
checkstart = TRUE;
|
|
||||||
hl = hl->hl_next;
|
|
||||||
continue; /* {{ necessary }} */
|
|
||||||
}
|
|
||||||
if (line == line_end)
|
|
||||||
break;
|
|
||||||
|
|
||||||
/* Get the next char from the line. */
|
|
||||||
oline = line;
|
oline = line;
|
||||||
ch = step_char(&line, +1, line_end);
|
ch = step_char(&line, +1, line_end);
|
||||||
ncwidth = line - oline;
|
ncwidth = line - oline;
|
||||||
@ -808,10 +916,12 @@ adj_hilite(anchor, linepos, cvt_ops)
|
|||||||
} else if ((cvt_ops & CVT_ANSI) && IS_CSI_START(ch))
|
} else if ((cvt_ops & CVT_ANSI) && IS_CSI_START(ch))
|
||||||
{
|
{
|
||||||
/* Skip to end of ANSI escape sequence. */
|
/* Skip to end of ANSI escape sequence. */
|
||||||
|
line++; /* skip the CSI start char */
|
||||||
|
npos++;
|
||||||
while (line < line_end)
|
while (line < line_end)
|
||||||
{
|
{
|
||||||
npos++;
|
npos++;
|
||||||
if (!is_ansi_middle(*++line))
|
if (!is_ansi_middle(*line++))
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
} else
|
} else
|
||||||
@ -819,6 +929,32 @@ adj_hilite(anchor, linepos, cvt_ops)
|
|||||||
/* Ordinary unprocessed character. */
|
/* Ordinary unprocessed character. */
|
||||||
opos += ncwidth;
|
opos += ncwidth;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (opos == hl_opos) {
|
||||||
|
/* Adjust highlight position. */
|
||||||
|
hl_npos = npos;
|
||||||
|
}
|
||||||
|
if (opos > hl_opos)
|
||||||
|
{
|
||||||
|
/*
|
||||||
|
* We've moved past the highlight position; store the
|
||||||
|
* adjusted highlight position and move to the next highlight.
|
||||||
|
*/
|
||||||
|
if (checkstart)
|
||||||
|
{
|
||||||
|
hl->hl_startpos = hl_npos;
|
||||||
|
hl_opos = hl->hl_endpos;
|
||||||
|
checkstart = FALSE;
|
||||||
|
} else
|
||||||
|
{
|
||||||
|
hl->hl_endpos = hl_npos;
|
||||||
|
hl = hl->hl_next;
|
||||||
|
if (hl != NULL)
|
||||||
|
hl_opos = hl->hl_startpos;
|
||||||
|
checkstart = TRUE;
|
||||||
|
}
|
||||||
|
hl_npos = npos;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -882,7 +1018,7 @@ hilite_line(linepos, line, line_len, sp, ep, cvt_ops)
|
|||||||
searchp++;
|
searchp++;
|
||||||
else /* end of line */
|
else /* end of line */
|
||||||
break;
|
break;
|
||||||
} while (match_pattern(searchp, line_end - searchp, &sp, &ep, 1));
|
} while (match_pattern(search_pattern, searchp, line_end - searchp, &sp, &ep, 1, last_search_type));
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* If there were backspaces in the original line, they
|
* If there were backspaces in the original line, they
|
||||||
@ -920,7 +1056,7 @@ chg_caseless()
|
|||||||
* Pattern did have uppercase.
|
* Pattern did have uppercase.
|
||||||
* Discard the pattern; we can't change search caselessness now.
|
* Discard the pattern; we can't change search caselessness now.
|
||||||
*/
|
*/
|
||||||
uncompile_pattern();
|
uncompile_search_pattern();
|
||||||
}
|
}
|
||||||
|
|
||||||
#if HILITE_SEARCH
|
#if HILITE_SEARCH
|
||||||
@ -1128,6 +1264,9 @@ search_range(pos, endpos, search_type, matches, maxlines, plinepos, pendpos)
|
|||||||
add_lnum(linenum, pos);
|
add_lnum(linenum, pos);
|
||||||
oldpos = pos;
|
oldpos = pos;
|
||||||
|
|
||||||
|
if (is_filtered(linepos))
|
||||||
|
continue;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* If it's a caseless search, convert the line to lowercase.
|
* If it's a caseless search, convert the line to lowercase.
|
||||||
* If we're doing backspace processing, delete backspaces.
|
* If we're doing backspace processing, delete backspaces.
|
||||||
@ -1136,19 +1275,38 @@ search_range(pos, endpos, search_type, matches, maxlines, plinepos, pendpos)
|
|||||||
cline = calloc(1, cvt_length(line_len, cvt_ops));
|
cline = calloc(1, cvt_length(line_len, cvt_ops));
|
||||||
cvt_text(cline, line, &line_len, cvt_ops);
|
cvt_text(cline, line, &line_len, cvt_ops);
|
||||||
|
|
||||||
|
#if HILITE_SEARCH
|
||||||
|
/*
|
||||||
|
* 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) &&
|
||||||
|
!is_null_pattern(filter_pattern))
|
||||||
|
{
|
||||||
|
int line_filter = match_pattern(filter_pattern,
|
||||||
|
cline, line_len, &sp, &ep, 0, last_filter_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);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Test the next line to see if we have a match.
|
* Test the next line to see if we have a match.
|
||||||
* We are successful if we either want a match and got one,
|
* We are successful if we either want a match and got one,
|
||||||
* or if we want a non-match and got one.
|
* or if we want a non-match and got one.
|
||||||
*/
|
*/
|
||||||
line_match = match_pattern(cline, line_len, &sp, &ep, 0);
|
if (!is_null_pattern(search_pattern))
|
||||||
line_match = (!(search_type & SRCH_NO_MATCH) && line_match) ||
|
{
|
||||||
((search_type & SRCH_NO_MATCH) && !line_match);
|
line_match = match_pattern(search_pattern,
|
||||||
if (!line_match)
|
cline, line_len, &sp, &ep, 0, search_type);
|
||||||
|
if (line_match)
|
||||||
{
|
{
|
||||||
free(cline);
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
/*
|
/*
|
||||||
* Got a match.
|
* Got a match.
|
||||||
*/
|
*/
|
||||||
@ -1160,10 +1318,8 @@ search_range(pos, endpos, search_type, matches, maxlines, plinepos, pendpos)
|
|||||||
* Just add the matches in this line to the
|
* Just add the matches in this line to the
|
||||||
* hilite list and keep searching.
|
* hilite list and keep searching.
|
||||||
*/
|
*/
|
||||||
if (line_match)
|
|
||||||
hilite_line(linepos, cline, line_len, sp, ep, cvt_ops);
|
hilite_line(linepos, cline, line_len, sp, ep, cvt_ops);
|
||||||
#endif
|
#endif
|
||||||
free(cline);
|
|
||||||
} else if (--matches <= 0)
|
} else if (--matches <= 0)
|
||||||
{
|
{
|
||||||
/*
|
/*
|
||||||
@ -1178,7 +1334,6 @@ search_range(pos, endpos, search_type, matches, maxlines, plinepos, pendpos)
|
|||||||
* the matches in this one line.
|
* the matches in this one line.
|
||||||
*/
|
*/
|
||||||
clr_hilite();
|
clr_hilite();
|
||||||
if (line_match)
|
|
||||||
hilite_line(linepos, cline, line_len, sp, ep, cvt_ops);
|
hilite_line(linepos, cline, line_len, sp, ep, cvt_ops);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
@ -1188,9 +1343,12 @@ search_range(pos, endpos, search_type, matches, maxlines, plinepos, pendpos)
|
|||||||
return (0);
|
return (0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
free(cline);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* search for a pattern in history. If found, compile that pattern.
|
* search for a pattern in history. If found, compile that pattern.
|
||||||
*/
|
*/
|
||||||
static int
|
static int
|
||||||
@ -1205,7 +1363,7 @@ hist_pattern(search_type)
|
|||||||
if (pattern == NULL)
|
if (pattern == NULL)
|
||||||
return (0);
|
return (0);
|
||||||
|
|
||||||
if (compile_pattern(pattern, search_type) < 0)
|
if (compile_pattern(pattern, search_type, &search_pattern) < 0)
|
||||||
return (0);
|
return (0);
|
||||||
|
|
||||||
is_ucase_pattern = is_ucase(pattern);
|
is_ucase_pattern = is_ucase(pattern);
|
||||||
@ -1241,7 +1399,6 @@ search(search_type, pattern, n)
|
|||||||
int n;
|
int n;
|
||||||
{
|
{
|
||||||
POSITION pos;
|
POSITION pos;
|
||||||
int result;
|
|
||||||
|
|
||||||
if (pattern == NULL || *pattern == '\0')
|
if (pattern == NULL || *pattern == '\0')
|
||||||
{
|
{
|
||||||
@ -1284,7 +1441,7 @@ search(search_type, pattern, n)
|
|||||||
/*
|
/*
|
||||||
* Compile the pattern.
|
* Compile the pattern.
|
||||||
*/
|
*/
|
||||||
if (compile_pattern(pattern, search_type) < 0)
|
if (compile_pattern(pattern, search_type, &search_pattern) < 0)
|
||||||
return (-1);
|
return (-1);
|
||||||
/*
|
/*
|
||||||
* Ignore case if -I is set OR
|
* Ignore case if -I is set OR
|
||||||
@ -1398,7 +1555,7 @@ prep_hilite(spos, epos, maxlines)
|
|||||||
*/
|
*/
|
||||||
#define SEARCH_MORE (3*size_linebuf)
|
#define SEARCH_MORE (3*size_linebuf)
|
||||||
|
|
||||||
if (!prev_pattern())
|
if (!prev_pattern() && !is_filtering())
|
||||||
return;
|
return;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@ -1429,6 +1586,7 @@ prep_hilite(spos, epos, maxlines)
|
|||||||
* Discard the old prep region and start a new one.
|
* Discard the old prep region and start a new one.
|
||||||
*/
|
*/
|
||||||
clr_hilite();
|
clr_hilite();
|
||||||
|
clr_filter();
|
||||||
if (epos != NULL_POSITION)
|
if (epos != NULL_POSITION)
|
||||||
epos += SEARCH_MORE;
|
epos += SEARCH_MORE;
|
||||||
nprep_startpos = spos;
|
nprep_startpos = spos;
|
||||||
@ -1500,6 +1658,33 @@ prep_hilite(spos, epos, maxlines)
|
|||||||
prep_startpos = nprep_startpos;
|
prep_startpos = nprep_startpos;
|
||||||
prep_endpos = nprep_endpos;
|
prep_endpos = nprep_endpos;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Set the pattern to be used for line filtering.
|
||||||
|
*/
|
||||||
|
public void
|
||||||
|
set_filter_pattern(pattern, search_type)
|
||||||
|
char *pattern;
|
||||||
|
int search_type;
|
||||||
|
{
|
||||||
|
clr_filter();
|
||||||
|
if (pattern == NULL || *pattern == '\0')
|
||||||
|
uncompile_filter_pattern();
|
||||||
|
else
|
||||||
|
compile_pattern(pattern, search_type, &filter_pattern);
|
||||||
|
screen_trashed = 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Is there a line filter in effect?
|
||||||
|
*/
|
||||||
|
public int
|
||||||
|
is_filtering()
|
||||||
|
{
|
||||||
|
if (ch_getflags() & CH_HELPFILE)
|
||||||
|
return (0);
|
||||||
|
return !is_null_pattern(filter_pattern);
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (C) 1984-2007 Mark Nudelman
|
* Copyright (C) 1984-2008 Mark Nudelman
|
||||||
*
|
*
|
||||||
* You may distribute under the terms of either the GNU General Public
|
* You may distribute under the terms of either the GNU General Public
|
||||||
* License or the Less License, as specified in the README file.
|
* License or the Less License, as specified in the README file.
|
||||||
@ -46,6 +46,7 @@ extern long jump_sline_fraction;
|
|||||||
u_interrupt(type)
|
u_interrupt(type)
|
||||||
int type;
|
int type;
|
||||||
{
|
{
|
||||||
|
bell();
|
||||||
#if OS2
|
#if OS2
|
||||||
LSIGNAL(SIGINT, SIG_ACK);
|
LSIGNAL(SIGINT, SIG_ACK);
|
||||||
#endif
|
#endif
|
||||||
@ -63,7 +64,7 @@ u_interrupt(type)
|
|||||||
if (less_is_more)
|
if (less_is_more)
|
||||||
quit(0);
|
quit(0);
|
||||||
if (reading)
|
if (reading)
|
||||||
intread();
|
intread(); /* May longjmp */
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef SIGTSTP
|
#ifdef SIGTSTP
|
||||||
@ -255,24 +256,5 @@ psignals()
|
|||||||
{
|
{
|
||||||
if (quit_on_intr)
|
if (quit_on_intr)
|
||||||
quit(QUIT_OK);
|
quit(QUIT_OK);
|
||||||
bell();
|
|
||||||
/*
|
|
||||||
* {{ You may wish to replace the bell() with
|
|
||||||
* error("Interrupt", NULL_PARG); }}
|
|
||||||
*/
|
|
||||||
|
|
||||||
/*
|
|
||||||
* If we were interrupted while in the "calculating
|
|
||||||
* line numbers" loop, turn off line numbers.
|
|
||||||
*/
|
|
||||||
if (lnloop)
|
|
||||||
{
|
|
||||||
lnloop = 0;
|
|
||||||
if (linenums == 2)
|
|
||||||
screen_trashed = 1;
|
|
||||||
linenums = 0;
|
|
||||||
error("Line numbers turned off", NULL_PARG);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (C) 1984-2007 Mark Nudelman
|
* Copyright (C) 1984-2008 Mark Nudelman
|
||||||
*
|
*
|
||||||
* You may distribute under the terms of either the GNU General Public
|
* You may distribute under the terms of either the GNU General Public
|
||||||
* License or the Less License, as specified in the README file.
|
* License or the Less License, as specified in the README file.
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (C) 1984-2007 Mark Nudelman
|
* Copyright (C) 1984-2008 Mark Nudelman
|
||||||
*
|
*
|
||||||
* You may distribute under the terms of either the GNU General Public
|
* You may distribute under the terms of either the GNU General Public
|
||||||
* License or the Less License, as specified in the README file.
|
* License or the Less License, as specified in the README file.
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (C) 1984-2007 Mark Nudelman
|
* Copyright (C) 1984-2008 Mark Nudelman
|
||||||
*
|
*
|
||||||
* You may distribute under the terms of either the GNU General Public
|
* You may distribute under the terms of either the GNU General Public
|
||||||
* License or the Less License, as specified in the README file.
|
* License or the Less License, as specified in the README file.
|
||||||
@ -702,6 +702,24 @@ v413 11/6/07 Fix search highlight bug with non-ASCII text.
|
|||||||
v414 11/6/07 Fix display bug with no-wrap terminals.
|
v414 11/6/07 Fix display bug with no-wrap terminals.
|
||||||
v415 11/14/07 Add --follow-name option.
|
v415 11/14/07 Add --follow-name option.
|
||||||
v416 11/22/07 Fix crash when searching text with invalid UTF-8 sequences.
|
v416 11/22/07 Fix crash when searching text with invalid UTF-8 sequences.
|
||||||
|
v417 12/31/07 Don't support single-char CSI in UTF-8 mode;
|
||||||
|
fix bug with -R and invalid CSI sequences;
|
||||||
|
fix bug searching text with SGR sequences with -r;
|
||||||
|
emulate SGR sequences in WIN32 build.
|
||||||
|
v418 12/31/07 Clean up.
|
||||||
|
-----------------------------------------------------------------
|
||||||
|
v419 1/16/08 Make CSI char 0x9B work in UTF-8 mode (thanks to Colin Watson).
|
||||||
|
v420 2/24/08 Add & command; fix -F option; fix '' after G.
|
||||||
|
v421 2/24/08 Ignore filtered lines when searching.
|
||||||
|
v422 3/2/08 Output CR at startup.
|
||||||
|
v423 5/27/08 Clean up.
|
||||||
|
v424 6/16/08 Fix compile bug with pcre; don't filter help file.
|
||||||
|
v425 7/14/08 Fix non-ANSI code in list handling in ch.c.
|
||||||
|
v426 10/27/08 Fix ignaw terminal handling (thanks to Per Hedeland);
|
||||||
|
fix binary file detection in UTF-8 mode.
|
||||||
|
v427 3/16/09 A few Win32 fixes (thanks to Jason Hood).
|
||||||
|
v428 3/30/09 Add "|-" syntax to LESSOPEN.
|
||||||
|
v429 4/10/09 Fix search highlighting bug with underlined text.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
char version[] = "416";
|
char version[] = "429";
|
||||||
|
Loading…
Reference in New Issue
Block a user