#! /bin/sh # # This is a self-applying patch in a shell script. # It has this form because some of the files are generated, # and thus no history is available for them; # they need to be deleted before the patch is applied. # # Change directory to the appropriate place # before applying running this shell script. # # Don't forget the -p0 option if you apply this patch manually. # # ------------------------------------------------------------ # # Before you apply this patch manually, # please delete the following files: # rm -f README ALPHA BUILDING CHANGES MANIFEST Makefile # # Now patch the files... # (Don't forget the -p0 option.) # patch -p0 << 'fubar' Index: common/patchlevel.h Prereq: "1.3.D035" *************** *** 1 **** ! #define PATCHLEVEL "1.3.D035" --- 1 ---- ! #define PATCHLEVEL "1.4.D038" Index: README *************** *** 0 **** --- 1,396 ---- + + + + readme(aegis) readme(aegis) + + + NAME + aegis - project change supervisor + Copyright (C) 1990, 1991, 1992, 1993 Peter Miller. + All rights reserved. + + The aegis program is distributed under the terms of the + GNU General Public License. See the LICENSE section, + below, for more details. + + aegis (ee.j.iz) n., a protection, a defence. + + DESCRIPTION + The aegis program is a CASE tool with a difference. In + the spirit of the UNIX Operating System, the aegis + program is a small component designed to work with other + programs. + + Many CASE systems attempt to provide everything, from + bubble charts to source control to compilers. Users are + trapped with the components supplied by the CASE system, + and if you don't like one of the components (it may be + too limited, for instance), then that is just tough. + + In contrast, UNIX provides many components of a CASE + system - compilers, editors, dependency manitenance tools + (such as make), source control tools (such as RCS). You + may substitute the tool of your choice if you don't like + the ones supplied with the system - gcc, jove, cake, to + name just a few. The aegis program adds to this list + with software configuration management, and true to UNIX + philosophy, the aegis program does not dictate the choice + of any of the other tools (although it may stretch them + to their limits). + + Enough hype, what is it that the aegis program does? + Just what is software configuration management? This + question is sufficiently broad as to require a book in + answer. In essence, the aegis program is a project + change supervisor. It provides a framework within which + a team of developers may work on many changes to a + program independently, and the aegis program coordinates + integrating these changes back into the master source of + the program, with as little disruption as possible. + Resolution of contention for source files, a major + headache for any project with more than one developer, is + one of the aegis program's major functions. + + It should be noted that the aegis program is a + developer's tool, in the same sense as make or RCS are + developer's tools. It is not a manager's tool - it does + not provide progress tracking or manage work allocation. + + + + + + + 1 + + + + + + readme(aegis) readme(aegis) + + + BENEFITS + So why should you use the aegis program? + + The aegis program uses a particular model of the + development of software projects. This model has a + master source (or baseline) of a project, and a team of + developers creating changes to be made to this baseline. + When a change is complete, it is integrated with the + baseline, to become the new baseline. Each change must + be atomic and self-contained, no change is allowed to + cause the baseline to cease to work. "Working" is + defined as passing it's own tests. The tests are + considered part of the baseline. The aegis program + provides support for the developer so that an entire copy + of the baseline need not be taken to change a few files, + only those files which are to be changed need to be + copied. + + In order to ensure that changes are unable to cause the + baseline to cease to work, aegis mandates that changes be + accompanied by at least one test, and that all such tests + be known to complete sucessfully. These steadily + accumulated tests form an ever increasing regression test + suite for all later changes. There is also a mandatory + review stage for each change to the baseline. While + these requirements may be relaxed per-change or even per- + project, doing so potentially compromises the "working" + definition of the baseline. + + The win in using the aegis program is that there are O(n) + interactions between developers and the baseline. + Contrast this with a master source which is being edited + directly by the developers - there are O(n!) + interactions between developers - this makes adding "just + one more" developer a potential disaster. + + Another win is that the project baseline always works. + Always having a working baseline means that a version is + always available for demonstrations, or those "pre- + release snapshots" we are always forced to provide. + + The above advantages are all very well - for management + types. Why should Joe Average Programmer use the aegis + program? Recall that RCS provides file locking, but only + for one file at a time. The aegis program provides the + file locking, atomically, for the set of files in the + change. Recall also that RCS locks the file the instant + you start editing it. This makes popular files a project + bottleneck. The aegis program allows concurrent editing, + and a resolution mechanism just before the change must be + integrated, meaning fewer delays for J.A.Programmer. + + + + + + + 2 + + + + + + readme(aegis) readme(aegis) + + + ALPHA NOTICE + Please note that this is Alpha software. It probably has + bugs, it is known to have unimplemented features. This + version is not intended to be the final product. For + more information, see the ALPHA file included in this + release. + + The reasons the author thinks this software is alpha + include: * it has not clocked enought CPU time, * it has + not been built on enough systems, * it has not been + tested on enough systems, * the User Guide is not + finished. However, feedback to date has been very + favourable. + + This will probably be the last Alpha release. The next + release will be 2.0, and will be a Beta release. The + problems reported to date are configuration and build + problems; there are few reports of it failing to function + correctly in other cases. + + ARCHIVE SITE + The latest version of aegis is available by anonymous ftp + from: + Host: ftp.cse.nau.edu (134.114.64.70) + Dir: /pub/Aegis + File: aegis.1.4.tar.Z # the complete source + File: aegis.1.4.patch.Z # patch to take 1.3 to 1.4 + File: aegis.1.4.ps.Z # PostScript of the User Guide + + To use anonymous ftp, give "anonymous" as the user name + (omit the quotes) and your email address as the password. + + My grateful thanks to Paul Balyoz + for his generosity in providing this archive space. + + This directory also contains a few other pieces of + software written by me. Some are referred to in the + aegis documentation. Please have a look if you are + interested. + + For those of you without ftp, I recommend the use of an + ftp-by-email server. Here is a list of a few (there are + many more): + mail-server@pit-manager.mit.edu + ftpmail@decwrl.dec.com + ftpmail@cs.uow.edu.au + + In general, you can get a help message about how to use + each system by sending email with a subject of "help" and + a message body containing just the word "help". + + + + + + + + 3 + + + + + + readme(aegis) readme(aegis) + + + MAILING LIST + A mailing list has been created so that users of aegis + may exchange ideas about how to use the aegis program. + Discussion may include, but is not limited to: bugs, + enhancements, and applications. The list is not + moderated. + + The address of the mailing list is + aegis-users@bmr.gov.au + + To subscribe to this mailing list, send an email message + to majordomo@bmr.gov.au with a message body containing + the single line + subscribe aegis-users + Please note that bmr.gov.au is an Internet site, so if + you have an address which is not readily derived from + your mail headers (majordomo is only a Perl program, + after all) you will need to use a message of the form: + subscribe aegis-users address + where address is an email address which makes sense from + an Internet site. + + The software which handles this mailing list CANNOT send + you a copy of the aegis program. Please use ftp or ftp- + by-email, instead. + + COMPARISON WITH CVS + One of the most common questions about aegis is "How does + it compare with CVS?" + + The CVS program aims to provide a repository, RCS for + sets of files. The aegis program aims to provide a + baseline, a repository, consistency of the baseline, and + validation of changes being made to the baseline. + + A simplistic way of thinking of this is "CVS is over + RCS", but "aegis is over RCS and make". Actually CVS + requires RCS, whereas aegis may be configured to use + almost any history tool; similarly for the dependency + maintenance tool, aegis may be configured to use almost + any sufficiently capable tool (unfortunately traditional + make isn't sufficiently capable, but the name is well + known and evokes the appropriate functional image). + + The most significant point of departure is around the + "cvs checkin" fucntionality. In CVS, this is + unconditional; a developer can add a poorly though-out + code change, or even indulge in a little vandalism, with + nothing to prevent it. In contrast, the aegis program + breaks this step into several pieces: the change must be + be known to build, the change must have tests and those + tests be known to have run and passed, the change must + then be reviewed (double check), and then built and + tested again (tripple check). + + + + 4 + + + + + + readme(aegis) readme(aegis) + + + For a more detailed discussion, see appendix C of the + User Guide. + + NEW IN THIS RELEASE + A number of features have been added to aegis with this + release. A few of them are detailed here: + + * Support has been added for systems without the seteuid + system call, or those with crippled implementations. + + * Most of the unimplemented command variants have been + finished. These include New Change Undo, Develop Begin + Undo and ReMove PRoject. Most notable of the exceptions + is -ANticipate option for the -CoPy_file and -DIFFerence + command. + + * The User Guide has been added to, making it a little + more complete. It still needs more work, sigh. + + * The code to handle automounters has been made more + robust. + + * The command substitutions have been vastly improved, + and are now documented. + + Plus the usual crop of bug fixes and tinkering. For + excruciating detail, and also acknowlegements of those + who generously sent me feedback, please see the CHANGES + file included in this distribution. + + BUILDING + Instructions on how to build and test the aegis program + are to be found in the BUILDING file included in this + distribution. + + LICENSE + The aegis 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. + + The aegis 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., 675 Mass Ave, Cambridge, + MA 02139, USA. + + It should be in the LICENSE file included in this + + + + 5 + + + + + + readme(aegis) readme(aegis) + + + distribution. + + AUTHOR + Peter Miller UUCP uunet!munnari!bmr.gov.au!pmiller + /\/\* Internet pmiller@bmr.gov.au + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 6 + + Index: ALPHA *************** *** 0 **** --- 1,264 ---- + + + + alpha(aegis) alpha(aegis) + + + NAME + aegis - project change supervisor + Copyright (C) 1990, 1991, 1992, 1993 Peter Miller. + All rights reserved. + + The aegis program is distributed under the terms of the + GNU General Public License. See the LICENSE section, + below, for more details. + + aegis (ee.j.iz) n., a protection, a defence. + + ALPHA SOFTWARE + This is an alpha version of the aegis program. This + means that it is not the final product, or even a Beta + version. It probably has bugs, and it has known + limitations. This version is intended for testing only, + and should be used with caution in a "live" environment. + That said, the harder you use it, the more useful the + testing. If you are still interested, the author would + like to know the following: + + 1. The type of UNIX + The author will need to know the type of UNIX you + are using, and sometimes what version, or if it + is not UNIX but something else. The output of + "uname -rs" is usually sufficent (but not all + systems have it). + + 2. The Version Number + In any information you send, please include the + version number reported in the + common/patchlevel.h file, or `aegis -vers` if you + can get it to compile. + + 3. The Archive Site + When and where you obtained this version of + aegis. If you tell me nothing else, tell me this + (and, hopefully, why you did nothing else). + + 4. Unpacking + Did you have problems unpacking aegis? This + probably isn't a problem with the .tar.Z + distribution, but you could have obtained a shar + format copy. + + 5. Building + Did you have problems building aegis? This could + have been the instructions included, it could + have been the Makefile, it could have been + problems configuring it, or anything else. + + 6. Testing, Non-Set-Uid + Did you have problems with the tests? Yes, the + aegis program comes with tests! You could have + + + + 1 + + + + + + alpha(aegis) alpha(aegis) + + + had problems running them, or some of them could + have failed. If some tests fail but not others, + please let me know which ones failed. + + 7. Testing, Set-Uid-Root + Did you have problems with the tests when aegis + was set-uid-root? You could have had problems + running them, or some of them could have failed. + If some tests fail but not others, please let me + know which ones failed, and include the fact that + aegis was set-uid-root at the time. + + 8. Installation + Did you have problems installing aegis? This + could have been the instructions, or anything + else. + + At this point it would probably be a very good idea to + print out the manual entries and read them carefully. + You will also want to print a copy of the User Guide; if + you don't gave groff, there should be a PostScript copy + at the archive site. It is a known flaw that the User + Guide is incomplete, it is something the author is + working on "at this moment". (See the PRINTED MANUALS + section of the BUILDING file for more details.) + + 9. The Example Project + After reading the User Guide, it is often useful + to manually run through the example in chapter 3. + You will need to do more than one change, + hopefully several; the first change is not + representative of the system. Did you manually + do the example? Did you find flaws in the User + Guide or manual entries? + + 10. Using Aegis + Did you have problems using aegis? This is a + whole can of worms. If possible, include a shell + script similar to the tests which accompany + aegis, which reproduces the bug. Exit code 1 on + failure (bug), exit code 0 on success (for when + bug is fixed). + + 11. The Source Code + Did you read the code? Did you write some code? + If you read the code and found problems, fixed + them, or extended aegis, these contributions are + most welcome. I reserve the right to modify or + reject such contributions. + + The above list is inclusive, not exclusive. Any and all + feedback is greatly appreciated, as is the effort and + interest required to produce it. + + + + + 2 + + + + + + alpha(aegis) alpha(aegis) + + + SOME HISTORY + The idea for aegis did not come full-blown into my head + in the shower, as some of my programs do, but rather from + working for a software shop which used a simplistic form + of something similar. That system was held together by + chewing-gum and string, it was written in a disgusting + variant of Basic, and by golly the damn thing worked + (mostly). The aegis program is nothing like it, owes + none of its code to that system, and is far more + versatile. + + Since that company decided to close down our section, we + all moved on simultaneously (all 60 of us), sometimes + working together, and sometimes not, but always keeping + in touch. With suggestions and conversations with some + of them early in 1990, the manual entries for aegis took + shape, and formed most of the design document for aegis. + The rest of the design document will eventually appear in + the "model" section of the user manual. + + Since getting the first glimmerings of a functional aegis + late in 1990 it is increasingly obvious that I never want + to be without it ever again. All of my sources that I + modify are instantly placed under aegis, as is anything I + distribute. All code I write for myself, and all new + code I write for my employer, goes under aegis. Why? + Because it has fewer bugs! + + Example: one of the sources I carry with me from job to + job is "cook", my dependency maintenance tool. Cook had + existed for 3 years before aegis appeared on the scene, + and I used it daily. When I placed cook under aegis, I + found 6 bugs! Since then I have found even more. Not + only are there now fewer bugs, but they never come back, + because the regession test suite always grows. + + LICENSE + The aegis 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. + + The aegis 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., 675 Mass Ave, Cambridge, + MA 02139, USA. + + + + + 3 + + + + + + alpha(aegis) alpha(aegis) + + + It should be in the LICENSE file included in this + distribution. + + AUTHOR + Peter Miller UUCP uunet!munnari!bmr.gov.au!pmiller + /\/\* Internet pmiller@bmr.gov.au + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 4 + + Index: BUILDING *************** *** 0 **** --- 1,594 ---- + + + + build(aegis) build(aegis) + + + NAME + aegis - project change supervisor + Copyright (C) 1990, 1991, 1992, 1993 Peter Miller. + All rights reserved. + + The aegis program is distributed under the terms of the + GNU General Public License. See the LICENSE section, + below, for more details. + + aegis (ee.j.iz) n., a protection, a defence. + + SPACE REQUIREMENTS + You will need up to 10MB to unpack and build the aegis + program. (This is the worst case seen so far, most + systems have binaries about 60% as big as this, 6MB is + more typical.) Your mileage may vary. + + SITE CONFIGURATION + The file common/conf.h needs to be created to match your + site. Select an appropriate file from the conf + directory. The files in this directory are named for the + various systems encountered to date by the author. The + file most closely resembling your system should be copied + into the common/conf.h file. You can copy it or use a + symbolic link; copying is recommended because you may + need to edit. + + The common/conf.h file is extensively commented. Read + the comments and change what you need to. Please read + this file carefully. + + Another file which may require editing is the Makefile + file. The first few lines contain comments describing + what may require changing. In general these changes will + relate to the name of your favorite C compiler, and where + it keeps its include files. + + The top of the Makefile file is arranged as macro + definitions, with alternatives for each known system in + comments. Search for your system's name, editing the + macro definition as required. + + KNOWN SYSTEMS + This distribution of aegis is known to build on the + following systems: + + SunOS 4.1 + The native cc(1) and also gcc(1) are known to + work for Sun4s. The appropriate configuration is + contained in the conf/SunOS-4.1 file. Sun seem + to be having chronic problems with locking; you + may need to get the very latest set of locking + patches and apply them. + + + + + 1 + + + + + + build(aegis) build(aegis) + + + ConvexOS 10.0 + The native cc(1) works just fine. The + appropriate configuration is contained in the + conf/ConvexOS-10 file. Note that there is no + "bin" user on ConvexOS, so the owner of aegis ' + library files is "daemon"; you will need to map + user and group "bin" to "daemon" in the + instructions below. + + DG/UX 5.4.1 + The native cc(1) works just fine. The + appropriate configuration is contained in the + conf/dgux-5.4.1 file. + + ULTRIX 4.2 + It has the seteuid and setegid calls, but the + shell has no functions! Complain to your vendor. + You will need to change the SHELL macro + definition in the Makefile file to use sh5(1) + instead. The appropriate configuration is + contained in the conf/ULTRIX-4.2 file. + + Pyramid SMP DC/OSx 1.0-92b023 + This system is pretty horrendous. Read the file + BUILDpyr included in this distribution for + instruction how to configure aegis, then follow + the rest of the instructions in this file. The + appropriate configuration is contained in the + conf/dcosx file. + + HP-UX A.08.07 + The author has been advised that the aegis + program works on this system. Could another + person confirm this, please. The appropriate + configuration is contained in the conf/hpux-8.07 + file. + + SCO 2.4 + The author has been advised that the aegis + program works on this system. Could another + person confirm this, please. The appropriate + configuration is contained in the conf/SCO-2.4 + file. + + If the instructions for any of the above systems do not + work, after you have double-checked everything, the + author would like to know. + + UNKNOWN SYSTEMS + Please let the author know of any other systems you get + aegis working on, and the modifications necessary. + Please include the differences to the Makefile file, and + the whole common/conf.h file you used. Included any + other files you edited or added. Include the output of + + + + 2 + + + + + + build(aegis) build(aegis) + + + the "uname -rs" command, if your flavour of UNIX has such + a command. + + While the aegis program was developed using gcc, this is + not the default in the Makefile file. The code uses ANSI + C features without compromising the ability to be + compiled on older C compilers. Functions mandated by the + ANSI C standard are used, because many systems provided + them, one way or another. Please let the author know of + any others you think should be added to the common/ansi.c + file. + + You may need to use some ANSI C header files which the + aegis code uses, but which some systems (as yet) fail to + provide. You will find lines at the top of the Makefile + file similar to + H = -I/usr/include -Ih + Change this to suit your system and your compiler. The + "h" directory must be searched last as it is intended to + suplement your system, not replace it. + + You will need to check the include files in the "h" + directory to see that they are suitable for your system. + You may want to delete any that your system already has. + + BUILDING AEGIS + All you should need to do is use the + % make + ...lots of output... + % + command and wait. When this finishes you should see a + directory called bin containing two files: aegis and + fmtgen. The fmtgen file is a program used in + constructing aegis and is not for general consumption. + + OTHER USEFUL SOFTWARE + Before describing how to test aegis, you may need to grab + some other free software, because the tests require it in + some cases, and because it is generally useful in others. + + cook + This is a dependency maintenance tool (DMT). An + example of a well-known DTM is make(1), however + this old failthfull is not sufficiently capable + to meet the demands placed on it by the aegis + program, but cook certainly is. The cook package + is written by the same author as aegis. The cook + package is necessary for test 11 to pass. It is + also used in the documentation. The cook program + may be found at the same archive site as the + aegis program, and in the same directory. The + cook program is available under the terms of the + GNU General Public License. + + + + + 3 + + + + + + build(aegis) build(aegis) + + + RCS + This is a source control package, and is + available from any of the GNU archives. The + tests use RCS as the history mechanism, so it is + necessary to have RCS for most of the tests to + pass. + + GNU diff + If the diff(1) utility supplied by your flavor of + unix does not have the -c option, you will need + GNU diff to make patch files, if you want to + publish software for FTP or on USENET. Context + differences are also helpful for reviewing + changes. + + groff + This GNU software replaces the documentation + tools which (sometimes) come with UNIX. They + produce superior error messages, and support a + wider range of functionality and fonts. The + aegis User Guide was prepared with groff. + + bison + This GNU software is a replacement for yacc(1). + Some systems have very sick yaccs, and this may + be necessary if your system include files + disagree strongly with your system's yacc. The + Makefile has bison setup in comments. + + fhist + This software, available under the terms of the + GNU General Public License, is a set of file + history and comparison utilities. It was + originally written by David I. Bell, and is based + on the minimal difference algorithm by Eugene W. + Myers. This copy is enhanced and maintained by + the same author as aegis, and may be found at the + same archive site, in the same directory. + + TESTING AEGIS + The aegis program comes with a test suite. To run this + test suite, use the command + % make sure + ...lots of output... + Passed All Tests + % + + The tests take a minute or two each, with a few very + fast, and a couple very slow, but it varies greatly + depending on your CPU. + + The tests assume that the RCS commands "ci", "co", "rlog" + and "rcs" are somewhere in the command search PATH. + + + + + 4 + + + + + + build(aegis) build(aegis) + + + The test/00/t0011a.sh file assumes the cook(1) command by + the author is somewhere in the command search path. This + test reproduces the example used in Chapter 3 of the User + Guide. + + If you are using Sun's tmpfs file system as your /tmp + directory, the tests will fail. This is because the + tmpfs file system does not support file locking. Set the + AEGIS_TMP environment variable to somewhere else before + running the tests. Something like + % setenv AEGIS_TMP /usr/tmp + % + is usually sufficient if you are using C shell, or + $ AEGIS_TMP=/usr/tmp + $ export AEGIS_TMP + $ + if you are using Bourne shell. Remember, this must be + done before running the tests. + + If the tests fail due to errors complaining of "user too + privileged" you will need to adjust the AEGIS_MIN_UID + define in the common/conf.h file. Similarly for "group + too privileged", although this is rarer. This error + message will also occur if you run the tests as root: the + tests must be run as a mortal each time. + + TESTING SET-UID-ROOT + If the aegis program is not set-uid-root then it runs in + "test" mode which gives you some confidence that aegis is + working before being tested again when it is set-uid- + root. Two pass testing like this means that you need not + trust your system to a set-uid-root program which is not + known to work. + + You will need to do a little of the install, to create + the directory which will contain aegis' lock file. + # mkdir /usr/local/lib/aegis + # chmod 755 /usr/local/lib/aegis + # chown bin /usr/local/lib/aegis + # chgrp bin /usr/local/lib/aegis + # + You will need to change aegis to be set-uid-root. This + may be done with the following commands: + # chown root bin/aegis + # chmod u+s bin/aegis + # + Once aegis is set-uid-root, it is tested again, in the + same manner as before. + % make sure + ...lots of output... + Passed All Tests + % + + You should test aegis as a mortal in both passes, rather + + + + 5 + + + + + + build(aegis) build(aegis) + + + than as root, to be sure the set-uid-root functionality + is working correctly. + + INSTALLING AEGIS + Put the aegis program somewhere where users will + automatically pick it up, such as in the /usr/local/bin + directory. Use the command + # cp bin/aegis /usr/local/bin + # + Don't forget to make sure that the copy is set-uid-root, + some versions of cp do not transfer the set-uid bit of + the mode. + + The manuals can be installed using the commands + # sh man1/install.sh /usr/local/man/man1 + # sh man5/install.sh /usr/local/man/man5 + # + but this is very site specific. You can select a + different path by changing the last argument. + + By default, aegis is configured to use + /usr/local/lib/aegis as the place it stores the table + containing the mapping from project name to project + directory, and indexes into this table. The aegis + program also has example .cshrc and .profile files, and + generic notification scripts. These can be copied to + this library as follows: + # mkdir /usr/local/lib/aegis + # chmod 755 /usr/local/lib/aegis + # chown bin /usr/local/lib/aegis + # chgrp bin /usr/local/lib/aegis + # cp lib/* /usr/local/lib/aegis + # chmod a+r /usr/local/lib/aegis/* + # chmod a+x /usr/local/lib/aegis/*.sh + # + This is only an example, and you may want to place this + somewhere else. Control of the placement of this + directory may be found in the first few lines of the + Makefile file. + + All of the above install can be done automatically, using + the "make install" command as root. Control of the + directories used may be found in the first few lines of + the Makefile file. + + USER CONFIGURATION + The aegis command is assumed to be in a generally + accessable place, otherwise users will need to add the + relevant directory to their PATH. Users should add + source /usr/local/lib/aegis/cshrc + to the end of their .cshrc file for the recommended + aliases. There is a profile for users of the Bourne + shell (it assumes you have a version of the Bourne shell + which has functions). + + + + 6 + + + + + + build(aegis) build(aegis) + + + The /usr/local/lib/aegis/state file contains pointers to + "system" projects. Users may add their own project + pointers (to their own projects) by putting a search path + into the AEGIS environment variable. The system part is + always automatically appended by aegis. The default, + already set by the /usr/local/lib/aegis/cshrc file, is + $HOME/lib/aegis. Do not create this directory, aegis is + finickey and wants to do this itself. + + Where projects reside is completely flexible, be they + system projects or user projects. They are not kept + under the /usr/local/lib/aegis directory, this directory + only contains pointers. + + PRINTED MANUALS + This distribution contains the sources to all of the + documentation for aegis. The author used the GNU groff + package and a postscript printer to prepare the + documentation. If you do not have this software, you + will need to substitute commands appropriate to your + site. + + To print copies of the README, BUILDING and ALPHA files, + the following commands may be used + % groff -t -man aux/*.man | lpr + % + This will produce about 12 pages. The "-t" flag means + preprocess with tbl(1). + + To print copies of the manual entries, the following + commands may be used + % cd man1 + % groff -s -t -man *.1 | lpr + % cd ../man5 + % groff -s -t -man *.5 | lpr + % cd .. + % + This will produce about 60 pages. The "-s" flag means + preprocess with soelim(1), and the "-t" flag means + preprocess with tbl(1). + + To print a copy of the User Guide, the following commands + may be used + % cd doc + % groff -s -t -p -ms aegis.ms | lpr + % cd .. + % + This will produce about 90 pages. The "-s" flag means + preprocess with soelim(1), the "-t" flag means preprocess + with tbl(1), and the "-p" flag means preprocess with + pic(1). Alternatively, you could get a PostScript copy + of the User Guide from the archive site. + + Please note the the User Guide is still in the process of + + + + 7 + + + + + + build(aegis) build(aegis) + + + being written. Some sections of the User Guide are + incomplete. Feedback on the form and content of this + document would be most welcome. + + GETTING HELP + This is alpha software, so things will probably go wrong. + Thank you for your patience. + + If you need assistance with the aegis program, please do + not hesitate to contact the author at + Peter Miller + Any and all feedback is welcome. + + When reporting problems, please include the version + number given by the + % aegis -version + aegis version a.b.cccc + ... + % + command. + + In the common/main.h file, the is a define of DEBUG in + comments. If the comments are removed, extensive + debugging is turned on. This causes some performance + loss, but performs much run-time checking and adds the + -TRace command line option. + + When the -TRace command line option is followed by one or + more file names, it turns on execution traces in those + source files. It is usually best to place this on the + end of the command line so that names of the files to be + traced are not confused with other file names or strings + on the command line. + + LICENSE + The aegis 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. + + The aegis 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. + + It should be in the LICENSE file included in this + distribution. + + + + + + + + + 8 + + + + + + build(aegis) build(aegis) + + + AUTHOR + Peter Miller UUCP uunet!munnari!bmr.gov.au!pmiller + /\/\* Internet pmiller@bmr.gov.au + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 9 + + Index: CHANGES *************** *** 0 **** --- 1,2934 ---- + + + + Project "aegis.1.4" Page 1 + List of Changes Tue Mar 30 23:57:23 1993 + + Change State Description + ------- ------- ------------- + 1 completed New release derived from aegis.1.3. + 2 completed create the aermpr command + 3 completed aenrls dumped core for non-owner but worked for + owner + 4 completed implement the aencu functionality + 5 completed implement the aedbu functionality + 6 completed note that ULTRIX was tried + 7 completed add a build lock, to protect builds from + integrate pass + 8 completed clear build time and diff time fields of config + copied into a change + 9 completed add the AEGIS_PROJECT and AEGIS_CHANGE + environment variables + 10 completed improve handling of outomounter directories + 11 completed document CVS vs Aegis + 12 completed complete the chapter 3 example in the User Guide + 13 completed inprove failure messages from tests + 14 completed make automounter handling more robust + 15 completed unix permissions for projects + 16 completed improve command substitutions + 17 completed change configuration to use new substitutions + 18 completed improve copyright notices + 19 completed add substitutions to file templates + 20 completed add support for the GNU long option style + 21 completed stop using _t suffix on type names + 22 completed and config details for AIX + 23 completed add support for systems without seteuid + 24 completed allow nomination of temp test dir + 25 completed rationalize lib entries + 26 completed fix problems with ULTRIX + 27 completed fix a bug in the no-seteuid flavour + 28 completed more documentation + 29 completed pyramid port + 30 completed improve pyramid port + 31 completed there was a permissions bug in aeibu + 32 completed fix problems found in final testing + 33 completed fix bugs in aecp and column output + 34 completed note hpux as a known port + 35 completed New_Project does not check uid + 36 being_ fix minor problem with generated Makefile + integrated + + + + Project "aegis.1.4", Change 1 Page 1 + Change Details Tue Mar 30 23:57:27 1993 + + NAME + Project "aegis.1.4", Delta 1, Change 1. + + SUMMARY + New release derived from aegis.1.3. + + DESCRIPTION + New release derived from aegis.1.3. + + This change is exempt from testing. This change is exempt from + testing against the baseline. + + CAUSE + This change was caused by internal_enhancement. + + FILES + Type Action Edit File Name + ------- ------- ------- ----------- + source create 1 COPYING + source create 1 aegis/administ.c + source create 1 aegis/administ.h + source create 1 aegis/arglex2.h + source create 1 aegis/build.c + source create 1 aegis/build.h + source create 1 aegis/cattr.def + source create 1 aegis/cattr_ed.c + source create 1 aegis/cattr_ed.h + source create 1 aegis/change.c + source create 1 aegis/change.h + source create 1 aegis/chdir.c + source create 1 aegis/chdir.h + source create 1 aegis/col.c + source create 1 aegis/col.h + source create 1 aegis/commit.c + source create 1 aegis/commit.h + source create 1 aegis/common.def + source create 1 aegis/copyfile.c + source create 1 aegis/copyfile.h + source create 1 aegis/cstate.def + source create 1 aegis/develop1.c + source create 1 aegis/develop1.h + source create 1 aegis/develop2.c + source create 1 aegis/develop2.h + source create 1 aegis/diff.c + source create 1 aegis/diff.h + source create 1 aegis/dir.c + source create 1 aegis/dir.h + source create 1 aegis/file.c + source create 1 aegis/file.h + source create 1 aegis/gonzo.c + source create 1 aegis/gonzo.h + source create 1 aegis/gram.h + source create 1 aegis/gram.y + source create 1 aegis/gstate.def + source create 1 aegis/help.c + source create 1 aegis/help.h + source create 1 aegis/integra1.c + + + + Project "aegis.1.4", Change 1 Page 2 + Change Details Tue Mar 30 23:57:27 1993 + + Type Action Edit File Name + ------- ------- ------- ----------- + source create 1 aegis/integra1.h + source create 1 aegis/integra2.c + source create 1 aegis/integra2.h + source create 1 aegis/io.c + source create 1 aegis/io.h + source create 1 aegis/lex.c + source create 1 aegis/lex.h + source create 1 aegis/list.c + source create 1 aegis/list.h + source create 1 aegis/lock.c + source create 1 aegis/lock.h + source create 1 aegis/log.c + source create 1 aegis/log.h + source create 1 aegis/main.c + source create 1 aegis/new_chan.c + source create 1 aegis/new_chan.h + source create 1 aegis/new_file.c + source create 1 aegis/new_file.h + source create 1 aegis/new_proj.c + source create 1 aegis/new_proj.h + source create 1 aegis/new_rele.c + source create 1 aegis/new_rele.h + source create 1 aegis/new_test.c + source create 1 aegis/new_test.h + source create 1 aegis/os.c + source create 1 aegis/os.h + source create 1 aegis/pager.c + source create 1 aegis/pager.h + source create 1 aegis/parse.c + source create 1 aegis/parse.h + source create 1 aegis/pattr.def + source create 1 aegis/pattr_ed.c + source create 1 aegis/pattr_ed.h + source create 1 aegis/pconf.def + source create 1 aegis/project.c + source create 1 aegis/project.h + source create 1 aegis/pstate.def + source create 1 aegis/rem_file.c + source create 1 aegis/rem_file.h + source create 1 aegis/review.c + source create 1 aegis/review.h + source create 1 aegis/reviewer.c + source create 1 aegis/reviewer.h + source create 1 aegis/sub.c + source create 1 aegis/sub.h + source create 1 aegis/test.c + source create 1 aegis/test.h + source create 1 aegis/type.c + source create 1 aegis/type.h + source create 1 aegis/uconf.def + source create 1 aegis/undo.c + source create 1 aegis/undo.h + source create 1 aegis/user.c + source create 1 aegis/user.h + source create 1 aegis/ustate.def + + + + Project "aegis.1.4", Change 1 Page 3 + Change Details Tue Mar 30 23:57:27 1993 + + Type Action Edit File Name + ------- ------- ------- ----------- + source create 1 aegis/version.c + source create 1 aegis/version.h + source create 1 aux/ALPHA.man + source create 1 aux/BUILDING.man + source create 1 aux/CHANGES.sh + source create 1 aux/Howto.cook + source create 1 aux/MANIFEST.sh + source create 1 aux/Makefile.awk + source create 1 aux/Makefile.sh + source create 1 aux/README.man + source create 1 aux/patches.sh + source create 1 common/ansi.c + source create 1 common/arglex.c + source create 1 common/arglex.h + source create 1 common/error.c + source create 1 common/error.h + source create 1 common/indent.c + source create 1 common/indent.h + source create 1 common/main.h + source create 1 common/mem.c + source create 1 common/mem.h + source create 1 common/option.c + source create 1 common/option.h + source create 1 common/s-v-arg.h + source create 1 common/str.c + source create 1 common/str.h + source create 1 common/trace.c + source create 1 common/trace.h + source create 1 common/word.c + source create 1 common/word.h + source create 1 conf/ConvexOS-10 + source create 1 conf/SunOS-4.1.1 + source create 1 conf/SunOS-4.1.2 + source create 1 conf/SunOS-4.1.3 + source create 1 conf/SysV-4.0 + source create 1 conf/dgux-5.4.1 + source create 1 config + source create 1 doc/aegis.ms + source create 1 doc/c1.0.so + source create 1 doc/c1.1.so + source create 1 doc/c1.2.so + source create 1 doc/c1.3.so + source create 1 doc/c1.4.so + source create 1 doc/c2.0.so + source create 1 doc/c2.1.so + source create 1 doc/c2.2.so + source create 1 doc/c2.3.so + source create 1 doc/c2.4.so + source create 1 doc/c3.0.so + source create 1 doc/c3.1.so + source create 1 doc/c3.2.so + source create 1 doc/c3.3.so + source create 1 doc/c4.0.so + source create 1 doc/c4.1.so + source create 1 doc/c4.2.so + + + + Project "aegis.1.4", Change 1 Page 4 + Change Details Tue Mar 30 23:57:27 1993 + + Type Action Edit File Name + ------- ------- ------- ----------- + source create 1 doc/c4.3.so + source create 1 doc/c5.0.so + source create 1 doc/c6.0.so + source create 1 doc/c7.0.so + source create 1 doc/c7.1.so + source create 1 doc/c7.2.so + source create 1 doc/c7.4.so + source create 1 doc/c7.5.so + source create 1 doc/cA.0.so + source create 1 doc/cB.0.so + source create 1 dot.cshrc + source create 1 dot.profile + source create 1 fmtgen/id.c + source create 1 fmtgen/id.h + source create 1 fmtgen/lex.c + source create 1 fmtgen/lex.h + source create 1 fmtgen/main.c + source create 1 fmtgen/parse.h + source create 1 fmtgen/parse.y + source create 1 fmtgen/type.c + source create 1 fmtgen/type.h + source create 1 fmtgen/type_enum.c + source create 1 fmtgen/type_integ.c + source create 1 fmtgen/type_list.c + source create 1 fmtgen/type_ref.c + source create 1 fmtgen/type_strin.c + source create 1 fmtgen/type_struc.c + source create 1 h/stdarg.h-min + source create 1 h/stddef.h + source create 1 h/stdlib.h + source create 1 man1/aeb.1 + source create 1 man1/aeca.1 + source create 1 man1/aecd.1 + source create 1 man1/aecp.1 + source create 1 man1/aecpu.1 + source create 1 man1/aed.1 + source create 1 man1/aedb.1 + source create 1 man1/aedbu.1 + source create 1 man1/aede.1 + source create 1 man1/aedeu.1 + source create 1 man1/aegis.1 + source create 1 man1/aeib.1 + source create 1 man1/aeibu.1 + source create 1 man1/aeif.1 + source create 1 man1/aeip.1 + source create 1 man1/ael.1 + source create 1 man1/aena.1 + source create 1 man1/aenc.1 + source create 1 man1/aencu.1 + source create 1 man1/aend.1 + source create 1 man1/aenf.1 + source create 1 man1/aenfu.1 + source create 1 man1/aeni.1 + source create 1 man1/aenpr.1 + source create 1 man1/aenrls.1 + + + + Project "aegis.1.4", Change 1 Page 5 + Change Details Tue Mar 30 23:57:27 1993 + + Type Action Edit File Name + ------- ------- ------- ----------- + source create 1 man1/aenrv.1 + source create 1 man1/aent.1 + source create 1 man1/aentu.1 + source create 1 man1/aepa.1 + source create 1 man1/aera.1 + source create 1 man1/aerd.1 + source create 1 man1/aerf.1 + source create 1 man1/aeri.1 + source create 1 man1/aerm.1 + source create 1 man1/aermu.1 + source create 1 man1/aerp.1 + source create 1 man1/aerpr.1 + source create 1 man1/aerpu.1 + source create 1 man1/aerrv.1 + source create 1 man1/aet.1 + source create 1 man1/aev.1 + source create 1 man1/install.sh + source create 1 man1/o__rules.so + source create 1 man1/o_anticip.so + source create 1 man1/o_auto.so + source create 1 man1/o_baselin.so + source create 1 man1/o_change.so + source create 1 man1/o_devdir.so + source create 1 man1/o_dir.so + source create 1 man1/o_help.so + source create 1 man1/o_indep.so + source create 1 man1/o_keep.so + source create 1 man1/o_lib.so + source create 1 man1/o_list.so + source create 1 man1/o_major.so + source create 1 man1/o_manual.so + source create 1 man1/o_min.so + source create 1 man1/o_minor.so + source create 1 man1/o_nolog.so + source create 1 man1/o_overw.so + source create 1 man1/o_page.so + source create 1 man1/o_project.so + source create 1 man1/o_terse.so + source create 1 man1/o_verbose.so + source create 1 man1/z_cr.so + source create 1 man1/z_exit.so + source create 1 man1/z_intuit.so + source create 1 man1/z_name.so + source create 1 man5/aecattr.5 + source create 1 man5/aecstate.5 + source create 1 man5/aedir.5 + source create 1 man5/aegis.5 + source create 1 man5/aegstate.5 + source create 1 man5/aepattr.5 + source create 1 man5/aepconf.5 + source create 1 man5/aepstate.5 + source create 1 man5/aeuconf.5 + source create 1 man5/aeustate.5 + source create 1 man5/install.sh + source create 1 man5/z_cr.so + + + + Project "aegis.1.4", Change 1 Page 6 + Change Details Tue Mar 30 23:57:27 1993 + + Type Action Edit File Name + ------- ------- ------- ----------- + source create 1 man5/z_name.so + source create 1 notify/de.sh + source create 1 notify/deu.sh + source create 1 notify/if.sh + source create 1 notify/ip.sh + source create 1 notify/rf.sh + source create 1 notify/rp.sh + source create 1 notify/rpu.sh + test create 1 test/00/t0001a.sh + test create 1 test/00/t0002a.sh + test create 1 test/00/t0003a.sh + test create 1 test/00/t0004a.sh + test create 1 test/00/t0005a.sh + test create 1 test/00/t0006a.sh + test create 1 test/00/t0007a.sh + test create 1 test/00/t0008a.sh + test create 1 test/00/t0009a.sh + test create 1 test/00/t0010a.sh + test create 1 test/00/t0011a.sh + + HISTORY + What When Who Comment + ------ ------ ----- --------- + new_change Thu Jan 7 pmiller + 16:12:43 1993 1 + develop_begin Thu Jan 7 pmiller + 16:12:43 1993 1 + develop_end Thu Jan 7 pmiller + 16:12:43 1993 1 + review_pass Thu Jan 7 pmiller + 16:12:43 1993 1 + integrate_begin Thu Jan 7 pmiller + 16:12:43 1993 1 + integrate_pass Thu Jan 7 pmiller + 16:21:54 1993 1 + + + + Project "aegis.1.4", Change 2 Page 1 + Change Details Tue Mar 30 23:57:28 1993 + + NAME + Project "aegis.1.4", Delta 2, Change 2. + + SUMMARY + create the aermpr command + + DESCRIPTION + create the aermpr command + + CAUSE + This change was caused by internal_enhancement. + + FILES + Type Action Edit File Name + ------- ------- ------- ----------- + source modify 2 aegis/gonzo.c + source modify 2 aegis/gonzo.h + source modify 2 aegis/integra2.c + source modify 2 aegis/main.c + source create 1 aegis/rem_proj.c + source create 1 aegis/rem_proj.h + source modify 2 man1/aegis.1 + source create 1 man1/aermpr.1 + source remove 1 man1/aerpr.1 + source modify 2 man1/o_keep.so + test create 1 test/00/t0012a.sh + + HISTORY + What When Who Comment + ------ ------ ----- --------- + new_change Thu Jan 7 pmiller + 21:34:50 1993 + develop_begin Thu Jan 7 pmiller Elapsed time: 1.084 + 21:35:17 1993 days. + develop_end Fri Jan 8 pmiller + 22:12:52 1993 + review_pass Fri Jan 8 pmiller + 22:13:05 1993 + integrate_begin Fri Jan 8 pmiller Elapsed time: 0.060 + 22:13:57 1993 days. + integrate_pass Fri Jan 8 pmiller + 22:40:53 1993 + + + + Project "aegis.1.4", Change 3 Page 1 + Change Details Tue Mar 30 23:57:28 1993 + + NAME + Project "aegis.1.4", Delta 3, Change 3. + + SUMMARY + aenrls dumped core for non-owner but worked for owner + + DESCRIPTION + The aenrls command dumped core for non-owner but worked for + owner, because group field of the new project was being + referenced before it was initialized. It worked for the owner + because that user has been seen earlier, and so the project's + group was never queried. + + This change is exempt from testing. This change is exempt from + testing against the baseline. + + CAUSE + This change was caused by internal_bug. + + FILES + Type Action Edit File Name + ------- ------- ------- ----------- + source modify 2 aegis/new_rele.c + source modify 2 dot.cshrc + source modify 2 dot.profile + + HISTORY + What When Who Comment + ------ ------ ----- --------- + new_change Fri Jan 8 pmiller + 22:42:58 1993 + develop_begin Fri Jan 8 pmiller Elapsed time: 0.812 + 22:43:12 1993 days. + develop_end Sat Jan 9 pmiller + 21:18:24 1993 + develop_end_ Sat Jan 9 pmiller Elapsed time: 0.054 + undo 21:19:10 1993 days. + develop_end Sat Jan 9 pmiller + 21:43:31 1993 + review_pass Sat Jan 9 pmiller + 21:43:40 1993 + integrate_begin Sat Jan 9 pmiller Elapsed time: 0.050 + 21:44:28 1993 days. + integrate_pass Sat Jan 9 pmiller + 22:06:50 1993 + + + + Project "aegis.1.4", Change 4 Page 1 + Change Details Tue Mar 30 23:57:29 1993 + + NAME + Project "aegis.1.4", Delta 4, Change 4. + + SUMMARY + implement the aencu functionality + + DESCRIPTION + Implement the -New_Change_Undo functionality + + CAUSE + This change was caused by internal_enhancement. + + FILES + Type Action Edit File Name + ------- ------- ------- ----------- + source modify 2 aegis/new_chan.c + source modify 2 aegis/project.c + source modify 2 aegis/project.h + test create 1 test/00/t0013a.sh + + HISTORY + What When Who Comment + ------ ------ ----- --------- + new_change Sat Jan 9 pmiller + 22:08:25 1993 + develop_begin Sat Jan 9 pmiller Elapsed time: 1.065 + 22:08:49 1993 days. + develop_end Sun Jan 10 pmiller + 22:38:12 1993 + review_pass Sun Jan 10 pmiller + 22:38:55 1993 + integrate_begin Sun Jan 10 pmiller Elapsed time: 0.052 + 22:39:54 1993 days. + integrate_pass Sun Jan 10 pmiller + 23:03:27 1993 + + + + Project "aegis.1.4", Change 5 Page 1 + Change Details Tue Mar 30 23:57:30 1993 + + NAME + Project "aegis.1.4", Delta 5, Change 5. + + SUMMARY + implement the aedbu functionality + + DESCRIPTION + implement the aedbu functionality + + CAUSE + This change was caused by internal_enhancement. + + FILES + Type Action Edit File Name + ------- ------- ------- ----------- + source modify 2 aegis/develop2.c + test create 1 test/00/t0014a.sh + + HISTORY + What When Who Comment + ------ ------ ----- --------- + new_change Sun Jan 10 pmiller + 23:04:57 1993 + develop_begin Sun Jan 10 pmiller Elapsed time: 0.000 + 23:05:04 1993 days. + develop_end Mon Jan 11 pmiller + 11:13:41 1993 + review_pass Mon Jan 11 pmiller + 11:13:51 1993 + integrate_begin Mon Jan 11 pmiller Elapsed time: 0.126 + 11:14:36 1993 days. + integrate_pass Mon Jan 11 pmiller + 12:11:06 1993 + + + + Project "aegis.1.4", Change 6 Page 1 + Change Details Tue Mar 30 23:57:30 1993 + + NAME + Project "aegis.1.4", Delta 6, Change 6. + + SUMMARY + note that ULTRIX was tried + + DESCRIPTION + A build of aegis as tried on ULTRIX 4.2. It failed, + because the ULTRIX Bourne shell does not have functions. + Complain to your vendor. + + This change is exempt from testing. This change is exempt from + testing against the baseline. + + CAUSE + This change was caused by internal_enhancement. + + FILES + Type Action Edit File Name + ------- ------- ------- ----------- + source modify 2 aux/BUILDING.man + source modify 2 aux/README.man + source create 1 conf/ULTRIX-4.2 + + HISTORY + What When Who Comment + ------ ------ ----- --------- + new_change Mon Jan 11 pmiller + 12:12:07 1993 + develop_begin Mon Jan 11 pmiller Elapsed time: 0.025 + 12:12:18 1993 days. + develop_end Mon Jan 11 pmiller + 12:23:22 1993 + review_pass Mon Jan 11 pmiller + 12:23:49 1993 + integrate_begin Mon Jan 11 pmiller Elapsed time: 0.059 + 12:24:43 1993 days. + integrate_pass Mon Jan 11 pmiller + 12:51:09 1993 + + + + Project "aegis.1.4", Change 7 Page 1 + Change Details Tue Mar 30 23:57:31 1993 + + NAME + Project "aegis.1.4", Delta 7, Change 7. + + SUMMARY + add a build lock, to protect builds from integrate pass + + DESCRIPTION + It is possible that if an integrate pass were to happen buring + a development build, then the build could fail, because it was + started with one baseline with includes and objects, and + completed with a different baseline with includes and objects, + albeit with the same name. + + To prevent this, a build lock is taken by builds (non + exclusive) and by integrate pass (exclusive) to prevent this + from happenning. + + My thanks to Neil Justusson + for reporting this problem. + + This change is exempt from testing. This change is exempt from + testing against the baseline. + + CAUSE + This change was caused by external_bug. + + FILES + Type Action Edit File Name + ------- ------- ------- ----------- + source modify 2 aegis/build.c + source modify 3 aegis/integra2.c + source modify 2 aegis/lock.c + source modify 2 aegis/lock.h + source modify 3 aegis/new_rele.c + source modify 3 aegis/project.c + source modify 3 aegis/project.h + + HISTORY + What When Who Comment + ------ ------ ----- --------- + new_change Mon Jan 11 pmiller + 12:58:27 1993 + develop_begin Mon Jan 11 pmiller Elapsed time: 0.207 + 12:58:36 1993 days. + develop_end Mon Jan 11 pmiller + 14:31:50 1993 + develop_end_ Mon Jan 11 pmiller + undo 14:33:31 1993 + develop_end Mon Jan 11 pmiller + 14:41:05 1993 + review_pass Mon Jan 11 pmiller + 14:51:01 1993 + integrate_begin Mon Jan 11 pmiller Elapsed time: 0.892 + 14:51:54 1993 days. + integrate_pass Mon Jan 11 pmiller + 21:33:16 1993 + + + + Project "aegis.1.4", Change 8 Page 1 + Change Details Tue Mar 30 23:57:32 1993 + + NAME + Project "aegis.1.4", Delta 8, Change 8. + + SUMMARY + clear build time and diff time fields of config copied into a + change + + DESCRIPTION + It was possible to deceive aegis about the success or otherwise + of builds and diferences, by manipulating the config file. By + invalidating builds and differences when the config file is + added to or removed from a change, this ability goes away. + + Update the manual entries to describe the build lock. + + This change is exempt from testing. This change is exempt from + testing against the baseline. + + CAUSE + This change was caused by internal_bug. + + FILES + Type Action Edit File Name + ------- ------- ------- ----------- + source modify 3 aegis/build.c + source modify 2 aegis/copyfile.c + source modify 4 aegis/integra2.c + source modify 2 man1/aeb.1 + source modify 2 man1/aecp.1 + source modify 2 man1/aecpu.1 + source modify 2 man1/aeip.1 + source create 1 man1/o_bld_lk.so + + HISTORY + What When Who Comment + ------ ------ ----- --------- + new_change Mon Jan 11 pmiller + 21:37:50 1993 + develop_begin Mon Jan 11 pmiller Elapsed time: 0.138 + 21:38:06 1993 days. + develop_end Mon Jan 11 pmiller + 22:40:25 1993 + review_pass Mon Jan 11 pmiller + 22:40:36 1993 + integrate_begin Mon Jan 11 pmiller Elapsed time: 0.056 + 22:41:28 1993 days. + integrate_pass Mon Jan 11 pmiller + 23:06:27 1993 + + + + Project "aegis.1.4", Change 9 Page 1 + Change Details Tue Mar 30 23:57:33 1993 + + NAME + Project "aegis.1.4", Delta 9, Change 9. + + SUMMARY + add the AEGIS_PROJECT and AEGIS_CHANGE environment variables + + DESCRIPTION + 1. Experience has shown that these envionment variables are + essential to allow aegis to be used by more than one project. + Users frequently work on one project while waiting for a build + on another. + 2. allow administrators to delete projects, not just owners + (since administrators may initiate -NewRelease) + + This change is exempt from testing. This change is exempt from + testing against the baseline. + + CAUSE + This change was caused by internal_enhancement. + + FILES + Type Action Edit File Name + ------- ------- ------- ----------- + source modify 2 aegis/administ.c + source modify 4 aegis/build.c + source modify 2 aegis/cattr_ed.c + source modify 2 aegis/chdir.c + source modify 3 aegis/copyfile.c + source modify 2 aegis/develop1.c + source modify 3 aegis/develop2.c + source modify 2 aegis/diff.c + source modify 2 aegis/integra1.c + source modify 5 aegis/integra2.c + source modify 2 aegis/list.c + source modify 3 aegis/new_chan.c + source modify 2 aegis/new_file.c + source modify 2 aegis/new_test.c + source modify 2 aegis/pattr_ed.c + source modify 2 aegis/rem_file.c + source modify 2 aegis/rem_proj.c + source modify 2 aegis/review.c + source modify 2 aegis/reviewer.c + source modify 2 aegis/test.c + source modify 2 aegis/uconf.def + source modify 2 aegis/user.c + source modify 2 man1/aermpr.1 + source modify 2 man1/o_change.so + source modify 2 man1/o_project.so + source modify 2 man5/aeuconf.5 + + HISTORY + What When Who Comment + ------ ------ ----- --------- + new_change Mon Jan 11 pmiller + 23:07:58 1993 + develop_begin Mon Jan 11 pmiller Elapsed time: 0.080 + 23:08:11 1993 days. + + + + Project "aegis.1.4", Change 9 Page 2 + Change Details Tue Mar 30 23:57:33 1993 + + What When Who Comment + ------ ------ ----- --------- + develop_end Tue Jan 12 pmiller + 16:14:21 1993 + review_pass Tue Jan 12 pmiller + 16:14:33 1993 + integrate_begin Tue Jan 12 pmiller Elapsed time: 0.067 + 16:15:24 1993 days. + integrate_pass Tue Jan 12 pmiller + 16:45:26 1993 + + + + Project "aegis.1.4", Change 10 Page 1 + Change Details Tue Mar 30 23:57:34 1993 + + NAME + Project "aegis.1.4", Delta 11, Change 10. + + SUMMARY + improve handling of outomounter directories + + DESCRIPTION + The simplistic method used for coping with the automounter + proved ineffective, because it assumed (among other things) + that the mounts would be direct mounts. A more robust method, + invokving searching the /etc/mtab file for mount information, + has been implemented. + + My thanks to Malcolm C. Strickland for reporting this problem. (And + probably numerous others in the coming days.) + + There are some systems out there which use a getmnt() system + call, rather than have a /etc/mtab file. I don't have access + to one, so this case is not handled by this change. Volunteers? + + This change is exempt from testing. This change is exempt from + testing against the baseline. + + CAUSE + This change was caused by external_bug. + + FILES + Type Action Edit File Name + ------- ------- ------- ----------- + source create 1 aegis/automount.c + source create 1 aegis/automount.h + source modify 3 aegis/gonzo.c + source modify 2 aegis/os.c + source modify 2 aux/Howto.cook + source modify 3 aux/README.man + source modify 2 conf/ConvexOS-10 + source modify 2 conf/SunOS-4.1.1 + source modify 2 conf/SunOS-4.1.2 + source modify 2 conf/SunOS-4.1.3 + source modify 2 conf/SysV-4.0 + source modify 2 conf/ULTRIX-4.2 + source modify 2 conf/dgux-5.4.1 + + HISTORY + What When Who Comment + ------ ------ ----- --------- + new_change Fri Jan 22 pmiller + 10:07:13 1993 + develop_begin Fri Jan 22 pmiller Elapsed time: 0.621 + 10:07:19 1993 days. + develop_end Fri Jan 22 pmiller + 14:46:56 1993 + review_pass Fri Jan 22 pmiller + 14:47:07 1993 + integrate_begin Fri Jan 22 pmiller + 14:47:58 1993 + + + + Project "aegis.1.4", Change 10 Page 2 + Change Details Tue Mar 30 23:57:34 1993 + + What When Who Comment + ------ ------ ----- --------- + integrate_fail Fri Jan 22 pmiller awk bew its brains out + 14:55:21 1993 in creating Makefile. + Replace it with gawk. + Elapsed time: 0.059 + days. + develop_end Fri Jan 22 pmiller + 15:21:52 1993 + review_pass Fri Jan 22 pmiller + 15:25:59 1993 + integrate_begin Fri Jan 22 pmiller Elapsed time: 0.127 + 15:26:53 1993 days. + integrate_pass Fri Jan 22 pmiller + 16:23:51 1993 + + + + Project "aegis.1.4", Change 11 Page 1 + Change Details Tue Mar 30 23:57:35 1993 + + NAME + Project "aegis.1.4", Delta 12, Change 11. + + SUMMARY + document CVS vs Aegis + + DESCRIPTION + add a comparison of CVS to the documentation and to the README + file. + + The people who asked for this information are too numerous to + remember. Thank you all for prompting me for this information. + + This change is exempt from testing. This change is exempt from + testing against the baseline. + + CAUSE + This change was caused by internal_enhancement. + + FILES + Type Action Edit File Name + ------- ------- ------- ----------- + source modify 3 aux/Howto.cook + source modify 4 aux/README.man + source modify 2 doc/aegis.ms + source modify 2 doc/c7.4.so + source create 1 doc/cC.0.so + + HISTORY + What When Who Comment + ------ ------ ----- --------- + new_change Sun Jan 24 pmiller + 09:21:25 1993 + develop_begin Sun Jan 24 pmiller Elapsed time: 0.000 + 09:22:21 1993 days. + develop_end Sun Jan 24 pmiller + 23:30:22 1993 + review_pass Sun Jan 24 pmiller + 23:30:30 1993 + integrate_begin Sun Jan 24 pmiller Elapsed time: 0.000 + 23:31:31 1993 days. + integrate_pass Mon Jan 25 pmiller + 09:31:26 1993 + + + + Project "aegis.1.4", Change 12 Page 1 + Change Details Tue Mar 30 23:57:35 1993 + + NAME + Project "aegis.1.4", Delta 29, Change 12. + + SUMMARY + complete the chapter 3 example in the User Guide + + DESCRIPTION + complete the chapter 3 example in the User Guide + + This change is exempt from testing against the baseline. + + CAUSE + This change was caused by internal_enhancement. + + FILES + Type Action Edit File Name + ------- ------- ------- ----------- + source modify 9 aegis/diff.c + source modify 3 aegis/help.c + source modify 8 aux/Howto.cook + source modify 4 aux/MANIFEST.sh + source modify 11 aux/README.man + source modify 8 config + source modify 4 doc/aegis.ms + source modify 3 doc/c1.0.so + source modify 3 doc/c2.0.so + source modify 3 doc/c2.1.so + source modify 3 doc/c2.2.so + source modify 3 doc/c2.3.so + source modify 3 doc/c2.4.so + source create 1 doc/c2.5.so + source modify 4 man1/z_cr.so + source modify 4 man5/z_cr.so + test modify 6 test/00/t0011a.sh + + HISTORY + What When Who Comment + ------ ------ ----- --------- + new_change Mon Jan 25 pmiller + 09:34:05 1993 + develop_begin Mon Jan 25 pmiller Elapsed time: 29.559 + 09:34:13 1993 days. + develop_end Mon Mar 8 pmiller + 21:45:42 1993 + review_pass Mon Mar 8 pmiller + 21:45:52 1993 + integrate_begin Mon Mar 8 pmiller Elapsed time: 0.063 + 21:47:08 1993 days. + integrate_pass Mon Mar 8 pmiller + 22:15:24 1993 + + + + Project "aegis.1.4", Change 13 Page 1 + Change Details Tue Mar 30 23:57:36 1993 + + NAME + Project "aegis.1.4", Delta 15, Change 13. + + SUMMARY + inprove failure messages from tests + + DESCRIPTION + Tests need to say what failed when they fail. + + My thanks to J. Cazander, Philips Electronic Design & Tools, + The Netherlands, for this suggestion. + + This change is exempt from testing against the baseline. + + CAUSE + This change was caused by external_enhancement. + + FILES + Type Action Edit File Name + ------- ------- ------- ----------- + source modify 3 config + test modify 2 test/00/t0001a.sh + test modify 2 test/00/t0002a.sh + test modify 2 test/00/t0003a.sh + test modify 2 test/00/t0004a.sh + test modify 2 test/00/t0005a.sh + test modify 2 test/00/t0006a.sh + test modify 2 test/00/t0007a.sh + test modify 2 test/00/t0008a.sh + test modify 2 test/00/t0009a.sh + test modify 2 test/00/t0010a.sh + test modify 2 test/00/t0011a.sh + test modify 2 test/00/t0012a.sh + test modify 2 test/00/t0013a.sh + test modify 2 test/00/t0014a.sh + + HISTORY + What When Who Comment + ------ ------ ----- --------- + new_change Sat Jan 30 pmiller Elapsed time: 1.135 + 23:04:42 1993 days. + develop_begin Tue Feb 2 pmiller Elapsed time: 0.721 + 16:35:34 1993 days. + develop_end Tue Feb 2 pmiller + 22:00:03 1993 + review_pass Tue Feb 2 pmiller + 22:00:16 1993 + integrate_begin Tue Feb 2 pmiller Elapsed time: 0.095 + 22:01:11 1993 days. + integrate_pass Tue Feb 2 pmiller + 22:43:54 1993 + + + + Project "aegis.1.4", Change 14 Page 1 + Change Details Tue Mar 30 23:57:37 1993 + + NAME + Project "aegis.1.4", Delta 13, Change 14. + + SUMMARY + make automounter handling more robust + + DESCRIPTION + The automounter mangles pathnames. What the user thinks a file + is called and what the system insists that it is called can + differ radically. Change aegis to compare the system's idea of + pathnames, not the user's idead of pathnames. + * make sure the manuals for the -dir options mention the risks + of using `pwd`. + * make sure defaults go through use home directory (not am + mangled) or user defined default (hopefully not am mangled). + + This change is exempt from testing. This change is exempt from + testing against the baseline. + + CAUSE + This change was caused by internal_enhancement. + + FILES + Type Action Edit File Name + ------- ------- ------- ----------- + source remove 1 aegis/automount.c + source remove 1 aegis/automount.h + source modify 2 aegis/change.c + source modify 2 aegis/change.h + source modify 3 aegis/chdir.c + source modify 4 aegis/copyfile.c + source modify 4 aegis/develop2.c + source modify 6 aegis/integra2.c + source modify 3 aegis/new_file.c + source modify 2 aegis/new_proj.c + source modify 4 aegis/new_rele.c + source modify 3 aegis/new_test.c + source modify 3 aegis/os.c + source modify 4 aegis/project.c + source modify 3 aegis/rem_file.c + source modify 3 aegis/user.c + source modify 2 man1/aedb.1 + source modify 2 man1/aenpr.1 + source modify 2 man1/aenrls.1 + source modify 2 man1/o_dir.so + + HISTORY + What When Who Comment + ------ ------ ----- --------- + new_change Sat Jan 30 pmiller + 23:08:59 1993 + develop_begin Sat Jan 30 pmiller Elapsed time: 0.000 + 23:09:08 1993 days. + develop_end Mon Feb 1 pmiller + 13:38:33 1993 + review_pass Mon Feb 1 pmiller + 13:38:43 1993 + + + + Project "aegis.1.4", Change 14 Page 2 + Change Details Tue Mar 30 23:57:37 1993 + + What When Who Comment + ------ ------ ----- --------- + integrate_begin Mon Feb 1 pmiller Elapsed time: 0.165 + 13:39:17 1993 days. + integrate_pass Mon Feb 1 pmiller + 14:53:44 1993 + + + + Project "aegis.1.4", Change 15 Page 1 + Change Details Tue Mar 30 23:57:38 1993 + + NAME + Project "aegis.1.4", Delta 14, Change 15. + + SUMMARY + unix permissions for projects + + DESCRIPTION + 1. Make the 'ael p' listing cope with Permission denied errors + 2. add the 'users_changes' listing to tell what a user is + currently working on + 3. fix adcd to not resolve the symbolic links. + + This change is exempt from testing. This change is exempt from + testing against the baseline. + + CAUSE + This change was caused by internal_bug. + + FILES + Type Action Edit File Name + ------- ------- ------- ----------- + source modify 5 aegis/build.c + source modify 3 aegis/change.c + source modify 3 aegis/change.h + source modify 4 aegis/chdir.c + source modify 5 aegis/copyfile.c + source modify 5 aegis/develop2.c + source modify 3 aegis/diff.c + source modify 4 aegis/gonzo.c + source modify 7 aegis/integra2.c + source modify 3 aegis/list.c + source modify 2 aegis/list.h + source modify 4 aegis/new_file.c + source modify 3 aegis/new_proj.c + source modify 5 aegis/new_rele.c + source modify 4 aegis/new_test.c + source modify 4 aegis/os.c + source modify 2 aegis/os.h + source modify 5 aegis/project.c + source modify 4 aegis/project.h + source modify 4 aegis/rem_file.c + source modify 3 aegis/review.c + source modify 2 aegis/sub.c + source modify 3 aegis/test.c + source modify 4 aegis/user.c + source modify 2 aegis/user.h + source modify 5 aux/README.man + source modify 2 config + source modify 2 man1/ael.1 + + HISTORY + What When Who Comment + ------ ------ ----- --------- + new_change Mon Feb 1 pmiller Elapsed time: 0.505 + 11:08:03 1993 days. + develop_begin Mon Feb 1 pmiller Elapsed time: 0.941 + 14:55:27 1993 days. + + + + Project "aegis.1.4", Change 15 Page 2 + Change Details Tue Mar 30 23:57:38 1993 + + What When Who Comment + ------ ------ ----- --------- + develop_end Tue Feb 2 pmiller + 14:29:05 1993 + review_pass Tue Feb 2 pmiller + 14:29:12 1993 + integrate_begin Tue Feb 2 pmiller Elapsed time: 0.255 + 14:30:07 1993 days. + integrate_pass Tue Feb 2 pmiller + 16:24:56 1993 + + + + Project "aegis.1.4", Change 16 Page 1 + Change Details Tue Mar 30 23:57:39 1993 + + NAME + Project "aegis.1.4", Delta 16, Change 16. + + SUMMARY + improve command substitutions + + DESCRIPTION + 1. Make the command substitutions be symbolic, as in + '${input}', rather than cryptic, as in '%1'. + 2. Provide backwards compatibility for a few revs + 3. change the manual entries with the %n form. + 4. change the document to the new form + 5. change the tests to use the new form + + This change is exempt from testing against the baseline. + + CAUSE + This change was caused by internal_enhancement. + + FILES + Type Action Edit File Name + ------- ------- ------- ----------- + source modify 6 aegis/build.c + source modify 2 aegis/cattr.def + source modify 4 aegis/change.c + source modify 4 aegis/diff.c + source modify 8 aegis/integra2.c + source modify 4 aegis/list.c + source modify 6 aegis/new_rele.c + source modify 2 aegis/pattr.def + source modify 2 aegis/pconf.def + source modify 3 aegis/sub.c + source modify 2 aegis/sub.h + source modify 2 aegis/version.c + source modify 6 aux/README.man + source modify 2 common/arglex.c + source modify 2 common/arglex.h + source modify 2 doc/c3.0.so + source modify 2 doc/c3.1.so + source modify 2 doc/c3.2.so + source modify 2 doc/c3.3.so + source modify 2 doc/c4.2.so + source modify 3 doc/c7.4.so + source modify 2 man1/z_cr.so + source modify 2 man5/aecattr.5 + source create 1 man5/aecattr.so + source modify 2 man5/aecstate.5 + source modify 2 man5/aepattr.5 + source create 1 man5/aepattr.so + source modify 2 man5/aepconf.5 + source modify 2 man5/aepstate.5 + source create 1 man5/aesub.5 + source modify 2 man5/z_cr.so + test modify 3 test/00/t0002a.sh + test modify 3 test/00/t0004a.sh + test modify 3 test/00/t0005a.sh + test modify 3 test/00/t0006a.sh + + + + Project "aegis.1.4", Change 16 Page 2 + Change Details Tue Mar 30 23:57:39 1993 + + Type Action Edit File Name + ------- ------- ------- ----------- + test modify 3 test/00/t0007a.sh + test modify 3 test/00/t0008a.sh + test modify 3 test/00/t0009a.sh + test modify 3 test/00/t0010a.sh + test modify 3 test/00/t0011a.sh + + HISTORY + What When Who Comment + ------ ------ ----- --------- + new_change Mon Feb 1 pmiller Elapsed time: 0.248 + 11:10:06 1993 days. + develop_begin Tue Feb 2 pmiller Elapsed time: 9.031 + 22:01:38 1993 days. + develop_end Mon Feb 15 pmiller + 22:15:31 1993 + review_pass Mon Feb 15 pmiller + 22:16:34 1993 + integrate_begin Mon Feb 15 pmiller Elapsed time: 0.000 + 22:17:57 1993 days. + integrate_pass Tue Feb 16 pmiller + 09:04:13 1993 + + + + Project "aegis.1.4", Change 17 Page 1 + Change Details Tue Mar 30 23:57:39 1993 + + NAME + Project "aegis.1.4", Delta 18, Change 17. + + SUMMARY + change configuration to use new substitutions + + DESCRIPTION + 1. change configuration to use new substitutions + 2. fix bug where -New_Release fails to copy some of the + attributes. + 3. rationalize some of the command executing functions + + This change is exempt from testing. This change is exempt from + testing against the baseline. + + CAUSE + This change was caused by internal_enhancement. + + FILES + Type Action Edit File Name + ------- ------- ------- ----------- + source modify 5 aegis/change.c + source modify 4 aegis/change.h + source modify 5 aegis/diff.c + source modify 9 aegis/integra2.c + source modify 7 aegis/new_rele.c + source modify 3 aegis/pattr.def + source modify 4 aegis/sub.c + source modify 4 aux/Howto.cook + source modify 7 aux/README.man + source modify 2 aux/patches.sh + source modify 4 config + + HISTORY + What When Who Comment + ------ ------ ----- --------- + new_change Tue Feb 16 pmiller + 09:12:15 1993 + develop_begin Tue Feb 16 pmiller Elapsed time: 1.800 + 09:12:24 1993 days. + develop_end Wed Feb 17 pmiller + 15:12:32 1993 + review_pass Wed Feb 17 pmiller + 15:12:50 1993 + integrate_begin Wed Feb 17 pmiller Elapsed time: 0.075 + 15:13:38 1993 days. + integrate_fail Wed Feb 17 pmiller problems creating th + 15:47:26 1993 epatch + Elapsed time: 0.997 + days. + develop_end Wed Feb 17 pmiller + 23:16:09 1993 + review_pass Wed Feb 17 pmiller + 23:16:22 1993 + integrate_begin Wed Feb 17 pmiller Elapsed time: 0.147 + 23:17:18 1993 days. + integrate_pass Thu Feb 18 pmiller + + + + Project "aegis.1.4", Change 17 Page 2 + Change Details Tue Mar 30 23:57:39 1993 + + What When Who Comment + ------ ------ ----- --------- + 16:53:32 1993 + + + + Project "aegis.1.4", Change 18 Page 1 + Change Details Tue Mar 30 23:57:40 1993 + + NAME + Project "aegis.1.4", Delta 19, Change 18. + + SUMMARY + improve copyright notices + + DESCRIPTION + Change copyright notices to be legally binding + + My thanks to Len and Richard Stallman + for for their advice in this matter. + + This change is exempt from testing against the baseline. + + CAUSE + This change was caused by external_bug. + + FILES + Type Action Edit File Name + ------- ------- ------- ----------- + source remove 1 COPYING + source create 1 LICENSE + source modify 3 aegis/administ.c + source modify 2 aegis/administ.h + source modify 2 aegis/arglex2.h + source modify 7 aegis/build.c + source modify 2 aegis/build.h + source modify 3 aegis/cattr.def + source modify 3 aegis/cattr_ed.c + source modify 2 aegis/cattr_ed.h + source modify 6 aegis/change.c + source modify 5 aegis/change.h + source modify 5 aegis/chdir.c + source modify 2 aegis/chdir.h + source modify 2 aegis/col.c + source modify 2 aegis/col.h + source modify 2 aegis/commit.c + source modify 2 aegis/commit.h + source modify 2 aegis/common.def + source modify 6 aegis/copyfile.c + source modify 2 aegis/copyfile.h + source modify 2 aegis/cstate.def + source modify 3 aegis/develop1.c + source modify 2 aegis/develop1.h + source modify 6 aegis/develop2.c + source modify 2 aegis/develop2.h + source modify 6 aegis/diff.c + source modify 2 aegis/diff.h + source modify 2 aegis/dir.c + source modify 2 aegis/dir.h + source modify 2 aegis/file.c + source modify 2 aegis/file.h + source modify 5 aegis/gonzo.c + source modify 3 aegis/gonzo.h + source modify 2 aegis/gram.h + source modify 2 aegis/gram.y + source modify 2 aegis/gstate.def + + + + Project "aegis.1.4", Change 18 Page 2 + Change Details Tue Mar 30 23:57:40 1993 + + Type Action Edit File Name + ------- ------- ------- ----------- + source modify 2 aegis/help.c + source modify 2 aegis/help.h + source modify 3 aegis/integra1.c + source modify 2 aegis/integra1.h + source modify 10 aegis/integra2.c + source modify 2 aegis/integra2.h + source modify 2 aegis/io.c + source modify 2 aegis/io.h + source modify 2 aegis/lex.c + source modify 2 aegis/lex.h + source modify 5 aegis/list.c + source modify 3 aegis/list.h + source modify 3 aegis/lock.c + source modify 3 aegis/lock.h + source modify 2 aegis/log.c + source modify 2 aegis/log.h + source modify 3 aegis/main.c + source modify 4 aegis/new_chan.c + source modify 2 aegis/new_chan.h + source modify 5 aegis/new_file.c + source modify 2 aegis/new_file.h + source modify 4 aegis/new_proj.c + source modify 2 aegis/new_proj.h + source modify 8 aegis/new_rele.c + source modify 2 aegis/new_rele.h + source modify 5 aegis/new_test.c + source modify 2 aegis/new_test.h + source modify 5 aegis/os.c + source modify 3 aegis/os.h + source modify 2 aegis/pager.c + source modify 2 aegis/pager.h + source modify 2 aegis/parse.c + source modify 2 aegis/parse.h + source modify 4 aegis/pattr.def + source modify 3 aegis/pattr_ed.c + source modify 2 aegis/pattr_ed.h + source modify 3 aegis/pconf.def + source modify 6 aegis/project.c + source modify 5 aegis/project.h + source modify 2 aegis/pstate.def + source modify 5 aegis/rem_file.c + source modify 2 aegis/rem_file.h + source modify 3 aegis/rem_proj.c + source modify 2 aegis/rem_proj.h + source modify 4 aegis/review.c + source modify 2 aegis/review.h + source modify 3 aegis/reviewer.c + source modify 2 aegis/reviewer.h + source modify 5 aegis/sub.c + source modify 3 aegis/sub.h + source modify 4 aegis/test.c + source modify 2 aegis/test.h + source modify 2 aegis/type.c + source modify 2 aegis/type.h + source modify 3 aegis/uconf.def + + + + Project "aegis.1.4", Change 18 Page 3 + Change Details Tue Mar 30 23:57:40 1993 + + Type Action Edit File Name + ------- ------- ------- ----------- + source modify 2 aegis/undo.c + source modify 2 aegis/undo.h + source modify 5 aegis/user.c + source modify 3 aegis/user.h + source modify 2 aegis/ustate.def + source modify 3 aegis/version.c + source modify 2 aegis/version.h + source modify 2 aux/ALPHA.man + source modify 3 aux/BUILDING.man + source modify 2 aux/CHANGES.sh + source modify 5 aux/Howto.cook + source modify 2 aux/MANIFEST.sh + source modify 2 aux/Makefile.awk + source modify 2 aux/Makefile.sh + source modify 8 aux/README.man + source modify 3 aux/patches.sh + source modify 2 common/ansi.c + source modify 3 common/arglex.c + source modify 3 common/arglex.h + source modify 2 common/error.c + source modify 2 common/error.h + source modify 2 common/indent.c + source modify 2 common/indent.h + source modify 2 common/main.h + source modify 2 common/mem.c + source modify 2 common/mem.h + source modify 2 common/option.c + source modify 2 common/option.h + source modify 2 common/s-v-arg.h + source modify 2 common/str.c + source modify 2 common/str.h + source modify 2 common/trace.c + source modify 2 common/trace.h + source modify 2 common/word.c + source modify 2 common/word.h + source modify 3 conf/ConvexOS-10 + source modify 3 conf/SunOS-4.1.1 + source modify 3 conf/SunOS-4.1.2 + source modify 3 conf/SunOS-4.1.3 + source modify 3 conf/SysV-4.0 + source modify 3 conf/ULTRIX-4.2 + source modify 3 conf/dgux-5.4.1 + source modify 5 config + source modify 3 doc/aegis.ms + source modify 2 doc/c1.0.so + source modify 2 doc/c1.1.so + source modify 2 doc/c1.2.so + source modify 2 doc/c1.3.so + source modify 2 doc/c1.4.so + source modify 2 doc/c2.0.so + source modify 2 doc/c2.1.so + source modify 2 doc/c2.2.so + source modify 2 doc/c2.3.so + source modify 2 doc/c2.4.so + source modify 3 doc/c3.0.so + + + + Project "aegis.1.4", Change 18 Page 4 + Change Details Tue Mar 30 23:57:40 1993 + + Type Action Edit File Name + ------- ------- ------- ----------- + source modify 3 doc/c3.1.so + source modify 3 doc/c3.2.so + source modify 3 doc/c3.3.so + source modify 2 doc/c4.0.so + source modify 2 doc/c4.1.so + source modify 3 doc/c4.2.so + source modify 2 doc/c4.3.so + source modify 2 doc/c5.0.so + source modify 2 doc/c6.0.so + source modify 2 doc/c7.0.so + source modify 2 doc/c7.1.so + source modify 2 doc/c7.2.so + source modify 4 doc/c7.4.so + source modify 2 doc/c7.5.so + source modify 2 doc/cA.0.so + source modify 2 doc/cB.0.so + source modify 2 doc/cC.0.so + source modify 3 dot.cshrc + source modify 3 dot.profile + source modify 2 fmtgen/id.c + source modify 2 fmtgen/id.h + source modify 2 fmtgen/lex.c + source modify 2 fmtgen/lex.h + source modify 2 fmtgen/main.c + source modify 2 fmtgen/parse.h + source modify 2 fmtgen/parse.y + source modify 2 fmtgen/type.c + source modify 2 fmtgen/type.h + source modify 2 fmtgen/type_enum.c + source modify 2 fmtgen/type_integ.c + source modify 2 fmtgen/type_list.c + source modify 2 fmtgen/type_ref.c + source modify 2 fmtgen/type_strin.c + source modify 2 fmtgen/type_struc.c + source modify 2 h/stdarg.h-min + source modify 2 h/stddef.h + source modify 2 h/stdlib.h + source modify 3 man1/aeb.1 + source modify 2 man1/aeca.1 + source modify 2 man1/aecd.1 + source modify 3 man1/aecp.1 + source modify 3 man1/aecpu.1 + source modify 2 man1/aed.1 + source modify 3 man1/aedb.1 + source modify 2 man1/aedbu.1 + source modify 2 man1/aede.1 + source modify 2 man1/aedeu.1 + source modify 3 man1/aegis.1 + source modify 2 man1/aeib.1 + source modify 2 man1/aeibu.1 + source modify 2 man1/aeif.1 + source modify 3 man1/aeip.1 + source modify 3 man1/ael.1 + source modify 2 man1/aena.1 + source modify 2 man1/aenc.1 + + + + Project "aegis.1.4", Change 18 Page 5 + Change Details Tue Mar 30 23:57:40 1993 + + Type Action Edit File Name + ------- ------- ------- ----------- + source modify 2 man1/aencu.1 + source modify 2 man1/aend.1 + source modify 2 man1/aenf.1 + source modify 2 man1/aenfu.1 + source modify 2 man1/aeni.1 + source modify 3 man1/aenpr.1 + source modify 3 man1/aenrls.1 + source modify 2 man1/aenrv.1 + source modify 2 man1/aent.1 + source modify 2 man1/aentu.1 + source modify 2 man1/aepa.1 + source modify 2 man1/aera.1 + source modify 2 man1/aerd.1 + source modify 2 man1/aerf.1 + source modify 2 man1/aeri.1 + source modify 2 man1/aerm.1 + source modify 3 man1/aermpr.1 + source modify 2 man1/aermu.1 + source modify 2 man1/aerp.1 + source modify 2 man1/aerpu.1 + source modify 2 man1/aerrv.1 + source modify 2 man1/aet.1 + source modify 2 man1/aev.1 + source modify 2 man1/install.sh + source modify 2 man1/o__rules.so + source modify 2 man1/o_anticip.so + source modify 2 man1/o_auto.so + source modify 2 man1/o_baselin.so + source modify 2 man1/o_bld_lk.so + source modify 3 man1/o_change.so + source modify 2 man1/o_devdir.so + source modify 3 man1/o_dir.so + source modify 2 man1/o_help.so + source modify 2 man1/o_indep.so + source modify 3 man1/o_keep.so + source modify 2 man1/o_lib.so + source modify 2 man1/o_list.so + source modify 2 man1/o_major.so + source modify 2 man1/o_manual.so + source modify 2 man1/o_min.so + source modify 2 man1/o_minor.so + source modify 2 man1/o_nolog.so + source modify 2 man1/o_overw.so + source modify 2 man1/o_page.so + source modify 3 man1/o_project.so + source modify 2 man1/o_terse.so + source modify 2 man1/o_verbose.so + source modify 3 man1/z_cr.so + source modify 2 man1/z_exit.so + source modify 2 man1/z_intuit.so + source modify 2 man1/z_name.so + source modify 3 man5/aecattr.5 + source modify 2 man5/aecattr.so + source modify 3 man5/aecstate.5 + source modify 2 man5/aedir.5 + + + + Project "aegis.1.4", Change 18 Page 6 + Change Details Tue Mar 30 23:57:40 1993 + + Type Action Edit File Name + ------- ------- ------- ----------- + source modify 2 man5/aegis.5 + source modify 2 man5/aegstate.5 + source modify 3 man5/aepattr.5 + source modify 2 man5/aepattr.so + source modify 3 man5/aepconf.5 + source modify 3 man5/aepstate.5 + source modify 2 man5/aesub.5 + source modify 3 man5/aeuconf.5 + source modify 2 man5/aeustate.5 + source modify 2 man5/install.sh + source modify 3 man5/z_cr.so + source modify 2 man5/z_name.so + source modify 2 notify/de.sh + source modify 2 notify/deu.sh + source modify 2 notify/if.sh + source modify 2 notify/ip.sh + source modify 2 notify/rf.sh + source modify 2 notify/rp.sh + source modify 2 notify/rpu.sh + test modify 3 test/00/t0001a.sh + test modify 4 test/00/t0002a.sh + test modify 3 test/00/t0003a.sh + test modify 4 test/00/t0004a.sh + test modify 4 test/00/t0005a.sh + test modify 4 test/00/t0006a.sh + test modify 4 test/00/t0007a.sh + test modify 4 test/00/t0008a.sh + test modify 4 test/00/t0009a.sh + test modify 4 test/00/t0010a.sh + test modify 4 test/00/t0011a.sh + test modify 3 test/00/t0012a.sh + test modify 3 test/00/t0013a.sh + test modify 3 test/00/t0014a.sh + + HISTORY + What When Who Comment + ------ ------ ----- --------- + new_change Wed Feb 17 pmiller Elapsed time: 0.857 + 23:21:55 1993 days. + develop_begin Thu Feb 18 pmiller Elapsed time: 0.978 + 22:17:39 1993 days. + develop_end Fri Feb 19 pmiller + 22:07:52 1993 + develop_end_ Fri Feb 19 pmiller Elapsed time: 0.157 + undo 22:10:52 1993 days. + develop_end Fri Feb 19 pmiller + 23:21:41 1993 + review_pass Fri Feb 19 pmiller + 23:21:53 1993 + integrate_begin Fri Feb 19 pmiller Elapsed time: 0.682 + 23:23:27 1993 days. + integrate_pass Sun Feb 21 pmiller + 21:00:21 1993 + + + + Project "aegis.1.4", Change 19 Page 1 + Change Details Tue Mar 30 23:57:41 1993 + + NAME + Project "aegis.1.4", Delta 21, Change 19. + + SUMMARY + add substitutions to file templates + + DESCRIPTION + Use substitutions to fill in more of file templates. Things + like the file name and the date are now available. + + This change is exempt from testing. This change is exempt from + testing against the baseline. + + CAUSE + This change was caused by external_bug. + + FILES + Type Action Edit File Name + ------- ------- ------- ----------- + source modify 7 aegis/change.c + source modify 7 aegis/new_file.c + source modify 7 aegis/new_test.c + source modify 6 aegis/sub.c + source modify 3 aux/ALPHA.man + source modify 3 common/ansi.c + source modify 4 conf/ConvexOS-10 + source modify 4 conf/SunOS-4.1.1 + source modify 4 conf/SunOS-4.1.2 + source modify 4 conf/SunOS-4.1.3 + source modify 4 conf/SysV-4.0 + source modify 4 conf/ULTRIX-4.2 + source modify 4 conf/dgux-5.4.1 + source modify 6 config + source modify 4 man5/aepconf.5 + source modify 3 man5/aesub.5 + + HISTORY + What When Who Comment + ------ ------ ----- --------- + new_change Wed Feb 17 pmiller Elapsed time: 1.783 + 23:23:19 1993 days. + develop_begin Mon Feb 22 pmiller Elapsed time: 0.547 + 14:15:28 1993 days. + develop_end Tue Feb 23 pmiller + 10:51:32 1993 + review_pass Tue Feb 23 pmiller + 10:53:04 1993 + integrate_begin Tue Feb 23 pmiller Elapsed time: 0.244 + 10:54:20 1993 days. + integrate_pass Tue Feb 23 pmiller + 12:44:13 1993 + + + + Project "aegis.1.4", Change 20 Page 1 + Change Details Tue Mar 30 23:57:42 1993 + + NAME + Project "aegis.1.4", Delta 20, Change 20. + + SUMMARY + add support for the GNU long option style + + DESCRIPTION + The GNU people use --name for options which are more than one + letter long. All of aegis' options are more than one letter + long, so this is kind-of unnecessray. Also map '-- + foo=bar' into '-foo' 'bar' for another form of compatibility. + + My thanks to Richard Stallman for this + suggestion. + + This change is exempt from testing against the baseline. + + CAUSE + This change was caused by external_enhancement. + + FILES + Type Action Edit File Name + ------- ------- ------- ----------- + source modify 4 aegis/administ.c + source modify 8 aegis/build.c + source modify 4 aegis/cattr_ed.c + source modify 7 aegis/copyfile.c + source modify 4 aegis/develop1.c + source modify 7 aegis/develop2.c + source modify 7 aegis/diff.c + source modify 4 aegis/integra1.c + source modify 11 aegis/integra2.c + source modify 6 aegis/list.c + source modify 4 aegis/main.c + source modify 5 aegis/new_chan.c + source modify 6 aegis/new_file.c + source modify 5 aegis/new_proj.c + source modify 9 aegis/new_rele.c + source modify 6 aegis/new_test.c + source modify 4 aegis/pattr_ed.c + source modify 6 aegis/rem_file.c + source modify 4 aegis/rem_proj.c + source modify 5 aegis/review.c + source modify 4 aegis/reviewer.c + source modify 5 aegis/test.c + source modify 4 aegis/version.c + source modify 4 aux/BUILDING.man + source modify 6 aux/Howto.cook + source modify 3 aux/MANIFEST.sh + source modify 4 aux/patches.sh + source modify 4 common/arglex.c + source modify 3 fmtgen/main.c + source modify 3 man1/o__rules.so + test modify 5 test/00/t0002a.sh + + + + Project "aegis.1.4", Change 20 Page 2 + Change Details Tue Mar 30 23:57:42 1993 + + HISTORY + What When Who Comment + ------ ------ ----- --------- + new_change Sun Feb 21 pmiller + 21:11:57 1993 + develop_begin Sun Feb 21 pmiller Elapsed time: 0.000 + 21:12:02 1993 days. + develop_end Mon Feb 22 pmiller + 13:32:22 1993 + review_pass Mon Feb 22 pmiller + 13:32:33 1993 + integrate_begin Mon Feb 22 pmiller Elapsed time: 0.083 + 13:33:35 1993 days. + integrate_pass Mon Feb 22 pmiller + 14:10:57 1993 + + + + Project "aegis.1.4", Change 21 Page 1 + Change Details Tue Mar 30 23:57:43 1993 + + NAME + Project "aegis.1.4", Delta 22, Change 21. + + SUMMARY + stop using _t suffix on type names + + DESCRIPTION + The ANSI C and POSIX standards reserve the _t suffix on + identifiers, to indicate system specified types. + + This change is exempt from testing. This change is exempt from + testing against the baseline. + + CAUSE + This change was caused by internal_bug. + + FILES + Type Action Edit File Name + ------- ------- ------- ----------- + source modify 5 aegis/administ.c + source modify 9 aegis/build.c + source modify 5 aegis/cattr_ed.c + source modify 8 aegis/change.c + source modify 6 aegis/change.h + source modify 6 aegis/chdir.c + source modify 3 aegis/col.c + source modify 3 aegis/commit.c + source modify 3 aegis/commit.h + source modify 8 aegis/copyfile.c + source modify 5 aegis/develop1.c + source modify 8 aegis/develop2.c + source modify 8 aegis/diff.c + source modify 3 aegis/dir.c + source modify 3 aegis/dir.h + source modify 3 aegis/file.c + source modify 3 aegis/file.h + source modify 6 aegis/gonzo.c + source modify 4 aegis/gonzo.h + source modify 3 aegis/gram.y + source modify 5 aegis/integra1.c + source modify 12 aegis/integra2.c + source modify 3 aegis/io.c + source modify 3 aegis/io.h + source modify 7 aegis/list.c + source modify 4 aegis/list.h + source modify 4 aegis/lock.c + source modify 4 aegis/lock.h + source modify 3 aegis/log.c + source modify 3 aegis/log.h + source modify 5 aegis/main.c + source modify 6 aegis/new_chan.c + source modify 8 aegis/new_file.c + source modify 6 aegis/new_proj.c + source modify 10 aegis/new_rele.c + source modify 8 aegis/new_test.c + source modify 6 aegis/os.c + source modify 4 aegis/os.h + + + + Project "aegis.1.4", Change 21 Page 2 + Change Details Tue Mar 30 23:57:43 1993 + + Type Action Edit File Name + ------- ------- ------- ----------- + source modify 3 aegis/parse.c + source modify 3 aegis/parse.h + source modify 5 aegis/pattr_ed.c + source modify 7 aegis/project.c + source modify 6 aegis/project.h + source modify 7 aegis/rem_file.c + source modify 5 aegis/rem_proj.c + source modify 6 aegis/review.c + source modify 5 aegis/reviewer.c + source modify 7 aegis/sub.c + source modify 4 aegis/sub.h + source modify 6 aegis/test.c + source modify 3 aegis/type.c + source modify 3 aegis/type.h + source modify 3 aegis/undo.c + source modify 3 aegis/undo.h + source modify 6 aegis/user.c + source modify 4 aegis/user.h + source modify 5 aegis/version.c + source modify 5 common/arglex.c + source modify 4 common/arglex.h + source modify 3 common/error.c + source modify 3 common/error.h + source modify 3 common/str.c + source modify 3 common/str.h + source modify 3 common/trace.c + source modify 3 common/word.c + source modify 3 common/word.h + source modify 3 fmtgen/id.c + source modify 3 fmtgen/id.h + source modify 3 fmtgen/lex.c + source modify 3 fmtgen/lex.h + source modify 4 fmtgen/main.c + source modify 3 fmtgen/parse.y + source modify 3 fmtgen/type.c + source modify 3 fmtgen/type.h + source modify 3 fmtgen/type_enum.c + source modify 3 fmtgen/type_integ.c + source modify 3 fmtgen/type_list.c + source modify 3 fmtgen/type_ref.c + source modify 3 fmtgen/type_strin.c + source modify 3 fmtgen/type_struc.c + + HISTORY + What When Who Comment + ------ ------ ----- --------- + new_change Tue Feb 23 pmiller + 10:51:17 1993 + develop_begin Tue Feb 23 pmiller Elapsed time: 0.000 + 10:55:03 1993 days. + develop_end Tue Feb 23 pmiller + 21:52:17 1993 + review_pass Tue Feb 23 pmiller + 21:52:27 1993 + integrate_begin Tue Feb 23 pmiller Elapsed time: 0.163 + + + + Project "aegis.1.4", Change 21 Page 3 + Change Details Tue Mar 30 23:57:43 1993 + + What When Who Comment + ------ ------ ----- --------- + 21:53:45 1993 days. + integrate_pass Tue Feb 23 pmiller + 23:06:59 1993 + + + + Project "aegis.1.4", Change 22 Page 1 + Change Details Tue Mar 30 23:57:44 1993 + + NAME + Project "aegis.1.4", Delta 23, Change 22. + + SUMMARY + and config details for AIX + + DESCRIPTION + 1. Add configuration details for AIX-3.2. + 2. The support for AIX is very limited at this stage, because + it has the brain-dead POSIX seteuid sematics, so the set-uid- + root mode does not work + + My thanks to John M. Sellens + and Andy Lowry for providing this + information. + + This change is exempt from testing. This change is exempt from + testing against the baseline. + + CAUSE + This change was caused by external_enhancement. + + FILES + Type Action Edit File Name + ------- ------- ------- ----------- + source modify 4 aegis/col.c + source modify 7 aegis/user.c + source modify 5 aux/BUILDING.man + source modify 3 aux/Makefile.sh + source modify 3 common/option.c + source create 1 conf/AIX-3.2 + source modify 5 conf/ConvexOS-10 + source modify 5 conf/SunOS-4.1.1 + source modify 5 conf/SunOS-4.1.2 + source modify 5 conf/SunOS-4.1.3 + source modify 5 conf/SysV-4.0 + source modify 5 conf/ULTRIX-4.2 + source modify 5 conf/dgux-5.4.1 + + HISTORY + What When Who Comment + ------ ------ ----- --------- + new_change Tue Feb 23 pmiller Elapsed time: 0.101 + 22:15:46 1993 days. + develop_begin Tue Feb 23 pmiller Elapsed time: 0.000 + 23:01:03 1993 days. + develop_end Wed Feb 24 pmiller + 12:28:50 1993 + review_pass Wed Feb 24 pmiller + 12:38:44 1993 + integrate_begin Wed Feb 24 pmiller Elapsed time: 0.126 + 12:40:08 1993 days. + integrate_pass Wed Feb 24 pmiller + 13:36:57 1993 + + + + Project "aegis.1.4", Change 23 Page 1 + Change Details Tue Mar 30 23:57:45 1993 + + NAME + Project "aegis.1.4", Delta 24, Change 23. + + SUMMARY + add support for systems without seteuid + + DESCRIPTION + While many modern UNIXes have seteuid, there are numerous older + flavours without it. And there are some which have it, but + with unusable semantics. This change adds conditional + functionality to use forks and setuid if an functional seteuid + is not available. + + My thanks to Andy Lowry for + encouragement and discussion while designing and implemnting + this change. This change was a very welcome one, if my inbox + is any indication. + + This change is exempt from testing. This change is exempt from + testing against the baseline. + + CAUSE + This change was caused by external_enhancement. + + FILES + Type Action Edit File Name + ------- ------- ------- ----------- + source modify 10 aegis/build.c + source modify 9 aegis/change.c + source modify 7 aegis/chdir.c + source modify 5 aegis/col.c + source modify 9 aegis/copyfile.c + source modify 9 aegis/develop2.c + source modify 4 aegis/file.c + source create 1 aegis/glue.c + source create 1 aegis/glue.h + source create 1 aegis/indent.c + source create 1 aegis/indent.h + source modify 13 aegis/integra2.c + source modify 3 aegis/lex.c + source modify 5 aegis/lock.c + source modify 4 aegis/log.c + source modify 9 aegis/new_file.c + source modify 9 aegis/new_test.c + source modify 7 aegis/os.c + source modify 5 aegis/os.h + source modify 3 aegis/pager.c + source modify 4 aux/ALPHA.man + source modify 6 aux/BUILDING.man + source modify 9 aux/README.man + source modify 4 common/error.c + source modify 4 common/error.h + source remove 2 common/indent.c + source remove 2 common/indent.h + source modify 4 common/trace.c + source modify 3 common/trace.h + source modify 2 conf/AIX-3.2 + + + + Project "aegis.1.4", Change 23 Page 2 + Change Details Tue Mar 30 23:57:45 1993 + + Type Action Edit File Name + ------- ------- ------- ----------- + source modify 6 conf/ConvexOS-10 + source modify 6 conf/SunOS-4.1.1 + source modify 6 conf/SunOS-4.1.2 + source modify 6 conf/SunOS-4.1.3 + source modify 6 conf/SysV-4.0 + source modify 6 conf/ULTRIX-4.2 + source modify 6 conf/dgux-5.4.1 + source create 1 fmtgen/indent.c + source create 1 fmtgen/indent.h + + HISTORY + What When Who Comment + ------ ------ ----- --------- + new_change Wed Feb 24 pmiller + 12:41:43 1993 + develop_begin Wed Feb 24 pmiller Elapsed time: 5.502 + 12:42:02 1993 days. + develop_end Wed Mar 3 pmiller + 16:27:46 1993 + review_pass Wed Mar 3 pmiller + 16:27:55 1993 + integrate_begin Wed Mar 3 pmiller Elapsed time: 0.818 + 16:29:26 1993 days. + integrate_pass Wed Mar 3 pmiller + 22:37:31 1993 + + + + Project "aegis.1.4", Change 24 Page 1 + Change Details Tue Mar 30 23:57:46 1993 + + NAME + Project "aegis.1.4", Delta 25, Change 24. + + SUMMARY + allow nomination of temp test dir + + DESCRIPTION + Some people have found aegis difficult to test because they are + using the tmpfs as their /tmp, but this does not provide + locking, and so the tests fail. + + This is solved by changing the tests to use the AEGIS_TMP + environment variable, if set. + + A curious SunOS bug is also avoided. SunOS seems to be + forgetting to release some locks when processes are killed, + notabley shared locks. This prevented integrate pass from + completing, in some cases. + + This change is exempt from testing against the baseline. + + CAUSE + This change was caused by external_enhancement. + + FILES + Type Action Edit File Name + ------- ------- ------- ----------- + source modify 7 aegis/gonzo.c + source modify 6 aegis/lock.c + source modify 5 aux/ALPHA.man + source modify 7 aux/BUILDING.man + source modify 7 aux/Howto.cook + source modify 10 aux/README.man + source modify 7 config + source create 1 h/unistd.h + test modify 4 test/00/t0001a.sh + test modify 6 test/00/t0002a.sh + test modify 4 test/00/t0003a.sh + test modify 5 test/00/t0004a.sh + test modify 5 test/00/t0005a.sh + test modify 5 test/00/t0006a.sh + test modify 5 test/00/t0007a.sh + test modify 5 test/00/t0008a.sh + test modify 5 test/00/t0009a.sh + test modify 5 test/00/t0010a.sh + test modify 5 test/00/t0011a.sh + test modify 4 test/00/t0012a.sh + test modify 4 test/00/t0013a.sh + test modify 4 test/00/t0014a.sh + + HISTORY + What When Who Comment + ------ ------ ----- --------- + new_change Wed Mar 3 pmiller + 22:44:06 1993 + develop_begin Wed Mar 3 pmiller Elapsed time: 0.000 + 22:44:28 1993 days. + + + + Project "aegis.1.4", Change 24 Page 2 + Change Details Tue Mar 30 23:57:46 1993 + + What When Who Comment + ------ ------ ----- --------- + develop_end Thu Mar 4 pmiller + 13:20:55 1993 + review_pass Thu Mar 4 pmiller + 13:25:06 1993 + integrate_begin Thu Mar 4 pmiller Elapsed time: 0.284 + 13:26:04 1993 days. + integrate_pass Thu Mar 4 pmiller + 15:33:48 1993 + + + + Project "aegis.1.4", Change 25 Page 1 + Change Details Tue Mar 30 23:57:46 1993 + + NAME + Project "aegis.1.4", Delta 26, Change 25. + + SUMMARY + rationalize lib entries + + DESCRIPTION + Place all of the items to be installed into the system lib + directory in a single source directory + + Also fixed a nasty catch-22 in the error handling. Was caused + by the recent locking bug fix. + + This change is exempt from testing. This change is exempt from + testing against the baseline. + + CAUSE + This change was caused by internal_enhancement. + + FILES + Type Action Edit File Name + ------- ------- ------- ----------- + source modify 2 aegis/glue.c + source modify 7 aegis/lock.c + source modify 10 aegis/new_file.c + source modify 10 aegis/new_test.c + source modify 8 aux/BUILDING.man + source modify 5 common/error.c + source modify 3 doc/c6.0.so + source remove 3 dot.cshrc + source remove 3 dot.profile + source create 1 lib/cshrc + source create 1 lib/de.inews.sh + source create 1 lib/de.sh + source create 1 lib/deu.inews.sh + source create 1 lib/deu.sh + source create 1 lib/if.inews.sh + source create 1 lib/if.sh + source create 1 lib/ip.inews.sh + source create 1 lib/ip.sh + source create 1 lib/profile + source create 1 lib/rf.inews.sh + source create 1 lib/rf.sh + source create 1 lib/rp.inews.sh + source create 1 lib/rp.sh + source create 1 lib/rpu.inews.sh + source create 1 lib/rpu.sh + source remove 2 notify/de.sh + source remove 2 notify/deu.sh + source remove 2 notify/if.sh + source remove 2 notify/ip.sh + source remove 2 notify/rf.sh + source remove 2 notify/rp.sh + source remove 2 notify/rpu.sh + + + + Project "aegis.1.4", Change 25 Page 2 + Change Details Tue Mar 30 23:57:46 1993 + + HISTORY + What When Who Comment + ------ ------ ----- --------- + new_change Thu Mar 4 pmiller + 15:37:40 1993 + develop_begin Thu Mar 4 pmiller Elapsed time: 0.742 + 15:37:50 1993 days. + develop_end Fri Mar 5 pmiller + 13:41:47 1993 + review_pass Fri Mar 5 pmiller + 13:42:11 1993 + integrate_begin Fri Mar 5 pmiller Elapsed time: 0.277 + 13:42:50 1993 days. + integrate_pass Fri Mar 5 pmiller + 15:47:34 1993 + + + + Project "aegis.1.4", Change 26 Page 1 + Change Details Tue Mar 30 23:57:47 1993 + + NAME + Project "aegis.1.4", Delta 27, Change 26. + + SUMMARY + fix problems with ULTRIX + + DESCRIPTION + Ultrix needs to use the /bin/sh5 shell, rather than the /bin/sh + shell. Make the necessary changes to modify the shell as + required. + + This change is exempt from testing. This change is exempt from + testing against the baseline. + + CAUSE + This change was caused by external_bug. + + FILES + Type Action Edit File Name + ------- ------- ------- ----------- + source modify 8 aegis/os.c + source modify 6 aegis/os.h + source modify 7 aegis/test.c + source modify 8 aegis/user.c + source modify 9 aux/BUILDING.man + source modify 3 conf/AIX-3.2 + source modify 7 conf/ConvexOS-10 + source modify 7 conf/SunOS-4.1.1 + source modify 7 conf/SunOS-4.1.2 + source modify 7 conf/SunOS-4.1.3 + source modify 7 conf/SysV-4.0 + source modify 7 conf/ULTRIX-4.2 + source modify 7 conf/dgux-5.4.1 + source modify 3 man1/aet.1 + + HISTORY + What When Who Comment + ------ ------ ----- --------- + new_change Fri Mar 5 pmiller + 16:16:31 1993 + develop_begin Fri Mar 5 pmiller Elapsed time: 0.079 + 16:16:39 1993 days. + develop_end Fri Mar 5 pmiller + 16:52:06 1993 + review_pass Fri Mar 5 pmiller + 16:52:17 1993 + integrate_begin Fri Mar 5 pmiller Elapsed time: 1.666 + 16:53:17 1993 days. + integrate_pass Sat Mar 6 pmiller + 21:52:50 1993 + + + + Project "aegis.1.4", Change 27 Page 1 + Change Details Tue Mar 30 23:57:48 1993 + + NAME + Project "aegis.1.4", Delta 28, Change 27. + + SUMMARY + fix a bug in the no-seteuid flavour + + DESCRIPTION + the pager code needs to remember what it is talking to. + + My thanks to Andy Lowry for raising this + problem. + + This change is exempt from testing. This change is exempt from + testing against the baseline. + + CAUSE + This change was caused by external_bug. + + FILES + Type Action Edit File Name + ------- ------- ------- ----------- + source modify 6 aegis/col.c + source modify 3 aegis/glue.c + source modify 9 aegis/user.c + + HISTORY + What When Who Comment + ------ ------ ----- --------- + new_change Sat Mar 6 pmiller + 21:55:48 1993 + develop_begin Sat Mar 6 pmiller Elapsed time: 1.065 + 21:55:56 1993 days. + develop_end Sun Mar 7 pmiller + 21:25:14 1993 + review_pass Sun Mar 7 pmiller + 21:25:51 1993 + integrate_begin Sun Mar 7 pmiller Elapsed time: 0.053 + 21:27:01 1993 days. + integrate_pass Sun Mar 7 pmiller + 21:50:46 1993 + + + + Project "aegis.1.4", Change 28 Page 1 + Change Details Tue Mar 30 23:57:48 1993 + + NAME + Project "aegis.1.4", Delta 30, Change 28. + + SUMMARY + more documentation + + DESCRIPTION + 1. polish the integrator section of chapter 3. + 2. add a chapter about the difference tools. + + This change is exempt from testing. This change is exempt from + testing against the baseline. + + CAUSE + This change was caused by internal_enhancement. + + FILES + Type Action Edit File Name + ------- ------- ------- ----------- + source modify 10 aux/BUILDING.man + source modify 5 doc/aegis.ms + source modify 3 doc/c1.4.so + source modify 4 doc/c2.3.so + source modify 3 doc/c5.0.so + source modify 3 doc/c7.1.so + source create 1 doc/c8.0.so + source create 1 doc/c8.1.so + source create 1 doc/c8.2.so + source create 1 doc/c8.3.so + source modify 3 doc/cB.0.so + + HISTORY + What When Who Comment + ------ ------ ----- --------- + new_change Mon Mar 8 pmiller + 22:23:59 1993 + develop_begin Mon Mar 8 pmiller Elapsed time: 0.000 + 22:24:07 1993 days. + develop_end Tue Mar 9 pmiller + 14:37:27 1993 + review_pass Tue Mar 9 pmiller + 14:38:00 1993 + integrate_begin Tue Mar 9 pmiller Elapsed time: 0.909 + 14:39:02 1993 days. + integrate_pass Tue Mar 9 pmiller + 21:27:59 1993 + + + + Project "aegis.1.4", Change 29 Page 1 + Change Details Tue Mar 30 23:57:49 1993 + + NAME + Project "aegis.1.4", Delta 31, Change 29. + + SUMMARY + pyramid port + + DESCRIPTION + A number of things needed to be done to make aegis work on the + pyramid. + 1. read the BUILD.PY file for what needs to be done. Changed + BUILDING to reference it. + 2. fix a number of minor things in the code to make it compile. + + This change is exempt from testing against the baseline. + + CAUSE + This change was caused by internal_enhancement. + + FILES + Type Action Edit File Name + ------- ------- ------- ----------- + source modify 4 aegis/dir.c + source modify 4 aegis/glue.c + source modify 2 aegis/glue.h + source modify 8 aegis/lock.c + source modify 11 aegis/new_rele.c + source modify 8 aegis/sub.c + source modify 10 aegis/user.c + source create 1 aux/BUILD.PY.man + source modify 11 aux/BUILDING.man + source modify 9 aux/Howto.cook + source modify 4 aux/Makefile.sh + source modify 6 common/error.c + source modify 4 conf/AIX-3.2 + source modify 8 conf/ConvexOS-10 + source modify 8 conf/SunOS-4.1.1 + source modify 8 conf/SunOS-4.1.2 + source modify 8 conf/SunOS-4.1.3 + source modify 8 conf/SysV-4.0 + source modify 8 conf/ULTRIX-4.2 + source create 1 conf/apollo + source create 1 conf/dcosx + source modify 8 conf/dgux-5.4.1 + source modify 4 fmtgen/type_list.c + source modify 4 fmtgen/type_struc.c + source create 1 h/dirent.h + source create 1 h/utime.h + test modify 6 test/00/t0007a.sh + test modify 5 test/00/t0012a.sh + test modify 5 test/00/t0013a.sh + test modify 5 test/00/t0014a.sh + + HISTORY + What When Who Comment + ------ ------ ----- --------- + new_change Wed Mar 10 pmiller + 12:25:51 1993 + + + + Project "aegis.1.4", Change 29 Page 2 + Change Details Tue Mar 30 23:57:49 1993 + + What When Who Comment + ------ ------ ----- --------- + develop_begin Wed Mar 10 pmiller Elapsed time: 0.183 + 12:26:02 1993 days. + develop_end Thu Mar 11 pmiller + 22:48:29 1993 + review_pass Thu Mar 11 pmiller + 22:49:17 1993 + integrate_begin Thu Mar 11 pmiller Elapsed time: 0.111 + 22:52:09 1993 days. + integrate_pass Thu Mar 11 pmiller + 23:41:59 1993 + + + + Project "aegis.1.4", Change 30 Page 1 + Change Details Tue Mar 30 23:57:50 1993 + + NAME + Project "aegis.1.4", Delta 32, Change 30. + + SUMMARY + improve pyramid port + + DESCRIPTION + improve pyramid port + + This change is exempt from testing against the baseline. + + CAUSE + This change was caused by internal_bug. + + FILES + Type Action Edit File Name + ------- ------- ------- ----------- + source modify 6 aegis/cattr_ed.c + source modify 10 aegis/change.c + source modify 8 aegis/gonzo.c + source modify 6 aegis/pattr_ed.c + source modify 8 aegis/project.c + source modify 11 aegis/user.c + source remove 1 aux/BUILD.PY.man + source modify 12 aux/BUILDING.man + source create 1 aux/BUILDpyr.man + source modify 10 aux/Howto.cook + source modify 5 aux/Makefile.sh + source modify 2 conf/dcosx + source modify 4 doc/c2.1.so + source modify 4 fmtgen/parse.y + source modify 5 fmtgen/type_struc.c + test modify 7 test/00/t0007a.sh + + HISTORY + What When Who Comment + ------ ------ ----- --------- + new_change Sat Mar 13 pmiller + 22:54:35 1993 + develop_begin Sat Mar 13 pmiller Elapsed time: 2.795 + 22:54:41 1993 days. + develop_end Wed Mar 17 pmiller + 21:22:26 1993 + review_pass Wed Mar 17 pmiller + 21:22:36 1993 + integrate_begin Wed Mar 17 pmiller Elapsed time: 1.129 + 21:23:33 1993 days. + integrate_pass Thu Mar 18 pmiller + 22:21:35 1993 + + + + Project "aegis.1.4", Change 31 Page 1 + Change Details Tue Mar 30 23:57:51 1993 + + NAME + Project "aegis.1.4", Delta 33, Change 31. + + SUMMARY + there was a permissions bug in aeibu + + DESCRIPTION + there was a permissions bug in aeibu + + CAUSE + This change was caused by internal_bug. + + FILES + Type Action Edit File Name + ------- ------- ------- ----------- + source modify 14 aegis/integra2.c + source modify 6 aux/ALPHA.man + source modify 13 aux/BUILDING.man + source modify 12 aux/README.man + source modify 9 config + test create 1 test/00/t0015a.sh + + HISTORY + What When Who Comment + ------ ------ ----- --------- + new_change Thu Mar 18 pmiller + 22:25:31 1993 + develop_begin Thu Mar 18 pmiller Elapsed time: 1.077 + 22:25:39 1993 days. + develop_end Fri Mar 19 pmiller + 23:00:23 1993 + review_pass Fri Mar 19 pmiller + 23:00:34 1993 + integrate_begin Fri Mar 19 pmiller Elapsed time: 0.094 + 23:02:14 1993 days. + integrate_pass Fri Mar 19 pmiller + 23:44:22 1993 + + + + Project "aegis.1.4", Change 32 Page 1 + Change Details Tue Mar 30 23:57:51 1993 + + NAME + Project "aegis.1.4", Delta 34, Change 32. + + SUMMARY + fix problems found in final testing + + DESCRIPTION + fix problems found in final testing + + This change is exempt from testing. This change is exempt from + testing against the baseline. + + CAUSE + This change was caused by internal_bug. + + FILES + Type Action Edit File Name + ------- ------- ------- ----------- + source modify 5 aegis/glue.c + source modify 9 aegis/gonzo.c + source modify 14 aux/BUILDING.man + source modify 6 aux/Makefile.sh + source modify 9 conf/ConvexOS-10 + + HISTORY + What When Who Comment + ------ ------ ----- --------- + new_change Sat Mar 20 pmiller + 09:20:45 1993 + develop_begin Sat Mar 20 pmiller Elapsed time: 0.869 + 09:20:51 1993 days. + develop_end Sun Mar 21 pmiller + 08:22:03 1993 + review_pass Sun Mar 21 pmiller + 08:22:15 1993 + integrate_begin Sun Mar 21 pmiller Elapsed time: 0.063 + 08:23:27 1993 days. + integrate_pass Sun Mar 21 pmiller + 08:51:41 1993 + + + + Project "aegis.1.4", Change 33 Page 1 + Change Details Tue Mar 30 23:57:52 1993 + + NAME + Project "aegis.1.4", Delta 35, Change 33. + + SUMMARY + fix bugs in aecp and column output + + DESCRIPTION + 1. aecp -delta N failed to remember the correct edit number in + the change, thus not performing a merge + 2. column headings came out in the wrong place when columns + wrapped over page boundaries. + + This change is exempt from testing. This change is exempt from + testing against the baseline. + + CAUSE + This change was caused by internal_bug. + + FILES + Type Action Edit File Name + ------- ------- ------- ----------- + source modify 7 aegis/col.c + source modify 10 aegis/copyfile.c + + HISTORY + What When Who Comment + ------ ------ ----- --------- + new_change Sun Mar 21 pmiller + 08:52:55 1993 + develop_begin Sun Mar 21 pmiller Elapsed time: 1.483 + 08:53:02 1993 days. + develop_end Mon Mar 22 pmiller + 12:30:10 1993 + review_pass Mon Mar 22 pmiller + 12:31:10 1993 + integrate_begin Mon Mar 22 pmiller Elapsed time: 0.321 + 12:32:17 1993 days. + integrate_pass Mon Mar 22 pmiller + 14:56:51 1993 + + + + Project "aegis.1.4", Change 34 Page 1 + Change Details Tue Mar 30 23:57:53 1993 + + NAME + Project "aegis.1.4", Delta 36, Change 34. + + SUMMARY + note hpux as a known port + + DESCRIPTION + 1. A user managed to get aegis compiled and tested under HP/UX, + but was unable to verify set-uid-root functionality. My thanks + to Chris Adeniyi-Jones for providing this + information. + 2. Mention the mailing list in the README file. + 3. correct the author's sig + 4. add an install target to te Makefile as requires by c.s.unix + stds. + + This change is exempt from testing. This change is exempt from + testing against the baseline. + + CAUSE + This change was caused by internal_enhancement. + + FILES + Type Action Edit File Name + ------- ------- ------- ----------- + source modify 4 aegis/help.c + source modify 7 aux/ALPHA.man + source modify 15 aux/BUILDING.man + source modify 2 aux/BUILDpyr.man + source modify 7 aux/Makefile.sh + source modify 13 aux/README.man + source modify 4 common/ansi.c + source create 1 conf/hpux-8.07 + source modify 5 fmtgen/main.c + source modify 5 man1/z_cr.so + source modify 5 man5/z_cr.so + + HISTORY + What When Who Comment + ------ ------ ----- --------- + new_change Sun Mar 28 pmiller + 21:25:11 1993 + develop_begin Sun Mar 28 pmiller Elapsed time: 0.000 + 21:26:08 1993 days. + develop_end Mon Mar 29 pmiller + 13:23:41 1993 + review_pass Mon Mar 29 pmiller + 13:23:52 1993 + integrate_begin Mon Mar 29 pmiller Elapsed time: 0.156 + 13:25:02 1993 days. + integrate_pass Mon Mar 29 pmiller + 14:35:15 1993 + + + + Project "aegis.1.4", Change 35 Page 1 + Change Details Tue Mar 30 23:57:54 1993 + + NAME + Project "aegis.1.4", Delta 37, Change 35. + + SUMMARY + New_Project does not check uid + + DESCRIPTION + 1. The uid limits were not checked when a project was created. + Users were creating projects as root, and then getting + "permission denied" errors from the NFS semantics. My thanks + to John Thorp for raising this + problem. + + 2. Add the SCO config. My thanks to David Robison + for the config info. + + This change is exempt from testing. This change is exempt from + testing against the baseline. + + CAUSE + This change was caused by internal_enhancement. + + FILES + Type Action Edit File Name + ------- ------- ------- ----------- + source modify 7 aegis/new_proj.c + source modify 16 aux/BUILDING.man + source modify 8 aux/Makefile.sh + source create 1 conf/SCO-2.4 + + HISTORY + What When Who Comment + ------ ------ ----- --------- + new_change Mon Mar 29 pmiller + 15:25:20 1993 + develop_begin Mon Mar 29 pmiller Elapsed time: 0.128 + 15:25:26 1993 days. + develop_end Mon Mar 29 pmiller + 16:23:10 1993 + review_pass Mon Mar 29 pmiller + 16:24:05 1993 + integrate_begin Mon Mar 29 pmiller Elapsed time: 1.840 + 16:25:31 1993 days. + integrate_pass Tue Mar 30 pmiller + 22:43:22 1993 + + + + Project "aegis.1.4", Change 36 Page 1 + Change Details Tue Mar 30 23:57:55 1993 + + NAME + Project "aegis.1.4", Delta 38, Change 36. + + SUMMARY + fix minor problem with generated Makefile + + DESCRIPTION + fix minor problem with generated Makefile + + This change is exempt from testing. This change is exempt from + testing against the baseline. + + CAUSE + This change was caused by internal_enhancement. + + STATE + This change is in 'being_integrated' state. + + FILES + Type Action Edit File Name + ------- ------- ------- ----------- + source modify 8 aux/Makefile.sh + source modify 4 doc/c2.1.so + source modify 3 doc/c2.2.so + source modify 4 doc/c2.3.so + + HISTORY + What When Who Comment + ------ ------ ----- --------- + new_change Tue Mar 30 pmiller + 22:50:44 1993 + develop_begin Tue Mar 30 pmiller Elapsed time: 0.137 + 22:50:50 1993 days. + develop_end Tue Mar 30 pmiller + 23:52:28 1993 + review_pass Tue Mar 30 pmiller + 23:52:38 1993 + integrate_begin Tue Mar 30 pmiller + 23:53:48 1993 Index: MANIFEST *************** *** 0 **** --- 1,326 ---- + + + README Blurb about aegis + ALPHA Warning that aegis is only ALPHA software + BUILDING Instructions how to build, test and install aegis + BUILDpyr + CHANGES Change history of this release of aegis + LICENSE GNU General Public License + MANIFEST This file + Makefile Instructions to make(1) how to build and test aegis + aegis/administ.c functions to add and remove administrators + aegis/administ.h interface definition for aegis/administ.c + aegis/arglex2.h definitions of command line tokens + aegis/build.c functions to perform development and integration builds + aegis/build.h interface definition for aegis/build.c + aegis/cattr.def change state file contents definition + aegis/cattr_ed.c functions to list and modify change attributes + aegis/cattr_ed.h interface definition for aegis/cattr_ed.c + aegis/change.c functions to manipulate change state data + aegis/change.h interface definition for aegis/change.c + aegis/chdir.c functions to change directory or determine paths + aegis/chdir.h interface definition for aegis/chdir.c + aegis/col.c functions for columnized output + aegis/col.h interface definition for aegis/col.c + aegis/commit.c functions to store and enact file manipulations for commit + aegis/commit.h interface definition for aegis/commit.c + aegis/common.def enumerations common to many aegis file contents + aegis/copyfile.c copy files into a change, and undo + aegis/copyfile.h interface definition for aegis/copyfile.c + aegis/cstate.def change state file contents definition + aegis/develop1.c functions to add and remove developers + aegis/develop1.h interface definition for aegis/develop1.c + aegis/develop2.c functions to enter and leave 'being_developed' state + aegis/develop2.h interface definition for aegis/develop2.c + aegis/diff.c difference a change + aegis/diff.h interface definition for aegis/diff.c + aegis/dir.c functions to walk directory trees + aegis/dir.h interface definition for aegis/dir.c + aegis/file.c functions for pushing files around + aegis/file.h interface definition for aegis/file.c + aegis/glue.c functions to perform systems calls in subprocesses + aegis/glue.h interface definition for aegis/glue.c + aegis/gonzo.c functions for manipulating global state data + aegis/gonzo.h interface definition for aegis/gonzo.c + aegis/gram.h interface definition for aegis/gram.y + aegis/gram.y grammar and functions to parse aegis' data files + aegis/gstate.def global state file contents definition + aegis/help.c functions to provide consistent treatment of -Help options + aegis/help.h interface definition for aegis/help.c + aegis/indent.c functions to automatically indent output + aegis/indent.h interface definition for aegis/indent.c + aegis/integra1.c functions to add and remove integrators + aegis/integra1.h interface definition for aegis/integra1.c + aegis/integra2.c functions for state transitions to and from being_integrated state + aegis/integra2.h interface definition for aegis/integra2.c + aegis/io.c functions to parse and write fundamental data types + aegis/io.h interface definition for aegis/io.c + aegis/lex.c functions to perform lexical analysis on aegis' data files + aegis/lex.h interface definition for aegis/lex.c + aegis/list.c list interesting things about changes and projects + aegis/list.h interface definition for aegis/list.c + aegis/lock.c functions to lock aegis' data + aegis/lock.h interface definition for aegis/lock.c + aegis/log.c functions to open and close log files + aegis/log.h interface definition for aegis/log.c + aegis/main.c the operating system start-up point + aegis/new_chan.c functions to create and destroy changes + aegis/new_chan.h interface definition for aegis/new_chan.c + aegis/new_file.c functions to add or remove a new file to a change + aegis/new_file.h interface definition for aegis/new_file.c + aegis/new_proj.c functions to create and destroy projects + aegis/new_proj.h interface definition for aegis/new_proj.c + aegis/new_rele.c functions to create a new project out of an old one + aegis/new_rele.h interface definition for aegis/new_rele.c + aegis/new_test.c functions to add and remove new tests to a change + aegis/new_test.h interface definition for aegis/new_test.c + aegis/os.c wrappers around operating system functions + aegis/os.h interface definition for aegis/os.c + aegis/pager.c functions to pipe output through paginator + aegis/pager.h interface definition for aegis/pager.c + aegis/parse.c functions to parse aegis' data files + aegis/parse.h interface definition for aegis/parse.c + aegis/pattr.def project attributes file contents definition + aegis/pattr_ed.c functions to list and modify project attributes + aegis/pattr_ed.h interface definition for aegis/patter_ed.c + aegis/pconf.def project config file contents definition + aegis/project.c functions to manipulate project state data + aegis/project.h interface definition for aegis/project.h + aegis/pstate.def project state file contents definition + aegis/rem_file.c functions to add and remove files to be deleted to a change + aegis/rem_file.h interface definition for aegis/rem_file.c + aegis/rem_proj.c functions to remove projects + aegis/rem_proj.h interface definition for aegis/rem_proj.c + aegis/review.c review a change, pass or fail or undo + aegis/review.h interface definition for aegis/review.c + aegis/reviewer.c functions to add and remove reviewers + aegis/reviewer.h interface definition for aegis/reviewer.c + aegis/sub.c functions to perform command substitutions + aegis/sub.h interface definition for aegis/sub.c + aegis/test.c test a change + aegis/test.h interface definition for aegis/test.c + aegis/type.c functions to manipulate types in aegis' data files + aegis/type.h interface definition for aegis/type.c + aegis/uconf.def user config file contents definition + aegis/undo.c functions to store and enact file operations on transation abort + aegis/undo.h interface definition for aegis/undo.c + aegis/user.c functions to manage information about users + aegis/user.h interface definition for aegis/user.c + aegis/ustate.def user state file contents definition + aegis/version.c give version information + aegis/version.h interface definition for aegis/version.c + aux/ALPHA.man source for ALPHA file + aux/BUILDING.man source for BUILDING file + aux/BUILDpyr.man source of the BUILDpyr file + aux/CHANGES.sh shell script to create the CHANGES file + aux/Howto.cook instructions to cook(1), how to build project + aux/MANIFEST.sh shell script to generate the MANIFEST file + aux/Makefile.awk helper file for generating the Makefile file + aux/Makefile.sh shell script to generate the Mafile file + aux/README.man source for the README file + aux/patches.sh shell script to generate the patch file + common/ansi.c missing ANSI C library functions + common/arglex.c lexical analysis of command line arguments + common/arglex.h interface definition for common/arglex.c + common/error.c functions to report errors + common/error.h interface definition for common/error.c + common/main.h common definitions, including DEBUG define + common/mem.c functions to manipulate dynamic memory + common/mem.h interface definition for common/mem.c + common/option.c functions to manipulate command line options + common/option.h interface definition for common/option.c + common/patchlevel.h The patch level of this distribution. + common/s-v-arg.h insulation from varargs.h versus stdarg.h incompatibilities + common/str.c string manipulation functions + common/str.h interface definition for common/str.c + common/trace.c functions for execution trace + common/trace.h interface definition for common/trace.c + common/word.c functions to manipulate lists of strings + common/word.h interface definition for common/word.c + conf/AIX-3.2 aegis configuration for AIX 3.2 system + conf/ConvexOS-10 aegis configuration for ConvexOS 10 + conf/SCO-2.4 aegis configuration for SCO 2.4 + conf/SunOS-4.1.1 aegis configuration for SunOS 4.1.1 + conf/SunOS-4.1.2 aegis configuration for SunOS 4.1.2 + conf/SunOS-4.1.3 aegis configuration for SunOS 4.1.3 + conf/SysV-4.0 aegis configuration for generic SVR4 system + conf/ULTRIX-4.2 aegis configuration for ULTRIX version 4.2 + conf/apollo aegis configuration for apollo domain + conf/dcosx aegis configuration for Pyramid SMP DC/OSx + conf/dgux-5.4.1 aegis configuration for dgux 5.4.1 + conf/hpux-8.07 aegis configuration for generic SVR4 system + config instructions to aegis, per-project configuration + doc/aegis.ms User Guide + doc/c1.0.so User Guide, Introduction + doc/c1.1.so User Guide, Introduction, What does aegis do? + doc/c1.2.so User Guide, Introduction, Why use aegis? + doc/c1.3.so User Guide, How Aegis Works, When (not) to use Aegis + doc/c1.4.so User Guide, Introduction, How to use this manual + doc/c2.0.so User Guide, The Change Development Cycle + doc/c2.1.so User Guide, The Change Development Cycle, The Developer + doc/c2.2.so User Guide, The Change Development Cycle, The Reviewer + doc/c2.3.so User Guide, The Change Development Cycle, The Integrator + doc/c2.4.so User Guide, The Change Development Cycle, The Administrator + doc/c2.5.so User Guide, The Change Development Cycle, What to do Next + doc/c3.0.so User Guide, The History Tool" + doc/c3.1.so User Guide, The History Tool, Using SCCS + doc/c3.2.so User Guide, The History Tool, Using RCS + doc/c3.3.so User Guide, The History Tool, Using fhist + doc/c4.0.so User Guide, The Dependency Maintenance Tool + doc/c4.1.so User Guide, The Dependency Maintenance Tool, Requirements + doc/c4.2.so User Guide, The Dependency Maintenance Tool, Cook + doc/c4.3.so User Guiide, The Depenency Maintenance Tool, Other Packages + doc/c5.0.so User Guide, The Project Attributes + doc/c6.0.so User Guide, Tips and Traps + doc/c7.0.so User Guide, How Aegis Works + doc/c7.1.so User Guide, How Aegis Works, The Model + doc/c7.2.so User Guide, How Aegis Works, Philosophy + doc/c7.4.so User Guide, How Aegis Works, Further Work + doc/c7.5.so User Guide, How Aegis Works, Security + doc/c8.0.so User Guide, The Difference Tools + doc/c8.1.so User Guide, The Difference Tools, Interfacing + doc/c8.2.so User Guide, The Difference Tools, Using diff and diff3 + doc/c8.3.so User Guide, The Difference Tools, Using fhist + doc/cA.0.so User Guide, Appendix A: New Project Quick Reference + doc/cB.0.so User Guide, Appendix B: Glossary + doc/cC.0.so User Guide, Appendix C, Product Comparisons + doc/version.so The patch level of this distribution. + fmtgen/id.c symbol table manipulation + fmtgen/id.h interface definition for fmtgen/id.c + fmtgen/indent.c functions to automatically indent output + fmtgen/indent.h interface definition for fmtgen/indent.c + fmtgen/lex.c lexical analyzer + fmtgen/lex.h interface definition for fmtgen/lex.c + fmtgen/main.c operating system start-up point + fmtgen/parse.h interface definition for fmtgen/parse.y + fmtgen/parse.y grammar and functions to parse aegis file contents definitions + fmtgen/type.c functions to manipulate data types + fmtgen/type.h interface definition for fmtgen/type.c + fmtgen/type_enum.c enumerated types functions gereation + fmtgen/type_integ.c functions to manipulate integer type + fmtgen/type_list.c list types function generation + fmtgen/type_ref.c functions to manipulate reference types + fmtgen/type_strin.c functions to manipluate string type + fmtgen/type_struc.c struct types function generation + h/dirent.h minimal replacement for dirent.h + h/stdarg.h-min minimal stdarg.h substitute + h/stddef.h minimal stddef.h substitute + h/stdlib.h minimal stdlib.h substitute + h/unistd.h minimal substitute for unistd.h + h/utime.h minimal replacement for utime.h + lib/cshrc csh user config for aegis + lib/de.inews.sh command used to notify by usenet that a change is ready for review + lib/de.sh command used to notify by email that a change is ready for review + lib/deu.inews.sh command used to notify by usenet that a change has been withdrawn from review + lib/deu.sh command used to notify by email that a change has been withdrawn from review + lib/if.inews.sh command used to notify by usenet that a change failed integration + lib/if.sh command used to notify by email that a change failed integration + lib/ip.inews.sh command used to notify by usenet that a change has passed integration + lib/ip.sh command used to notify by email that a change has passed integration + lib/profile Bourne shell user config for aegis + lib/rf.inews.sh command used to notify by usenet that a change failed review + lib/rf.sh command used to notify by email that a change failed review + lib/rp.inews.sh command used to notify by usenet that a change has passed review + lib/rp.sh command used to notify by email that a change has passed review + lib/rpu.inews.sh command used to notify by usenet that a change review passed is rescinded + lib/rpu.sh command used to notify by email that a change review passed is rescinded + man1/aeb.1 manual entry for 'aegis -Build' command + man1/aeca.1 manual entry for 'aegis -Change_Attributes' command + man1/aecd.1 manual entry for 'aegis -Change_Directory' command + man1/aecp.1 manual entry for aegis -CoPy_file + man1/aecpu.1 manual entry for 'aegis -CoPy_file_Undo' command + man1/aed.1 manual entry for 'aegis -DIFFerence' command + man1/aedb.1 manual entry for 'aegis -Develop_Begin' command + man1/aedbu.1 manual entry for 'aegis -Develop_Begin_Undo' command + man1/aede.1 manual entry for 'aegis -Develop_End' command + man1/aedeu.1 manual entry for 'aegis -Develop_End_Undo' command + man1/aegis.1 manual entry for aegis + man1/aeib.1 manual entry for 'aegis -Integrate_Begin' command + man1/aeibu.1 manual entry for 'aegis -Integrate_Begin_Undo' command + man1/aeif.1 manual entry for 'aegis -Integrate_Fail' command + man1/aeip.1 manual entry for 'aegis -Integrate_Pass' command + man1/ael.1 manual entry for 'aegis -List' command + man1/aena.1 manual entry for 'aegis -New_Administrator' command + man1/aenc.1 manual entry for 'aegis -New_Change' command + man1/aencu.1 manual entry for 'aegis -New_Change_Undo' command + man1/aend.1 manual entry for 'aegis -New_Developer' command + man1/aenf.1 manual entry for 'aegis -New_File' command + man1/aenfu.1 manual entry for 'aegis -New_Fule_Undo' command + man1/aeni.1 manual entry for 'aegis -New_Integrator' command + man1/aenpr.1 manual entry for 'aegis -New_PRoject' command + man1/aenrls.1 manual entry for 'aegis -New_ReLeaSe' command + man1/aenrv.1 manual entry for 'aegis -New_ReViewer' command + man1/aent.1 manual entry for 'aegis -New_Test' command + man1/aentu.1 manual entry for 'aegis -New_Test_Undo' command + man1/aepa.1 manual entry for 'aegis -Project_Attributes' command + man1/aera.1 manual entry for 'aegis -Remove_Administrator' command + man1/aerd.1 manual entry for 'aegis -Remove_Developer' command + man1/aerf.1 manual entry for 'aegis -Review_FAIL' command + man1/aeri.1 manual entry for the 'aegis -Remove_Integrator' command + man1/aerm.1 manual entry for the 'aegis -ReMove_file' command + man1/aermpr.1 manual entry for the 'aegis -ReMove_PRoject' command + man1/aermu.1 manual entry for the 'aegis -ReMove_file_Undo' command + man1/aerp.1 manual entry for the 'aegis -Review_PASS' command + man1/aerpu.1 manual entry for the 'aegis -Review_Pass_Undo' command + man1/aerrv.1 manual entry for the 'aegis -Remove ReViewer' command + man1/aet.1 manual entry for the 'aegis -Test' command + man1/aev.1 manual entry for the 'aegis -VERSion' command + man1/install.sh shell script to install section 1 manual pages + man1/o__rules.so description of option up/down case convention + man1/o_anticip.so description of -ANticipate command line option + man1/o_auto.so description of -AUTOmatic command line option + man1/o_baselin.so description of -BaseLine command line option + man1/o_bld_lk.so manual section describing the build lock + man1/o_change.so description of -Change command line option + man1/o_devdir.so description of -Development_Directory command line option + man1/o_dir.so description of -DIRectory command line option + man1/o_help.so description of -Help command line option + man1/o_indep.so description of -INDependent command line option + man1/o_keep.so description of -Keep command line option + man1/o_lib.so description of -LIBrary command line option + man1/o_list.so description of -List command line option + man1/o_major.so description of -MAJor command line option + man1/o_manual.so description of -MINor command line option + man1/o_min.so description of -MINImum command line option + man1/o_minor.so description of -MINOr command line option + man1/o_nolog.so description of -Not_Logging command line option + man1/o_overw.so description of -OverWriting command line option + man1/o_page.so description of -Page_Length and -Page_Width command line options + man1/o_project.so description of -Project command line option + man1/o_terse.so description of -TERse command line option + man1/o_verbose.so description of -Verbose command line option + man1/z_cr.so copyright and author parts of section 1 manual entries + man1/z_exit.so exit status part of section 1 manual entries + man1/z_intuit.so description of how file names are interpreted on command line + man1/z_name.so common setup for section 1 manual entries + man5/aecattr.5 description of aegis change attribute file format + man5/aecattr.so description of aegis change attribute file format + man5/aecstate.5 description of aegis change state file format + man5/aedir.5 description of aegis project directory structure + man5/aegis.5 description of aegis file format general structure + man5/aegstate.5 description of aegis global state file format + man5/aepattr.5 description of aegis project attribute file format + man5/aepattr.so description of aegis project attribute file format + man5/aepconf.5 description of aegis project config file format + man5/aepstate.5 description of aegis project state file format + man5/aesub.5 manual page describing command substitutions + man5/aeuconf.5 description of aegis user config file format + man5/aeustate.5 description of aegis user state file format + man5/install.sh shell script to install section 5 manual entries + man5/z_cr.so copyright and author parts of section 5 manual entries + man5/z_name.so common setup for section 5 manual entries + test/00/t0001a.sh test -Help for each function + test/00/t0002a.sh Test core functionality. + test/00/t0003a.sh Test 'aegis -VERSion' + test/00/t0004a.sh Test the 'aegis -DIFFerence' command. + test/00/t0005a.sh Test the 'aegis -DevEnd' command. + test/00/t0006a.sh Test 'aegis -DIFFerence' when the edit number is out-of-date. + test/00/t0007a.sh test for correct behaviour around symbolic links + test/00/t0008a.sh Test command substitutions + test/00/t0009a.sh Test -New_ReLeaSe functionality. + test/00/t0010a.sh Test -Review_Pass_Undo functionality. + test/00/t0011a.sh Test documentation example. + test/00/t0012a.sh Test the aermpr functionality + test/00/t0013a.sh Test the -New_Change_Undo functionality + test/00/t0014a.sh Test the -Develop_Begin_Undo functionality + test/00/t0015a.sh Test the -Integrate_Begin_Undo functionality Index: Makefile *************** *** 0 **** --- 1,921 ---- + # + # You may need to change this for your system. + # The ``h'' directory supplements your system, not replacing it. + # The first variation is for gcc when it isn't the native complier, + # the second variation is for systems with missing ANSI C include files, + # the third variation is for conforming ANSI C implementations. + # + # H = -I/usr/local/lib/gcc-include -I/usr/include -Ih + # H = -I/usr/include -Ih + H = + # H = # SunOS + # H = # ConvexOS + # H = # dgux + # H = # dcosx + # H = # ULTRIX + # H = # hpux + # H = # SCO + + # + # the name of the compiler to use + # + CC = cc + # CC = gcc + # CC = cc # SunOS + # CC = cc # ConvexOS + # CC = cc # dgux + # CC = /usr/ucb/cc # dcosx + # CC = cc # ULTRIX + # CC = cc # hpux + # CC = rcc # SCO + + # + # The compiler flags to use, except for include path. + # + CFLAGS = -O + # CFLAGS = -g + # CFLAGS = -O # SunOS + # CFLAGS = -O # ConvexOS + # CFLAGS = -O # dgux + # CFLAGS = -O -Wall -ansi # gcc + # CFLAGS = -O -Xt -U__STDC__ # dcosx + # CFLAGS = -O # ULTRIX + # CFLAGS = -O # hpux + # CFLAGS = -O # SCO + + # + # which yacc to use + # + YACC = yacc + # YACC = byacc # Berkeley + # YACC = bison -y # GNU + + # + # where to put the library directory + # (not used in testing mode) + # + LIB = /usr/local/lib/aegis + + # + # where to put the executables + # + BIN = /usr/local/bin + + # + # where to put the manual entries + # + MAN = /usr/local/man + + # + # extra libraries required for your system + # + LIBRARIES = + # LIBRARIES = -lbsd + # LIBRARIES = # SunOS + # LIBRARIES = # ConvexOS + # LIBRARIES = # dgux + # LIBRARIES = -lucb # dcosx + # LIBRARIES = # ULTRIX + # LIBRARIES = # hpux + # LIBRARIES = -lsocket # SCO + + # + # shell to use to run the tests + # make sure there are no spaces after the definition, + # many flavours of make(1) can't cope with them. + # + SHELL = /bin/sh + # SHELL = /bin/sh # SunOS + # SHELL = /bin/sh # ConvexOS + # SHELL = /bin/sh # dgux + # SHELL = /bin/sh # dcosx + # SHELL = /bin/sh5 # ULTRIX + # SHELL = /bin/ksh # apollo + # SHELL = /bin/sh # hpux + # SHELL = /bin/sh # SCO + + # You should not need to alter anything below this point. + #------------------------------------------------------------ + + all: bin/aegis + + + aegis/administ.o: aegis/administ.c aegis/arglex2.h common/arglex.h \ + common/main.h aegis/administ.h aegis/commit.h \ + common/str.h common/s-v-arg.h common/conf.h \ + common/error.h aegis/help.h aegis/list.h aegis/lock.h \ + common/option.h aegis/os.h aegis/project.h \ + aegis/pstate.h aegis/type.h aegis/parse.h aegis/pattr.h \ + common/trace.h aegis/user.h aegis/ustate.h \ + aegis/uconf.h common/word.h + $(CC) $(CFLAGS) -Iaegis -Icommon $(H) -c aegis/administ.c + mv administ.o aegis/administ.o + + aegis/build.o: aegis/build.c aegis/arglex2.h common/arglex.h \ + common/main.h aegis/build.h aegis/col.h aegis/commit.h \ + common/str.h common/s-v-arg.h common/conf.h \ + aegis/change.h aegis/cstate.h aegis/type.h \ + aegis/parse.h aegis/pconf.h common/error.h aegis/help.h \ + aegis/list.h aegis/lock.h aegis/log.h common/option.h \ + aegis/os.h aegis/project.h aegis/pstate.h aegis/pattr.h \ + aegis/sub.h common/trace.h aegis/user.h aegis/ustate.h \ + aegis/uconf.h + $(CC) $(CFLAGS) -Iaegis -Icommon $(H) -c aegis/build.c + mv build.o aegis/build.o + + aegis/cattr.c aegis/cattr.h: aegis/cattr.def bin/fmtgen aegis/common.def + bin/fmtgen -Iaegis aegis/cattr.def aegis/cattr.c aegis/cattr.h + + aegis/cattr.o: aegis/cattr.c aegis/cattr.h common/main.h aegis/type.h \ + common/str.h common/s-v-arg.h common/conf.h \ + aegis/parse.h common/error.h aegis/indent.h aegis/io.h \ + common/mem.h aegis/os.h common/trace.h + $(CC) $(CFLAGS) -Iaegis -Icommon $(H) -c aegis/cattr.c + mv cattr.o aegis/cattr.o + + aegis/cattr_ed.o: aegis/cattr_ed.c aegis/arglex2.h common/arglex.h \ + common/main.h aegis/cattr.h aegis/type.h common/str.h \ + common/s-v-arg.h common/conf.h aegis/parse.h \ + aegis/cattr_ed.h aegis/commit.h aegis/change.h \ + aegis/cstate.h aegis/pconf.h common/error.h \ + aegis/help.h aegis/lock.h aegis/project.h \ + aegis/pstate.h aegis/pattr.h common/option.h aegis/os.h \ + common/trace.h aegis/user.h aegis/ustate.h \ + aegis/uconf.h + $(CC) $(CFLAGS) -Iaegis -Icommon $(H) -c aegis/cattr_ed.c + mv cattr_ed.o aegis/cattr_ed.o + + aegis/change.o: aegis/change.c aegis/change.h common/main.h \ + aegis/cstate.h aegis/type.h common/str.h \ + common/s-v-arg.h common/conf.h aegis/parse.h \ + aegis/pconf.h aegis/commit.h common/error.h \ + aegis/lock.h common/mem.h common/option.h aegis/os.h \ + aegis/project.h aegis/pstate.h aegis/pattr.h \ + aegis/sub.h common/trace.h aegis/undo.h aegis/user.h \ + aegis/ustate.h aegis/uconf.h common/word.h + $(CC) $(CFLAGS) -Iaegis -Icommon $(H) -c aegis/change.c + mv change.o aegis/change.o + + aegis/chdir.o: aegis/chdir.c aegis/arglex2.h common/arglex.h \ + common/main.h aegis/chdir.h aegis/change.h \ + aegis/cstate.h aegis/type.h common/str.h \ + common/s-v-arg.h common/conf.h aegis/parse.h \ + aegis/pconf.h common/error.h aegis/help.h aegis/list.h \ + common/option.h aegis/os.h aegis/project.h \ + aegis/pstate.h aegis/pattr.h common/trace.h \ + aegis/user.h aegis/ustate.h aegis/uconf.h + $(CC) $(CFLAGS) -Iaegis -Icommon $(H) -c aegis/chdir.c + mv chdir.o aegis/chdir.o + + aegis/col.o: aegis/col.c aegis/col.h common/main.h common/error.h \ + aegis/glue.h common/conf.h common/mem.h common/option.h \ + aegis/os.h common/str.h common/s-v-arg.h aegis/pager.h \ + common/trace.h + $(CC) $(CFLAGS) -Iaegis -Icommon $(H) -c aegis/col.c + mv col.o aegis/col.o + + aegis/commit.o: aegis/commit.c aegis/commit.h common/str.h \ + common/s-v-arg.h common/conf.h common/main.h \ + aegis/dir.h common/mem.h aegis/os.h common/trace.h \ + aegis/undo.h + $(CC) $(CFLAGS) -Iaegis -Icommon $(H) -c aegis/commit.c + mv commit.o aegis/commit.o + + aegis/common.c aegis/common.h: aegis/common.def bin/fmtgen + bin/fmtgen -Iaegis aegis/common.def aegis/common.c aegis/common.h + + aegis/common.o: aegis/common.c aegis/common.h common/main.h \ + aegis/type.h common/str.h common/s-v-arg.h \ + common/conf.h aegis/parse.h common/error.h \ + aegis/indent.h aegis/io.h common/mem.h aegis/os.h \ + common/trace.h + $(CC) $(CFLAGS) -Iaegis -Icommon $(H) -c aegis/common.c + mv common.o aegis/common.o + + aegis/copyfile.o: aegis/copyfile.c aegis/arglex2.h common/arglex.h \ + common/main.h aegis/commit.h common/str.h \ + common/s-v-arg.h common/conf.h aegis/copyfile.h \ + aegis/change.h aegis/cstate.h aegis/type.h \ + aegis/parse.h aegis/pconf.h common/error.h aegis/file.h \ + aegis/help.h aegis/list.h aegis/lock.h aegis/log.h \ + common/option.h aegis/os.h aegis/project.h \ + aegis/pstate.h aegis/pattr.h common/trace.h \ + aegis/undo.h aegis/user.h aegis/ustate.h aegis/uconf.h \ + common/word.h + $(CC) $(CFLAGS) -Iaegis -Icommon $(H) -c aegis/copyfile.c + mv copyfile.o aegis/copyfile.o + + aegis/cstate.c aegis/cstate.h: aegis/cstate.def bin/fmtgen \ + aegis/cattr.def aegis/common.def + bin/fmtgen -Iaegis aegis/cstate.def aegis/cstate.c aegis/cstate.h + + aegis/cstate.o: aegis/cstate.c aegis/cstate.h common/main.h \ + aegis/type.h common/str.h common/s-v-arg.h \ + common/conf.h aegis/parse.h common/error.h \ + aegis/indent.h aegis/io.h common/mem.h aegis/os.h \ + common/trace.h + $(CC) $(CFLAGS) -Iaegis -Icommon $(H) -c aegis/cstate.c + mv cstate.o aegis/cstate.o + + aegis/develop1.o: aegis/develop1.c aegis/arglex2.h common/arglex.h \ + common/main.h aegis/commit.h common/str.h \ + common/s-v-arg.h common/conf.h aegis/develop1.h \ + common/error.h aegis/help.h aegis/lock.h aegis/list.h \ + common/option.h aegis/os.h aegis/project.h \ + aegis/pstate.h aegis/type.h aegis/parse.h aegis/pattr.h \ + common/trace.h aegis/user.h aegis/ustate.h \ + aegis/uconf.h common/word.h + $(CC) $(CFLAGS) -Iaegis -Icommon $(H) -c aegis/develop1.c + mv develop1.o aegis/develop1.o + + aegis/develop2.o: aegis/develop2.c aegis/arglex2.h common/arglex.h \ + common/main.h aegis/change.h aegis/cstate.h \ + aegis/type.h common/str.h common/s-v-arg.h \ + common/conf.h aegis/parse.h aegis/pconf.h aegis/col.h \ + aegis/commit.h aegis/common.h aegis/develop2.h \ + aegis/dir.h common/error.h aegis/help.h aegis/list.h \ + aegis/lock.h common/option.h aegis/os.h aegis/project.h \ + aegis/pstate.h aegis/pattr.h aegis/sub.h common/trace.h \ + aegis/undo.h aegis/user.h aegis/ustate.h aegis/uconf.h + $(CC) $(CFLAGS) -Iaegis -Icommon $(H) -c aegis/develop2.c + mv develop2.o aegis/develop2.o + + aegis/diff.o: aegis/diff.c aegis/arglex2.h common/arglex.h \ + common/main.h aegis/change.h aegis/cstate.h \ + aegis/type.h common/str.h common/s-v-arg.h \ + common/conf.h aegis/parse.h aegis/pconf.h aegis/col.h \ + aegis/commit.h aegis/diff.h common/error.h aegis/help.h \ + aegis/list.h aegis/lock.h aegis/log.h common/option.h \ + aegis/os.h aegis/project.h aegis/pstate.h aegis/pattr.h \ + aegis/sub.h common/trace.h aegis/undo.h aegis/user.h \ + aegis/ustate.h aegis/uconf.h common/word.h + $(CC) $(CFLAGS) -Iaegis -Icommon $(H) -c aegis/diff.c + mv diff.o aegis/diff.o + + aegis/dir.o: aegis/dir.c aegis/dir.h common/main.h common/str.h \ + common/s-v-arg.h common/conf.h common/error.h \ + aegis/glue.h common/trace.h common/word.h + $(CC) $(CFLAGS) -Iaegis -Icommon $(H) -c aegis/dir.c + mv dir.o aegis/dir.o + + aegis/file.o: aegis/file.c aegis/file.h common/main.h common/str.h \ + common/s-v-arg.h common/conf.h common/error.h \ + aegis/glue.h common/mem.h aegis/os.h common/trace.h + $(CC) $(CFLAGS) -Iaegis -Icommon $(H) -c aegis/file.c + mv file.o aegis/file.o + + aegis/glue.o: aegis/glue.c common/error.h common/main.h aegis/glue.h \ + common/conf.h common/mem.h aegis/os.h common/str.h \ + common/s-v-arg.h common/trace.h aegis/undo.h + $(CC) $(CFLAGS) -Iaegis -Icommon $(H) -c aegis/glue.c + mv glue.o aegis/glue.o + + aegis/gonzo.o: aegis/gonzo.c aegis/commit.h common/str.h \ + common/s-v-arg.h common/conf.h common/main.h \ + common/error.h aegis/gonzo.h aegis/gstate.h \ + aegis/type.h aegis/parse.h aegis/lock.h common/mem.h \ + common/option.h aegis/os.h aegis/project.h \ + aegis/pstate.h aegis/pattr.h common/trace.h \ + aegis/undo.h aegis/user.h aegis/ustate.h aegis/uconf.h \ + common/word.h + $(CC) $(CFLAGS) -D'LIB="$(LIB)"' -Iaegis -Icommon $(H) -c aegis/gonzo.c + mv gonzo.o aegis/gonzo.o + + aegis/gram.gen.c aegis/gram.gen.h: aegis/gram.y + $(YACC) -d aegis/gram.y + sed "s/[yY][yY]/gram_/g" < y.tab.c > aegis/gram.gen.c + rm y.tab.c + sed "s/[yY][yY]/gram_/g" < y.tab.h > aegis/gram.gen.h + rm y.tab.h + + aegis/gram.gen.o: aegis/gram.gen.c aegis/gram.h common/main.h \ + aegis/lex.h common/mem.h aegis/parse.h common/str.h \ + common/s-v-arg.h common/conf.h aegis/type.h + $(CC) $(CFLAGS) -Iaegis -Icommon $(H) -c aegis/gram.gen.c + mv gram.gen.o aegis/gram.gen.o + + aegis/gstate.c aegis/gstate.h: aegis/gstate.def bin/fmtgen + bin/fmtgen -Iaegis aegis/gstate.def aegis/gstate.c aegis/gstate.h + + aegis/gstate.o: aegis/gstate.c aegis/gstate.h common/main.h \ + aegis/type.h common/str.h common/s-v-arg.h \ + common/conf.h aegis/parse.h common/error.h \ + aegis/indent.h aegis/io.h common/mem.h aegis/os.h \ + common/trace.h + $(CC) $(CFLAGS) -Iaegis -Icommon $(H) -c aegis/gstate.c + mv gstate.o aegis/gstate.o + + aegis/help.o: aegis/help.c aegis/arglex2.h common/arglex.h \ + common/main.h common/error.h aegis/gonzo.h \ + aegis/gstate.h aegis/type.h common/str.h \ + common/s-v-arg.h common/conf.h aegis/parse.h \ + aegis/help.h common/option.h aegis/pager.h \ + common/patchlevel.h common/trace.h aegis/undo.h + $(CC) $(CFLAGS) -Iaegis -Icommon $(H) -c aegis/help.c + mv help.o aegis/help.o + + aegis/indent.o: aegis/indent.c common/error.h common/main.h \ + aegis/glue.h common/conf.h aegis/indent.h \ + common/s-v-arg.h common/trace.h + $(CC) $(CFLAGS) -Iaegis -Icommon $(H) -c aegis/indent.c + mv indent.o aegis/indent.o + + aegis/integra1.o: aegis/integra1.c aegis/arglex2.h common/arglex.h \ + common/main.h aegis/commit.h common/str.h \ + common/s-v-arg.h common/conf.h common/error.h \ + aegis/help.h aegis/integra1.h aegis/list.h aegis/lock.h \ + common/option.h aegis/os.h aegis/project.h \ + aegis/pstate.h aegis/type.h aegis/parse.h aegis/pattr.h \ + common/trace.h aegis/user.h aegis/ustate.h \ + aegis/uconf.h common/word.h + $(CC) $(CFLAGS) -Iaegis -Icommon $(H) -c aegis/integra1.c + mv integra1.o aegis/integra1.o + + aegis/integra2.o: aegis/integra2.c aegis/arglex2.h common/arglex.h \ + common/main.h aegis/commit.h common/str.h \ + common/s-v-arg.h common/conf.h aegis/change.h \ + aegis/cstate.h aegis/type.h aegis/parse.h aegis/pconf.h \ + aegis/dir.h common/error.h aegis/file.h aegis/help.h \ + aegis/integra2.h aegis/list.h aegis/lock.h aegis/log.h \ + common/option.h aegis/os.h aegis/project.h \ + aegis/pstate.h aegis/pattr.h aegis/sub.h common/trace.h \ + aegis/undo.h aegis/user.h aegis/ustate.h aegis/uconf.h + $(CC) $(CFLAGS) -Iaegis -Icommon $(H) -c aegis/integra2.c + mv integra2.o aegis/integra2.o + + aegis/io.o: aegis/io.c aegis/indent.h common/main.h common/str.h \ + common/s-v-arg.h common/conf.h aegis/io.h aegis/type.h + $(CC) $(CFLAGS) -Iaegis -Icommon $(H) -c aegis/io.c + mv io.o aegis/io.o + + aegis/lex.o: aegis/lex.c common/error.h common/main.h aegis/glue.h \ + common/conf.h aegis/lex.h common/s-v-arg.h common/str.h \ + aegis/gram.gen.h + $(CC) $(CFLAGS) -Iaegis -Icommon $(H) -c aegis/lex.c + mv lex.o aegis/lex.o + + aegis/list.o: aegis/list.c aegis/arglex2.h common/arglex.h \ + common/main.h aegis/col.h aegis/change.h aegis/cstate.h \ + aegis/type.h common/str.h common/s-v-arg.h \ + common/conf.h aegis/parse.h aegis/pconf.h \ + common/error.h aegis/gonzo.h aegis/gstate.h \ + aegis/help.h aegis/list.h common/option.h aegis/os.h \ + aegis/project.h aegis/pstate.h aegis/pattr.h \ + common/trace.h aegis/user.h aegis/ustate.h \ + aegis/uconf.h common/word.h + $(CC) $(CFLAGS) -Iaegis -Icommon $(H) -c aegis/list.c + mv list.o aegis/list.o + + aegis/lock.o: aegis/lock.c common/error.h common/main.h aegis/glue.h \ + common/conf.h aegis/gonzo.h aegis/gstate.h aegis/type.h \ + common/str.h common/s-v-arg.h aegis/parse.h \ + aegis/lock.h common/mem.h aegis/os.h common/trace.h + $(CC) $(CFLAGS) -Iaegis -Icommon $(H) -c aegis/lock.c + mv lock.o aegis/lock.o + + aegis/log.o: aegis/log.c common/error.h common/main.h aegis/log.h \ + aegis/os.h common/str.h common/s-v-arg.h common/conf.h \ + common/trace.h aegis/undo.h aegis/user.h aegis/ustate.h \ + aegis/type.h aegis/parse.h aegis/uconf.h + $(CC) $(CFLAGS) -Iaegis -Icommon $(H) -c aegis/log.c + mv log.o aegis/log.o + + aegis/main.o: aegis/main.c aegis/administ.h common/main.h \ + aegis/arglex2.h common/arglex.h aegis/build.h \ + aegis/cattr_ed.h aegis/chdir.h aegis/copyfile.h \ + aegis/develop1.h aegis/develop2.h aegis/diff.h \ + common/error.h aegis/help.h aegis/integra1.h \ + aegis/integra2.h aegis/list.h aegis/log.h \ + aegis/new_chan.h aegis/new_file.h aegis/new_proj.h \ + aegis/new_rele.h aegis/new_test.h common/option.h \ + aegis/os.h common/str.h common/s-v-arg.h common/conf.h \ + aegis/pattr_ed.h aegis/rem_file.h aegis/rem_proj.h \ + aegis/review.h aegis/reviewer.h aegis/test.h \ + common/trace.h aegis/undo.h aegis/version.h + $(CC) $(CFLAGS) -Iaegis -Icommon $(H) -c aegis/main.c + mv main.o aegis/main.o + + aegis/new_chan.o: aegis/new_chan.c aegis/arglex2.h common/arglex.h \ + common/main.h aegis/cattr.h aegis/type.h common/str.h \ + common/s-v-arg.h common/conf.h aegis/parse.h \ + aegis/change.h aegis/cstate.h aegis/pconf.h aegis/col.h \ + aegis/commit.h aegis/common.h common/error.h \ + aegis/help.h aegis/list.h aegis/lock.h aegis/new_chan.h \ + common/option.h aegis/os.h aegis/project.h \ + aegis/pstate.h aegis/pattr.h common/trace.h \ + aegis/user.h aegis/ustate.h aegis/uconf.h + $(CC) $(CFLAGS) -Iaegis -Icommon $(H) -c aegis/new_chan.c + mv new_chan.o aegis/new_chan.o + + aegis/new_file.o: aegis/new_file.c aegis/arglex2.h common/arglex.h \ + common/main.h aegis/change.h aegis/cstate.h \ + aegis/type.h common/str.h common/s-v-arg.h \ + common/conf.h aegis/parse.h aegis/pconf.h aegis/col.h \ + aegis/commit.h common/error.h aegis/glue.h aegis/help.h \ + aegis/list.h aegis/lock.h aegis/log.h aegis/new_file.h \ + common/option.h aegis/os.h aegis/project.h \ + aegis/pstate.h aegis/pattr.h common/trace.h \ + aegis/user.h aegis/ustate.h aegis/uconf.h common/word.h + $(CC) $(CFLAGS) -Iaegis -Icommon $(H) -c aegis/new_file.c + mv new_file.o aegis/new_file.o + + aegis/new_proj.o: aegis/new_proj.c aegis/arglex2.h common/arglex.h \ + common/main.h aegis/commit.h common/str.h \ + common/s-v-arg.h common/conf.h common/error.h \ + aegis/gonzo.h aegis/gstate.h aegis/type.h aegis/parse.h \ + aegis/help.h aegis/list.h aegis/lock.h aegis/new_proj.h \ + common/option.h aegis/os.h aegis/project.h \ + aegis/pstate.h aegis/pattr.h common/trace.h \ + aegis/undo.h aegis/user.h aegis/ustate.h aegis/uconf.h + $(CC) $(CFLAGS) -Iaegis -Icommon $(H) -c aegis/new_proj.c + mv new_proj.o aegis/new_proj.o + + aegis/new_rele.o: aegis/new_rele.c aegis/arglex2.h common/arglex.h \ + common/main.h aegis/change.h aegis/cstate.h \ + aegis/type.h common/str.h common/s-v-arg.h \ + common/conf.h aegis/parse.h aegis/pconf.h \ + aegis/commit.h aegis/dir.h common/error.h aegis/file.h \ + aegis/gonzo.h aegis/gstate.h aegis/help.h aegis/list.h \ + aegis/lock.h aegis/log.h common/mem.h aegis/new_rele.h \ + common/option.h aegis/os.h aegis/project.h \ + aegis/pstate.h aegis/pattr.h aegis/sub.h common/trace.h \ + aegis/undo.h aegis/user.h aegis/ustate.h aegis/uconf.h + $(CC) $(CFLAGS) -Iaegis -Icommon $(H) -c aegis/new_rele.c + mv new_rele.o aegis/new_rele.o + + aegis/new_test.o: aegis/new_test.c aegis/arglex2.h common/arglex.h \ + common/main.h aegis/change.h aegis/cstate.h \ + aegis/type.h common/str.h common/s-v-arg.h \ + common/conf.h aegis/parse.h aegis/pconf.h aegis/col.h \ + aegis/commit.h common/error.h aegis/glue.h aegis/help.h \ + aegis/list.h aegis/lock.h aegis/new_test.h \ + common/option.h aegis/os.h aegis/project.h \ + aegis/pstate.h aegis/pattr.h common/trace.h \ + aegis/user.h aegis/ustate.h aegis/uconf.h common/word.h + $(CC) $(CFLAGS) -Iaegis -Icommon $(H) -c aegis/new_test.c + mv new_test.o aegis/new_test.o + + aegis/os.o: aegis/os.c common/conf.h aegis/dir.h common/main.h \ + common/str.h common/s-v-arg.h common/error.h \ + aegis/file.h aegis/glue.h common/mem.h common/option.h \ + aegis/os.h common/trace.h aegis/undo.h common/word.h + $(CC) $(CFLAGS) -Iaegis -Icommon $(H) -c aegis/os.c + mv os.o aegis/os.o + + aegis/pager.o: aegis/pager.c common/error.h common/main.h aegis/os.h \ + common/str.h common/s-v-arg.h common/conf.h \ + aegis/pager.h common/trace.h aegis/undo.h + $(CC) $(CFLAGS) -Iaegis -Icommon $(H) -c aegis/pager.c + mv pager.o aegis/pager.o + + aegis/parse.o: aegis/parse.c common/error.h common/main.h aegis/gram.h \ + aegis/lex.h common/mem.h aegis/parse.h common/str.h \ + common/s-v-arg.h common/conf.h aegis/type.h \ + common/trace.h + $(CC) $(CFLAGS) -Iaegis -Icommon $(H) -c aegis/parse.c + mv parse.o aegis/parse.o + + aegis/pattr.c aegis/pattr.h: aegis/pattr.def bin/fmtgen aegis/common.def + bin/fmtgen -Iaegis aegis/pattr.def aegis/pattr.c aegis/pattr.h + + aegis/pattr.o: aegis/pattr.c aegis/pattr.h common/main.h aegis/type.h \ + common/str.h common/s-v-arg.h common/conf.h \ + aegis/parse.h common/error.h aegis/indent.h aegis/io.h \ + common/mem.h aegis/os.h common/trace.h + $(CC) $(CFLAGS) -Iaegis -Icommon $(H) -c aegis/pattr.c + mv pattr.o aegis/pattr.o + + aegis/pattr_ed.o: aegis/pattr_ed.c aegis/arglex2.h common/arglex.h \ + common/main.h aegis/commit.h common/str.h \ + common/s-v-arg.h common/conf.h common/error.h \ + aegis/help.h aegis/lock.h common/option.h aegis/os.h \ + aegis/pattr.h aegis/type.h aegis/parse.h \ + aegis/pattr_ed.h aegis/project.h aegis/pstate.h \ + common/trace.h aegis/user.h aegis/ustate.h \ + aegis/uconf.h + $(CC) $(CFLAGS) -Iaegis -Icommon $(H) -c aegis/pattr_ed.c + mv pattr_ed.o aegis/pattr_ed.o + + aegis/pconf.c aegis/pconf.h: aegis/pconf.def bin/fmtgen aegis/common.def + bin/fmtgen -Iaegis aegis/pconf.def aegis/pconf.c aegis/pconf.h + + aegis/pconf.o: aegis/pconf.c aegis/pconf.h common/main.h aegis/type.h \ + common/str.h common/s-v-arg.h common/conf.h \ + aegis/parse.h common/error.h aegis/indent.h aegis/io.h \ + common/mem.h aegis/os.h common/trace.h + $(CC) $(CFLAGS) -Iaegis -Icommon $(H) -c aegis/pconf.c + mv pconf.o aegis/pconf.o + + aegis/project.o: aegis/project.c aegis/change.h common/main.h \ + aegis/cstate.h aegis/type.h common/str.h \ + common/s-v-arg.h common/conf.h aegis/parse.h \ + aegis/pconf.h aegis/commit.h common/error.h \ + aegis/gonzo.h aegis/gstate.h aegis/lock.h common/mem.h \ + common/option.h aegis/os.h aegis/project.h \ + aegis/pstate.h aegis/pattr.h common/trace.h \ + aegis/user.h aegis/ustate.h aegis/uconf.h aegis/undo.h + $(CC) $(CFLAGS) -Iaegis -Icommon $(H) -c aegis/project.c + mv project.o aegis/project.o + + aegis/pstate.c aegis/pstate.h: aegis/pstate.def bin/fmtgen \ + aegis/pattr.def aegis/common.def + bin/fmtgen -Iaegis aegis/pstate.def aegis/pstate.c aegis/pstate.h + + aegis/pstate.o: aegis/pstate.c aegis/pstate.h common/main.h \ + aegis/type.h common/str.h common/s-v-arg.h \ + common/conf.h aegis/parse.h common/error.h \ + aegis/indent.h aegis/io.h common/mem.h aegis/os.h \ + common/trace.h + $(CC) $(CFLAGS) -Iaegis -Icommon $(H) -c aegis/pstate.c + mv pstate.o aegis/pstate.o + + aegis/rem_file.o: aegis/rem_file.c aegis/arglex2.h common/arglex.h \ + common/main.h aegis/change.h aegis/cstate.h \ + aegis/type.h common/str.h common/s-v-arg.h \ + common/conf.h aegis/parse.h aegis/pconf.h \ + aegis/commit.h common/error.h aegis/help.h aegis/list.h \ + aegis/lock.h aegis/log.h common/option.h aegis/os.h \ + aegis/project.h aegis/pstate.h aegis/pattr.h \ + aegis/rem_file.h common/trace.h aegis/user.h \ + aegis/ustate.h aegis/uconf.h common/word.h + $(CC) $(CFLAGS) -Iaegis -Icommon $(H) -c aegis/rem_file.c + mv rem_file.o aegis/rem_file.o + + aegis/rem_proj.o: aegis/rem_proj.c aegis/arglex2.h common/arglex.h \ + common/main.h aegis/change.h aegis/cstate.h \ + aegis/type.h common/str.h common/s-v-arg.h \ + common/conf.h aegis/parse.h aegis/pconf.h \ + aegis/commit.h common/error.h aegis/gonzo.h \ + aegis/gstate.h aegis/help.h aegis/list.h aegis/lock.h \ + common/option.h aegis/project.h aegis/pstate.h \ + aegis/pattr.h aegis/rem_proj.h common/trace.h \ + aegis/user.h aegis/ustate.h aegis/uconf.h + $(CC) $(CFLAGS) -Iaegis -Icommon $(H) -c aegis/rem_proj.c + mv rem_proj.o aegis/rem_proj.o + + aegis/review.o: aegis/review.c aegis/arglex2.h common/arglex.h \ + common/main.h aegis/change.h aegis/cstate.h \ + aegis/type.h common/str.h common/s-v-arg.h \ + common/conf.h aegis/parse.h aegis/pconf.h \ + aegis/commit.h aegis/dir.h common/error.h aegis/file.h \ + aegis/help.h aegis/list.h aegis/lock.h common/mem.h \ + common/option.h aegis/os.h aegis/project.h \ + aegis/pstate.h aegis/pattr.h aegis/review.h aegis/sub.h \ + common/trace.h aegis/undo.h aegis/user.h aegis/ustate.h \ + aegis/uconf.h + $(CC) $(CFLAGS) -Iaegis -Icommon $(H) -c aegis/review.c + mv review.o aegis/review.o + + aegis/reviewer.o: aegis/reviewer.c aegis/arglex2.h common/arglex.h \ + common/main.h aegis/commit.h common/str.h \ + common/s-v-arg.h common/conf.h common/error.h \ + aegis/help.h aegis/list.h aegis/lock.h common/option.h \ + aegis/os.h aegis/project.h aegis/pstate.h aegis/type.h \ + aegis/parse.h aegis/pattr.h aegis/reviewer.h \ + common/trace.h aegis/user.h aegis/ustate.h \ + aegis/uconf.h common/word.h + $(CC) $(CFLAGS) -Iaegis -Icommon $(H) -c aegis/reviewer.c + mv reviewer.o aegis/reviewer.o + + aegis/sub.o: aegis/sub.c common/arglex.h common/main.h aegis/change.h \ + aegis/cstate.h aegis/type.h common/str.h \ + common/s-v-arg.h common/conf.h aegis/parse.h \ + aegis/pconf.h common/error.h common/mem.h \ + common/option.h aegis/os.h aegis/project.h \ + aegis/pstate.h aegis/pattr.h aegis/sub.h common/trace.h \ + common/word.h + $(CC) $(CFLAGS) -Iaegis -Icommon $(H) -c aegis/sub.c + mv sub.o aegis/sub.o + + aegis/test.o: aegis/test.c aegis/arglex2.h common/arglex.h \ + common/main.h aegis/change.h aegis/cstate.h \ + aegis/type.h common/str.h common/s-v-arg.h \ + common/conf.h aegis/parse.h aegis/pconf.h \ + aegis/commit.h common/error.h aegis/help.h aegis/list.h \ + aegis/lock.h aegis/log.h common/option.h aegis/os.h \ + aegis/project.h aegis/pstate.h aegis/pattr.h \ + aegis/test.h common/trace.h aegis/user.h aegis/ustate.h \ + aegis/uconf.h common/word.h + $(CC) $(CFLAGS) -Iaegis -Icommon $(H) -c aegis/test.c + mv test.o aegis/test.o + + aegis/type.o: aegis/type.c aegis/type.h common/main.h common/str.h \ + common/s-v-arg.h common/conf.h + $(CC) $(CFLAGS) -Iaegis -Icommon $(H) -c aegis/type.c + mv type.o aegis/type.o + + aegis/uconf.c aegis/uconf.h: aegis/uconf.def bin/fmtgen + bin/fmtgen -Iaegis aegis/uconf.def aegis/uconf.c aegis/uconf.h + + aegis/uconf.o: aegis/uconf.c aegis/uconf.h common/main.h aegis/type.h \ + common/str.h common/s-v-arg.h common/conf.h \ + aegis/parse.h common/error.h aegis/indent.h aegis/io.h \ + common/mem.h aegis/os.h common/trace.h + $(CC) $(CFLAGS) -Iaegis -Icommon $(H) -c aegis/uconf.c + mv uconf.o aegis/uconf.o + + aegis/undo.o: aegis/undo.c common/error.h common/main.h common/mem.h \ + common/option.h aegis/os.h common/str.h \ + common/s-v-arg.h common/conf.h common/trace.h \ + aegis/undo.h + $(CC) $(CFLAGS) -Iaegis -Icommon $(H) -c aegis/undo.c + mv undo.o aegis/undo.o + + aegis/user.o: aegis/user.c aegis/commit.h common/str.h common/s-v-arg.h \ + common/conf.h common/main.h common/error.h \ + aegis/gonzo.h aegis/gstate.h aegis/type.h aegis/parse.h \ + aegis/lock.h common/mem.h common/option.h aegis/os.h \ + aegis/project.h aegis/pstate.h aegis/pattr.h \ + common/trace.h aegis/user.h aegis/ustate.h \ + aegis/uconf.h aegis/undo.h common/word.h + $(CC) $(CFLAGS) -Iaegis -Icommon $(H) -c aegis/user.c + mv user.o aegis/user.o + + aegis/ustate.c aegis/ustate.h: aegis/ustate.def bin/fmtgen + bin/fmtgen -Iaegis aegis/ustate.def aegis/ustate.c aegis/ustate.h + + aegis/ustate.o: aegis/ustate.c aegis/ustate.h common/main.h \ + aegis/type.h common/str.h common/s-v-arg.h \ + common/conf.h aegis/parse.h common/error.h \ + aegis/indent.h aegis/io.h common/mem.h aegis/os.h \ + common/trace.h + $(CC) $(CFLAGS) -Iaegis -Icommon $(H) -c aegis/ustate.c + mv ustate.o aegis/ustate.o + + aegis/version.o: aegis/version.c aegis/arglex2.h common/arglex.h \ + common/main.h common/error.h aegis/help.h \ + common/option.h common/str.h common/s-v-arg.h \ + common/conf.h common/trace.h aegis/version.h + $(CC) $(CFLAGS) -Iaegis -Icommon $(H) -c aegis/version.c + mv version.o aegis/version.o + + common/ansi.o: common/ansi.c common/main.h common/conf.h + $(CC) $(CFLAGS) -Icommon $(H) -c common/ansi.c + mv ansi.o common/ansi.o + + common/arglex.o: common/arglex.c common/arglex.h common/main.h \ + common/error.h common/option.h common/str.h \ + common/s-v-arg.h common/conf.h common/trace.h + $(CC) $(CFLAGS) -Icommon $(H) -c common/arglex.c + mv arglex.o common/arglex.o + + common/error.o: common/error.c common/arglex.h common/main.h \ + common/error.h common/option.h common/s-v-arg.h \ + common/conf.h + $(CC) $(CFLAGS) -Icommon $(H) -c common/error.c + mv error.o common/error.o + + common/mem.o: common/mem.c common/main.h common/mem.h common/error.h + $(CC) $(CFLAGS) -Icommon $(H) -c common/mem.c + mv mem.o common/mem.o + + common/option.o: common/option.c common/error.h common/main.h \ + common/option.h common/trace.h + $(CC) $(CFLAGS) -Icommon $(H) -c common/option.c + mv option.o common/option.o + + common/str.o: common/str.c common/error.h common/main.h common/mem.h \ + common/s-v-arg.h common/conf.h common/str.h + $(CC) $(CFLAGS) -Icommon $(H) -c common/str.c + mv str.o common/str.o + + common/trace.o: common/trace.c common/error.h common/main.h \ + common/mem.h common/option.h common/s-v-arg.h \ + common/conf.h common/str.h common/trace.h + $(CC) $(CFLAGS) -Icommon $(H) -c common/trace.c + mv trace.o common/trace.o + + common/word.o: common/word.c common/main.h common/word.h common/str.h \ + common/s-v-arg.h common/conf.h common/error.h \ + common/mem.h + $(CC) $(CFLAGS) -Icommon $(H) -c common/word.c + mv word.o common/word.o + + fmtgen/id.o: fmtgen/id.c common/main.h fmtgen/id.h common/str.h \ + common/s-v-arg.h common/conf.h common/word.h \ + common/mem.h common/error.h + $(CC) $(CFLAGS) -Ifmtgen -Icommon $(H) -c fmtgen/id.c + mv id.o fmtgen/id.o + + fmtgen/indent.o: fmtgen/indent.c common/error.h common/main.h \ + fmtgen/indent.h common/s-v-arg.h common/conf.h \ + common/trace.h + $(CC) $(CFLAGS) -Ifmtgen -Icommon $(H) -c fmtgen/indent.c + mv indent.o fmtgen/indent.o + + fmtgen/lex.o: fmtgen/lex.c common/error.h common/main.h fmtgen/id.h \ + common/str.h common/s-v-arg.h common/conf.h \ + common/word.h fmtgen/lex.h common/mem.h fmtgen/type.h \ + fmtgen/parse.gen.h + $(CC) $(CFLAGS) -Ifmtgen -Icommon $(H) -c fmtgen/lex.c + mv lex.o fmtgen/lex.o + + fmtgen/main.o: fmtgen/main.c common/arglex.h common/main.h \ + common/error.h fmtgen/id.h common/str.h \ + common/s-v-arg.h common/conf.h common/word.h \ + fmtgen/lex.h common/option.h fmtgen/parse.h \ + common/trace.h + $(CC) $(CFLAGS) -Ifmtgen -Icommon $(H) -c fmtgen/main.c + mv main.o fmtgen/main.o + + fmtgen/parse.gen.c fmtgen/parse.gen.h: fmtgen/parse.y + $(YACC) -d fmtgen/parse.y + sed "s/[yY][yY]/parse_/g" < y.tab.c > fmtgen/parse.gen.c + rm y.tab.c + sed "s/[yY][yY]/parse_/g" < y.tab.h > fmtgen/parse.gen.h + rm y.tab.h + + fmtgen/parse.gen.o: fmtgen/parse.gen.c common/error.h common/main.h \ + fmtgen/id.h common/str.h common/s-v-arg.h common/conf.h \ + common/word.h fmtgen/indent.h fmtgen/lex.h common/mem.h \ + fmtgen/parse.h common/trace.h fmtgen/type.h + $(CC) $(CFLAGS) -Ifmtgen -Icommon $(H) -c fmtgen/parse.gen.c + mv parse.gen.o fmtgen/parse.gen.o + + fmtgen/type.o: fmtgen/type.c fmtgen/type.h common/main.h fmtgen/lex.h \ + common/str.h common/s-v-arg.h common/conf.h + $(CC) $(CFLAGS) -Ifmtgen -Icommon $(H) -c fmtgen/type.c + mv type.o fmtgen/type.o + + fmtgen/type_enum.o: fmtgen/type_enum.c fmtgen/type.h common/main.h \ + fmtgen/lex.h common/str.h common/s-v-arg.h \ + common/conf.h fmtgen/indent.h fmtgen/id.h common/word.h \ + common/mem.h + $(CC) $(CFLAGS) -Ifmtgen -Icommon $(H) -c fmtgen/type_enum.c + mv type_enum.o fmtgen/type_enum.o + + fmtgen/type_integ.o: fmtgen/type_integ.c fmtgen/type.h common/main.h \ + fmtgen/lex.h common/str.h common/s-v-arg.h \ + common/conf.h fmtgen/indent.h common/mem.h + $(CC) $(CFLAGS) -Ifmtgen -Icommon $(H) -c fmtgen/type_integ.c + mv type_integ.o fmtgen/type_integ.o + + fmtgen/type_list.o: fmtgen/type_list.c fmtgen/type.h common/main.h \ + fmtgen/lex.h common/str.h common/s-v-arg.h \ + common/conf.h fmtgen/indent.h common/mem.h fmtgen/id.h \ + common/word.h + $(CC) $(CFLAGS) -Ifmtgen -Icommon $(H) -c fmtgen/type_list.c + mv type_list.o fmtgen/type_list.o + + fmtgen/type_ref.o: fmtgen/type_ref.c fmtgen/type.h common/main.h \ + fmtgen/lex.h common/str.h common/s-v-arg.h \ + common/conf.h fmtgen/indent.h common/mem.h fmtgen/id.h \ + common/word.h common/error.h + $(CC) $(CFLAGS) -Ifmtgen -Icommon $(H) -c fmtgen/type_ref.c + mv type_ref.o fmtgen/type_ref.o + + fmtgen/type_strin.o: fmtgen/type_strin.c fmtgen/type.h common/main.h \ + fmtgen/lex.h common/str.h common/s-v-arg.h \ + common/conf.h fmtgen/indent.h common/mem.h + $(CC) $(CFLAGS) -Ifmtgen -Icommon $(H) -c fmtgen/type_strin.c + mv type_strin.o fmtgen/type_strin.o + + fmtgen/type_struc.o: fmtgen/type_struc.c fmtgen/type.h common/main.h \ + fmtgen/lex.h common/str.h common/s-v-arg.h \ + common/conf.h fmtgen/indent.h common/mem.h fmtgen/id.h \ + common/word.h common/error.h + $(CC) $(CFLAGS) -Ifmtgen -Icommon $(H) -c fmtgen/type_struc.c + mv type_struc.o fmtgen/type_struc.o + + t0001a: all test/00/t0001a.sh + $(SHELL) test/00/t0001a.sh + + t0002a: all test/00/t0002a.sh + $(SHELL) test/00/t0002a.sh + + t0003a: all test/00/t0003a.sh + $(SHELL) test/00/t0003a.sh + + t0004a: all test/00/t0004a.sh + $(SHELL) test/00/t0004a.sh + + t0005a: all test/00/t0005a.sh + $(SHELL) test/00/t0005a.sh + + t0006a: all test/00/t0006a.sh + $(SHELL) test/00/t0006a.sh + + t0007a: all test/00/t0007a.sh + $(SHELL) test/00/t0007a.sh + + t0008a: all test/00/t0008a.sh + $(SHELL) test/00/t0008a.sh + + t0009a: all test/00/t0009a.sh + $(SHELL) test/00/t0009a.sh + + t0010a: all test/00/t0010a.sh + $(SHELL) test/00/t0010a.sh + + t0011a: all test/00/t0011a.sh + $(SHELL) test/00/t0011a.sh + + t0012a: all test/00/t0012a.sh + $(SHELL) test/00/t0012a.sh + + t0013a: all test/00/t0013a.sh + $(SHELL) test/00/t0013a.sh + + t0014a: all test/00/t0014a.sh + $(SHELL) test/00/t0014a.sh + + t0015a: all test/00/t0015a.sh + $(SHELL) test/00/t0015a.sh + + clean: + rm -f core bin/fmtgen aegis/administ.o aegis/build.o \ + aegis/cattr.c aegis/cattr.h aegis/cattr.o \ + aegis/cattr_ed.o aegis/change.o aegis/chdir.o \ + aegis/col.o aegis/commit.o aegis/common.c \ + aegis/common.h aegis/common.o aegis/copyfile.o \ + aegis/cstate.c aegis/cstate.h aegis/cstate.o \ + aegis/develop1.o aegis/develop2.o aegis/diff.o \ + aegis/dir.o aegis/file.o aegis/glue.o aegis/gonzo.o \ + aegis/gram.gen.c aegis/gram.gen.h aegis/gram.gen.o \ + aegis/gstate.c aegis/gstate.h aegis/gstate.o \ + aegis/help.o aegis/indent.o aegis/integra1.o \ + aegis/integra2.o aegis/io.o aegis/lex.o aegis/list.o \ + aegis/lock.o aegis/log.o aegis/main.o aegis/new_chan.o \ + aegis/new_file.o aegis/new_proj.o aegis/new_rele.o \ + aegis/new_test.o aegis/os.o aegis/pager.o aegis/parse.o \ + aegis/pattr.c aegis/pattr.h aegis/pattr.o \ + aegis/pattr_ed.o aegis/pconf.c aegis/pconf.h \ + aegis/pconf.o aegis/project.o aegis/pstate.c \ + aegis/pstate.h aegis/pstate.o aegis/rem_file.o \ + aegis/rem_proj.o aegis/review.o aegis/reviewer.o \ + aegis/sub.o aegis/test.o aegis/type.o aegis/uconf.c \ + aegis/uconf.h aegis/uconf.o aegis/undo.o aegis/user.o \ + aegis/ustate.c aegis/ustate.h aegis/ustate.o \ + aegis/version.o common/ansi.o common/arglex.o \ + common/error.o common/mem.o common/option.o \ + common/str.o common/trace.o common/word.o fmtgen/id.o \ + fmtgen/indent.o fmtgen/lex.o fmtgen/main.o \ + fmtgen/parse.gen.c fmtgen/parse.gen.h \ + fmtgen/parse.gen.o fmtgen/type.o fmtgen/type_enum.o \ + fmtgen/type_integ.o fmtgen/type_list.o \ + fmtgen/type_ref.o fmtgen/type_strin.o \ + fmtgen/type_struc.o + + realclean: clean + rm -f bin/aegis + + clobber: realclean + rm -f common/conf.h + + common/conf.h: + echo "#include <../conf/`uname -s`-`uname -r`>" > common/conf.h + + FmtgenFiles = common/ansi.o common/arglex.o common/error.o common/mem.o \ + common/option.o common/str.o common/trace.o \ + common/word.o fmtgen/id.o fmtgen/indent.o fmtgen/lex.o \ + fmtgen/main.o fmtgen/parse.gen.o fmtgen/type.o \ + fmtgen/type_enum.o fmtgen/type_integ.o \ + fmtgen/type_list.o fmtgen/type_ref.o \ + fmtgen/type_strin.o fmtgen/type_struc.o + + bin/fmtgen: $(FmtgenFiles) + if test ! -d bin; then mkdir bin; fi; exit 0 + $(CC) -o bin/fmtgen $(FmtgenFiles) $(LIBRARIES) + + AegisFiles = aegis/administ.o aegis/build.o aegis/cattr.o \ + aegis/cattr_ed.o aegis/change.o aegis/chdir.o \ + aegis/col.o aegis/commit.o aegis/common.o \ + aegis/copyfile.o aegis/cstate.o aegis/develop1.o \ + aegis/develop2.o aegis/diff.o aegis/dir.o aegis/file.o \ + aegis/glue.o aegis/gonzo.o aegis/gram.gen.o \ + aegis/gstate.o aegis/help.o aegis/indent.o \ + aegis/integra1.o aegis/integra2.o aegis/io.o \ + aegis/lex.o aegis/list.o aegis/lock.o aegis/log.o \ + aegis/main.o aegis/new_chan.o aegis/new_file.o \ + aegis/new_proj.o aegis/new_rele.o aegis/new_test.o \ + aegis/os.o aegis/pager.o aegis/parse.o aegis/pattr.o \ + aegis/pattr_ed.o aegis/pconf.o aegis/project.o \ + aegis/pstate.o aegis/rem_file.o aegis/rem_proj.o \ + aegis/review.o aegis/reviewer.o aegis/sub.o \ + aegis/test.o aegis/type.o aegis/uconf.o aegis/undo.o \ + aegis/user.o aegis/ustate.o aegis/version.o \ + common/ansi.o common/arglex.o common/error.o \ + common/mem.o common/option.o common/str.o \ + common/trace.o common/word.o + + bin/aegis: $(AegisFiles) + if test ! -d bin; then mkdir bin; fi; exit 0 + $(CC) -o bin/aegis $(AegisFiles) $(LIBRARIES) + + sure: t0001a t0002a t0003a t0004a t0005a t0006a t0007a t0008a t0009a \ + t0010a t0011a t0012a t0013a t0014a t0015a + @echo Passed All Tests + + install: all + cp bin/aegis $(BIN) + chown root $(BIN)/aegis + chmod a+x,u+s $(BIN)/aegis + -mkdir $(LIB) + chmod 0755 $(LIB) + cp lib/* $(LIB) + chmod a+r $(LIB)/* + chmod a+x $(LIB)/*.sh + chown bin $(LIB) + chgrp bin $(LIB) + $(SHELL) man1/install.sh $(MAN)/man1 + $(SHELL) man5/install.sh $(MAN)/man5 Index: LICENSE *************** *** 0 **** --- 1,339 ---- + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 675 Mass Ave, Cambridge, MA 02139, 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 + + Appendix: 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., 675 Mass Ave, Cambridge, MA 02139, 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. Index: aegis/administ.c *************** *** 1,12 **** /* * aegis - project change supervisor ! * Copyright (c) 1991-1992 Peter Miller. * All rights reserved. * * 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 1, 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 --- 1,12 ---- /* * aegis - project change supervisor ! * Copyright (C) 1991, 1992, 1993 Peter Miller. * All rights reserved. * * 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 *************** *** 87,100 **** "", " -Project ", " This option may be used to select the project of", ! " interest. When no -Project option is specified, if", ! " the user is only working on changes within a single", ! " project, the project name defaults to that project;", ! " if the user is currently working on changes to more", ! " than one project, or is not working on changes to", ! " any project, the user's $HOME/.%src file is", ! " examined for a default project field (see aeuconf(5)", ! " for more information).", "", " -TERse", " This option may be used to cause listings to", --- 87,100 ---- "", " -Project ", " This option may be used to select the project of", ! " interest. When no -Project option is specified, the", ! " AEGIS_PROJECT environment variable is consulted. If", ! " that does not exist, the user's $HOME/.aegisrc file", ! " is examined for a default project field (see", ! " aeuconf(5) for more information). If that does not", ! " exist, when the user is only working on changes", ! " within a single project, the project name defaults", ! " to that project. Otherwise, it is an error.", "", " -TERse", " This option may be used to cause listings to", *************** *** 108,118 **** " option this option causes column headings to be", " added.", "", ! " All options are case insensitive. Options may be", ! " abbreviated; the abbreviation is the upper case letters.", " Options and other command line arguments may be mixed", ! " arbitrarily on the command line.", "", "RECOMMENDED ALIAS", " The recommended alias for this command is", " csh%% alias aena '%s -na \\!* -v'", --- 108,136 ---- " option this option causes column headings to be", " added.", "", ! " All options may be abbreviated; the abbreviation is", ! " documented as the upper case letters, all lower case", ! " letters and underscores (_) are optional. You must use", ! " consecutive sequences of optional letters.", ! "", ! " All options are case insensitive, you may type them in", ! " upper case or lower case or a combination of both, case", ! " is not important.", ! "", ! " For example: the arguments \"-project, \"-PROJ\" and \"-p\"", ! " are all interpreted to mean the -Project option. The", ! " argument \"-prj\" will not be understood, because", ! " consecutive optional characters were not supplied.", ! "", " Options and other command line arguments may be mixed", ! " arbitrarily on the command line, after the function", ! " selectors.", "", + " The GNU long option names are understood. Since all", + " option names for aegis are long, this means ignoring the", + " extra leading '-'. The \"--option=value\" convention is", + " also understood.", + "", "RECOMMENDED ALIAS", " The recommended alias for this command is", " csh%% alias aena '%s -na \\!* -v'", *************** *** 145,151 **** static void administrator_list() { ! string_t *project_name; trace(("administrator_list()\n{\n"/*}*/)); arglex(); --- 163,169 ---- static void administrator_list() { ! string_ty *project_name; trace(("administrator_list()\n{\n"/*}*/)); arglex(); *************** *** 181,192 **** new_administrator_main() { wlist wl; ! string_t *s1; pstate pstate_data; int j; ! string_t *project_name; ! project_t *pp; ! user_t *up; trace(("new_administrator_main()\n{\n"/*}*/)); wl_zero(&wl); --- 199,210 ---- new_administrator_main() { wlist wl; ! string_ty *s1; pstate pstate_data; int j; ! string_ty *project_name; ! project_ty *pp; ! user_ty *up; trace(("new_administrator_main()\n{\n"/*}*/)); wl_zero(&wl); *************** *** 259,265 **** */ for (j = 0; j < wl.wl_nwords; ++j) { ! user_t *candidate; /* * make sure the user isn't already there --- 277,283 ---- */ for (j = 0; j < wl.wl_nwords; ++j) { ! user_ty *candidate; /* * make sure the user isn't already there *************** *** 413,423 **** " option this option causes column headings to be", " added.", "", ! " All options are case insensitive. Options may be", ! " abbreviated; the abbreviation is the upper case letters.", " Options and other command line arguments may be mixed", ! " arbitrarily on the command line.", "", "RECOMMENDED ALIAS", " The recommended alias for this command is", " csh%% alias aera '%s -ra \\!* -v'", --- 431,459 ---- " option this option causes column headings to be", " added.", "", ! " All options may be abbreviated; the abbreviation is", ! " documented as the upper case letters, all lower case", ! " letters and underscores (_) are optional. You must use", ! " consecutive sequences of optional letters.", ! "", ! " All options are case insensitive, you may type them in", ! " upper case or lower case or a combination of both, case", ! " is not important.", ! "", ! " For example: the arguments \"-project, \"-PROJ\" and \"-p\"", ! " are all interpreted to mean the -Project option. The", ! " argument \"-prj\" will not be understood, because", ! " consecutive optional characters were not supplied.", ! "", " Options and other command line arguments may be mixed", ! " arbitrarily on the command line, after the function", ! " selectors.", "", + " The GNU long option names are understood. Since all", + " option names for aegis are long, this means ignoring the", + " extra leading '-'. The \"--option=value\" convention is", + " also understood.", + "", "RECOMMENDED ALIAS", " The recommended alias for this command is", " csh%% alias aera '%s -ra \\!* -v'", *************** *** 452,463 **** remove_administrator_main() { wlist wl; ! string_t *s1; pstate pstate_data; int j; ! string_t *project_name; ! project_t *pp; ! user_t *up; trace(("remove_administrator_main()\n{\n"/*}*/)); wl_zero(&wl); --- 488,499 ---- remove_administrator_main() { wlist wl; ! string_ty *s1; pstate pstate_data; int j; ! string_ty *project_name; ! project_ty *pp; ! user_ty *up; trace(("remove_administrator_main()\n{\n"/*}*/)); wl_zero(&wl); *************** *** 530,536 **** */ for (j = 0; j < wl.wl_nwords; ++j) { ! user_t *candidate; candidate = user_symbolic(pp, wl.wl_word[j]); if (!project_administrator_query(pp, user_name(candidate))) --- 566,572 ---- */ for (j = 0; j < wl.wl_nwords; ++j) { ! user_ty *candidate; candidate = user_symbolic(pp, wl.wl_word[j]); if (!project_administrator_query(pp, user_name(candidate))) Index: aegis/administ.h *************** *** 1,12 **** /* * aegis - project change supervisor ! * Copyright (c) 1991-1992 Peter Miller. * All rights reserved. * * 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 1, 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 --- 1,12 ---- /* * aegis - project change supervisor ! * Copyright (C) 1991, 1992, 1993 Peter Miller. * All rights reserved. * * 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 Index: aegis/arglex2.h *************** *** 1,12 **** /* * aegis - project change supervisor ! * Copyright (c) 1991-1992 Peter Miller. * All rights reserved. * * 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 1, 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 --- 1,12 ---- /* * aegis - project change supervisor ! * Copyright (C) 1991, 1992, 1993 Peter Miller. * All rights reserved. * * 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 Index: aegis/build.c *************** *** 1,12 **** /* * aegis - project change supervisor ! * Copyright (c) 1991-1992 Peter Miller. * All rights reserved. * * 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 1, 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 --- 1,12 ---- /* * aegis - project change supervisor ! * Copyright (C) 1991, 1992, 1993 Peter Miller. * All rights reserved. * * 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 *************** *** 118,131 **** " the project account for instance, in order to do an", " integration.", "", "OPTIONS", " The following options are understood:", "", " -Change ", " This option may be used to specify a particular", ! " change within a project. If the user is only", ! " working on one change within a project, that is", ! " the default change number.", "", " -Help", " This option may be used to obtain more", --- 118,144 ---- " the project account for instance, in order to do an", " integration.", "", + " While there is a build in progress for any change in a", + " project, an integrate pass for the project will wait until", + " all the builds are completed before starting. This is to", + " ensure that the baseline is consistent for the entire build.", + " Similarly, while an integrate pass is in progress for a", + " project, any builds will wait until it is completed before", + " starting.", + "", "OPTIONS", " The following options are understood:", "", " -Change ", " This option may be used to specify a particular", ! " change within a project. When no -Change option is", ! " specified, the AEGIS_CHANGE environment variable is", ! " consulted. If that does not exist, the user's", ! " $HOME/.aegisrc file is examined for a default change", ! " field (see aeuconf(5) for more information). If", ! " that does not exist, when the user is only working", ! " on one change within a project, that is the default", ! " change number. Otherwise, it is an error.", "", " -Help", " This option may be used to obtain more", *************** *** 138,151 **** "", " -Project ", " This option may be used to select the project of", ! " interest. When no -Project option is specified, if", ! " the user is only working on changes within a single", ! " project, the project name defaults to that project;", ! " if the user is currently working on changes to more", ! " than one project, or is not working on changes to", ! " any project, the user's $HOME/.%src file is", ! " examined for a default project field (see aeuconf(5)", ! " for more information).", "", " -TERse", " This option may be used to cause listings to", --- 151,164 ---- "", " -Project ", " This option may be used to select the project of", ! " interest. When no -Project option is specified, the", ! " AEGIS_PROJECT environment variable is consulted. If", ! " that does not exist, the user's $HOME/.aegisrc file", ! " is examined for a default project field (see", ! " aeuconf(5) for more information). If that does not", ! " exist, when the user is only working on changes", ! " within a single project, the project name defaults", ! " to that project. Otherwise, it is an error.", "", " -TERse", " This option may be used to cause listings to", *************** *** 160,169 **** " added.", "", " All options are case insensitive. Options may be", ! " abbreviated; the abbreviation is the upper case letters.", " Options and other command line arguments may be mixed", ! " arbitrarily on the command line.", "", "RECOMMENDED ALIAS", " The recommended alias for this command is", " csh%% alias aeb '%s -b \\!* -v'", --- 173,200 ---- " added.", "", " All options are case insensitive. Options may be", ! " All options may be abbreviated; the abbreviation is", ! " documented as the upper case letters, all lower case", ! " letters and underscores (_) are optional. You must use", ! " consecutive sequences of optional letters.", ! "", ! " All options are case insensitive, you may type them in", ! " upper case or lower case or a combination of both, case", ! " is not important.", ! "", ! " For example: the arguments \"-project, \"-PROJ\" and \"-p\"", ! " are all interpreted to mean the -Project option. The", ! " argument \"-prj\" will not be understood, because", ! " consecutive optional characters were not supplied.", ! "", " Options and other command line arguments may be mixed", ! " arbitrarily on the command line, after the function", ! " selectors.", "", + " The GNU long option names are understood. Since all", + " option names for aegis are long, this means ignoring the", + " extra leading '-'. The \"--option=value\" convention is", + " also understood.", "RECOMMENDED ALIAS", " The recommended alias for this command is", " csh%% alias aeb '%s -b \\!* -v'", *************** *** 208,214 **** static void build_list() { ! string_t *project_name; trace(("build_list()\n{\n"/*}*/)); arglex(); --- 239,245 ---- static void build_list() { ! string_ty *project_name; trace(("build_list()\n{\n"/*}*/)); arglex(); *************** *** 264,279 **** static void build_main() { ! string_t *the_command; cstate cstate_data; pstate pstate_data; pconf pconf_data; ! string_t *project_name; ! project_t *pp; long change_number; ! change_t *cp; int nolog; ! user_t *up; trace(("build_main()\n{\n"/*}*/)); nolog = 0; --- 295,310 ---- static void build_main() { ! string_ty *the_command; cstate cstate_data; pstate pstate_data; pconf pconf_data; ! string_ty *project_name; ! project_ty *pp; long change_number; ! change_ty *cp; int nolog; ! user_ty *up; trace(("build_main()\n{\n"/*}*/)); nolog = 0; *************** *** 347,352 **** --- 378,384 ---- * Block if necessary. */ change_cstate_lock_prepare(cp); + project_build_read_lock_prepare(pp); lock_take(); cstate_data = change_cstate_get(cp); pstate_data = project_pstate_get(pp); *************** *** 413,421 **** trace(("work out the build command\n")); if (cstate_data->state == cstate_state_being_integrated) { - char stamp[40]; - char cnum[20]; - /* * %1 = project name * %2 = change number --- 445,450 ---- *************** *** 424,455 **** * 'b' is the minor version number, * and 'nnn' is the build number. */ ! sprintf ! ( ! stamp, ! "%ld.%ld.D%3.3ld", ! pstate_data->version_major, ! pstate_data->version_minor, ! cstate_data->delta_number ! ); ! sprintf(cnum, "%ld", change_number); the_command = pconf_data->build_command; ! the_command = ! substitute ! ( ! cp, ! the_command->str_text, ! project_name_get(pp)->str_text, ! cnum, ! stamp, ! (char *)0 ! ); } else { - char stamp[40]; - char cnum[20]; - /* * %1 = project name * %2 = change number --- 453,466 ---- * 'b' is the minor version number, * and 'nnn' is the build number. */ ! sub_var_set("1", "${project}"); ! sub_var_set("2", "${change}"); ! sub_var_set("3", "${version}"); the_command = pconf_data->build_command; ! the_command = substitute(cp, the_command); } else { /* * %1 = project name * %2 = change number *************** *** 459,485 **** * and 'nnn' is the change number. * %4 = the absolute path of the project baseline directory. */ ! sprintf ! ( ! stamp, ! "%ld.%ld.C%3.3ld", ! pstate_data->version_major, ! pstate_data->version_minor, ! change_number ! ); ! sprintf(cnum, "%ld", change_number); ! the_command = ! substitute ! ( ! cp, ! pconf_data->development_build_command->str_text, ! project_name_get(pp)->str_text, ! cnum, ! stamp, ! project_baseline_path_get(pp)->str_text, ! (char *)0 ! ); ! } /* --- 470,481 ---- * and 'nnn' is the change number. * %4 = the absolute path of the project baseline directory. */ ! sub_var_set("1", "${project}"); ! sub_var_set("2", "${change}"); ! sub_var_set("3", "${version}"); ! sub_var_set("4", "${baseline}"); ! the_command = pconf_data->development_build_command; ! the_command = substitute(cp, the_command); } /* *************** *** 497,507 **** trace(("do the build\n")); if (cstate_data->state == cstate_state_being_integrated) { ! string_t *id; if (!nolog) { ! user_t *pup; pup = project_user(pp); log_open(change_logfile_get(cp), pup); --- 493,503 ---- trace(("do the build\n")); if (cstate_data->state == cstate_state_being_integrated) { ! string_ty *id; if (!nolog) { ! user_ty *pup; pup = project_user(pp); log_open(change_logfile_get(cp), pup); *************** *** 508,531 **** user_free(pup); } change_verbose(cp, "integration build started"); ! id = change_integration_directory_get(cp); project_become(pp); os_execute(the_command, OS_EXEC_FLAG_NO_INPUT, id); ! os_become_undo(); change_verbose(cp, "integration build complete"); } else { ! string_t *dd; if (!nolog) log_open(change_logfile_get(cp), up); change_verbose(cp, "development build started"); change_run_project_file_command(cp); ! dd = change_development_directory_get(cp); user_become(up); os_execute(the_command, OS_EXEC_FLAG_NO_INPUT, dd); ! os_become_undo(); change_verbose(cp, "development build complete"); } --- 504,527 ---- user_free(pup); } change_verbose(cp, "integration build started"); ! id = change_integration_directory_get(cp, 0); project_become(pp); os_execute(the_command, OS_EXEC_FLAG_NO_INPUT, id); ! project_become_undo(); change_verbose(cp, "integration build complete"); } else { ! string_ty *dd; if (!nolog) log_open(change_logfile_get(cp), up); change_verbose(cp, "development build started"); change_run_project_file_command(cp); ! dd = change_development_directory_get(cp, 0); user_become(up); os_execute(the_command, OS_EXEC_FLAG_NO_INPUT, dd); ! user_become_undo(); change_verbose(cp, "development build complete"); } Index: aegis/build.h *************** *** 1,12 **** /* * aegis - project change supervisor ! * Copyright (c) 1991-1992 Peter Miller. * All rights reserved. * * 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 1, 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 --- 1,12 ---- /* * aegis - project change supervisor ! * Copyright (C) 1991, 1992, 1993 Peter Miller. * All rights reserved. * * 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 Index: aegis/cattr.def *************** *** 1,12 **** /* * aegis - project change supervisor ! * Copyright (c) 1991-1992 Peter Miller. * All rights reserved. * * 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 1, 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 --- 1,12 ---- /* * aegis - project change supervisor ! * Copyright (C) 1991, 1992, 1993 Peter Miller. * All rights reserved. * * 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 *************** *** 20,27 **** * MANIFEST: change state file contents definition * * if you change this file, don't forget to change ! * man5/aecattr.5 ! * man5/aecstate.5 */ #include --- 20,26 ---- * MANIFEST: change state file contents definition * * if you change this file, don't forget to change ! * man5/aecattr.so */ #include Index: aegis/cattr_ed.c *************** *** 1,12 **** /* * aegis - project change supervisor ! * Copyright (c) 1991-1992 Peter Miller. * All rights reserved. * * 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 1, 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 --- 1,12 ---- /* * aegis - project change supervisor ! * Copyright (C) 1991, 1992, 1993 Peter Miller. * All rights reserved. * * 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 *************** *** 82,90 **** "", " -Change ", " This option may be used to specify a particular", ! " change within a project. If the user is only", ! " working on one change within a project, that is", ! " the default change number.", "", " -Help", " This option may be used to obtain more", --- 82,95 ---- "", " -Change ", " This option may be used to specify a particular", ! " change within a project. When no -Change option is", ! " specified, the AEGIS_CHANGE environment variable is", ! " consulted. If that does not exist, the user's", ! " $HOME/.aegisrc file is examined for a default change", ! " field (see aeuconf(5) for more information). If", ! " that does not exist, when the user is only working", ! " on one change within a project, that is the default", ! " change number. Otherwise, it is an error.", "", " -Help", " This option may be used to obtain more", *************** *** 97,110 **** "", " -Project ", " This option may be used to select the project of", ! " interest. When no -Project option is specified, if", ! " the user is only working on changes within a single", ! " project, the project name defaults to that project;", ! " if the user is currently working on changes to more", ! " than one project, or is not working on changes to", ! " any project, the user's $HOME/.%src file is", ! " examined for a default project field (see aeuconf(5)", ! " for more information).", "", " -TERse", " This option may be used to cause listings to", --- 102,115 ---- "", " -Project ", " This option may be used to select the project of", ! " interest. When no -Project option is specified, the", ! " AEGIS_PROJECT environment variable is consulted. If", ! " that does not exist, the user's $HOME/.aegisrc file", ! " is examined for a default project field (see", ! " aeuconf(5) for more information). If that does not", ! " exist, when the user is only working on changes", ! " within a single project, the project name defaults", ! " to that project. Otherwise, it is an error.", "", " -TERse", " This option may be used to cause listings to", *************** *** 118,128 **** " option this option causes column headings to be", " added.", "", ! " All options are case insensitive. Options may be", ! " abbreviated; the abbreviation is the upper case letters.", " Options and other command line arguments may be mixed", ! " arbitrarily on the command line.", "", "RECOMMENDED ALIAS", " The recommended alias for this command is", " csh%% alias aeca '%s -ca \\!* -v'", --- 123,151 ---- " option this option causes column headings to be", " added.", "", ! " All options may be abbreviated; the abbreviation is", ! " documented as the upper case letters, all lower case", ! " letters and underscores (_) are optional. You must use", ! " consecutive sequences of optional letters.", ! "", ! " All options are case insensitive, you may type them in", ! " upper case or lower case or a combination of both, case", ! " is not important.", ! "", ! " For example: the arguments \"-project, \"-PROJ\" and \"-p\"", ! " are all interpreted to mean the -Project option. The", ! " argument \"-prj\" will not be understood, because", ! " consecutive optional characters were not supplied.", ! "", " Options and other command line arguments may be mixed", ! " arbitrarily on the command line, after the function", ! " selectors.", "", + " The GNU long option names are understood. Since all", + " option names for aegis are long, this means ignoring the", + " extra leading '-'. The \"--option=value\" convention is", + " also understood.", + "", "RECOMMENDED ALIAS", " The recommended alias for this command is", " csh%% alias aeca '%s -ca \\!* -v'", *************** *** 153,165 **** static void change_attributes_list() { ! string_t *project_name; ! project_t *pp; cattr cattr_data; cstate cstate_data; long change_number; ! change_t *cp; ! user_t *up; trace(("change_attributes_list()\n{\n"/*}*/)); arglex(); --- 176,188 ---- static void change_attributes_list() { ! string_ty *project_name; ! project_ty *pp; cattr cattr_data; cstate cstate_data; long change_number; ! change_ty *cp; ! user_ty *up; trace(("change_attributes_list()\n{\n"/*}*/)); arglex(); *************** *** 223,229 **** * build the cattr data */ cstate_data = change_cstate_get(cp); ! cattr_data = cattr_type.alloc(); if (cstate_data->description) cattr_data->description = str_copy(cstate_data->description); if (cstate_data->brief_description) --- 246,252 ---- * build the cattr data */ cstate_data = change_cstate_get(cp); ! cattr_data = (cattr)cattr_type.alloc(); if (cstate_data->description) cattr_data->description = str_copy(cstate_data->description); if (cstate_data->brief_description) *************** *** 250,262 **** static void change_attributes_main() { ! string_t *project_name; ! project_t *pp; cattr cattr_data = 0; cstate cstate_data; long change_number; ! change_t *cp; ! user_t *up; trace(("change_attributes_main()\n{\n"/*}*/)); project_name = 0; --- 273,285 ---- static void change_attributes_main() { ! string_ty *project_name; ! project_ty *pp; cattr cattr_data = 0; cstate cstate_data; long change_number; ! change_ty *cp; ! user_ty *up; trace(("change_attributes_main()\n{\n"/*}*/)); project_name = 0; Index: aegis/cattr_ed.h *************** *** 1,12 **** /* * aegis - project change supervisor ! * Copyright (c) 1991-1992 Peter Miller. * All rights reserved. * * 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 1, 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 --- 1,12 ---- /* * aegis - project change supervisor ! * Copyright (C) 1991, 1992, 1993 Peter Miller. * All rights reserved. * * 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 Index: aegis/change.c *************** *** 1,12 **** /* * aegis - project change supervisor ! * Copyright (c) 1991-1992 Peter Miller. * All rights reserved. * * 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 1, 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 --- 1,12 ---- /* * aegis - project change supervisor ! * Copyright (C) 1991, 1992, 1993 Peter Miller. * All rights reserved. * * 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 *************** *** 41,56 **** #include ! change_t * change_alloc(pp, number) ! project_t *pp; long number; { ! change_t *cp; trace(("change_alloc(pp = %08lX, number = %ld)\n{\n"/*}*/, pp, number)); assert(number >= 1); ! cp = (change_t *)mem_alloc_clear(sizeof(change_t)); cp->reference_count = 1; cp->pp = project_copy(pp); cp->number = number; --- 41,56 ---- #include ! change_ty * change_alloc(pp, number) ! project_ty *pp; long number; { ! change_ty *cp; trace(("change_alloc(pp = %08lX, number = %ld)\n{\n"/*}*/, pp, number)); assert(number >= 1); ! cp = (change_ty *)mem_alloc_clear(sizeof(change_ty)); cp->reference_count = 1; cp->pp = project_copy(pp); cp->number = number; *************** *** 63,69 **** void change_free(cp) ! change_t *cp; { trace(("change_free(cp = %08lX)\n{\n"/*}*/, cp)); assert(cp->reference_count >= 1); --- 63,69 ---- void change_free(cp) ! change_ty *cp; { trace(("change_free(cp = %08lX)\n{\n"/*}*/, cp)); assert(cp->reference_count >= 1); *************** *** 92,100 **** } ! change_t * change_copy(cp) ! change_t *cp; { trace(("change_copy(cp = %08lX)\n{\n"/*}*/, cp)); assert(cp->reference_count >= 1); --- 92,100 ---- } ! change_ty * change_copy(cp) ! change_ty *cp; { trace(("change_copy(cp = %08lX)\n{\n"/*}*/, cp)); assert(cp->reference_count >= 1); *************** *** 105,130 **** } ! static void improve _((change_t *)); static void improve(cp) ! change_t *cp; { trace(("improve(cp = %08lX)\n{\n"/*}*/, cp)); if (!cp->cstate_data->history) ! cp->cstate_data->history = cstate_history_list_type.alloc(); if (!cp->cstate_data->src) ! cp->cstate_data->src = cstate_src_list_type.alloc(); trace((/*{*/"}\n")); } ! static void lock_sync _((change_t *)); static void lock_sync(cp) ! change_t *cp; { long n; --- 105,134 ---- } ! static void improve _((change_ty *)); static void improve(cp) ! change_ty *cp; { trace(("improve(cp = %08lX)\n{\n"/*}*/, cp)); if (!cp->cstate_data->history) ! cp->cstate_data->history = ! (cstate_history_list) ! cstate_history_list_type.alloc(); if (!cp->cstate_data->src) ! cp->cstate_data->src = ! (cstate_src_list) ! cstate_src_list_type.alloc(); trace((/*{*/"}\n")); } ! static void lock_sync _((change_ty *)); static void lock_sync(cp) ! change_ty *cp; { long n; *************** *** 148,154 **** cstate change_cstate_get(cp) ! change_t *cp; { trace(("change_cstate_get(cp = %08lX)\n{\n"/*}*/, cp)); lock_sync(cp); --- 152,158 ---- cstate change_cstate_get(cp) ! change_ty *cp; { trace(("change_cstate_get(cp = %08lX)\n{\n"/*}*/, cp)); lock_sync(cp); *************** *** 267,278 **** void change_bind_new(cp) ! change_t *cp; { trace(("change_bind_new(cp = %08lX)\n{\n"/*}*/, cp)); assert(!cp->cstate_data); cp->is_a_new_file = 1; ! cp->cstate_data = cstate_type.alloc(); improve(cp); trace((/*{*/"}\n")); } --- 271,282 ---- void change_bind_new(cp) ! change_ty *cp; { trace(("change_bind_new(cp = %08lX)\n{\n"/*}*/, cp)); assert(!cp->cstate_data); cp->is_a_new_file = 1; ! cp->cstate_data = (cstate)cstate_type.alloc(); improve(cp); trace((/*{*/"}\n")); } *************** *** 296,305 **** void change_cstate_write(cp) ! change_t *cp; { ! string_t *filename_new; ! string_t *filename_old; pstate pstate_data; static int count; --- 300,309 ---- void change_cstate_write(cp) ! change_ty *cp; { ! string_ty *filename_new; ! string_ty *filename_old; pstate pstate_data; static int count; *************** *** 338,345 **** change_become(cp); if (cp->is_a_new_file) { ! string_t *s1; ! string_t *s2; s1 = project_home_path_get(cp->pp); s2 = os_below_dir(s1, cp->filename); --- 342,349 ---- change_become(cp); if (cp->is_a_new_file) { ! string_ty *s1; ! string_ty *s2; s1 = project_home_path_get(cp->pp); s2 = os_below_dir(s1, cp->filename); *************** *** 372,379 **** cstate_src change_src_find(cp, file_name) ! change_t *cp; ! string_t *file_name; { cstate cstate_data; int j; --- 376,383 ---- cstate_src change_src_find(cp, file_name) ! change_ty *cp; ! string_ty *file_name; { cstate cstate_data; int j; *************** *** 402,409 **** void change_src_remove(cp, file_name) ! change_t *cp; ! string_t *file_name; { cstate cstate_data; int j; --- 406,413 ---- void change_src_remove(cp, file_name) ! change_ty *cp; ! string_ty *file_name; { cstate cstate_data; int j; *************** *** 428,439 **** cstate_src change_src_new(cp) ! change_t *cp; { cstate cstate_data; cstate_src src_data; cstate_src *src_data_p; ! type_t *type_p; trace(("change_src_new(cp = %08lX)\n{\n"/*}*/, cp)); cstate_data = change_cstate_get(cp); --- 432,443 ---- cstate_src change_src_new(cp) ! change_ty *cp; { cstate cstate_data; cstate_src src_data; cstate_src *src_data_p; ! type_ty *type_p; trace(("change_src_new(cp = %08lX)\n{\n"/*}*/, cp)); cstate_data = change_cstate_get(cp); *************** *** 444,450 **** &type_p, (void **)&src_data_p ); ! src_data = cstate_src_type.alloc(); *src_data_p = src_data; trace(("return %08lX;\n", src_data)); trace((/*{*/"}\n")); --- 448,454 ---- &type_p, (void **)&src_data_p ); ! src_data = (cstate_src)cstate_src_type.alloc(); *src_data_p = src_data; trace(("return %08lX;\n", src_data)); trace((/*{*/"}\n")); *************** *** 454,466 **** cstate_history change_history_new(cp, up) ! change_t *cp; ! user_t *up; { cstate cstate_data; cstate_history history_data; cstate_history *history_data_p; ! type_t *type_p; trace(("change_history_new(cp = %08lX)\n{\n"/*}*/, cp)); cstate_data = change_cstate_get(cp); --- 458,470 ---- cstate_history change_history_new(cp, up) ! change_ty *cp; ! user_ty *up; { cstate cstate_data; cstate_history history_data; cstate_history *history_data_p; ! type_ty *type_p; trace(("change_history_new(cp = %08lX)\n{\n"/*}*/, cp)); cstate_data = change_cstate_get(cp); *************** *** 471,477 **** &type_p, (void **)&history_data_p ); ! history_data = cstate_history_type.alloc(); *history_data_p = history_data; time(&history_data->when); history_data->who = str_copy(user_name(up)); --- 475,481 ---- &type_p, (void **)&history_data_p ); ! history_data = (cstate_history)cstate_history_type.alloc(); *history_data_p = history_data; time(&history_data->when); history_data->who = str_copy(user_name(up)); *************** *** 481,489 **** } ! string_t * change_developer_name(cp) ! change_t *cp; { cstate cstate_data; cstate_history history_data; --- 485,493 ---- } ! string_ty * change_developer_name(cp) ! change_ty *cp; { cstate cstate_data; cstate_history history_data; *************** *** 510,525 **** } break; } ! assert(history_data); ! trace_string(history_data->who->str_text); trace((/*{*/"}\n")); ! return history_data->who; } ! string_t * change_reviewer_name(cp) ! change_t *cp; { cstate cstate_data; cstate_history history_data; --- 514,529 ---- } break; } ! trace(("return \"%s\";\n", ! history_data ? history_data->who->str_text : "")); trace((/*{*/"}\n")); ! return (history_data ? history_data->who : 0); } ! string_ty * change_reviewer_name(cp) ! change_ty *cp; { cstate cstate_data; cstate_history history_data; *************** *** 545,560 **** } break; } ! assert(history_data); ! trace_string(history_data->who->str_text); trace((/*{*/"}\n")); ! return history_data->who; } ! string_t * change_integrator_name(cp) ! change_t *cp; { cstate cstate_data; cstate_history history_data; --- 549,564 ---- } break; } ! trace(("return \"%s\";\n", ! history_data ? history_data->who->str_text : "")); trace((/*{*/"}\n")); ! return (history_data ? history_data->who : 0); } ! string_ty * change_integrator_name(cp) ! change_ty *cp; { cstate cstate_data; cstate_history history_data; *************** *** 581,596 **** } break; } ! assert(history_data); ! trace_string(history_data->who->str_text); trace((/*{*/"}\n")); ! return history_data->who; } void change_bind_existing(cp) ! change_t *cp; { pstate pstate_data; int j; --- 585,600 ---- } break; } ! trace(("return \"%s\";\n", ! history_data ? history_data->who->str_text : "")); trace((/*{*/"}\n")); ! return (history_data ? history_data->who : 0); } void change_bind_existing(cp) ! change_ty *cp; { pstate pstate_data; int j; *************** *** 615,631 **** void change_development_directory_set(cp, s) ! change_t *cp; ! string_t *s; { cstate cstate_data; trace(("change_development_directory_set(cp = %08lX, s = \"%s\")\n{\n"/*}*/, cp, s->str_text)); if (cp->development_directory) fatal("duplicate -DIRectory option"); assert(s->str_text[0] == '/'); change_become(cp); ! cp->development_directory = os_pathname(s); change_become_undo(); cstate_data = change_cstate_get(cp); if (!cstate_data->development_directory) --- 619,642 ---- void change_development_directory_set(cp, s) ! change_ty *cp; ! string_ty *s; { cstate cstate_data; + /* + * To cope with automounters, directories are stored as given, + * or are derived from the home directory in the passwd file. + * Within aegis, pathnames have their symbolic links resolved, + * and any comparison of paths is done on this "system idea" + * of the pathname. + */ trace(("change_development_directory_set(cp = %08lX, s = \"%s\")\n{\n"/*}*/, cp, s->str_text)); if (cp->development_directory) fatal("duplicate -DIRectory option"); assert(s->str_text[0] == '/'); change_become(cp); ! cp->development_directory = os_pathname(s, 1); change_become_undo(); cstate_data = change_cstate_get(cp); if (!cstate_data->development_directory) *************** *** 634,710 **** } ! string_t * ! change_development_directory_get(cp) ! change_t *cp; { trace(("change_development_directory_get(cp = %08lX)\n{\n"/*}*/, cp)); ! if (!cp->development_directory) { - cstate cstate_data; - cstate_data = change_cstate_get(cp); ! if (!cstate_data->development_directory) ! fatal("no development directory"); ! change_become(cp); ! cp->development_directory = ! os_pathname(cstate_data->development_directory); ! change_become_undo(); } ! trace_string(cp->development_directory->str_text); trace((/*{*/"}\n")); ! return cp->development_directory; } void change_integration_directory_set(cp, s) ! change_t *cp; ! string_t *s; { cstate cstate_data; trace(("change_integration_directory_set(cp = %08lX, s = \"%s\")\n{\n"/*}*/, cp, s->str_text)); if (cp->integration_directory) fatal("duplicate -DIRectory option"); change_become(cp); ! cp->integration_directory = os_pathname(s); change_become_undo(); cstate_data = change_cstate_get(cp); if (!cstate_data->integration_directory) ! cp->cstate_data->integration_directory = str_copy(s); trace((/*{*/"}\n")); } ! string_t * ! change_integration_directory_get(cp) ! change_t *cp; { trace(("change_integration_directory_get(cp = %08lX)\n{\n"/*}*/, cp)); ! if (!cp->integration_directory) { - cstate cstate_data; - cstate_data = change_cstate_get(cp); ! if (!cstate_data->integration_directory) ! fatal("no integration directory"); ! change_become(cp); ! cp->integration_directory = ! os_pathname(cstate_data->integration_directory); ! change_become_undo(); } ! trace_string(cp->integration_directory->str_text); trace((/*{*/"}\n")); ! return cp->integration_directory; } ! string_t * change_logfile_get(cp) ! change_t *cp; { ! string_t *s1; cstate cstate_data; trace(("change_logfile_get(cp = %08lX)\n{\n"/*}*/, cp)); --- 645,786 ---- } ! string_ty * ! change_development_directory_get(cp, resolve) ! change_ty *cp; ! int resolve; { + string_ty *result; + cstate cstate_data; + + /* + * To cope with automounters, directories are stored as given, + * or are derived from the home directory in the passwd file. + * Within aegis, pathnames have their symbolic links resolved, + * and any comparison of paths is done on this "system idea" + * of the pathname. + */ trace(("change_development_directory_get(cp = %08lX)\n{\n"/*}*/, cp)); ! if (!resolve) { cstate_data = change_cstate_get(cp); ! result = cstate_data->development_directory; } ! else ! { ! if (!cp->development_directory) ! { ! cstate_data = change_cstate_get(cp); ! if (!cstate_data->development_directory) ! { ! change_fatal ! ( ! cp, ! "this change is in the %s state, there is no development directory", ! cstate_state_ename(cstate_data->state) ! ); ! } ! change_become(cp); ! cp->development_directory = ! os_pathname ! ( ! cstate_data->development_directory, ! 1 ! ); ! change_become_undo(); ! } ! result = cp->development_directory; ! } ! trace_string(result->str_text); trace((/*{*/"}\n")); ! return result; } void change_integration_directory_set(cp, s) ! change_ty *cp; ! string_ty *s; { cstate cstate_data; + /* + * To cope with automounters, directories are stored as given, + * or are derived from the home directory in the passwd file. + * Within aegis, pathnames have their symbolic links resolved, + * and any comparison of paths is done on this "system idea" + * of the pathname. + */ trace(("change_integration_directory_set(cp = %08lX, s = \"%s\")\n{\n"/*}*/, cp, s->str_text)); if (cp->integration_directory) fatal("duplicate -DIRectory option"); change_become(cp); ! cp->integration_directory = os_pathname(s, 1); change_become_undo(); cstate_data = change_cstate_get(cp); if (!cstate_data->integration_directory) ! cstate_data->integration_directory = str_copy(s); trace((/*{*/"}\n")); } ! string_ty * ! change_integration_directory_get(cp, resolve) ! change_ty *cp; ! int resolve; { + string_ty *result; + cstate cstate_data; + + /* + * To cope with automounters, directories are stored as given, + * or are derived from the home directory in the passwd file. + * Within aegis, pathnames have their symbolic links resolved, + * and any comparison of paths is done on this "system idea" + * of the pathname. + */ trace(("change_integration_directory_get(cp = %08lX)\n{\n"/*}*/, cp)); ! if (!resolve) { cstate_data = change_cstate_get(cp); ! result = cstate_data->integration_directory; } ! else ! { ! if (!cp->integration_directory) ! { ! cstate_data = change_cstate_get(cp); ! if (!cstate_data->integration_directory) ! { ! change_fatal ! ( ! cp, ! "this change is in the %s state, there is no integration directory", ! cstate_state_ename(cstate_data->state) ! ); ! } ! change_become(cp); ! cp->integration_directory = ! os_pathname ! ( ! cstate_data->integration_directory, ! 1 ! ); ! change_become_undo(); ! } ! result = cp->integration_directory; ! } ! trace_string(result->str_text); trace((/*{*/"}\n")); ! return result; } ! string_ty * change_logfile_get(cp) ! change_ty *cp; { ! string_ty *s1; cstate cstate_data; trace(("change_logfile_get(cp = %08lX)\n{\n"/*}*/, cp)); *************** *** 717,727 **** change_fatal(cp, "no log file"); case cstate_state_being_integrated: ! s1 = change_integration_directory_get(cp); break; case cstate_state_being_developed: ! s1 = change_development_directory_get(cp); break; } --- 793,803 ---- change_fatal(cp, "no log file"); case cstate_state_being_integrated: ! s1 = change_integration_directory_get(cp, 0); break; case cstate_state_being_developed: ! s1 = change_development_directory_get(cp, 0); break; } *************** *** 736,742 **** void change_cstate_lock_prepare(cp) ! change_t *cp; { trace(("change_cstate_lock_prepare(cp = %08lX)\n{\n"/*}*/, cp)); lock_prepare_cstate(project_name_get(cp->pp), cp->number); --- 812,818 ---- void change_cstate_lock_prepare(cp) ! change_ty *cp; { trace(("change_cstate_lock_prepare(cp = %08lX)\n{\n"/*}*/, cp)); lock_prepare_cstate(project_name_get(cp->pp), cp->number); *************** *** 746,757 **** void change_error(cp, s sva_last) ! change_t *cp; char *s; sva_last_decl { va_list ap; ! string_t *msg; sva_init(ap, s); msg = str_vformat(s, ap); --- 822,833 ---- void change_error(cp, s sva_last) ! change_ty *cp; char *s; sva_last_decl { va_list ap; ! string_ty *msg; sva_init(ap, s); msg = str_vformat(s, ap); *************** *** 762,773 **** void change_fatal(cp, s sva_last) ! change_t *cp; char *s; sva_last_decl { va_list ap; ! string_t *msg; sva_init(ap, s); msg = str_vformat(s, ap); --- 838,849 ---- void change_fatal(cp, s sva_last) ! change_ty *cp; char *s; sva_last_decl { va_list ap; ! string_ty *msg; sva_init(ap, s); msg = str_vformat(s, ap); *************** *** 778,789 **** void change_verbose(cp, s sva_last) ! change_t *cp; char *s; sva_last_decl { va_list ap; ! string_t *msg; sva_init(ap, s); msg = str_vformat(s, ap); --- 854,865 ---- void change_verbose(cp, s sva_last) ! change_ty *cp; char *s; sva_last_decl { va_list ap; ! string_ty *msg; sva_init(ap, s); msg = str_vformat(s, ap); *************** *** 792,805 **** } ! string_t * change_pconf_path_get(cp) ! change_t *cp; { cstate cstate_data; pstate_src p_src_data; cstate_src c_src_data; ! static string_t *file_name; trace(("change_pconf_path_get(cp = %08lX)\n{\n"/*}*/, cp)); if (cp->pconf_path) --- 868,881 ---- } ! string_ty * change_pconf_path_get(cp) ! change_ty *cp; { cstate cstate_data; pstate_src p_src_data; cstate_src c_src_data; ! static string_ty *file_name; trace(("change_pconf_path_get(cp = %08lX)\n{\n"/*}*/, cp)); if (cp->pconf_path) *************** *** 815,821 **** str_format ( "%S/%S", ! change_integration_directory_get(cp), file_name ); goto ret; --- 891,897 ---- str_format ( "%S/%S", ! change_integration_directory_get(cp, 1), file_name ); goto ret; *************** *** 840,846 **** str_format ( "%S/%S", ! change_development_directory_get(cp), file_name ); goto ret; --- 916,922 ---- str_format ( "%S/%S", ! change_development_directory_get(cp, 1), file_name ); goto ret; *************** *** 852,858 **** str_format ( "%S/%S", ! project_baseline_path_get(cp->pp), file_name ); goto ret; --- 928,934 ---- str_format ( "%S/%S", ! project_baseline_path_get(cp->pp, 1), file_name ); goto ret; *************** *** 867,884 **** pconf change_pconf_get(cp) ! change_t *cp; { trace(("change_pconf_get(cp = %08lX)\n{\n"/*}*/, cp)); lock_sync(cp); if (!cp->pconf_data) { ! string_t *filename; filename = change_pconf_path_get(cp); change_become(cp); if (!os_exists(filename)) ! cp->pconf_data = pconf_type.alloc(); else { cp->pconf_data = pconf_read_file(filename->str_text); --- 943,960 ---- pconf change_pconf_get(cp) ! change_ty *cp; { trace(("change_pconf_get(cp = %08lX)\n{\n"/*}*/, cp)); lock_sync(cp); if (!cp->pconf_data) { ! string_ty *filename; filename = change_pconf_path_get(cp); change_become(cp); if (!os_exists(filename)) ! cp->pconf_data = (pconf)pconf_type.alloc(); else { cp->pconf_data = pconf_read_file(filename->str_text); *************** *** 959,975 **** void change_run_change_file_command(cp, wlp, up) ! change_t *cp; wlist *wlp; ! user_t *up; { pconf pconf_data; ! string_t *the_command; ! char num[20]; ! char cnum[40]; ! string_t *the_files; pstate pstate_data; ! string_t *dd; trace(("change_run_change_file_command(cp = %08lX)\n{\n"/*}*/, cp)); pconf_data = change_pconf_get(cp); --- 1035,1049 ---- void change_run_change_file_command(cp, wlp, up) ! change_ty *cp; wlist *wlp; ! user_ty *up; { pconf pconf_data; ! string_ty *the_command; ! string_ty *the_files; pstate pstate_data; ! string_ty *dd; trace(("change_run_change_file_command(cp = %08lX)\n{\n"/*}*/, cp)); pconf_data = change_pconf_get(cp); *************** *** 977,1006 **** goto ret; pstate_data = project_pstate_get(cp->pp); - sprintf(num, "%ld", cp->number); - sprintf - ( - cnum, - "%ld.%ld.C%3.3ld", - pstate_data->version_major, - pstate_data->version_minor, - cp->number - ); the_files = wl2str(wlp, 0, 32767); ! the_command = ! substitute ! ( ! cp, ! pconf_data->change_file_command->str_text, ! project_name_get(cp->pp)->str_text, ! num, ! cnum, ! project_baseline_path_get(cp->pp)->str_text, ! the_files->str_text, ! (char *)0 ! ); str_free(the_files); ! dd = change_development_directory_get(cp); user_become(up); os_execute(the_command, OS_EXEC_FLAG_NO_INPUT, dd); user_become_undo(); --- 1051,1067 ---- goto ret; pstate_data = project_pstate_get(cp->pp); the_files = wl2str(wlp, 0, 32767); ! sub_var_set("File_List", "%S", the_files); str_free(the_files); ! sub_var_set("1", "${project}"); ! sub_var_set("2", "${change}"); ! sub_var_set("3", "${version}"); ! sub_var_set("4", "${baseline}"); ! sub_var_set("5", "${file_list}"); ! the_command = pconf_data->change_file_command; ! the_command = substitute(cp, the_command); ! dd = change_development_directory_get(cp, 0); user_become(up); os_execute(the_command, OS_EXEC_FLAG_NO_INPUT, dd); user_become_undo(); *************** *** 1012,1026 **** void change_run_project_file_command(cp) ! change_t *cp; { cstate cstate_data; pconf pconf_data; ! string_t *the_command; ! char num[20]; ! char cnum[40]; ! pstate pstate_data; ! string_t *dd; /* * make sure are sync'ed with project --- 1073,1084 ---- void change_run_project_file_command(cp) ! change_ty *cp; { cstate cstate_data; pconf pconf_data; ! string_ty *the_command; ! string_ty *dd; /* * make sure are sync'ed with project *************** *** 1045,1088 **** goto done; /* ! * %1 = project name ! * %2 = change number ! * %3 = identifying string, in the form "a.b.Cnnn" ! * where 'a' is the major version number, ! * 'b' is the minor version number, ! * and 'nnn' is the change number. ! * %4 = the absolute path of the project baseline directory. */ ! pstate_data = project_pstate_get(cp->pp); ! sprintf ! ( ! cnum, ! "%ld.%ld.C%3.3ld", ! pstate_data->version_major, ! pstate_data->version_minor, ! cp->number ! ); ! sprintf(num, "%ld", cp->number); /* - * construct the command string - */ - the_command = - substitute - ( - cp, - pconf_data->project_file_command->str_text, - project_name_get(cp->pp)->str_text, - num, - cnum, - project_baseline_path_get(cp->pp)->str_text, - (char *)0 - ); - - /* * execute the command */ ! dd = change_development_directory_get(cp); change_become(cp); os_execute(the_command, OS_EXEC_FLAG_NO_INPUT, dd); change_become_undo(); --- 1103,1121 ---- goto done; /* ! * All of the substitutions described in aesub(5) are available. */ ! sub_var_set("1", "${project}"); ! sub_var_set("2", "${change}"); ! sub_var_set("3", "${version}"); ! sub_var_set("4", "${baseline}"); ! the_command = pconf_data->project_file_command; ! the_command = substitute(cp, the_command); /* * execute the command */ ! dd = change_development_directory_get(cp, 0); change_become(cp); os_execute(the_command, OS_EXEC_FLAG_NO_INPUT, dd); change_become_undo(); *************** *** 1314,1325 **** } ! string_t * change_file_template(cp, name) ! change_t *cp; ! string_t *name; { ! string_t *result; size_t j, k; pconf pconf_data; --- 1347,1358 ---- } ! string_ty * change_file_template(cp, name) ! change_ty *cp; ! string_ty *name; { ! string_ty *result; size_t j, k; pconf pconf_data; *************** *** 1338,1344 **** for (k = 0; k < ftp->pattern->length; ++k) { int m; ! string_t *s; s = ftp->pattern->list[k]; m = gmatch(s->str_text, name->str_text); --- 1371,1377 ---- for (k = 0; k < ftp->pattern->length; ++k) { int m; ! string_ty *s; s = ftp->pattern->list[k]; m = gmatch(s->str_text, name->str_text); *************** *** 1356,1362 **** } if (k < ftp->pattern->length) { ! result = ftp->body; break; } } --- 1389,1395 ---- } if (k < ftp->pattern->length) { ! result = str_copy(ftp->body); break; } } *************** *** 1365,1370 **** --- 1398,1412 ---- * here for all exits */ done: + if (result) + { + string_ty *s; + + sub_var_set("File_Name", "%S", name); + s = substitute(cp, result); + str_free(result); + result = s; + } trace((/*{*/"}\n")); return result; } *************** *** 1372,1378 **** void change_become(cp) ! change_t *cp; { trace(("change_become(cp = %08lX)\n{\n"/*}*/, cp)); project_become(cp->pp); --- 1414,1420 ---- void change_become(cp) ! change_ty *cp; { trace(("change_become(cp = %08lX)\n{\n"/*}*/, cp)); project_become(cp->pp); *************** *** 1391,1397 **** int change_umask(cp) ! change_t *cp; { return project_umask(cp->pp); } --- 1433,1439 ---- int change_umask(cp) ! change_ty *cp; { return project_umask(cp->pp); } *************** *** 1399,1410 **** void change_run_develop_end_notify_command(cp) ! change_t *cp; { pstate pstate_data; ! string_t *the_command; ! char num[20]; ! string_t *dd; /* * make sure there is one --- 1441,1451 ---- void change_run_develop_end_notify_command(cp) ! change_ty *cp; { pstate pstate_data; ! string_ty *the_command; ! string_ty *dd; /* * make sure there is one *************** *** 1420,1445 **** * it happens after the data is written and the locks are released, * so we don't much care if the command fails! * ! * %1 = project name ! * %2 = change number ! * %3 = developer */ ! sprintf(num, "%ld", cp->number); ! the_command = ! substitute ! ( ! cp, ! pstate_data->develop_end_notify_command->str_text, ! project_name_get(cp->pp)->str_text, ! num, ! change_developer_name(cp)->str_text, ! (char *)0 ! ); /* * execute the command */ ! dd = change_development_directory_get(cp); change_become(cp); os_execute(the_command, OS_EXEC_FLAG_NO_INPUT + OS_EXEC_FLAG_ERROK, dd); change_become_undo(); --- 1461,1478 ---- * it happens after the data is written and the locks are released, * so we don't much care if the command fails! * ! * All of the substitutions described in aesub(5) are available. */ ! sub_var_set("1", "${project}"); ! sub_var_set("2", "${change}"); ! sub_var_set("3", "${developer}"); ! the_command = pstate_data->develop_end_notify_command; ! the_command = substitute(cp, the_command); /* * execute the command */ ! dd = change_development_directory_get(cp, 0); change_become(cp); os_execute(the_command, OS_EXEC_FLAG_NO_INPUT + OS_EXEC_FLAG_ERROK, dd); change_become_undo(); *************** *** 1455,1466 **** void change_run_develop_end_undo_notify_command(cp) ! change_t *cp; { pstate pstate_data; ! string_t *the_command; ! char num[20]; ! string_t *dd; /* * make sure there is one --- 1488,1498 ---- void change_run_develop_end_undo_notify_command(cp) ! change_ty *cp; { pstate pstate_data; ! string_ty *the_command; ! string_ty *dd; /* * make sure there is one *************** *** 1476,1501 **** * it happens after the data is written and the locks are released, * so we don't much care if the command fails! * ! * %1 = project name ! * %2 = change number ! * %3 = developer */ ! sprintf(num, "%ld", cp->number); ! the_command = ! substitute ! ( ! cp, ! pstate_data->develop_end_undo_notify_command->str_text, ! project_name_get(cp->pp)->str_text, ! num, ! change_developer_name(cp)->str_text, ! (char *)0 ! ); /* * execute the command */ ! dd = change_development_directory_get(cp); change_become(cp); os_execute(the_command, OS_EXEC_FLAG_NO_INPUT + OS_EXEC_FLAG_ERROK, dd); change_become_undo(); --- 1508,1525 ---- * it happens after the data is written and the locks are released, * so we don't much care if the command fails! * ! * All of the substitutions described in aesub(5) are available. */ ! sub_var_set("1", "${project}"); ! sub_var_set("2", "${change}"); ! sub_var_set("3", "${developer}"); ! the_command = pstate_data->develop_end_undo_notify_command; ! the_command = substitute(cp, the_command); /* * execute the command */ ! dd = change_development_directory_get(cp, 0); change_become(cp); os_execute(the_command, OS_EXEC_FLAG_NO_INPUT + OS_EXEC_FLAG_ERROK, dd); change_become_undo(); *************** *** 1511,1522 **** void change_run_integrate_fail_notify_command(cp) ! change_t *cp; { pstate pstate_data; ! string_t *the_command; ! char num[20]; ! string_t *dd; /* * make sure there is one --- 1535,1545 ---- void change_run_integrate_fail_notify_command(cp) ! change_ty *cp; { pstate pstate_data; ! string_ty *the_command; ! string_ty *dd; /* * make sure there is one *************** *** 1535,1564 **** * In doing it after the locks are released, * the lists will be accurate (e.g. list of files in change). * ! * %1 = project name ! * %2 = change number ! * %3 = developer ! * %4 = reviewer ! * %5 = integrator */ ! sprintf(num, "%ld", cp->number); ! the_command = ! substitute ! ( ! cp, ! pstate_data->integrate_fail_notify_command->str_text, ! project_name_get(cp->pp)->str_text, ! num, ! change_developer_name(cp)->str_text, ! change_reviewer_name(cp)->str_text, ! change_integrator_name(cp)->str_text, ! (char *)0 ! ); /* * execute the command */ ! dd = change_development_directory_get(cp); change_become(cp); os_execute(the_command, OS_EXEC_FLAG_NO_INPUT + OS_EXEC_FLAG_ERROK, dd); change_become_undo(); --- 1558,1577 ---- * In doing it after the locks are released, * the lists will be accurate (e.g. list of files in change). * ! * All of the substitutions described in aesub(5) are available. */ ! sub_var_set("1", "${project}"); ! sub_var_set("2", "${change}"); ! sub_var_set("3", "${developer}"); ! sub_var_set("4", "${reviewer}"); ! sub_var_set("5", "${integrator}"); ! the_command = pstate_data->integrate_fail_notify_command; ! the_command = substitute(cp, the_command); /* * execute the command */ ! dd = change_development_directory_get(cp, 0); change_become(cp); os_execute(the_command, OS_EXEC_FLAG_NO_INPUT + OS_EXEC_FLAG_ERROK, dd); change_become_undo(); *************** *** 1574,1585 **** void change_run_integrate_pass_notify_command(cp) ! change_t *cp; { pstate pstate_data; ! string_t *the_command; ! char num[20]; ! string_t *bl; /* * make sure there is one --- 1587,1597 ---- void change_run_integrate_pass_notify_command(cp) ! change_ty *cp; { pstate pstate_data; ! string_ty *the_command; ! string_ty *bl; /* * make sure there is one *************** *** 1598,1627 **** * In doing it after the locks are released, * the lists will be accurate (e.g. list of files in change). * ! * %1 = project name ! * %2 = change number ! * %3 = developer ! * %4 = reviewer ! * %5 = integrator */ ! sprintf(num, "%ld", cp->number); ! the_command = ! substitute ! ( ! cp, ! pstate_data->integrate_pass_notify_command->str_text, ! project_name_get(cp->pp)->str_text, ! num, ! change_developer_name(cp)->str_text, ! change_reviewer_name(cp)->str_text, ! change_integrator_name(cp)->str_text, ! (char *)0 ! ); /* * execute the command */ ! bl = project_baseline_path_get(cp->pp); project_become(cp->pp); os_execute(the_command, OS_EXEC_FLAG_NO_INPUT + OS_EXEC_FLAG_ERROK, bl); project_become_undo(); --- 1610,1629 ---- * In doing it after the locks are released, * the lists will be accurate (e.g. list of files in change). * ! * All of the substitutions described in aesub(5) are available. */ ! sub_var_set("1", "${project}"); ! sub_var_set("2", "${change}"); ! sub_var_set("3", "${developer}"); ! sub_var_set("4", "${reviewer}"); ! sub_var_set("5", "${integrator}"); ! the_command = pstate_data->integrate_pass_notify_command; ! the_command = substitute(cp, the_command); /* * execute the command */ ! bl = project_baseline_path_get(cp->pp, 0); project_become(cp->pp); os_execute(the_command, OS_EXEC_FLAG_NO_INPUT + OS_EXEC_FLAG_ERROK, bl); project_become_undo(); *************** *** 1637,1648 **** void change_run_review_pass_notify_command(cp) ! change_t *cp; { pstate pstate_data; ! string_t *the_command; ! char num[20]; ! string_t *dd; /* * make sure there is one --- 1639,1649 ---- void change_run_review_pass_notify_command(cp) ! change_ty *cp; { pstate pstate_data; ! string_ty *the_command; ! string_ty *dd; /* * make sure there is one *************** *** 1658,1685 **** * it happens after the data is written and the locks are released, * so we don't much care if the command fails! * ! * %1 = project name ! * %2 = change number ! * %3 = developer ! * %4 = reviewer */ ! sprintf(num, "%ld", cp->number); ! the_command = ! substitute ! ( ! cp, ! pstate_data->review_pass_notify_command->str_text, ! project_name_get(cp->pp)->str_text, ! num, ! change_developer_name(cp)->str_text, ! change_reviewer_name(cp)->str_text, ! (char *)0 ! ); /* * execute the command */ ! dd = change_development_directory_get(cp); change_become(cp); os_execute(the_command, OS_EXEC_FLAG_NO_INPUT + OS_EXEC_FLAG_ERROK, dd); str_free(the_command); --- 1659,1677 ---- * it happens after the data is written and the locks are released, * so we don't much care if the command fails! * ! * All of the substitutions described in aesub(5) are available. */ ! sub_var_set("1", "${project}"); ! sub_var_set("2", "${change}"); ! sub_var_set("3", "${developer}"); ! sub_var_set("4", "${reviewer}"); ! the_command = pstate_data->review_pass_notify_command; ! the_command = substitute(cp, the_command); /* * execute the command */ ! dd = change_development_directory_get(cp, 0); change_become(cp); os_execute(the_command, OS_EXEC_FLAG_NO_INPUT + OS_EXEC_FLAG_ERROK, dd); str_free(the_command); *************** *** 1695,1707 **** void change_run_review_pass_undo_notify_command(cp) ! change_t *cp; { pstate pstate_data; ! string_t *the_command; ! char num[20]; ! string_t *dd; ! string_t *notify; /* * make sure there is one --- 1687,1698 ---- void change_run_review_pass_undo_notify_command(cp) ! change_ty *cp; { pstate pstate_data; ! string_ty *the_command; ! string_ty *dd; ! string_ty *notify; /* * make sure there is one *************** *** 1720,1747 **** * it happens after the data is written and the locks are released, * so we don't much care if the command fails! * ! * %1 = project name ! * %2 = change number ! * %3 = developer ! * %4 = reviewer */ ! sprintf(num, "%ld", cp->number); ! the_command = ! substitute ! ( ! cp, ! notify->str_text, ! project_name_get(cp->pp)->str_text, ! num, ! change_developer_name(cp)->str_text, ! change_reviewer_name(cp)->str_text, ! (char *)0 ! ); /* * execute the command */ ! dd = change_development_directory_get(cp); change_become(cp); os_execute(the_command, OS_EXEC_FLAG_NO_INPUT + OS_EXEC_FLAG_ERROK, dd); str_free(the_command); --- 1711,1728 ---- * it happens after the data is written and the locks are released, * so we don't much care if the command fails! * ! * All of the substitutions described in aesub(5) are available. */ ! sub_var_set("1", "${project}"); ! sub_var_set("2", "${change}"); ! sub_var_set("3", "${developer}"); ! sub_var_set("4", "${reviewer}"); ! the_command = substitute(cp, notify); /* * execute the command */ ! dd = change_development_directory_get(cp, 0); change_become(cp); os_execute(the_command, OS_EXEC_FLAG_NO_INPUT + OS_EXEC_FLAG_ERROK, dd); str_free(the_command); *************** *** 1757,1768 **** void change_run_review_fail_notify_command(cp) ! change_t *cp; { pstate pstate_data; ! string_t *the_command; ! char num[20]; ! string_t *dd; /* * make sure there is one --- 1738,1748 ---- void change_run_review_fail_notify_command(cp) ! change_ty *cp; { pstate pstate_data; ! string_ty *the_command; ! string_ty *dd; /* * make sure there is one *************** *** 1781,1808 **** * In doing it after the locks are released, * the lists will be accurate (e.g. list of files in change). * ! * %1 = project name ! * %2 = change number ! * %3 = developer ! * %4 = reviewer */ ! sprintf(num, "%ld", cp->number); ! the_command = ! substitute ! ( ! cp, ! pstate_data->review_fail_notify_command->str_text, ! project_name_get(cp->pp)->str_text, ! num, ! change_developer_name(cp)->str_text, ! change_reviewer_name(cp)->str_text, ! (char *)0 ! ); /* * execute the command */ ! dd = change_development_directory_get(cp); change_become(cp); os_execute(the_command, OS_EXEC_FLAG_NO_INPUT + OS_EXEC_FLAG_ERROK, dd); str_free(the_command); --- 1761,1779 ---- * In doing it after the locks are released, * the lists will be accurate (e.g. list of files in change). * ! * All of the substitutions described in aesub(5) are available. */ ! sub_var_set("1", "${project}"); ! sub_var_set("2", "${change}"); ! sub_var_set("3", "${developer}"); ! sub_var_set("4", "${reviewer}"); ! the_command = pstate_data->review_fail_notify_command; ! the_command = substitute(cp, the_command); /* * execute the command */ ! dd = change_development_directory_get(cp, 0); change_become(cp); os_execute(the_command, OS_EXEC_FLAG_NO_INPUT + OS_EXEC_FLAG_ERROK, dd); str_free(the_command); *************** *** 1818,1833 **** void change_run_history_get_command(cp, file_name, edit_number, output_file, up) ! change_t *cp; ! string_t *file_name; ! string_t *edit_number; ! string_t *output_file; ! user_t *up; { ! string_t *hist; ! string_t *dir; cstate cstate_data; ! string_t *the_command; pconf pconf_data; /* --- 1789,1803 ---- void change_run_history_get_command(cp, file_name, edit_number, output_file, up) ! change_ty *cp; ! string_ty *file_name; ! string_ty *edit_number; ! string_ty *output_file; ! user_ty *up; { ! string_ty *dir; cstate cstate_data; ! string_ty *the_command; pconf pconf_data; /* *************** *** 1834,1857 **** * If the edit numbers differ, extract the * appropriate edit from the baseline (use the * history-get-command) into a file in /tmp ! * %1 = history file ! * %2 = edit number ! * %3 = output file */ trace(("change_run_history_get_command(cp = %08lX)\n{\n"/*}*/, cp)); ! hist = str_format("%S/%S", project_history_path_get(cp->pp), file_name); pconf_data = change_pconf_get(cp); ! the_command = ! substitute ! ( ! cp, ! pconf_data->history_get_command->str_text, ! hist->str_text, ! edit_number->str_text, ! output_file->str_text, ! (char *)0 ! ); ! str_free(hist); /* * run the command as the current user --- 1804,1838 ---- * If the edit numbers differ, extract the * appropriate edit from the baseline (use the * history-get-command) into a file in /tmp ! * ! * All of the substitutions described in aesub(5) are available; ! * in addition ! * ! * ${History} ! * history file ! * ! * ${Edit} ! * edit number ! * ! * ${Output} ! * output file */ trace(("change_run_history_get_command(cp = %08lX)\n{\n"/*}*/, cp)); ! sub_var_set ! ( ! "History", ! "%S/%S", ! project_history_path_get(cp->pp), ! file_name ! ); ! sub_var_set("Edit", "%S", edit_number); ! sub_var_set("Output", "%S", output_file); ! sub_var_set("1", "${history}"); ! sub_var_set("2", "${edit}"); ! sub_var_set("3", "${output}"); pconf_data = change_pconf_get(cp); ! the_command = pconf_data->history_get_command; ! the_command = substitute(cp, the_command); /* * run the command as the current user *************** *** 1859,1870 **** */ cstate_data = change_cstate_get(cp); if (cstate_data->state == cstate_state_being_integrated) ! dir = change_integration_directory_get(cp); else ! dir = change_development_directory_get(cp); user_become(up); os_execute(the_command, OS_EXEC_FLAG_NO_INPUT, dir); ! os_become_undo(); str_free(the_command); trace((/*{*/"}\n")); } --- 1840,2141 ---- */ cstate_data = change_cstate_get(cp); if (cstate_data->state == cstate_state_being_integrated) ! dir = change_integration_directory_get(cp, 0); else ! dir = change_development_directory_get(cp, 0); user_become(up); os_execute(the_command, OS_EXEC_FLAG_NO_INPUT, dir); ! user_become_undo(); ! str_free(the_command); ! trace((/*{*/"}\n")); ! } ! ! ! void ! change_development_directory_clear(cp) ! change_ty *cp; ! { ! cstate cstate_data; ! ! cstate_data = change_cstate_get(cp); ! assert(cstate_data->development_directory); ! if (cstate_data->development_directory) ! { ! str_free(cstate_data->development_directory); ! cstate_data->development_directory = 0; ! } ! } ! ! ! void ! change_integration_directory_clear(cp) ! change_ty *cp; ! { ! cstate cstate_data; ! ! cstate_data = change_cstate_get(cp); ! assert(cstate_data->integration_directory); ! if (cstate_data->integration_directory) ! { ! str_free(cstate_data->integration_directory); ! cstate_data->integration_directory = 0; ! } ! } ! ! ! void ! change_run_history_create_command(cp, filename) ! change_ty *cp; ! string_ty *filename; ! { ! string_ty *hp; ! string_ty *id; ! pconf pconf_data; ! string_ty *the_command; ! ! /* ! * create a new history ! * All of the substitutions described in aesub(5) are avaliable. ! * In addition: ! * ! * ${Input} ! * absolute path of source file ! * ! * ${History} ! * absolute path of history file ! */ ! trace(("change_run_history_create_command(cp = %08lX, \ ! filename = \"%s\")\n{\n"/*}*/, (long)cp, filename->str_text)); ! pconf_data = change_pconf_get(cp); ! hp = project_history_path_get(cp->pp); ! id = change_integration_directory_get(cp, 0); ! sub_var_set("Input", "%S/%S", id, filename); ! sub_var_set("History", "%S/%S", hp, filename); ! sub_var_set("1", "${input}"); ! sub_var_set("2", "${history}"); ! the_command = pconf_data->history_create_command; ! the_command = substitute(cp, the_command); ! project_become(cp->pp); ! os_mkdir_between(hp, filename, 02755); ! os_execute(the_command, OS_EXEC_FLAG_NO_INPUT, id); ! project_become_undo(); ! str_free(the_command); ! trace((/*{*/"}\n")); ! } ! ! ! void ! change_run_history_put_command(cp, filename) ! change_ty *cp; ! string_ty *filename; ! { ! string_ty *hp; ! string_ty *id; ! pconf pconf_data; ! string_ty *the_command; ! ! /* ! * Update and existing history. ! * All of the substitutions described in aesub(5) are avaliable. ! * In addition: ! * ! * ${Input} ! * absolute path of source file ! * ! * ${History} ! * absolute path of history file ! */ ! trace(("change_run_history_put_command(cp = %08lX, \ ! filename = \"%s\")\n{\n"/*}*/, (long)cp, filename->str_text)); ! pconf_data = change_pconf_get(cp); ! hp = project_history_path_get(cp->pp); ! id = change_integration_directory_get(cp, 0); ! sub_var_set("Input", "%S/%S", id, filename); ! sub_var_set("History", "%S/%S", hp, filename); ! sub_var_set("1", "${input}"); ! sub_var_set("2", "${history}"); ! the_command = pconf_data->history_put_command; ! the_command = substitute(cp, the_command); ! project_become(cp->pp); ! os_execute(the_command, OS_EXEC_FLAG_NO_INPUT, id); ! project_become_undo(); ! str_free(the_command); ! trace((/*{*/"}\n")); ! } ! ! ! string_ty * ! change_run_history_query_command(cp, filename) ! change_ty *cp; ! string_ty *filename; ! { ! string_ty *hp; ! string_ty *bl; ! pconf pconf_data; ! string_ty *the_command; ! string_ty *result; ! ! /* ! * Ask the history file what its edit number is. ! * We use this method because the string ! * returned is essentially random, ! * between different history programs. ! * All of the substitutions described in aesub(5) are available. ! * In addition ! * ! * ${History} ! * absolute path of history file ! */ ! trace(("change_run_history_query_command(cp = %08lX, \ ! filename = \"%s\")\n{\n"/*}*/, (long)cp, filename->str_text)); ! pconf_data = change_pconf_get(cp); ! hp = project_history_path_get(cp->pp); ! bl = project_baseline_path_get(cp->pp, 0); ! sub_var_set("History", "%S/%S", hp, filename); ! sub_var_set("1", "${history}"); ! the_command = pconf_data->history_query_command; ! the_command = substitute(cp, the_command); ! project_become(cp->pp); ! result = ! os_execute_slurp ! ( ! the_command, ! OS_EXEC_FLAG_NO_INPUT, ! bl ! ); ! project_become_undo(); ! str_free(the_command); ! if (!result->str_length) ! { ! fatal ! ( ! "the history_query_command returned the empty string, this is invalid" ! ); ! } ! trace(("return \"%s\";\n", result->str_text)); ! trace((/*{*/"}\n")); ! return result; ! } ! ! ! void ! change_run_diff_command(cp, up, original, input, output) ! change_ty *cp; ! user_ty *up; ! string_ty *original; ! string_ty *input; ! string_ty *output; ! { ! pconf pconf_data; ! string_ty *dd; ! string_ty *the_command; ! ! /* ! * Run the diff_command. ! * All of the substitutions described in aesub(5) are available. ! * In addition ! * ! * ${Original} ! * absolute path of original file copied from the baseline ! * usually, but not always ! * ! * ${Input} ! * absolute path of current file in the development directory ! * usually, but not always ! * ! * ${Output} ! * absolute path of file in which to write the difference listing ! * usually in the development diretcory ! */ ! trace ! (( ! "change_run_diff_command(cp = %08lX, up = %08lX, \ ! original = \"%s\", input = \"%s\", output = \"%s\")\n{\n"/*}*/, ! (long)cp, ! (long)up, ! original->str_text, ! input->str_text, ! output->str_text ! )); ! pconf_data = change_pconf_get(cp); ! dd = change_development_directory_get(cp, 0); ! sub_var_set("ORiginal", "%S", original); ! sub_var_set("Input", "%S", input); ! sub_var_set("Output", "%S", output); ! sub_var_set("1", "${original}"); ! sub_var_set("2", "${input}"); ! sub_var_set("3", "${output}"); ! the_command = pconf_data->diff_command; ! the_command = substitute(cp, the_command); ! trace_string(the_command->str_text); ! user_become(up); ! os_execute(the_command, OS_EXEC_FLAG_NO_INPUT, dd); ! user_become_undo(); ! str_free(the_command); ! trace((/*{*/"}\n")); ! } ! ! ! void ! change_run_diff3_command(cp, up, original, most_recent, input, output) ! change_ty *cp; ! user_ty *up; ! string_ty *original; ! string_ty *most_recent; ! string_ty *input; ! string_ty *output; ! { ! pconf pconf_data; ! string_ty *the_command; ! string_ty *dd; ! ! /* ! * Run the diff3_command. ! * All of the substitutions described in aesub(5) are available. ! * In addition ! * ! * ${Original} ! * absolute path of original file copied from the baseline ! * usually somewhere in /tmp ! * ! * ${Most_Recent} ! * absolute path of original file currently in the baseline ! * usually, but not always ! * ! * ${Input} ! * absolute path of current file in the development directory ! * usually, but not always ! * ! * ${Output} ! * absolute path of file in which to write the difference listing ! * usually in the development diretcory ! */ ! trace ! (( ! "change_run_diff3_command(cp = %08lX, up = %08lX, original = \ ! \"%s\", most_recent = \"%s\", input = \"%s\", output = \"%s\")\n{\n"/*}*/, ! (long)cp, ! (long)up, ! original->str_text, ! most_recent->str_text, ! input->str_text, ! output->str_text ! )); ! pconf_data = change_pconf_get(cp); ! dd = change_development_directory_get(cp, 0); ! sub_var_set("ORiginal", "%S", original); ! sub_var_set("Most_Recent", "%S", most_recent); ! sub_var_set("Input", "%S", input); ! sub_var_set("Output", "%S", output); ! sub_var_set("1", "${original}"); ! sub_var_set("2", "${most_recent}"); ! sub_var_set("3", "${input}"); ! sub_var_set("4", "${output}"); ! the_command = pconf_data->diff3_command; ! the_command = substitute(cp, the_command); ! user_become(up); ! os_execute(the_command, OS_EXEC_FLAG_NO_INPUT, dd); ! user_become_undo(); str_free(the_command); trace((/*{*/"}\n")); } Index: aegis/change.h *************** *** 1,12 **** /* * aegis - project change supervisor ! * Copyright (c) 1991-1992 Peter Miller. * All rights reserved. * * 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 1, 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 --- 1,12 ---- /* * aegis - project change supervisor ! * Copyright (C) 1991, 1992, 1993 Peter Miller. * All rights reserved. * * 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 *************** *** 28,48 **** #include struct wlist; ! struct user_t; ! typedef struct change_t change_t; ! struct change_t { long reference_count; ! struct project_t *pp; long number; int is_a_new_file; ! string_t *filename; cstate cstate_data; ! string_t *development_directory; ! string_t *integration_directory; ! string_t *logfile; ! string_t *pconf_path; pconf pconf_data; long lock_magic; /* --- 28,48 ---- #include struct wlist; ! struct user_ty; ! typedef struct change_ty change_ty; ! struct change_ty { long reference_count; ! struct project_ty *pp; long number; int is_a_new_file; ! string_ty *filename; cstate cstate_data; ! string_ty *development_directory; ! string_ty *integration_directory; ! string_ty *logfile; ! string_ty *pconf_path; pconf pconf_data; long lock_magic; /* *************** *** 51,96 **** */ }; ! change_t *change_alloc _((struct project_t *, long)); ! void change_free _((change_t *)); ! change_t *change_copy _((change_t *)); ! void change_bind_existing _((change_t *)); ! void change_bind_new _((change_t *)); ! cstate change_cstate_get _((change_t *)); ! void change_cstate_write _((change_t *)); ! cstate_src change_src_find _((change_t *, string_t *)); ! void change_src_remove _((change_t *, string_t *)); ! cstate_src change_src_new _((change_t *)); ! cstate_history change_history_new _((change_t *, struct user_t *)); ! string_t *change_developer_name _((change_t *)); ! string_t *change_reviewer_name _((change_t *)); ! string_t *change_integrator_name _((change_t *)); ! void change_development_directory_set _((change_t *, string_t *)); ! void change_integration_directory_set _((change_t *, string_t *)); ! string_t *change_development_directory_get _((change_t *)); ! string_t *change_integration_directory_get _((change_t *)); ! string_t *change_logfile_get _((change_t *)); ! void change_cstate_lock_prepare _((change_t *)); ! void change_error _((change_t *, char *, ...)); ! void change_fatal _((change_t *, char *, ...)); ! void change_verbose _((change_t *, char *, ...)); ! string_t *change_pconf_path_get _((change_t *)); ! pconf change_pconf_get _((change_t *)); ! void change_run_change_file_command _((change_t *, struct wlist *, ! struct user_t *)); ! void change_run_project_file_command _((change_t *)); ! void change_run_develop_end_notify_command _((change_t *)); ! void change_run_develop_end_undo_notify_command _((change_t *)); ! void change_run_review_pass_notify_command _((change_t *)); ! void change_run_review_pass_undo_notify_command _((change_t *)); ! void change_run_review_fail_notify_command _((change_t *)); ! void change_run_integrate_pass_notify_command _((change_t *)); ! void change_run_integrate_fail_notify_command _((change_t *)); ! void change_run_history_get_command _((change_t *cp, string_t *file_name, ! string_t *edit_number, string_t *output_file, struct user_t *up)); ! string_t *change_file_template _((change_t *, string_t *)); ! void change_become _((change_t *)); void change_become_undo _((void)); ! int change_umask _((change_t *)); #endif /* CHANGE_H */ --- 51,107 ---- */ }; ! change_ty *change_alloc _((struct project_ty *, long)); ! void change_free _((change_ty *)); ! change_ty *change_copy _((change_ty *)); ! void change_bind_existing _((change_ty *)); ! void change_bind_new _((change_ty *)); ! cstate change_cstate_get _((change_ty *)); ! void change_cstate_write _((change_ty *)); ! cstate_src change_src_find _((change_ty *, string_ty *)); ! void change_src_remove _((change_ty *, string_ty *)); ! cstate_src change_src_new _((change_ty *)); ! cstate_history change_history_new _((change_ty *, struct user_ty *)); ! string_ty *change_developer_name _((change_ty *)); ! string_ty *change_reviewer_name _((change_ty *)); ! string_ty *change_integrator_name _((change_ty *)); ! void change_development_directory_set _((change_ty *, string_ty *)); ! void change_integration_directory_set _((change_ty *, string_ty *)); ! string_ty *change_development_directory_get _((change_ty *, int)); ! string_ty *change_integration_directory_get _((change_ty *, int)); ! string_ty *change_logfile_get _((change_ty *)); ! void change_cstate_lock_prepare _((change_ty *)); ! void change_error _((change_ty *, char *, ...)); ! void change_fatal _((change_ty *, char *, ...)); ! void change_verbose _((change_ty *, char *, ...)); ! string_ty *change_pconf_path_get _((change_ty *)); ! pconf change_pconf_get _((change_ty *)); ! void change_run_change_file_command _((change_ty *, struct wlist *, ! struct user_ty *)); ! void change_run_project_file_command _((change_ty *)); ! void change_run_develop_end_notify_command _((change_ty *)); ! void change_run_develop_end_undo_notify_command _((change_ty *)); ! void change_run_review_pass_notify_command _((change_ty *)); ! void change_run_review_pass_undo_notify_command _((change_ty *)); ! void change_run_review_fail_notify_command _((change_ty *)); ! void change_run_integrate_pass_notify_command _((change_ty *)); ! void change_run_integrate_fail_notify_command _((change_ty *)); ! void change_run_history_get_command _((change_ty *cp, string_ty *file_name, ! string_ty *edit_number, string_ty *output_file, struct user_ty *up)); ! void change_run_history_create_command _((change_ty *cp, string_ty *file_name)); ! void change_run_history_put_command _((change_ty *cp, string_ty *file_name)); ! string_ty *change_run_history_query_command _((change_ty *cp, ! string_ty *file_name)); ! void change_run_diff_command _((change_ty *cp, struct user_ty *up, ! string_ty *original, string_ty *input, string_ty *output)); ! void change_run_diff3_command _((change_ty *cp, struct user_ty *up, ! string_ty *original, string_ty *most_recent, string_ty *input, ! string_ty *output)); ! string_ty *change_file_template _((change_ty *, string_ty *)); ! void change_become _((change_ty *)); void change_become_undo _((void)); ! int change_umask _((change_ty *)); ! void change_development_directory_clear _((change_ty *)); ! void change_integration_directory_clear _((change_ty *)); #endif /* CHANGE_H */ Index: aegis/chdir.c *************** *** 1,12 **** /* * aegis - project change supervisor ! * Copyright (c) 1991-1992 Peter Miller. * All rights reserved. * * 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 1, 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 --- 1,12 ---- /* * aegis - project change supervisor ! * Copyright (C) 1991, 1992, 1993 Peter Miller. * All rights reserved. * * 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 *************** *** 84,92 **** "", " -Change ", " This option may be used to specify a particular", ! " change within a project. If the user is only", ! " working on one change within a project, that is", ! " the default change number.", "", " -Development_Directory", " This option is ised to specify that the", --- 84,97 ---- "", " -Change ", " This option may be used to specify a particular", ! " change within a project. When no -Change option is", ! " specified, the AEGIS_CHANGE environment variable is", ! " consulted. If that does not exist, the user's", ! " $HOME/.aegisrc file is examined for a default change", ! " field (see aeuconf(5) for more information). If", ! " that does not exist, when the user is only working", ! " on one change within a project, that is the default", ! " change number. Otherwise, it is an error.", "", " -Development_Directory", " This option is ised to specify that the", *************** *** 106,119 **** "", " -Project ", " This option may be used to select the project of", ! " interest. When no -Project option is specified, if", ! " the user is only working on changes within a single", ! " project, the project name defaults to that project;", ! " if the user is currently working on changes to more", ! " than one project, or is not working on changes to", ! " any project, the user's $HOME/.%src file is", ! " examined for a default project field (see aeuconf(5)", ! " for more information).", "", " -TERse", " This option may be used to cause listings to", --- 111,124 ---- "", " -Project ", " This option may be used to select the project of", ! " interest. When no -Project option is specified, the", ! " AEGIS_PROJECT environment variable is consulted. If", ! " that does not exist, the user's $HOME/.aegisrc file", ! " is examined for a default project field (see", ! " aeuconf(5) for more information). If that does not", ! " exist, when the user is only working on changes", ! " within a single project, the project name defaults", ! " to that project. Otherwise, it is an error.", "", " -TERse", " This option may be used to cause listings to", *************** *** 162,168 **** static void change_directory_list() { ! string_t *project_name; trace(("change_directory_list()\n{\n"/*}*/)); arglex(); --- 167,173 ---- static void change_directory_list() { ! string_ty *project_name; trace(("change_directory_list()\n{\n"/*}*/)); arglex(); *************** *** 212,224 **** char *subdir = 0; int devdir = 0; cstate cstate_data; ! string_t *d; int baseline = 0; ! string_t *project_name; ! project_t *pp; long change_number; ! change_t *cp; ! user_t *up; trace(("change_directory_main()\n{\n"/*}*/)); project_name = 0; --- 217,229 ---- char *subdir = 0; int devdir = 0; cstate cstate_data; ! string_ty *d; int baseline = 0; ! string_ty *project_name; ! project_ty *pp; long change_number; ! change_ty *cp; ! user_ty *up; trace(("change_directory_main()\n{\n"/*}*/)); project_name = 0; *************** *** 305,312 **** if (baseline) { if (change_number) ! fatal("the -BaseLine and -Change options are mutually exclusive"); ! d = project_baseline_path_get(pp); cp = 0; } else --- 310,322 ---- if (baseline) { if (change_number) ! { ! fatal ! ( ! "the -BaseLine and -Change options are mutually exclusive" ! ); ! } ! d = project_baseline_path_get(pp, 0); cp = 0; } else *************** *** 328,334 **** case cstate_state_being_integrated: if (!devdir) { ! d = cstate_data->integration_directory; break; } /* fall through... */ --- 338,344 ---- case cstate_state_being_integrated: if (!devdir) { ! d = change_integration_directory_get(cp, 0); break; } /* fall through... */ *************** *** 336,342 **** case cstate_state_awaiting_integration: case cstate_state_being_reviewed: case cstate_state_being_developed: ! d = cstate_data->development_directory; break; } } --- 346,352 ---- case cstate_state_awaiting_integration: case cstate_state_being_reviewed: case cstate_state_being_developed: ! d = change_development_directory_get(cp, 0); break; } } *************** *** 347,358 **** */ if (subdir) { ! string_t *tmp; tmp = str_format("%S/%s", d, subdir); user_become(up); ! d = os_pathname(tmp); ! os_become_undo(); str_free(tmp); } --- 357,368 ---- */ if (subdir) { ! string_ty *tmp; tmp = str_format("%S/%s", d, subdir); user_become(up); ! d = os_pathname(tmp, 0); ! user_become_undo(); str_free(tmp); } Index: aegis/chdir.h *************** *** 1,12 **** /* * aegis - project change supervisor ! * Copyright (c) 1991-1992 Peter Miller. * All rights reserved. * * 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 1, 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 --- 1,12 ---- /* * aegis - project change supervisor ! * Copyright (C) 1991, 1992, 1993 Peter Miller. * All rights reserved. * * 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 Index: aegis/col.c *************** *** 1,12 **** /* * aegis - project change supervisor ! * Copyright (c) 1991-1992 Peter Miller. * All rights reserved. * * 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 1, 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 --- 1,12 ---- /* * aegis - project change supervisor ! * Copyright (C) 1991, 1992, 1993 Peter Miller. * All rights reserved. * * 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 *************** *** 27,32 **** --- 27,33 ---- #include #include + #include #include #include #include *************** *** 38,45 **** #define PRINTER_THRESHOLD 33 ! typedef struct col_t col_t; ! struct col_t { int icol; int ocol; --- 39,46 ---- #define PRINTER_THRESHOLD 33 ! typedef struct col_ty col_ty; ! struct col_ty { int icol; int ocol; *************** *** 55,61 **** }; static size_t ncols; ! static col_t **col; static char *filename; static FILE *fp; static char pager[] = "PAGER"; --- 56,62 ---- }; static size_t ncols; ! static col_ty **col; static char *filename; static FILE *fp; static char pager[] = "PAGER"; *************** *** 104,110 **** { filename = mem_copy_string(s); os_become_orig(); ! fp = fopen(filename, "w"); if (!fp) nfatal("open(\"%s\")", filename); os_become_undo(); --- 105,111 ---- { filename = mem_copy_string(s); os_become_orig(); ! fp = glue_fopen(filename, "w"); if (!fp) nfatal("open(\"%s\")", filename); os_become_undo(); *************** *** 176,182 **** col_close() { int j; ! col_t *cp; /* * free the memory consumed by the columns --- 177,183 ---- col_close() { int j; ! col_ty *cp; /* * free the memory consumed by the columns *************** *** 211,218 **** /* * write the last of the output */ ! if (fflush(fp)) ! col_error(); /* * close the output --- 212,227 ---- /* * write the last of the output */ ! if (filename != pager) ! { ! if (glue_fflush(fp)) ! col_error(); ! } ! else ! { ! if (fflush(fp)) ! col_error(); ! } /* * close the output *************** *** 219,225 **** */ if (filename != pager) { ! if (fclose(fp)) nfatal("close(\"%s\")", filename); mem_free(filename); } --- 228,234 ---- */ if (filename != pager) { ! if (glue_fclose(fp)) nfatal("close(\"%s\")", filename); mem_free(filename); } *************** *** 256,262 **** int min; int max; { ! col_t *cp; trace(("col_create(min = %d, max = %d)\n{\n"/*}*/, min, max)); if (!max) --- 265,271 ---- int min; int max; { ! col_ty *cp; trace(("col_create(min = %d, max = %d)\n{\n"/*}*/, min, max)); if (!max) *************** *** 263,273 **** { max = page_width; if (max <= min) ! max = min + 1; } assert(min < max); ! cp = (col_t *)mem_alloc(sizeof(col_t)); ! *(col_t **)enlarge(&ncols, (char **)&col, sizeof(col_t *)) = cp; cp->min = min; cp->max = max; cp->text_length_max = 0; --- 272,289 ---- { max = page_width; if (max <= min) ! max = min + 8; } + + /* + * try to get sensable behaviour out of narrow windows + */ + if (max > page_width) + page_width = max; + assert(min < max); ! cp = (col_ty *)mem_alloc(sizeof(col_ty)); ! *(col_ty **)enlarge(&ncols, (char **)&col, sizeof(col_ty *)) = cp; cp->min = min; cp->max = max; cp->text_length_max = 0; *************** *** 277,282 **** --- 293,299 ---- cp->ocol = 0; cp->heading = 0; cp->heading_required = 0; + cp->top_of_page_diverted = 0; trace(("return %d;\n", ncols - 1)); trace((/*{*/"}\n")); return (ncols - 1); *************** *** 288,294 **** * col_save_char * * SYNOPSIS ! * void col_save_char(col_t *cp, int c); * * DESCRIPTION * The col_save_char function is used to --- 305,311 ---- * col_save_char * * SYNOPSIS ! * void col_save_char(col_ty *cp, int c); * * DESCRIPTION * The col_save_char function is used to *************** *** 299,309 **** * c - the character to append */ ! static void col_save_char _((col_t *, int)); static void col_save_char(cp, c) ! col_t *cp; int c; { if (cp->text_length >= cp->text_length_max) --- 316,326 ---- * c - the character to append */ ! static void col_save_char _((col_ty *, int)); static void col_save_char(cp, c) ! col_ty *cp; int c; { if (cp->text_length >= cp->text_length_max) *************** *** 332,338 **** * col_putchar * * SYNOPSIS ! * void col_putchar(col_t *cp, int c); * * DESCRIPTION * The col_putchar function is used to --- 349,355 ---- * col_putchar * * SYNOPSIS ! * void col_putchar(col_ty *cp, int c); * * DESCRIPTION * The col_putchar function is used to *************** *** 347,357 **** * c - the character to append */ ! static void col_putchar _((col_t *, int)); static void col_putchar(cp, c) ! col_t *cp; int c; { switch (c) --- 364,374 ---- * c - the character to append */ ! static void col_putchar _((col_ty *, int)); static void col_putchar(cp, c) ! col_ty *cp; int c; { switch (c) *************** *** 419,425 **** int cid; char *s; { ! col_t *cp; trace(("col_puts(cid = %d, s = %08lX)\n{\n"/*}*/, cid, s)); assert(cid >= 0 && cid < ncols); --- 436,442 ---- int cid; char *s; { ! col_ty *cp; trace(("col_puts(cid = %d, s = %08lX)\n{\n"/*}*/, cid, s)); assert(cid >= 0 && cid < ncols); *************** *** 491,497 **** top_of_page_mark() { int j; ! col_t *cp; top_of_page = 1; for (j = 0; j < ncols; ++j) --- 508,514 ---- top_of_page_mark() { int j; ! col_ty *cp; top_of_page = 1; for (j = 0; j < ncols; ++j) *************** *** 544,552 **** switch (c) { case '\n': ! putc('\n', fp); #ifdef DEBUG ! fflush(fp); #endif in_col = 0; out_col = 0; --- 561,575 ---- switch (c) { case '\n': ! if (filename != pager) ! glue_fputc('\n', fp); ! else ! putc('\n', fp); #ifdef DEBUG ! if (filename != pager) ! glue_fflush(fp); ! else ! fflush(fp); #endif in_col = 0; out_col = 0; *************** *** 566,586 **** default: while (((out_col + 8) & -8) <= in_col && out_col + 1 < in_col) { ! putc('\t', fp); out_col = (out_col + 8) & -8; } while (out_col < in_col) { ! putc(' ', fp); ++out_col; } ! putc(c, fp); in_col++; out_col++; break; } ! if (ferror(fp)) ! col_error(); } --- 589,626 ---- default: while (((out_col + 8) & -8) <= in_col && out_col + 1 < in_col) { ! if (filename != pager) ! glue_fputc('\t', fp); ! else ! putc('\t', fp); out_col = (out_col + 8) & -8; } while (out_col < in_col) { ! if (filename != pager) ! glue_fputc(' ', fp); ! else ! putc(' ', fp); ++out_col; } ! if (filename != pager) ! glue_fputc(c, fp); ! else ! putc(c, fp); in_col++; out_col++; break; } ! if (filename != pager) ! { ! if (glue_ferror(fp)) ! col_error(); ! } ! else ! { ! if (ferror(fp)) ! col_error(); ! } } *************** *** 637,643 **** { int more; int j; ! col_t *cp; trace(("col_eoln_sub()\n{\n"/*}*/)); for (;;) --- 677,683 ---- { int more; int j; ! col_ty *cp; trace(("col_eoln_sub()\n{\n"/*}*/)); for (;;) *************** *** 744,750 **** { int heading_required; int j; ! col_t *cp; char tmp1[50]; char *tmp2; int frac; --- 784,790 ---- { int heading_required; int j; ! col_ty *cp; char tmp1[50]; char *tmp2; int frac; *************** *** 806,811 **** --- 846,869 ---- col_emit_char('\n'); /* + * in weird cases where the terminal is too narrow, + * the headings can try to span pages. + * If we are already top-of-page diverted, don't do it again. + */ + heading_required = 0; + for (j = 0; j < ncols; ++j) + { + if (col[j]->top_of_page_diverted) + heading_required--; + } + if (heading_required < 0) + { + for (j = 0; j < ncols; ++j) + col[j]->heading_required = 0; + return; + } + + /* * divert for headings */ heading_required = 0; *************** *** 812,817 **** --- 870,876 ---- for (j = 0; j < ncols; ++j) { cp = col[j]; + assert(!cp->top_of_page_diverted); cp->top_of_page_diverted = cp->current; if (cp->heading && cp->heading_required) { *************** *** 836,841 **** --- 895,902 ---- { cp = col[j]; cp->current = cp->top_of_page_diverted; + cp->heading_required = 0; + cp->top_of_page_diverted = 0; } } *************** *** 859,865 **** col_eoln() { int j; ! col_t *cp; int heading_required; /* --- 920,926 ---- col_eoln() { int j; ! col_ty *cp; int heading_required; /* *************** *** 942,948 **** col_bol(cid) int cid; { ! col_t *cp; trace(("col_bol(cid = %d)\n{\n"/*}*/, cid)); assert(cid >= 0 && cid < ncols); --- 1003,1009 ---- col_bol(cid) int cid; { ! col_ty *cp; trace(("col_bol(cid = %d)\n{\n"/*}*/, cid)); assert(cid >= 0 && cid < ncols); *************** *** 974,980 **** int cid; char *s; { ! col_t *cp; trace(("col_heading(cid = %d, s = %08lX)\n{\n"/*}*/, cid, s)); assert(cid >= 0 && cid < ncols); --- 1035,1041 ---- int cid; char *s; { ! col_ty *cp; trace(("col_heading(cid = %d, s = %08lX)\n{\n"/*}*/, cid, s)); assert(cid >= 0 && cid < ncols); Index: aegis/col.h *************** *** 1,12 **** /* * aegis - project change supervisor ! * Copyright (c) 1991-1992 Peter Miller. * All rights reserved. * * 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 1, 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 --- 1,12 ---- /* * aegis - project change supervisor ! * Copyright (C) 1991, 1992, 1993 Peter Miller. * All rights reserved. * * 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 Index: aegis/commit.c *************** *** 1,12 **** /* * aegis - project change supervisor ! * Copyright (c) 1991-1992 Peter Miller. * All rights reserved. * * 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 1, 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 --- 1,12 ---- /* * aegis - project change supervisor ! * Copyright (C) 1991, 1992, 1993 Peter Miller. * All rights reserved. * * 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 *************** *** 44,50 **** * set at the time the commit call was issued. */ ! enum what_t { what_rename, what_unlink_errok, --- 44,50 ---- * set at the time the commit call was issued. */ ! enum what_ty { what_rename, what_unlink_errok, *************** *** 51,73 **** what_rmdir_errok, what_rmdir_tree_errok }; ! typedef enum what_t what_t; ! typedef struct action_t action_t; ! struct action_t { ! what_t what; ! string_t *path1; ! string_t *path2; ! action_t *next; int uid; int gid; int umask; }; ! static action_t *head1; ! static action_t *tail1; ! static action_t *head2; /* --- 51,73 ---- what_rmdir_errok, what_rmdir_tree_errok }; ! typedef enum what_ty what_ty; ! typedef struct action_ty action_ty; ! struct action_ty { ! what_ty what; ! string_ty *path1; ! string_ty *path2; ! action_ty *next; int uid; int gid; int umask; }; ! static action_ty *head1; ! static action_ty *tail1; ! static action_ty *head2; /* *************** *** 75,81 **** * link1 * * SYNOPSIS ! * void link1(what_t action, string_t *path1, string_t *path2); * * DESCRIPTION * The link1 function is used to --- 75,81 ---- * link1 * * SYNOPSIS ! * void link1(what_ty action, string_ty *path1, string_ty *path2); * * DESCRIPTION * The link1 function is used to *************** *** 87,104 **** * path2 - optional argument (NULL if not used) */ ! static void link1 _((what_t, string_t *, string_t *)); static void link1(what, path1, path2) ! what_t what; ! string_t *path1; ! string_t *path2; { ! action_t *new; trace(("commit::link1(what = %d, path1 = %08lX, path2 = %08lX)\n{\n"/*}*/, what, path1, path2)); ! new = (action_t *)mem_alloc(sizeof(action_t)); new->what = what; os_become_query(&new->uid, &new->gid, &new->umask); new->path1 = str_copy(path1); --- 87,104 ---- * path2 - optional argument (NULL if not used) */ ! static void link1 _((what_ty, string_ty *, string_ty *)); static void link1(what, path1, path2) ! what_ty what; ! string_ty *path1; ! string_ty *path2; { ! action_ty *new; trace(("commit::link1(what = %d, path1 = %08lX, path2 = %08lX)\n{\n"/*}*/, what, path1, path2)); ! new = (action_ty *)mem_alloc(sizeof(action_ty)); new->what = what; os_become_query(&new->uid, &new->gid, &new->umask); new->path1 = str_copy(path1); *************** *** 123,129 **** * link2 * * SYNOPSIS ! * void link2(what_t action, string_t *path1, string_t *path2); * * DESCRIPTION * The link2 function is used to --- 123,129 ---- * link2 * * SYNOPSIS ! * void link2(what_ty action, string_ty *path1, string_ty *path2); * * DESCRIPTION * The link2 function is used to *************** *** 135,152 **** * path2 - optional argument (NULL if not used) */ ! static void link2 _((what_t, string_t *, string_t *)); static void link2(what, path1, path2) ! what_t what; ! string_t *path1; ! string_t *path2; { ! action_t *new; trace(("commit::link2(what = %d, path1 = %08lX, path2 = %08lX)\n{\n"/*}*/, what, path1, path2)); ! new = (action_t *)mem_alloc(sizeof(action_t)); new->what = what; os_become_query(&new->uid, &new->gid, &new->umask); new->path1 = str_copy(path1); --- 135,152 ---- * path2 - optional argument (NULL if not used) */ ! static void link2 _((what_ty, string_ty *, string_ty *)); static void link2(what, path1, path2) ! what_ty what; ! string_ty *path1; ! string_ty *path2; { ! action_ty *new; trace(("commit::link2(what = %d, path1 = %08lX, path2 = %08lX)\n{\n"/*}*/, what, path1, path2)); ! new = (action_ty *)mem_alloc(sizeof(action_ty)); new->what = what; os_become_query(&new->uid, &new->gid, &new->umask); new->path1 = str_copy(path1); *************** *** 178,185 **** void commit_rename(from, to) ! string_t *from; ! string_t *to; { trace(("commit_rename(from = %08lX, to = %08lX)\n{\n"/*}*/, from, to)); trace_string(from->str_text); --- 178,185 ---- void commit_rename(from, to) ! string_ty *from; ! string_ty *to; { trace(("commit_rename(from = %08lX, to = %08lX)\n{\n"/*}*/, from, to)); trace_string(from->str_text); *************** *** 207,217 **** void commit_unlink_errok(path) ! string_t *path; { trace(("commit_unlink_errok(path = %08lX)\n{\n"/*}*/, path)); trace_string(path->str_text); ! link2(what_unlink_errok, path, (string_t *)0); trace((/*{*/"}\n")); } --- 207,217 ---- void commit_unlink_errok(path) ! string_ty *path; { trace(("commit_unlink_errok(path = %08lX)\n{\n"/*}*/, path)); trace_string(path->str_text); ! link2(what_unlink_errok, path, (string_ty *)0); trace((/*{*/"}\n")); } *************** *** 221,227 **** * commit_rmdir_errok * * SYNOPSIS ! * void commit_rmdir_errok(string_t *path); * * DESCRIPTION * The commit_rmdir_errok function is used to --- 221,227 ---- * commit_rmdir_errok * * SYNOPSIS ! * void commit_rmdir_errok(string_ty *path); * * DESCRIPTION * The commit_rmdir_errok function is used to *************** *** 235,245 **** void commit_rmdir_errok(path) ! string_t *path; { trace(("commit_rmdir_errok(path = %08lX)\n{\n"/*}*/, path)); trace_string(path->str_text); ! link2(what_rmdir_errok, path, (string_t *)0); trace((/*{*/"}\n")); } --- 235,245 ---- void commit_rmdir_errok(path) ! string_ty *path; { trace(("commit_rmdir_errok(path = %08lX)\n{\n"/*}*/, path)); trace_string(path->str_text); ! link2(what_rmdir_errok, path, (string_ty *)0); trace((/*{*/"}\n")); } *************** *** 249,255 **** * commit_rmdir_tree_errok * * SYNOPSIS ! * void commit_rmdir_tree_errok(string_t *path); * * DESCRIPTION * The commit_rmdir_tree_errok function is used to --- 249,255 ---- * commit_rmdir_tree_errok * * SYNOPSIS ! * void commit_rmdir_tree_errok(string_ty *path); * * DESCRIPTION * The commit_rmdir_tree_errok function is used to *************** *** 263,273 **** void commit_rmdir_tree_errok(path) ! string_t *path; { trace(("commit_rmdir_tree_errok(path = %08lX)\n{\n"/*}*/, path)); trace_string(path->str_text); ! link2(what_rmdir_tree_errok, path, (string_t *)0); trace((/*{*/"}\n")); } --- 263,273 ---- void commit_rmdir_tree_errok(path) ! string_ty *path; { trace(("commit_rmdir_tree_errok(path = %08lX)\n{\n"/*}*/, path)); trace_string(path->str_text); ! link2(what_rmdir_tree_errok, path, (string_ty *)0); trace((/*{*/"}\n")); } *************** *** 277,284 **** * rmdir_tree_callback * * SYNOPSIS ! * void rmdir_tree_callback(void * arg, dir_walk_message_t message, ! * string_t *path, struct stat *st); * * DESCRIPTION * The rmdir_tree_callback function is used to --- 277,284 ---- * rmdir_tree_callback * * SYNOPSIS ! * void rmdir_tree_callback(void * arg, dir_walk_message_ty message, ! * string_ty *path, struct stat *st); * * DESCRIPTION * The rmdir_tree_callback function is used to *************** *** 300,313 **** * st - pointer to stat structure describing file system entity */ ! static void rmdir_tree_callback _((void *, dir_walk_message_t, string_t *path, ! struct stat *)); static void rmdir_tree_callback(arg, message, path, stat) void *arg; ! dir_walk_message_t message; ! string_t *path; struct stat *stat; { trace(("rmdir_tree_callback(message = %d, path = %08lX, \ --- 300,313 ---- * st - pointer to stat structure describing file system entity */ ! static void rmdir_tree_callback _((void *, dir_walk_message_ty, ! string_ty *path, struct stat *)); static void rmdir_tree_callback(arg, message, path, stat) void *arg; ! dir_walk_message_ty message; ! string_ty *path; struct stat *stat; { trace(("rmdir_tree_callback(message = %d, path = %08lX, \ *************** *** 357,363 **** trace(("commit()\n{\n"/*}*/)); while (head1 || head2) { ! action_t *action; /* * Take the first item off the list. --- 357,363 ---- trace(("commit()\n{\n"/*}*/)); while (head1 || head2) { ! action_ty *action; /* * Take the first item off the list. Index: aegis/commit.h *************** *** 1,12 **** /* * aegis - project change supervisor ! * Copyright (c) 1991-1992 Peter Miller. * All rights reserved. * * 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 1, 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 --- 1,12 ---- /* * aegis - project change supervisor ! * Copyright (C) 1991, 1992, 1993 Peter Miller. * All rights reserved. * * 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 *************** *** 25,34 **** #include ! void commit_rename _((string_t *from, string_t *to)); ! void commit_unlink_errok _((string_t *path)); ! void commit_rmdir_errok _((string_t *path)); ! void commit_rmdir_tree_errok _((string_t *path)); void commit _((void)); #endif /* COMMIT_H */ --- 25,34 ---- #include ! void commit_rename _((string_ty *from, string_ty *to)); ! void commit_unlink_errok _((string_ty *path)); ! void commit_rmdir_errok _((string_ty *path)); ! void commit_rmdir_tree_errok _((string_ty *path)); void commit _((void)); #endif /* COMMIT_H */ Index: aegis/common.def *************** *** 1,12 **** /* * aegis - project change supervisor ! * Copyright (c) 1991-1992 Peter Miller. * All rights reserved. * * 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 1, 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 --- 1,12 ---- /* * aegis - project change supervisor ! * Copyright (C) 1991, 1992, 1993 Peter Miller. * All rights reserved. * * 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 Index: aegis/copyfile.c *************** *** 1,12 **** /* * aegis - project change supervisor ! * Copyright (c) 1991-1993 Peter Miller. * All rights reserved. * * 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 1, 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 --- 1,12 ---- /* * aegis - project change supervisor ! * Copyright (C) 1991, 1992, 1993 Peter Miller. * All rights reserved. * * 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 *************** *** 104,109 **** --- 104,114 ---- " development directory, and added to the list of files in", " the change.", "", + " This command will cancel any build or test registrations,", + " because adding another file logically invalidates them. If", + " the config file was added, any diff registration will also", + " be cancelled.", + "", "OPTIONS", " The following options are understood:", "", *************** *** 117,125 **** "", " -Change ", " This option may be used to specify a particular", ! " change within a project. If the user is only", ! " working on one change within a project, that is", ! " the default change number.", "", " -Delta ", " This optioon may be used to specify a particular", --- 122,135 ---- "", " -Change ", " This option may be used to specify a particular", ! " change within a project. When no -Change option is", ! " specified, the AEGIS_CHANGE environment variable is", ! " consulted. If that does not exist, the user's", ! " $HOME/.aegisrc file is examined for a default change", ! " field (see aeuconf(5) for more information). If", ! " that does not exist, when the user is only working", ! " on one change within a project, that is the default", ! " change number. Otherwise, it is an error.", "", " -Delta ", " This optioon may be used to specify a particular", *************** *** 150,163 **** "", " -Project ", " This option may be used to select the project of", ! " interest. When no -Project option is specified, if", ! " the user is only working on changes within a single", ! " project, the project name defaults to that project;", ! " if the user is currently working on changes to more", ! " than one project, or is not working on changes to", ! " any project, the user's $HOME/.%src file is", ! " examined for a default project field (see aeuconf(5)", ! " for more information).", "", " -TERse", " This option may be used to cause listings to", --- 160,173 ---- "", " -Project ", " This option may be used to select the project of", ! " interest. When no -Project option is specified, the", ! " AEGIS_PROJECT environment variable is consulted. If", ! " that does not exist, the user's $HOME/.aegisrc file", ! " is examined for a default project field (see", ! " aeuconf(5) for more information). If that does not", ! " exist, when the user is only working on changes", ! " within a single project, the project name defaults", ! " to that project. Otherwise, it is an error.", "", " -TERse", " This option may be used to cause listings to", *************** *** 171,181 **** " option this option causes column headings to be", " added.", "", ! " All options are case insensitive. Options may be", ! " abbreviated; the abbreviation is the upper case letters.", " Options and other command line arguments may be mixed", ! " arbitrarily on the command line.", "", "RECOMMENDED ALIAS", " The recommended alias for this command is", " csh%% alias aecp '%s -cp \\!* -v'", --- 181,209 ---- " option this option causes column headings to be", " added.", "", ! " All options may be abbreviated; the abbreviation is", ! " documented as the upper case letters, all lower case", ! " letters and underscores (_) are optional. You must use", ! " consecutive sequences of optional letters.", ! "", ! " All options are case insensitive, you may type them in", ! " upper case or lower case or a combination of both, case", ! " is not important.", ! "", ! " For example: the arguments \"-project, \"-PROJ\" and \"-p\"", ! " are all interpreted to mean the -Project option. The", ! " argument \"-prj\" will not be understood, because", ! " consecutive optional characters were not supplied.", ! "", " Options and other command line arguments may be mixed", ! " arbitrarily on the command line, after the function", ! " selectors.", "", + " The GNU long option names are understood. Since all", + " option names for aegis are long, this means ignoring the", + " extra leading '-'. The \"--option=value\" convention is", + " also understood.", + "", "RECOMMENDED ALIAS", " The recommended alias for this command is", " csh%% alias aecp '%s -cp \\!* -v'", *************** *** 210,216 **** static void copy_file_list() { ! string_t *project_name; long change_number; trace(("copy_file_list()\n{\n"/*}*/)); --- 238,244 ---- static void copy_file_list() { ! string_ty *project_name; long change_number; trace(("copy_file_list()\n{\n"/*}*/)); *************** *** 260,283 **** static void copy_file_main() { ! string_t *dd; ! string_t *bl; wlist wl; ! string_t *s1; ! string_t *s2; int stomp; cstate cstate_data; pstate pstate_data; int j; pconf pconf_data; ! string_t *project_name; ! project_t *pp; long change_number; ! change_t *cp; int nolog; ! user_t *up; char *output; long delta_number; trace(("copy_file_main()\n{\n"/*}*/)); wl_zero(&wl); --- 288,315 ---- static void copy_file_main() { ! string_ty *id; ! string_ty *dd; ! string_ty *bl; wlist wl; ! string_ty *s1; ! string_ty *s2; int stomp; cstate cstate_data; pstate pstate_data; int j; pconf pconf_data; ! string_ty *project_name; ! project_ty *pp; long change_number; ! change_ty *cp; int nolog; ! user_ty *up; char *output; long delta_number; + string_ty *delta_number_implies_edit_number = 0; + int config_seen; + string_ty *config_name; trace(("copy_file_main()\n{\n"/*}*/)); wl_zero(&wl); *************** *** 311,317 **** case arglex_token_string: s1 = str_from_c(arglex_value.alv_string); os_become_orig(); ! s2 = os_pathname(s1); os_become_undo(); str_free(s1); if (wl_member(&wl, s2)) --- 343,349 ---- case arglex_token_string: s1 = str_from_c(arglex_value.alv_string); os_become_orig(); ! s2 = os_pathname(s1, 1); os_become_undo(); str_free(s1); if (wl_member(&wl, s2)) *************** *** 489,496 **** /* * the delta given was the current baseline, * don't bother with history */ ! delta_number = 0; break; } } --- 521,532 ---- /* * the delta given was the current baseline, * don't bother with history + * + * Except when integrating, + * in which case the integration copy may differ. */ ! if (cstate_data->state != cstate_state_being_integrated) ! delta_number = 0; break; } } *************** *** 501,521 **** * 2. if the file is inside the development directory, ok * 3. if the file is inside the baseline, ok * 4. if neither, error */ for (j = 0; j < wl.wl_nwords; ++j) { s1 = wl.wl_word[j]; assert(s1->str_text[0] == '/'); ! s2 = os_below_dir(change_development_directory_get(cp), s1); if (!s2) ! s2 = os_below_dir(project_baseline_path_get(pp), s1); ! if (!s2 && cstate_data->state == cstate_state_being_integrated) ! s2 = os_below_dir(change_integration_directory_get(cp), s1); if (!s2) change_fatal(cp, "path \"%S\" unrelated", s1); str_free(s1); wl.wl_word[j] = s2; } /* * ensure that each file --- 537,574 ---- * 2. if the file is inside the development directory, ok * 3. if the file is inside the baseline, ok * 4. if neither, error + * + * To cope with automounters, directories are stored as given, + * or are derived from the home directory in the passwd file. + * Within aegis, pathnames have their symbolic links resolved, + * and any comparison of paths is done on this "system idea" + * of the pathname. */ + config_seen = 0; + config_name = str_from_c("config"); + dd = change_development_directory_get(cp, 1); + if (cstate_data->state == cstate_state_being_integrated) + id = change_integration_directory_get(cp, 1); + else + id = 0; + bl = project_baseline_path_get(pp, 1); for (j = 0; j < wl.wl_nwords; ++j) { s1 = wl.wl_word[j]; assert(s1->str_text[0] == '/'); ! s2 = os_below_dir(dd, s1); if (!s2) ! s2 = os_below_dir(bl, s1); ! if (!s2 && id) ! s2 = os_below_dir(id, s1); if (!s2) change_fatal(cp, "path \"%S\" unrelated", s1); str_free(s1); wl.wl_word[j] = s2; + if (str_equal(s2, config_name)) + config_seen++; } + str_free(config_name); /* * ensure that each file *************** *** 561,581 **** * Copy each file into the development directory. * Create any necessary directories along the way. */ - dd = change_development_directory_get(cp); - if (cstate_data->state == cstate_state_being_integrated) - bl = change_integration_directory_get(cp); - else - bl = project_baseline_path_get(pp); for (j = 0; j < wl.wl_nwords; ++j) { ! string_t *from; ! string_t *to; s1 = wl.wl_word[j]; if (delta_number) { - string_t *edit_number; - /* * find the edit number, * given fie file name and delta number --- 614,627 ---- * Copy each file into the development directory. * Create any necessary directories along the way. */ for (j = 0; j < wl.wl_nwords; ++j) { ! string_ty *from; ! string_ty *to; s1 = wl.wl_word[j]; if (delta_number) { /* * find the edit number, * given fie file name and delta number *************** *** 583,591 **** * NULL returned means that the file * does not exist at the given delta. */ ! edit_number = project_delta_to_edit(pp, delta_number, s1); ! if (edit_number) { /* * make a temporary file --- 629,637 ---- * NULL returned means that the file * does not exist at the given delta. */ ! delta_number_implies_edit_number = project_delta_to_edit(pp, delta_number, s1); ! if (delta_number_implies_edit_number) { /* * make a temporary file *************** *** 608,614 **** ( cp, s1, ! edit_number, from, up ); --- 654,660 ---- ( cp, s1, ! delta_number_implies_edit_number, from, up ); *************** *** 635,645 **** /* * clean up afterwards */ ! if (edit_number) ! { ! str_free(edit_number); os_unlink_errok(from); - } user_become_undo(); str_free(from); str_free(to); --- 681,688 ---- /* * clean up afterwards */ ! if (delta_number_implies_edit_number) os_unlink_errok(from); user_become_undo(); str_free(from); str_free(to); *************** *** 646,652 **** } else { ! from = str_format("%S/%S", bl, s1); if (output) to = str_from_c(output); else --- 689,698 ---- } else { ! if (id) ! from = str_format("%S/%S", id, s1); ! else ! from = str_format("%S/%S", bl, s1); if (output) to = str_from_c(output); else *************** *** 707,713 **** else str_free(c_src_data->edit_number); assert(p_src_data->edit_number); ! c_src_data->edit_number = str_copy(p_src_data->edit_number); } /* --- 753,766 ---- else str_free(c_src_data->edit_number); assert(p_src_data->edit_number); ! if (delta_number_implies_edit_number) ! c_src_data->edit_number = ! delta_number_implies_edit_number; ! else ! c_src_data->edit_number = ! str_copy(p_src_data->edit_number); ! if (config_seen) ! c_src_data->diff_time = 0; } /* *************** *** 828,841 **** " confuse tools such as make(1) by leaving these files in", " place.", "", "OPTIONS", " The following options are understood:", "", " -Change ", " This option may be used to specify a particular", ! " change within a project. If the user is only", ! " working on one change within a project, that is", ! " the default change number.", "", " -Help", " This option may be used to obtain more", --- 881,904 ---- " confuse tools such as make(1) by leaving these files in", " place.", "", + " This command will cancel any build or test registrations,", + " because deleting a file logically invalidates them. If the", + " config file was deleted, any diff registration will also be", + " cancelled.", + "", "OPTIONS", " The following options are understood:", "", " -Change ", " This option may be used to specify a particular", ! " change within a project. When no -Change option is", ! " specified, the AEGIS_CHANGE environment variable is", ! " consulted. If that does not exist, the user's", ! " $HOME/.aegisrc file is examined for a default change", ! " field (see aeuconf(5) for more information). If", ! " that does not exist, when the user is only working", ! " on one change within a project, that is the default", ! " change number. Otherwise, it is an error.", "", " -Help", " This option may be used to obtain more", *************** *** 848,861 **** "", " -Project ", " This option may be used to select the project of", ! " interest. When no -Project option is specified, if", ! " the user is only working on changes within a single", ! " project, the project name defaults to that project;", ! " if the user is currently working on changes to more", ! " than one project, or is not working on changes to", ! " any project, the user's $HOME/.%src file is", ! " examined for a default project field (see aeuconf(5)", ! " for more information).", "", " -TERse", " This option may be used to cause listings to", --- 911,924 ---- "", " -Project ", " This option may be used to select the project of", ! " interest. When no -Project option is specified, the", ! " AEGIS_PROJECT environment variable is consulted. If", ! " that does not exist, the user's $HOME/.aegisrc file", ! " is examined for a default project field (see", ! " aeuconf(5) for more information). If that does not", ! " exist, when the user is only working on changes", ! " within a single project, the project name defaults", ! " to that project. Otherwise, it is an error.", "", " -TERse", " This option may be used to cause listings to", *************** *** 869,879 **** " option this option causes column headings to be", " added.", "", ! " All options are case insensitive. Options may be", ! " abbreviated; the abbreviation is the upper case letters.", " Options and other command line arguments may be mixed", ! " arbitrarily on the command line.", "", "RECOMMENDED ALIAS", " The recommended alias for this command is", " csh%% alias aecpu '%s -cpu \\!* -v'", --- 932,960 ---- " option this option causes column headings to be", " added.", "", ! " All options may be abbreviated; the abbreviation is", ! " documented as the upper case letters, all lower case", ! " letters and underscores (_) are optional. You must use", ! " consecutive sequences of optional letters.", ! "", ! " All options are case insensitive, you may type them in", ! " upper case or lower case or a combination of both, case", ! " is not important.", ! "", ! " For example: the arguments \"-project, \"-PROJ\" and \"-p\"", ! " are all interpreted to mean the -Project option. The", ! " argument \"-prj\" will not be understood, because", ! " consecutive optional characters were not supplied.", ! "", " Options and other command line arguments may be mixed", ! " arbitrarily on the command line, after the function", ! " selectors.", "", + " The GNU long option names are understood. Since all", + " option names for aegis are long, this means ignoring the", + " extra leading '-'. The \"--option=value\" convention is", + " also understood.", + "", "RECOMMENDED ALIAS", " The recommended alias for this command is", " csh%% alias aecpu '%s -cpu \\!* -v'", *************** *** 906,912 **** static void copy_file_undo_list() { ! string_t *project_name; long change_number; trace(("copy_file_undo_list()\n{\n"/*}*/)); --- 987,993 ---- static void copy_file_undo_list() { ! string_ty *project_name; long change_number; trace(("copy_file_undo_list()\n{\n"/*}*/)); *************** *** 960,975 **** cstate cstate_data; pstate pstate_data; int j; ! string_t *s1; ! string_t *s2; int keep; pconf pconf_data; ! string_t *project_name; ! project_t *pp; long change_number; ! change_t *cp; int nolog; ! user_t *up; trace(("copy_file_undo_main()\n{\n"/*}*/)); wl_zero(&wl); --- 1041,1058 ---- cstate cstate_data; pstate pstate_data; int j; ! string_ty *s1; ! string_ty *s2; int keep; pconf pconf_data; ! string_ty *project_name; ! project_ty *pp; long change_number; ! change_ty *cp; int nolog; ! user_ty *up; ! int config_seen; ! string_ty *config_name; trace(("copy_file_undo_main()\n{\n"/*}*/)); wl_zero(&wl); *************** *** 988,994 **** case arglex_token_string: s1 = str_from_c(arglex_value.alv_string); os_become_orig(); ! s2 = os_pathname(s1); os_become_undo(); str_free(s1); if (wl_member(&wl, s2)) --- 1071,1077 ---- case arglex_token_string: s1 = str_from_c(arglex_value.alv_string); os_become_orig(); ! s2 = os_pathname(s1, 1); os_become_undo(); str_free(s1); if (wl_member(&wl, s2)) *************** *** 1092,1109 **** * 3. if the file is inside the baseline, ok * 4. if neither, error */ for (j = 0; j < wl.wl_nwords; ++j) { s1 = wl.wl_word[j]; assert(s1->str_text[0] == '/'); ! s2 = os_below_dir(cstate_data->development_directory, s1); if (!s2) ! s2 = os_below_dir(project_baseline_path_get(pp), s1); if (!s2) change_fatal(cp, "path \"%S\" unrelated", s1); str_free(s1); wl.wl_word[j] = s2; } /* * ensure that each file --- 1175,1197 ---- * 3. if the file is inside the baseline, ok * 4. if neither, error */ + config_seen = 0; + config_name = str_from_c("config"); for (j = 0; j < wl.wl_nwords; ++j) { s1 = wl.wl_word[j]; assert(s1->str_text[0] == '/'); ! s2 = os_below_dir(change_development_directory_get(cp, 1), s1); if (!s2) ! s2 = os_below_dir(project_baseline_path_get(pp, 1), s1); if (!s2) change_fatal(cp, "path \"%S\" unrelated", s1); str_free(s1); wl.wl_word[j] = s2; + if (str_equal(s2, config_name)) + config_seen++; } + str_free(config_name); /* * ensure that each file *************** *** 1120,1125 **** --- 1208,1215 ---- change_fatal(cp, "file \"%S\" not in change", s1); if (src_data->action != file_action_modify) change_fatal(cp, "file \"%S\" is not -CoPy_file", s1); + if (config_seen) + src_data->diff_time = 0; } /* *************** *** 1129,1137 **** */ if (!keep) { ! string_t *dd; ! dd = change_development_directory_get(cp); user_become(up); for (j = 0; j < wl.wl_nwords; ++j) { --- 1219,1227 ---- */ if (!keep) { ! string_ty *dd; ! dd = change_development_directory_get(cp, 1); user_become(up); for (j = 0; j < wl.wl_nwords; ++j) { *************** *** 1146,1152 **** commit_unlink_errok(s2); str_free(s2); } ! os_become_undo(); } /* --- 1236,1242 ---- commit_unlink_errok(s2); str_free(s2); } ! user_become_undo(); } /* Index: aegis/copyfile.h *************** *** 1,12 **** /* * aegis - project change supervisor ! * Copyright (c) 1991-1992 Peter Miller. * All rights reserved. * * 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 1, 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 --- 1,12 ---- /* * aegis - project change supervisor ! * Copyright (C) 1991, 1992, 1993 Peter Miller. * All rights reserved. * * 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 Index: aegis/cstate.def *************** *** 1,12 **** /* * aegis - project change supervisor ! * Copyright (c) 1991-1992 Peter Miller. * All rights reserved. * * 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 1, 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 --- 1,12 ---- /* * aegis - project change supervisor ! * Copyright (C) 1991, 1992, 1993 Peter Miller. * All rights reserved. * * 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 Index: aegis/develop1.c *************** *** 1,12 **** /* * aegis - project change supervisor ! * Copyright (c) 1991-1992 Peter Miller. * All rights reserved. * * 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 1, 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 --- 1,12 ---- /* * aegis - project change supervisor ! * Copyright (C) 1991, 1992, 1993 Peter Miller. * All rights reserved. * * 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 *************** *** 86,99 **** "", " -Project ", " This option may be used to select the project of", ! " interest. When no -Project option is specified, if", ! " the user is only working on changes within a single", ! " project, the project name defaults to that project;", ! " if the user is currently working on changes to more", ! " than one project, or is not working on changes to", ! " any project, the user's $HOME/.%src file is", ! " examined for a default project field (see aeuconf(5)", ! " for more information).", "", " -TERse", " This option may be used to cause listings to", --- 86,99 ---- "", " -Project ", " This option may be used to select the project of", ! " interest. When no -Project option is specified, the", ! " AEGIS_PROJECT environment variable is consulted. If", ! " that does not exist, the user's $HOME/.aegisrc file", ! " is examined for a default project field (see", ! " aeuconf(5) for more information). If that does not", ! " exist, when the user is only working on changes", ! " within a single project, the project name defaults", ! " to that project. Otherwise, it is an error.", "", " -TERse", " This option may be used to cause listings to", *************** *** 107,117 **** " option this option causes column headings to be", " added.", "", ! " All options are case insensitive. Options may be", ! " abbreviated; the abbreviation is the upper case letters.", " Options and other command line arguments may be mixed", ! " arbitrarily on the command line.", "", "RECOMMENDED ALIAS", " The recommended alias for this command is", " csh%% alias aend '%s -nd \\!* -v'", --- 107,135 ---- " option this option causes column headings to be", " added.", "", ! " All options may be abbreviated; the abbreviation is", ! " documented as the upper case letters, all lower case", ! " letters and underscores (_) are optional. You must use", ! " consecutive sequences of optional letters.", ! "", ! " All options are case insensitive, you may type them in", ! " upper case or lower case or a combination of both, case", ! " is not important.", ! "", ! " For example: the arguments \"-project, \"-PROJ\" and \"-p\"", ! " are all interpreted to mean the -Project option. The", ! " argument \"-prj\" will not be understood, because", ! " consecutive optional characters were not supplied.", ! "", " Options and other command line arguments may be mixed", ! " arbitrarily on the command line, after the function", ! " selectors.", "", + " The GNU long option names are understood. Since all", + " option names for aegis are long, this means ignoring the", + " extra leading '-'. The \"--option=value\" convention is", + " also understood.", + "", "RECOMMENDED ALIAS", " The recommended alias for this command is", " csh%% alias aend '%s -nd \\!* -v'", *************** *** 143,149 **** developer_list(usage) void (*usage)_((void)); { ! string_t *project_name; trace(("developer_list()\n{\n"/*}*/)); arglex(); --- 161,167 ---- developer_list(usage) void (*usage)_((void)); { ! string_ty *project_name; trace(("developer_list()\n{\n"/*}*/)); arglex(); *************** *** 177,188 **** new_developer_main() { wlist wl; ! string_t *s1; pstate pstate_data; int j; ! string_t *project_name; ! project_t *pp; ! user_t *up; trace(("new_developer_main()\n{\n"/*}*/)); wl_zero(&wl); --- 195,206 ---- new_developer_main() { wlist wl; ! string_ty *s1; pstate pstate_data; int j; ! string_ty *project_name; ! project_ty *pp; ! user_ty *up; trace(("new_developer_main()\n{\n"/*}*/)); wl_zero(&wl); *************** *** 255,261 **** */ for (j = 0; j < wl.wl_nwords; ++j) { ! user_t *candidate; /* * make sure the user isn't already there --- 273,279 ---- */ for (j = 0; j < wl.wl_nwords; ++j) { ! user_ty *candidate; /* * make sure the user isn't already there *************** *** 388,401 **** "", " -Project ", " This option may be used to select the project of", ! " interest. When no -Project option is specified, if", ! " the user is only working on changes within a single", ! " project, the project name defaults to that project;", ! " if the user is currently working on changes to more", ! " than one project, or is not working on changes to", ! " any project, the user's $HOME/.%src file is", ! " examined for a default project field (see aeuconf(5)", ! " for more information).", "", " -TERse", " This option may be used to cause listings to", --- 406,419 ---- "", " -Project ", " This option may be used to select the project of", ! " interest. When no -Project option is specified, the", ! " AEGIS_PROJECT environment variable is consulted. If", ! " that does not exist, the user's $HOME/.aegisrc file", ! " is examined for a default project field (see", ! " aeuconf(5) for more information). If that does not", ! " exist, when the user is only working on changes", ! " within a single project, the project name defaults", ! " to that project. Otherwise, it is an error.", "", " -TERse", " This option may be used to cause listings to", *************** *** 409,419 **** " option this option causes column headings to be", " added.", "", ! " All options are case insensitive. Options may be", ! " abbreviated; the abbreviation is the upper case letters.", " Options and other command line arguments may be mixed", ! " arbitrarily on the command line.", "", "RECOMMENDED ALIAS", " The recommended alias for this command is", " csh%% alias aerd '%s -rd \\!* -v'", --- 427,455 ---- " option this option causes column headings to be", " added.", "", ! " All options may be abbreviated; the abbreviation is", ! " documented as the upper case letters, all lower case", ! " letters and underscores (_) are optional. You must use", ! " consecutive sequences of optional letters.", ! "", ! " All options are case insensitive, you may type them in", ! " upper case or lower case or a combination of both, case", ! " is not important.", ! "", ! " For example: the arguments \"-project, \"-PROJ\" and \"-p\"", ! " are all interpreted to mean the -Project option. The", ! " argument \"-prj\" will not be understood, because", ! " consecutive optional characters were not supplied.", ! "", " Options and other command line arguments may be mixed", ! " arbitrarily on the command line, after the function", ! " selectors.", "", + " The GNU long option names are understood. Since all", + " option names for aegis are long, this means ignoring the", + " extra leading '-'. The \"--option=value\" convention is", + " also understood.", + "", "RECOMMENDED ALIAS", " The recommended alias for this command is", " csh%% alias aerd '%s -rd \\!* -v'", *************** *** 445,456 **** remove_developer_main() { wlist wl; ! string_t *s1; pstate pstate_data; int j; ! string_t *project_name; ! project_t *pp; ! user_t *up; trace(("remove_developer_main()\n{\n"/*}*/)); wl_zero(&wl); --- 481,492 ---- remove_developer_main() { wlist wl; ! string_ty *s1; pstate pstate_data; int j; ! string_ty *project_name; ! project_ty *pp; ! user_ty *up; trace(("remove_developer_main()\n{\n"/*}*/)); wl_zero(&wl); *************** *** 523,529 **** */ for (j = 0; j < wl.wl_nwords; ++j) { ! user_t *candidate; candidate = user_symbolic(pp, wl.wl_word[j]); if (!project_developer_query(pp, user_name(candidate))) --- 559,565 ---- */ for (j = 0; j < wl.wl_nwords; ++j) { ! user_ty *candidate; candidate = user_symbolic(pp, wl.wl_word[j]); if (!project_developer_query(pp, user_name(candidate))) Index: aegis/develop1.h *************** *** 1,12 **** /* * aegis - project change supervisor ! * Copyright (c) 1991-1992 Peter Miller. * All rights reserved. * * 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 1, 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 --- 1,12 ---- /* * aegis - project change supervisor ! * Copyright (C) 1991, 1992, 1993 Peter Miller. * All rights reserved. * * 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 Index: aegis/develop2.c *************** *** 1,12 **** /* * aegis - project change supervisor ! * Copyright (c) 1991-1992 Peter Miller. * All rights reserved. * * 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 1, 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 --- 1,12 ---- /* * aegis - project change supervisor ! * Copyright (C) 1991, 1992, 1993 Peter Miller. * All rights reserved. * * 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 *************** *** 83,98 **** "", " The development directory for the change will be created", " automatically; below the directory specified in the", ! " default_development_directory of aeuconf(5), or if not set", ! " below the directory specified in the", ! " default_development_directory of aepattr(5), or if not set", ! " below the current user's home directory. It is rare to need", ! " to know the exact pathname of the development directory, as", ! " the aecd(1) command can take you there at any time.", "", " Successful execution of this command will move the", ! " specified change from the 'awaiting_development' state to", ! " the 'being_developed' state.", "", "OPTIONS", " The following options are understood:", --- 83,99 ---- "", " The development directory for the change will be created", " automatically; below the directory specified in the", ! " default_development_directory field of aeuconf(5), or if", ! " not set below the directory specified in the default_-", ! " development_directory field of aepattr(5), or if not set", ! " below the current user's home directory. It is rare to", ! " need to know the exact pathname of the development", ! " directory, as the aecd(1) command can take you there at", ! " any time.", "", " Successful execution of this command will move the", ! " specified change from the awaiting development state to", ! " the being developed state.", "", "OPTIONS", " The following options are understood:", *************** *** 99,117 **** "", " -Change ", " This option may be used to specify a particular", ! " change within a project. If the user is only", ! " working on one change within a project, that is", ! " the default change number.", "", " -DIRectory ", ! " This option may be used to specify which", ! " directory is to be used. It is an error if the", ! " current user does not have appropriate", ! " permissions to create the directory path given.", "", " -Help", ! " This option may be used to obtain more", ! " information about how to use the %s program.", "", " -List", " This option may be used to obtain a list of", --- 100,129 ---- "", " -Change ", " This option may be used to specify a particular", ! " change within a project. When no -Change option", ! " is specified, the AEGIS_CHANGE environment", ! " variable is consulted. If that does not exist,", ! " the user's $HOME/.%src file is examined for a", ! " default change field (see aeuconf(5) for more", ! " information). If that does not exist, when the", ! " user is only working on one change within a", ! " project, that is the default change number.", ! " Otherwise, it is an error.", "", " -DIRectory ", ! " This option may be used to specify which directory", ! " is to be used. It is an error if the current user", ! " does not have appropriate permissions to create", ! " the directory path given. This must be an", ! " absolute path.", "", + " Caution: If you are using an automounter do not", + " use `pwd` to make an absolute path, it usually", + " gives the wrong answer.", + "", " -Help", ! " This option may be used to obtain more information", ! " about how to use the %s program.", "", " -List", " This option may be used to obtain a list of", *************** *** 120,133 **** "", " -Project ", " This option may be used to select the project of", ! " interest. When no -Project option is specified, if", ! " the user is only working on changes within a single", ! " project, the project name defaults to that project;", ! " if the user is currently working on changes to more", ! " than one project, or is not working on changes to", ! " any project, the user's $HOME/.%src file is", ! " examined for a default project field (see aeuconf(5)", ! " for more information).", "", " -TERse", " This option may be used to cause listings to", --- 132,146 ---- "", " -Project ", " This option may be used to select the project of", ! " interest. When no -Project option is specified,", ! " the AEGIS_PROJECT environment variable is", ! " consulted. If that does not exist, the user's", ! " $HOME/.%src file is examined for a default", ! " project field (see aeuconf(5) for more", ! " information). If that does not exist, when the", ! " user is only working on changes within a single", ! " project, the project name defaults to that", ! " project. Otherwise, it is an error.", "", " -TERse", " This option may be used to cause listings to", *************** *** 137,151 **** " -Verbose", " This option may be used to cause %s to produce", " more output. By default %s only produces", ! " output on errors. When used with the -List", ! " option this option causes column headings to be", ! " added.", "", ! " All options are case insensitive. Options may be", ! " abbreviated; the abbreviation is the upper case letters.", " Options and other command line arguments may be mixed", ! " arbitrarily on the command line.", "", "RECOMMENDED ALIAS", " The recommended alias for this command is", " csh%% alias aedb '%s -db \\!* -v'", --- 150,181 ---- " -Verbose", " This option may be used to cause %s to produce", " more output. By default %s only produces", ! " output on errors. When used with the -List option", ! " this option causes column headings to be added.", "", ! " All options may be abbreviated; the abbreviation is", ! " documented as the upper case letters, all lower case", ! " letters and underscores (_) are optional. You must use", ! " consecutive sequences of optional letters.", ! "", ! " All options are case insensitive, you may type them in", ! " upper case or lower case or a combination of both, case", ! " is not important.", ! "", ! " For example: the arguments \"-project, \"-PROJ\" and \"-p\"", ! " are all interpreted to mean the -Project option. The", ! " argument \"-prj\" will not be understood, because", ! " consecutive optional characters were not supplied.", ! "", " Options and other command line arguments may be mixed", ! " arbitrarily on the command line, after the function", ! " selectors.", "", + " The GNU long option names are understood. Since all", + " option names for aegis are long, this means ignoring the", + " extra leading '-'. The \"--option=value\" convention is", + " also understood.", + "", "RECOMMENDED ALIAS", " The recommended alias for this command is", " csh%% alias aedb '%s -db \\!* -v'", *************** *** 153,166 **** "", "ERRORS", " It is an error if the change does not exist.", ! " It is an error if the change is not in the", ! " 'awaiting_development' state.", " It is an error if the current user is not a developer of", " the specified project.", "", "EXIT STATUS", " The %s command will exit with a status of 1 on any", ! " error. The %s command will only exit with a status of", " 0 if there are no errors.", "", "COPYRIGHT", --- 183,196 ---- "", "ERRORS", " It is an error if the change does not exist.", ! " It is an error if the change is not in the awaiting", ! " development state.", " It is an error if the current user is not a developer of", " the specified project.", "", "EXIT STATUS", " The %s command will exit with a status of 1 on any", ! " error. The %s command will only exit with a status of", " 0 if there are no errors.", "", "COPYRIGHT", *************** *** 179,185 **** static void develop_begin_list() { ! string_t *project_name; trace(("develop_begin_list()\n{\n"/*}*/)); project_name = 0; --- 209,215 ---- static void develop_begin_list() { ! string_ty *project_name; trace(("develop_begin_list()\n{\n"/*}*/)); project_name = 0; *************** *** 224,236 **** cstate cstate_data; pstate pstate_data; cstate_history history_data; ! string_t *devdir; ! string_t *s2; ! string_t *project_name; ! project_t *pp; long change_number; ! change_t *cp; ! user_t *up; trace(("develop_begin_main()\n{\n"/*}*/)); project_name = 0; --- 254,266 ---- cstate cstate_data; pstate pstate_data; cstate_history history_data; ! string_ty *devdir; ! string_ty *s2; ! string_ty *project_name; ! project_ty *pp; long change_number; ! change_ty *cp; ! user_ty *up; trace(("develop_begin_main()\n{\n"/*}*/)); project_name = 0; *************** *** 262,272 **** develop_begin_usage(); if (devdir) fatal("duplicate -DIRectory option"); ! s2 = str_from_c(arglex_value.alv_string); ! os_become_orig(); ! devdir = os_pathname(s2); ! os_become_undo(); ! str_free(s2); break; case arglex_token_project: --- 292,305 ---- develop_begin_usage(); if (devdir) fatal("duplicate -DIRectory option"); ! /* ! * To cope with automounters, directories are stored as ! * given, or are derived from the home directory in the ! * passwd file. Within aegis, pathnames have their ! * symbolic links resolved, and any comparison of paths ! * is done on this "system idea" of the pathname. ! */ ! devdir = str_from_c(arglex_value.alv_string); break; case arglex_token_project: *************** *** 371,377 **** ); str_free(s2); } - assert(!cstate_data->development_directory); change_development_directory_set(cp, devdir); /* --- 404,409 ---- *************** *** 380,386 **** user_become(up); os_mkdir(devdir, 02755); undo_rmdir_errok(devdir); ! os_become_undo(); change_verbose(cp, "development directory \"%S\"", devdir); /* --- 412,418 ---- user_become(up); os_mkdir(devdir, 02755); undo_rmdir_errok(devdir); ! user_become_undo(); change_verbose(cp, "development directory \"%S\"", devdir); /* *************** *** 477,485 **** "", " -Change ", " This option may be used to specify a particular", ! " change within a project. If the user is only", ! " working on one change within a project, that is", ! " the default change number.", "", " -Help", " This option may be used to obtain more", --- 509,522 ---- "", " -Change ", " This option may be used to specify a particular", ! " change within a project. When no -Change option is", ! " specified, the AEGIS_CHANGE environment variable is", ! " consulted. If that does not exist, the user's", ! " $HOME/.aegisrc file is examined for a default change", ! " field (see aeuconf(5) for more information). If", ! " that does not exist, when the user is only working", ! " on one change within a project, that is the default", ! " change number. Otherwise, it is an error.", "", " -Help", " This option may be used to obtain more", *************** *** 496,509 **** "", " -Project ", " This option may be used to select the project of", ! " interest. When no -Project option is specified, if", ! " the user is only working on changes within a single", ! " project, the project name defaults to that project;", ! " if the user is currently working on changes to more", ! " than one project, or is not working on changes to", ! " any project, the user's $HOME/.%src file is", ! " examined for a default project field (see aeuconf(5)", ! " for more information).", "", " -TERse", " This option may be used to cause listings to", --- 533,546 ---- "", " -Project ", " This option may be used to select the project of", ! " interest. When no -Project option is specified, the", ! " AEGIS_PROJECT environment variable is consulted. If", ! " that does not exist, the user's $HOME/.aegisrc file", ! " is examined for a default project field (see", ! " aeuconf(5) for more information). If that does not", ! " exist, when the user is only working on changes", ! " within a single project, the project name defaults", ! " to that project. Otherwise, it is an error.", "", " -TERse", " This option may be used to cause listings to", *************** *** 517,527 **** " option this option causes column headings to be", " added.", "", ! " All options are case insensitive. Options may be", ! " abbreviated; the abbreviation is the upper case letters.", " Options and other command line arguments may be mixed", ! " arbitrarily on the command line.", "", "RECOMMENDED ALIAS", " The recommended alias for this command is", " csh%% alias aedbu '%s -dbu \\!* -v'", --- 554,582 ---- " option this option causes column headings to be", " added.", "", ! " All options may be abbreviated; the abbreviation is", ! " documented as the upper case letters, all lower case", ! " letters and underscores (_) are optional. You must use", ! " consecutive sequences of optional letters.", ! "", ! " All options are case insensitive, you may type them in", ! " upper case or lower case or a combination of both, case", ! " is not important.", ! "", ! " For example: the arguments \"-project, \"-PROJ\" and \"-p\"", ! " are all interpreted to mean the -Project option. The", ! " argument \"-prj\" will not be understood, because", ! " consecutive optional characters were not supplied.", ! "", " Options and other command line arguments may be mixed", ! " arbitrarily on the command line, after the function", ! " selectors.", "", + " The GNU long option names are understood. Since all", + " option names for aegis are long, this means ignoring the", + " extra leading '-'. The \"--option=value\" convention is", + " also understood.", + "", "RECOMMENDED ALIAS", " The recommended alias for this command is", " csh%% alias aedbu '%s -dbu \\!* -v'", *************** *** 554,560 **** static void develop_begin_undo_list() { ! string_t *project_name; trace(("develop_begin_undo_list()\n{\n"/*}*/)); project_name = 0; --- 609,615 ---- static void develop_begin_undo_list() { ! string_ty *project_name; trace(("develop_begin_undo_list()\n{\n"/*}*/)); project_name = 0; *************** *** 596,603 **** static void develop_begin_undo_main() { trace(("develop_begin_undo_main()\n{\n"/*}*/)); ! fatal("develop_begin_undo not implememted"); trace((/*{*/"}\n")); } --- 651,830 ---- static void develop_begin_undo_main() { + string_ty *project_name; + long change_number; + int keep; + project_ty *pp; + user_ty *up; + change_ty *cp; + pstate pstate_data; + cstate cstate_data; + cstate_history history_data; + trace(("develop_begin_undo_main()\n{\n"/*}*/)); ! project_name = 0; ! change_number = 0; ! keep = 0; ! while (arglex_token != arglex_token_eoln) ! { ! switch (arglex_token) ! { ! default: ! generic_argument(develop_begin_undo_usage); ! continue; ! ! case arglex_token_keep: ! if (keep) ! { ! fatal ! ( ! "duplicate %s option", ! arglex_value.alv_string ! ); ! } ! keep++; ! break; ! ! case arglex_token_change: ! if (arglex() != arglex_token_number) ! develop_begin_undo_usage(); ! /* fall through... */ ! ! case arglex_token_number: ! if (change_number) ! fatal("duplicate -Change option"); ! change_number = arglex_value.alv_number; ! if (change_number < 1) ! fatal("change %ld out of range", change_number); ! break; ! ! case arglex_token_project: ! if (arglex() != arglex_token_string) ! develop_begin_undo_usage(); ! /* fall through... */ ! ! case arglex_token_string: ! if (project_name) ! fatal("duplicate -Project option"); ! project_name = str_from_c(arglex_value.alv_string); ! break; ! } ! arglex(); ! } ! ! /* ! * locate project data ! */ ! if (!project_name) ! project_name = user_default_project(); ! pp = project_alloc(project_name); ! str_free(project_name); ! project_bind_existing(pp); ! ! /* ! * locate user data ! */ ! up = user_executing(pp); ! ! /* ! * locate change data ! */ ! if (!change_number) ! change_number = user_default_change(up); ! cp = change_alloc(pp, change_number); ! change_bind_existing(cp); ! ! /* ! * Take an advisory write lock on the appropriate row of the change ! * table. Take an advisory write lock on the appropriate row of the ! * user table. Block until can get both simultaneously. ! */ ! project_pstate_lock_prepare(pp); ! change_cstate_lock_prepare(cp); ! user_ustate_lock_prepare(up); ! lock_take(); ! cstate_data = change_cstate_get(cp); ! pstate_data = project_pstate_get(pp); ! ! /* ! * It is an error if the change is not in the being developed state. ! * It is an error if the change is not assigned to the current user. ! */ ! if (cstate_data->state != cstate_state_being_developed) ! change_fatal(cp, "not in 'being_developed' state"); ! if (!str_equal(change_developer_name(cp), user_name(up))) ! { ! change_fatal ! ( ! cp, ! "user \"%S\" is not the developer", ! user_name(up) ! ); ! } ! ! /* ! * add to history for state change ! */ ! history_data = change_history_new(cp, up); ! history_data->what = cstate_history_what_develop_begin_undo; ! ! /* ! * Send the change to the awaiting-development state. ! * Clear the build-time field. ! * Clear the test-time field. ! * Clear the test-baseline-time field. ! * Clear the src field. ! */ ! cstate_data->state = cstate_state_awaiting_development; ! cstate_data->build_time = 0; ! cstate_data->test_time = 0; ! cstate_data->test_baseline_time = 0; ! while (cstate_data->src->length) ! change_src_remove(cp, cstate_data->src->list[0]->file_name); ! ! /* ! * Remove the change from the list of assigned changes in the user ! * change table (in the user row). ! */ ! user_own_remove(up, project_name_get(pp), change_number); ! ! /* ! * remove the development directory ! */ ! if (!keep) ! { ! string_ty *dd; ! ! change_verbose(cp, "remove development directory"); ! dd = change_development_directory_get(cp, 1); ! change_become(cp); ! commit_rmdir_tree_errok(dd); ! change_become_undo(); ! } ! ! /* ! * clear development directory field ! */ ! change_development_directory_clear(cp); ! ! /* ! * Write the change table row. ! * Write the user table row. ! * Release advisory locks. ! */ ! change_cstate_write(cp); ! project_pstate_write(pp); ! user_ustate_write(up); ! commit(); ! lock_release(); ! ! /* ! * verbose success message ! */ ! change_verbose(cp, "no longer being developed"); ! change_free(cp); ! project_free(pp); ! user_free(up); trace((/*{*/"}\n")); } *************** *** 676,684 **** "", " -Change ", " This option may be used to specify a particular", ! " change within a project. If the user is only", ! " working on one change within a project, that is", ! " the default change number.", "", " -Help", " This option may be used to obtain more", --- 903,916 ---- "", " -Change ", " This option may be used to specify a particular", ! " change within a project. When no -Change option is", ! " specified, the AEGIS_CHANGE environment variable is", ! " consulted. If that does not exist, the user's", ! " $HOME/.aegisrc file is examined for a default change", ! " field (see aeuconf(5) for more information). If", ! " that does not exist, when the user is only working", ! " on one change within a project, that is the default", ! " change number. Otherwise, it is an error.", "", " -Help", " This option may be used to obtain more", *************** *** 691,704 **** "", " -Project ", " This option may be used to select the project of", ! " interest. When no -Project option is specified, if", ! " the user is only working on changes within a single", ! " project, the project name defaults to that project;", ! " if the user is currently working on changes to more", ! " than one project, or is not working on changes to", ! " any project, the user's $HOME/.%src file is", ! " examined for a default project field (see aeuconf(5)", ! " for more information).", "", " -TERse", " This option may be used to cause listings to", --- 923,936 ---- "", " -Project ", " This option may be used to select the project of", ! " interest. When no -Project option is specified, the", ! " AEGIS_PROJECT environment variable is consulted. If", ! " that does not exist, the user's $HOME/.aegisrc file", ! " is examined for a default project field (see", ! " aeuconf(5) for more information). If that does not", ! " exist, when the user is only working on changes", ! " within a single project, the project name defaults", ! " to that project. Otherwise, it is an error.", "", " -TERse", " This option may be used to cause listings to", *************** *** 712,722 **** " option this option causes column headings to be", " added.", "", ! " All options are case insensitive. Options may be", ! " abbreviated; the abbreviation is the upper case letters.", " Options and other command line arguments may be mixed", ! " arbitrarily on the command line.", "", "RECOMMENDED ALIAS", " The recommended alias for this command is", " csh%% alias aede '%s -de \\!* -v'", --- 944,972 ---- " option this option causes column headings to be", " added.", "", ! " All options may be abbreviated; the abbreviation is", ! " documented as the upper case letters, all lower case", ! " letters and underscores (_) are optional. You must use", ! " consecutive sequences of optional letters.", ! "", ! " All options are case insensitive, you may type them in", ! " upper case or lower case or a combination of both, case", ! " is not important.", ! "", ! " For example: the arguments \"-project, \"-PROJ\" and \"-p\"", ! " are all interpreted to mean the -Project option. The", ! " argument \"-prj\" will not be understood, because", ! " consecutive optional characters were not supplied.", ! "", " Options and other command line arguments may be mixed", ! " arbitrarily on the command line, after the function", ! " selectors.", "", + " The GNU long option names are understood. Since all", + " option names for aegis are long, this means ignoring the", + " extra leading '-'. The \"--option=value\" convention is", + " also understood.", + "", "RECOMMENDED ALIAS", " The recommended alias for this command is", " csh%% alias aede '%s -de \\!* -v'", *************** *** 758,764 **** static void develop_end_list() { ! string_t *project_name; trace(("develop_end_list()\n{\n"/*}*/)); project_name = 0; --- 1008,1014 ---- static void develop_end_list() { ! string_ty *project_name; trace(("develop_end_list()\n{\n"/*}*/)); project_name = 0; *************** *** 795,812 **** } ! static void repair_diff_time _((change_t *, string_t *)); static void repair_diff_time(cp, path) ! change_t *cp; ! string_t *path; { ! string_t *s; cstate_src src_data; ! string_t *s2; ! s = os_below_dir(change_development_directory_get(cp), path); src_data = change_src_find(cp, s); if (src_data) src_data->diff_time = os_mtime(path); --- 1045,1062 ---- } ! static void repair_diff_time _((change_ty *, string_ty *)); static void repair_diff_time(cp, path) ! change_ty *cp; ! string_ty *path; { ! string_ty *s; cstate_src src_data; ! string_ty *s2; ! s = os_below_dir(change_development_directory_get(cp, 1), path); src_data = change_src_find(cp, s); if (src_data) src_data->diff_time = os_mtime(path); *************** *** 830,850 **** } ! static void de_func _((void *, dir_walk_message_t, string_t *, struct stat *)); static void de_func(arg, message, path, st) void *arg; ! dir_walk_message_t message; ! string_t *path; struct stat *st; { ! change_t *cp; int uid; trace(("de_func(message = %d, path = \"%s\", st = %08lX)\n{\n"/*}*/, message, path->str_text, st)); ! cp = (change_t *)arg; switch (message) { case dir_walk_file: --- 1080,1100 ---- } ! static void de_func _((void *, dir_walk_message_ty, string_ty *, struct stat *)); static void de_func(arg, message, path, st) void *arg; ! dir_walk_message_ty message; ! string_ty *path; struct stat *st; { ! change_ty *cp; int uid; trace(("de_func(message = %d, path = \"%s\", st = %08lX)\n{\n"/*}*/, message, path->str_text, st)); ! cp = (change_ty *)arg; switch (message) { case dir_walk_file: *************** *** 872,887 **** static void develop_end_main() { ! string_t *dd; cstate cstate_data; pstate pstate_data; int j; cstate_history history_data; ! string_t *project_name; ! project_t *pp; long change_number; ! change_t *cp; ! user_t *up; int build_whine; int test_whine; int test_bl_whine; --- 1122,1137 ---- static void develop_end_main() { ! string_ty *dd; cstate cstate_data; pstate pstate_data; int j; cstate_history history_data; ! string_ty *project_name; ! project_ty *pp; long change_number; ! change_ty *cp; ! user_ty *up; int build_whine; int test_whine; int test_bl_whine; *************** *** 994,1007 **** * It is an error if any files in the change file table have been * modified since the last diff. */ ! dd = change_development_directory_get(cp); user_become(up); for (j = 0; j < cstate_data->src->length; ++j) { cstate_src c_src_data; pstate_src p_src_data; ! string_t *path; ! string_t *path_d; long when; long when_d; --- 1244,1257 ---- * It is an error if any files in the change file table have been * modified since the last diff. */ ! dd = change_development_directory_get(cp, 1); user_become(up); for (j = 0; j < cstate_data->src->length; ++j) { cstate_src c_src_data; pstate_src p_src_data; ! string_ty *path; ! string_ty *path_d; long when; long when_d; *************** *** 1184,1190 **** * to be read-only, and record the new ctime. */ dir_walk(dd, de_func, cp); ! os_become_undo(); /* * add to history for state change --- 1434,1440 ---- * to be read-only, and record the new ctime. */ dir_walk(dd, de_func, cp); ! user_become_undo(); /* * add to history for state change *************** *** 1304,1312 **** "", " -Change ", " This option may be used to specify a particular", ! " change within a project. If the user is only", ! " working on one change within a project, that is", ! " the default change number.", "", " -Help", " This option may be used to obtain more", --- 1554,1567 ---- "", " -Change ", " This option may be used to specify a particular", ! " change within a project. When no -Change option is", ! " specified, the AEGIS_CHANGE environment variable is", ! " consulted. If that does not exist, the user's", ! " $HOME/.aegisrc file is examined for a default change", ! " field (see aeuconf(5) for more information). If", ! " that does not exist, when the user is only working", ! " on one change within a project, that is the default", ! " change number. Otherwise, it is an error.", "", " -Help", " This option may be used to obtain more", *************** *** 1319,1332 **** "", " -Project ", " This option may be used to select the project of", ! " interest. When no -Project option is specified, if", ! " the user is only working on changes within a single", ! " project, the project name defaults to that project;", ! " if the user is currently working on changes to more", ! " than one project, or is not working on changes to", ! " any project, the user's $HOME/.%src file is", ! " examined for a default project field (see aeuconf(5)", ! " for more information).", "", " -TERse", " This option may be used to cause listings to", --- 1574,1587 ---- "", " -Project ", " This option may be used to select the project of", ! " interest. When no -Project option is specified, the", ! " AEGIS_PROJECT environment variable is consulted. If", ! " that does not exist, the user's $HOME/.aegisrc file", ! " is examined for a default project field (see", ! " aeuconf(5) for more information). If that does not", ! " exist, when the user is only working on changes", ! " within a single project, the project name defaults", ! " to that project. Otherwise, it is an error.", "", " -TERse", " This option may be used to cause listings to", *************** *** 1377,1383 **** static void develop_end_undo_list() { ! string_t *project_name; trace(("develop_end_undo_list()\n{\n"/*}*/)); project_name = 0; --- 1632,1638 ---- static void develop_end_undo_list() { ! string_ty *project_name; trace(("develop_end_undo_list()\n{\n"/*}*/)); project_name = 0; *************** *** 1416,1436 **** } ! static void deu_func _((void *, dir_walk_message_t, string_t *, struct stat *)); static void deu_func(arg, message, path, st) void *arg; ! dir_walk_message_t message; ! string_t *path; struct stat *st; { ! change_t *cp; int uid; trace(("deu_func(message = %d, path = \"%s\", st = %08lX)\n{\n"/*}*/, message, path->str_text, st)); ! cp = (change_t *)arg; switch (message) { case dir_walk_dir_before: --- 1671,1691 ---- } ! static void deu_func _((void *, dir_walk_message_ty, string_ty *, struct stat *)); static void deu_func(arg, message, path, st) void *arg; ! dir_walk_message_ty message; ! string_ty *path; struct stat *st; { ! change_ty *cp; int uid; trace(("deu_func(message = %d, path = \"%s\", st = %08lX)\n{\n"/*}*/, message, path->str_text, st)); ! cp = (change_ty *)arg; switch (message) { case dir_walk_dir_before: *************** *** 1462,1473 **** pstate pstate_data; cstate_history history_data; int j; ! string_t *project_name; ! project_t *pp; long change_number; ! change_t *cp; ! user_t *up; ! string_t *dd; trace(("develop_end_undo_main()\n{\n"/*}*/)); project_name = 0; --- 1717,1728 ---- pstate pstate_data; cstate_history history_data; int j; ! string_ty *project_name; ! project_ty *pp; long change_number; ! change_ty *cp; ! user_ty *up; ! string_ty *dd; trace(("develop_end_undo_main()\n{\n"/*}*/)); project_name = 0; *************** *** 1605,1614 **** /* * change the ownership back to the user */ ! dd = change_development_directory_get(cp); user_become(up); dir_walk(dd, deu_func, cp); ! os_become_undo(); /* * write out the data and release the locks --- 1860,1869 ---- /* * change the ownership back to the user */ ! dd = change_development_directory_get(cp, 1); user_become(up); dir_walk(dd, deu_func, cp); ! user_become_undo(); /* * write out the data and release the locks Index: aegis/develop2.h *************** *** 1,12 **** /* * aegis - project change supervisor ! * Copyright (c) 1991-1992 Peter Miller. * All rights reserved. * * 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 1, 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 --- 1,12 ---- /* * aegis - project change supervisor ! * Copyright (C) 1991, 1992, 1993 Peter Miller. * All rights reserved. * * 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 Index: aegis/diff.c *************** *** 1,12 **** /* * aegis - project change supervisor ! * Copyright (c) 1991-1992 Peter Miller. * All rights reserved. * * 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 1, 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 --- 1,12 ---- /* * aegis - project change supervisor ! * Copyright (C) 1991, 1992, 1993 Peter Miller. * All rights reserved. * * 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 *************** *** 113,121 **** "", " -Change ", " This option may be used to specify a particular", ! " change within a project. If the user is only", ! " working on one change within a project, that is", ! " the default change number.", "", " -Help", " This option may be used to obtain more", --- 113,126 ---- "", " -Change ", " This option may be used to specify a particular", ! " change within a project. When no -Change option is", ! " specified, the AEGIS_CHANGE environment variable is", ! " consulted. If that does not exist, the user's", ! " $HOME/.aegisrc file is examined for a default change", ! " field (see aeuconf(5) for more information). If", ! " that does not exist, when the user is only working", ! " on one change within a project, that is the default", ! " change number. Otherwise, it is an error.", "", " -Help", " This option may be used to obtain more", *************** *** 128,141 **** "", " -Project ", " This option may be used to select the project of", ! " interest. When no -Project option is specified, if", ! " the user is only working on changes within a single", ! " project, the project name defaults to that project;", ! " if the user is currently working on changes to more", ! " than one project, or is not working on changes to", ! " any project, the user's $HOME/.%src file is", ! " examined for a default project field (see aeuconf(5)", ! " for more information).", "", " -TERse", " This option may be used to cause listings to", --- 133,146 ---- "", " -Project ", " This option may be used to select the project of", ! " interest. When no -Project option is specified, the", ! " AEGIS_PROJECT environment variable is consulted. If", ! " that does not exist, the user's $HOME/.aegisrc file", ! " is examined for a default project field (see", ! " aeuconf(5) for more information). If that does not", ! " exist, when the user is only working on changes", ! " within a single project, the project name defaults", ! " to that project. Otherwise, it is an error.", "", " -TERse", " This option may be used to cause listings to", *************** *** 149,159 **** " option this option causes column headings to be", " added.", "", ! " All options are case insensitive. Options may be", ! " abbreviated; the abbreviation is the upper case letters.", " Options and other command line arguments may be mixed", ! " arbitrarily on the command line.", "", "RECOMMENDED ALIAS", " The recommended alias for this command is", " csh%% alias aed '%s -diff \\!* -v'", --- 154,182 ---- " option this option causes column headings to be", " added.", "", ! " All options may be abbreviated; the abbreviation is", ! " documented as the upper case letters, all lower case", ! " letters and underscores (_) are optional. You must use", ! " consecutive sequences of optional letters.", ! "", ! " All options are case insensitive, you may type them in", ! " upper case or lower case or a combination of both, case", ! " is not important.", ! "", ! " For example: the arguments \"-project, \"-PROJ\" and \"-p\"", ! " are all interpreted to mean the -Project option. The", ! " argument \"-prj\" will not be understood, because", ! " consecutive optional characters were not supplied.", ! "", " Options and other command line arguments may be mixed", ! " arbitrarily on the command line, after the function", ! " selectors.", "", + " The GNU long option names are understood. Since all", + " option names for aegis are long, this means ignoring the", + " extra leading '-'. The \"--option=value\" convention is", + " also understood.", + "", "RECOMMENDED ALIAS", " The recommended alias for this command is", " csh%% alias aed '%s -diff \\!* -v'", *************** *** 183,189 **** static void difference_list() { ! string_t *project_name; long change_number; trace(("difference_list()\n{\n"/*}*/)); --- 206,212 ---- static void difference_list() { ! string_ty *project_name; long change_number; trace(("difference_list()\n{\n"/*}*/)); *************** *** 234,255 **** static void difference_main() { ! string_t *dd; ! string_t *bl; wlist wl; ! string_t *s1 = 0; ! string_t *s2; wlist need_new_build; pstate pstate_data; pconf pconf_data; cstate cstate_data; size_t j; ! string_t *project_name; ! project_t *pp; long change_number; ! change_t *cp; int nolog; ! user_t *up; trace(("difference_main()\n{\n"/*}*/)); wl_zero(&wl); --- 257,278 ---- static void difference_main() { ! string_ty *dd; ! string_ty *bl; wlist wl; ! string_ty *s1 = 0; ! string_ty *s2; wlist need_new_build; pstate pstate_data; pconf pconf_data; cstate cstate_data; size_t j; ! string_ty *project_name; ! project_ty *pp; long change_number; ! change_ty *cp; int nolog; ! user_ty *up; trace(("difference_main()\n{\n"/*}*/)); wl_zero(&wl); *************** *** 268,274 **** case arglex_token_string: s1 = str_from_c(arglex_value.alv_string); os_become_orig(); ! s2 = os_pathname(s1); os_become_undo(); if (wl_member(&wl, s2)) { --- 291,297 ---- case arglex_token_string: s1 = str_from_c(arglex_value.alv_string); os_become_orig(); ! s2 = os_pathname(s1, 1); os_become_undo(); if (wl_member(&wl, s2)) { *************** *** 389,397 **** { s1 = wl.wl_word[j]; assert(s1->str_text[0] == '/'); ! s2 = os_below_dir(change_development_directory_get(cp), s1); if (!s2) ! s2 = os_below_dir(project_baseline_path_get(pp), s1); if (!s2) change_fatal(cp, "path \"%S\" unrelated", s1); str_free(s1); --- 412,420 ---- { s1 = wl.wl_word[j]; assert(s1->str_text[0] == '/'); ! s2 = os_below_dir(change_development_directory_get(cp, 1), s1); if (!s2) ! s2 = os_below_dir(project_baseline_path_get(pp, 1), s1); if (!s2) change_fatal(cp, "path \"%S\" unrelated", s1); str_free(s1); *************** *** 422,437 **** if (!nolog) log_open(change_logfile_get(cp), up); pconf_data = change_pconf_get(cp); ! dd = change_development_directory_get(cp); ! bl = project_baseline_path_get(pp); for (j = 0; j < wl.wl_nwords; ++j) { cstate_src src1_data; pstate_src src2_data; ! string_t *outname; ! string_t *curfile; ! string_t *the_command = 0; ! string_t *orig1 = 0; int ignore; s1 = wl.wl_word[j]; --- 445,460 ---- if (!nolog) log_open(change_logfile_get(cp), up); pconf_data = change_pconf_get(cp); ! dd = change_development_directory_get(cp, 1); ! bl = project_baseline_path_get(pp, 1); for (j = 0; j < wl.wl_nwords; ++j) { cstate_src src1_data; pstate_src src2_data; ! string_ty *original; ! string_ty *input; ! string_ty *curfile; ! string_ty *outname; int ignore; s1 = wl.wl_word[j]; *************** *** 481,519 **** && src1_data->diff_file_time == os_mtime(outname) ); ! os_become_undo(); if (ignore) break; /* ! * if the file is a new file, ! * use the diff-command ! * %1 set to /dev/null, ! * %2 set to development copy file, ! * %3 set to development copy file with a ",D" suffix. */ ! the_command = ! substitute ! ( ! cp, ! pconf_data->diff_command->str_text, ! "/dev/null", ! curfile->str_text, ! outname->str_text, ! (char *)0 ! ); ! trace_string(the_command->str_text); ! user_become(up); ! os_execute ( ! the_command, ! OS_EXEC_FLAG_NO_INPUT, ! dd ); ! str_free(the_command); src1_data->diff_time = os_mtime(curfile); src1_data->diff_file_time = os_mtime(outname); ! os_become_undo(); break; case file_action_remove: --- 504,531 ---- && src1_data->diff_file_time == os_mtime(outname) ); ! user_become_undo(); if (ignore) break; /* ! * difference the file ! * from nothing */ ! original = str_from_c("/dev/null"); ! change_run_diff_command ( ! cp, ! up, ! original, ! curfile, ! outname ); ! str_free(original); ! user_become(up); src1_data->diff_time = os_mtime(curfile); src1_data->diff_file_time = os_mtime(outname); ! user_become_undo(); break; case file_action_remove: *************** *** 543,549 **** && src1_data->diff_file_time == os_mtime(outname) ); ! os_become_undo(); if (ignore) break; --- 555,561 ---- && src1_data->diff_file_time == os_mtime(outname) ); ! user_become_undo(); if (ignore) break; *************** *** 553,585 **** */ user_become(up); os_mkdir_between(dd, s1, 02755); ! os_become_undo(); /* ! * if the file is being deleted, ! * use the diff-command ! * %1 set to baseline file, ! * %2 set to /dev/null, ! * %3 set to development copy file with a ",D" suffix. */ ! orig1 = str_format("%S/%S", bl, s1); ! the_command = ! substitute ! ( ! cp, ! pconf_data->diff_command->str_text, ! orig1->str_text, ! "/dev/null", ! outname->str_text, ! (char *)0 ! ); ! str_free(orig1); user_become(up); - os_execute(the_command, OS_EXEC_FLAG_NO_INPUT, dd); - str_free(the_command); src1_data->diff_time = 0; src1_data->diff_file_time = os_mtime(outname); ! os_become_undo(); break; case file_action_modify: --- 565,592 ---- */ user_become(up); os_mkdir_between(dd, s1, 02755); ! user_become_undo(); /* ! * difference the file ! * to nothing */ ! original = str_format("%S/%S", bl, s1); ! input = str_from_c("/dev/null"); ! change_run_diff_command ! ( ! cp, ! up, ! original, ! input, ! outname ! ); ! str_free(original); ! str_free(input); user_become(up); src1_data->diff_time = 0; src1_data->diff_file_time = os_mtime(outname); ! user_become_undo(); break; case file_action_modify: *************** *** 617,623 **** && src1_data->diff_file_time == os_mtime(outname) ); ! os_become_undo(); if (ignore) break; --- 624,630 ---- && src1_data->diff_file_time == os_mtime(outname) ); ! user_become_undo(); if (ignore) break; *************** *** 625,663 **** * If the edit number of the file in the change * files table matches the edit number in the * baseline files table, ! * use the diff-command field from the product ! * table ! * %1 set to baseline file, ! * %2 set to development copy file, ! * %3 set to development copy file with a ",D" */ ! orig1 = str_format("%S/%S", bl, s1); ! the_command = ! substitute ! ( ! cp, ! pconf_data->diff_command->str_text, ! orig1->str_text, ! curfile->str_text, ! outname->str_text, ! (char *)0 ! ); user_become(up); - os_execute(the_command, OS_EXEC_FLAG_NO_INPUT, dd); - str_free(the_command); src1_data->diff_time = os_mtime(curfile); src1_data->diff_file_time = os_mtime(outname); ! os_become_undo(); ! str_free(orig1); } else { ! string_t *orig2; /* * name for temp file */ ! orig1 = str_format ( "/tmp/%s.%d", --- 632,662 ---- * If the edit number of the file in the change * files table matches the edit number in the * baseline files table, ! * use the diff-command */ ! original = str_format("%S/%S", bl, s1); ! change_run_diff_command ! ( ! cp, ! up, ! original, ! curfile, ! outname ! ); ! str_free(original); user_become(up); src1_data->diff_time = os_mtime(curfile); src1_data->diff_file_time = os_mtime(outname); ! user_become_undo(); } else { ! string_ty *most_recent; /* * name for temp file */ ! original = str_format ( "/tmp/%s.%d", *************** *** 665,671 **** getpid() ); user_become(up); ! undo_unlink_errok(orig1); user_become_undo(); /* --- 664,670 ---- getpid() ); user_become(up); ! undo_unlink_errok(original); user_become_undo(); /* *************** *** 676,718 **** cp, s1, src1_data->edit_number, ! orig1, up ); /* ! * and then use the diff3-command from the ! * product table ! * %1 set to the temporary file, ! * %2 set to baseline file, ! * %3 set to development copy file, ! * %4 set to development copy file with a ",D" */ ! orig2 = str_format("%S/%S", bl, s1); ! the_command = ! substitute ! ( ! cp, ! pconf_data->diff3_command->str_text, ! orig1->str_text, ! orig2->str_text, ! curfile->str_text, ! outname->str_text, ! (char *)0 ! ); ! user_become(up); ! os_execute(the_command, OS_EXEC_FLAG_NO_INPUT, dd); ! str_free(the_command); /* * Remember to remove the temporary file when * finished. */ ! os_unlink(orig1); ! os_become_undo(); /* ! * Set the edit number in the change file row * to the latest baseline edit number. */ str_free(src1_data->edit_number); --- 675,710 ---- cp, s1, src1_data->edit_number, ! original, up ); /* ! * use the diff3-command */ ! most_recent = str_format("%S/%S", bl, s1); ! change_run_diff3_command ! ( ! cp, ! up, ! original, ! most_recent, ! curfile, ! outname ! ); ! str_free(most_recent); /* * Remember to remove the temporary file when * finished. */ ! user_become(up); ! os_unlink(original); ! user_become_undo(); ! str_free(original); /* ! * Set the edit number in the change * to the latest baseline edit number. */ str_free(src1_data->edit_number); *************** *** 721,732 **** /* * Invalidate the build-time field. * (because need new build) */ wl_append(&need_new_build, src1_data->file_name); cstate_data->build_time = 0; - str_free(orig1); - str_free(orig2); src1_data->diff_time = 0; src1_data->diff_file_time = 0; } --- 713,723 ---- /* * Invalidate the build-time field. + * Invalidate the diff-time fields. * (because need new build) */ wl_append(&need_new_build, src1_data->file_name); cstate_data->build_time = 0; src1_data->diff_time = 0; src1_data->diff_file_time = 0; } *************** *** 759,765 **** change_error ( cp, ! "file \"%S\" was out-of-date, see \"%S,D\" for details", need_new_build.wl_word[j], need_new_build.wl_word[j] ); --- 750,756 ---- change_error ( cp, ! "file \"%S\" was out of date, see \"%S,D\" for details", need_new_build.wl_word[j], need_new_build.wl_word[j] ); Index: aegis/diff.h *************** *** 1,12 **** /* * aegis - project change supervisor ! * Copyright (c) 1991-1992 Peter Miller. * All rights reserved. * * 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 1, 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 --- 1,12 ---- /* * aegis - project change supervisor ! * Copyright (C) 1991, 1992, 1993 Peter Miller. * All rights reserved. * * 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 Index: aegis/dir.c *************** *** 1,12 **** /* * aegis - project change supervisor ! * Copyright (c) 1991-1992 Peter Miller. * All rights reserved. * * 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 1, 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 --- 1,12 ---- /* * aegis - project change supervisor ! * Copyright (C) 1991, 1992, 1993 Peter Miller. * All rights reserved. * * 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 *************** *** 22,32 **** #include #include - #include - #include #include #include #include #include --- 22,31 ---- #include #include #include #include + #include #include #include *************** *** 33,56 **** void dir_walk(path, callback, arg) ! string_t *path; ! dir_walk_callback_t callback; void *arg; { wlist wl; struct stat st; - DIR *dp; - struct dirent *de; int j; ! string_t *s; ! trace(("dir_walk(path = %08lX, callback = %08lX, arg = %08lX)\n{\n"/*}*/, path, callback, arg)); trace_string(path->str_text); #ifdef S_IFLNK ! if (lstat(path->str_text, &st)) nfatal("lstat(\"%s\")", path->str_text); #else ! if (stat(path->str_text, &st)) nfatal("stat(\"%s\")", path->str_text); #endif switch (st.st_mode & S_IFMT) --- 32,57 ---- void dir_walk(path, callback, arg) ! string_ty *path; ! dir_walk_callback_ty callback; void *arg; { wlist wl; struct stat st; int j; ! string_ty *s; ! char *cp; ! char *data; ! long data_len; ! trace(("dir_walk(path = %08lX, callback = %08lX, \ ! arg = %08lX)\n{\n"/*}*/, path, callback, arg)); trace_string(path->str_text); #ifdef S_IFLNK ! if (glue_lstat(path->str_text, &st)) nfatal("lstat(\"%s\")", path->str_text); #else ! if (glue_stat(path->str_text, &st)) nfatal("stat(\"%s\")", path->str_text); #endif switch (st.st_mode & S_IFMT) *************** *** 58,91 **** case S_IFDIR: callback(arg, dir_walk_dir_before, path, &st); wl_zero(&wl); ! dp = opendir(path->str_text); ! if (!dp) ! nfatal("opendir(\"%s\")", path->str_text); ! for (;;) { ! de = readdir(dp); ! if (!de) ! break; ! if ! ( ! de->d_name[0] == '.' ! && ! ( ! !de->d_name[1] ! || ! ( ! de->d_name[1] == '.' ! && ! !de->d_name[2] ! ) ! ) ! ) ! continue; ! s = str_from_c(de->d_name); wl_append(&wl, s); str_free(s); } - closedir(dp); for (j = 0; j < wl.wl_nwords; ++j) { s = str_format("%S/%S", path, wl.wl_word[j]); --- 59,74 ---- case S_IFDIR: callback(arg, dir_walk_dir_before, path, &st); wl_zero(&wl); ! if (glue_read_whole_dir(path->str_text, &data, &data_len)) ! nfatal("read \"%s\" directory", path->str_text); ! cp = data; ! while (cp < data + data_len) { ! s = str_from_c(cp); ! cp += s->str_length + 1; wl_append(&wl, s); str_free(s); } for (j = 0; j < wl.wl_nwords; ++j) { s = str_format("%S/%S", path, wl.wl_word[j]); Index: aegis/dir.h *************** *** 1,12 **** /* * aegis - project change supervisor ! * Copyright (c) 1991-1992 Peter Miller. * All rights reserved. * * 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 1, 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 --- 1,12 ---- /* * aegis - project change supervisor ! * Copyright (C) 1991, 1992, 1993 Peter Miller. * All rights reserved. * * 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 *************** *** 26,32 **** #include #include ! enum dir_walk_message_t { dir_walk_dir_before, dir_walk_dir_after, --- 26,32 ---- #include #include ! enum dir_walk_message_ty { dir_walk_dir_before, dir_walk_dir_after, *************** *** 34,45 **** dir_walk_special, dir_walk_symlink }; ! typedef enum dir_walk_message_t dir_walk_message_t; struct stat; ! typedef void (*dir_walk_callback_t)_((void *arg, dir_walk_message_t, string_t *, struct stat *)); ! void dir_walk _((string_t *, dir_walk_callback_t, void *arg)); #endif /* DIR_H */ --- 34,46 ---- dir_walk_special, dir_walk_symlink }; ! typedef enum dir_walk_message_ty dir_walk_message_ty; struct stat; ! typedef void (*dir_walk_callback_ty)_((void *arg, dir_walk_message_ty, ! string_ty *, struct stat *)); ! void dir_walk _((string_ty *, dir_walk_callback_ty, void *arg)); #endif /* DIR_H */ Index: aegis/file.c *************** *** 1,12 **** /* * aegis - project change supervisor ! * Copyright (c) 1991-1992 Peter Miller. * All rights reserved. * * 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 1, 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 --- 1,12 ---- /* * aegis - project change supervisor ! * Copyright (C) 1991, 1992, 1993 Peter Miller. * All rights reserved. * * 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 *************** *** 26,31 **** --- 26,32 ---- #include #include + #include #include #include #include *************** *** 36,42 **** * copy_whole_file * * SYNOPSIS ! * void copy_whole_file(string_t *from, string_t *to, int cmt); * * DESCRIPTION * The copy_whole_file function is used to --- 37,43 ---- * copy_whole_file * * SYNOPSIS ! * void copy_whole_file(string_ty *from, string_ty *to, int cmt); * * DESCRIPTION * The copy_whole_file function is used to *************** *** 57,103 **** void copy_whole_file(from, to, cmt) ! string_t *from; ! string_t *to; int cmt; { - FILE *fp1; - FILE *fp2; - int c; - trace(("copy_whole_file(from = %08lX, to = %08lX)\n{\n"/*}*/, from, to)); os_become_must_be_active(); trace_string(from->str_text); trace_string(to->str_text); - fp1 = fopen(from->str_text, "rb"); - if (!fp1) - nfatal("fopen(\"%s\", \"rb\")", from->str_text); if (to->str_length) { ! fp2 = fopen(to->str_text, "wb"); ! if (!fp2) ! nfatal("fopen(\"%s\", \"wb\")", to->str_text); } else - fp2 = stdout; - while ((c = fgetc(fp1)) != EOF) { ! fputc(c, fp2); ! if (ferror(fp2)) ! { ! if (fp2 == stdout) ! nfatal("standard output"); ! nfatal("write(\"%s\")", to->str_text); ! } } - if (ferror(fp1)) - nfatal("read(\"%s\")", from->str_text); - if (fclose(fp1)) - nfatal("close(\"%s\")", from->str_text); - if (fflush(fp2)) - nfatal("write(\"%s\")", to->str_text); - if (fp2 != stdout && fclose(fp2)) - nfatal("close(\"%s\")", to->str_text); /* * copy last-time-modified of the file --- 58,88 ---- void copy_whole_file(from, to, cmt) ! string_ty *from; ! string_ty *to; int cmt; { trace(("copy_whole_file(from = %08lX, to = %08lX)\n{\n"/*}*/, from, to)); os_become_must_be_active(); trace_string(from->str_text); trace_string(to->str_text); if (to->str_length) { ! if (glue_copyfile(from->str_text, to->str_text)) ! { ! nfatal ! ( ! "cp \"%s\" \"%s\"", ! from->str_text, ! to->str_text ! ); ! } } else { ! if (glue_catfile(from->str_text)) ! nfatal("cat \"%s\"", from->str_text); } /* * copy last-time-modified of the file *************** *** 118,124 **** * read_whole_file * * SYNOPSIS ! * string_t *read_whole_file(char *path); * * DESCRIPTION * The read_whole_file function is used to --- 103,109 ---- * read_whole_file * * SYNOPSIS ! * string_ty *read_whole_file(char *path); * * DESCRIPTION * The read_whole_file function is used to *************** *** 135,141 **** * Assumes the user has already been set. */ ! string_t * read_whole_file(fn) char *fn; { --- 120,126 ---- * Assumes the user has already been set. */ ! string_ty * read_whole_file(fn) char *fn; { *************** *** 142,148 **** size_t length_max; size_t length; char *text; ! string_t *s; int c; FILE *fp; --- 127,133 ---- size_t length_max; size_t length; char *text; ! string_ty *s; int c; FILE *fp; *************** *** 150,159 **** length_max = 1000; length = 0; text = mem_alloc(length_max); ! fp = fopen(fn, "r"); if (!fp) nfatal("open(\"%s\")", fn); ! while ((c = fgetc(fp)) != EOF) { if (length >= length_max) { --- 135,144 ---- length_max = 1000; length = 0; text = mem_alloc(length_max); ! fp = glue_fopen(fn, "r"); if (!fp) nfatal("open(\"%s\")", fn); ! while ((c = glue_fgetc(fp)) != EOF) { if (length >= length_max) { *************** *** 162,172 **** } text[length++] = c; } ! if (ferror(fp)) nfatal("read(\"%s\")", fn); while (length > 0 && isspace(text[length - 1])) --length; ! fclose(fp); s = str_n_from_c(text, length); mem_free(text); return s; --- 147,157 ---- } text[length++] = c; } ! if (glue_ferror(fp)) nfatal("read(\"%s\")", fn); while (length > 0 && isspace(text[length - 1])) --length; ! glue_fclose(fp); s = str_n_from_c(text, length); mem_free(text); return s; Index: aegis/file.h *************** *** 1,12 **** /* * aegis - project change supervisor ! * Copyright (c) 1991-1992 Peter Miller. * All rights reserved. * * 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 1, 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 --- 1,12 ---- /* * aegis - project change supervisor ! * Copyright (C) 1991, 1992, 1993 Peter Miller. * All rights reserved. * * 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 *************** *** 26,32 **** #include #include ! void copy_whole_file _((string_t *from, string_t *to, int cmt)); ! string_t *read_whole_file _((char *)); #endif /* FILE_H */ --- 26,32 ---- #include #include ! void copy_whole_file _((string_ty *from, string_ty *to, int cmt)); ! string_ty *read_whole_file _((char *)); #endif /* FILE_H */ Index: aegis/glue.c *************** *** 0 **** --- 1,2260 ---- + /* + * aegis - project change supervisor + * Copyright (C) 1993 Peter Miller. + * All rights reserved. + * + * 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., 675 Mass Ave, Cambridge, MA 02139, USA. + * + * MANIFEST: functions to perform systems calls in subprocesses + * + * Most of the functions in this file are only used when + * the CONF_NO_seteuid symbol is defined in common/conf.h. + * + * The various system calls wgich must be perfomed as a specific user + * are given to a "proxy" process to perform, where this proxy process + * has the appropriate real (and effective) user id and group id. + * These processes terminate when they see end-of-file on their command + * streams, which only happens when the parent process exits. + * + * The overhead of communicating with the proxy process will + * naturally result in a performance hit for systems without + * a seteuid system call. + * + * Note that some systems, notably AIX, have a seteuid system call + * which is broken. These systems will also need to use this glue. + */ + + #include + #include + #include + #include + #include + #include + #include + #include + #include + + #include + #include + #include + #include + #include + #include + + #ifdef CONF_NO_seteuid + + #define GUARD1 0x416E6479 + #define GUARD2 0x4C777279 + + enum + { + command_access, + command_catfile, + command_chmod, + command_chown, + command_close, + command_copyfile, + command_creat, + command_fcntl, + command_getcwd, + command_link, + command_lstat, + command_mkdir, + command_open, + command_read, + command_readlink, + command_read_whole_dir, + command_rename, + command_rmdir, + command_stat, + command_unlink, + command_utime, + command_write, + }; + + + typedef struct proxy_ty proxy_ty; + struct proxy_ty + { + int hash; + int uid; + int gid; + int umask; + int pid; + FILE *command; + FILE *reply; + proxy_ty *next; + + }; + + #define proxy_hash(u, g, m) (((u) * 16 + (g) * 4 + (m)) & 0x7FFF) + + /* + * This table will be sparsely filled. + * The maximum number of entries expected is 4. + * The size MUST be prime. + */ + static proxy_ty *proxy_table[17]; + + + #ifdef DEBUG + + static char *command_name _((int)); + + static char * + command_name(n) + int n; + { + static char buf[12]; + + switch (n) + { + case EOF: return "quit"; + case command_access: return "access"; + case command_catfile: return "catfile"; + case command_chmod: return "chmod"; + case command_chown: return "chown"; + case command_close: return "close"; + case command_copyfile: return "copyfile"; + case command_creat: return "creat"; + case command_fcntl: return "fcntl"; + case command_getcwd: return "getcwd"; + case command_link: return "link"; + case command_lstat: return "lstat"; + case command_mkdir: return "mkdir"; + case command_open: return "open"; + case command_read: return "read"; + case command_readlink: return "readlink"; + case command_read_whole_dir: return "read_whole_dir"; + case command_rename: return "rename"; + case command_rmdir: return "rmdir"; + case command_stat: return "stat"; + case command_unlink: return "unlink"; + case command_utime: return "utime"; + case command_write: return "write"; + } + sprintf(buf, "%d", n); + return buf; + } + + #endif + + + static void put_int _((FILE *, int)); + + static void + put_int(fp, n) + FILE *fp; + int n; + { + int j; + unsigned char *ptr; + + trace(("put_int(%d)\n{\n"/*}*/, n)); + ptr = (unsigned char *)&n; + for (j = 0; j < sizeof(int); ++j) + putc(ptr[j], fp); + if (ferror(fp)) + nfatal("writing pipe"); + trace((/*{*/"}\n")); + } + + + static int get_int _((FILE *)); + + static int + get_int(fp) + FILE *fp; + { + int result; + int j; + unsigned char *ptr; + + trace(("get_int()\n{\n"/*}*/)); + ptr = (unsigned char *)&result; + for (j = 0; j < sizeof(int); ++j) + { + int c; + + c = getc(fp); + if (c == EOF) + { + if (ferror(fp)) + nfatal("reading pipe"); + fatal("reading pipe: proxy protocol error (%d)", getpid()); + } + ptr[j] = c; + } + trace(("return %d;\n", result)); + trace((/*{*/"}\n")); + return result; + } + + + static void put_long _((FILE *, long)); + + static void + put_long(fp, n) + FILE *fp; + long n; + { + int j; + unsigned char *ptr; + + trace(("put_long(%ld)\n{\n"/*}*/, n)); + ptr = (unsigned char *)&n; + for (j = 0; j < sizeof(long); ++j) + putc(ptr[j], fp); + if (ferror(fp)) + nfatal("writing pipe"); + trace((/*{*/"}\n")); + } + + + static long get_long _((FILE *)); + + static long + get_long(fp) + FILE *fp; + { + long result; + int j; + unsigned char *ptr; + + trace(("get_long()\n{\n"/*}*/)); + ptr = (unsigned char *)&result; + for (j = 0; j < sizeof(long); ++j) + { + int c; + + c = getc(fp); + if (c == EOF) + { + if (ferror(fp)) + nfatal("reading pipe"); + fatal("reading pipe: proxy protocol error (%d)", getpid()); + } + ptr[j] = c; + } + trace(("return %ld;\n", result)); + trace((/*{*/"}\n")); + return result; + } + + + static void put_binary _((FILE *, void *, size_t)); + + static void + put_binary(fp, ptr, len) + FILE *fp; + void *ptr; + size_t len; + { + trace(("put_binary(%ld)\n{\n"/*}*/, len)); + fwrite(ptr, 1, len, fp); + if (ferror(fp)) + nfatal("writing pipe"); + trace((/*{*/"}\n")); + } + + + static void get_binary _((FILE *, void *, size_t)); + + static void + get_binary(fp, ptr, len) + FILE *fp; + void *ptr; + size_t len; + { + long n; + + trace(("get_binary(%ld)\n{\n"/*}*/, len)); + n = fread(ptr, 1, len, fp); + if (n != len) + { + if (ferror(fp)) + nfatal("reading pipe"); + fatal("reading pipe: proxy protocol error (%d)", getpid()); + } + trace((/*{*/"}\n")); + } + + + static void put_string _((FILE *, char *)); + + static void + put_string(fp, s) + FILE *fp; + char *s; + { + trace(("put_string(\"%s\")\n{\n"/*}*/, s)); + for (;;) + { + putc(*s, fp); + if (ferror(fp)) + nfatal("writing pipe"); + if (!*s) + break; + ++s; + } + trace((/*{*/"}\n")); + } + + + static void *get_string _((FILE *)); + + static void * + get_string(fp) + FILE *fp; + { + static char *result; + static size_t result_max; + size_t pos; + + trace(("get_string()\n{\n"/*}*/)); + if (!result) + { + result_max = (1L << 10 ) - 32; + result = mem_alloc(result_max); + } + + pos = 0; + for (;;) + { + int c; + + c = getc(fp); + if (c == EOF) + { + if (ferror(fp)) + nfatal("reading pipe"); + fatal("reading pipe: proxy protocol error (%d)", getpid()); + } + if (pos >= result_max) + { + result_max += (1L << 10); + mem_change_size(&result, result_max); + } + result[pos] = c; + if (!c) + break; + ++pos; + } + trace(("return \"%s\";\n", result)); + trace((/*{*/"}\n")); + return result; + } + + + static void proxy _((int rd, int wr)); + + static void + proxy(rd_fd, wr_fd) + int rd_fd; + int wr_fd; + { + FILE *command; + FILE *reply; + char *path; + char *path1; + int mode; + struct stat st; + struct utimbuf utb; + int uid; + int gid; + char *buf; + int max; + int perm; + int result; + int fd; + long nbytes; + long nbytes2; + struct flock flock; + + trace(("proxy(%d, %d)\n{\n"/*}*/, rd_fd, wr_fd)); + errno = 0; + command = fdopen(rd_fd, "r"); + if (!command) + { + if (!errno) + errno = ENOMEM; + exit(errno); + } + + errno = 0; + reply = fdopen(wr_fd, "w"); + if (!reply) + { + if (!errno) + errno = ENOMEM; + exit(errno); + } + + for (;;) + { + int c; + + c = getc(command); + trace(("command: %s\n", command_name(c))); + trace(("uid = %d;\n", getuid())); + trace(("gid = %d;\n", getgid())); + switch (c) + { + case EOF: + if (ferror(command)) + exit(errno); + exit(0); + + default: + fatal("proxy: unknown %d command (bug)", c); + + case command_access: + path = get_string(command); + mode = get_int(command); + if (access(path, mode)) + result = errno; + else + result = 0; + put_int(reply, result); + break; + + case command_catfile: + path = get_string(command); + if (catfile(path)) + result = errno; + else + result = 0; + put_int(reply, result); + break; + + case command_chmod: + path = get_string(command); + mode = get_int(command); + if (chmod(path, mode)) + result = errno; + else + result = 0; + put_int(reply, result); + break; + + case command_chown: + path = get_string(command); + uid = get_int(command); + gid = get_int(command); + if (chown(path, uid, gid)) + result = errno; + else + result = 0; + put_int(reply, result); + break; + + case command_close: + fd = get_int(command); + if (close(fd)) + result = errno; + else + result = 0; + put_int(reply, result); + break; + + case command_copyfile: + path = get_string(command); + path1 = mem_copy_string(path); + path = get_string(command); + result = copyfile(path1, path); + if (result) + result = errno; + mem_free(path1); + put_int(reply, result); + break; + + case command_creat: + path = get_string(command); + mode = get_int(command); + result = creat(path, mode); + put_int(reply, result); + if (result < 0) + put_int(reply, errno); + break; + + case command_getcwd: + max = get_int(command); + path = mem_alloc(max); + if (!getcwd(path, max)) + put_int(reply, errno); + else + { + put_int(reply, 0); + put_string(reply, path); + } + mem_free(path); + break; + + case command_fcntl: + fd = get_int(command); + mode = get_int(command); + get_binary(command, &flock, sizeof(flock)); + result = fcntl(fd, mode, &flock); + if (result) + result = errno; + put_int(reply, result); + put_binary(reply, &flock, sizeof(flock)); + break; + + case command_lstat: + path = get_string(command); + #ifdef S_IFLNK + result = lstat(path, &st); + #else + result = stat(path, &st); + #endif + if (result) + put_int(reply, errno); + else + { + put_int(reply, 0); + put_binary(reply, &st, sizeof(st)); + } + break; + + + case command_link: + path = get_string(command); + path1 = mem_copy_string(path); + path = get_string(command); + result = link(path1, path); + if (result) + result = errno; + mem_free(path1); + put_int(reply, result); + break; + + case command_mkdir: + path = get_string(command); + mode = get_int(command); + if (mkdir(path, mode)) + result = errno; + else + result = 0; + put_int(reply, result); + break; + + case command_open: + path = get_string(command); + mode = get_int(command); + perm = get_int(command); + result = open(path, mode, perm); + put_int(reply, result); + if (result < 0) + put_int(reply, errno); + break; + + case command_rename: + path = get_string(command); + path1 = mem_copy_string(path); + path = get_string(command); + result = rename(path1, path); + if (result) + result = errno; + mem_free(path1); + put_int(reply, result); + break; + + case command_read: + fd = get_int(command); + nbytes = get_long(command); + buf = mem_alloc(nbytes); + nbytes2 = read(fd, buf, nbytes); + put_long(reply, nbytes2); + if (nbytes2 > 0) + put_binary(reply, buf, nbytes2); + else if (nbytes2 < 0) + put_int(reply, errno); + mem_free(buf); + break; + + case command_readlink: + path = get_string(command); + max = get_int(command); + path1 = mem_alloc(max + 1); + result = readlink(path, path1, max); + put_int(reply, result); + if (result < 0) + put_int(reply, errno); + else + put_binary(reply, path1, result); + mem_free(path1); + break; + + case command_read_whole_dir: + path = get_string(command); + result = read_whole_dir(path, &buf, &nbytes); + if (result < 0) + put_int(reply, errno); + else + { + put_int(reply, 0); + put_long(reply, nbytes); + put_binary(reply, buf, nbytes); + } + break; + + case command_rmdir: + path = get_string(command); + if (rmdir(path)) + result = errno; + else + result = 0; + put_int(reply, result); + break; + + case command_stat: + path = get_string(command); + result = stat(path, &st); + if (result) + put_int(reply, errno); + else + { + put_int(reply, 0); + put_binary(reply, &st, sizeof(st)); + } + break; + + case command_unlink: + path = get_string(command); + result = unlink(path); + if (result) + result = errno; + put_int(reply, result); + break; + + case command_utime: + path = get_string(command); + get_binary(command, &utb, sizeof(utb)); + result = utime(path, &utb); + if (result) + result = errno; + put_int(reply, result); + break; + + case command_write: + fd = get_int(command); + nbytes = get_long(command); + buf = mem_alloc(nbytes); + get_binary(command, buf, nbytes); + nbytes2 = write(fd, buf, nbytes); + put_long(reply, nbytes2); + if (nbytes2 < 0) + put_int(reply, errno); + mem_free(buf); + break; + } + fflush(reply); + if (ferror(reply)) + exit(errno); + } + trace((/*{*/"}\n")); + } + + + static void get_pipe _((int *, int *)); + + static void + get_pipe(rd, wr) + int *rd; + int *wr; + { + int fd[2]; + + trace(("get_pipe()\n{\n"/*}*/)); + if (pipe(fd)) + nfatal("pipe"); + *rd = fd[0]; + *wr = fd[1]; + trace(("read %d\n", fd[0])); + trace(("write %d\n", fd[1])); + trace((/*{*/"}\n")); + } + + + static void proxy_close _((void)); + + static void + proxy_close() + { + proxy_ty *p; + int j; + + trace(("proxy_close()\n{\n"/*}*/)); + trace(("pid = %d;\n", getpid())); + for (j = 0; j < SIZEOF(proxy_table); ++j) + { + for (;;) + { + p = proxy_table[j]; + if (!p) + break; + trace(("p->pid %d; uid %d; gid %d\n", p->pid, p->uid, p->gid)); + proxy_table[j] = p->next; + fclose(p->command); + fclose(p->reply); + mem_free((char *)p); + } + } + trace((/*{*/"}\n")); + } + + + static void proxy_spawn _((proxy_ty *)); + + static void + proxy_spawn(pp) + proxy_ty *pp; + { + int command_read_fd; + int command_write_fd; + int reply_read_fd; + int reply_write_fd; + int pid; + static int quitregd; + + trace(("proxy_spawn()\n{\n"/*}*/)); + if (!quitregd) + { + quitregd = 1; + signal(SIGPIPE, SIG_IGN); + trace(("master pid %d;\n", getpid())); + } + + get_pipe(&command_read_fd, &command_write_fd); + get_pipe(&reply_read_fd, &reply_write_fd); + switch (pid = fork()) + { + case -1: + nfatal("fork"); + + case 0: + /* + * close the ends of the pipes the proxy will not be using + */ + close(command_write_fd); + close(reply_read_fd); + error_set_id_func((error_id_ty)0); + + /* + * the proxy now assumes the appropriate ID + */ + if (setgid(pp->gid)) + exit(errno); + if (setuid(pp->uid)) + exit(errno); + umask(pp->umask); + + /* + * close all of the master ends of all the other proxys + * otherwise they will keep each other alive + * after the master dies + */ + trace_indent_reset(); + proxy_close(); + + /* + * normally the proxys are silent, + * returning all errors to the master. + * Should one of the error functions be called, + * make sure the proxy does not perform the undo. + */ + undo_cancel(); + + /* + * do whatever is asked + */ + proxy(command_read_fd, reply_write_fd); + exit(0); + + default: + /* + * close the ends of the pipes the master will not be using + */ + close(command_read_fd); + close(reply_write_fd); + + /* + * remember who the child is + * (even though we don't have a use for it at the moment) + */ + pp->pid = pid; + trace(("child pid %d\n", getpid())); + + /* + * open a buffered stream for commands + */ + errno = 0; + pp->command = fdopen(command_write_fd, "w"); + if (!pp->command) + { + if (!errno) + errno = ENOMEM; + nfatal("fdopen"); + } + + /* + * open a buffered stream for replies + */ + errno = 0; + pp->reply = fdopen(reply_read_fd, "r"); + if (!pp->reply) + { + if (!errno) + errno = ENOMEM; + nfatal("fdopen"); + } + break; + } + trace((/*{*/"}\n")); + } + + + static proxy_ty *proxy_find _((void)); + + static proxy_ty * + proxy_find() + { + int uid; + int gid; + int um; + int hash; + int pix; + proxy_ty *pp; + + /* + * search for an existing proxy + */ + trace(("proxy_find()\n{\n"/*}*/)); + os_become_must_be_active(); + os_become_query(&uid, &gid, &um); + hash = proxy_hash(uid, gid, um); + pix = hash % SIZEOF(proxy_table); + for (pp = proxy_table[pix]; pp; pp = pp->next) + { + if (pp->hash != hash) + continue; + if (pp->uid != uid || pp->gid != gid || pp->umask != um) + continue; + goto done; + } + + /* + * no such proxy, so create a new one + */ + trace(("uid = %d; gid = %d; umask = 0%o;\n", uid, gid, um)); + pp = (proxy_ty *)mem_alloc(sizeof(proxy_ty)); + pp->hash = hash; + pp->uid = uid; + pp->gid = gid; + pp->umask = um; + pp->pid = -1; + pp->command = 0; + pp->reply = 0; + pp->next = 0; + proxy_spawn(pp); + + /* + * glue into the table AFTER the spawn, + * so the child doesn't close the wrong things. + */ + pp->next = proxy_table[pix]; + proxy_table[pix] = pp; + + /* + * here for all exits + */ + done: + trace(("return %08lX;\n", (long)pp)); + trace((/*{*/"}\n")); + return pp; + } + + + static void end_of_command _((proxy_ty *)); + + static void + end_of_command(pp) + proxy_ty *pp; + { + trace(("end_of_command()\n{\n"/*}*/)); + if (fflush(pp->command)) + nfatal("write pipe"); + trace((/*{*/"}\n")); + } + + + int + glue_stat(path, st) + char *path; + struct stat *st; + { + proxy_ty *pp; + int result; + + trace(("glue_stat()\n{\n"/*}*/)); + pp = proxy_find(); + putc(command_stat, pp->command); + put_string(pp->command, path); + end_of_command(pp); + result = get_int(pp->reply); + if (result) + { + errno = result; + result = -1; + } + else + get_binary(pp->reply, st, sizeof(*st)); + trace(("return %d; /* errno = %d */\n", result, errno)); + trace((/*{*/"}\n")); + return result; + } + + + int + glue_lstat(path, st) + char *path; + struct stat *st; + { + proxy_ty *pp; + int result; + + trace(("glue_lstat()\n{\n"/*}*/)); + pp = proxy_find(); + putc(command_lstat, pp->command); + put_string(pp->command, path); + end_of_command(pp); + result = get_int(pp->reply); + if (result) + { + errno = result; + result = -1; + } + else + get_binary(pp->reply, st, sizeof(*st)); + trace(("return %d; /* errno = %d */\n", result, errno)); + trace((/*{*/"}\n")); + return result; + } + + + int + glue_mkdir(path, mode) + char *path; + int mode; + { + proxy_ty *pp; + int result; + + trace(("glue_mkdir()\n{\n"/*}*/)); + pp = proxy_find(); + putc(command_mkdir, pp->command); + put_string(pp->command, path); + put_int(pp->command, mode); + end_of_command(pp); + result = get_int(pp->reply); + if (result) + { + errno = result; + result = -1; + } + trace(("return %d; /* errno = %d */\n", result, errno)); + trace((/*{*/"}\n")); + return result; + } + + + int + glue_chown(path, uid, gid) + char *path; + int uid; + int gid; + { + proxy_ty *pp; + int result; + + trace(("glue_chown()\n{\n"/*}*/)); + pp = proxy_find(); + putc(command_chown, pp->command); + put_string(pp->command, path); + put_int(pp->command, uid); + put_int(pp->command, gid); + end_of_command(pp); + result = get_int(pp->reply); + if (result) + { + errno = result; + result = -1; + } + trace(("return %d; /* errno = %d */\n", result, errno)); + trace((/*{*/"}\n")); + return result; + } + + + int + glue_catfile(path) + char *path; + { + proxy_ty *pp; + int result; + + trace(("glue_catfile()\n{\n"/*}*/)); + pp = proxy_find(); + putc(command_catfile, pp->command); + put_string(pp->command, path); + end_of_command(pp); + result = get_int(pp->reply); + if (result) + { + errno = result; + result = -1; + } + trace(("return %d; /* errno = %d */\n", result, errno)); + trace((/*{*/"}\n")); + return result; + } + + + int + glue_chmod(path, mode) + char *path; + int mode; + { + proxy_ty *pp; + int result; + + trace(("glue_chmod()\n{\n"/*}*/)); + pp = proxy_find(); + putc(command_chmod, pp->command); + put_string(pp->command, path); + put_int(pp->command, mode); + end_of_command(pp); + result = get_int(pp->reply); + if (result) + { + errno = result; + result = -1; + } + trace(("return %d; /* errno = %d */\n", result, errno)); + trace((/*{*/"}\n")); + return result; + } + + + int + glue_rmdir(path) + char *path; + { + proxy_ty *pp; + int result; + + trace(("glue_rmdir()\n{\n"/*}*/)); + pp = proxy_find(); + putc(command_rmdir, pp->command); + put_string(pp->command, path); + end_of_command(pp); + result = get_int(pp->reply); + if (result) + { + errno = result; + result = -1; + } + trace(("return %d; /* errno = %d */\n", result, errno)); + trace((/*{*/"}\n")); + return result; + } + + + int + glue_rename(p1, p2) + char *p1; + char *p2; + { + proxy_ty *pp; + int result; + + trace(("glue_rename()\n{\n"/*}*/)); + pp = proxy_find(); + putc(command_rename, pp->command); + put_string(pp->command, p1); + put_string(pp->command, p2); + end_of_command(pp); + result = get_int(pp->reply); + if (result) + { + errno = result; + result = -1; + } + trace(("return %d; /* errno = %d */\n", result, errno)); + trace((/*{*/"}\n")); + return result; + } + + + int + glue_unlink(path) + char *path; + { + proxy_ty *pp; + int result; + + trace(("glue_unlink()\n{\n"/*}*/)); + pp = proxy_find(); + putc(command_unlink, pp->command); + put_string(pp->command, path); + end_of_command(pp); + result = get_int(pp->reply); + if (result) + { + errno = result; + result = -1; + } + trace(("return %d; /* errno = %d */\n", result, errno)); + trace((/*{*/"}\n")); + return result; + } + + + int + glue_link(p1, p2) + char *p1; + char *p2; + { + proxy_ty *pp; + int result; + + trace(("glue_link()\n{\n"/*}*/)); + pp = proxy_find(); + putc(command_link, pp->command); + put_string(pp->command, p1); + put_string(pp->command, p2); + end_of_command(pp); + result = get_int(pp->reply); + if (result) + { + errno = result; + result = -1; + } + trace(("return %d; /* errno = %d */\n", result, errno)); + trace((/*{*/"}\n")); + return result; + } + + + int + glue_access(path, mode) + char *path; + int mode; + { + proxy_ty *pp; + int result; + + trace(("glue_access()\n{\n"/*}*/)); + pp = proxy_find(); + putc(command_access, pp->command); + put_string(pp->command, path); + put_int(pp->command, mode); + end_of_command(pp); + result = get_int(pp->reply); + if (result) + { + errno = result; + result = -1; + } + trace(("return %d; /* errno = %d */\n", result, errno)); + trace((/*{*/"}\n")); + return result; + } + + + char * + glue_getcwd(buf, max) + char *buf; + int max; + { + proxy_ty *pp; + char *s; + int result; + + /* + * don't bother with the case where buf + * is the NULL pointer, aegis never uses it. + */ + trace(("glue_getcwd()\n{\n"/*}*/)); + assert(buf); + pp = proxy_find(); + putc(command_getcwd, pp->command); + put_int(pp->command, max); + end_of_command(pp); + result = get_int(pp->reply); + if (result) + { + s = 0; + trace(("return NULL; /* errno = %d */\n", result)); + errno = result; + } + else + { + s = get_string(pp->reply); + strcpy(buf, s); + s = buf; + trace(("return \"%s\";\n", s)); + } + trace((/*{*/"}\n")); + return s; + } + + + int + glue_readlink(path, buf, max) + char *path; + char *buf; + int max; + { + proxy_ty *pp; + int result; + + trace(("glue_readlink()\n{\n"/*}*/)); + pp = proxy_find(); + putc(command_readlink, pp->command); + put_string(pp->command, path); + put_int(pp->command, max); + end_of_command(pp); + result = get_int(pp->reply); + if (result < 0) + { + errno = get_int(pp->reply); + result = -1; + } + else + { + get_binary(pp->reply, buf, result); + trace(("buf = \"%.*s\";\n", result, buf)); + } + trace(("return %d; /* errno = %d */\n", result, errno)); + trace((/*{*/"}\n")); + return result; + } + + + int + glue_utime(path, values) + char *path; + struct utimbuf *values; + { + proxy_ty *pp; + int result; + + trace(("glue_utime()\n{\n"/*}*/)); + pp = proxy_find(); + putc(command_utime, pp->command); + put_string(pp->command, path); + put_binary(pp->command, values, sizeof(*values)); + end_of_command(pp); + result = get_int(pp->reply); + if (result) + { + errno = result; + result = -1; + } + trace(("return %d; /* errno = %d */\n", result, errno)); + trace((/*{*/"}\n")); + return result; + } + + + int + glue_copyfile(p1, p2) + char *p1; + char *p2; + { + proxy_ty *pp; + int result; + + trace(("glue_copyfile()\n{\n"/*}*/)); + pp = proxy_find(); + putc(command_copyfile, pp->command); + put_string(pp->command, p1); + put_string(pp->command, p2); + end_of_command(pp); + result = get_int(pp->reply); + if (result) + { + errno = result; + result = -1; + } + trace(("return %d; /* errno = %d */\n", result, errno)); + trace((/*{*/"}\n")); + return result; + } + + + typedef struct glue_file_ty glue_file_ty; + struct glue_file_ty + { + long guard1; + char *path; + int fmode; + char *buffer_end; + char *buffer_pos; + int fd; + int errno; + int pushback; + proxy_ty *pp; + char buffer[1 << 11]; /* fits within knl pipe buf */ + long guard2; + }; + + + FILE * + glue_fopen(path, mode) + char *path; + char *mode; + { + glue_file_ty *gfp; + proxy_ty *pp; + int fmode; + int fd; + + trace(("glue_fopen()\n{\n"/*}*/)); + if (!strcmp(mode, "r")) + fmode = O_RDONLY; + else if (!strcmp(mode, "w")) + fmode = O_WRONLY | O_CREAT | O_TRUNC; + else + { + errno = EINVAL; + gfp = 0; + goto done; + } + + pp = proxy_find(); + putc(command_open, pp->command); + put_string(pp->command, path); + put_int(pp->command, fmode); + put_int(pp->command, 0666); + end_of_command(pp); + fd = get_int(pp->reply); + if (fd < 0) + { + errno = get_int(pp->reply); + gfp = 0; + goto done; + } + + /* + * build our file structure + */ + gfp = (glue_file_ty *)mem_alloc(sizeof(glue_file_ty)); + gfp->pp = pp; + gfp->path = mem_copy_string(path); + gfp->fmode = fmode; + gfp->fd = fd; + gfp->guard1 = GUARD1; + gfp->guard2 = GUARD2; + if (gfp->fmode == O_RDONLY) + { + gfp->buffer_end = 0; + gfp->buffer_pos = 0; + } + else + { + gfp->buffer_pos = gfp->buffer; + gfp->buffer_end = gfp->buffer + sizeof(gfp->buffer); + } + gfp->errno = 0; + gfp->pushback = EOF; + + /* + * NOTE: this is veeerrry nasty. + * The return value is not really a valid FILE, + * but is only useful to the glue file functions. + */ + done: + trace(("return %08lX; /* errno = %d */\n", (long)gfp, errno)); + trace((/*{*/"}\n")); + return (FILE *)gfp; + } + + + int + glue_fclose(fp) + FILE *fp; + { + proxy_ty *pp; + glue_file_ty *gfp; + int result; + int result2; + + /* + * Leave the standard file streams alone. + * There is a chance these will be seen here. + */ + if (fp == stdout || fp == stdin || fp == stderr) + return fclose(fp); + + /* + * flush the buffers + */ + trace(("glue_fclose()\n{\n"/*}*/)); + result = glue_fflush(fp) ? errno : 0; + + /* + * locate the appropriate proxy + */ + gfp = (glue_file_ty *)fp; + assert(gfp->guard1 == GUARD1); + assert(gfp->guard2 == GUARD2); + pp = gfp->pp; + + /* + * tell the proxy to close + */ + putc(command_close, pp->command); + put_int(pp->command, gfp->fd); + end_of_command(pp); + result2 = get_int(pp->reply); + if (!result) + result = result2; + + /* + * Fclose always closes the file, + * even when the implicit write fails. + * Always dispose of our data. + */ + mem_free(gfp->path); + mem_free((char *)gfp); + + /* + * set errno and get out of here + */ + if (result) + { + errno = result; + result = -1; + } + trace(("return %d; /* errno = %d */\n", result, errno)); + trace((/*{*/"}\n")); + return result; + } + + + int + glue_fgetc(fp) + FILE *fp; + { + proxy_ty *pp; + glue_file_ty *gfp; + int result; + long nbytes; + + /* + * Leave the standard file streams alone. + * There is a chance these will be seen here. + */ + if (fp == stdout || fp == stdin || fp == stderr) + return getc(fp); + + /* + * locate the appropriate proxy + */ + #if 0 + trace(("glue_fgetc()\n{\n"/*}*/)); + #endif + gfp = (glue_file_ty *)fp; + assert(gfp->guard1 == GUARD1); + assert(gfp->guard2 == GUARD2); + pp = gfp->pp; + + /* + * complain if we are in an error state, + * or they asked for something stupid + */ + if (gfp->errno) + { + errno = gfp->errno; + result = EOF; + goto done; + } + if (gfp->fmode != O_RDONLY) + { + gfp->errno = EINVAL; + errno = EINVAL; + result = EOF; + goto done; + } + + /* + * use pushback if there is anything in it + */ + if (gfp->pushback != EOF) + { + result = gfp->pushback; + gfp->pushback = EOF; + goto done; + } + + /* + * use the buffer if there is anything in it + */ + if (gfp->buffer_pos && gfp->buffer_pos < gfp->buffer_end) + { + result = (unsigned char)*gfp->buffer_pos++; + goto done; + } + gfp->buffer_pos = 0; + gfp->buffer_end = 0; + + /* + * tell the proxy to read another buffer-full + */ + pp = gfp->pp; + putc(command_read, pp->command); + put_int(pp->command, gfp->fd); + put_long(pp->command, (long)sizeof(gfp->buffer)); + end_of_command(pp); + nbytes = get_long(pp->reply); + if (nbytes < 0) + { + gfp->errno = get_int(pp->reply); + errno = gfp->errno; + result = EOF; + goto done; + } + if (nbytes == 0) + { + errno = 0; + result = EOF; + goto done; + } + assert(nbytes <= sizeof(gfp->buffer)); + get_binary(pp->reply, gfp->buffer, nbytes); + gfp->buffer_pos = gfp->buffer; + gfp->buffer_end = gfp->buffer + nbytes; + result = (unsigned char)*gfp->buffer_pos++; + + /* + * here for all exits + */ + done: + #if 0 + trace(("return %d; /* errno = %d */\n", result, errno)); + trace((/*{*/"}\n")); + #endif + return result; + } + + + int + glue_ungetc(c, fp) + int c; + FILE *fp; + { + glue_file_ty *gfp; + int result; + + /* + * Leave the standard file streams alone. + * There is a chance these will be seen here. + */ + if (fp == stdout || fp == stdin || fp == stderr) + return ungetc(c, fp); + + /* + * make a pointer to our data + */ + trace(("glue_ungetc()\n{\n"/*}*/)); + result = EOF; + gfp = (glue_file_ty *)fp; + assert(gfp->guard1 == GUARD1); + assert(gfp->guard2 == GUARD2); + + /* + * make sure not too many + */ + if (gfp->pushback != EOF || c == EOF) + { + gfp->errno = EINVAL; + errno = EINVAL; + gfp->pushback = EOF; + goto done; + } + + /* + * stash the returned char + */ + gfp->pushback = (unsigned char)c; + result = (unsigned char)c; + + /* + * here for all exits + */ + done: + trace(("return %d; /* errno = %d */\n", result, errno)); + trace((/*{*/"}\n")); + return result; + } + + + int + glue_fputc(c, fp) + int c; + FILE *fp; + { + proxy_ty *pp; + glue_file_ty *gfp; + int result; + + /* + * Leave the standard file streams alone. + * There is a chance these will be seen here. + */ + if (fp == stdout || fp == stdin || fp == stderr) + return putc(c, fp); + + /* + * locate the appropriate proxy + */ + #if 0 + trace(("glue_fputc()\n{\n"/*}*/)); + #endif + result = EOF; + gfp = (glue_file_ty *)fp; + assert(gfp->guard1 == GUARD1); + assert(gfp->guard2 == GUARD2); + pp = gfp->pp; + + /* + * if the stream is in an error state, + * or we were asked to do something stupid, + * return the error + */ + if (gfp->errno) + { + errno = gfp->errno; + goto done; + } + if (gfp->fmode == O_RDONLY) + { + gfp->errno = EINVAL; + errno = EINVAL; + goto done; + } + + /* + * if there is no room in the buffer, + * flush it to the proxy + */ + assert(gfp->buffer_pos); + if (gfp->buffer_pos >= gfp->buffer_end) + { + long nbytes; + long nbytes2; + + putc(command_write, pp->command); + put_int(pp->command, gfp->fd); + nbytes = gfp->buffer_pos - gfp->buffer; + put_long(pp->command, nbytes); + put_binary(pp->command, gfp->buffer, nbytes); + end_of_command(pp); + nbytes2 = get_long(pp->reply); + if (nbytes2 < 0) + { + gfp->errno = get_int(pp->reply); + errno = gfp->errno; + goto done; + } + if (nbytes2 != nbytes) + { + gfp->errno = EIO; + errno = EIO; + goto done; + } + gfp->buffer_pos = gfp->buffer; + gfp->buffer_end = gfp->buffer + sizeof(gfp->buffer); + } + + /* + * stash the character + */ + *gfp->buffer_pos++ = c; + result = (unsigned char)c; + + /* + * here for all exits + */ + done: + #if 0 + trace(("return %d; /* errno = %d */\n", result, errno)); + trace((/*{*/"}\n")); + #endif + return result; + } + + + int + glue_ferror(fp) + FILE *fp; + { + glue_file_ty *gfp; + + /* + * Leave the standard file streams alone. + * There is a chance these will be seen here. + */ + if (fp == stdout || fp == stdin || fp == stderr) + return ferror(fp); + + /* + * locate the appropriate proxy + */ + gfp = (glue_file_ty *)fp; + assert(gfp->guard1 == GUARD1); + assert(gfp->guard2 == GUARD2); + + /* + * set errno depending on + * the error for this stream. + */ + if (gfp->errno) + { + errno = gfp->errno; + gfp->errno = 0; + return 1; + } + return 0; + } + + + int + glue_fflush(fp) + FILE *fp; + { + glue_file_ty *gfp; + proxy_ty *pp; + int result; + + /* + * Leave the standard file streams alone. + * There is a chance these will be seen here. + */ + if (fp == stdout || fp == stdin || fp == stderr) + return fflush(fp); + + /* + * locate the appropriate proxy + */ + trace(("glue_fflush()\n{\n"/*}*/)); + result = EOF; + gfp = (glue_file_ty *)fp; + assert(gfp->guard1 == GUARD1); + assert(gfp->guard2 == GUARD2); + pp = gfp->pp; + + /* + * if the stream is in an error state, + * don't do anything + */ + if (gfp->errno) + { + errno = gfp->errno; + goto done; + } + if (gfp->fmode == O_RDONLY) + { + gfp->errno = EINVAL; + errno = EINVAL; + goto done; + } + + /* + * if there is anything in the buffer, + * send it to the proxy + */ + if (gfp->buffer_pos && gfp->buffer_pos > gfp->buffer) + { + long nbytes; + long nbytes2; + + putc(command_write, pp->command); + put_int(pp->command, gfp->fd); + nbytes = gfp->buffer_pos - gfp->buffer; + put_long(pp->command, nbytes); + put_binary(pp->command, gfp->buffer, nbytes); + end_of_command(pp); + nbytes2 = get_long(pp->reply); + if (nbytes2 < 0) + { + gfp->errno = get_int(pp->reply); + errno = gfp->errno; + goto done; + } + if (nbytes2 != nbytes) + { + gfp->errno = EIO; + errno = EIO; + goto done; + } + gfp->buffer_pos = gfp->buffer; + gfp->buffer_end = gfp->buffer + sizeof(gfp->buffer); + } + result = 0; + + /* + * here for all exits + */ + done: + trace(("return %d; /* errno = %d */\n", result, errno)); + trace((/*{*/"}\n")); + return result; + } + + + int + glue_open(path, mode, perm) + char *path; + int mode; + int perm; + { + proxy_ty *pp; + int result; + + trace(("glue_open()\n{\n"/*}*/)); + pp = proxy_find(); + putc(command_open, pp->command); + put_string(pp->command, path); + put_int(pp->command, mode); + put_int(pp->command, perm); + end_of_command(pp); + result = get_int(pp->reply); + if (result < 0) + errno = get_int(pp->reply); + trace(("return %d; /* errno = %d */\n", result, errno)); + trace((/*{*/"}\n")); + return result; + } + + + int + glue_creat(path, mode) + char *path; + int mode; + { + proxy_ty *pp; + int result; + + trace(("glue_creat()\n{\n"/*}*/)); + pp = proxy_find(); + putc(command_creat, pp->command); + put_string(pp->command, path); + put_int(pp->command, mode); + end_of_command(pp); + result = get_int(pp->reply); + if (result < 0) + errno = get_int(pp->reply); + trace(("return %d; /* errno = %d */\n", result, errno)); + trace((/*{*/"}\n")); + return result; + } + + + int + glue_close(fd) + int fd; + { + proxy_ty *pp; + int result; + + trace(("glue_close()\n{\n"/*}*/)); + pp = proxy_find(); + putc(command_close, pp->command); + put_int(pp->command, fd); + end_of_command(pp); + result = get_int(pp->reply); + if (result) + { + errno = result; + result = -1; + } + trace(("return %d; /* errno = %d */\n", result, errno)); + trace((/*{*/"}\n")); + return result; + } + + + int + glue_write(fd, buf, len) + int fd; + char *buf; + long len; + { + proxy_ty *pp; + int result; + + trace(("glue_write()\n{\n"/*}*/)); + pp = proxy_find(); + putc(command_write, pp->command); + put_int(pp->command, fd); + put_long(pp->command, len); + put_binary(pp->command, buf, len); + end_of_command(pp); + result = get_int(pp->reply); + if (result) + { + errno = result; + result = -1; + } + trace(("return %d; /* errno = %d */\n", result, errno)); + trace((/*{*/"}\n")); + return result; + } + + + int + glue_fcntl(fd, cmd, data) + int fd; + int cmd; + struct flock *data; + { + proxy_ty *pp; + int result; + + trace(("glue_fcntl()\n{\n"/*}*/)); + assert(cmd == F_SETLKW || cmd == F_SETLK || cmd == F_UNLCK); + pp = proxy_find(); + putc(command_fcntl, pp->command); + put_int(pp->command, fd); + put_int(pp->command, cmd); + put_binary(pp->command, data, sizeof(*data)); + end_of_command(pp); + result = get_int(pp->reply); + get_binary(pp->reply, data, sizeof(*data)); + if (result) + { + errno = result; + result = -1; + } + trace(("return %d; /* errno = %d */\n", result, errno)); + trace((/*{*/"}\n")); + return result; + } + + + int + glue_read_whole_dir(path, data_p, data_len_p) + char *path; + char **data_p; + long *data_len_p; + { + static char *data; + static long data_max; + long data_len; + + trace(("glue_read_whole_dir(path = \"%s\")\n{\n"/*}*/, path)); + pp = proxy_find(); + putc(command_read_whole_dir, pp->command); + put_string(pp->command, path); + end_of_command(pp); + result = get_int(pp->reply); + if (result) + { + errno = result; + result = -1; + } + else + { + data_len = get_long(pp->reply); + if (data_len > data_max) + { + data_max = data_len; + if (!data) + data = mem_alloc(data_max); + else + mem_change_size(&data, data_max); + } + get_binary(pp->reply, data, data_len); + *data_len_p = data_len; + *data_p = data; + } + trace(("return %d; /* errno = %d */\n", result, errno)); + trace((/*{*/"}\n")); + return result; + } + + + #endif /* CONF_NO_seteuid */ + + + /* + * NAME + * copyfile - copy a file + * + * SYNOPSIS + * int copyfile(char *src, char *dst); + * + * DESCRIPTION + * The copyfile function complements the link and rename functions. + * + * ARGUMENTS + * src - pathname of source file + * dst - pathname of destination file + * + * RETURNS + * 0 on success + * -1 on error, setting errno appropriately + */ + + int + copyfile(src, dst) + char *src; + char *dst; + { + int src_fd; + int dst_fd; + char *buffer; + long max; + long nbytes; + long nbytes2; + int err; + int result; + + trace(("copyfile(\"%s\", \"%s\")\n{\n"/*}*/, src, dst)); + result = -1; + src_fd = open(src, O_RDONLY, 0666); + if (src_fd < 0) + goto done; + dst_fd = open(dst, O_WRONLY | O_CREAT | O_TRUNC, 0666); + if (dst_fd < 0) + { + err = errno; + close(src_fd); + errno = err; + goto done; + } + + max = 1L << 13; + errno = 0; + buffer = malloc(max); + if (!buffer) + { + err = errno ? errno : ENOMEM; + close(dst_fd); + close(src_fd); + errno = err; + goto done; + } + + for (;;) + { + nbytes = read(src_fd, buffer, max); + if (nbytes < 0) + { + err = errno; + close(src_fd); + close(dst_fd); + free(buffer); + errno = err; + goto done; + } + if (nbytes == 0) + break; + + nbytes2 = write(dst_fd, buffer, nbytes); + if (nbytes2 < 0) + { + err = errno; + close(src_fd); + close(dst_fd); + free(buffer); + errno = err; + goto done; + } + if (nbytes2 != nbytes) + { + close(src_fd); + close(dst_fd); + free(buffer); + errno = EIO; /* weird device, probably */ + goto done; + } + } + free(buffer); + if (close(src_fd)) + { + err = errno; + close(dst_fd); + errno = err; + goto done; + } + result = close(dst_fd); + + /* + * here for all exits + */ + done: + trace(("return %d; /* errno = %d */\n", result, errno)); + trace((/*{*/"}\n")); + return result; + } + + + /* + * NAME + * catfile - copy a file + * + * SYNOPSIS + * int catfile(char *path); + * + * DESCRIPTION + * The catfile function is used to print the contents of + * a file on the standard output. + * + * ARGUMENTS + * path - pathname of source file + * + * RETURNS + * 0 on success + * -1 on error, setting errno appropriately + */ + + int + catfile(path) + char *path; + { + int fd; + char *buffer; + long max; + long nbytes; + long nbytes2; + int err; + int result; + + trace(("catfile(\"%s\")\n{\n"/*}*/, path)); + result = -1; + fd = open(path, O_RDONLY, 0666); + if (fd < 0) + goto done; + + max = 1L << 13; + errno = 0; + buffer = malloc(max); + if (!buffer) + { + err = errno ? errno : ENOMEM; + close(fd); + errno = err; + goto done; + } + + for (;;) + { + nbytes = read(fd, buffer, max); + if (nbytes < 0) + { + err = errno; + close(fd); + free(buffer); + errno = err; + goto done; + } + if (nbytes == 0) + break; + + nbytes2 = write(fileno(stdout), buffer, nbytes); + if (nbytes2 < 0) + { + err = errno; + close(fd); + free(buffer); + errno = err; + goto done; + } + if (nbytes2 != nbytes) + { + close(fd); + free(buffer); + errno = EIO; /* weird device, probably */ + goto done; + } + } + free(buffer); + result = close(fd); + + /* + * here for all exits + */ + done: + trace(("return %d; /* errno = %d */\n", result, errno)); + trace((/*{*/"}\n")); + return result; + } + + + int + read_whole_dir(path, data_p, data_len_p) + char *path; + char **data_p; + long *data_len_p; + { + DIR *dp; + struct dirent *de; + static char *data; + static size_t data_len; + static size_t data_max; + char *np; + size_t len; + + errno = ENOMEM; + dp = opendir(path); + if (!dp) + return -1; + errno = 0; + if (!data) + { + data_max = 1000; + data = mem_alloc(data_max); + } + data_len = 0; + for (;;) + { + de = readdir(dp); + if (!de) + break; + np = de->d_name; + #ifdef CONF_pyramid_broken_readdir + np -= 2; + #endif + if (np[0] == '.' && (!np[1] || (np[1] == '.' && !np[2]))) + continue; + len = strlen(np) + 1; + if (data_len + len > data_max) + { + data_max += 1000; + mem_change_size(&data, data_max); + } + memcpy(data + data_len, np, len); + data_len += len; + } + closedir(dp); + *data_p = data; + *data_len_p = data_len; + return 0; + } Index: aegis/glue.h *************** *** 0 **** --- 1,109 ---- + /* + * aegis - project change supervisor + * Copyright (C) 1993 Peter Miller. + * All rights reserved. + * + * 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., 675 Mass Ave, Cambridge, MA 02139, USA. + * + * MANIFEST: interface definition for aegis/glue.c + */ + + #ifndef AEGIS_GLUE_H + #define AEGIS_GLUE_H + + #include + + #include + #include + + struct stat; + struct utimbuf; + struct flock; + + int copyfile _((char *src, char *dst)); + int catfile _((char *path)); + int read_whole_dir _((char *path, char **data, long *datalen)); + + #ifndef CONF_NO_seteuid + + /* + * seteuid works + */ + #define glue_access access + #define glue_catfile catfile + #define glue_chmod chmod + #define glue_chown chown + #define glue_close close + #define glue_creat creat + #define glue_copyfile copyfile + #define glue_fclose fclose + #define glue_fcntl fcntl + #define glue_ferror ferror + #define glue_fflush fflush + #define glue_fgetc getc + #define glue_fopen fopen + #define glue_fputc putc + #define glue_getcwd getcwd + #define glue_link link + #define glue_lstat lstat + #define glue_mkdir mkdir + #define glue_open open + #define glue_readlink readlink + #define glue_read_whole_dir read_whole_dir + #define glue_rename rename + #define glue_rmdir rmdir + #define glue_stat stat + #define glue_ungetc ungetc + #define glue_unlink unlink + #define glue_utime utime + #define glue_write write + + #else + + /* + * no seteuid call, or doesn't work correctly + */ + int glue_access _((char *path, int mode)); + int glue_catfile _((char *path)); + int glue_chmod _((char *path, int mode)); + int glue_chown _((char *path, int uid, int gid)); + int glue_close _((int fd)); + int glue_creat _((char *path, int mode)); + int glue_copyfile _((char *src, char *dst)); + int glue_fclose _((FILE *)); + int glue_fcntl _((int fd, int cmd, struct flock *)); + int glue_ferror _((FILE *)); + int glue_fflush _((FILE *)); + int glue_fgetc _((FILE *)); + FILE *glue_fopen _((char *path, char *mode)); + int glue_fputc _((int, FILE *)); + char *glue_getcwd _((char *buf, int max)); + int glue_link _((char *p1, char *p2)); + int glue_lstat _((char *path, struct stat *st)); + int glue_mkdir _((char *path, int mode)); + int glue_open _((char *path, int mode, int perm)); + int glue_readlink _((char *path, char *buf, int max)); + int glue_read_whole_dir _((char *path, char **data, long *datalen)); + int glue_rename _((char *p1, char *p2)); + int glue_rmdir _((char *path)); + int glue_stat _((char *path, struct stat *st)); + int glue_ungetc _((int, FILE *)); + int glue_unlink _((char *path)); + int glue_utime _((char *path, struct utimbuf *)); + int glue_write _((int fd, char *data, long len)); + + #endif /* seteuid alternatives */ + + #endif /* AEGIS_GLUE_H */ Index: aegis/gonzo.c *************** *** 1,12 **** /* * aegis - project change supervisor ! * Copyright (c) 1991-1992 Peter Miller. * All rights reserved. * * 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 1, 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 --- 1,12 ---- /* * aegis - project change supervisor ! * Copyright (C) 1991, 1992, 1993 Peter Miller. * All rights reserved. * * 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 *************** *** 41,51 **** #include #include ! typedef struct gonzo_t gonzo_t; ! struct gonzo_t { ! string_t *dir; ! string_t *gstate_filename; gstate gstate_data; int is_a_new_file; int modified; --- 41,51 ---- #include #include ! typedef struct gonzo_ty gonzo_ty; ! struct gonzo_ty { ! string_ty *dir; ! string_ty *gstate_filename; gstate gstate_data; int is_a_new_file; int modified; *************** *** 54,76 **** }; static size_t ngonzos; ! static gonzo_t **gonzo; static int done_tail; ! static user_t *gonzo_user _((void)); ! static user_t * gonzo_user() { ! static user_t *u; if (!u) { ! string_t *s; s = str_from_c(AEGIS_USER); ! u = user_symbolic((project_t *)0, s); u->umask = 022; str_free(s); } --- 54,76 ---- }; static size_t ngonzos; ! static gonzo_ty **gonzo; static int done_tail; ! static user_ty *gonzo_user _((void)); ! static user_ty * gonzo_user() { ! static user_ty *u; if (!u) { ! string_ty *s; s = str_from_c(AEGIS_USER); ! u = user_symbolic((project_ty *)0, s); u->umask = 022; str_free(s); } *************** *** 78,90 **** } ! static int is_temporary _((string_t *)); static int is_temporary(s) ! string_t *s; { ! return !strncmp(s->str_text, "/tmp/", 5); } --- 78,97 ---- } ! static int is_temporary _((string_ty *)); static int is_temporary(s) ! string_ty *s; { ! return ! ( ! !strncmp(s->str_text, "/tmp/", 5) ! || ! !strncmp(s->str_text, "/usr/tmp/", 9) ! || ! !strncmp(s->str_text, "/var/tmp/", 9) ! ); } *************** *** 92,100 **** gonzo_library_append(s) char *s; { ! gonzo_t *gp; ! string_t *tmp; ! string_t *dir; /* * resolve the pathname --- 99,107 ---- gonzo_library_append(s) char *s; { ! gonzo_ty *gp; ! string_ty *tmp; ! string_ty *dir; /* * resolve the pathname *************** *** 104,110 **** assert(!done_tail); tmp = str_from_c(s); os_become_orig(); ! dir = os_pathname(tmp); os_become_undo(); str_free(tmp); --- 111,117 ---- assert(!done_tail); tmp = str_from_c(s); os_become_orig(); ! dir = os_pathname(tmp, 1); os_become_undo(); str_free(tmp); *************** *** 111,130 **** /* * append the new entry to the end of the list */ ! gp = (gonzo_t *)mem_alloc_clear(sizeof(gonzo_t)); gp->dir = dir; gp->temporary = is_temporary(dir); gp->gstate_filename = str_format("%S/state", gp->dir); ! *(gonzo_t **)enlarge(&ngonzos, (char **)&gonzo, sizeof(gonzo_t *)) = gp; trace((/*{*/"}\n")); } ! static void lock_sync _((gonzo_t *)); static void lock_sync(gp) ! gonzo_t *gp; { long n; --- 118,143 ---- /* * append the new entry to the end of the list */ ! gp = (gonzo_ty *)mem_alloc_clear(sizeof(gonzo_ty)); gp->dir = dir; gp->temporary = is_temporary(dir); gp->gstate_filename = str_format("%S/state", gp->dir); ! *(gonzo_ty **) ! enlarge ! ( ! &ngonzos, ! (char **)&gonzo, sizeof(gonzo_ty *) ! ) = ! gp; trace((/*{*/"}\n")); } ! static void lock_sync _((gonzo_ty *)); static void lock_sync(gp) ! gonzo_ty *gp; { long n; *************** *** 145,155 **** ! static gstate gonzo_gstate_get _((gonzo_t *)); static gstate gonzo_gstate_get(gp) ! gonzo_t *gp; { trace(("gonzo_gstate_get(gp = %08lX)\n{\n"/*}*/, gp)); lock_sync(gp); --- 158,168 ---- ! static gstate gonzo_gstate_get _((gonzo_ty *)); static gstate gonzo_gstate_get(gp) ! gonzo_ty *gp; { trace(("gonzo_gstate_get(gp = %08lX)\n{\n"/*}*/, gp)); lock_sync(gp); *************** *** 170,178 **** gstate_read_file(gp->gstate_filename->str_text); } else ! gp->gstate_data = gstate_type.alloc(); if (!gp->gstate_data->where) ! gp->gstate_data->where = gstate_where_list_type.alloc(); gonzo_become_undo(); } trace(("return %08lX;\n", gp->gstate_data)); --- 183,193 ---- gstate_read_file(gp->gstate_filename->str_text); } else ! gp->gstate_data = (gstate)gstate_type.alloc(); if (!gp->gstate_data->where) ! gp->gstate_data->where = ! (gstate_where_list) ! gstate_where_list_type.alloc(); gonzo_become_undo(); } trace(("return %08lX;\n", gp->gstate_data)); *************** *** 186,192 **** * construct_library_directory * * SYNOPSIS ! * void construct_library_directory(gonzo_t *gp); * * DESCRIPTION * The construct_library_directory function is used to --- 201,207 ---- * construct_library_directory * * SYNOPSIS ! * void construct_library_directory(gonzo_ty *gp); * * DESCRIPTION * The construct_library_directory function is used to *************** *** 214,229 **** * foreign "root" users to the "unknown" user instead. */ ! static void construct_library_directory _((gonzo_t *)); static void construct_library_directory(gp) ! gonzo_t *gp; { int exists; ! string_t *above; ! string_t *above2; ! string_t *root; int mode; /* --- 229,244 ---- * foreign "root" users to the "unknown" user instead. */ ! static void construct_library_directory _((gonzo_ty *)); static void construct_library_directory(gp) ! gonzo_ty *gp; { int exists; ! string_ty *above; ! string_ty *above2; ! string_ty *root; int mode; /* *************** *** 285,298 **** } ! static void gonzo_gstate_write_sub _((gonzo_t *)); static void gonzo_gstate_write_sub(gp) ! gonzo_t *gp; { ! string_t *filename_new; ! string_t *filename_old; static int count; if (!gp->modified) --- 300,313 ---- } ! static void gonzo_gstate_write_sub _((gonzo_ty *)); static void gonzo_gstate_write_sub(gp) ! gonzo_ty *gp; { ! string_ty *filename_new; ! string_ty *filename_old; static int count; if (!gp->modified) *************** *** 335,342 **** static void do_tail() { ! string_t *s1; ! string_t *s2; char *cp; wlist path; size_t j; --- 350,357 ---- static void do_tail() { ! string_ty *s1; ! string_ty *s2; char *cp; wlist path; size_t j; *************** *** 393,405 **** } ! static gonzo_t *gonzo_nth _((size_t)); ! static gonzo_t * gonzo_nth(j) size_t j; { ! gonzo_t *result; trace(("gonzo_nth(j = %ld)\n{\n"/*}*/, j)); do_tail(); --- 408,420 ---- } ! static gonzo_ty *gonzo_nth _((size_t)); ! static gonzo_ty * gonzo_nth(j) size_t j; { ! gonzo_ty *result; trace(("gonzo_nth(j = %ld)\n{\n"/*}*/, j)); do_tail(); *************** *** 417,423 **** gonzo_gstate_write() { size_t j; ! gonzo_t *gp; trace(("gonzo_gstate_write()\n{\n"/*}*/)); for (j = 0; ; ++j) --- 432,438 ---- gonzo_gstate_write() { size_t j; ! gonzo_ty *gp; trace(("gonzo_gstate_write()\n{\n"/*}*/)); for (j = 0; ; ++j) *************** *** 431,446 **** } ! static string_t *gonzo_project_home_path_sub _((gonzo_t *, string_t *)); ! static string_t * gonzo_project_home_path_sub(gp, name) ! gonzo_t *gp; ! string_t *name; { gstate gstate_data; size_t j; ! string_t *result; /* * find the project in the gstate --- 446,461 ---- } ! static string_ty *gonzo_project_home_path_sub _((gonzo_ty *, string_ty *)); ! static string_ty * gonzo_project_home_path_sub(gp, name) ! gonzo_ty *gp; ! string_ty *name; { gstate gstate_data; size_t j; ! string_ty *result; /* * find the project in the gstate *************** *** 466,479 **** } ! string_t * gonzo_project_home_path_from_name(name) ! string_t *name; { ! gonzo_t *gp; size_t j; ! string_t *result; ! string_t *s; /* * find the project in the gstate list --- 481,494 ---- } ! string_ty * gonzo_project_home_path_from_name(name) ! string_ty *name; { ! gonzo_ty *gp; size_t j; ! string_ty *result; ! string_ty *s; /* * find the project in the gstate list *************** *** 504,510 **** { size_t n; size_t j; ! gonzo_t *gp; gstate gstate_data; trace(("gonzo_project_list(result = %08lX)\n{\n"/*}*/, result)); --- 519,525 ---- { size_t n; size_t j; ! gonzo_ty *gp; gstate gstate_data; trace(("gonzo_project_list(result = %08lX)\n{\n"/*}*/, result)); *************** *** 539,545 **** void gonzo_project_list_user(uname, result) ! string_t *uname; wlist *result; { size_t n; --- 554,560 ---- void gonzo_project_list_user(uname, result) ! string_ty *uname; wlist *result; { size_t n; *************** *** 550,558 **** wl_zero(result); for (n = 0; ; ++n) { ! string_t *ustate_path; ustate ustate_data; ! gonzo_t *gp; gp = gonzo_nth(n); if (!gp) --- 565,573 ---- wl_zero(result); for (n = 0; ; ++n) { ! string_ty *ustate_path; ustate ustate_data; ! gonzo_ty *gp; gp = gonzo_nth(n); if (!gp) *************** *** 573,579 **** ustate_data = ustate_read_file(ustate_path->str_text); gonzo_become_undo(); if (!ustate_data->own) ! ustate_data->own = ustate_own_type.alloc(); str_free(ustate_path); /* --- 588,596 ---- ustate_data = ustate_read_file(ustate_path->str_text); gonzo_become_undo(); if (!ustate_data->own) ! ustate_data->own = ! (ustate_own_list) ! ustate_own_list_type.alloc(); str_free(ustate_path); /* *************** *** 598,609 **** void gonzo_project_add(pp) ! project_t *pp; { gstate_where *addr_p; gstate_where addr; ! gonzo_t *gp; ! type_t *type_p; trace(("gonzo_project_add(pp = %08lX)\n{\n"/*}*/, pp)); gp = gonzo_nth(0); --- 615,626 ---- void gonzo_project_add(pp) ! project_ty *pp; { gstate_where *addr_p; gstate_where addr; ! gonzo_ty *gp; ! type_ty *type_p; trace(("gonzo_project_add(pp = %08lX)\n{\n"/*}*/, pp)); gp = gonzo_nth(0); *************** *** 613,619 **** &type_p, (void **)&addr_p ); ! addr = gstate_where_type.alloc(); *addr_p = addr; trace_pointer(addr); addr->project_name = str_copy(project_name_get(pp)); --- 630,636 ---- &type_p, (void **)&addr_p ); ! addr = (gstate_where)gstate_where_type.alloc(); *addr_p = addr; trace_pointer(addr); addr->project_name = str_copy(project_name_get(pp)); *************** *** 623,629 **** --- 640,720 ---- } + static int gonzo_project_delete_sub _((gonzo_ty *, project_ty *)); + + static int + gonzo_project_delete_sub(gp, pp) + gonzo_ty *gp; + project_ty *pp; + { + gstate gstate_data; + size_t j; + int result; + + /* + * find the project in the gstate + */ + trace(("gonzo_project_delete_sub(gp = %08lX, pp = %08lX)\n{\n"/*}*/, + gp, pp)); + gstate_data = gonzo_gstate_get(gp); + assert(gstate_data->where); + result = 0; + for (j = 0; j < gstate_data->where->length; ++j) + { + gstate_where addr; + long k; + + addr = gstate_data->where->list[j]; + if (!str_equal(addr->project_name, project_name_get(pp))) + continue; + + /* + * delete the item from the list + */ + for (k = j + 1; k < gstate_data->where->length; ++k) + gstate_data->where->list[k - 1] = + gstate_data->where->list[k]; + gstate_data->where->length--; + + /* + * free the item + */ + gstate_where_type.free(addr); + + /* + * mark this gstate file as modified + */ + gp->modified = 1; + result = 1; + break; + } + trace(("return %d;\n", result)); + trace((/*{*/"}\n")); + return result; + } + + void + gonzo_project_delete(pp) + project_ty *pp; + { + gonzo_ty *gp; + long j; + + trace(("gonzo_project_delete(pp = %08lX)\n{\n"/*}*/, pp)); + for (j = 0; ; ++j) + { + gp = gonzo_nth(j); + if (!gp) + break; + if (gonzo_project_delete_sub(gp, pp)) + break; + } + trace((/*{*/"}\n")); + } + + + void gonzo_gstate_lock_prepare_new() { trace(("gonzo_gstate_lock_prepare_new()\n{\n"/*}*/)); *************** *** 632,642 **** } ! string_t * gonzo_lockpath_get() { ! static string_t *path; ! gonzo_t *gp; trace(("gonzo_lockpath_get()\n{\n"/*}*/)); if (!path) --- 723,733 ---- } ! string_ty * gonzo_lockpath_get() { ! static string_ty *path; ! gonzo_ty *gp; trace(("gonzo_lockpath_get()\n{\n"/*}*/)); if (!path) *************** *** 652,663 **** } ! static int gonzo_ustate_path_sub _((gonzo_t *, string_t *)); static int gonzo_ustate_path_sub(gp, project_name) ! gonzo_t *gp; ! string_t *project_name; { gstate gstate_data; size_t j; --- 743,754 ---- } ! static int gonzo_ustate_path_sub _((gonzo_ty *, string_ty *)); static int gonzo_ustate_path_sub(gp, project_name) ! gonzo_ty *gp; ! string_ty *project_name; { gstate gstate_data; size_t j; *************** *** 687,701 **** } ! string_t * gonzo_ustate_path(project_name, user_name) ! string_t *project_name; ! string_t *user_name; { ! gonzo_t *gp; size_t j; ! string_t *dir; ! string_t *result; /* * find the project in the gstate list --- 778,792 ---- } ! string_ty * gonzo_ustate_path(project_name, user_name) ! string_ty *project_name; ! string_ty *user_name; { ! gonzo_ty *gp; size_t j; ! string_ty *dir; ! string_ty *result; /* * find the project in the gstate list Index: aegis/gonzo.h *************** *** 1,12 **** /* * aegis - project change supervisor ! * Copyright (c) 1991-1992 Peter Miller. * All rights reserved. * * 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 1, 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 --- 1,12 ---- /* * aegis - project change supervisor ! * Copyright (C) 1991, 1992, 1993 Peter Miller. * All rights reserved. * * 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 *************** *** 27,47 **** #include struct wlist; ! struct project_t; void gonzo_gstate_write _((void)); void gonzo_library_append _((char *path)); ! struct string_t *gonzo_project_home_path_from_name _((struct string_t *)); void gonzo_project_list _((struct wlist *result)); ! void gonzo_project_list_user _((string_t *, struct wlist *result)); ! void gonzo_project_add _((struct project_t *)); void gonzo_gstate_write _((void)); void gonzo_gstate_lock_prepare_new _((void)); ! string_t *gonzo_lockpath_get _((void)); ! string_t *gonzo_ustate_path _((string_t *project_name, string_t *user_name)); void gonzo_become _((void)); void gonzo_become_undo _((void)); --- 27,48 ---- #include struct wlist; ! struct project_ty; void gonzo_gstate_write _((void)); void gonzo_library_append _((char *path)); ! struct string_ty *gonzo_project_home_path_from_name _((struct string_ty *)); void gonzo_project_list _((struct wlist *result)); ! void gonzo_project_list_user _((string_ty *, struct wlist *result)); ! void gonzo_project_add _((struct project_ty *)); ! void gonzo_project_delete _((struct project_ty *)); void gonzo_gstate_write _((void)); void gonzo_gstate_lock_prepare_new _((void)); ! string_ty *gonzo_lockpath_get _((void)); ! string_ty *gonzo_ustate_path _((string_ty *project_name, string_ty *user_name)); void gonzo_become _((void)); void gonzo_become_undo _((void)); Index: aegis/gram.h *************** *** 1,12 **** /* * aegis - project change supervisor ! * Copyright (c) 1992 Peter Miller. * All rights reserved. * * 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 1, 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 --- 1,12 ---- /* * aegis - project change supervisor ! * Copyright (C) 1992, 1993 Peter Miller. * All rights reserved. * * 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 Index: aegis/gram.y *************** *** 1,12 **** /* * aegis - project change supervisor ! * Copyright (c) 1991-1992 Peter Miller. * All rights reserved. * * 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 1, 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 --- 1,12 ---- /* * aegis - project change supervisor ! * Copyright (C) 1991, 1992, 1993 Peter Miller. * All rights reserved. * * 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 *************** *** 37,44 **** %union { ! string_t *lv_string; ! long lv_integer; } %type NAME STRING --- 37,44 ---- %union { ! string_ty *lv_string; ! long lv_integer; } %type NAME STRING Index: aegis/gstate.def *************** *** 1,12 **** /* * aegis - project change supervisor ! * Copyright (c) 1991-1992 Peter Miller. * All rights reserved. * * 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 1, 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 --- 1,12 ---- /* * aegis - project change supervisor ! * Copyright (C) 1991, 1992, 1993 Peter Miller. * All rights reserved. * * 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 Index: aegis/help.c *************** *** 1,12 **** /* * aegis - project change supervisor ! * Copyright (c) 1991-1993 Peter Miller. * All rights reserved. * * 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 1, 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 --- 1,12 ---- /* * aegis - project change supervisor ! * Copyright (C) 1991, 1992, 1993 Peter Miller. * All rights reserved. * * 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 *************** *** 39,45 **** static char *cr[] = { ! "%s version %v, Copyright (c) 1991-1993 Peter Miller.", "All rights reserved.", "", "The %s program comes with ABSOLUTELY NO WARRANTY;", --- 39,46 ---- static char *cr[] = { ! "%s version %v", ! "Copyright (C) 1990, 1991, 1992, 1993 Peter Miller.", "All rights reserved.", "", "The %s program comes with ABSOLUTELY NO WARRANTY;", *************** *** 51,58 **** static char *au[] = { ! "Peter Miller\tUUCP\tuunet!munnari!bmr.gov.au!pmiller", ! "/\\/\\*\t\tCSNET\tpmiller@bmr.gov.au", }; --- 52,59 ---- static char *au[] = { ! "Peter Miller UUCP uunet!munnari!bmr.gov.au!pmiller", ! "/\\/\\* Internet pmiller@bmr.gov.au", }; Index: aegis/help.h *************** *** 1,12 **** /* * aegis - project change supervisor ! * Copyright (c) 1991-1992 Peter Miller. * All rights reserved. * * 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 1, 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 --- 1,12 ---- /* * aegis - project change supervisor ! * Copyright (C) 1991, 1992, 1993 Peter Miller. * All rights reserved. * * 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 Index: aegis/indent.c *************** *** 0 **** --- 1,269 ---- + /* + * aegis - project change supervisor + * Copyright (C) 1991, 1992, 1993 Peter Miller. + * All rights reserved. + * + * 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., 675 Mass Ave, Cambridge, MA 02139, USA. + * + * MANIFEST: functions to automatically indent output + */ + + #include + #include + + #include + #include + #include + #include + #include + + + #define INDENT 8 + + static FILE *fp; + static char *fn; + static int depth; + static int in_col; + static int out_col; + static int continuation_line; + + + /* + * Function Name: + * indent_more + * + * Description: + * The indent_more function is used to increase the indenting + * beyond the automatically calculated indent. + * + * Preconditions: + * There must be a matching indent_less call. + * + * validataion: + * none + * + * Passed: + * nothing + * + * Returns: + * nothing + */ + + void + indent_more() + { + ++depth; + } + + + /* + * Function Name: + * indent_less + * + * Description: + * The indent_less function is used to decrease the indenting + * to less than the automatically calculated indent. + * + * Preconditions: + * There must be a matching indent_more call. + * + * validataion: + * none + * + * Passed: + * nothing + * + * Returns: + * nothing + */ + + void + indent_less() + { + --depth; + } + + + /* + * Function Name: + * indent_putchar + * + * Description: + * The indent_putchar function is used to emity characters. + * It keeps track of (){}[] pairs and indents between them. + * Leading whitespace is suppressed and replaced with its own + * idea of indenting. + * + * Preconditions: + * none + * + * validation: + * none + * + * Passed: + * 'c' the character to emit. + */ + + void + indent_putchar(c) + char c; + { + assert(fp); + switch (c) + { + case '\n': + glue_fputc('\n', fp); + #ifdef DEBUG + glue_fflush(fp); + #endif + in_col = 0; + out_col = 0; + if (continuation_line == 1) + continuation_line = 2; + else + continuation_line = 0; + break; + + case ' ': + if (out_col) + ++in_col; + break; + + case '\t': + if (out_col) + in_col = (in_col / INDENT + 1) * INDENT; + break; + + case '\1': + if (!out_col) + break; + if (in_col >= INDENT * (depth + 2)) + ++in_col; + else + in_col = INDENT * (depth + 2); + break; + + case /*{*/'}': + case /*(*/')': + case /*[*/']': + --depth; + /* fall through */ + + default: + if (!out_col && c != '#' && continuation_line != 2) + in_col += INDENT * depth; + while (((out_col + 8) & -8) <= in_col && out_col + 1 < in_col) + { + glue_fputc('\t', fp); + out_col = (out_col + 8) & -8; + } + while (out_col < in_col) + { + glue_fputc(' ', fp); + ++out_col; + } + if (c == '{'/*}*/ || c == '('/*)*/ || c == '['/*]*/) + ++depth; + glue_fputc(c, fp); + in_col++; + out_col = in_col; + continuation_line = (c == '\\'); + break; + } + if (glue_ferror(fp)) + nfatal("write \"%s\"", fn); + } + + + /* + * Function Name: + * indent_printf + * + * Description: + * As putchar is to indent_putchasr, printf is to indent_printf. + * + * Preconditions: + * none + * + * Validation: + * none + * + * Passed: + * 's' format string + * ... and optional arguments + * + * Returns: + * nothing + */ + + /*VARARGS1*/ + void + indent_printf(s sva_last) + char *s; + sva_last_decl + { + va_list ap; + char buffer[2000]; + + sva_init(ap, s); + vsprintf(buffer, s, ap); + va_end(ap); + for (s = buffer; *s; ++s) + indent_putchar(*s); + } + + + void + indent_open(s) + char *s; + { + trace(("indent_open(s = %08lX)\n{\n"/*}*/, s)); + if (!s) + { + fp = stdout; + s = "(stdout)"; + } + else + { + trace_string(s); + fp = glue_fopen(s, "w"); + if (!fp) + nfatal("open \"%s\"", s); + } + trace_pointer(fp); + fn = s; + depth = 0; + in_col = 0; + out_col = 0; + continuation_line = 0; + trace((/*{*/"}\n")); + } + + + void + indent_close() + { + trace(("indent_close()\n{\n"/*}*/)); + trace_pointer(fp); + if (out_col) + indent_putchar('\n'); + if (glue_fflush(fp)) + nfatal("write \"%s\"", fn); + if (fp != stdout && glue_fclose(fp)) + nfatal("close \"%s\"", fn); + fp = 0; + fn = 0; + trace((/*{*/"}\n")); + } Index: aegis/indent.h *************** *** 0 **** --- 1,35 ---- + /* + * aegis - project change supervisor + * Copyright (C) 1991, 1992, 1993 Peter Miller. + * All rights reserved. + * + * 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., 675 Mass Ave, Cambridge, MA 02139, USA. + * + * MANIFEST: interface definition for aegis/indent.c + */ + + #ifndef INDENT_H + #define INDENT_H + + #include + + void indent_close _((void)); + void indent_less _((void)); + void indent_more _((void)); + void indent_open _((char *)); + void indent_printf _((char *, ...)); + void indent_putchar _((int)); + + #endif /* INDENT_H */ Index: aegis/integra1.c *************** *** 1,12 **** /* * aegis - project change supervisor ! * Copyright (c) 1991-1992 Peter Miller. * All rights reserved. * * 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 1, 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 --- 1,12 ---- /* * aegis - project change supervisor ! * Copyright (C) 1991, 1992, 1993 Peter Miller. * All rights reserved. * * 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 *************** *** 86,99 **** "", " -Project ", " This option may be used to select the project of", ! " interest. When no -Project option is specified, if", ! " the user is only working on changes within a single", ! " project, the project name defaults to that project;", ! " if the user is currently working on changes to more", ! " than one project, or is not working on changes to", ! " any project, the user's $HOME/.%src file is", ! " examined for a default project field (see aeuconf(5)", ! " for more information).", "", " -TERse", " This option may be used to cause listings to", --- 86,99 ---- "", " -Project ", " This option may be used to select the project of", ! " interest. When no -Project option is specified, the", ! " AEGIS_PROJECT environment variable is consulted. If", ! " that does not exist, the user's $HOME/.aegisrc file", ! " is examined for a default project field (see", ! " aeuconf(5) for more information). If that does not", ! " exist, when the user is only working on changes", ! " within a single project, the project name defaults", ! " to that project. Otherwise, it is an error.", "", " -TERse", " This option may be used to cause listings to", *************** *** 107,117 **** " option this option causes column headings to be", " added.", "", ! " All options are case insensitive. Options may be", ! " abbreviated; the abbreviation is the upper case letters.", " Options and other command line arguments may be mixed", ! " arbitrarily on the command line.", "", "RECOMMENDED ALIAS", " The recommended alias for this command is", " csh%% alias aeni '%s -ni \\!* -v'", --- 107,135 ---- " option this option causes column headings to be", " added.", "", ! " All options may be abbreviated; the abbreviation is", ! " documented as the upper case letters, all lower case", ! " letters and underscores (_) are optional. You must use", ! " consecutive sequences of optional letters.", ! "", ! " All options are case insensitive, you may type them in", ! " upper case or lower case or a combination of both, case", ! " is not important.", ! "", ! " For example: the arguments \"-project, \"-PROJ\" and \"-p\"", ! " are all interpreted to mean the -Project option. The", ! " argument \"-prj\" will not be understood, because", ! " consecutive optional characters were not supplied.", ! "", " Options and other command line arguments may be mixed", ! " arbitrarily on the command line, after the function", ! " selectors.", "", + " The GNU long option names are understood. Since all", + " option names for aegis are long, this means ignoring the", + " extra leading '-'. The \"--option=value\" convention is", + " also understood.", + "", "RECOMMENDED ALIAS", " The recommended alias for this command is", " csh%% alias aeni '%s -ni \\!* -v'", *************** *** 143,149 **** integrator_list(usage) void (*usage)_((void)); { ! string_t *project_name; trace(("integrator_list()\n{\n"/*}*/)); arglex(); --- 161,167 ---- integrator_list(usage) void (*usage)_((void)); { ! string_ty *project_name; trace(("integrator_list()\n{\n"/*}*/)); arglex(); *************** *** 179,190 **** new_integrator_main() { wlist wl; ! string_t *s1; pstate pstate_data; int j; ! string_t *project_name; ! project_t *pp; ! user_t *up; trace(("new_integrator_main()\n{\n"/*}*/)); wl_zero(&wl); --- 197,208 ---- new_integrator_main() { wlist wl; ! string_ty *s1; pstate pstate_data; int j; ! string_ty *project_name; ! project_ty *pp; ! user_ty *up; trace(("new_integrator_main()\n{\n"/*}*/)); wl_zero(&wl); *************** *** 257,263 **** */ for (j = 0; j < wl.wl_nwords; ++j) { ! user_t *candidate; /* * make sure the user isn't already there --- 275,281 ---- */ for (j = 0; j < wl.wl_nwords; ++j) { ! user_ty *candidate; /* * make sure the user isn't already there *************** *** 411,421 **** " option this option causes column headings to be", " added.", "", ! " All options are case insensitive. Options may be", ! " abbreviated; the abbreviation is the upper case letters.", " Options and other command line arguments may be mixed", ! " arbitrarily on the command line.", "", "RECOMMENDED ALIAS", " The recommended alias for this command is", " csh%% alias aeri '%s -ri \\!* -v'", --- 429,457 ---- " option this option causes column headings to be", " added.", "", ! " All options may be abbreviated; the abbreviation is", ! " documented as the upper case letters, all lower case", ! " letters and underscores (_) are optional. You must use", ! " consecutive sequences of optional letters.", ! "", ! " All options are case insensitive, you may type them in", ! " upper case or lower case or a combination of both, case", ! " is not important.", ! "", ! " For example: the arguments \"-project, \"-PROJ\" and \"-p\"", ! " are all interpreted to mean the -Project option. The", ! " argument \"-prj\" will not be understood, because", ! " consecutive optional characters were not supplied.", ! "", " Options and other command line arguments may be mixed", ! " arbitrarily on the command line, after the function", ! " selectors.", "", + " The GNU long option names are understood. Since all", + " option names for aegis are long, this means ignoring the", + " extra leading '-'. The \"--option=value\" convention is", + " also understood.", + "", "RECOMMENDED ALIAS", " The recommended alias for this command is", " csh%% alias aeri '%s -ri \\!* -v'", *************** *** 447,458 **** remove_integrator_main() { wlist wl; ! string_t *s1; pstate pstate_data; int j; ! string_t *project_name; ! project_t *pp; ! user_t *up; trace(("remove_integrator_main()\n{\n"/*}*/)); wl_zero(&wl); --- 483,494 ---- remove_integrator_main() { wlist wl; ! string_ty *s1; pstate pstate_data; int j; ! string_ty *project_name; ! project_ty *pp; ! user_ty *up; trace(("remove_integrator_main()\n{\n"/*}*/)); wl_zero(&wl); *************** *** 525,531 **** */ for (j = 0; j < wl.wl_nwords; ++j) { ! user_t *candidate; candidate = user_symbolic(pp, wl.wl_word[j]); if (!project_integrator_query(pp, user_name(candidate))) --- 561,567 ---- */ for (j = 0; j < wl.wl_nwords; ++j) { ! user_ty *candidate; candidate = user_symbolic(pp, wl.wl_word[j]); if (!project_integrator_query(pp, user_name(candidate))) Index: aegis/integra1.h *************** *** 1,12 **** /* * aegis - project change supervisor ! * Copyright (c) 1991-1992 Peter Miller. * All rights reserved. * * 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 1, 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 --- 1,12 ---- /* * aegis - project change supervisor ! * Copyright (C) 1991, 1992, 1993 Peter Miller. * All rights reserved. * * 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 Index: aegis/integra2.c *************** *** 1,12 **** /* * aegis - project change supervisor ! * Copyright (c) 1991-1992 Peter Miller. * All rights reserved. * * 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 1, 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 --- 1,12 ---- /* * aegis - project change supervisor ! * Copyright (C) 1991, 1992, 1993 Peter Miller. * All rights reserved. * * 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 *************** *** 110,118 **** "", " -Change ", " This option may be used to specify a particular", ! " change within a project. If the user is only", ! " working on one change within a project, that is", ! " the default change number.", "", " -Help", " This option may be used to obtain more", --- 110,123 ---- "", " -Change ", " This option may be used to specify a particular", ! " change within a project. When no -Change option is", ! " specified, the AEGIS_CHANGE environment variable is", ! " consulted. If that does not exist, the user's", ! " $HOME/.aegisrc file is examined for a default change", ! " field (see aeuconf(5) for more information). If", ! " that does not exist, when the user is only working", ! " on one change within a project, that is the default", ! " change number. Otherwise, it is an error.", "", " -Help", " This option may be used to obtain more", *************** *** 132,145 **** "", " -Project ", " This option may be used to select the project of", ! " interest. When no -Project option is specified, if", ! " the user is only working on changes within a single", ! " project, the project name defaults to that project;", ! " if the user is currently working on changes to more", ! " than one project, or is not working on changes to", ! " any project, the user's $HOME/.%src file is", ! " examined for a default project field (see aeuconf(5)", ! " for more information).", "", " -TERse", " This option may be used to cause listings to", --- 137,150 ---- "", " -Project ", " This option may be used to select the project of", ! " interest. When no -Project option is specified, the", ! " AEGIS_PROJECT environment variable is consulted. If", ! " that does not exist, the user's $HOME/.aegisrc file", ! " is examined for a default project field (see", ! " aeuconf(5) for more information). If that does not", ! " exist, when the user is only working on changes", ! " within a single project, the project name defaults", ! " to that project. Otherwise, it is an error.", "", " -TERse", " This option may be used to cause listings to", *************** *** 153,163 **** " option this option causes column headings to be", " added.", "", ! " All options are case insensitive. Options may be", ! " abbreviated; the abbreviation is the upper case letters.", " Options and other command line arguments may be mixed", ! " arbitrarily on the command line.", "", "RECOMMENDED ALIAS", " The recommended alias for this command is", " csh%% alias aeib '%s -ib \\!* -v'", --- 158,186 ---- " option this option causes column headings to be", " added.", "", ! " All options may be abbreviated; the abbreviation is", ! " documented as the upper case letters, all lower case", ! " letters and underscores (_) are optional. You must use", ! " consecutive sequences of optional letters.", ! "", ! " All options are case insensitive, you may type them in", ! " upper case or lower case or a combination of both, case", ! " is not important.", ! "", ! " For example: the arguments \"-project, \"-PROJ\" and \"-p\"", ! " are all interpreted to mean the -Project option. The", ! " argument \"-prj\" will not be understood, because", ! " consecutive optional characters were not supplied.", ! "", " Options and other command line arguments may be mixed", ! " arbitrarily on the command line, after the function", ! " selectors.", "", + " The GNU long option names are understood. Since all", + " option names for aegis are long, this means ignoring the", + " extra leading '-'. The \"--option=value\" convention is", + " also understood.", + "", "RECOMMENDED ALIAS", " The recommended alias for this command is", " csh%% alias aeib '%s -ib \\!* -v'", *************** *** 198,204 **** static void integrate_begin_list() { ! string_t *project_name; trace(("integrate_begin_list()\n{\n"/*}*/)); arglex(); --- 221,227 ---- static void integrate_begin_list() { ! string_ty *project_name; trace(("integrate_begin_list()\n{\n"/*}*/)); arglex(); *************** *** 232,264 **** } ! static void link_tree_callback_minimum _((void *, dir_walk_message_t, ! string_t *, struct stat *)); static void link_tree_callback_minimum(arg, message, path, st) void *arg; ! dir_walk_message_t message; ! string_t *path; struct stat *st; { ! string_t *s1; ! string_t *s2; ! change_t *cp; pstate_src src; trace(("link_tree_callback_minimum(message = %d, path = %08lX, \ st = %08lX)\n{\n"/*}*/, message, path, st)); ! cp = (change_t *)arg; assert(cp); trace_string(path->str_text); ! s1 = os_below_dir(project_baseline_path_get(cp->pp), path); assert(s1); trace_string(s1->str_text); if (!s1->str_length) ! s2 = str_copy(change_integration_directory_get(cp)); else ! s2 = str_format("%S/%S", change_integration_directory_get(cp), s1); trace_string(s2->str_text); switch (message) { --- 255,287 ---- } ! static void link_tree_callback_minimum _((void *, dir_walk_message_ty, ! string_ty *, struct stat *)); static void link_tree_callback_minimum(arg, message, path, st) void *arg; ! dir_walk_message_ty message; ! string_ty *path; struct stat *st; { ! string_ty *s1; ! string_ty *s2; ! change_ty *cp; pstate_src src; trace(("link_tree_callback_minimum(message = %d, path = %08lX, \ st = %08lX)\n{\n"/*}*/, message, path, st)); ! cp = (change_ty *)arg; assert(cp); trace_string(path->str_text); ! s1 = os_below_dir(project_baseline_path_get(cp->pp, 1), path); assert(s1); trace_string(s1->str_text); if (!s1->str_length) ! s2 = str_copy(change_integration_directory_get(cp, 1)); else ! s2 = str_format("%S/%S", change_integration_directory_get(cp, 1), s1); trace_string(s2->str_text); switch (message) { *************** *** 301,307 **** */ os_mkdir_between ( ! change_integration_directory_get(cp), s1, 02755 ); --- 324,330 ---- */ os_mkdir_between ( ! change_integration_directory_get(cp, 1), s1, 02755 ); *************** *** 340,372 **** } ! static void link_tree_callback _((void *, dir_walk_message_t, string_t *, struct stat *)); static void link_tree_callback(arg, message, path, st) void *arg; ! dir_walk_message_t message; ! string_t *path; struct stat *st; { ! string_t *s1; ! string_t *s2; ! change_t *cp; pstate_src src; trace(("link_tree_callback(message = %d, path = %08lX, \ st = %08lX)\n{\n"/*}*/, message, path, st)); ! cp = (change_t *)arg; assert(cp); trace_string(path->str_text); ! s1 = os_below_dir(project_baseline_path_get(cp->pp), path); assert(s1); trace_string(s1->str_text); if (!s1->str_length) ! s2 = str_copy(change_integration_directory_get(cp)); else ! s2 = str_format("%S/%S", change_integration_directory_get(cp), s1); trace_string(s2->str_text); switch (message) { --- 363,395 ---- } ! static void link_tree_callback _((void *, dir_walk_message_ty, string_ty *, struct stat *)); static void link_tree_callback(arg, message, path, st) void *arg; ! dir_walk_message_ty message; ! string_ty *path; struct stat *st; { ! string_ty *s1; ! string_ty *s2; ! change_ty *cp; pstate_src src; trace(("link_tree_callback(message = %d, path = %08lX, \ st = %08lX)\n{\n"/*}*/, message, path, st)); ! cp = (change_ty *)arg; assert(cp); trace_string(path->str_text); ! s1 = os_below_dir(project_baseline_path_get(cp->pp, 1), path); assert(s1); trace_string(s1->str_text); if (!s1->str_length) ! s2 = str_copy(change_integration_directory_get(cp, 1)); else ! s2 = str_format("%S/%S", change_integration_directory_get(cp, 1), s1); trace_string(s2->str_text); switch (message) { *************** *** 425,456 **** } ! static void copy_tree_callback_minimum _((void *, dir_walk_message_t, ! string_t *, struct stat *)); static void copy_tree_callback_minimum(arg, message, path, st) void *arg; ! dir_walk_message_t message; ! string_t *path; struct stat *st; { ! string_t *s1; ! string_t *s2; ! change_t *cp; pstate_src src; int uid; trace(("copy_tree_callback(message = %d, path = %08lX, \ st = %08lX)\n{\n"/*}*/, message, path, st)); ! cp = (change_t *)arg; assert(cp); trace_string(path->str_text); ! s1 = os_below_dir(project_baseline_path_get(cp->pp), path); assert(s1); trace_string(s1->str_text); if (!s1->str_length) ! s2 = str_copy(change_integration_directory_get(cp)); else { s2 = --- 448,479 ---- } ! static void copy_tree_callback_minimum _((void *, dir_walk_message_ty, ! string_ty *, struct stat *)); static void copy_tree_callback_minimum(arg, message, path, st) void *arg; ! dir_walk_message_ty message; ! string_ty *path; struct stat *st; { ! string_ty *s1; ! string_ty *s2; ! change_ty *cp; pstate_src src; int uid; trace(("copy_tree_callback(message = %d, path = %08lX, \ st = %08lX)\n{\n"/*}*/, message, path, st)); ! cp = (change_ty *)arg; assert(cp); trace_string(path->str_text); ! s1 = os_below_dir(project_baseline_path_get(cp->pp, 1), path); assert(s1); trace_string(s1->str_text); if (!s1->str_length) ! s2 = str_copy(change_integration_directory_get(cp, 1)); else { s2 = *************** *** 457,463 **** str_format ( "%S/%S", ! change_integration_directory_get(cp), s1 ); } --- 480,486 ---- str_format ( "%S/%S", ! change_integration_directory_get(cp, 1), s1 ); } *************** *** 511,517 **** */ os_mkdir_between ( ! change_integration_directory_get(cp), s1, 02755 ); --- 534,540 ---- */ os_mkdir_between ( ! change_integration_directory_get(cp, 1), s1, 02755 ); *************** *** 550,580 **** } ! static void copy_tree_callback _((void *, dir_walk_message_t, string_t *, struct stat *)); static void copy_tree_callback(arg, message, path, st) void *arg; ! dir_walk_message_t message; ! string_t *path; struct stat *st; { ! string_t *s1; ! string_t *s2; ! change_t *cp; pstate_src src; int uid; trace(("copy_tree_callback(message = %d, path = %08lX, st = %08lX)\n{\n"/*}*/, message, path, st)); ! cp = (change_t *)arg; assert(cp); trace_string(path->str_text); ! s1 = os_below_dir(project_baseline_path_get(cp->pp), path); assert(s1); trace_string(s1->str_text); if (!s1->str_length) ! s2 = str_copy(change_integration_directory_get(cp)); else { s2 = --- 573,603 ---- } ! static void copy_tree_callback _((void *, dir_walk_message_ty, string_ty *, struct stat *)); static void copy_tree_callback(arg, message, path, st) void *arg; ! dir_walk_message_ty message; ! string_ty *path; struct stat *st; { ! string_ty *s1; ! string_ty *s2; ! change_ty *cp; pstate_src src; int uid; trace(("copy_tree_callback(message = %d, path = %08lX, st = %08lX)\n{\n"/*}*/, message, path, st)); ! cp = (change_ty *)arg; assert(cp); trace_string(path->str_text); ! s1 = os_below_dir(project_baseline_path_get(cp->pp, 1), path); assert(s1); trace_string(s1->str_text); if (!s1->str_length) ! s2 = str_copy(change_integration_directory_get(cp, 1)); else { s2 = *************** *** 581,587 **** str_format ( "%S/%S", ! change_integration_directory_get(cp), s1 ); } --- 604,610 ---- str_format ( "%S/%S", ! change_integration_directory_get(cp, 1), s1 ); } *************** *** 653,661 **** static void integrate_begin_main() { ! string_t *bl; ! string_t *dd; ! string_t *id; pconf pconf_data; pstate pstate_data; cstate cstate_data; --- 676,684 ---- static void integrate_begin_main() { ! string_ty *bl; ! string_ty *dd; ! string_ty *id; pconf pconf_data; pstate pstate_data; cstate cstate_data; *************** *** 662,674 **** int j; cstate_history history_data; int minimum; ! string_t *project_name; ! project_t *pp; long change_number; ! change_t *cp; int nolog; ! user_t *up; int errs; trace(("integrate_begin_main()\n{\n"/*}*/)); minimum = 0; --- 685,698 ---- int j; cstate_history history_data; int minimum; ! string_ty *project_name; ! project_ty *pp; long change_number; ! change_ty *cp; int nolog; ! user_ty *up; int errs; + string_ty *s; trace(("integrate_begin_main()\n{\n"/*}*/)); minimum = 0; *************** *** 798,804 **** /* * Create the integration directory. */ ! cstate_data->integration_directory = str_format ( "%S/delta.%3.3ld", --- 822,828 ---- /* * Create the integration directory. */ ! s = str_format ( "%S/delta.%3.3ld", *************** *** 805,815 **** project_home_path_get(pp), cstate_data->delta_number ); ! change_integration_directory_set ! ( ! cp, ! cstate_data->integration_directory ! ); /* * There will be many files in the baseline in addition --- 829,836 ---- project_home_path_get(pp), cstate_data->delta_number ); ! change_integration_directory_set(cp, s); ! str_free(s); /* * There will be many files in the baseline in addition *************** *** 840,855 **** * (b) the changed file must exist and not have been modified * (c) the difference file must exist and not have been modified */ ! dd = change_development_directory_get(cp); ! id = change_integration_directory_get(cp); ! bl = project_baseline_path_get(pp); project_become(pp); errs = 0; for (j = 0; j < cstate_data->src->length; ++j) { cstate_src src_data; ! string_t *s1; ! string_t *s2; src_data = cstate_data->src->list[j]; s1 = str_format("%S/%S", dd, src_data->file_name); --- 861,876 ---- * (b) the changed file must exist and not have been modified * (c) the difference file must exist and not have been modified */ ! dd = change_development_directory_get(cp, 1); ! id = change_integration_directory_get(cp, 1); ! bl = project_baseline_path_get(pp, 1); project_become(pp); errs = 0; for (j = 0; j < cstate_data->src->length; ++j) { cstate_src src_data; ! string_ty *s1; ! string_ty *s2; src_data = cstate_data->src->list[j]; s1 = str_format("%S/%S", dd, src_data->file_name); *************** *** 933,940 **** for (j = 0; j < cstate_data->src->length; ++j) { cstate_src src_data; ! string_t *s1; ! string_t *s2; src_data = cstate_data->src->list[j]; s1 = str_format("%S/%S", dd, src_data->file_name); --- 954,961 ---- for (j = 0; j < cstate_data->src->length; ++j) { cstate_src src_data; ! string_ty *s1; ! string_ty *s2; src_data = cstate_data->src->list[j]; s1 = str_format("%S/%S", dd, src_data->file_name); *************** *** 965,971 **** break; } } ! os_become_undo(); /* * add the change to the user's list --- 986,992 ---- break; } } ! project_become_undo(); /* * add the change to the user's list *************** *** 990,1025 **** */ if (pconf_data->integrate_begin_command) { ! string_t *the_command; ! char num[20]; ! char bnum[40]; if (!nolog) log_open(change_logfile_get(cp), up); ! sprintf(num, "%ld", change_number); ! sprintf ! ( ! bnum, ! "%ld.%ld.D%3.3ld", ! pstate_data->version_major, ! pstate_data->version_minor, ! cstate_data->delta_number ! ); ! the_command = ! substitute ! ( ! cp, ! pconf_data->integrate_begin_command->str_text, ! project_name_get(pp)->str_text, ! num, ! bnum, ! (char *)0 ! ); os_execute ( the_command, OS_EXEC_FLAG_NO_INPUT + OS_EXEC_FLAG_ERROK, ! change_integration_directory_get(cp) ); str_free(the_command); } --- 1011,1030 ---- */ if (pconf_data->integrate_begin_command) { ! string_ty *the_command; if (!nolog) log_open(change_logfile_get(cp), up); ! sub_var_set("1", "${project}"); ! sub_var_set("2", "${change}"); ! sub_var_set("3", "${version}"); ! the_command = pconf_data->integrate_begin_command; ! the_command = substitute(cp, the_command); os_execute ( the_command, OS_EXEC_FLAG_NO_INPUT + OS_EXEC_FLAG_ERROK, ! change_integration_directory_get(cp, 1) ); str_free(the_command); } *************** *** 1103,1111 **** "", " -Change ", " This option may be used to specify a particular", ! " change within a project. If the user is only", ! " working on one change within a project, that is", ! " the default change number.", "", " -Help", " This option may be used to obtain more", --- 1108,1121 ---- "", " -Change ", " This option may be used to specify a particular", ! " change within a project. When no -Change option is", ! " specified, the AEGIS_CHANGE environment variable is", ! " consulted. If that does not exist, the user's", ! " $HOME/.aegisrc file is examined for a default change", ! " field (see aeuconf(5) for more information). If", ! " that does not exist, when the user is only working", ! " on one change within a project, that is the default", ! " change number. Otherwise, it is an error.", "", " -Help", " This option may be used to obtain more", *************** *** 1122,1135 **** "", " -Project ", " This option may be used to select the project of", ! " interest. When no -Project option is specified, if", ! " the user is only working on changes within a single", ! " project, the project name defaults to that project;", ! " if the user is currently working on changes to more", ! " than one project, or is not working on changes to", ! " any project, the user's $HOME/.%src file is", ! " examined for a default project field (see aeuconf(5)", ! " for more information).", "", " -TERse", " This option may be used to cause listings to", --- 1132,1145 ---- "", " -Project ", " This option may be used to select the project of", ! " interest. When no -Project option is specified, the", ! " AEGIS_PROJECT environment variable is consulted. If", ! " that does not exist, the user's $HOME/.aegisrc file", ! " is examined for a default project field (see", ! " aeuconf(5) for more information). If that does not", ! " exist, when the user is only working on changes", ! " within a single project, the project name defaults", ! " to that project. Otherwise, it is an error.", "", " -TERse", " This option may be used to cause listings to", *************** *** 1143,1153 **** " option this option causes column headings to be", " added.", "", ! " All options are case insensitive. Options may be", ! " abbreviated; the abbreviation is the upper case letters.", " Options and other command line arguments may be mixed", ! " arbitrarily on the command line.", "", "RECOMMENDED ALIAS", " The recommended alias for this command is", " csh%% alias aeibu '%s -ibu \\!* -v'", --- 1153,1181 ---- " option this option causes column headings to be", " added.", "", ! " All options may be abbreviated; the abbreviation is", ! " documented as the upper case letters, all lower case", ! " letters and underscores (_) are optional. You must use", ! " consecutive sequences of optional letters.", ! "", ! " All options are case insensitive, you may type them in", ! " upper case or lower case or a combination of both, case", ! " is not important.", ! "", ! " For example: the arguments \"-project, \"-PROJ\" and \"-p\"", ! " are all interpreted to mean the -Project option. The", ! " argument \"-prj\" will not be understood, because", ! " consecutive optional characters were not supplied.", ! "", " Options and other command line arguments may be mixed", ! " arbitrarily on the command line, after the function", ! " selectors.", "", + " The GNU long option names are understood. Since all", + " option names for aegis are long, this means ignoring the", + " extra leading '-'. The \"--option=value\" convention is", + " also understood.", + "", "RECOMMENDED ALIAS", " The recommended alias for this command is", " csh%% alias aeibu '%s -ibu \\!* -v'", *************** *** 1181,1187 **** integrating_list(usage) void (*usage)_((void)); { ! string_t *project_name; trace(("integrating_list()\n{\n"/*}*/)); arglex(); --- 1209,1215 ---- integrating_list(usage) void (*usage)_((void)); { ! string_ty *project_name; trace(("integrating_list()\n{\n"/*}*/)); arglex(); *************** *** 1223,1234 **** cstate cstate_data; pstate pstate_data; cstate_history history_data; ! string_t *dir; ! string_t *project_name; ! project_t *pp; long change_number; ! change_t *cp; ! user_t *up; trace(("integrate_begin_main()\n{\n"/*}*/)); project_name = 0; --- 1251,1262 ---- cstate cstate_data; pstate pstate_data; cstate_history history_data; ! string_ty *dir; ! string_ty *project_name; ! project_ty *pp; long change_number; ! change_ty *cp; ! user_ty *up; trace(("integrate_begin_main()\n{\n"/*}*/)); project_name = 0; *************** *** 1332,1339 **** * Note that the project has no current integration */ pstate_data->currently_integrating_change = 0; ! dir = cstate_data->integration_directory; ! cstate_data->integration_directory = 0; cstate_data->build_time = 0; cstate_data->delta_number = 0; --- 1360,1367 ---- * Note that the project has no current integration */ pstate_data->currently_integrating_change = 0; ! dir = str_copy(change_integration_directory_get(cp, 1)); ! change_integration_directory_clear(cp); cstate_data->build_time = 0; cstate_data->delta_number = 0; *************** *** 1341,1348 **** --- 1369,1378 ---- * Complain if they are in the integration directory, * because the rmdir at the end can't then run to completion. */ + os_become_orig(); if (os_below_dir(dir, os_curdir())) change_fatal(cp, "please leave the integration directory"); + os_become_undo(); /* * write out the data and release the locks *************** *** 1352,1358 **** project_pstate_write(pp); user_become(up); commit_rmdir_tree_errok(dir); ! os_become_undo(); str_free(dir); commit(); lock_release(); --- 1382,1388 ---- project_pstate_write(pp); user_become(up); commit_rmdir_tree_errok(dir); ! user_become_undo(); str_free(dir); commit(); lock_release(); *************** *** 1439,1447 **** "", " -Change ", " This option may be used to specify a particular", ! " change within a project. If the user is only", ! " working on one change within a project, that is", ! " the default change number.", "", " -Help", " This option may be used to obtain more", --- 1469,1482 ---- "", " -Change ", " This option may be used to specify a particular", ! " change within a project. When no -Change option is", ! " specified, the AEGIS_CHANGE environment variable is", ! " consulted. If that does not exist, the user's", ! " $HOME/.aegisrc file is examined for a default change", ! " field (see aeuconf(5) for more information). If", ! " that does not exist, when the user is only working", ! " on one change within a project, that is the default", ! " change number. Otherwise, it is an error.", "", " -Help", " This option may be used to obtain more", *************** *** 1458,1471 **** "", " -Project ", " This option may be used to select the project of", ! " interest. When no -Project option is specified, if", ! " the user is only working on changes within a single", ! " project, the project name defaults to that project;", ! " if the user is currently working on changes to more", ! " than one project, or is not working on changes to", ! " any project, the user's $HOME/.%src file is", ! " examined for a default project field (see aeuconf(5)", ! " for more information).", "", " -TERse", " This option may be used to cause listings to", --- 1493,1506 ---- "", " -Project ", " This option may be used to select the project of", ! " interest. When no -Project option is specified, the", ! " AEGIS_PROJECT environment variable is consulted. If", ! " that does not exist, the user's $HOME/.aegisrc file", ! " is examined for a default project field (see", ! " aeuconf(5) for more information). If that does not", ! " exist, when the user is only working on changes", ! " within a single project, the project name defaults", ! " to that project. Otherwise, it is an error.", "", " -TERse", " This option may be used to cause listings to", *************** *** 1479,1489 **** " option this option causes column headings to be", " added.", "", ! " All options are case insensitive. Options may be", ! " abbreviated; the abbreviation is the upper case letters.", " Options and other command line arguments may be mixed", ! " arbitrarily on the command line.", "", "RECOMMENDED ALIAS", " The recommended alias for this command is", " csh%% alias aeif '%s -if \\!* -v'", --- 1514,1542 ---- " option this option causes column headings to be", " added.", "", ! " All options may be abbreviated; the abbreviation is", ! " documented as the upper case letters, all lower case", ! " letters and underscores (_) are optional. You must use", ! " consecutive sequences of optional letters.", ! "", ! " All options are case insensitive, you may type them in", ! " upper case or lower case or a combination of both, case", ! " is not important.", ! "", ! " For example: the arguments \"-project, \"-PROJ\" and \"-p\"", ! " are all interpreted to mean the -Project option. The", ! " argument \"-prj\" will not be understood, because", ! " consecutive optional characters were not supplied.", ! "", " Options and other command line arguments may be mixed", ! " arbitrarily on the command line, after the function", ! " selectors.", "", + " The GNU long option names are understood. Since all", + " option names for aegis are long, this means ignoring the", + " extra leading '-'. The \"--option=value\" convention is", + " also understood.", + "", "RECOMMENDED ALIAS", " The recommended alias for this command is", " csh%% alias aeif '%s -if \\!* -v'", *************** *** 1511,1528 **** } ! static void repair_diff_time _((change_t *, string_t *)); static void repair_diff_time(cp, path) ! change_t *cp; ! string_t *path; { ! string_t *s; cstate_src src_data; ! string_t *s2; ! s = os_below_dir(change_development_directory_get(cp), path); src_data = change_src_find(cp, s); if (src_data) src_data->diff_time = os_mtime(path); --- 1564,1581 ---- } ! static void repair_diff_time _((change_ty *, string_ty *)); static void repair_diff_time(cp, path) ! change_ty *cp; ! string_ty *path; { ! string_ty *s; cstate_src src_data; ! string_ty *s2; ! s = os_below_dir(change_development_directory_get(cp, 1), path); src_data = change_src_find(cp, s); if (src_data) src_data->diff_time = os_mtime(path); *************** *** 1546,1566 **** } ! static void if_func _((void *, dir_walk_message_t, string_t *, struct stat *)); static void if_func(arg, message, path, st) void *arg; ! dir_walk_message_t message; ! string_t *path; struct stat *st; { ! change_t *cp; int uid; trace(("if_func(message = %d, path = \"%s\", st = %08lX)\n{\n"/*}*/, message, path->str_text, st)); ! cp = (change_t *)arg; switch (message) { case dir_walk_dir_before: --- 1599,1619 ---- } ! static void if_func _((void *, dir_walk_message_ty, string_ty *, struct stat *)); static void if_func(arg, message, path, st) void *arg; ! dir_walk_message_ty message; ! string_ty *path; struct stat *st; { ! change_ty *cp; int uid; trace(("if_func(message = %d, path = \"%s\", st = %08lX)\n{\n"/*}*/, message, path->str_text, st)); ! cp = (change_ty *)arg; switch (message) { case dir_walk_dir_before: *************** *** 1592,1612 **** static void integrate_fail_main() { ! string_t *dd; cstate cstate_data; pstate pstate_data; cstate_history history_data; ! string_t *comment = 0; ! string_t *rev_name; ! string_t *int_name; ! string_t *dir; int j; ! string_t *project_name; ! project_t *pp; long change_number; ! change_t *cp; ! user_t *up; ! user_t *devup; trace(("integrate_fail_main()\n{\n"/*}*/)); project_name = 0; --- 1645,1665 ---- static void integrate_fail_main() { ! string_ty *dd; cstate cstate_data; pstate pstate_data; cstate_history history_data; ! string_ty *comment = 0; ! string_ty *rev_name; ! string_ty *int_name; ! string_ty *dir; int j; ! string_ty *project_name; ! project_ty *pp; long change_number; ! change_ty *cp; ! user_ty *up; ! user_ty *devup; trace(("integrate_fail_main()\n{\n"/*}*/)); project_name = 0; *************** *** 1713,1720 **** rev_name = change_reviewer_name(cp); int_name = change_integrator_name(cp); cstate_data->delta_number = 0; ! dir = cstate_data->integration_directory; ! cstate_data->integration_directory = 0; cstate_data->state = cstate_state_being_developed; /* --- 1766,1773 ---- rev_name = change_reviewer_name(cp); int_name = change_integrator_name(cp); cstate_data->delta_number = 0; ! dir = str_copy(change_integration_directory_get(cp, 1)); ! change_integration_directory_clear(cp); cstate_data->state = cstate_state_being_developed; /* *************** *** 1743,1752 **** * make the change files writable again */ change_verbose(cp, "make the development directory writable again"); ! dd = change_development_directory_get(cp); user_become(devup); dir_walk(dd, if_func, cp); ! os_become_undo(); /* * go through the files in the change and unlock them --- 1796,1805 ---- * make the change files writable again */ change_verbose(cp, "make the development directory writable again"); ! dd = change_development_directory_get(cp, 1); user_become(devup); dir_walk(dd, if_func, cp); ! user_become_undo(); /* * go through the files in the change and unlock them *************** *** 1780,1786 **** change_verbose(cp, "remove the integration directory"); project_become(pp); commit_rmdir_tree_errok(dir); ! os_become_undo(); /* * write out the data and release the locks --- 1833,1839 ---- change_verbose(cp, "remove the integration directory"); project_become(pp); commit_rmdir_tree_errok(dir); ! project_become_undo(); /* * write out the data and release the locks *************** *** 1872,1885 **** " directory is deleted. The change is no longer assigned", " to the current user.", "", "OPTIONS", " The following options are understood:", "", " -Change ", " This option may be used to specify a particular", ! " change within a project. If the user is only", ! " working on one change within a project, that is", ! " the default change number.", "", " -Help", " This option may be used to obtain more", --- 1925,1951 ---- " directory is deleted. The change is no longer assigned", " to the current user.", "", + " While there is a build in progress for any change in a", + " project, an integrate pass for the project will wait until", + " all the builds are completed before starting. This is to", + " ensure that the baseline is consistent for the entire build.", + " Similarly, while an integrate pass is in progress for a", + " project, any builds will wait until it is completed before", + " starting.", + "", "OPTIONS", " The following options are understood:", "", " -Change ", " This option may be used to specify a particular", ! " change within a project. When no -Change option is", ! " specified, the AEGIS_CHANGE environment variable is", ! " consulted. If that does not exist, the user's", ! " $HOME/.aegisrc file is examined for a default change", ! " field (see aeuconf(5) for more information). If", ! " that does not exist, when the user is only working", ! " on one change within a project, that is the default", ! " change number. Otherwise, it is an error.", "", " -Help", " This option may be used to obtain more", *************** *** 1892,1905 **** "", " -Project ", " This option may be used to select the project of", ! " interest. When no -Project option is specified, if", ! " the user is only working on changes within a single", ! " project, the project name defaults to that project;", ! " if the user is currently working on changes to more", ! " than one project, or is not working on changes to", ! " any project, the user's $HOME/.%src file is", ! " examined for a default project field (see aeuconf(5)", ! " for more information).", "", " -TERse", " This option may be used to cause listings to", --- 1958,1971 ---- "", " -Project ", " This option may be used to select the project of", ! " interest. When no -Project option is specified, the", ! " AEGIS_PROJECT environment variable is consulted. If", ! " that does not exist, the user's $HOME/.aegisrc file", ! " is examined for a default project field (see", ! " aeuconf(5) for more information). If that does not", ! " exist, when the user is only working on changes", ! " within a single project, the project name defaults", ! " to that project. Otherwise, it is an error.", "", " -TERse", " This option may be used to cause listings to", *************** *** 1913,1923 **** " option this option causes column headings to be", " added.", "", ! " All options are case insensitive. Options may be", ! " abbreviated; the abbreviation is the upper case letters.", " Options and other command line arguments may be mixed", ! " arbitrarily on the command line.", "", "RECOMMENDED ALIAS", " The recommended alias for this command is", " csh%% alias aeip '%s -ip \\!* -v'", --- 1979,2007 ---- " option this option causes column headings to be", " added.", "", ! " All options may be abbreviated; the abbreviation is", ! " documented as the upper case letters, all lower case", ! " letters and underscores (_) are optional. You must use", ! " consecutive sequences of optional letters.", ! "", ! " All options are case insensitive, you may type them in", ! " upper case or lower case or a combination of both, case", ! " is not important.", ! "", ! " For example: the arguments \"-project, \"-PROJ\" and \"-p\"", ! " are all interpreted to mean the -Project option. The", ! " argument \"-prj\" will not be understood, because", ! " consecutive optional characters were not supplied.", ! "", " Options and other command line arguments may be mixed", ! " arbitrarily on the command line, after the function", ! " selectors.", "", + " The GNU long option names are understood. Since all", + " option names for aegis are long, this means ignoring the", + " extra leading '-'. The \"--option=value\" convention is", + " also understood.", + "", "RECOMMENDED ALIAS", " The recommended alias for this command is", " csh%% alias aeip '%s -ip \\!* -v'", *************** *** 1956,1984 **** static void integrate_pass_main() { ! string_t *hp; ! string_t *id; ! string_t *cwd; pstate pstate_data; cstate cstate_data; ! string_t *old_baseline; ! string_t *new_baseline; ! string_t *dev_dir; ! string_t *int_name; ! string_t *rev_name; ! string_t *dev_name; cstate_history history_data; pstate_history phistory_data; int j; int ncmds; pconf pconf_data; ! string_t *project_name; ! project_t *pp; long change_number; ! change_t *cp; int nolog; ! user_t *up; ! user_t *devup; trace(("integrate_pass_main()\n{\n"/*}*/)); project_name = 0; --- 2040,2068 ---- static void integrate_pass_main() { ! string_ty *hp; ! string_ty *id; ! string_ty *cwd; pstate pstate_data; cstate cstate_data; ! string_ty *old_baseline; ! string_ty *new_baseline; ! string_ty *dev_dir; ! string_ty *int_name; ! string_ty *rev_name; ! string_ty *dev_name; cstate_history history_data; pstate_history phistory_data; int j; int ncmds; pconf pconf_data; ! string_ty *project_name; ! project_ty *pp; long change_number; ! change_ty *cp; int nolog; ! user_ty *up; ! user_ty *devup; trace(("integrate_pass_main()\n{\n"/*}*/)); project_name = 0; *************** *** 2055,2060 **** --- 2139,2145 ---- project_pstate_lock_prepare(pp); change_cstate_lock_prepare(cp); user_ustate_lock_prepare(up); + project_build_write_lock_prepare(pp); lock_take(); cstate_data = change_cstate_get(cp); pstate_data = project_pstate_get(pp); *************** *** 2066,2077 **** os_become_orig(); cwd = os_curdir(); os_become_undo(); ! if (os_below_dir(change_development_directory_get(cp), cwd)) change_fatal(cp, "please leave development directory"); ! id = change_integration_directory_get(cp); if (os_below_dir(id, cwd)) change_fatal(cp, "please leave integration directory"); ! if (os_below_dir(project_baseline_path_get(pp), cwd)) project_fatal(pp, "please leave baseline directory"); /* --- 2151,2162 ---- os_become_orig(); cwd = os_curdir(); os_become_undo(); ! if (os_below_dir(change_development_directory_get(cp, 1), cwd)) change_fatal(cp, "please leave development directory"); ! id = change_integration_directory_get(cp, 1); if (os_below_dir(id, cwd)) change_fatal(cp, "please leave integration directory"); ! if (os_below_dir(project_baseline_path_get(pp, 1), cwd)) project_fatal(pp, "please leave baseline directory"); /* *************** *** 2153,2159 **** */ if (!nolog) { ! user_t *pup; pup = project_user(pp); log_open(change_logfile_get(cp), pup); --- 2238,2244 ---- */ if (!nolog) { ! user_ty *pup; pup = project_user(pp); log_open(change_logfile_get(cp), pup); *************** *** 2166,2174 **** { cstate_src c_src_data; pstate_src p_src_data; ! string_t *the_command; ! string_t *src_file; ! string_t *dst_file; c_src_data = cstate_data->src->list[j]; c_src_data->diff_time = 0; --- 2251,2258 ---- { cstate_src c_src_data; pstate_src p_src_data; ! string_ty *src_file; ! string_ty *dst_file; c_src_data = cstate_data->src->list[j]; c_src_data->diff_time = 0; *************** *** 2182,2187 **** --- 2266,2282 ---- { case file_action_create: /* + * because history is never thrown away, + * we could be reusing an existing history file + */ + if (p_src_data->edit_number) + { + assert(p_src_data->deleted_by); + p_src_data->deleted_by = 0; + goto reusing_an_old_file; + } + + /* * it exists, now */ trace(("create\n")); *************** *** 2188,2252 **** p_src_data->about_to_be_created_by = 0; /* ! * prepare for the history commands */ ! project_become(pp); ! os_mkdir_between(hp, c_src_data->file_name, 02755); ! os_become_undo(); ! src_file = ! str_format("%S/%S", id, c_src_data->file_name); ! dst_file = ! str_format("%S/%S", hp, c_src_data->file_name); ! ! /* ! * create a new history ! * %1 = source file ! * %2 = history file ! */ ! the_command = pconf_data->history_create_command; ! the_command = ! substitute ( cp, ! the_command->str_text, ! src_file->str_text, ! dst_file->str_text, ! (char *)0 ); - project_become(pp); - os_execute(the_command, OS_EXEC_FLAG_NO_INPUT, id); - os_become_undo(); - - /* - * ask the history file what its edit number is - * %1 = history file - * we use this method because the string - * returned is essentially random, - * between different history programs. - */ - the_command = pconf_data->history_query_command; - the_command = - substitute - ( - cp, - the_command->str_text, - dst_file->str_text, - (char *)0 - ); - project_become(pp); - p_src_data->edit_number = - os_execute_slurp - ( - the_command, - OS_EXEC_FLAG_NO_INPUT, - id - ); - os_become_undo(); c_src_data->edit_number = str_copy(p_src_data->edit_number); break; case file_action_modify: trace(("modify\n")); assert(str_equal(p_src_data->edit_number, c_src_data->edit_number)); --- 2283,2307 ---- p_src_data->about_to_be_created_by = 0; /* ! * create the history */ ! change_run_history_create_command ! ( ! cp, ! c_src_data->file_name ! ); ! p_src_data->edit_number = ! change_run_history_query_command ( cp, ! c_src_data->file_name ); c_src_data->edit_number = str_copy(p_src_data->edit_number); break; case file_action_modify: + reusing_an_old_file: trace(("modify\n")); assert(str_equal(p_src_data->edit_number, c_src_data->edit_number)); *************** *** 2261,2309 **** /* * update the history - * %1 = source file - * %2 = history file */ ! the_command = pconf_data->history_put_command; ! the_command = ! substitute ( cp, ! the_command->str_text, ! src_file->str_text, ! dst_file->str_text, ! (char *)0 ); - project_become(pp); - os_execute(the_command, OS_EXEC_FLAG_NO_INPUT, id); - os_become_undo(); - - /* - * ask the history file what its edit number is - * %1 = history file - * we use this method because the string - * returned is essentially random, - * between different history programs. - */ - the_command = pconf_data->history_query_command; - the_command = - substitute - ( - cp, - the_command->str_text, - dst_file->str_text, - (char *)0 - ); - str_free(p_src_data->edit_number); - project_become(pp); - p_src_data->edit_number = - os_execute_slurp - ( - the_command, - OS_EXEC_FLAG_NO_INPUT, - id - ); - os_become_undo(); c_src_data->edit_number = str_copy(p_src_data->edit_number); break; --- 2316,2333 ---- /* * update the history */ ! change_run_history_put_command ! ( ! cp, ! c_src_data->file_name ! ); ! p_src_data->edit_number = ! change_run_history_query_command ( cp, ! c_src_data->file_name ); c_src_data->edit_number = str_copy(p_src_data->edit_number); break; *************** *** 2323,2340 **** /* * Advance the change to the 'completed' state. ! * Clear the build-done field. ! * Clear the test-done field. ! * Clear the test-baseline-done field. */ cstate_data->state = cstate_state_completed; cstate_data->build_time = 0; cstate_data->test_time = 0; cstate_data->test_baseline_time = 0; ! dev_dir = cstate_data->development_directory; ! cstate_data->development_directory = 0; ! new_baseline = cstate_data->integration_directory; ! cstate_data->integration_directory = 0; int_name = change_integrator_name(cp); rev_name = change_reviewer_name(cp); dev_name = change_developer_name(cp); --- 2347,2364 ---- /* * Advance the change to the 'completed' state. ! * Clear the build-time field. ! * Clear the test-time field. ! * Clear the test-baseline-time field. */ cstate_data->state = cstate_state_completed; cstate_data->build_time = 0; cstate_data->test_time = 0; cstate_data->test_baseline_time = 0; ! dev_dir = str_copy(change_development_directory_get(cp, 1)); ! change_development_directory_clear(cp); ! new_baseline = str_copy(change_integration_directory_get(cp, 1)); ! change_integration_directory_clear(cp); int_name = change_integrator_name(cp); rev_name = change_reviewer_name(cp); dev_name = change_developer_name(cp); *************** *** 2347,2370 **** str_format ( "%S.D%3.3ld", ! project_baseline_path_get(pp), cstate_data->delta_number - 1 ); ! new_baseline = change_integration_directory_get(cp); project_become(pp); ! commit_rename(project_baseline_path_get(pp), old_baseline); ! commit_rename(new_baseline, project_baseline_path_get(pp)); commit_rmdir_tree_errok(old_baseline); ! os_become_undo(); str_free(old_baseline); /* * throw away the development directory */ devup = user_symbolic(pp, dev_name); user_become(devup); commit_rmdir_tree_errok(dev_dir); ! os_become_undo(); str_free(dev_dir); user_free(devup); --- 2371,2395 ---- str_format ( "%S.D%3.3ld", ! project_baseline_path_get(pp, 1), cstate_data->delta_number - 1 ); ! new_baseline = change_integration_directory_get(cp, 1); project_become(pp); ! commit_rename(project_baseline_path_get(pp, 1), old_baseline); ! commit_rename(new_baseline, project_baseline_path_get(pp, 1)); commit_rmdir_tree_errok(old_baseline); ! project_become_undo(); str_free(old_baseline); /* * throw away the development directory */ + change_verbose(cp, "discard old directories"); devup = user_symbolic(pp, dev_name); user_become(devup); commit_rmdir_tree_errok(dev_dir); ! user_become_undo(); str_free(dev_dir); user_free(devup); Index: aegis/integra2.h *************** *** 1,12 **** /* * aegis - project change supervisor ! * Copyright (c) 1991-1992 Peter Miller. * All rights reserved. * * 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 1, 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 --- 1,12 ---- /* * aegis - project change supervisor ! * Copyright (C) 1991, 1992, 1993 Peter Miller. * All rights reserved. * * 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 Index: aegis/io.c *************** *** 1,12 **** /* * aegis - project change supervisor ! * Copyright (c) 1991-1992 Peter Miller. * All rights reserved. * * 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 1, 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 --- 1,12 ---- /* * aegis - project change supervisor ! * Copyright (C) 1991, 1992, 1993 Peter Miller. * All rights reserved. * * 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 *************** *** 28,34 **** #include ! type_t integer_type = { type_class_integer, "integer", --- 28,34 ---- #include ! type_ty integer_type = { type_class_integer, "integer", *************** *** 38,44 **** }; ! type_t string_type = { type_class_string, "string", --- 38,44 ---- }; ! type_ty string_type = { type_class_string, "string", *************** *** 92,98 **** void string_write(name, this) char *name; ! string_t *this; { char *s; int count; --- 92,98 ---- void string_write(name, this) char *name; ! string_ty *this; { char *s; int count; Index: aegis/io.h *************** *** 1,12 **** /* * aegis - project change supervisor ! * Copyright (c) 1991-1992 Peter Miller. * All rights reserved. * * 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 1, 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 --- 1,12 ---- /* * aegis - project change supervisor ! * Copyright (C) 1991, 1992, 1993 Peter Miller. * All rights reserved. * * 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 *************** *** 26,35 **** #include #include ! extern type_t integer_type; ! extern type_t string_type; ! void string_write _((char *, string_t *)); void integer_write _((char *, long)); #endif /* IO_H */ --- 26,35 ---- #include #include ! extern type_ty integer_type; ! extern type_ty string_type; ! void string_write _((char *, string_ty *)); void integer_write _((char *, long)); #endif /* IO_H */ Index: aegis/lex.c *************** *** 1,12 **** /* * aegis - project change supervisor ! * Copyright (c) 1991-1992 Peter Miller. * All rights reserved. * * 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 1, 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 --- 1,12 ---- /* * aegis - project change supervisor ! * Copyright (C) 1991, 1992, 1993 Peter Miller. * All rights reserved. * * 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 *************** *** 25,30 **** --- 25,31 ---- #include #include + #include #include #include #include *************** *** 42,50 **** void lex_open(s) ! char *s; { ! fp = fopen(s, "r"); if (!fp) nfatal("open \"%s\"", s); file_name = s; --- 43,51 ---- void lex_open(s) ! char *s; { ! fp = glue_fopen(s, "r"); if (!fp) nfatal("open \"%s\"", s); file_name = s; *************** *** 56,62 **** void lex_close() { ! fclose(fp); fp = 0; if (error_count) fatal("%s: incorrect format", file_name); --- 57,63 ---- void lex_close() { ! glue_fclose(fp); fp = 0; if (error_count) fatal("%s: incorrect format", file_name); *************** *** 71,81 **** { int c; ! c = fgetc(fp); switch (c) { case EOF: ! if (ferror(fp)) { nerror("%s", file_name); ++error_count; --- 72,82 ---- { int c; ! c = glue_fgetc(fp); switch (c) { case EOF: ! if (glue_ferror(fp)) { nerror("%s", file_name); ++error_count; *************** *** 115,121 **** /* fall through... */ default: ! ungetc(c, fp); break; } } --- 116,122 ---- /* fall through... */ default: ! glue_ungetc(c, fp); break; } } Index: aegis/lex.h *************** *** 1,12 **** /* * aegis - project change supervisor ! * Copyright (c) 1991-1992 Peter Miller. * All rights reserved. * * 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 1, 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 --- 1,12 ---- /* * aegis - project change supervisor ! * Copyright (C) 1991, 1992, 1993 Peter Miller. * All rights reserved. * * 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 Index: aegis/list.c *************** *** 1,12 **** /* * aegis - project change supervisor ! * Copyright (c) 1991-1992 Peter Miller. * All rights reserved. * * 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 1, 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 --- 1,12 ---- /* * aegis - project change supervisor ! * Copyright (C) 1991, 1992, 1993 Peter Miller. * All rights reserved. * * 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 *************** *** 40,55 **** #include ! typedef struct table_t table_t; ! struct table_t { char *name; char *description; ! void (*func)_((string_t *, long)); }; ! static table_t table[] = { { "Administrators", --- 40,55 ---- #include ! typedef struct table_ty table_ty; ! struct table_ty { char *name; char *description; ! void (*func)_((string_ty *, long)); }; ! static table_ty table[] = { { "Administrators", *************** *** 112,117 **** --- 112,123 ---- list_reviewers, }, { + "Users_Changes", + "List of changes owned by the current user", + list_user_changes, + + }, + { "Version", "List version of a project or change", list_version, *************** *** 145,151 **** " %s -List - list (possibly) interesting things", "", "SYNOPSIS", ! " %s -List [