From 9083fe80c4706c5d83a80ce46faabbedea406f59 Mon Sep 17 00:00:00 2001 From: Thomas Jensen Date: Thu, 4 Sep 2014 01:03:05 +0200 Subject: [PATCH] Synchronized RCS conversion results with historical distribution archives --- COPYING | 340 ++++++++++++++ Makefile | 7 +- README | 98 ++++ README.Win32.txt | 41 ++ boxes-config | 2 +- doc/boxes.1.in | 2 +- src/Makefile | 5 +- src/Makefile.Win32 | 161 +++++++ src/boxes.c | 10 +- src/boxes.h.in | 5 +- src/config.h | 6 +- src/generate.c | 8 +- src/generate.h | 5 +- src/lexer.h | 6 +- src/lexer.l | 8 +- src/misc/getopt.c | 1051 +++++++++++++++++++++++++++++++++++++++++++ src/misc/getopt.h | 110 +++++ src/parser.y | 7 +- src/regexp/Makefile | 6 +- src/regexp/regexp.c | 2 +- src/regexp/regexp.h | 2 +- src/regexp/regsub.c | 8 +- src/remove.c | 8 +- src/remove.h | 5 +- src/shape.c | 9 +- src/shape.h | 8 +- src/tools.c | 8 +- src/tools.h | 5 +- 28 files changed, 1902 insertions(+), 31 deletions(-) create mode 100644 COPYING create mode 100644 README create mode 100644 README.Win32.txt create mode 100644 src/Makefile.Win32 create mode 100644 src/misc/getopt.c create mode 100644 src/misc/getopt.h diff --git a/COPYING b/COPYING new file mode 100644 index 0000000..60549be --- /dev/null +++ b/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) 19yy + + 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) 19yy 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/Makefile b/Makefile index 4d0777e..8c252f9 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ # Creation: August 14, 1999 (Saturday, 01:08h) # Author: Copyright (C) 1999 Thomas Jensen # tsjensen@stud.informatik.uni-erlangen.de -# Version: $Id: Makefile,v 1.4 1999/08/22 11:43:55 tsjensen Exp tsjensen $ +# Version: $Id: Makefile,v 1.5 2000/03/17 23:52:29 tsjensen Exp tsjensen $ # Format: GNU make # Web Site: http://home.pages.de/~jensen/boxes/ # Platforms: sparc/Solaris 2.6 and others @@ -25,6 +25,11 @@ # Revision History: # # $Log: Makefile,v $ +# Revision 1.5 2000/03/17 23:52:29 tsjensen +# Incremented version number to 1.0.1 +# Renamed snapshot file name to boxes-SNAP-latest +# Added README.Win32.txt to snapshot generation commands +# # Revision 1.4 1999/08/22 11:43:55 tsjensen # Added comment to guide user to GLOBALCONF definition line # diff --git a/README b/README new file mode 100644 index 0000000..ce8f440 --- /dev/null +++ b/README @@ -0,0 +1,98 @@ + _. + | | ____ + | |__ ____ ___ ___ ____ ______ ___ __ /_ | ____ + | __ \ / _ \ \ \/ / _/ __ \ / ___/ \ \/ / | | / _ \ + | \_\ \ ( <_> ) > < \ ___/ \___ \ \ / | | ( <_> ) + |___ / \____/ /__/\_ \ \___ > /____ > \_/ |___| /\____/ + \/ \/ \/ \/ \/ + + draws all kinds of boxes around your text (in ASCII art) + + [stability & portability release 1.0.1] + + + +GETTING IT + + http://home.pages.de/~jensen/boxes/ + + Boxes is free software under the GNU General Public License (GNU GPL). + See COPYING file or http://www.gnu.org/copyleft/gpl.html. + + +COMPILING IT + + Skip this section if you got yourself a binary distribution. NOTE, + however, that the location of the system-wide config file can only be + changed using the source distribution, because its path is compiled in. + + 1. Unpack the archive + + 2. Edit the top level Makefile and change the value of GLOBALCONF to + whereever you want the system-wide config file to reside. Note that + each user may have his/her own config file in $HOME/.boxes. + + 3. Type 'make' in the top level directory. + This should leave you with a binary in the src directory. + + The author takes care that this always works under intel/Linux and + sparc/Solaris, the latter of which is the boxes development + platform. + If you are on a different platform and somehow manage to materialize + a binary, please send it to the author (boxes@home-of.tj), so it + can be posted on the boxes home page. Boxes is generally very easy + to port, because it uses only a small set of instructions and is + based on ANSI C. + + +INSTALLING IT + + 1. Copy doc/boxes.1 to an appropriate manual page directory (such as + /usr/local/man/man1). + Copy boxes-config to the location specified in the Makefile as being + the name of the system-wide boxes config file. + Copy src/boxes (the binary) to a location which is in your path + (such as /usr/local/bin). + + Example: + cp doc/boxes.1 /usr/local/man/man1 + cp boxes-config /usr/local/share/boxes + cp src/boxes /usr/local/bin + + 2. If you want to make your own changes to the config file, copy the + system-wide config file into your home as $HOME/.boxes, then modify + it. Boxes will use $HOME/.boxes if it exists. + + +RUNNING IT + + Try if boxes works by typing "boxes" on the command line, then enter + "foo", press return and hit Ctrl-D. It should give you something + like that: /*******/ + /* foo */ + /*******/ + + Detailed usage information is in the manual page and a lot more can be + found on the Web page (see above). It is especially interesting to tie + boxes to your editor, so that it can be invoked by a simple keypress. + + +CONTACT + + * For questions which the online documentation could not answer, requests + for more features, praise and bug reports please feel free to email + the author at boxes@home-of.tj. Bug reports are especially appreciated. + + * For questions particular to the binary you downloaded contact the + supplier of the binary listed on the download page. + + * Send your cool new box designs to boxdesigns@home-of.tj! If they are + good or useful, they may be added to the official config file. + + + _________________________ + /\ \ + \_| Enjoy! | +03/18/2000 | -- Thomas Jensen | + | ____________________|_ +EOF \_/______________________/ diff --git a/README.Win32.txt b/README.Win32.txt new file mode 100644 index 0000000..e599076 --- /dev/null +++ b/README.Win32.txt @@ -0,0 +1,41 @@ +boxes 1.0.1 Win32 port Information Date: 18-Mar-2000 + + +This is the Win32 Version of boxes 1.0.1, built from the updated +snapshot of 18-Mar-2000, currently the most stable source. It was +built using gcc-2.95.2 with mingw32, plus a C source file containing +the GNU getopt() implementation. +Many thanks to Ron Aaron for helping me with this +port! + +General information may be found in the generic README file provided +with this archive and the boxes home page at http://home.pages.de/ +~jensen/boxes/. Note that the generic README file is intended for UNIX +users, so some things don't translate literally (e.g., you would have +to type Ctrl-Z instead of Ctrl-D to signal end of file, etc.). + +The system-wide config file is assumed to reside in the same directory +as the boxes executable. (This is the case when you unpack the +archive.) The name of the config file is assumed to be the same as the +name of the executable, only with a .cfg extension instead of .exe. +As with the UNIX version, boxes still looks for a file boxes.cfg in +the directory pointed to by the environment variable HOME, and for a +file pointed to by the environment variable BOXES. + +The standard troff format manual page is part of the package +(boxes.1), but knowing that in the Windows world there may be some +people who don't have troff installed on their systems, an HTML +version of the page is provided. It is a little out of date, but not a +whole lot. + +Watch the boxes home page for additional Win32 goodies. I am thinking +of hacking up a Visual Studio add-in for boxes. Don't know if that's +feasible in the way I think it should work, but we'll see. + + +Enjoy! + +Thomas Jensen + + +EOT diff --git a/boxes-config b/boxes-config index 4103630..ad0ed4f 100644 --- a/boxes-config +++ b/boxes-config @@ -3,7 +3,7 @@ # Date created: March 17, 1999 (Wednesday, 17:02h) # Author: Thomas Jensen # tsjensen@stud.informatik.uni-erlangen.de -# Version: $Id: boxes-config,v 1.15 1999/08/22 11:37:27 tsjensen Exp tsjensen $ +# Version: $Id: boxes-config,v 1.16 2000/03/17 23:39:34 tsjensen Exp tsjensen $ # Format: ASCII Text # World Wide Web: http://home.pages.de/~jensen/boxes/ # Purpose: Example configuration file for the boxes program diff --git a/doc/boxes.1.in b/doc/boxes.1.in index fe423a2..92d51a3 100644 --- a/doc/boxes.1.in +++ b/doc/boxes.1.in @@ -1,6 +1,6 @@ .\" @(#)boxes.1 1.0 08/22/99 .\" -.\" $Id: boxes.1,v 1.2 1999/08/18 19:14:08 tsjensen Exp tsjensen $ +.\" $Id: boxes.1.in,v 1.3 1999/08/21 23:41:25 tsjensen Exp tsjensen $ .\" .TH boxes 1 "August 22 1999" .UC 4 diff --git a/src/Makefile b/src/Makefile index 94aab35..c152714 100644 --- a/src/Makefile +++ b/src/Makefile @@ -3,7 +3,7 @@ # Creation: March 18, 1999 (Thursday, 15:10h) # Author: Copyright (C) 1999 Thomas Jensen # tsjensen@stud.informatik.uni-erlangen.de -# Version: $Id: Makefile,v 1.16 1999/11/08 10:55:13 tsjensen Exp tsjensen $ +# Version: $Id: Makefile,v 1.17 2000/03/17 23:51:43 tsjensen Exp tsjensen $ # Format: GNU make # Web Site: http://home.pages.de/~jensen/boxes/ # Platforms: sparc/Solaris 2.6 and others @@ -25,6 +25,9 @@ # Revision History: # # $Log: Makefile,v $ +# Revision 1.17 2000/03/17 23:51:43 tsjensen +# Added Makefile.Win32 and misc/* to snap generation commands +# # Revision 1.16 1999/11/08 10:55:13 tsjensen # Moved config.h into ORIG_HDRCL group, so it appears in the change log Web # page diff --git a/src/Makefile.Win32 b/src/Makefile.Win32 new file mode 100644 index 0000000..ae62bf9 --- /dev/null +++ b/src/Makefile.Win32 @@ -0,0 +1,161 @@ +# +# File: Makefile.Win32 +# Creation: March 18, 1999 (Thursday, 15:10h) +# Author: Copyright (C) 1999 Thomas Jensen +# tsjensen@stud.informatik.uni-erlangen.de +# Win32 Modifications by Ron Aaron +# Version: $Id: Makefile,v 1.16 1999/11/08 10:55:13 tsjensen Exp tsjensen $ +# Format: GNU make +# Web Site: http://home.pages.de/~jensen/boxes/ +# Platforms: win32 +# Purpose: Makefile for boxes, the box drawing program +# +# Remarks: o 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. +# o 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. +# o 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 +# +# Revision History: +# +# $Log: Makefile,v $ +# Revision 1.17 2000/03/16 10:55:13 ronaaron +# Win32 port +# +# Revision 1.16 1999/11/08 10:55:13 tsjensen +# Moved config.h into ORIG_HDRCL group, so it appears in the change log Web +# page +# +# Revision 1.15 1999/08/21 23:35:44 tsjensen +# boxes.h is now generated from boxes.h.in by top level Makefile +# Added -Wall -W to CFLAGS and removed .c.o rule +# +# Revision 1.14 1999/08/21 16:10:41 tsjensen +# Removed case insensitivity option (-i) from flex call (-> lexer.l) +# +# Revision 1.13 1999/08/13 23:55:03 tsjensen +# Given regexp stuff its own Makefile in regexp. +# Major Makefile overhaul, maily implementation of new directory structure +# and consolidation of file macros +# Use more GNU make features +# +# Revision 1.12 1999/07/20 18:49:58 tsjensen +# Added GNU GPL disclaimer +# Now evaluating date command from SNAPFILE only once +# Changed order of files in snapshot archive (who cares) +# +# Revision 1.11 1999/07/12 18:28:53 tsjensen +# Removed --yacc option from bison call +# Added logpage target to generate the chronologically sorted global change +# log in HTML format. This requires a Perl script (create_changelog.pl). +# Added config.h to dependencies and stuff +# Removed special targets for yacc and lex files. Thanks to Andreas Heiduk, +# it is now possible to compile all files with -W -Wall and no extra +# defines. +# Moved regexp library to a subdirectory regexp +# Some modifications on the source file macros which now differentiate +# between files which are listed in the HTML change log and files which +# aren't. +# +# Revision 1.10 1999/07/02 11:50:35 tsjensen +# Added parser.h header file for lexer-parser communication +# Moved from yacc to GNU "bison --yacc" +# No longer linking with flex library +# Activated -Wall -W for parser.y +# Removed -DYY_NO_UNPUT from lexer compilation (now done via file option) +# +# Revision 1.1 1999/03/18 15:10:41 tsjensen +# Initial revision +#____________________________________________________________________________ +#============================================================================ + + +LEX = flex +YACC = bison +CC = gcc +CFLAGS = -Os -s -I. -Iregexp -Wall -W $(CFLAGS_ADDTL) +LDFLAGS = -s + +GEN_HDR = parser.h boxes.h +GEN_SRC = parser.c lex.yy.c +GEN_FILES = $(GEN_SRC) $(GEN_HDR) +ORIG_HDRCL = boxes.h.in config.h +ORIG_HDR = $(ORIG_HDRCL) lexer.h tools.h shape.h generate.h remove.h +ORIG_GEN = lexer.l parser.y +ORIG_NORM = boxes.c tools.c shape.c generate.c remove.c +ORIG_SRC = $(ORIG_GEN) $(ORIG_NORM) +ORIG_FILES = $(ORIG_SRC) $(ORIG_HDR) +OTH_FILES = Makefile + +ALL_CL = $(ORIG_SRC) $(ORIG_HDRCL) $(OTH_FILES) +ALL_FILES = $(ORIG_FILES) $(GEN_FILES) $(OTH_FILES) +ALL_OBJ = $(GEN_SRC:.c=.o) $(ORIG_NORM:.c=.o) regexp/regexp.o \ + regexp/regsub.o misc/getopt.o + + +boxes: $(ALL_OBJ) + $(CC) $(LDFLAGS) $(ALL_OBJ) -o boxes -lkernel32 + +parser.c parser.h: parser.y boxes.h regexp/regexp.h + $(YACC) -o parser.c -d parser.y + +lex.yy.c: lexer.l boxes.h + $(LEX) -t lexer.l > lexer.tmp.c + echo #include "config.h" > lex.yy.c + cat lexer.tmp.c >> lex.yy.c + rm lexer.tmp.c + + +boxes.o: boxes.c boxes.h regexp/regexp.h shape.h tools.h generate.h remove.h config.h +tools.o: tools.c tools.h boxes.h shape.h config.h +shape.o: shape.c shape.h boxes.h config.h tools.h +generate.o: generate.c generate.h boxes.h shape.h tools.h config.h +remove.o: remove.c remove.h boxes.h shape.h tools.h config.h +lex.yy.o: lex.yy.c parser.h tools.h shape.h lexer.h config.h +parser.o: parser.c parser.h tools.h shape.h lexer.h config.h +regexp/regexp.o: regexp/regexp.c +regexp/regsub.o: regexp/regsub.c +misc/getopt.o: misc/getopt.c + + +snap: $(ALL_FILES) + if [ -z "$(SNAPFILE)" ] ; then exit 1 ; fi + mkdir $(SNAPFILE)/src + cp $(ALL_FILES) $(SNAPFILE)/src + touch $(patsubst %,$(SNAPFILE)/src/%,$(GEN_FILES)) + $(MAKE) -C regexp SNAPFILE=../$(SNAPFILE) snap + +rcstest: + -for i in $(ORIG_FILES) $(OTH_FILES) ; do rcsdiff $$i ; done + $(MAKE) -C regexp rcstest + +logpage: $(ALL_CL) + @echo $(ALL_CL) $(shell $(MAKE) -C regexp -s logpage) + +clean: + rm -f $(ALL_OBJ) + rm -f $(GEN_FILES) + rm -f core boxes + $(MAKE) -C regexp clean + +love: + @echo "Not in front of the kids, honey!" + +boxes.h: boxes.h.in + cp boxes.h.in boxes.h + +build: + $(MAKE) CFLAGS_ADDTL=-O boxes + strip boxes + +debug: + $(MAKE) CFLAGS_ADDTL=-g boxes + +#EOF diff --git a/src/boxes.c b/src/boxes.c index 0d48b10..30f250a 100644 --- a/src/boxes.c +++ b/src/boxes.c @@ -3,7 +3,7 @@ * Date created: March 18, 1999 (Thursday, 15:09h) * Author: Copyright (C) 1999 Thomas Jensen * tsjensen@stud.informatik.uni-erlangen.de - * Version: $Id: boxes.c,v 1.33 1999/09/10 19:21:05 tsjensen Exp tsjensen $ + * Version: $Id: boxes.c,v 1.34 2000/03/17 23:44:26 tsjensen Exp tsjensen $ * Language: ANSI C * Platforms: sunos5/sparc, for now * World Wide Web: http://home.pages.de/~jensen/boxes/ @@ -48,6 +48,12 @@ * Revision History: * * $Log: boxes.c,v $ + * Revision 1.34 2000/03/17 23:44:26 tsjensen + * Port to Win32 platform based on patches by Ron Aaron + * Changes only affect Win32 version. Win32 behavior differs from the UNIX + * platforms in the way the config file is searched and the config file + * name (boxes.cfg). + * * Revision 1.33 1999/09/10 19:21:05 tsjensen * Eliminated use of PATH_MAX in order to ease porting * Restructured infile/outfile code to eliminate need for access() function @@ -237,7 +243,7 @@ extern int optind, opterr, optopt; /* for getopt() */ static const char rcsid_boxes_c[] = - "$Id: boxes.c,v 1.33 1999/09/10 19:21:05 tsjensen Exp tsjensen $"; + "$Id: boxes.c,v 1.34 2000/03/17 23:44:26 tsjensen Exp tsjensen $"; diff --git a/src/boxes.h.in b/src/boxes.h.in index 77c45b0..babd929 100644 --- a/src/boxes.h.in +++ b/src/boxes.h.in @@ -3,7 +3,7 @@ * Date created: March 18, 1999 (Thursday, 15:09h) * Author: Copyright (C) 1999 Thomas Jensen * tsjensen@stud.informatik.uni-erlangen.de - * Version: $Id: boxes.h.in,v 1.18 1999/08/21 23:37:23 tsjensen Exp tsjensen $ + * Version: $Id: boxes.h.in,v 1.19 2000/03/17 23:43:13 tsjensen Exp tsjensen $ * Language: ANSI C * Purpose: Project-wide globals and data structures * @@ -23,6 +23,9 @@ * Revision History: * * $Log: boxes.h.in,v $ + * Revision 1.19 2000/03/17 23:43:13 tsjensen + * Added vim autocommand to set syntax highlighting to C + * * Revision 1.18 1999/08/21 23:37:23 tsjensen * Renamed file from boxes.h to boxes.h.in * VERSION and GLOBALCONF values are now put in by top level Makefile diff --git a/src/config.h b/src/config.h index eb09f89..06017e2 100644 --- a/src/config.h +++ b/src/config.h @@ -4,7 +4,7 @@ * Date created: July 4, 1999 (Sunday, 21:04h) * Author: Copyright (C) 1999 Thomas Jensen * tsjensen@stud.informatik.uni-erlangen.de - * Version: $Id: config.h,v 1.2 1999/08/18 18:23:06 tsjensen Exp tsjensen $ + * Version: $Id: config.h,v 1.3 1999/08/25 13:38:37 tsjensen Exp tsjensen $ * Language: ANSI C * Purpose: Please compiler and ease porting * @@ -24,6 +24,10 @@ * Revision History: * * $Log: config.h,v $ + * Revision 1.3 1999/08/25 13:38:37 tsjensen + * Bugfix: Changed empty #elif to #else (thanks Tommy Williams) + * Port to i386/FreeBSD by Tommy Williams + * * Revision 1.2 1999/08/18 18:23:06 tsjensen * Added Linux defines. Now compiles nicely on (my) Linux. * diff --git a/src/generate.c b/src/generate.c index 9ff2562..4effb81 100644 --- a/src/generate.c +++ b/src/generate.c @@ -4,7 +4,7 @@ * Date created: June 23, 1999 (Wednesday, 20:10h) * Author: Copyright (C) 1999 Thomas Jensen * tsjensen@stud.informatik.uni-erlangen.de - * Version: $Id: generate.c,v 1.8 1999/08/22 11:36:45 tsjensen Exp tsjensen $ + * Version: $Id: generate.c,v 1.9 1999/08/31 15:37:01 tsjensen Exp tsjensen $ * Language: ANSI C * World Wide Web: http://home.pages.de/~jensen/boxes/ * Purpose: Box generation, i.e. the drawing of boxes @@ -25,6 +25,10 @@ * Revision History: * * $Log: generate.c,v $ + * Revision 1.9 1999/08/31 15:37:01 tsjensen + * Applied Joe Zbiciak's patches to remove all snprintf()s and variants + * Replaced snprintf() calls with calls to concat_strings() in the process + * * Revision 1.8 1999/08/22 11:36:45 tsjensen * Removed const from 2nd parameter of justify_line() function * @@ -70,7 +74,7 @@ static const char rcsid_generate_c[] = - "$Id: generate.c,v 1.8 1999/08/22 11:36:45 tsjensen Exp tsjensen $"; + "$Id: generate.c,v 1.9 1999/08/31 15:37:01 tsjensen Exp tsjensen $"; diff --git a/src/generate.h b/src/generate.h index 8c98104..5a5a9e1 100644 --- a/src/generate.h +++ b/src/generate.h @@ -4,7 +4,7 @@ * Date created: June 23, 1999 (Wednesday, 20:12h) * Author: Copyright (C) 1999 Thomas Jensen * tsjensen@stud.informatik.uni-erlangen.de - * Version: $Id: generate.h,v 1.2 1999/06/25 18:45:12 tsjensen Exp tsjensen $ + * Version: $Id: generate.h,v 1.3 1999/08/14 19:30:01 tsjensen Exp tsjensen $ * Language: ANSI C * Purpose: Box generation, i.e. the drawing of boxes * @@ -24,6 +24,9 @@ * Revision History: * * $Log: generate.h,v $ + * Revision 1.3 1999/08/14 19:30:01 tsjensen + * Added GNU GPL disclaimer + * * Revision 1.2 1999/06/25 18:45:12 tsjensen * Added output_box() function * diff --git a/src/lexer.h b/src/lexer.h index e604beb..77d47c9 100644 --- a/src/lexer.h +++ b/src/lexer.h @@ -4,7 +4,7 @@ * Date created: July 01, 1999 (Thursday, 13:43h) * Author: Copyright (C) 1999 Thomas Jensen * tsjensen@stud.informatik.uni-erlangen.de - * Version: $Id: lexer.h,v 1.3 1999/08/14 19:06:26 tsjensen Exp tsjensen $ + * Version: $Id: lexer.h,v 1.4 1999/08/18 15:42:46 tsjensen Exp tsjensen $ * Language: ANSI C * Purpose: Export symbols used by the parser files only * @@ -24,6 +24,10 @@ * Revision History: * * $Log: lexer.h,v $ + * Revision 1.4 1999/08/18 15:42:46 tsjensen + * Added LEX_SDELIM macro (valid string delimiter characters) + * Added prototype for chg_strdelims() + * * Revision 1.3 1999/08/14 19:06:26 tsjensen * Added GNU GPL disclaimer * Added yylex() declaration to please compiler diff --git a/src/lexer.l b/src/lexer.l index e792e1d..f3de2b4 100644 --- a/src/lexer.l +++ b/src/lexer.l @@ -4,7 +4,7 @@ * Date created: March 15, 1999 (Monday, 17:16h) * Author: Copyright (C) 1999 Thomas Jensen * tsjensen@stud.informatik.uni-erlangen.de - * Version: $Id: lexer.l,v 1.16 1999/08/18 18:23:41 tsjensen Exp tsjensen $ + * Version: $Id: lexer.l,v 1.17 1999/08/20 19:51:12 tsjensen Exp tsjensen $ * Language: lex (ANSI C) * Purpose: flex lexical analyzer for boxes configuration files * @@ -26,6 +26,10 @@ * Revision History: * * $Log: lexer.l,v $ + * Revision 1.17 1999/08/20 19:51:12 tsjensen + * Moved contents of YY_USER_INIT definition into a separate function which + * is now called by YY_USER_INIT (better readability) + * * Revision 1.16 1999/08/18 18:23:41 tsjensen * Declared yyerrcnt to be static * Added YY_USER_INIT macro to set the input buffer size to the config file @@ -109,7 +113,7 @@ static const char rcsid_lexer_l[] = - "$Id: lexer.l,v 1.16 1999/08/18 18:23:41 tsjensen Exp tsjensen $"; + "$Id: lexer.l,v 1.17 1999/08/20 19:51:12 tsjensen Exp tsjensen $"; int yylineno = 1; diff --git a/src/misc/getopt.c b/src/misc/getopt.c new file mode 100644 index 0000000..f44cf99 --- /dev/null +++ b/src/misc/getopt.c @@ -0,0 +1,1051 @@ +/* Getopt for GNU. + NOTE: getopt is now part of the C library, so if you don't know what + "Keep this file name-space clean" means, talk to drepper@gnu.org + before changing it! + + Copyright (C) 1987, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98 + Free Software Foundation, Inc. + + NOTE: The canonical source of this file is maintained with the GNU C Library. + Bugs can be reported to bug-glibc@gnu.org. + + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by the + Free Software Foundation; either version 2, or (at your option) any + later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ + +/* This tells Alpha OSF/1 not to define a getopt prototype in . + Ditto for AIX 3.2 and . */ +#ifndef _NO_PROTO +# define _NO_PROTO +#endif + +#ifdef HAVE_CONFIG_H +# include +#endif + +#if !defined __STDC__ || !__STDC__ +/* This is a separate conditional since some stdc systems + reject `defined (const)'. */ +# ifndef const +# define const +# endif +#endif + +#include + +/* Comment out all this code if we are using the GNU C Library, and are not + actually compiling the library itself. This code is part of the GNU C + Library, but also included in many other GNU distributions. Compiling + and linking in this code is a waste when using the GNU C library + (especially if it is a shared library). Rather than having every GNU + program understand `configure --with-gnu-libc' and omit the object files, + it is simpler to just do this in the source for each such file. */ + +#define GETOPT_INTERFACE_VERSION 2 +#if !defined _LIBC && defined __GLIBC__ && __GLIBC__ >= 2 +# include +# if _GNU_GETOPT_INTERFACE_VERSION == GETOPT_INTERFACE_VERSION +# define ELIDE_CODE +# endif +#endif + +#ifndef ELIDE_CODE + + +/* This needs to come after some library #include + to get __GNU_LIBRARY__ defined. */ +#ifdef __GNU_LIBRARY__ +/* Don't include stdlib.h for non-GNU C libraries because some of them + contain conflicting prototypes for getopt. */ +# include +# include +#endif /* GNU C library. */ + +#ifdef VMS +# include +# if HAVE_STRING_H - 0 +# include +# endif +#endif + +#ifndef _ +/* This is for other GNU distributions with internationalized messages. + When compiling libc, the _ macro is predefined. */ +# ifdef HAVE_LIBINTL_H +# include +# define _(msgid) gettext (msgid) +# else +# define _(msgid) (msgid) +# endif +#endif + +/* This version of `getopt' appears to the caller like standard Unix `getopt' + but it behaves differently for the user, since it allows the user + to intersperse the options with the other arguments. + + As `getopt' works, it permutes the elements of ARGV so that, + when it is done, all the options precede everything else. Thus + all application programs are extended to handle flexible argument order. + + Setting the environment variable POSIXLY_CORRECT disables permutation. + Then the behavior is completely standard. + + GNU application programs can use a third alternative mode in which + they can distinguish the relative order of options and other arguments. */ + +#include "getopt.h" + +/* For communication from `getopt' to the caller. + When `getopt' finds an option that takes an argument, + the argument value is returned here. + Also, when `ordering' is RETURN_IN_ORDER, + each non-option ARGV-element is returned here. */ + +char * optarg = NULL; + +/* Index in ARGV of the next element to be scanned. + This is used for communication to and from the caller + and for communication between successive calls to `getopt'. + + On entry to `getopt', zero means this is the first call; initialize. + + When `getopt' returns -1, this is the index of the first of the + non-option elements that the caller should itself scan. + + Otherwise, `optind' communicates from one call to the next + how much of ARGV has been scanned so far. */ + +/* 1003.2 says this must be 1 before any call. */ +int optind = 1; + +/* Formerly, initialization of getopt depended on optind==0, which + causes problems with re-calling getopt as programs generally don't + know that. */ + +int __getopt_initialized = 0; + +/* The next char to be scanned in the option-element + in which the last option character we returned was found. + This allows us to pick up the scan where we left off. + + If this is zero, or a null string, it means resume the scan + by advancing to the next ARGV-element. */ + +static char *nextchar; + +/* Callers store zero here to inhibit the error message + for unrecognized options. */ + +int opterr = 1; + +/* Set to an option character which was unrecognized. + This must be initialized on some systems to avoid linking in the + system's own getopt implementation. */ + +int optopt = '?'; + +/* Describe how to deal with options that follow non-option ARGV-elements. + + If the caller did not specify anything, + the default is REQUIRE_ORDER if the environment variable + POSIXLY_CORRECT is defined, PERMUTE otherwise. + + REQUIRE_ORDER means don't recognize them as options; + stop option processing when the first non-option is seen. + This is what Unix does. + This mode of operation is selected by either setting the environment + variable POSIXLY_CORRECT, or using `+' as the first character + of the list of option characters. + + PERMUTE is the default. We permute the contents of ARGV as we scan, + so that eventually all the non-options are at the end. This allows options + to be given in any order, even with programs that were not written to + expect this. + + RETURN_IN_ORDER is an option available to programs that were written + to expect options and other ARGV-elements in any order and that care about + the ordering of the two. We describe each non-option ARGV-element + as if it were the argument of an option with character code 1. + Using `-' as the first character of the list of option characters + selects this mode of operation. + + The special argument `--' forces an end of option-scanning regardless + of the value of `ordering'. In the case of RETURN_IN_ORDER, only + `--' can cause `getopt' to return -1 with `optind' != ARGC. */ + +static enum +{ + REQUIRE_ORDER, PERMUTE, RETURN_IN_ORDER +} ordering; + +/* Value of POSIXLY_CORRECT environment variable. */ +static char *posixly_correct; + +#ifdef __GNU_LIBRARY__ +/* We want to avoid inclusion of string.h with non-GNU libraries + because there are many ways it can cause trouble. + On some systems, it contains special magic macros that don't work + in GCC. */ +# include +# define my_index strchr +#else + +/* Avoid depending on library functions or files + whose names are inconsistent. */ + +#ifndef getenv +extern char *getenv (); +#endif +#ifndef strncmp +extern int strncmp (); +#endif + +static char * +my_index (str, chr) + const char *str; + int chr; +{ + while (*str) + { + if (*str == chr) + return (char *) str; + str++; + } + return 0; +} + +/* If using GCC, we can safely declare strlen this way. + If not using GCC, it is ok not to declare it. */ +#ifdef __GNUC__ +/* Note that Motorola Delta 68k R3V7 comes with GCC but not stddef.h. + That was relevant to code that was here before. */ +# if (!defined __STDC__ || !__STDC__) && !defined strlen +/* gcc with -traditional declares the built-in strlen to return int, + and has done so at least since version 2.4.5. -- rms. */ +extern int strlen (const char *); +# endif /* not __STDC__ */ +#endif /* __GNUC__ */ + +#endif /* not __GNU_LIBRARY__ */ + +/* Handle permutation of arguments. */ + +/* Describe the part of ARGV that contains non-options that have + been skipped. `first_nonopt' is the index in ARGV of the first of them; + `last_nonopt' is the index after the last of them. */ + +static int first_nonopt; +static int last_nonopt; + +#ifdef _LIBC +/* Bash 2.0 gives us an environment variable containing flags + indicating ARGV elements that should not be considered arguments. */ + +/* Defined in getopt_init.c */ +extern char *__getopt_nonoption_flags; + +static int nonoption_flags_max_len; +static int nonoption_flags_len; + +static int original_argc; +static char *const *original_argv; + +/* Make sure the environment variable bash 2.0 puts in the environment + is valid for the getopt call we must make sure that the ARGV passed + to getopt is that one passed to the process. */ +static void +__attribute__ ((unused)) +store_args_and_env (int argc, char *const *argv) +{ + /* XXX This is no good solution. We should rather copy the args so + that we can compare them later. But we must not use malloc(3). */ + original_argc = argc; + original_argv = argv; +} +# ifdef text_set_element +text_set_element (__libc_subinit, store_args_and_env); +# endif /* text_set_element */ + +# define SWAP_FLAGS(ch1, ch2) \ + if (nonoption_flags_len > 0) \ + { \ + char __tmp = __getopt_nonoption_flags[ch1]; \ + __getopt_nonoption_flags[ch1] = __getopt_nonoption_flags[ch2]; \ + __getopt_nonoption_flags[ch2] = __tmp; \ + } +#else /* !_LIBC */ +# define SWAP_FLAGS(ch1, ch2) +#endif /* _LIBC */ + +/* Exchange two adjacent subsequences of ARGV. + One subsequence is elements [first_nonopt,last_nonopt) + which contains all the non-options that have been skipped so far. + The other is elements [last_nonopt,optind), which contains all + the options processed since those non-options were skipped. + + `first_nonopt' and `last_nonopt' are relocated so that they describe + the new indices of the non-options in ARGV after they are moved. */ + +#if defined __STDC__ && __STDC__ +static void exchange (char **); +#endif + +static void +exchange (argv) + char **argv; +{ + int bottom = first_nonopt; + int middle = last_nonopt; + int top = optind; + char *tem; + + /* Exchange the shorter segment with the far end of the longer segment. + That puts the shorter segment into the right place. + It leaves the longer segment in the right place overall, + but it consists of two parts that need to be swapped next. */ + +#ifdef _LIBC + /* First make sure the handling of the `__getopt_nonoption_flags' + string can work normally. Our top argument must be in the range + of the string. */ + if (nonoption_flags_len > 0 && top >= nonoption_flags_max_len) + { + /* We must extend the array. The user plays games with us and + presents new arguments. */ + char *new_str = malloc (top + 1); + if (new_str == NULL) + nonoption_flags_len = nonoption_flags_max_len = 0; + else + { + memset (__mempcpy (new_str, __getopt_nonoption_flags, + nonoption_flags_max_len), + '\0', top + 1 - nonoption_flags_max_len); + nonoption_flags_max_len = top + 1; + __getopt_nonoption_flags = new_str; + } + } +#endif + + while (top > middle && middle > bottom) + { + if (top - middle > middle - bottom) + { + /* Bottom segment is the short one. */ + int len = middle - bottom; + register int i; + + /* Swap it with the top part of the top segment. */ + for (i = 0; i < len; i++) + { + tem = argv[bottom + i]; + argv[bottom + i] = argv[top - (middle - bottom) + i]; + argv[top - (middle - bottom) + i] = tem; + SWAP_FLAGS (bottom + i, top - (middle - bottom) + i); + } + /* Exclude the moved bottom segment from further swapping. */ + top -= len; + } + else + { + /* Top segment is the short one. */ + int len = top - middle; + register int i; + + /* Swap it with the bottom part of the bottom segment. */ + for (i = 0; i < len; i++) + { + tem = argv[bottom + i]; + argv[bottom + i] = argv[middle + i]; + argv[middle + i] = tem; + SWAP_FLAGS (bottom + i, middle + i); + } + /* Exclude the moved top segment from further swapping. */ + bottom += len; + } + } + + /* Update records for the slots the non-options now occupy. */ + + first_nonopt += (optind - last_nonopt); + last_nonopt = optind; +} + +/* Initialize the internal data when the first call is made. */ + +#if defined __STDC__ && __STDC__ +static const char *_getopt_initialize (int, char *const *, const char *); +#endif +static const char * +_getopt_initialize (argc, argv, optstring) + int argc; + char *const *argv; + const char *optstring; +{ + /* Start processing options with ARGV-element 1 (since ARGV-element 0 + is the program name); the sequence of previously skipped + non-option ARGV-elements is empty. */ + + first_nonopt = last_nonopt = optind; + + nextchar = NULL; + + posixly_correct = getenv ("POSIXLY_CORRECT"); + + /* Determine how to handle the ordering of options and nonoptions. */ + + if (optstring[0] == '-') + { + ordering = RETURN_IN_ORDER; + ++optstring; + } + else if (optstring[0] == '+') + { + ordering = REQUIRE_ORDER; + ++optstring; + } + else if (posixly_correct != NULL) + ordering = REQUIRE_ORDER; + else + ordering = PERMUTE; + +#ifdef _LIBC + if (posixly_correct == NULL + && argc == original_argc && argv == original_argv) + { + if (nonoption_flags_max_len == 0) + { + if (__getopt_nonoption_flags == NULL + || __getopt_nonoption_flags[0] == '\0') + nonoption_flags_max_len = -1; + else + { + const char *orig_str = __getopt_nonoption_flags; + int len = nonoption_flags_max_len = strlen (orig_str); + if (nonoption_flags_max_len < argc) + nonoption_flags_max_len = argc; + __getopt_nonoption_flags = + (char *) malloc (nonoption_flags_max_len); + if (__getopt_nonoption_flags == NULL) + nonoption_flags_max_len = -1; + else + memset (__mempcpy (__getopt_nonoption_flags, orig_str, len), + '\0', nonoption_flags_max_len - len); + } + } + nonoption_flags_len = nonoption_flags_max_len; + } + else + nonoption_flags_len = 0; +#endif + + return optstring; +} + +/* Scan elements of ARGV (whose length is ARGC) for option characters + given in OPTSTRING. + + If an element of ARGV starts with '-', and is not exactly "-" or "--", + then it is an option element. The characters of this element + (aside from the initial '-') are option characters. If `getopt' + is called repeatedly, it returns successively each of the option characters + from each of the option elements. + + If `getopt' finds another option character, it returns that character, + updating `optind' and `nextchar' so that the next call to `getopt' can + resume the scan with the following option character or ARGV-element. + + If there are no more option characters, `getopt' returns -1. + Then `optind' is the index in ARGV of the first ARGV-element + that is not an option. (The ARGV-elements have been permuted + so that those that are not options now come last.) + + OPTSTRING is a string containing the legitimate option characters. + If an option character is seen that is not listed in OPTSTRING, + return '?' after printing an error message. If you set `opterr' to + zero, the error message is suppressed but we still return '?'. + + If a char in OPTSTRING is followed by a colon, that means it wants an arg, + so the following text in the same ARGV-element, or the text of the following + ARGV-element, is returned in `optarg'. Two colons mean an option that + wants an optional arg; if there is text in the current ARGV-element, + it is returned in `optarg', otherwise `optarg' is set to zero. + + If OPTSTRING starts with `-' or `+', it requests different methods of + handling the non-option ARGV-elements. + See the comments about RETURN_IN_ORDER and REQUIRE_ORDER, above. + + Long-named options begin with `--' instead of `-'. + Their names may be abbreviated as long as the abbreviation is unique + or is an exact match for some defined option. If they have an + argument, it follows the option name in the same ARGV-element, separated + from the option name by a `=', or else the in next ARGV-element. + When `getopt' finds a long-named option, it returns 0 if that option's + `flag' field is nonzero, the value of the option's `val' field + if the `flag' field is zero. + + The elements of ARGV aren't really const, because we permute them. + But we pretend they're const in the prototype to be compatible + with other systems. + + LONGOPTS is a vector of `struct option' terminated by an + element containing a name which is zero. + + LONGIND returns the index in LONGOPT of the long-named option found. + It is only valid when a long-named option has been found by the most + recent call. + + If LONG_ONLY is nonzero, '-' as well as '--' can introduce + long-named options. */ + +int +_getopt_internal (argc, argv, optstring, longopts, longind, long_only) + int argc; + char *const *argv; + const char *optstring; + const struct option *longopts; + int *longind; + int long_only; +{ + optarg = NULL; + + if (optind == 0 || !__getopt_initialized) + { + if (optind == 0) + optind = 1; /* Don't scan ARGV[0], the program name. */ + optstring = _getopt_initialize (argc, argv, optstring); + __getopt_initialized = 1; + } + + /* Test whether ARGV[optind] points to a non-option argument. + Either it does not have option syntax, or there is an environment flag + from the shell indicating it is not an option. The later information + is only used when the used in the GNU libc. */ +#ifdef _LIBC +# define NONOPTION_P (argv[optind][0] != '-' || argv[optind][1] == '\0' \ + || (optind < nonoption_flags_len \ + && __getopt_nonoption_flags[optind] == '1')) +#else +# define NONOPTION_P (argv[optind][0] != '-' || argv[optind][1] == '\0') +#endif + + if (nextchar == NULL || *nextchar == '\0') + { + /* Advance to the next ARGV-element. */ + + /* Give FIRST_NONOPT & LAST_NONOPT rational values if OPTIND has been + moved back by the user (who may also have changed the arguments). */ + if (last_nonopt > optind) + last_nonopt = optind; + if (first_nonopt > optind) + first_nonopt = optind; + + if (ordering == PERMUTE) + { + /* If we have just processed some options following some non-options, + exchange them so that the options come first. */ + + if (first_nonopt != last_nonopt && last_nonopt != optind) + exchange ((char **) argv); + else if (last_nonopt != optind) + first_nonopt = optind; + + /* Skip any additional non-options + and extend the range of non-options previously skipped. */ + + while (optind < argc && NONOPTION_P) + optind++; + last_nonopt = optind; + } + + /* The special ARGV-element `--' means premature end of options. + Skip it like a null option, + then exchange with previous non-options as if it were an option, + then skip everything else like a non-option. */ + + if (optind != argc && !strcmp (argv[optind], "--")) + { + optind++; + + if (first_nonopt != last_nonopt && last_nonopt != optind) + exchange ((char **) argv); + else if (first_nonopt == last_nonopt) + first_nonopt = optind; + last_nonopt = argc; + + optind = argc; + } + + /* If we have done all the ARGV-elements, stop the scan + and back over any non-options that we skipped and permuted. */ + + if (optind == argc) + { + /* Set the next-arg-index to point at the non-options + that we previously skipped, so the caller will digest them. */ + if (first_nonopt != last_nonopt) + optind = first_nonopt; + return -1; + } + + /* If we have come to a non-option and did not permute it, + either stop the scan or describe it to the caller and pass it by. */ + + if (NONOPTION_P) + { + if (ordering == REQUIRE_ORDER) + return -1; + optarg = argv[optind++]; + return 1; + } + + /* We have found another option-ARGV-element. + Skip the initial punctuation. */ + + nextchar = (argv[optind] + 1 + + (longopts != NULL && argv[optind][1] == '-')); + } + + /* Decode the current option-ARGV-element. */ + + /* Check whether the ARGV-element is a long option. + + If long_only and the ARGV-element has the form "-f", where f is + a valid short option, don't consider it an abbreviated form of + a long option that starts with f. Otherwise there would be no + way to give the -f short option. + + On the other hand, if there's a long option "fubar" and + the ARGV-element is "-fu", do consider that an abbreviation of + the long option, just like "--fu", and not "-f" with arg "u". + + This distinction seems to be the most useful approach. */ + + if (longopts != NULL + && (argv[optind][1] == '-' + || (long_only && (argv[optind][2] || !my_index (optstring, argv[optind][1]))))) + { + char *nameend; + const struct option *p; + const struct option *pfound = NULL; + int exact = 0; + int ambig = 0; + int indfound = -1; + int option_index; + + for (nameend = nextchar; *nameend && *nameend != '='; nameend++) + /* Do nothing. */ ; + + /* Test all long options for either exact match + or abbreviated matches. */ + for (p = longopts, option_index = 0; p->name; p++, option_index++) + if (!strncmp (p->name, nextchar, nameend - nextchar)) + { + if ((unsigned int) (nameend - nextchar) + == (unsigned int) strlen (p->name)) + { + /* Exact match found. */ + pfound = p; + indfound = option_index; + exact = 1; + break; + } + else if (pfound == NULL) + { + /* First nonexact match found. */ + pfound = p; + indfound = option_index; + } + else + /* Second or later nonexact match found. */ + ambig = 1; + } + + if (ambig && !exact) + { + if (opterr) + fprintf (stderr, _("%s: option `%s' is ambiguous\n"), + argv[0], argv[optind]); + nextchar += strlen (nextchar); + optind++; + optopt = 0; + return '?'; + } + + if (pfound != NULL) + { + option_index = indfound; + optind++; + if (*nameend) + { + /* Don't test has_arg with >, because some C compilers don't + allow it to be used on enums. */ + if (pfound->has_arg) + { + optarg = nameend + 1; + } + else + { + if (opterr) + if (argv[optind - 1][1] == '-') + /* --option */ + fprintf (stderr, + _("%s: option `--%s' doesn't allow an argument\n"), + argv[0], pfound->name); + else + /* +option or -option */ + fprintf (stderr, + _("%s: option `%c%s' doesn't allow an argument\n"), + argv[0], argv[optind - 1][0], pfound->name); + + nextchar += strlen (nextchar); + + optopt = pfound->val; + return '?'; + } + } + else if (pfound->has_arg == 1) + { + if (optind < argc) + optarg = argv[optind++]; + else + { + if (opterr) + fprintf (stderr, + _("%s: option `%s' requires an argument\n"), + argv[0], argv[optind - 1]); + nextchar += strlen (nextchar); + optopt = pfound->val; + return optstring[0] == ':' ? ':' : '?'; + } + } + nextchar += strlen (nextchar); + if (longind != NULL) + *longind = option_index; + if (pfound->flag) + { + *(pfound->flag) = pfound->val; + return 0; + } + return pfound->val; + } + + /* Can't find it as a long option. If this is not getopt_long_only, + or the option starts with '--' or is not a valid short + option, then it's an error. + Otherwise interpret it as a short option. */ + if (!long_only || argv[optind][1] == '-' + || my_index (optstring, *nextchar) == NULL) + { + if (opterr) + { + if (argv[optind][1] == '-') + /* --option */ + fprintf (stderr, _("%s: unrecognized option `--%s'\n"), + argv[0], nextchar); + else + /* +option or -option */ + fprintf (stderr, _("%s: unrecognized option `%c%s'\n"), + argv[0], argv[optind][0], nextchar); + } + nextchar = (char *) ""; + optind++; + optopt = 0; + return '?'; + } + } + + /* Look at and handle the next short option-character. */ + + { + char c = *nextchar++; + char *temp = my_index (optstring, c); + + /* Increment `optind' when we start to process its last character. */ + if (*nextchar == '\0') + ++optind; + + if (temp == NULL || c == ':') + { + if (opterr) + { + if (posixly_correct) + /* 1003.2 specifies the format of this message. */ + fprintf (stderr, _("%s: illegal option -- %c\n"), + argv[0], c); + else + fprintf (stderr, _("%s: invalid option -- %c\n"), + argv[0], c); + } + optopt = c; + return '?'; + } + /* Convenience. Treat POSIX -W foo same as long option --foo */ + if (temp[0] == 'W' && temp[1] == ';') + { + char *nameend; + const struct option *p; + const struct option *pfound = NULL; + int exact = 0; + int ambig = 0; + int indfound = 0; + int option_index; + + /* This is an option that requires an argument. */ + if (*nextchar != '\0') + { + optarg = nextchar; + /* If we end this ARGV-element by taking the rest as an arg, + we must advance to the next element now. */ + optind++; + } + else if (optind == argc) + { + if (opterr) + { + /* 1003.2 specifies the format of this message. */ + fprintf (stderr, _("%s: option requires an argument -- %c\n"), + argv[0], c); + } + optopt = c; + if (optstring[0] == ':') + c = ':'; + else + c = '?'; + return c; + } + else + /* We already incremented `optind' once; + increment it again when taking next ARGV-elt as argument. */ + optarg = argv[optind++]; + + /* optarg is now the argument, see if it's in the + table of longopts. */ + + for (nextchar = nameend = optarg; *nameend && *nameend != '='; nameend++) + /* Do nothing. */ ; + + /* Test all long options for either exact match + or abbreviated matches. */ + for (p = longopts, option_index = 0; p->name; p++, option_index++) + if (!strncmp (p->name, nextchar, nameend - nextchar)) + { + if ((unsigned int) (nameend - nextchar) == strlen (p->name)) + { + /* Exact match found. */ + pfound = p; + indfound = option_index; + exact = 1; + break; + } + else if (pfound == NULL) + { + /* First nonexact match found. */ + pfound = p; + indfound = option_index; + } + else + /* Second or later nonexact match found. */ + ambig = 1; + } + if (ambig && !exact) + { + if (opterr) + fprintf (stderr, _("%s: option `-W %s' is ambiguous\n"), + argv[0], argv[optind]); + nextchar += strlen (nextchar); + optind++; + return '?'; + } + if (pfound != NULL) + { + option_index = indfound; + if (*nameend) + { + /* Don't test has_arg with >, because some C compilers don't + allow it to be used on enums. */ + if (pfound->has_arg) + optarg = nameend + 1; + else + { + if (opterr) + fprintf (stderr, _("\ +%s: option `-W %s' doesn't allow an argument\n"), + argv[0], pfound->name); + + nextchar += strlen (nextchar); + return '?'; + } + } + else if (pfound->has_arg == 1) + { + if (optind < argc) + optarg = argv[optind++]; + else + { + if (opterr) + fprintf (stderr, + _("%s: option `%s' requires an argument\n"), + argv[0], argv[optind - 1]); + nextchar += strlen (nextchar); + return optstring[0] == ':' ? ':' : '?'; + } + } + nextchar += strlen (nextchar); + if (longind != NULL) + *longind = option_index; + if (pfound->flag) + { + *(pfound->flag) = pfound->val; + return 0; + } + return pfound->val; + } + nextchar = NULL; + return 'W'; /* Let the application handle it. */ + } + if (temp[1] == ':') + { + if (temp[2] == ':') + { + /* This is an option that accepts an argument optionally. */ + if (*nextchar != '\0') + { + optarg = nextchar; + optind++; + } + else + optarg = NULL; + nextchar = NULL; + } + else + { + /* This is an option that requires an argument. */ + if (*nextchar != '\0') + { + optarg = nextchar; + /* If we end this ARGV-element by taking the rest as an arg, + we must advance to the next element now. */ + optind++; + } + else if (optind == argc) + { + if (opterr) + { + /* 1003.2 specifies the format of this message. */ + fprintf (stderr, + _("%s: option requires an argument -- %c\n"), + argv[0], c); + } + optopt = c; + if (optstring[0] == ':') + c = ':'; + else + c = '?'; + } + else + /* We already incremented `optind' once; + increment it again when taking next ARGV-elt as argument. */ + optarg = argv[optind++]; + nextchar = NULL; + } + } + return c; + } +} + +int +getopt (argc, argv, optstring) + int argc; + char *const *argv; + const char *optstring; +{ + return _getopt_internal (argc, argv, optstring, + (const struct option *) 0, + (int *) 0, + 0); +} + +#endif /* Not ELIDE_CODE. */ + +#ifdef TEST + +/* Compile with -DTEST to make an executable for use in testing + the above definition of `getopt'. */ + +int +main (argc, argv) + int argc; + char **argv; +{ + int c; + int digit_optind = 0; + + while (1) + { + int this_option_optind = optind ? optind : 1; + + c = getopt (argc, argv, "abc:d:0123456789"); + if (c == -1) + break; + + switch (c) + { + case '0': + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': + if (digit_optind != 0 && digit_optind != this_option_optind) + printf ("digits occur in two different argv-elements.\n"); + digit_optind = this_option_optind; + printf ("option %c\n", c); + break; + + case 'a': + printf ("option a\n"); + break; + + case 'b': + printf ("option b\n"); + break; + + case 'c': + printf ("option c with value `%s'\n", optarg); + break; + + case '?': + break; + + default: + printf ("?? getopt returned character code 0%o ??\n", c); + } + } + + if (optind < argc) + { + printf ("non-option ARGV-elements: "); + while (optind < argc) + printf ("%s ", argv[optind++]); + printf ("\n"); + } + + exit (0); +} + +#endif /* TEST */ diff --git a/src/misc/getopt.h b/src/misc/getopt.h new file mode 100644 index 0000000..820af1c --- /dev/null +++ b/src/misc/getopt.h @@ -0,0 +1,110 @@ +/* Declarations for getopt. + Copyright (C) 1989,90,91,92,93,94,96,97 Free Software Foundation, Inc. + + NOTE: The canonical source of this file is maintained with the GNU C Library. + Bugs can be reported to bug-glibc@gnu.org. + + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by the + Free Software Foundation; either version 2, or (at your option) any + later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ + +#ifndef _GETOPT_H +#define _GETOPT_H 1 + + +/* For communication from `getopt' to the caller. + When `getopt' finds an option that takes an argument, + the argument value is returned here. + Also, when `ordering' is RETURN_IN_ORDER, + each non-option ARGV-element is returned here. */ + +char * optarg; + +/* Index in ARGV of the next element to be scanned. + This is used for communication to and from the caller + and for communication between successive calls to `getopt'. + + On entry to `getopt', zero means this is the first call; initialize. + + When `getopt' returns -1, this is the index of the first of the + non-option elements that the caller should itself scan. + + Otherwise, `optind' communicates from one call to the next + how much of ARGV has been scanned so far. */ + +int optind; + +/* Callers store zero here to inhibit the error message `getopt' prints + for unrecognized options. */ + +int opterr; + +/* Set to an option character which was unrecognized. */ + +int optopt; + +/* Describe the long-named options requested by the application. + The LONG_OPTIONS argument to getopt_long or getopt_long_only is a vector + of `struct option' terminated by an element containing a name which is + zero. + + The field `has_arg' is: + no_argument (or 0) if the option does not take an argument, + required_argument (or 1) if the option requires an argument, + optional_argument (or 2) if the option takes an optional argument. + + If the field `flag' is not NULL, it points to a variable that is set + to the value given in the field `val' when the option is found, but + left unchanged if the option is not found. + + To have a long-named option do something other than set an `int' to + a compiled-in constant, such as set a value from `optarg', set the + option's `flag' field to zero and its `val' field to a nonzero + value (the equivalent single-letter option character, if there is + one). For long options that have a zero `flag' field, `getopt' + returns the contents of the `val' field. */ + +struct option +{ +#if defined (__STDC__) && __STDC__ + const char *name; +#else + char *name; +#endif + /* has_arg can't be an enum because some compilers complain about + type mismatches in all the code that assumes it is an int. */ + int has_arg; + int *flag; + int val; +}; + +/* Names for the values of the `has_arg' field of `struct option'. */ + +#define no_argument 0 +#define required_argument 1 +#define optional_argument 2 + +extern int getopt_long (int argc, char *const *argv, const char *shortopts, + const struct option *longopts, int *longind); +extern int getopt_long_only (int argc, char *const *argv, + const char *shortopts, + const struct option *longopts, int *longind); + +/* Internal only. Users should not call this directly. */ +extern int _getopt_internal (int argc, char *const *argv, + const char *shortopts, + const struct option *longopts, int *longind, + int long_only); + +#endif /* getopt.h */ diff --git a/src/parser.y b/src/parser.y index 848bef5..c0bdec7 100644 --- a/src/parser.y +++ b/src/parser.y @@ -4,7 +4,7 @@ * Date created: March 16, 1999 (Tuesday, 17:17h) * Author: Copyright (C) 1999 Thomas Jensen * tsjensen@stud.informatik.uni-erlangen.de - * Version: $Id: parser.y,v 1.21 1999/08/18 15:38:44 tsjensen Exp tsjensen $ + * Version: $Id: parser.y,v 1.22 1999/08/21 15:53:58 tsjensen Exp tsjensen $ * Language: GNU bison (ANSI C) * Purpose: Yacc parser for boxes configuration files * @@ -24,6 +24,9 @@ * Revision History: * * $Log: parser.y,v $ + * Revision 1.22 1999/08/21 15:53:58 tsjensen + * Removed check for empty sample block, which is also done in lexer.l + * * Revision 1.21 1999/08/18 15:38:44 tsjensen * Added new tokens YCHGDEL and YDELWORD * Added code for DELIMITER statements @@ -130,7 +133,7 @@ const char rcsid_parser_y[] = - "$Id: parser.y,v 1.21 1999/08/18 15:38:44 tsjensen Exp tsjensen $"; + "$Id: parser.y,v 1.22 1999/08/21 15:53:58 tsjensen Exp tsjensen $"; static int pflicht = 0; diff --git a/src/regexp/Makefile b/src/regexp/Makefile index 6857a4b..a66dd55 100644 --- a/src/regexp/Makefile +++ b/src/regexp/Makefile @@ -3,7 +3,7 @@ # Creation: August 13, 1999 (Friday, 22:13h) # Author: Copyright (C) 1999 Thomas Jensen # tsjensen@stud.informatik.uni-erlangen.de -# Version: $Id$ +# Version: $Id: Makefile,v 1.1 1999/08/13 20:56:09 tsjensen Exp tsjensen $ # Format: GNU make # Web Site: http://home.pages.de/~jensen/boxes/ # Platforms: sparc/Solaris 2.6 and others @@ -25,7 +25,9 @@ # # Revision History: # -# $Log$ +# $Log: Makefile,v $ +# Revision 1.1 1999/08/13 20:56:09 tsjensen +# Initial revision #____________________________________________________________________________ #============================================================================ diff --git a/src/regexp/regexp.c b/src/regexp/regexp.c index 2127974..b149c5d 100644 --- a/src/regexp/regexp.c +++ b/src/regexp/regexp.c @@ -27,7 +27,7 @@ #include "regmagic.h" char rcsid_regexp_c[] = - "$Id$"; + "$Id: regexp.c,v 1.3 1999/04/12 18:13:20 tsjensen Exp tsjensen $"; /* * The "internal use only" fields in regexp.h are present to pass info from diff --git a/src/regexp/regexp.h b/src/regexp/regexp.h index 8dc1e82..e966de2 100644 --- a/src/regexp/regexp.h +++ b/src/regexp/regexp.h @@ -1,7 +1,7 @@ /* * Definitions etc. for regexp(3) routines. * - * Version: $Id: regexp.h,v 1.4 1999/06/22 12:12:05 tsjensen Exp tsjensen $ + * Version: $Id: regexp.h,v 1.5 1999/06/25 18:53:51 tsjensen Exp tsjensen $ * * Caveat: this is V8 regexp(3) [actually, a reimplementation thereof], * not the System V one. diff --git a/src/regexp/regsub.c b/src/regexp/regsub.c index b6609fa..6322def 100644 --- a/src/regexp/regsub.c +++ b/src/regexp/regsub.c @@ -3,7 +3,7 @@ * Date created: Copyright (c) 1986 by University of Toronto. * Author: Henry Spencer. * Extensions and modifications by Thomas Jensen - * Version: $Id: regsub.c,v 1.3 1999/04/12 18:13:57 tsjensen Exp tsjensen $ + * Version: $Id: regsub.c,v 1.4 1999/07/20 18:51:41 tsjensen Exp tsjensen $ * Language: K&R C (traditional) * World Wide Web: http://home.pages.de/~jensen/boxes/ * Purpose: Perform substitutions after a regexp match @@ -24,6 +24,10 @@ * Revision History: * * $Log: regsub.c,v $ + * Revision 1.4 1999/07/20 18:51:41 tsjensen + * Bugfix: REPLACE "^" with "a" caused a hangup. Now automatically declaring + * matches which have a length of zero to be of scope "once". + * * Revision 1.3 1999/04/12 18:13:57 tsjensen * Added missing '$' to rcs id string, changed from #ident to char * @@ -42,7 +46,7 @@ #include "regmagic.h" char rcsid_regsub_c[] = - "$Id: regsub.c,v 1.3 1999/04/12 18:13:57 tsjensen Exp tsjensen $"; + "$Id: regsub.c,v 1.4 1999/07/20 18:51:41 tsjensen Exp tsjensen $"; diff --git a/src/remove.c b/src/remove.c index f9af3d6..b33955a 100644 --- a/src/remove.c +++ b/src/remove.c @@ -4,7 +4,7 @@ * Date created: June 23, 1999 (Wednesday, 20:59h) * Author: Copyright (C) 1999 Thomas Jensen * tsjensen@stud.informatik.uni-erlangen.de - * Version: $Id: remove.c,v 1.5 1999/11/07 17:46:26 tsjensen Exp tsjensen $ + * Version: $Id: remove.c,v 1.6 1999/11/08 10:51:41 tsjensen Exp tsjensen $ * Language: ANSI C * World Wide Web: http://home.pages.de/~jensen/boxes/ * Purpose: Box removal, i.e. the deletion of boxes @@ -25,6 +25,10 @@ * Revision History: * * $Log: remove.c,v $ + * Revision 1.6 1999/11/08 10:51:41 tsjensen + * Bugfix: For non-empty left box sides, spaces belonging to "empty" shape + * lines were not properly removed in some cases + * * Revision 1.5 1999/11/07 17:46:26 tsjensen * Bugfix: Horizontal box parts were not correctly detected if the west box * side was empty (reported: Tobias Buchal) @@ -58,7 +62,7 @@ #include "remove.h" static const char rcsid_remove_c[] = - "$Id: remove.c,v 1.5 1999/11/07 17:46:26 tsjensen Exp tsjensen $"; + "$Id: remove.c,v 1.6 1999/11/08 10:51:41 tsjensen Exp tsjensen $"; diff --git a/src/remove.h b/src/remove.h index 58cee6c..8fc8ba2 100644 --- a/src/remove.h +++ b/src/remove.h @@ -4,7 +4,7 @@ * Date created: June 23, 1999 (Wednesday, 21:00h) * Author: Copyright (C) 1999 Thomas Jensen * tsjensen@stud.informatik.uni-erlangen.de - * Version: $Id: remove.h,v 1.1 1999/06/23 19:15:00 tsjensen Exp $ + * Version: $Id: remove.h,v 1.2 1999/07/23 16:16:40 tsjensen Exp tsjensen $ * Language: ANSI C * Purpose: Box removal, i.e. the deletion of boxes * @@ -24,6 +24,9 @@ * Revision History: * * $Log: remove.h,v $ + * Revision 1.2 1999/07/23 16:16:40 tsjensen + * Added GNU GPL disclaimer + * * Revision 1.1 1999/06/23 19:15:00 tsjensen * Initial revision * diff --git a/src/shape.c b/src/shape.c index 062ae59..b362936 100644 --- a/src/shape.c +++ b/src/shape.c @@ -4,7 +4,7 @@ * Date created: June 23, 1999 (Wednesday, 13:39h) * Author: Copyright (C) 1999 Thomas Jensen * tsjensen@stud.informatik.uni-erlangen.de - * Version: $Id: shape.c,v 1.4 1999/07/23 16:38:02 tsjensen Exp tsjensen $ + * Version: $Id: shape.c,v 1.5 1999/08/14 19:11:53 tsjensen Exp tsjensen $ * Language: ANSI C * World Wide Web: http://home.pages.de/~jensen/boxes/ * Purpose: Shape handling and information functions @@ -25,6 +25,11 @@ * Revision History: * * $Log: shape.c,v $ + * Revision 1.5 1999/08/14 19:11:53 tsjensen + * Added findshape(), genshape(), freeshape(), and isdeepempty() functions + * Added on_side() back in with a few changes + * Changed empty_side() to use isdeepempty() -> much simpler code + * * Revision 1.4 1999/07/23 16:38:02 tsjensen * Removed functions iscorner(), on_side(), shapecmp(), both_on_side(), and * shape_distance() - nobody was using them anyway. @@ -53,7 +58,7 @@ #include "tools.h" static const char rcsid_shape_c[] = - "$Id: shape.c,v 1.4 1999/07/23 16:38:02 tsjensen Exp tsjensen $"; + "$Id: shape.c,v 1.5 1999/08/14 19:11:53 tsjensen Exp tsjensen $"; diff --git a/src/shape.h b/src/shape.h index 1abeca8..8dd8026 100644 --- a/src/shape.h +++ b/src/shape.h @@ -4,7 +4,7 @@ * Date created: June 23, 1999 (Wednesday, 13:45h) * Author: Copyright (C) 1999 Thomas Jensen * tsjensen@stud.informatik.uni-erlangen.de - * Version: $Id: shape.h,v 1.3 1999/07/23 16:36:33 tsjensen Exp tsjensen $ + * Version: $Id: shape.h,v 1.4 1999/08/14 19:08:34 tsjensen Exp tsjensen $ * Language: ANSI C * Purpose: Shape handling and information functions * @@ -24,6 +24,12 @@ * Revision History: * * $Log: shape.h,v $ + * Revision 1.4 1999/08/14 19:08:34 tsjensen + * Added genshape(), freeshape(), and findshape() prototypes + * Added on_side() prototype back again + * Added isdeepempty() prototype + * Changed first parameter of empty_side() prototype + * * Revision 1.3 1999/07/23 16:36:33 tsjensen * Added GNU GPL disclaimer * Removed prototypes of iscorner(), on_side(), shapecmp(), both_on_side(), diff --git a/src/tools.c b/src/tools.c index 31c9779..772015d 100644 --- a/src/tools.c +++ b/src/tools.c @@ -4,7 +4,7 @@ * Date created: June 20, 1999 (Sunday, 16:51h) * Author: Copyright (C) 1999 Thomas Jensen * tsjensen@stud.informatik.uni-erlangen.de - * Version: $Id: tools.c,v 1.4 1999/08/21 16:09:33 tsjensen Exp tsjensen $ + * Version: $Id: tools.c,v 1.5 1999/08/31 15:35:13 tsjensen Exp tsjensen $ * Language: ANSI C * World Wide Web: http://home.pages.de/~jensen/boxes/ * Purpose: Provide tool functions for error reporting and some @@ -26,6 +26,10 @@ * Revision History: * * $Log: tools.c,v $ + * Revision 1.5 1999/08/31 15:35:13 tsjensen + * Applied Joe Zbiciak's patches to remove all snprintf()s and variants + * Added concat_strings() function and changed yyerror() in the process + * * Revision 1.4 1999/08/21 16:09:33 tsjensen * Removed newline check from empty_line() function * @@ -55,7 +59,7 @@ static const char rcsid_tools_c[] = - "$Id: tools.c,v 1.4 1999/08/21 16:09:33 tsjensen Exp tsjensen $"; + "$Id: tools.c,v 1.5 1999/08/31 15:35:13 tsjensen Exp tsjensen $"; diff --git a/src/tools.h b/src/tools.h index 2c818b9..eb8b297 100644 --- a/src/tools.h +++ b/src/tools.h @@ -4,7 +4,7 @@ * Date created: June 20, 1999 (Sunday, 16:57h) * Author: Copyright (C) 1999 Thomas Jensen * tsjensen@stud.informatik.uni-erlangen.de - * Version: $Id: tools.h,v 1.2 1999/07/20 18:56:15 tsjensen Exp tsjensen $ + * Version: $Id: tools.h,v 1.3 1999/08/31 15:38:42 tsjensen Exp tsjensen $ * Language: ANSI C * Purpose: Tool functions for error reporting and some string * handling and other needful things @@ -25,6 +25,9 @@ * Revision History: * * $Log: tools.h,v $ + * Revision 1.3 1999/08/31 15:38:42 tsjensen + * Added concat_strings() function prototype from Joe Zbiciak's patches + * * Revision 1.2 1999/07/20 18:56:15 tsjensen * Added GNU GPL disclaimer * Removed include boxes.h