diff --git a/src/apps/bin/less-381/COPYING b/src/apps/bin/less-381/COPYING new file mode 100644 index 0000000000..d104746444 --- /dev/null +++ b/src/apps/bin/less-381/COPYING @@ -0,0 +1,340 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +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 +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + 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 +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +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 +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 +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 +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 +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + 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 + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + 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 +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +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 + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + 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 + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +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 +signed it. However, nothing else grants you permission to modify or +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 +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +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 +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +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 +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 +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this 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 +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +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 + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE 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. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + 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. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +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. diff --git a/src/apps/bin/less-381/Jamfile b/src/apps/bin/less-381/Jamfile index 7fcde8d357..597f1ce2f7 100644 --- a/src/apps/bin/less-381/Jamfile +++ b/src/apps/bin/less-381/Jamfile @@ -1,14 +1,20 @@ SubDir OBOS_TOP src apps bin less-381 ; -SubDirCcFlags -DSYSDIR=\'\"/etc\"\' ; +# filter warnings we don't want here +local originalCCFlags = $(CCFLAGS) ; +CCFLAGS = [ Filter $(CCFLAGS) : -Wall -Wmissing-prototypes ] ; + +SubDirCcFlags -DBINDIR='\"/bin\"' -DSYSDIR='\"/etc\"' ; BinCommand less : main.c screen.c brac.c ch.c charset.c cmdbuf.c command.c decode.c edit.c filename.c forwback.c help.c ifile.c input.c jump.c line.c linenum.c lsystem.c mark.c optfunc.c option.c opttbl.c os.c output.c position.c prompt.c search.c signal.c tags.c ttyin.c version.c : - libtermcap.so ; + libtermcap.a : less.rdef ; -BinCommand lesskey : lesskey.c version.c : ; +BinCommand lesskey : lesskey.c version.c : : less.rdef ; -BinCommand lessecho : lessecho.c version.c : ; +BinCommand lessecho : lessecho.c version.c : : less.rdef ; +# restore CCFLAGS +CCFLAGS = $(originalCCFlags) ; diff --git a/src/apps/bin/less-381/NEWS b/src/apps/bin/less-381/NEWS index b5f1514975..6019cad3b7 100644 --- a/src/apps/bin/less-381/NEWS +++ b/src/apps/bin/less-381/NEWS @@ -13,6 +13,13 @@ ====================================================================== + Major changes between "less" versions 381 and 382 + +* Removed some old copyrighted code. + This probably breaks OS/9 support. + +====================================================================== + Major changes between "less" versions 378 and 381 * New -L option to disable LESSOPEN processing. diff --git a/src/apps/bin/less-381/README b/src/apps/bin/less-381/README index a2b9ca17b1..cf7806f9a2 100644 --- a/src/apps/bin/less-381/README +++ b/src/apps/bin/less-381/README @@ -1,7 +1,7 @@ - Less, version 381 + Less, version 382 - This is the distribution of less, version 381, released 17 Jan 2003. + This is the distribution of less, version 382, released 03 Feb 2004. This program is part of the GNU project (http://www.gnu.org). This program is free software. You may redistribute it and/or diff --git a/src/apps/bin/less-381/less.man b/src/apps/bin/less-381/less.man index 5455849f2b..92d83f486a 100644 --- a/src/apps/bin/less-381/less.man +++ b/src/apps/bin/less-381/less.man @@ -61,7 +61,7 @@ CCOOMMMMAANNDDSS - Version 381: 17 Jan 2003 1 + Version 382: 03 Feb 2004 1 @@ -127,7 +127,7 @@ LESS(1) LESS(1) - Version 381: 17 Jan 2003 2 + Version 382: 03 Feb 2004 2 @@ -193,7 +193,7 @@ LESS(1) LESS(1) - Version 381: 17 Jan 2003 3 + Version 382: 03 Feb 2004 3 @@ -259,7 +259,7 @@ LESS(1) LESS(1) - Version 381: 17 Jan 2003 4 + Version 382: 03 Feb 2004 4 @@ -325,7 +325,7 @@ LESS(1) LESS(1) - Version 381: 17 Jan 2003 5 + Version 382: 03 Feb 2004 5 @@ -391,7 +391,7 @@ LESS(1) LESS(1) - Version 381: 17 Jan 2003 6 + Version 382: 03 Feb 2004 6 @@ -457,7 +457,7 @@ LESS(1) LESS(1) - Version 381: 17 Jan 2003 7 + Version 382: 03 Feb 2004 7 @@ -523,7 +523,7 @@ LESS(1) LESS(1) - Version 381: 17 Jan 2003 8 + Version 382: 03 Feb 2004 8 @@ -589,7 +589,7 @@ OOPPTTIIOONNSS - Version 381: 17 Jan 2003 9 + Version 382: 03 Feb 2004 9 @@ -655,7 +655,7 @@ LESS(1) LESS(1) - Version 381: 17 Jan 2003 10 + Version 382: 03 Feb 2004 10 @@ -721,7 +721,7 @@ LESS(1) LESS(1) - Version 381: 17 Jan 2003 11 + Version 382: 03 Feb 2004 11 @@ -787,7 +787,7 @@ LESS(1) LESS(1) - Version 381: 17 Jan 2003 12 + Version 382: 03 Feb 2004 12 @@ -853,7 +853,7 @@ LESS(1) LESS(1) - Version 381: 17 Jan 2003 13 + Version 382: 03 Feb 2004 13 @@ -919,7 +919,7 @@ LESS(1) LESS(1) - Version 381: 17 Jan 2003 14 + Version 382: 03 Feb 2004 14 @@ -985,7 +985,7 @@ LESS(1) LESS(1) - Version 381: 17 Jan 2003 15 + Version 382: 03 Feb 2004 15 @@ -1051,7 +1051,7 @@ LESS(1) LESS(1) - Version 381: 17 Jan 2003 16 + Version 382: 03 Feb 2004 16 @@ -1117,7 +1117,7 @@ LLIINNEE EEDDIITTIINNGG - Version 381: 17 Jan 2003 17 + Version 382: 03 Feb 2004 17 @@ -1183,7 +1183,7 @@ LESS(1) LESS(1) - Version 381: 17 Jan 2003 18 + Version 382: 03 Feb 2004 18 @@ -1249,7 +1249,7 @@ IINNPPUUTT PPRREEPPRROOCCEESSSSOORR - Version 381: 17 Jan 2003 19 + Version 382: 03 Feb 2004 19 @@ -1315,7 +1315,7 @@ LESS(1) LESS(1) - Version 381: 17 Jan 2003 20 + Version 382: 03 Feb 2004 20 @@ -1381,7 +1381,7 @@ NNAATTIIOONNAALL CCHHAARRAACCTTEERR SSEETTSS - Version 381: 17 Jan 2003 21 + Version 382: 03 Feb 2004 21 @@ -1447,7 +1447,7 @@ LESS(1) LESS(1) - Version 381: 17 Jan 2003 22 + Version 382: 03 Feb 2004 22 @@ -1513,7 +1513,7 @@ PPRROOMMPPTTSS - Version 381: 17 Jan 2003 23 + Version 382: 03 Feb 2004 23 @@ -1579,7 +1579,7 @@ LESS(1) LESS(1) - Version 381: 17 Jan 2003 24 + Version 382: 03 Feb 2004 24 @@ -1645,7 +1645,7 @@ LESS(1) LESS(1) - Version 381: 17 Jan 2003 25 + Version 382: 03 Feb 2004 25 @@ -1711,7 +1711,7 @@ LESS(1) LESS(1) - Version 381: 17 Jan 2003 26 + Version 382: 03 Feb 2004 26 @@ -1777,7 +1777,7 @@ EENNVVIIRROONNMMEENNTT VVAARRIIAABBLLEESS - Version 381: 17 Jan 2003 27 + Version 382: 03 Feb 2004 27 @@ -1843,7 +1843,7 @@ LESS(1) LESS(1) - Version 381: 17 Jan 2003 28 + Version 382: 03 Feb 2004 28 @@ -1909,7 +1909,7 @@ LESS(1) LESS(1) - Version 381: 17 Jan 2003 29 + Version 382: 03 Feb 2004 29 @@ -1975,7 +1975,7 @@ CCOOPPYYRRIIGGHHTT - Version 381: 17 Jan 2003 30 + Version 382: 03 Feb 2004 30 @@ -2041,6 +2041,6 @@ AAUUTTHHOORR - Version 381: 17 Jan 2003 31 + Version 382: 03 Feb 2004 31 diff --git a/src/apps/bin/less-381/less.nro b/src/apps/bin/less-381/less.nro index 34d0ad0ba3..940c59c23e 100644 --- a/src/apps/bin/less-381/less.nro +++ b/src/apps/bin/less-381/less.nro @@ -1,4 +1,4 @@ -.TH LESS 1 "Version 381: 17 Jan 2003" +.TH LESS 1 "Version 382: 03 Feb 2004" .SH NAME less \- opposite of more .SH SYNOPSIS diff --git a/src/apps/bin/less-381/less.rdef b/src/apps/bin/less-381/less.rdef new file mode 100644 index 0000000000..b684956785 --- /dev/null +++ b/src/apps/bin/less-381/less.rdef @@ -0,0 +1,11 @@ +resource app_version +{ + major = 3, + middle = 8, + minor = 2, + variety = 5, + internal = 0, + short_info = "382", + long_info = "382 ©2004 The Free Software Foundation" +}; + diff --git a/src/apps/bin/less-381/lessecho.c b/src/apps/bin/less-381/lessecho.c index 3568578045..0c766f073b 100644 --- a/src/apps/bin/less-381/lessecho.c +++ b/src/apps/bin/less-381/lessecho.c @@ -28,7 +28,7 @@ #include "less.h" -static char *version = "$Revision: 1.1 $"; +static char *version = "$Revision: 1.2 $"; static int quote_all = 0; static char openquote = '"'; diff --git a/src/apps/bin/less-381/lesskey.man b/src/apps/bin/less-381/lesskey.man index addefe9a79..9c5cf45f83 100644 --- a/src/apps/bin/less-381/lesskey.man +++ b/src/apps/bin/less-381/lesskey.man @@ -61,7 +61,7 @@ CCOOMMMMAANNDD SSEECCTTIIOONN - Version 381: 17 Jan 2003 1 + Version 382: 03 Feb 2004 1 @@ -127,7 +127,7 @@ LESSKEY(1) LESSKEY(1) - Version 381: 17 Jan 2003 2 + Version 382: 03 Feb 2004 2 @@ -193,7 +193,7 @@ EEXXAAMMPPLLEE - Version 381: 17 Jan 2003 3 + Version 382: 03 Feb 2004 3 @@ -259,7 +259,7 @@ LESSKEY(1) LESSKEY(1) - Version 381: 17 Jan 2003 4 + Version 382: 03 Feb 2004 4 @@ -325,7 +325,7 @@ EEXXAAMMPPLLEE - Version 381: 17 Jan 2003 5 + Version 382: 03 Feb 2004 5 @@ -391,7 +391,7 @@ EEXXAAMMPPLLEE - Version 381: 17 Jan 2003 6 + Version 382: 03 Feb 2004 6 @@ -457,6 +457,6 @@ AAUUTTHHOORR - Version 381: 17 Jan 2003 7 + Version 382: 03 Feb 2004 7 diff --git a/src/apps/bin/less-381/lesskey.nro b/src/apps/bin/less-381/lesskey.nro index 2529451463..da3f23fae6 100644 --- a/src/apps/bin/less-381/lesskey.nro +++ b/src/apps/bin/less-381/lesskey.nro @@ -1,4 +1,4 @@ -.TH LESSKEY 1 "Version 381: 17 Jan 2003" +.TH LESSKEY 1 "Version 382: 03 Feb 2004" .SH NAME lesskey \- specify key bindings for less .SH SYNOPSIS diff --git a/src/apps/bin/less-381/lsystem.c b/src/apps/bin/less-381/lsystem.c index eb82eece5a..c25c089449 100644 --- a/src/apps/bin/less-381/lsystem.c +++ b/src/apps/bin/less-381/lsystem.c @@ -367,143 +367,3 @@ pipe_data(cmd, spos, epos) } #endif - -#ifdef _OSK -/* - * Popen, and Pclose, for OS-9. - * - * Based on code copyright (c) 1988 by Wolfgang Ocker, Puchheim, - * Ulli Dessauer, Germering and - * Reimer Mellin, Muenchen - * (W-Germany) - * - * These functions can be copied and distributed freely for any - * non-commercial purposes. It can only be incorporated into - * commercial software with the written permission of the authors. - * - * TOP-specific code stripped out and adapted for less by M.Gregorie, 1996 - * - * address: Wolfgang Ocker - * Lochhauserstrasse 35a - * D-8039 Puchheim - * West Germany - * - * e-mail: weo@altger.UUCP, ud@altger.UUCP, ram@altger.UUCP - * pyramid!tmpmbx!recco!weo - * pyramid!tmpmbx!nitmar!ud - * pyramid!tmpmbx!ramsys!ram - * - * Martin Gregorie - * 10 Sadlers Mead - * Harlow - * Essex, CM18 6HG - * U.K. - * - * gregorie@logica.com - */ -#include -#include -extern char **environ; -extern char *getenv(); -extern int os9forkc(); -static int pids[_NFILE] = { 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0 }; -/* - * p o p e n - */ -FILE *popen(name, mode) - char *name; - char *mode; -{ - int fd, fd2, fdsav, pid; - static char *argv[] = {NULL, NULL, NULL }; - static char cmd[200]; - static char cmd_path[200]; - char *cp; - char *shell; - FILE *r; - if ((shell = getenv("SHELL")) == NULL) - return(NULL); - cp = name; - while (*cp == ' ') - cp++; - strcpy(cmd_path, cp); - if (cp = index(cmd_path, ' ')) - *cp++ = '\0'; - strcpy(cmd, "ex "); - strcat(cmd, cmd_path); - if (cp) - { - strcat(cmd, " "); - strcat(cmd, cp); - } - argv[0] = shell; - argv[1] = cmd; - /* - mode is "r" (stdout) or "w" (stdin) - */ - switch(mode[0]) - { - case 'w': fd = 0; - break; - case 'r': fd = 1; - break; - default: return(NULL); - } - if (fd == 1) - fflush(stdout); - fdsav = dup(fd); - close(fd); - - creat("/pipe", S_IWRITE+S_IREAD); - pid = os9exec(os9forkc, argv[0], argv, environ, 0, 0, 3); - fd2 = dup(fd); - close(fd); - dup(fdsav); - close(fdsav); - if (pid > 0) - { - pids[fd2] = pid; - r = fdopen(fd2, mode); - } - else - { - close(fd2); - r = NULL; - } - return(r); -} - -/* - * p c l o s e - */ -int pclose(fp) - FILE *fp; -{ - unsigned int status; - int pid; - int fd, - i; - fd = fileno(fp); - if (pids[fd] == 0) - return(-1); - fflush(fp); - fclose(fp); - while ((pid = wait(&status)) != -1) - if (pid == pids[fd]) - break; - else - for (i = 0; i < _NFILE; i++) - if (pids[i] == pid) - { - pids[i] = 0; - break; - } - if (pid == -1) - status = -1; - pids[fd] = 0; - return(status); -} -#endif /* _OSK */ diff --git a/src/apps/bin/less-381/version.c b/src/apps/bin/less-381/version.c index 46dea70afc..9d23db6384 100644 --- a/src/apps/bin/less-381/version.c +++ b/src/apps/bin/less-381/version.c @@ -644,6 +644,8 @@ v379 11/23/02 Add -L option; fix bug with ctrl-K in lesskey files; fix minor man page problems; change to autoconf 2.54. v380 11/24/02 Make LINENUM same as POSITION. v381 11/28/02 Make -N use 7 columns for line number if possible. +----------------------------------------------------------------- +v382 2/3/04 Remove copyrighted code. */ -char version[] = "381"; +char version[] = "382";