This commit was generated by cvs2svn to compensate for changes in r6498,
which included commits to RCS files with non-trunk default branches. git-svn-id: file:///srv/svn/repos/haiku/trunk/current@6499 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
+579
-600
File diff suppressed because it is too large
Load Diff
+20
-12
@@ -5,7 +5,7 @@ Jambase Reference
|
|||||||
<BODY>
|
<BODY>
|
||||||
<CENTER>
|
<CENTER>
|
||||||
<a href=http://www.perforce.com/jam/jam.html>
|
<a href=http://www.perforce.com/jam/jam.html>
|
||||||
Jam/MR
|
Jam
|
||||||
</a>
|
</a>
|
||||||
<H1>
|
<H1>
|
||||||
<A NAME="TOP">
|
<A NAME="TOP">
|
||||||
@@ -14,9 +14,9 @@ Jambase Reference
|
|||||||
</H1>
|
</H1>
|
||||||
</CENTER>
|
</CENTER>
|
||||||
<P>
|
<P>
|
||||||
Jambase is a base set of Jam/MR rules which
|
Jambase is a base set of Jam rules which
|
||||||
provide roughly make(1)-like functionality for
|
provide roughly make(1)-like functionality for
|
||||||
<a href="Jam.html"><b>jam</b></A>, the Jam/MR executable program.
|
<a href="Jam.html"><b>jam</b></A>, the Jam executable program.
|
||||||
This document, which started out as the Jambase(5) man page,
|
This document, which started out as the Jambase(5) man page,
|
||||||
is a reference guide to the
|
is a reference guide to the
|
||||||
<A href="#RULES">rules</A>,
|
<A href="#RULES">rules</A>,
|
||||||
@@ -29,10 +29,10 @@ Jambase Reference
|
|||||||
<LI>
|
<LI>
|
||||||
<a href="Jamfile.html">Using Jamfiles and Jambase</A>
|
<a href="Jamfile.html">Using Jamfiles and Jambase</A>
|
||||||
<LI>
|
<LI>
|
||||||
<a href="Jam.html">The Jam/MR Executable Program</A>
|
<a href="Jam.html">The Jam Executable Program</A>
|
||||||
</UL>
|
</UL>
|
||||||
<P>
|
<P>
|
||||||
Jam/MR documentation and source are available from the
|
Jam documentation and source are available from the
|
||||||
<A HREF=http://public.perforce.com/public/index.html>Perforce Public Depot</a>.
|
<A HREF=http://public.perforce.com/public/index.html>Perforce Public Depot</a>.
|
||||||
For detailed information about any of the rules summarized below,
|
For detailed information about any of the rules summarized below,
|
||||||
see the
|
see the
|
||||||
@@ -267,19 +267,19 @@ Jambase Rules
|
|||||||
Makes <I>target</I> a symbolic link to <I>source,</I> if it isn't one
|
Makes <I>target</I> a symbolic link to <I>source,</I> if it isn't one
|
||||||
already. (Unix only.)
|
already. (Unix only.)
|
||||||
</BLOCKQUOTE>
|
</BLOCKQUOTE>
|
||||||
<B>SubDir</B> <I>VAR d1 ... dn</I> ;
|
<B>SubDir</B> <I>TOP d1 ... dn</I> ;
|
||||||
<BLOCKQUOTE>
|
<BLOCKQUOTE>
|
||||||
Sets up housekeeping for the source files located
|
Sets up housekeeping for the source files located
|
||||||
in <I><CODE>$(VAR)/d1/.../dn</CODE></I>:
|
in <I><CODE>$(TOP)/d1/.../dn</CODE></I>:
|
||||||
<UL>
|
<UL>
|
||||||
<LI>Reads in rules file associated with <I>VAR</I>,
|
<LI>Reads in rules file associated with <I>TOP</I>,
|
||||||
if it hasn't already been read.
|
if it hasn't already been read.
|
||||||
<LI>Initializes variables for search paths,
|
<LI>Initializes variables for search paths,
|
||||||
output directories, compiler
|
output directories, compiler
|
||||||
flags, and grist, using <I>d1 ... dn</I> tokens.
|
flags, and grist, using <I>d1 ... dn</I> tokens.
|
||||||
</UL>
|
</UL>
|
||||||
<P>
|
<P>
|
||||||
<I>VAR</I> is the name of a variable;
|
<I>TOP</I> is the name of a variable;
|
||||||
<I>d1</I> thru <I>dn</I> are elements
|
<I>d1</I> thru <I>dn</I> are elements
|
||||||
of a directory path.
|
of a directory path.
|
||||||
</BLOCKQUOTE>
|
</BLOCKQUOTE>
|
||||||
@@ -724,8 +724,16 @@ Jambase Variables
|
|||||||
|
|
||||||
MSVCNT
|
MSVCNT
|
||||||
<BLOCKQUOTE>
|
<BLOCKQUOTE>
|
||||||
Selects Microsoft Visual C NT compile & link
|
Selects Microsoft Visual C NT 5.0 and earlier compile
|
||||||
actions on NT.
|
& link actions on NT.
|
||||||
|
</BLOCKQUOTE>
|
||||||
|
|
||||||
|
MSVCDIR
|
||||||
|
<BLOCKQUOTE>
|
||||||
|
Selects Microsoft Visual C NT 6.0 and later compile
|
||||||
|
& link actions on NT. These are identical to versions
|
||||||
|
5.0 and earlier -- it just seems Microsoft changed the
|
||||||
|
name of the variable.
|
||||||
</BLOCKQUOTE>
|
</BLOCKQUOTE>
|
||||||
|
|
||||||
|
|
||||||
@@ -926,6 +934,6 @@ Jambase Variables
|
|||||||
<BR>
|
<BR>
|
||||||
Last updated: Dec 31, 2000
|
Last updated: Dec 31, 2000
|
||||||
<BR>
|
<BR>
|
||||||
$Id: //public/jam/src/Jambase.html#7 $
|
$Id: //public/jam/src/Jambase.html#10 $
|
||||||
</BODY>
|
</BODY>
|
||||||
</HTML>
|
</HTML>
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ Jamfiles and Jambase
|
|||||||
<BODY>
|
<BODY>
|
||||||
<CENTER>
|
<CENTER>
|
||||||
<A HREF=http://www.perforce.com/jam/jam.html>
|
<A HREF=http://www.perforce.com/jam/jam.html>
|
||||||
Jam/MR
|
Jam
|
||||||
</a>
|
</a>
|
||||||
<A NAME="TOP">
|
<A NAME="TOP">
|
||||||
<H2>
|
<H2>
|
||||||
@@ -14,12 +14,12 @@ Using Jamfiles and Jambase
|
|||||||
</A>
|
</A>
|
||||||
</CENTER>
|
</CENTER>
|
||||||
<P>
|
<P>
|
||||||
This document describes how to write Jamfiles using the Jam/MR Jambase
|
This document describes how to write Jamfiles using the Jam Jambase
|
||||||
rules to build software products.
|
rules to build software products.
|
||||||
Related documents of interest are:
|
Related documents of interest are:
|
||||||
<UL>
|
<UL>
|
||||||
<LI>
|
<LI>
|
||||||
<a href="Jam.html">The Jam/MR Executable Program</A>,
|
<a href="Jam.html">The Jam Executable Program</A>,
|
||||||
which describes using the <b>jam</b> command and the
|
which describes using the <b>jam</b> command and the
|
||||||
langauge used in Jambase
|
langauge used in Jambase
|
||||||
<LI>
|
<LI>
|
||||||
@@ -27,7 +27,7 @@ Related documents of interest are:
|
|||||||
which summarizes the Jambase rules and variables
|
which summarizes the Jambase rules and variables
|
||||||
</UL>
|
</UL>
|
||||||
<P>
|
<P>
|
||||||
Jam/MR documentation and source are available from the
|
Jam documentation and source are available from the
|
||||||
<A HREF=http://public.perforce.com/public/index.html>Perforce Public Depot</a>.
|
<A HREF=http://public.perforce.com/public/index.html>Perforce Public Depot</a>.
|
||||||
<HR>
|
<HR>
|
||||||
<P>
|
<P>
|
||||||
@@ -1445,6 +1445,6 @@ RmTemps Rule
|
|||||||
<BR>
|
<BR>
|
||||||
Last updated: Dec 31, 2000
|
Last updated: Dec 31, 2000
|
||||||
<BR>
|
<BR>
|
||||||
$Id: //public/jam/src/Jamfile.html#5 $
|
$Id: //public/jam/src/Jamfile.html#6 $
|
||||||
</BODY>
|
</BODY>
|
||||||
</HTML>
|
</HTML>
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
Jam/MR (aka "jam - make(1) redux")
|
Jam - make(1) redux
|
||||||
|
|
||||||
/+\
|
/+\
|
||||||
+\ Copyright 1993-2002 Christopher Seiwald and Perforce Software, Inc.
|
+\ Copyright 1993-2002 Christopher Seiwald and Perforce Software, Inc.
|
||||||
\+/
|
\+/
|
||||||
|
|
||||||
This is Release 2.4 of Jam/MR, a make-like program.
|
This is Release 2.5 of Jam, a make-like program.
|
||||||
|
|
||||||
License is hereby granted to use this software and distribute it
|
License is hereby granted to use this software and distribute it
|
||||||
freely, as long as this copyright notice is retained and modifications
|
freely, as long as this copyright notice is retained and modifications
|
||||||
@@ -110,10 +110,12 @@ INSTALLING
|
|||||||
depends on which compiler you are using:
|
depends on which compiler you are using:
|
||||||
|
|
||||||
BCCROOT: The Borland C compiler
|
BCCROOT: The Borland C compiler
|
||||||
|
MSVCDIR: The Microsoft Compiler 6.0 (for NT)
|
||||||
MSVCNT: The Microsoft Compiler 5.0 (for NT)
|
MSVCNT: The Microsoft Compiler 5.0 (for NT)
|
||||||
MSVC: The Microsoft Compiler 1.5 (for Windows)
|
MSVC: The Microsoft Compiler 1.5 (for Windows)
|
||||||
|
|
||||||
Only MSVCNT has really been tested and is known to work.
|
Only MSVCNT and MSVCDIR have really been tested and are known
|
||||||
|
to work.
|
||||||
|
|
||||||
Macintosh
|
Macintosh
|
||||||
|
|
||||||
@@ -142,6 +144,7 @@ February, 1996 - release 2.1
|
|||||||
November, 1997 - release 2.2
|
November, 1997 - release 2.2
|
||||||
December, 2000 - release 2.3
|
December, 2000 - release 2.3
|
||||||
March, 2002 - release 2.4
|
March, 2002 - release 2.4
|
||||||
|
December, 2002 - release 2.5
|
||||||
|
|
||||||
|
|
||||||
Christopher Seiwald
|
Christopher Seiwald
|
||||||
|
|||||||
+255
-5
@@ -1,9 +1,259 @@
|
|||||||
Release notes for Jam/MR 2.4
|
===============================================================================
|
||||||
|
===============================================================================
|
||||||
|
|
||||||
|
|
||||||
|
Release notes for Jam 2.5
|
||||||
|
(aka Jam - make(1) redux)
|
||||||
|
|
||||||
|
0. Changes between 2.5rc1 and 2.5rc2:
|
||||||
|
|
||||||
|
Several uninitialized memory accesses have been corrected in
|
||||||
|
var_expand() and file_archscan(), thanks to Matt Armstrong.
|
||||||
|
|
||||||
|
Fix 'actions updated' broken by change 2487. (See the
|
||||||
|
description to change 2612 for details).
|
||||||
|
|
||||||
|
Fix "includes of includes not being considered", broken by 2499.
|
||||||
|
(See the description to change 2614 for details).
|
||||||
|
|
||||||
|
Remove NT FQuote rule, as, \" is required to pass quotes on
|
||||||
|
the command line.
|
||||||
|
|
||||||
|
Porting change: allow jam to build with BorlandC 5.5
|
||||||
|
|
||||||
|
Porting change: for WinXP IA64; set MSVCNT to the root of the
|
||||||
|
SDK and MSVCVer to Win64; change handle type to long long (too
|
||||||
|
much to include windows.h?); bury IA64 in the library path in
|
||||||
|
Jambase.
|
||||||
|
|
||||||
|
Porting change: Mac classic MPW Codewarrior 7 upgrades: minor
|
||||||
|
compiling issues, new paths in Jambase for libraries and
|
||||||
|
includes, and separate out GenFile1 that sets PATH for UNIX
|
||||||
|
only, as it does't work under MPW (or anything other than with
|
||||||
|
sh).
|
||||||
|
|
||||||
|
Porting change: Minor Cray porting: make hashitem()'s key
|
||||||
|
value unsigned so we're guaranteed no integer overflows.
|
||||||
|
|
||||||
|
SubDir's support for an externally set TOP variable was broken
|
||||||
|
in 2.5rc1. It now works as it did in 2.4. Further, using SubDir
|
||||||
|
to include a subpart of an SubDir tree now works. Previously,
|
||||||
|
you could only include the root of another SubDir tree. For example,
|
||||||
|
|
||||||
|
SubDir ALL src builds ;
|
||||||
|
SubInclude ALL src server support ;
|
||||||
|
|
||||||
|
Essentially includes the ../server/support/Jamfile, without getting
|
||||||
|
confused as to the current directory.
|
||||||
|
|
||||||
|
0.1. Changes between 2.5rc2 and 2.5rc3:
|
||||||
|
|
||||||
|
More SubDir work after rc2: if a Jamrules invoked SubDir to
|
||||||
|
establish other roots, and that Jamrules isn't in the current
|
||||||
|
directory, the roots it established were wrong.
|
||||||
|
|
||||||
|
Fix mysterious rebuild problem: in an attempt to make 'jam -dc'
|
||||||
|
output report headers updates more accurately, internal (header
|
||||||
|
collection) targets were being bound as T_BIND_PARENTS so that
|
||||||
|
they could carry the timestamp of the actual source file. But
|
||||||
|
that caused the fate of the internal node to be marked as
|
||||||
|
T_FATE_NEEDTMP if anything they included was newer, and that
|
||||||
|
easily happens among header files (something is always newer
|
||||||
|
than something else). Now internal targets carry their parents
|
||||||
|
time, but with T_BIND_UNBOUND, like other NOTFILE targets.
|
||||||
|
|
||||||
|
Remove temp .bat files created on NT. They used to all have
|
||||||
|
the same name and get reused, but with 2.5 the names were salted
|
||||||
|
with the PID and they would litter $TEMP. Now they get removed
|
||||||
|
after being used.
|
||||||
|
|
||||||
|
Undocumented support for SUBDIRRULES, user-provided rules
|
||||||
|
to invoke at the end of the SubDir rule, and SUBDIRRESET,
|
||||||
|
SUBDIR variables to reset (like SUBDIRC++FLAGS, SUBDIRHDRS, etc)
|
||||||
|
for each new SubDir.
|
||||||
|
|
||||||
|
1. Release info:
|
||||||
|
|
||||||
|
Jam 2.5
|
||||||
|
January 20, 2002
|
||||||
|
VERSION 2.5
|
||||||
|
|
||||||
|
2. Compatibility
|
||||||
|
|
||||||
|
Jam 2.5 is upward compatible with Jam 2.4
|
||||||
|
|
||||||
|
The Jam 2.5 language is a superset of the 2.4 language;
|
||||||
|
Jamfiles, Jambase, and other rulesets used in 2.4 can be used
|
||||||
|
with the 2.5 language support.
|
||||||
|
|
||||||
|
3. Changes since 2.4.
|
||||||
|
|
||||||
|
3.1. Changes to Jam Language
|
||||||
|
|
||||||
|
The 'return' statement now actually returns, and there are now
|
||||||
|
break & continue statements for for & while loops.
|
||||||
|
|
||||||
|
3.2. Jambase Changes
|
||||||
|
|
||||||
|
MkDir now grists directories with 'dir', so that directory
|
||||||
|
targets can be distinguished from other targets.
|
||||||
|
|
||||||
|
SubDir now allows multiple overlapping roots (top level
|
||||||
|
directories): the first SubDir of a new root uses the CWD of
|
||||||
|
jam to set that root; subsquent SubDirs use the current SUBDIR
|
||||||
|
to set the new root. New FSubDirPath to compute a path (given
|
||||||
|
SubDir arguments) and SubRules to include another root's
|
||||||
|
Jamrules. Jamrules only included if present; no error issued
|
||||||
|
if no Jamrules file.
|
||||||
|
|
||||||
|
$(RMDIR) has been defined for NT and defaulted to $(RM)
|
||||||
|
everwhere else. Not much tested. For Michael Champigny.
|
||||||
|
|
||||||
|
GenFile actions (on UNIX) now put . in the PATH for the execution
|
||||||
|
of the command, so that (at least) when jam builds itself . does
|
||||||
|
not need to be in the global path. It is the rare case where a
|
||||||
|
target bound in the current directory can't be used directly,
|
||||||
|
so we fudge it by setting PATH.
|
||||||
|
|
||||||
|
3.3 'jam' Changes (See Jam.html)
|
||||||
|
|
||||||
|
The whole /MR of Jam's name has been dropped. It was intended
|
||||||
|
to avoid trademark infringement of JYACC's JAM, but as far as
|
||||||
|
we can tell (a) it wasn't enough to avoid infringement and (b)
|
||||||
|
the trademark has lapsed anyhow.
|
||||||
|
|
||||||
|
If header dependencies cause an object to be recompiled and
|
||||||
|
the source file is a temporary, the temporary is now
|
||||||
|
reconstructed. Previously, headers weren't considered when
|
||||||
|
deciding when to reconstruct a temporary.
|
||||||
|
|
||||||
|
-d has been reworked to make it easier to display more useful
|
||||||
|
tracing information separate from the debugging gunk:
|
||||||
|
|
||||||
|
-da - show all actions (formerly -d2)
|
||||||
|
-dc - show 'causes' for rebuilding (new output)
|
||||||
|
-dd - show dependencies (new output)
|
||||||
|
-dm - show make graph (aka -d3)
|
||||||
|
-dx - show executable text (formerly -d2)
|
||||||
|
|
||||||
|
-dd is new, and more display options are anticipated.
|
||||||
|
|
||||||
|
-n now implies -dax.
|
||||||
|
|
||||||
|
The message "...using xxx..." now only shows up with -da.
|
||||||
|
|
||||||
|
Jam.html was extensively updated, in an attempt at lucidity.
|
||||||
|
|
||||||
|
3.4. Jam internal code changes
|
||||||
|
|
||||||
|
Removed spurious search() in 'on' statement handling, thanks
|
||||||
|
(again) to Ingo Weinhold.
|
||||||
|
|
||||||
|
Fix 'includes' support so that included files aren't treated
|
||||||
|
as direct dependencies during the command execution phase. If
|
||||||
|
an included file failed to build, make1() would bypass the
|
||||||
|
including file. Now make0() appends each child's 'includes'
|
||||||
|
onto its own 'depends' list, eliminating 'includes'-specific
|
||||||
|
code in make0() and make1().
|
||||||
|
|
||||||
|
Rewrite of the past: updated all jam's source with comments to
|
||||||
|
reflect changes since about 2.3, very early 2001.
|
||||||
|
|
||||||
|
|
||||||
|
4. Fixed bugs
|
||||||
|
|
||||||
|
Fixed the description of the :E modifier in Jam.html.
|
||||||
|
|
||||||
|
Setting target-specific variables while under the influence of
|
||||||
|
the target's target-specific variables caused the _global_ values
|
||||||
|
to be modified. This happened both during header file scanning
|
||||||
|
(HdrRule is called when target-specific variables are in effect)
|
||||||
|
and with the "on target statement" syntax. Now setting
|
||||||
|
target-specific variables works again. Thanks to Matt Armstrong.
|
||||||
|
|
||||||
|
Setting "var on target ?= value" now works as expected: if the
|
||||||
|
variable is already set on the target, it is left unchanged.
|
||||||
|
Previously, ?= was ignored and the variable was set anyway.
|
||||||
|
Thanks to Chris Antos.
|
||||||
|
|
||||||
|
Variable expansion in actions has always put an extra blank
|
||||||
|
space after the last list element, but the expansion is described
|
||||||
|
in the code as "space separated". Now the last blank is suppressed
|
||||||
|
to match. From Miklos Fazekas.
|
||||||
|
|
||||||
|
The temp file name used by jam for .bat files on NT now contains
|
||||||
|
jam's pid, so that multiple jams can run on the same system (with
|
||||||
|
the same $TEMP). Thanks to Steve Anichini.
|
||||||
|
|
||||||
|
Several uninitialized memory accesses have been corrected in
|
||||||
|
var_expand() and file_archscan(), thanks to Matt Armstrong.
|
||||||
|
|
||||||
|
5. Porting
|
||||||
|
|
||||||
|
The Makefile now uses $(EXENAME) (./jam0 on UNIX, .\jam0.exe
|
||||||
|
on NT) instead of just "jam0", so that . doesn't need to be in
|
||||||
|
your PATH to bootstrap.
|
||||||
|
|
||||||
|
MACOSX updates: use 'ar' instead of libtool, as libtool can't
|
||||||
|
update a library and we archive too many things to do it in
|
||||||
|
one go; add piles of code to file_archscan() to handle new
|
||||||
|
BSD4.4 style "#1/nnnn" archive entry names, where the real
|
||||||
|
entry name follows the header and nnnn is the length of the
|
||||||
|
name.
|
||||||
|
|
||||||
|
The jam code underwent a const-ing, to work with compilers
|
||||||
|
that don't like "" being passed as a non-const char *.
|
||||||
|
|
||||||
|
Compiling on solaris w/ sparc now sets OSPLAT to "sparc".
|
||||||
|
Previously, it suppressed this, assuming (wrongly) that sparc
|
||||||
|
was the only solaris platform. Thanks to Michael Champigny
|
||||||
|
<[email protected]>.
|
||||||
|
|
||||||
|
Jambase no longer announces the compiler it is using on
|
||||||
|
Windows. It doesn't announce anything else, so why?
|
||||||
|
|
||||||
|
Jambase no longer refers to advapi32.lib on NT, as it isn't
|
||||||
|
needed for linking jam itself and it seems to move from
|
||||||
|
release to release (of MS Visual Studio).
|
||||||
|
|
||||||
|
Makefile/Jambase: BEOS updates from "Ingo Weinhold"
|
||||||
|
<[email protected]>.
|
||||||
|
|
||||||
|
The NoCare rule can be used to suppress error messages when
|
||||||
|
an 'include' file can't be found.
|
||||||
|
|
||||||
|
AIX "big" archives are now supported, thanks to suggestions
|
||||||
|
from Randy Roesler.
|
||||||
|
|
||||||
|
MSVCDIR now works as well as MSVCNT for the Microsoft Visual C
|
||||||
|
compiler directory. It changed names in VC 6.0. Thanks to
|
||||||
|
Matt Armstrong.
|
||||||
|
|
||||||
|
Allow jam to build with BorlandC 5.5
|
||||||
|
|
||||||
|
For WinXP IA64; set MSVCNT to the root of the SDK and MSVCVer
|
||||||
|
to Win64; change handle type to long long (too much to include
|
||||||
|
windows.h?); bury IA64 in the library path in Jambase.
|
||||||
|
|
||||||
|
Mac classic MPW Codewarrior 7 upgrades: minor compiling
|
||||||
|
issues, new paths in Jambase for libraries and includes, and
|
||||||
|
separate out GenFile1 that sets PATH for UNIX only, as it
|
||||||
|
does't work under MPW (or anything other than with sh).
|
||||||
|
|
||||||
|
Minor Cray porting: make hashitem()'s key value unsigned so
|
||||||
|
we're guaranteed no integer overflows.
|
||||||
|
|
||||||
|
|
||||||
|
===============================================================================
|
||||||
|
===============================================================================
|
||||||
|
|
||||||
|
|
||||||
|
Release notes for Jam 2.4
|
||||||
(aka Jam - make(1) redux)
|
(aka Jam - make(1) redux)
|
||||||
|
|
||||||
1. Release info:
|
1. Release info:
|
||||||
|
|
||||||
Jam/MR 2.4
|
Jam 2.4
|
||||||
March, 21, 2002
|
March, 21, 2002
|
||||||
VERSION 2.4
|
VERSION 2.4
|
||||||
|
|
||||||
@@ -196,7 +446,7 @@ Release notes for Jam/MR 2.4
|
|||||||
===============================================================================
|
===============================================================================
|
||||||
|
|
||||||
|
|
||||||
Release notes for Jam/MR 2.3
|
Release notes for Jam 2.3
|
||||||
(aka Jam - make(1) redux)
|
(aka Jam - make(1) redux)
|
||||||
|
|
||||||
0. Bugs fixed since 2.3.1
|
0. Bugs fixed since 2.3.1
|
||||||
@@ -211,7 +461,7 @@ Release notes for Jam/MR 2.3
|
|||||||
|
|
||||||
1. Release info:
|
1. Release info:
|
||||||
|
|
||||||
Jam/MR 2.3
|
Jam 2.3
|
||||||
November 16, 2000
|
November 16, 2000
|
||||||
VERSION 2.3
|
VERSION 2.3
|
||||||
PATCHLEVEL 1
|
PATCHLEVEL 1
|
||||||
@@ -258,7 +508,7 @@ Release notes for Jam/MR 2.3
|
|||||||
|
|
||||||
The old mock functions like makeDirName, which assigned their
|
The old mock functions like makeDirName, which assigned their
|
||||||
results to the variable named as their first argument, have
|
results to the variable named as their first argument, have
|
||||||
been replaced with real functions using the new [] synxtax.
|
been replaced with real functions using the new [] syntax.
|
||||||
E.g. "makeDirName foo : bar ola" is now "foo = [ fDirName bar ]"
|
E.g. "makeDirName foo : bar ola" is now "foo = [ fDirName bar ]"
|
||||||
|
|
||||||
Install now always does a cp/chmod/etc, rather than using
|
Install now always does a cp/chmod/etc, rather than using
|
||||||
|
|||||||
+56
-31
@@ -4,17 +4,6 @@
|
|||||||
* This file is part of Jam - see jam.c for Copyright information.
|
* This file is part of Jam - see jam.c for Copyright information.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
# include "jam.h"
|
|
||||||
|
|
||||||
# include "lists.h"
|
|
||||||
# include "parse.h"
|
|
||||||
# include "builtins.h"
|
|
||||||
# include "rules.h"
|
|
||||||
# include "filesys.h"
|
|
||||||
# include "newstr.h"
|
|
||||||
# include "regexp.h"
|
|
||||||
# include "pathsys.h"
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* builtins.c - builtin jam rules
|
* builtins.c - builtin jam rules
|
||||||
*
|
*
|
||||||
@@ -32,8 +21,27 @@
|
|||||||
* builtin_match() - MATCH rule
|
* builtin_match() - MATCH rule
|
||||||
*
|
*
|
||||||
* 01/10/01 (seiwald) - split from compile.c
|
* 01/10/01 (seiwald) - split from compile.c
|
||||||
|
* 01/08/01 (seiwald) - new 'Glob' (file expansion) builtin
|
||||||
|
* 03/02/02 (seiwald) - new 'Match' (regexp match) builtin
|
||||||
|
* 04/03/02 (seiwald) - Glob matches only filename, not directory
|
||||||
|
* 10/22/02 (seiwald) - list_new() now does its own newstr()/copystr()
|
||||||
|
* 10/22/02 (seiwald) - working return/break/continue statements
|
||||||
|
* 11/04/02 (seiwald) - const-ing for string literals
|
||||||
|
* 12/03/02 (seiwald) - fix odd includes support by grafting them onto depends
|
||||||
|
* 01/14/03 (seiwald) - fix includes fix with new internal includes TARGET
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
# include "jam.h"
|
||||||
|
|
||||||
|
# include "lists.h"
|
||||||
|
# include "parse.h"
|
||||||
|
# include "builtins.h"
|
||||||
|
# include "rules.h"
|
||||||
|
# include "filesys.h"
|
||||||
|
# include "newstr.h"
|
||||||
|
# include "regexp.h"
|
||||||
|
# include "pathsys.h"
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* compile_builtin() - define builtin rules
|
* compile_builtin() - define builtin rules
|
||||||
*/
|
*/
|
||||||
@@ -41,14 +49,14 @@
|
|||||||
# define P0 (PARSE *)0
|
# define P0 (PARSE *)0
|
||||||
# define C0 (char *)0
|
# define C0 (char *)0
|
||||||
|
|
||||||
LIST *builtin_depends( PARSE *parse, LOL *args );
|
LIST *builtin_depends( PARSE *parse, LOL *args, int *jmp );
|
||||||
LIST *builtin_echo( PARSE *parse, LOL *args );
|
LIST *builtin_echo( PARSE *parse, LOL *args, int *jmp );
|
||||||
LIST *builtin_exit( PARSE *parse, LOL *args );
|
LIST *builtin_exit( PARSE *parse, LOL *args, int *jmp );
|
||||||
LIST *builtin_flags( PARSE *parse, LOL *args );
|
LIST *builtin_flags( PARSE *parse, LOL *args, int *jmp );
|
||||||
LIST *builtin_glob( PARSE *parse, LOL *args );
|
LIST *builtin_glob( PARSE *parse, LOL *args, int *jmp );
|
||||||
LIST *builtin_match( PARSE *parse, LOL *args );
|
LIST *builtin_match( PARSE *parse, LOL *args, int *jmp );
|
||||||
|
|
||||||
int glob( char *s, char *c );
|
int glob( const char *s, const char *c );
|
||||||
|
|
||||||
void
|
void
|
||||||
load_builtins()
|
load_builtins()
|
||||||
@@ -59,7 +67,7 @@ load_builtins()
|
|||||||
|
|
||||||
bindrule( "Depends" )->procedure =
|
bindrule( "Depends" )->procedure =
|
||||||
bindrule( "DEPENDS" )->procedure =
|
bindrule( "DEPENDS" )->procedure =
|
||||||
parse_make( builtin_depends, P0, P0, P0, C0, C0, T_DEPS_DEPENDS );
|
parse_make( builtin_depends, P0, P0, P0, C0, C0, 0 );
|
||||||
|
|
||||||
bindrule( "echo" )->procedure =
|
bindrule( "echo" )->procedure =
|
||||||
bindrule( "Echo" )->procedure =
|
bindrule( "Echo" )->procedure =
|
||||||
@@ -77,7 +85,7 @@ load_builtins()
|
|||||||
|
|
||||||
bindrule( "Includes" )->procedure =
|
bindrule( "Includes" )->procedure =
|
||||||
bindrule( "INCLUDES" )->procedure =
|
bindrule( "INCLUDES" )->procedure =
|
||||||
parse_make( builtin_depends, P0, P0, P0, C0, C0, T_DEPS_INCLUDES );
|
parse_make( builtin_depends, P0, P0, P0, C0, C0, 1 );
|
||||||
|
|
||||||
bindrule( "Leaves" )->procedure =
|
bindrule( "Leaves" )->procedure =
|
||||||
bindrule( "LEAVES" )->procedure =
|
bindrule( "LEAVES" )->procedure =
|
||||||
@@ -116,17 +124,29 @@ load_builtins()
|
|||||||
LIST *
|
LIST *
|
||||||
builtin_depends(
|
builtin_depends(
|
||||||
PARSE *parse,
|
PARSE *parse,
|
||||||
LOL *args )
|
LOL *args,
|
||||||
|
int *jmp )
|
||||||
{
|
{
|
||||||
LIST *targets = lol_get( args, 0 );
|
LIST *targets = lol_get( args, 0 );
|
||||||
LIST *sources = lol_get( args, 1 );
|
LIST *sources = lol_get( args, 1 );
|
||||||
int which = parse->num;
|
|
||||||
LIST *l;
|
LIST *l;
|
||||||
|
|
||||||
for( l = targets; l; l = list_next( l ) )
|
for( l = targets; l; l = list_next( l ) )
|
||||||
{
|
{
|
||||||
TARGET *t = bindtarget( l->string );
|
TARGET *t = bindtarget( l->string );
|
||||||
t->deps[ which ] = targetlist( t->deps[ which ], sources );
|
|
||||||
|
/* If doing INCLUDES, switch to the TARGET's include */
|
||||||
|
/* TARGET, creating it if needed. The internal include */
|
||||||
|
/* TARGET shares the name of its parent. */
|
||||||
|
|
||||||
|
if( parse->num )
|
||||||
|
{
|
||||||
|
if( !t->includes )
|
||||||
|
t->includes = copytarget( t );
|
||||||
|
t = t->includes;
|
||||||
|
}
|
||||||
|
|
||||||
|
t->depends = targetlist( t->depends, sources );
|
||||||
}
|
}
|
||||||
|
|
||||||
return L0;
|
return L0;
|
||||||
@@ -142,7 +162,8 @@ builtin_depends(
|
|||||||
LIST *
|
LIST *
|
||||||
builtin_echo(
|
builtin_echo(
|
||||||
PARSE *parse,
|
PARSE *parse,
|
||||||
LOL *args )
|
LOL *args,
|
||||||
|
int *jmp )
|
||||||
{
|
{
|
||||||
list_print( lol_get( args, 0 ) );
|
list_print( lol_get( args, 0 ) );
|
||||||
printf( "\n" );
|
printf( "\n" );
|
||||||
@@ -159,7 +180,8 @@ builtin_echo(
|
|||||||
LIST *
|
LIST *
|
||||||
builtin_exit(
|
builtin_exit(
|
||||||
PARSE *parse,
|
PARSE *parse,
|
||||||
LOL *args )
|
LOL *args,
|
||||||
|
int *jmp )
|
||||||
{
|
{
|
||||||
list_print( lol_get( args, 0 ) );
|
list_print( lol_get( args, 0 ) );
|
||||||
printf( "\n" );
|
printf( "\n" );
|
||||||
@@ -177,7 +199,8 @@ builtin_exit(
|
|||||||
LIST *
|
LIST *
|
||||||
builtin_flags(
|
builtin_flags(
|
||||||
PARSE *parse,
|
PARSE *parse,
|
||||||
LOL *args )
|
LOL *args,
|
||||||
|
int *jmp )
|
||||||
{
|
{
|
||||||
LIST *l = lol_get( args, 0 );
|
LIST *l = lol_get( args, 0 );
|
||||||
|
|
||||||
@@ -199,7 +222,7 @@ struct globbing {
|
|||||||
static void
|
static void
|
||||||
builtin_glob_back(
|
builtin_glob_back(
|
||||||
void *closure,
|
void *closure,
|
||||||
char *file,
|
const char *file,
|
||||||
int status,
|
int status,
|
||||||
time_t time )
|
time_t time )
|
||||||
{
|
{
|
||||||
@@ -218,7 +241,7 @@ builtin_glob_back(
|
|||||||
for( l = globbing->patterns; l; l = l->next )
|
for( l = globbing->patterns; l; l = l->next )
|
||||||
if( !glob( l->string, buf ) )
|
if( !glob( l->string, buf ) )
|
||||||
{
|
{
|
||||||
globbing->results = list_new( globbing->results, newstr( file ) );
|
globbing->results = list_new( globbing->results, file, 0 );
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -226,7 +249,8 @@ builtin_glob_back(
|
|||||||
LIST *
|
LIST *
|
||||||
builtin_glob(
|
builtin_glob(
|
||||||
PARSE *parse,
|
PARSE *parse,
|
||||||
LOL *args )
|
LOL *args,
|
||||||
|
int *jmp )
|
||||||
{
|
{
|
||||||
LIST *l = lol_get( args, 0 );
|
LIST *l = lol_get( args, 0 );
|
||||||
LIST *r = lol_get( args, 1 );
|
LIST *r = lol_get( args, 1 );
|
||||||
@@ -249,7 +273,8 @@ builtin_glob(
|
|||||||
LIST *
|
LIST *
|
||||||
builtin_match(
|
builtin_match(
|
||||||
PARSE *parse,
|
PARSE *parse,
|
||||||
LOL *args )
|
LOL *args,
|
||||||
|
int *jmp )
|
||||||
{
|
{
|
||||||
LIST *l, *r;
|
LIST *l, *r;
|
||||||
LIST *result = 0;
|
LIST *result = 0;
|
||||||
@@ -282,7 +307,7 @@ builtin_match(
|
|||||||
int l = re->endp[i] - re->startp[i];
|
int l = re->endp[i] - re->startp[i];
|
||||||
memcpy( buf, re->startp[i], l );
|
memcpy( buf, re->startp[i], l );
|
||||||
buf[ l ] = 0;
|
buf[ l ] = 0;
|
||||||
result = list_new( result, newstr( buf ) );
|
result = list_new( result, buf, 0 );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -6,6 +6,8 @@
|
|||||||
|
|
||||||
/*
|
/*
|
||||||
* builtins.h - compile parsed jam statements
|
* builtins.h - compile parsed jam statements
|
||||||
|
*
|
||||||
|
* 01/10/01 (seiwald) - split from compile.h
|
||||||
*/
|
*/
|
||||||
|
|
||||||
void load_builtins();
|
void load_builtins();
|
||||||
|
|||||||
@@ -6,6 +6,9 @@
|
|||||||
|
|
||||||
/*
|
/*
|
||||||
* command.c - maintain lists of commands
|
* command.c - maintain lists of commands
|
||||||
|
*
|
||||||
|
* 01/20/00 (seiwald) - Upgraded from K&R to ANSI C
|
||||||
|
* 09/08/00 (seiwald) - bulletproof PIECEMEAL size computation
|
||||||
*/
|
*/
|
||||||
|
|
||||||
# include "jam.h"
|
# include "jam.h"
|
||||||
@@ -26,7 +29,8 @@ cmd_new(
|
|||||||
RULE *rule,
|
RULE *rule,
|
||||||
LIST *targets,
|
LIST *targets,
|
||||||
LIST *sources,
|
LIST *sources,
|
||||||
LIST *shell )
|
LIST *shell,
|
||||||
|
int maxline )
|
||||||
{
|
{
|
||||||
CMD *cmd = (CMD *)malloc( sizeof( CMD ) );
|
CMD *cmd = (CMD *)malloc( sizeof( CMD ) );
|
||||||
|
|
||||||
@@ -38,10 +42,10 @@ cmd_new(
|
|||||||
lol_add( &cmd->args, targets );
|
lol_add( &cmd->args, targets );
|
||||||
lol_add( &cmd->args, sources );
|
lol_add( &cmd->args, sources );
|
||||||
|
|
||||||
/* Bail if the result won't fit in MAXLINE */
|
/* Bail if the result won't fit in maxline */
|
||||||
/* We don't free targets/sources/shell if bailing. */
|
/* We don't free targets/sources/shell if bailing. */
|
||||||
|
|
||||||
if( var_string( rule->actions, cmd->buf, MAXLINE, &cmd->args ) < 0 )
|
if( var_string( rule->actions, cmd->buf, maxline, &cmd->args ) < 0 )
|
||||||
{
|
{
|
||||||
cmd_free( cmd );
|
cmd_free( cmd );
|
||||||
return 0;
|
return 0;
|
||||||
|
|||||||
@@ -51,7 +51,8 @@ CMD *cmd_new(
|
|||||||
RULE *rule, /* rule (referenced) */
|
RULE *rule, /* rule (referenced) */
|
||||||
LIST *targets, /* $(<) (freed) */
|
LIST *targets, /* $(<) (freed) */
|
||||||
LIST *sources, /* $(>) (freed) */
|
LIST *sources, /* $(>) (freed) */
|
||||||
LIST *shell ); /* $(SHELL) (freed) */
|
LIST *shell, /* $(SHELL) (freed) */
|
||||||
|
int maxline ); /* max line length */
|
||||||
|
|
||||||
void cmd_free( CMD *cmd );
|
void cmd_free( CMD *cmd );
|
||||||
|
|
||||||
|
|||||||
@@ -4,13 +4,6 @@
|
|||||||
* This file is part of Jam - see jam.c for Copyright information.
|
* This file is part of Jam - see jam.c for Copyright information.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
# include "jam.h"
|
|
||||||
# include "lists.h"
|
|
||||||
# include "execcmd.h"
|
|
||||||
# include <errno.h>
|
|
||||||
|
|
||||||
# ifdef OS_MAC
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* execunix.c - execute a shell script on UNIX
|
* execunix.c - execute a shell script on UNIX
|
||||||
*
|
*
|
||||||
@@ -38,8 +31,16 @@
|
|||||||
* 04/08/94 (seiwald) - Coherent/386 support added.
|
* 04/08/94 (seiwald) - Coherent/386 support added.
|
||||||
* 05/04/94 (seiwald) - async multiprocess interface
|
* 05/04/94 (seiwald) - async multiprocess interface
|
||||||
* 01/22/95 (seiwald) - $(JAMSHELL) support
|
* 01/22/95 (seiwald) - $(JAMSHELL) support
|
||||||
|
* 01/20/00 (seiwald) - Upgraded from K&R to ANSI C
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
# include "jam.h"
|
||||||
|
# include "lists.h"
|
||||||
|
# include "execcmd.h"
|
||||||
|
# include <errno.h>
|
||||||
|
|
||||||
|
# ifdef OS_MAC
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* execcmd() - launch an async command execution
|
* execcmd() - launch an async command execution
|
||||||
*/
|
*/
|
||||||
|
|||||||
+49
-34
@@ -4,30 +4,6 @@
|
|||||||
* This file is part of Jam - see jam.c for Copyright information.
|
* This file is part of Jam - see jam.c for Copyright information.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
# include "jam.h"
|
|
||||||
# include "lists.h"
|
|
||||||
# include "execcmd.h"
|
|
||||||
# include <errno.h>
|
|
||||||
|
|
||||||
# ifdef USE_EXECUNIX
|
|
||||||
|
|
||||||
# ifdef NO_VFORK
|
|
||||||
# define vfork() fork()
|
|
||||||
# endif
|
|
||||||
|
|
||||||
# if defined( OS_NT ) || defined( OS_OS2 )
|
|
||||||
|
|
||||||
# define USE_EXECNT
|
|
||||||
|
|
||||||
# include <process.h>
|
|
||||||
|
|
||||||
# if !defined( __BORLANDC__ ) && !defined( OS_OS2 )
|
|
||||||
# define wait my_wait
|
|
||||||
static int my_wait( int *status );
|
|
||||||
# endif
|
|
||||||
|
|
||||||
# endif
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* execunix.c - execute a shell script on UNIX/WinNT/OS2/AmigaOS
|
* execunix.c - execute a shell script on UNIX/WinNT/OS2/AmigaOS
|
||||||
*
|
*
|
||||||
@@ -57,8 +33,35 @@ static int my_wait( int *status );
|
|||||||
* 05/04/94 (seiwald) - async multiprocess interface
|
* 05/04/94 (seiwald) - async multiprocess interface
|
||||||
* 01/22/95 (seiwald) - $(JAMSHELL) support
|
* 01/22/95 (seiwald) - $(JAMSHELL) support
|
||||||
* 06/02/97 (gsar) - full async multiprocess support for Win32
|
* 06/02/97 (gsar) - full async multiprocess support for Win32
|
||||||
|
* 01/20/00 (seiwald) - Upgraded from K&R to ANSI C
|
||||||
|
* 11/04/02 (seiwald) - const-ing for string literals
|
||||||
|
* 12/27/02 (seiwald) - grist .bat file with pid for system uniqueness
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
# include "jam.h"
|
||||||
|
# include "lists.h"
|
||||||
|
# include "execcmd.h"
|
||||||
|
# include <errno.h>
|
||||||
|
|
||||||
|
# ifdef USE_EXECUNIX
|
||||||
|
|
||||||
|
# ifdef OS_OS2
|
||||||
|
# define USE_EXECNT
|
||||||
|
# include <process.h>
|
||||||
|
# endif
|
||||||
|
|
||||||
|
# ifdef OS_NT
|
||||||
|
# define USE_EXECNT
|
||||||
|
# include <process.h>
|
||||||
|
# define WIN32_LEAN_AND_MEAN
|
||||||
|
# include <windows.h> /* do the ugly deed */
|
||||||
|
# define USE_MYWAIT
|
||||||
|
# if !defined( __BORLANDC__ )
|
||||||
|
# define wait my_wait
|
||||||
|
static int my_wait( int *status );
|
||||||
|
# endif
|
||||||
|
# endif
|
||||||
|
|
||||||
static int intr = 0;
|
static int intr = 0;
|
||||||
static int cmdsrunning = 0;
|
static int cmdsrunning = 0;
|
||||||
static void (*istat)( int );
|
static void (*istat)( int );
|
||||||
@@ -99,7 +102,7 @@ execcmd(
|
|||||||
{
|
{
|
||||||
int pid;
|
int pid;
|
||||||
int slot;
|
int slot;
|
||||||
char *argv[ MAXARGC + 1 ]; /* +1 for NULL */
|
const char *argv[ MAXARGC + 1 ]; /* +1 for NULL */
|
||||||
|
|
||||||
# ifdef USE_EXECNT
|
# ifdef USE_EXECNT
|
||||||
char *p;
|
char *p;
|
||||||
@@ -126,10 +129,12 @@ execcmd(
|
|||||||
!( tempdir = getenv( "TMP" ) ) )
|
!( tempdir = getenv( "TMP" ) ) )
|
||||||
tempdir = "\\temp";
|
tempdir = "\\temp";
|
||||||
|
|
||||||
cmdtab[ slot ].tempfile = malloc( strlen( tempdir ) + 14 );
|
/* +32 is room for \jamXXXXXtSS.bat (at least) */
|
||||||
|
|
||||||
sprintf( cmdtab[ slot ].tempfile, "%s\\jamtmp%02d.bat",
|
cmdtab[ slot ].tempfile = malloc( strlen( tempdir ) + 32 );
|
||||||
tempdir, slot );
|
|
||||||
|
sprintf( cmdtab[ slot ].tempfile, "%s\\jam%dt%d.bat",
|
||||||
|
tempdir, GetCurrentProcessId(), slot );
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Trim leading, ending white space */
|
/* Trim leading, ending white space */
|
||||||
@@ -216,12 +221,20 @@ execcmd(
|
|||||||
perror( "spawn" );
|
perror( "spawn" );
|
||||||
exit( EXITBAD );
|
exit( EXITBAD );
|
||||||
}
|
}
|
||||||
|
# else
|
||||||
|
# ifdef NO_VFORK
|
||||||
|
if ((pid = fork()) == 0)
|
||||||
|
{
|
||||||
|
execvp( argv[0], argv );
|
||||||
|
_exit(127);
|
||||||
|
}
|
||||||
# else
|
# else
|
||||||
if ((pid = vfork()) == 0)
|
if ((pid = vfork()) == 0)
|
||||||
{
|
{
|
||||||
execvp( argv[0], argv );
|
execvp( argv[0], argv );
|
||||||
_exit(127);
|
_exit(127);
|
||||||
}
|
}
|
||||||
|
# endif
|
||||||
|
|
||||||
if( pid == -1 )
|
if( pid == -1 )
|
||||||
{
|
{
|
||||||
@@ -283,6 +296,12 @@ execwait()
|
|||||||
exit( EXITBAD );
|
exit( EXITBAD );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# ifdef USE_EXECNT
|
||||||
|
/* Clear the temp file */
|
||||||
|
|
||||||
|
unlink( cmdtab[ i ].tempfile );
|
||||||
|
# endif
|
||||||
|
|
||||||
/* Drive the completion */
|
/* Drive the completion */
|
||||||
|
|
||||||
if( !--cmdsrunning )
|
if( !--cmdsrunning )
|
||||||
@@ -302,11 +321,7 @@ execwait()
|
|||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
# if defined( OS_NT ) && !defined( __BORLANDC__ )
|
# ifdef USE_MYWAIT
|
||||||
|
|
||||||
# define WIN32_LEAN_AND_MEAN
|
|
||||||
|
|
||||||
# include <windows.h> /* do the ugly deed */
|
|
||||||
|
|
||||||
static int
|
static int
|
||||||
my_wait( int *status )
|
my_wait( int *status )
|
||||||
@@ -365,6 +380,6 @@ FAILED:
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
# endif /* NT && !__BORLANDC__ */
|
# endif /* USE_MYWAIT */
|
||||||
|
|
||||||
# endif /* USE_EXECUNIX */
|
# endif /* USE_EXECUNIX */
|
||||||
|
|||||||
+16
-15
@@ -4,21 +4,6 @@
|
|||||||
* This file is part of Jam - see jam.c for Copyright information.
|
* This file is part of Jam - see jam.c for Copyright information.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
# include "jam.h"
|
|
||||||
# include "lists.h"
|
|
||||||
# include "execcmd.h"
|
|
||||||
|
|
||||||
# ifdef OS_VMS
|
|
||||||
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <string.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <iodef.h>
|
|
||||||
#include <ssdef.h>
|
|
||||||
#include <descrip.h>
|
|
||||||
#include <dvidef.h>
|
|
||||||
#include <clidef.h>
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* execvms.c - execute a shell script, ala VMS
|
* execvms.c - execute a shell script, ala VMS
|
||||||
*
|
*
|
||||||
@@ -36,8 +21,24 @@
|
|||||||
* 05/04/94 (seiwald) - async multiprocess interface; noop on VMS
|
* 05/04/94 (seiwald) - async multiprocess interface; noop on VMS
|
||||||
* 12/20/96 (seiwald) - rewritten to handle multi-line commands well
|
* 12/20/96 (seiwald) - rewritten to handle multi-line commands well
|
||||||
* 01/14/96 (seiwald) - don't put -'s between "'s
|
* 01/14/96 (seiwald) - don't put -'s between "'s
|
||||||
|
* 01/20/00 (seiwald) - Upgraded from K&R to ANSI C
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
# include "jam.h"
|
||||||
|
# include "lists.h"
|
||||||
|
# include "execcmd.h"
|
||||||
|
|
||||||
|
# ifdef OS_VMS
|
||||||
|
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <string.h>
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <iodef.h>
|
||||||
|
#include <ssdef.h>
|
||||||
|
#include <descrip.h>
|
||||||
|
#include <dvidef.h>
|
||||||
|
#include <clidef.h>
|
||||||
|
|
||||||
#define WRTLEN 240
|
#define WRTLEN 240
|
||||||
|
|
||||||
#define MIN( a, b ) ((a) < (b) ? (a) : (b))
|
#define MIN( a, b ) ((a) < (b) ? (a) : (b))
|
||||||
|
|||||||
+27
-20
@@ -4,13 +4,6 @@
|
|||||||
* This file is part of Jam - see jam.c for Copyright information.
|
* This file is part of Jam - see jam.c for Copyright information.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
# include "jam.h"
|
|
||||||
# include "lists.h"
|
|
||||||
# include "variable.h"
|
|
||||||
# include "expand.h"
|
|
||||||
# include "pathsys.h"
|
|
||||||
# include "newstr.h"
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* expand.c - expand a buffer, given variable values
|
* expand.c - expand a buffer, given variable values
|
||||||
*
|
*
|
||||||
@@ -26,9 +19,23 @@
|
|||||||
*
|
*
|
||||||
* 01/25/94 (seiwald) - $(X)$(UNDEF) was expanding like plain $(X)
|
* 01/25/94 (seiwald) - $(X)$(UNDEF) was expanding like plain $(X)
|
||||||
* 04/13/94 (seiwald) - added shorthand L0 for null list pointer
|
* 04/13/94 (seiwald) - added shorthand L0 for null list pointer
|
||||||
|
* 01/20/00 (seiwald) - Upgraded from K&R to ANSI C
|
||||||
* 01/11/01 (seiwald) - added support for :E=emptyvalue, :J=joinval
|
* 01/11/01 (seiwald) - added support for :E=emptyvalue, :J=joinval
|
||||||
|
* 01/13/01 (seiwald) - :UDJE work on non-filename strings
|
||||||
|
* 02/19/01 (seiwald) - make $($(var):J=x) join multiple values of var
|
||||||
|
* 01/25/02 (seiwald) - fixed broken $(v[1-]), by ian godin
|
||||||
|
* 10/22/02 (seiwald) - list_new() now does its own newstr()/copystr()
|
||||||
|
* 11/04/02 (seiwald) - const-ing for string literals
|
||||||
|
* 12/30/02 (armstrong) - fix out-of-bounds access in var_expand()
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
# include "jam.h"
|
||||||
|
# include "lists.h"
|
||||||
|
# include "variable.h"
|
||||||
|
# include "expand.h"
|
||||||
|
# include "pathsys.h"
|
||||||
|
# include "newstr.h"
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
PATHNAME f; /* :GDBSMR -- pieces */
|
PATHNAME f; /* :GDBSMR -- pieces */
|
||||||
char parent; /* :P -- go to parent directory */
|
char parent; /* :P -- go to parent directory */
|
||||||
@@ -39,8 +46,8 @@ typedef struct {
|
|||||||
PATHPART join; /* :J -- join list with char */
|
PATHPART join; /* :J -- join list with char */
|
||||||
} VAR_EDITS ;
|
} VAR_EDITS ;
|
||||||
|
|
||||||
static void var_edit_parse( char *mods, VAR_EDITS *edits );
|
static void var_edit_parse( const char *mods, VAR_EDITS *edits );
|
||||||
static void var_edit_file( char *in, char *out, VAR_EDITS *edits );
|
static void var_edit_file( const char *in, char *out, VAR_EDITS *edits );
|
||||||
static void var_edit_shift( char *out, VAR_EDITS *edits );
|
static void var_edit_shift( char *out, VAR_EDITS *edits );
|
||||||
|
|
||||||
# define MAGIC_COLON '\001'
|
# define MAGIC_COLON '\001'
|
||||||
@@ -62,14 +69,14 @@ static void var_edit_shift( char *out, VAR_EDITS *edits );
|
|||||||
LIST *
|
LIST *
|
||||||
var_expand(
|
var_expand(
|
||||||
LIST *l,
|
LIST *l,
|
||||||
char *in,
|
const char *in,
|
||||||
char *end,
|
const char *end,
|
||||||
LOL *lol,
|
LOL *lol,
|
||||||
int cancopyin )
|
int cancopyin )
|
||||||
{
|
{
|
||||||
char out_buf[ MAXSYM ];
|
char out_buf[ MAXSYM ];
|
||||||
char *out = out_buf;
|
char *out = out_buf;
|
||||||
char *inp = in;
|
const char *inp = in;
|
||||||
char *ov; /* for temp copy of variable in outbuf */
|
char *ov; /* for temp copy of variable in outbuf */
|
||||||
int depth;
|
int depth;
|
||||||
|
|
||||||
@@ -78,7 +85,7 @@ var_expand(
|
|||||||
|
|
||||||
/* This gets alot of cases: $(<) and $(>) */
|
/* This gets alot of cases: $(<) and $(>) */
|
||||||
|
|
||||||
if( in[0] == '$' && in[1] == '(' && in[3] == ')' && !in[4] )
|
if( end - in == 4 && in[0] == '$' && in[1] == '(' && in[3] == ')' )
|
||||||
{
|
{
|
||||||
switch( in[2] )
|
switch( in[2] )
|
||||||
{
|
{
|
||||||
@@ -107,9 +114,9 @@ var_expand(
|
|||||||
*out = '\0';
|
*out = '\0';
|
||||||
|
|
||||||
if( cancopyin )
|
if( cancopyin )
|
||||||
return list_new( l, copystr( inp ) );
|
return list_new( l, inp, 1 );
|
||||||
else
|
else
|
||||||
return list_new( l, newstr( out_buf ) );
|
return list_new( l, out_buf, 0 );
|
||||||
|
|
||||||
expand:
|
expand:
|
||||||
/*
|
/*
|
||||||
@@ -258,7 +265,7 @@ var_expand(
|
|||||||
/* Empty w/ :E=default? */
|
/* Empty w/ :E=default? */
|
||||||
|
|
||||||
if( !value && colon && edits.empty.ptr )
|
if( !value && colon && edits.empty.ptr )
|
||||||
evalue = value = list_new( L0, newstr( edits.empty.ptr ) );
|
evalue = value = list_new( L0, edits.empty.ptr, 0 );
|
||||||
|
|
||||||
/* For each variable value */
|
/* For each variable value */
|
||||||
|
|
||||||
@@ -300,7 +307,7 @@ var_expand(
|
|||||||
|
|
||||||
if( in == end )
|
if( in == end )
|
||||||
{
|
{
|
||||||
l = list_new( l, newstr( out_buf ) );
|
l = list_new( l, out_buf, 0 );
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -314,7 +321,7 @@ var_expand(
|
|||||||
for( rem = remainder; rem; rem = list_next( rem ) )
|
for( rem = remainder; rem; rem = list_next( rem ) )
|
||||||
{
|
{
|
||||||
strcpy( out1, rem->string );
|
strcpy( out1, rem->string );
|
||||||
l = list_new( l, newstr( out_buf ) );
|
l = list_new( l, out_buf, 0 );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -380,7 +387,7 @@ var_expand(
|
|||||||
|
|
||||||
static void
|
static void
|
||||||
var_edit_parse(
|
var_edit_parse(
|
||||||
char *mods,
|
const char *mods,
|
||||||
VAR_EDITS *edits )
|
VAR_EDITS *edits )
|
||||||
{
|
{
|
||||||
int havezeroed = 0;
|
int havezeroed = 0;
|
||||||
@@ -463,7 +470,7 @@ var_edit_parse(
|
|||||||
|
|
||||||
static void
|
static void
|
||||||
var_edit_file(
|
var_edit_file(
|
||||||
char *in,
|
const char *in,
|
||||||
char *out,
|
char *out,
|
||||||
VAR_EDITS *edits )
|
VAR_EDITS *edits )
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -6,6 +6,13 @@
|
|||||||
|
|
||||||
/*
|
/*
|
||||||
* expand.h - expand a buffer, given variable values
|
* expand.h - expand a buffer, given variable values
|
||||||
|
*
|
||||||
|
* 11/04/02 (seiwald) - const-ing for string literals
|
||||||
*/
|
*/
|
||||||
|
|
||||||
LIST *var_expand( LIST *l, char *in, char *end, LOL *lol, int cancopyin );
|
LIST *var_expand(
|
||||||
|
LIST *l,
|
||||||
|
const char *in,
|
||||||
|
const char *end,
|
||||||
|
LOL *lol,
|
||||||
|
int cancopyin );
|
||||||
|
|||||||
+17
-14
@@ -4,17 +4,6 @@
|
|||||||
* This file is part of Jam - see jam.c for Copyright information.
|
* This file is part of Jam - see jam.c for Copyright information.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
# include "jam.h"
|
|
||||||
# include "filesys.h"
|
|
||||||
# include "pathsys.h"
|
|
||||||
|
|
||||||
# ifdef OS_MAC
|
|
||||||
|
|
||||||
#include <Files.h>
|
|
||||||
#include <Folders.h>
|
|
||||||
|
|
||||||
# include <:sys:stat.h>
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* filemac.c - manipulate file names and scan directories on macintosh
|
* filemac.c - manipulate file names and scan directories on macintosh
|
||||||
*
|
*
|
||||||
@@ -35,8 +24,22 @@
|
|||||||
* 02/14/95 (seiwald) - parse and build /xxx properly
|
* 02/14/95 (seiwald) - parse and build /xxx properly
|
||||||
* 05/03/96 (seiwald) - split into pathunix.c
|
* 05/03/96 (seiwald) - split into pathunix.c
|
||||||
* 11/21/96 (peterk) - BEOS does not have Unix-style archives
|
* 11/21/96 (peterk) - BEOS does not have Unix-style archives
|
||||||
|
* 01/21/00 (malyn) - divorced from GUSI
|
||||||
|
* 01/08/01 (seiwald) - closure param for file_dirscan/file_archscan
|
||||||
|
* 11/04/02 (seiwald) - const-ing for string literals
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
# include "jam.h"
|
||||||
|
# include "filesys.h"
|
||||||
|
# include "pathsys.h"
|
||||||
|
|
||||||
|
# ifdef OS_MAC
|
||||||
|
|
||||||
|
#include <Files.h>
|
||||||
|
#include <Folders.h>
|
||||||
|
|
||||||
|
# include <:sys:stat.h>
|
||||||
|
|
||||||
void CopyC2PStr(const char * cstr, StringPtr pstr)
|
void CopyC2PStr(const char * cstr, StringPtr pstr)
|
||||||
{
|
{
|
||||||
int len;
|
int len;
|
||||||
@@ -53,7 +56,7 @@ void CopyC2PStr(const char * cstr, StringPtr pstr)
|
|||||||
|
|
||||||
void
|
void
|
||||||
file_dirscan(
|
file_dirscan(
|
||||||
char *dir,
|
const char *dir,
|
||||||
scanback func,
|
scanback func,
|
||||||
void *closure )
|
void *closure )
|
||||||
{
|
{
|
||||||
@@ -135,7 +138,7 @@ file_dirscan(
|
|||||||
|
|
||||||
int
|
int
|
||||||
file_time(
|
file_time(
|
||||||
char *filename,
|
const char *filename,
|
||||||
time_t *time )
|
time_t *time )
|
||||||
{
|
{
|
||||||
struct stat statbuf;
|
struct stat statbuf;
|
||||||
@@ -154,7 +157,7 @@ file_time(
|
|||||||
|
|
||||||
void
|
void
|
||||||
file_archscan(
|
file_archscan(
|
||||||
char *archive,
|
const char *archive,
|
||||||
scanback func,
|
scanback func,
|
||||||
void *closure )
|
void *closure )
|
||||||
{
|
{
|
||||||
|
|||||||
+34
-23
@@ -4,6 +4,30 @@
|
|||||||
* This file is part of Jam - see jam.c for Copyright information.
|
* This file is part of Jam - see jam.c for Copyright information.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
/*
|
||||||
|
* filent.c - scan directories and archives on NT
|
||||||
|
*
|
||||||
|
* External routines:
|
||||||
|
*
|
||||||
|
* file_dirscan() - scan a directory for files
|
||||||
|
* file_time() - get timestamp of file, if not done by file_dirscan()
|
||||||
|
* file_archscan() - scan an archive for files
|
||||||
|
*
|
||||||
|
* File_dirscan() and file_archscan() call back a caller provided function
|
||||||
|
* for each file found. A flag to this callback function lets file_dirscan()
|
||||||
|
* and file_archscan() indicate that a timestamp is being provided with the
|
||||||
|
* file. If file_dirscan() or file_archscan() do not provide the file's
|
||||||
|
* timestamp, interested parties may later call file_time().
|
||||||
|
*
|
||||||
|
* 07/10/95 (taylor) Findfirst() returns the first file on NT.
|
||||||
|
* 05/03/96 (seiwald) split apart into pathnt.c
|
||||||
|
* 01/20/00 (seiwald) - Upgraded from K&R to ANSI C
|
||||||
|
* 10/03/00 (anton) - Porting for Borland C++ 5.5
|
||||||
|
* 01/08/01 (seiwald) - closure param for file_dirscan/file_archscan
|
||||||
|
* 11/04/02 (seiwald) - const-ing for string literals
|
||||||
|
* 01/23/03 (seiwald) - long long handles for NT IA64
|
||||||
|
*/
|
||||||
|
|
||||||
# include "jam.h"
|
# include "jam.h"
|
||||||
# include "filesys.h"
|
# include "filesys.h"
|
||||||
# include "pathsys.h"
|
# include "pathsys.h"
|
||||||
@@ -23,38 +47,25 @@
|
|||||||
# include <sys/stat.h>
|
# include <sys/stat.h>
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* filent.c - scan directories and archives on NT
|
|
||||||
*
|
|
||||||
* External routines:
|
|
||||||
*
|
|
||||||
* file_dirscan() - scan a directory for files
|
* file_dirscan() - scan a directory for files
|
||||||
* file_time() - get timestamp of file, if not done by file_dirscan()
|
|
||||||
* file_archscan() - scan an archive for files
|
|
||||||
*
|
|
||||||
* File_dirscan() and file_archscan() call back a caller provided function
|
|
||||||
* for each file found. A flag to this callback function lets file_dirscan()
|
|
||||||
* and file_archscan() indicate that a timestamp is being provided with the
|
|
||||||
* file. If file_dirscan() or file_archscan() do not provide the file's
|
|
||||||
* timestamp, interested parties may later call file_time().
|
|
||||||
*
|
|
||||||
* 07/10/95 (taylor) Findfirst() returns the first file on NT.
|
|
||||||
* 05/03/96 (seiwald) split apart into pathnt.c
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*
|
# ifdef _M_IA64
|
||||||
* file_dirscan() - scan a directory for files
|
# define FINDTYPE long long
|
||||||
*/
|
# else
|
||||||
|
# define FINDTYPE long
|
||||||
|
# endif
|
||||||
|
|
||||||
void
|
void
|
||||||
file_dirscan(
|
file_dirscan(
|
||||||
char *dir,
|
const char *dir,
|
||||||
scanback func,
|
scanback func,
|
||||||
void *closure )
|
void *closure )
|
||||||
{
|
{
|
||||||
PATHNAME f;
|
PATHNAME f;
|
||||||
char filespec[ MAXJPATH ];
|
char filespec[ MAXJPATH ];
|
||||||
char filename[ MAXJPATH ];
|
char filename[ MAXJPATH ];
|
||||||
long handle;
|
FINDTYPE handle;
|
||||||
int ret;
|
int ret;
|
||||||
struct _finddata_t finfo[1];
|
struct _finddata_t finfo[1];
|
||||||
|
|
||||||
@@ -102,7 +113,7 @@ file_dirscan(
|
|||||||
# else
|
# else
|
||||||
handle = _findfirst( filespec, finfo );
|
handle = _findfirst( filespec, finfo );
|
||||||
|
|
||||||
if( ret = ( handle < 0L ) )
|
if( ret = ( handle == (FINDTYPE)(-1) ) )
|
||||||
return;
|
return;
|
||||||
|
|
||||||
while( !ret )
|
while( !ret )
|
||||||
@@ -128,7 +139,7 @@ file_dirscan(
|
|||||||
|
|
||||||
int
|
int
|
||||||
file_time(
|
file_time(
|
||||||
char *filename,
|
const char *filename,
|
||||||
time_t *time )
|
time_t *time )
|
||||||
{
|
{
|
||||||
/* On NT this is called only for C:/ */
|
/* On NT this is called only for C:/ */
|
||||||
@@ -169,7 +180,7 @@ struct ar_hdr {
|
|||||||
|
|
||||||
void
|
void
|
||||||
file_archscan(
|
file_archscan(
|
||||||
char *archive,
|
const char *archive,
|
||||||
scanback func,
|
scanback func,
|
||||||
void *closure )
|
void *closure )
|
||||||
{
|
{
|
||||||
|
|||||||
+15
-12
@@ -4,15 +4,6 @@
|
|||||||
* This file is part of Jam - see jam.c for Copyright information.
|
* This file is part of Jam - see jam.c for Copyright information.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
# include "jam.h"
|
|
||||||
# include "filesys.h"
|
|
||||||
# include "pathsys.h"
|
|
||||||
|
|
||||||
# ifdef OS_OS2
|
|
||||||
|
|
||||||
# include <io.h>
|
|
||||||
# include <dos.h>
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* fileos2.c - scan directories and archives on NT
|
* fileos2.c - scan directories and archives on NT
|
||||||
*
|
*
|
||||||
@@ -30,16 +21,28 @@
|
|||||||
*
|
*
|
||||||
* 07/10/95 (taylor) Findfirst() returns the first file on NT.
|
* 07/10/95 (taylor) Findfirst() returns the first file on NT.
|
||||||
* 05/03/96 (seiwald) split apart into pathnt.c
|
* 05/03/96 (seiwald) split apart into pathnt.c
|
||||||
|
* 01/20/00 (seiwald) - Upgraded from K&R to ANSI C
|
||||||
* 09/22/00 (seiwald) handle \ and c:\ specially: don't add extra /
|
* 09/22/00 (seiwald) handle \ and c:\ specially: don't add extra /
|
||||||
|
* 01/08/01 (seiwald) - closure param for file_dirscan/file_archscan
|
||||||
|
* 11/04/02 (seiwald) - const-ing for string literals
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
# include "jam.h"
|
||||||
|
# include "filesys.h"
|
||||||
|
# include "pathsys.h"
|
||||||
|
|
||||||
|
# ifdef OS_OS2
|
||||||
|
|
||||||
|
# include <io.h>
|
||||||
|
# include <dos.h>
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* file_dirscan() - scan a directory for files
|
* file_dirscan() - scan a directory for files
|
||||||
*/
|
*/
|
||||||
|
|
||||||
void
|
void
|
||||||
file_dirscan(
|
file_dirscan(
|
||||||
char *dir,
|
const char *dir,
|
||||||
scanback func,
|
scanback func,
|
||||||
void *closure )
|
void *closure )
|
||||||
{
|
{
|
||||||
@@ -103,7 +106,7 @@ file_dirscan(
|
|||||||
|
|
||||||
int
|
int
|
||||||
file_time(
|
file_time(
|
||||||
char *filename,
|
const char *filename,
|
||||||
time_t *time )
|
time_t *time )
|
||||||
{
|
{
|
||||||
/* This is called on OS2, not NT. */
|
/* This is called on OS2, not NT. */
|
||||||
@@ -121,7 +124,7 @@ file_time(
|
|||||||
|
|
||||||
void
|
void
|
||||||
file_archscan(
|
file_archscan(
|
||||||
char *archive,
|
const char *archive,
|
||||||
scanback func,
|
scanback func,
|
||||||
void *closure )
|
void *closure )
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -6,11 +6,13 @@
|
|||||||
|
|
||||||
/*
|
/*
|
||||||
* filesys.h - OS specific file routines
|
* filesys.h - OS specific file routines
|
||||||
|
*
|
||||||
|
* 11/04/02 (seiwald) - const-ing for string literals
|
||||||
*/
|
*/
|
||||||
|
|
||||||
typedef void (*scanback)( void *closure, char *file, int found, time_t t );
|
typedef void (*scanback)( void *closure, const char *file, int found, time_t t );
|
||||||
|
|
||||||
void file_dirscan( char *dir, scanback func, void *closure );
|
void file_dirscan( const char *dir, scanback func, void *closure );
|
||||||
void file_archscan( char *arch, scanback func, void *closure );
|
void file_archscan( const char *arch, scanback func, void *closure );
|
||||||
|
|
||||||
int file_time( char *filename, time_t *time );
|
int file_time( const char *filename, time_t *time );
|
||||||
|
|||||||
+111
-50
@@ -4,6 +4,35 @@
|
|||||||
* This file is part of Jam - see jam.c for Copyright information.
|
* This file is part of Jam - see jam.c for Copyright information.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
/*
|
||||||
|
* fileunix.c - manipulate file names and scan directories on UNIX/AmigaOS
|
||||||
|
*
|
||||||
|
* External routines:
|
||||||
|
*
|
||||||
|
* file_dirscan() - scan a directory for files
|
||||||
|
* file_time() - get timestamp of file, if not done by file_dirscan()
|
||||||
|
* file_archscan() - scan an archive for files
|
||||||
|
*
|
||||||
|
* File_dirscan() and file_archscan() call back a caller provided function
|
||||||
|
* for each file found. A flag to this callback function lets file_dirscan()
|
||||||
|
* and file_archscan() indicate that a timestamp is being provided with the
|
||||||
|
* file. If file_dirscan() or file_archscan() do not provide the file's
|
||||||
|
* timestamp, interested parties may later call file_time().
|
||||||
|
*
|
||||||
|
* 04/08/94 (seiwald) - Coherent/386 support added.
|
||||||
|
* 12/19/94 (mikem) - solaris string table insanity support
|
||||||
|
* 02/14/95 (seiwald) - parse and build /xxx properly
|
||||||
|
* 05/03/96 (seiwald) - split into pathunix.c
|
||||||
|
* 11/21/96 (peterk) - BEOS does not have Unix-style archives
|
||||||
|
* 01/08/01 (seiwald) - closure param for file_dirscan/file_archscan
|
||||||
|
* 04/03/01 (seiwald) - AIX uses SARMAG
|
||||||
|
* 07/16/02 (seiwald) - Support BSD style long filename in archives.
|
||||||
|
* 11/04/02 (seiwald) - const-ing for string literals
|
||||||
|
* 12/27/02 (seiwald) - support for AIX big archives
|
||||||
|
* 12/30/02 (seiwald) - terminate ar_hdr for solaris sscanf()
|
||||||
|
* 12/30/02 (seiwald) - skip solaris' empty archive member names (/, //xxx)
|
||||||
|
*/
|
||||||
|
|
||||||
# include "jam.h"
|
# include "jam.h"
|
||||||
# include "filesys.h"
|
# include "filesys.h"
|
||||||
# include "pathsys.h"
|
# include "pathsys.h"
|
||||||
@@ -35,7 +64,7 @@
|
|||||||
# endif
|
# endif
|
||||||
|
|
||||||
# if defined( OS_MVS ) || \
|
# if defined( OS_MVS ) || \
|
||||||
defined( OS_INTERIX ) || defined(OS_AIX)
|
defined( OS_INTERIX )
|
||||||
|
|
||||||
#define ARMAG "!<arch>\n"
|
#define ARMAG "!<arch>\n"
|
||||||
#define SARMAG 8
|
#define SARMAG 8
|
||||||
@@ -63,38 +92,20 @@ struct ar_hdr /* archive file member header - printable ascii */
|
|||||||
# endif
|
# endif
|
||||||
|
|
||||||
# ifndef HAVE_AR
|
# ifndef HAVE_AR
|
||||||
|
# ifdef _AIX43
|
||||||
|
/* AIX 43 ar SUPPORTs only __AR_BIG__ */
|
||||||
|
# define __AR_BIG__
|
||||||
|
# endif
|
||||||
# include <ar.h>
|
# include <ar.h>
|
||||||
# endif
|
# endif
|
||||||
|
|
||||||
/*
|
|
||||||
* fileunix.c - manipulate file names and scan directories on UNIX/AmigaOS
|
|
||||||
*
|
|
||||||
* External routines:
|
|
||||||
*
|
|
||||||
* file_dirscan() - scan a directory for files
|
|
||||||
* file_time() - get timestamp of file, if not done by file_dirscan()
|
|
||||||
* file_archscan() - scan an archive for files
|
|
||||||
*
|
|
||||||
* File_dirscan() and file_archscan() call back a caller provided function
|
|
||||||
* for each file found. A flag to this callback function lets file_dirscan()
|
|
||||||
* and file_archscan() indicate that a timestamp is being provided with the
|
|
||||||
* file. If file_dirscan() or file_archscan() do not provide the file's
|
|
||||||
* timestamp, interested parties may later call file_time().
|
|
||||||
*
|
|
||||||
* 04/08/94 (seiwald) - Coherent/386 support added.
|
|
||||||
* 12/19/94 (mikem) - solaris string table insanity support
|
|
||||||
* 02/14/95 (seiwald) - parse and build /xxx properly
|
|
||||||
* 05/03/96 (seiwald) - split into pathunix.c
|
|
||||||
* 11/21/96 (peterk) - BEOS does not have Unix-style archives
|
|
||||||
*/
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* file_dirscan() - scan a directory for files
|
* file_dirscan() - scan a directory for files
|
||||||
*/
|
*/
|
||||||
|
|
||||||
void
|
void
|
||||||
file_dirscan(
|
file_dirscan(
|
||||||
char *dir,
|
const char *dir,
|
||||||
scanback func,
|
scanback func,
|
||||||
void *closure )
|
void *closure )
|
||||||
{
|
{
|
||||||
@@ -149,7 +160,7 @@ file_dirscan(
|
|||||||
|
|
||||||
int
|
int
|
||||||
file_time(
|
file_time(
|
||||||
char *filename,
|
const char *filename,
|
||||||
time_t *time )
|
time_t *time )
|
||||||
{
|
{
|
||||||
struct stat statbuf;
|
struct stat statbuf;
|
||||||
@@ -172,7 +183,7 @@ file_time(
|
|||||||
|
|
||||||
void
|
void
|
||||||
file_archscan(
|
file_archscan(
|
||||||
char *archive,
|
const char *archive,
|
||||||
scanback func,
|
scanback func,
|
||||||
void *closure )
|
void *closure )
|
||||||
{
|
{
|
||||||
@@ -201,58 +212,92 @@ file_archscan(
|
|||||||
while( read( fd, &ar_hdr, SARHDR ) == SARHDR &&
|
while( read( fd, &ar_hdr, SARHDR ) == SARHDR &&
|
||||||
!memcmp( ar_hdr.ar_fmag, ARFMAG, SARFMAG ) )
|
!memcmp( ar_hdr.ar_fmag, ARFMAG, SARFMAG ) )
|
||||||
{
|
{
|
||||||
char lar_name[256];
|
|
||||||
long lar_date;
|
long lar_date;
|
||||||
long lar_size;
|
long lar_size;
|
||||||
long lar_offset;
|
char lar_name[256];
|
||||||
char *c;
|
char *dst = lar_name;
|
||||||
char *src, *dest;
|
|
||||||
|
|
||||||
strncpy( lar_name, ar_hdr.ar_name, sizeof(ar_hdr.ar_name) );
|
/* solaris sscanf() does strlen first, so terminate somewhere */
|
||||||
|
|
||||||
|
ar_hdr.ar_fmag[0] = 0;
|
||||||
|
|
||||||
|
/* Get date & size */
|
||||||
|
|
||||||
sscanf( ar_hdr.ar_date, "%ld", &lar_date );
|
sscanf( ar_hdr.ar_date, "%ld", &lar_date );
|
||||||
sscanf( ar_hdr.ar_size, "%ld", &lar_size );
|
sscanf( ar_hdr.ar_size, "%ld", &lar_size );
|
||||||
|
|
||||||
if (ar_hdr.ar_name[0] == '/')
|
/* Handle solaris string table.
|
||||||
|
** The entry under the name // is the table,
|
||||||
|
** and entries with the name /nnnn refer to the table.
|
||||||
|
*/
|
||||||
|
|
||||||
|
if( ar_hdr.ar_name[0] != '/' )
|
||||||
{
|
{
|
||||||
if (ar_hdr.ar_name[1] == '/')
|
/* traditional archive entry names:
|
||||||
|
** ends at the first space, /, or null.
|
||||||
|
*/
|
||||||
|
|
||||||
|
char *src = ar_hdr.ar_name;
|
||||||
|
const char *e = src + sizeof( ar_hdr.ar_name );
|
||||||
|
|
||||||
|
while( src < e && *src && *src != ' ' && *src != '/' )
|
||||||
|
*dst++ = *src++;
|
||||||
|
}
|
||||||
|
else if( ar_hdr.ar_name[1] == '/' )
|
||||||
{
|
{
|
||||||
/* this is the "string table" entry of the symbol table,
|
/* this is the "string table" entry of the symbol table,
|
||||||
** which holds strings of filenames that are longer than
|
** which holds strings of filenames that are longer than
|
||||||
** 15 characters (ie. don't fit into a ar_name
|
** 15 characters (ie. don't fit into a ar_name)
|
||||||
*/
|
*/
|
||||||
|
|
||||||
string_table = (char *)malloc(lar_size);
|
string_table = (char *)malloc(lar_size);
|
||||||
|
|
||||||
lseek(fd, offset + SARHDR, 0);
|
lseek(fd, offset + SARHDR, 0);
|
||||||
if (read(fd, string_table, lar_size) != lar_size)
|
if( read(fd, string_table, lar_size) != lar_size )
|
||||||
printf("error reading string table\n");
|
printf( "error reading string table\n" );
|
||||||
}
|
}
|
||||||
else if (string_table && ar_hdr.ar_name[1] != ' ')
|
else if( string_table && ar_hdr.ar_name[1] != ' ' )
|
||||||
{
|
{
|
||||||
/* Long filenames are recognized by "/nnnn" where nnnn is
|
/* Long filenames are recognized by "/nnnn" where nnnn is
|
||||||
** the offset of the string in the string table represented
|
** the offset of the string in the string table represented
|
||||||
** in ASCII decimals.
|
** in ASCII decimals.
|
||||||
*/
|
*/
|
||||||
dest = lar_name;
|
|
||||||
lar_offset = atoi(lar_name + 1);
|
char *src = string_table + atoi( ar_hdr.ar_name + 1 );
|
||||||
src = &string_table[lar_offset];
|
|
||||||
while (*src != '/')
|
while( *src != '/' )
|
||||||
*dest++ = *src++;
|
*dst++ = *src++;
|
||||||
*dest = '/';
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
c = lar_name - 1;
|
/* Terminate lar_name */
|
||||||
while( *++c != ' ' && *c != '/' )
|
|
||||||
;
|
|
||||||
*c = '\0';
|
|
||||||
|
|
||||||
if ( DEBUG_BINDSCAN )
|
*dst = 0;
|
||||||
|
|
||||||
|
/* Modern (BSD4.4) long names: if the name is "#1/nnnn",
|
||||||
|
** then the actual name is the nnnn bytes after the header.
|
||||||
|
*/
|
||||||
|
|
||||||
|
if( !strcmp( lar_name, "#1" ) )
|
||||||
|
{
|
||||||
|
int len = atoi( ar_hdr.ar_name + 3 );
|
||||||
|
if( read( fd, lar_name, len ) != len )
|
||||||
|
printf("error reading archive entry\n");
|
||||||
|
lar_name[len] = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Build name and pass it on. */
|
||||||
|
|
||||||
|
if( lar_name[0] )
|
||||||
|
{
|
||||||
|
if( DEBUG_BINDSCAN )
|
||||||
printf( "archive name %s found\n", lar_name );
|
printf( "archive name %s found\n", lar_name );
|
||||||
|
|
||||||
sprintf( buf, "%s(%s)", archive, lar_name );
|
sprintf( buf, "%s(%s)", archive, lar_name );
|
||||||
|
|
||||||
(*func)( closure, buf, 1 /* time valid */, (time_t)lar_date );
|
(*func)( closure, buf, 1 /* time valid */, (time_t)lar_date );
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Position at next member */
|
||||||
|
|
||||||
offset += SARHDR + ( ( lar_size + 1 ) & ~1 );
|
offset += SARHDR + ( ( lar_size + 1 ) & ~1 );
|
||||||
lseek( fd, offset, 0 );
|
lseek( fd, offset, 0 );
|
||||||
@@ -271,7 +316,7 @@ file_archscan(
|
|||||||
|
|
||||||
void
|
void
|
||||||
file_archscan(
|
file_archscan(
|
||||||
char *archive,
|
const char *archive,
|
||||||
scanback func,
|
scanback func,
|
||||||
void *closure )
|
void *closure )
|
||||||
{
|
{
|
||||||
@@ -289,6 +334,20 @@ file_archscan(
|
|||||||
if( ( fd = open( archive, O_RDONLY, 0 ) ) < 0 )
|
if( ( fd = open( archive, O_RDONLY, 0 ) ) < 0 )
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
# ifdef __AR_BIG__
|
||||||
|
|
||||||
|
if( read( fd, (char *)&fl_hdr, FL_HSZ ) != FL_HSZ ||
|
||||||
|
strncmp( AIAMAGBIG, fl_hdr.fl_magic, SAIAMAG ) )
|
||||||
|
{
|
||||||
|
if( strncmp( AIAMAG, fl_hdr.fl_magic, SAIAMAG ) )
|
||||||
|
printf( "Can't read new archive %s before AIX 4.3.\n" );
|
||||||
|
|
||||||
|
close( fd );
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
# else
|
||||||
|
|
||||||
if( read( fd, (char *)&fl_hdr, FL_HSZ ) != FL_HSZ ||
|
if( read( fd, (char *)&fl_hdr, FL_HSZ ) != FL_HSZ ||
|
||||||
strncmp( AIAMAG, fl_hdr.fl_magic, SAIAMAG ) )
|
strncmp( AIAMAG, fl_hdr.fl_magic, SAIAMAG ) )
|
||||||
{
|
{
|
||||||
@@ -296,6 +355,8 @@ file_archscan(
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# endif
|
||||||
|
|
||||||
sscanf( fl_hdr.fl_fstmoff, "%ld", &offset );
|
sscanf( fl_hdr.fl_fstmoff, "%ld", &offset );
|
||||||
|
|
||||||
if( DEBUG_BINDSCAN )
|
if( DEBUG_BINDSCAN )
|
||||||
|
|||||||
+15
-12
@@ -4,12 +4,6 @@
|
|||||||
* This file is part of Jam - see jam.c for Copyright information.
|
* This file is part of Jam - see jam.c for Copyright information.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
# include "jam.h"
|
|
||||||
# include "filesys.h"
|
|
||||||
# include "pathsys.h"
|
|
||||||
|
|
||||||
# ifdef OS_VMS
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* filevms.c - scan directories and libaries on VMS
|
* filevms.c - scan directories and libaries on VMS
|
||||||
*
|
*
|
||||||
@@ -27,8 +21,17 @@
|
|||||||
*
|
*
|
||||||
* 02/09/95 (seiwald) - bungled R=[xxx] - was using directory length!
|
* 02/09/95 (seiwald) - bungled R=[xxx] - was using directory length!
|
||||||
* 05/03/96 (seiwald) - split into pathvms.c
|
* 05/03/96 (seiwald) - split into pathvms.c
|
||||||
|
* 01/08/01 (seiwald) - closure param for file_dirscan/file_archscan
|
||||||
|
* 03/23/01 (seiwald) - VMS C++ changes.
|
||||||
|
* 11/04/02 (seiwald) - const-ing for string literals
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
# include "jam.h"
|
||||||
|
# include "filesys.h"
|
||||||
|
# include "pathsys.h"
|
||||||
|
|
||||||
|
# ifdef OS_VMS
|
||||||
|
|
||||||
# include <rms.h>
|
# include <rms.h>
|
||||||
# include <iodef.h>
|
# include <iodef.h>
|
||||||
# include <ssdef.h>
|
# include <ssdef.h>
|
||||||
@@ -99,7 +102,7 @@ file_cvttime(
|
|||||||
|
|
||||||
void
|
void
|
||||||
file_dirscan(
|
file_dirscan(
|
||||||
char *dir,
|
const char *dir,
|
||||||
scanback func,
|
scanback func,
|
||||||
void *closure )
|
void *closure )
|
||||||
{
|
{
|
||||||
@@ -135,7 +138,7 @@ file_dirscan(
|
|||||||
xfab.fab$l_dna = DEFAULT_FILE_SPECIFICATION;
|
xfab.fab$l_dna = DEFAULT_FILE_SPECIFICATION;
|
||||||
xfab.fab$b_dns = sizeof( DEFAULT_FILE_SPECIFICATION ) - 1;
|
xfab.fab$b_dns = sizeof( DEFAULT_FILE_SPECIFICATION ) - 1;
|
||||||
xfab.fab$l_fop = FAB$M_NAM;
|
xfab.fab$l_fop = FAB$M_NAM;
|
||||||
xfab.fab$l_fna = dir; /* address of file name */
|
xfab.fab$l_fna = (char *)dir; /* address of file name */
|
||||||
xfab.fab$b_fns = strlen( dir ); /* length of file name */
|
xfab.fab$b_fns = strlen( dir ); /* length of file name */
|
||||||
xfab.fab$l_nam = &xnam; /* address of NAB block */
|
xfab.fab$l_nam = &xnam; /* address of NAB block */
|
||||||
xfab.fab$l_xab = (char *)&xab; /* address of XAB block */
|
xfab.fab$l_xab = (char *)&xab; /* address of XAB block */
|
||||||
@@ -224,7 +227,7 @@ file_dirscan(
|
|||||||
|
|
||||||
int
|
int
|
||||||
file_time(
|
file_time(
|
||||||
char *filename,
|
const char *filename,
|
||||||
time_t *time )
|
time_t *time )
|
||||||
{
|
{
|
||||||
/* This should never be called, as all files are */
|
/* This should never be called, as all files are */
|
||||||
@@ -281,7 +284,7 @@ file_archmember(
|
|||||||
|
|
||||||
void
|
void
|
||||||
file_archscan(
|
file_archscan(
|
||||||
char *archive,
|
const char *archive,
|
||||||
scanback func,
|
scanback func,
|
||||||
void *closure )
|
void *closure )
|
||||||
{
|
{
|
||||||
@@ -294,7 +297,7 @@ file_archscan(
|
|||||||
|
|
||||||
register int status;
|
register int status;
|
||||||
|
|
||||||
VMS_archive = archive;
|
VMS_archive = (char *)archive;
|
||||||
VMS_func = func;
|
VMS_func = func;
|
||||||
VMS_closure = closure;
|
VMS_closure = closure;
|
||||||
|
|
||||||
@@ -302,7 +305,7 @@ file_archscan(
|
|||||||
if ( !( status & 1 ) )
|
if ( !( status & 1 ) )
|
||||||
return;
|
return;
|
||||||
|
|
||||||
library.dsc$a_pointer = archive;
|
library.dsc$a_pointer = (char *)archive;
|
||||||
library.dsc$w_length = strlen( archive );
|
library.dsc$w_length = strlen( archive );
|
||||||
|
|
||||||
status = lbr$open( &context, &library, NULL, NULL, NULL, NULL, NULL );
|
status = lbr$open( &context, &library, NULL, NULL, NULL, NULL, NULL );
|
||||||
|
|||||||
@@ -22,6 +22,8 @@
|
|||||||
* Internal functions:
|
* Internal functions:
|
||||||
*
|
*
|
||||||
* globchars() - build a bitlist to check for character group match
|
* globchars() - build a bitlist to check for character group match
|
||||||
|
*
|
||||||
|
* 11/04/02 (seiwald) - const-ing for string literals
|
||||||
*/
|
*/
|
||||||
|
|
||||||
# include "jam.h"
|
# include "jam.h"
|
||||||
@@ -29,7 +31,7 @@
|
|||||||
# define CHECK_BIT( tab, bit ) ( tab[ (bit)/8 ] & (1<<( (bit)%8 )) )
|
# define CHECK_BIT( tab, bit ) ( tab[ (bit)/8 ] & (1<<( (bit)%8 )) )
|
||||||
# define BITLISTSIZE 16 /* bytes used for [chars] in compiled expr */
|
# define BITLISTSIZE 16 /* bytes used for [chars] in compiled expr */
|
||||||
|
|
||||||
static void globchars( char *s, char *e, char *b );
|
static void globchars( const char *s, const char *e, char *b );
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* glob() - match a string against a simple pattern
|
* glob() - match a string against a simple pattern
|
||||||
@@ -37,11 +39,11 @@ static void globchars( char *s, char *e, char *b );
|
|||||||
|
|
||||||
int
|
int
|
||||||
glob(
|
glob(
|
||||||
register char *c,
|
const char *c,
|
||||||
register char *s )
|
const char *s )
|
||||||
{
|
{
|
||||||
char bitlist[ BITLISTSIZE ];
|
char bitlist[ BITLISTSIZE ];
|
||||||
char *here;
|
const char *here;
|
||||||
|
|
||||||
for( ;; )
|
for( ;; )
|
||||||
switch( *c++ )
|
switch( *c++ )
|
||||||
@@ -118,8 +120,8 @@ glob(
|
|||||||
|
|
||||||
static void
|
static void
|
||||||
globchars(
|
globchars(
|
||||||
char *s,
|
const char *s,
|
||||||
char *e,
|
const char *e,
|
||||||
char *b )
|
char *b )
|
||||||
{
|
{
|
||||||
int neg = 0;
|
int neg = 0;
|
||||||
|
|||||||
+9
-11
@@ -4,9 +4,6 @@
|
|||||||
* This file is part of Jam - see jam.c for Copyright information.
|
* This file is part of Jam - see jam.c for Copyright information.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
# include "jam.h"
|
|
||||||
# include "hash.h"
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* hash.c - simple in-memory hashing routines
|
* hash.c - simple in-memory hashing routines
|
||||||
*
|
*
|
||||||
@@ -21,15 +18,18 @@
|
|||||||
* hashrehash() - resize and rebuild hp->tab, the hash table
|
* hashrehash() - resize and rebuild hp->tab, the hash table
|
||||||
*
|
*
|
||||||
* 4/29/93 - ensure ITEM's are aligned
|
* 4/29/93 - ensure ITEM's are aligned
|
||||||
|
* 11/04/02 (seiwald) - const-ing for string literals
|
||||||
|
* 01/31/02 (seiwald) - keyval now unsigned (cray-ziness)
|
||||||
*/
|
*/
|
||||||
|
|
||||||
char *hashsccssid="@(#)hash.c 1.14 () 6/20/88";
|
# include "jam.h"
|
||||||
|
# include "hash.h"
|
||||||
|
|
||||||
/* Header attached to all data items entered into a hash table. */
|
/* Header attached to all data items entered into a hash table. */
|
||||||
|
|
||||||
struct hashhdr {
|
struct hashhdr {
|
||||||
struct item *next;
|
struct item *next;
|
||||||
int keyval; /* for quick comparisons */
|
unsigned int keyval; /* for quick comparisons */
|
||||||
} ;
|
} ;
|
||||||
|
|
||||||
/* This structure overlays the one handed to hashenter(). */
|
/* This structure overlays the one handed to hashenter(). */
|
||||||
@@ -78,7 +78,7 @@ struct hash
|
|||||||
} lists[ MAX_LISTS ];
|
} lists[ MAX_LISTS ];
|
||||||
} items;
|
} items;
|
||||||
|
|
||||||
char *name; /* just for hashstats() */
|
const char *name; /* just for hashstats() */
|
||||||
} ;
|
} ;
|
||||||
|
|
||||||
static void hashrehash( struct hash *hp );
|
static void hashrehash( struct hash *hp );
|
||||||
@@ -96,8 +96,8 @@ hashitem(
|
|||||||
{
|
{
|
||||||
ITEM **base;
|
ITEM **base;
|
||||||
register ITEM *i;
|
register ITEM *i;
|
||||||
char *b = (*data)->key;
|
unsigned char *b = (unsigned char *)(*data)->key;
|
||||||
int keyval;
|
unsigned int keyval;
|
||||||
|
|
||||||
if( enter && !hp->items.more )
|
if( enter && !hp->items.more )
|
||||||
hashrehash( hp );
|
hashrehash( hp );
|
||||||
@@ -110,8 +110,6 @@ hashitem(
|
|||||||
while( *b )
|
while( *b )
|
||||||
keyval = keyval * 2147059363 + *b++;
|
keyval = keyval * 2147059363 + *b++;
|
||||||
|
|
||||||
keyval &= 0x7FFFFFFF;
|
|
||||||
|
|
||||||
base = hp->tab.base + ( keyval % hp->tab.nel );
|
base = hp->tab.base + ( keyval % hp->tab.nel );
|
||||||
|
|
||||||
for( i = *base; i; i = i->hdr.next )
|
for( i = *base; i; i = i->hdr.next )
|
||||||
@@ -187,7 +185,7 @@ static void hashrehash( register struct hash *hp )
|
|||||||
struct hash *
|
struct hash *
|
||||||
hashinit(
|
hashinit(
|
||||||
int datalen,
|
int datalen,
|
||||||
char *name )
|
const char *name )
|
||||||
{
|
{
|
||||||
struct hash *hp = (struct hash *)malloc( sizeof( *hp ) );
|
struct hash *hp = (struct hash *)malloc( sizeof( *hp ) );
|
||||||
|
|
||||||
|
|||||||
@@ -6,11 +6,13 @@
|
|||||||
|
|
||||||
/*
|
/*
|
||||||
* hash.h - simple in-memory hashing routines
|
* hash.h - simple in-memory hashing routines
|
||||||
|
*
|
||||||
|
* 11/04/02 (seiwald) - const-ing for string literals
|
||||||
*/
|
*/
|
||||||
|
|
||||||
typedef struct hashdata HASHDATA;
|
typedef struct hashdata HASHDATA;
|
||||||
|
|
||||||
struct hash * hashinit( int datalen, char *name );
|
struct hash * hashinit( int datalen, const char *name );
|
||||||
int hashitem( struct hash *hp, HASHDATA **data, int enter );
|
int hashitem( struct hash *hp, HASHDATA **data, int enter );
|
||||||
void hashdone( struct hash *hp );
|
void hashdone( struct hash *hp );
|
||||||
|
|
||||||
|
|||||||
+53
-7
@@ -4,10 +4,6 @@
|
|||||||
* This file is part of Jam - see jam.c for Copyright information.
|
* This file is part of Jam - see jam.c for Copyright information.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
# include "jam.h"
|
|
||||||
# include "newstr.h"
|
|
||||||
# include "lists.h"
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* lists.c - maintain lists of strings
|
* lists.c - maintain lists of strings
|
||||||
*
|
*
|
||||||
@@ -23,8 +19,15 @@
|
|||||||
*
|
*
|
||||||
* 08/23/94 (seiwald) - new list_append()
|
* 08/23/94 (seiwald) - new list_append()
|
||||||
* 09/07/00 (seiwald) - documented lol_*() functions
|
* 09/07/00 (seiwald) - documented lol_*() functions
|
||||||
|
* 10/22/02 (seiwald) - list_new() now does its own newstr()/copystr()
|
||||||
|
* 11/04/02 (seiwald) - const-ing for string literals
|
||||||
|
* 12/09/02 (seiwald) - new list_printq() for writing lists to Jambase
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
# include "jam.h"
|
||||||
|
# include "newstr.h"
|
||||||
|
# include "lists.h"
|
||||||
|
|
||||||
static LIST *freelist = 0; /* junkpile for list_free() */
|
static LIST *freelist = 0; /* junkpile for list_free() */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@@ -61,13 +64,18 @@ list_append(
|
|||||||
LIST *
|
LIST *
|
||||||
list_new(
|
list_new(
|
||||||
LIST *head,
|
LIST *head,
|
||||||
char *string )
|
const char *string,
|
||||||
|
int copy )
|
||||||
{
|
{
|
||||||
LIST *l;
|
LIST *l;
|
||||||
|
|
||||||
if( DEBUG_LISTS )
|
if( DEBUG_LISTS )
|
||||||
printf( "list > %s <\n", string );
|
printf( "list > %s <\n", string );
|
||||||
|
|
||||||
|
/* Copy/newstr as needed */
|
||||||
|
|
||||||
|
string = copy ? copystr( string ) : newstr( string );
|
||||||
|
|
||||||
/* Get list struct from freelist, if one available. */
|
/* Get list struct from freelist, if one available. */
|
||||||
/* Otherwise allocate. */
|
/* Otherwise allocate. */
|
||||||
/* If from freelist, must free string first */
|
/* If from freelist, must free string first */
|
||||||
@@ -107,7 +115,7 @@ list_copy(
|
|||||||
LIST *nl )
|
LIST *nl )
|
||||||
{
|
{
|
||||||
for( ; nl; nl = list_next( nl ) )
|
for( ; nl; nl = list_next( nl ) )
|
||||||
l = list_new( l, copystr( nl->string ) );
|
l = list_new( l, nl->string, 1 );
|
||||||
|
|
||||||
return l;
|
return l;
|
||||||
}
|
}
|
||||||
@@ -128,7 +136,7 @@ list_sublist(
|
|||||||
;
|
;
|
||||||
|
|
||||||
for( ; l && count--; l = list_next( l ) )
|
for( ; l && count--; l = list_next( l ) )
|
||||||
nl = list_new( nl, copystr( l->string ) );
|
nl = list_new( nl, l->string, 1 );
|
||||||
|
|
||||||
return nl;
|
return nl;
|
||||||
}
|
}
|
||||||
@@ -160,6 +168,44 @@ list_print( LIST *l )
|
|||||||
printf( "%s ", l->string );
|
printf( "%s ", l->string );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* list_printq() - print a list of safely quoted strings to a file
|
||||||
|
*/
|
||||||
|
|
||||||
|
void
|
||||||
|
list_printq( FILE *out, LIST *l )
|
||||||
|
{
|
||||||
|
/* Dump each word, enclosed in "s */
|
||||||
|
/* Suitable for Jambase use. */
|
||||||
|
|
||||||
|
for( ; l; l = list_next( l ) )
|
||||||
|
{
|
||||||
|
const char *p = l->string;
|
||||||
|
const char *ep = p + strlen( p );
|
||||||
|
const char *op = p;
|
||||||
|
|
||||||
|
fputc( '\n', out );
|
||||||
|
fputc( '\t', out );
|
||||||
|
fputc( '"', out );
|
||||||
|
|
||||||
|
/* Any embedded "'s? Escape them */
|
||||||
|
|
||||||
|
while( p = (char *)memchr( op, '"', ep - op ) )
|
||||||
|
{
|
||||||
|
fwrite( op, p - op, 1, out );
|
||||||
|
fputc( '\\', out );
|
||||||
|
fputc( '"', out );
|
||||||
|
op = p + 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Write remainder */
|
||||||
|
|
||||||
|
fwrite( op, ep - op, 1, out );
|
||||||
|
fputc( '"', out );
|
||||||
|
fputc( ' ', out );
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* list_length() - return the number of items in the list
|
* list_length() - return the number of items in the list
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -24,6 +24,7 @@
|
|||||||
* list_sublist() - copy a subset of a list of strings
|
* list_sublist() - copy a subset of a list of strings
|
||||||
* list_free() - free a list of strings
|
* list_free() - free a list of strings
|
||||||
* list_print() - print a list of strings to stdout
|
* list_print() - print a list of strings to stdout
|
||||||
|
* list_printq() - print a list of safely quoted strings to a file
|
||||||
* list_length() - return the number of items in the list
|
* list_length() - return the number of items in the list
|
||||||
*
|
*
|
||||||
* lol_init() - initialize a LOL (list of lists)
|
* lol_init() - initialize a LOL (list of lists)
|
||||||
@@ -34,6 +35,9 @@
|
|||||||
*
|
*
|
||||||
* 04/13/94 (seiwald) - added shorthand L0 for null list pointer
|
* 04/13/94 (seiwald) - added shorthand L0 for null list pointer
|
||||||
* 08/23/94 (seiwald) - new list_append()
|
* 08/23/94 (seiwald) - new list_append()
|
||||||
|
* 10/22/02 (seiwald) - list_new() now does its own newstr()/copystr()
|
||||||
|
* 11/04/02 (seiwald) - const-ing for string literals
|
||||||
|
* 12/09/02 (seiwald) - new list_printq() for writing lists to Jambase
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@@ -45,7 +49,7 @@ typedef struct _list LIST;
|
|||||||
struct _list {
|
struct _list {
|
||||||
LIST *next;
|
LIST *next;
|
||||||
LIST *tail; /* only valid in head node */
|
LIST *tail; /* only valid in head node */
|
||||||
char *string; /* private copy */
|
const char *string; /* private copy */
|
||||||
} ;
|
} ;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@@ -64,7 +68,7 @@ struct _lol {
|
|||||||
LIST * list_append( LIST *l, LIST *nl );
|
LIST * list_append( LIST *l, LIST *nl );
|
||||||
LIST * list_copy( LIST *l, LIST *nl );
|
LIST * list_copy( LIST *l, LIST *nl );
|
||||||
void list_free( LIST *head );
|
void list_free( LIST *head );
|
||||||
LIST * list_new( LIST *head, char *string );
|
LIST * list_new( LIST *head, const char *string, int copy );
|
||||||
void list_print( LIST *l );
|
void list_print( LIST *l );
|
||||||
int list_length( LIST *l );
|
int list_length( LIST *l );
|
||||||
LIST * list_sublist( LIST *l, int start, int count );
|
LIST * list_sublist( LIST *l, int start, int count );
|
||||||
|
|||||||
@@ -6,7 +6,9 @@
|
|||||||
|
|
||||||
/*
|
/*
|
||||||
* make.h - bring a target up to date, once rules are in place
|
* make.h - bring a target up to date, once rules are in place
|
||||||
|
*
|
||||||
|
* 11/04/02 (seiwald) - const-ing for string literals
|
||||||
*/
|
*/
|
||||||
|
|
||||||
int make( int n_targets, char **targets, int anyhow );
|
int make( int n_targets, const char **targets, int anyhow );
|
||||||
int make1( TARGET *t );
|
int make1( TARGET *t );
|
||||||
|
|||||||
+26
-14
@@ -26,7 +26,7 @@
|
|||||||
*
|
*
|
||||||
* make1cmds() - turn ACTIONS into CMDs, grouping, splitting, etc
|
* make1cmds() - turn ACTIONS into CMDs, grouping, splitting, etc
|
||||||
* make1list() - turn a list of targets into a LIST, for $(<) and $(>)
|
* make1list() - turn a list of targets into a LIST, for $(<) and $(>)
|
||||||
* make1settings() - for vars that get bound values, build up replacement lists
|
* make1settings() - for vars that get bound, build up replacement lists
|
||||||
* make1bind() - bind targets that weren't bound in dependency analysis
|
* make1bind() - bind targets that weren't bound in dependency analysis
|
||||||
*
|
*
|
||||||
* 04/16/94 (seiwald) - Split from make.c.
|
* 04/16/94 (seiwald) - Split from make.c.
|
||||||
@@ -38,6 +38,15 @@
|
|||||||
* 01/22/94 (seiwald) - pass per-target JAMSHELL down to execcmd().
|
* 01/22/94 (seiwald) - pass per-target JAMSHELL down to execcmd().
|
||||||
* 02/28/95 (seiwald) - Handle empty "existing" actions.
|
* 02/28/95 (seiwald) - Handle empty "existing" actions.
|
||||||
* 03/10/95 (seiwald) - Fancy counts.
|
* 03/10/95 (seiwald) - Fancy counts.
|
||||||
|
* 02/07/01 (seiwald) - Fix jam -d0 return status.
|
||||||
|
* 01/21/02 (seiwald) - new -q to quit quickly on build failure
|
||||||
|
* 02/28/02 (seiwald) - don't delete 'actions updated' targets on failure
|
||||||
|
* 02/28/02 (seiwald) - merge EXEC_xxx flags in with RULE_xxx
|
||||||
|
* 07/17/02 (seiwald) - TEMPORARY sources for headers now get built
|
||||||
|
* 09/23/02 (seiwald) - "...using temp..." only displayed on -da now.
|
||||||
|
* 10/22/02 (seiwald) - list_new() now does its own newstr()/copystr()
|
||||||
|
* 11/04/02 (seiwald) - const-ing for string literals
|
||||||
|
* 12/03/02 (seiwald) - fix odd includes support by grafting them onto depends
|
||||||
*/
|
*/
|
||||||
|
|
||||||
# include "jam.h"
|
# include "jam.h"
|
||||||
@@ -116,7 +125,6 @@ make1a(
|
|||||||
TARGET *parent )
|
TARGET *parent )
|
||||||
{
|
{
|
||||||
TARGETS *c;
|
TARGETS *c;
|
||||||
int i;
|
|
||||||
|
|
||||||
/* If the parent is the first to try to build this target */
|
/* If the parent is the first to try to build this target */
|
||||||
/* or this target is in the make1c() quagmire, arrange for the */
|
/* or this target is in the make1c() quagmire, arrange for the */
|
||||||
@@ -148,8 +156,7 @@ make1a(
|
|||||||
|
|
||||||
t->progress = T_MAKE_ONSTACK;
|
t->progress = T_MAKE_ONSTACK;
|
||||||
|
|
||||||
for( i = T_DEPS_DEPENDS; i <= T_DEPS_INCLUDES; i++ )
|
for( c = t->depends; c && !intr; c = c->next )
|
||||||
for( c = t->deps[i]; c && !intr; c = c->next )
|
|
||||||
make1a( c->target, t );
|
make1a( c->target, t );
|
||||||
|
|
||||||
t->progress = T_MAKE_ACTIVE;
|
t->progress = T_MAKE_ACTIVE;
|
||||||
@@ -168,8 +175,7 @@ static void
|
|||||||
make1b( TARGET *t )
|
make1b( TARGET *t )
|
||||||
{
|
{
|
||||||
TARGETS *c;
|
TARGETS *c;
|
||||||
int i;
|
const char *failed = "dependents";
|
||||||
char *failed = "dependents";
|
|
||||||
|
|
||||||
/* If any dependents are still outstanding, wait until they */
|
/* If any dependents are still outstanding, wait until they */
|
||||||
/* call make1b() to signal their completion. */
|
/* call make1b() to signal their completion. */
|
||||||
@@ -181,8 +187,7 @@ make1b( TARGET *t )
|
|||||||
|
|
||||||
/* Collect status from dependents */
|
/* Collect status from dependents */
|
||||||
|
|
||||||
for( i = T_DEPS_DEPENDS; i <= T_DEPS_INCLUDES; i++ )
|
for( c = t->depends; c; c = c->next )
|
||||||
for( c = t->deps[i]; c; c = c->next )
|
|
||||||
if( c->target->status > t->status )
|
if( c->target->status > t->status )
|
||||||
{
|
{
|
||||||
failed = c->target->name;
|
failed = c->target->name;
|
||||||
@@ -215,12 +220,13 @@ make1b( TARGET *t )
|
|||||||
break;
|
break;
|
||||||
|
|
||||||
case T_FATE_ISTMP:
|
case T_FATE_ISTMP:
|
||||||
if( DEBUG_MAKE )
|
if( DEBUG_MAKEQ )
|
||||||
printf( "...using %s...\n", t->name );
|
printf( "...using %s...\n", t->name );
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case T_FATE_TOUCHED:
|
case T_FATE_TOUCHED:
|
||||||
case T_FATE_MISSING:
|
case T_FATE_MISSING:
|
||||||
|
case T_FATE_NEEDTMP:
|
||||||
case T_FATE_OUTDATED:
|
case T_FATE_OUTDATED:
|
||||||
case T_FATE_UPDATE:
|
case T_FATE_UPDATE:
|
||||||
/* Set "on target" vars, build actions, unset vars */
|
/* Set "on target" vars, build actions, unset vars */
|
||||||
@@ -421,7 +427,7 @@ make1cmds( ACTIONS *a0 )
|
|||||||
LIST *nt, *ns;
|
LIST *nt, *ns;
|
||||||
ACTIONS *a1;
|
ACTIONS *a1;
|
||||||
CMD *cmd;
|
CMD *cmd;
|
||||||
int start, chunk, length;
|
int start, chunk, length, maxline;
|
||||||
|
|
||||||
/* Only do rules with commands to execute. */
|
/* Only do rules with commands to execute. */
|
||||||
/* If this action has already been executed, use saved status */
|
/* If this action has already been executed, use saved status */
|
||||||
@@ -475,10 +481,15 @@ make1cmds( ACTIONS *a0 )
|
|||||||
* is likely to be much more compute intensive!
|
* is likely to be much more compute intensive!
|
||||||
*
|
*
|
||||||
* Note we loop through at least once, for sourceless actions.
|
* Note we loop through at least once, for sourceless actions.
|
||||||
|
*
|
||||||
|
* Max line length is the action specific maxline or, if not
|
||||||
|
* given or bigger than MAXLINE, MAXLINE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
start = 0;
|
start = 0;
|
||||||
chunk = length = list_length( ns );
|
chunk = length = list_length( ns );
|
||||||
|
maxline = rule->flags / RULE_MAXLINE;
|
||||||
|
maxline = maxline && maxline < MAXLINE ? maxline : MAXLINE;
|
||||||
|
|
||||||
do
|
do
|
||||||
{
|
{
|
||||||
@@ -487,7 +498,8 @@ make1cmds( ACTIONS *a0 )
|
|||||||
CMD *cmd = cmd_new( rule,
|
CMD *cmd = cmd_new( rule,
|
||||||
list_copy( L0, nt ),
|
list_copy( L0, nt ),
|
||||||
list_sublist( ns, start, chunk ),
|
list_sublist( ns, start, chunk ),
|
||||||
list_copy( L0, shell ) );
|
list_copy( L0, shell ),
|
||||||
|
maxline );
|
||||||
|
|
||||||
if( cmd )
|
if( cmd )
|
||||||
{
|
{
|
||||||
@@ -509,7 +521,7 @@ make1cmds( ACTIONS *a0 )
|
|||||||
/* Too long and not splittable. */
|
/* Too long and not splittable. */
|
||||||
|
|
||||||
printf( "%s actions too long (max %d)!\n",
|
printf( "%s actions too long (max %d)!\n",
|
||||||
rule->name, MAXLINE );
|
rule->name, maxline );
|
||||||
exit( EXITBAD );
|
exit( EXITBAD );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -574,7 +586,7 @@ make1list(
|
|||||||
|
|
||||||
/* Build new list */
|
/* Build new list */
|
||||||
|
|
||||||
l = list_new( l, copystr( t->boundname ) );
|
l = list_new( l, t->boundname, 1 );
|
||||||
}
|
}
|
||||||
|
|
||||||
return l;
|
return l;
|
||||||
@@ -606,7 +618,7 @@ make1settings( LIST *vars )
|
|||||||
|
|
||||||
/* Build new list */
|
/* Build new list */
|
||||||
|
|
||||||
nl = list_new( nl, copystr( t->boundname ) );
|
nl = list_new( nl, t->boundname, 1 );
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Add to settings chain */
|
/* Add to settings chain */
|
||||||
|
|||||||
@@ -18,6 +18,7 @@
|
|||||||
*
|
*
|
||||||
* Handles \'s and "'s specially; knows to delete blank and comment lines.
|
* Handles \'s and "'s specially; knows to delete blank and comment lines.
|
||||||
*
|
*
|
||||||
|
* 11/04/02 (seiwald) - const-ing for string literals
|
||||||
*/
|
*/
|
||||||
|
|
||||||
# include <stdio.h>
|
# include <stdio.h>
|
||||||
@@ -55,7 +56,7 @@ main( int argc, char **argv, char **envp )
|
|||||||
if( doDotC )
|
if( doDotC )
|
||||||
{
|
{
|
||||||
fprintf( fout, "/* Generated by mkjambase from Jambase */\n" );
|
fprintf( fout, "/* Generated by mkjambase from Jambase */\n" );
|
||||||
fprintf( fout, "char *jambase[] = {\n" );
|
fprintf( fout, "const char *jambase[] = {\n" );
|
||||||
}
|
}
|
||||||
|
|
||||||
for( ; argc--; argv++ )
|
for( ; argc--; argv++ )
|
||||||
|
|||||||
+12
-10
@@ -4,10 +4,6 @@
|
|||||||
* This file is part of Jam - see jam.c for Copyright information.
|
* This file is part of Jam - see jam.c for Copyright information.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
# include "jam.h"
|
|
||||||
# include "newstr.h"
|
|
||||||
# include "hash.h"
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* newstr.c - string manipulation routines
|
* newstr.c - string manipulation routines
|
||||||
*
|
*
|
||||||
@@ -26,9 +22,15 @@
|
|||||||
* This implementation builds a hash table of all strings, so that multiple
|
* This implementation builds a hash table of all strings, so that multiple
|
||||||
* calls of newstr() on the same string allocate memory for the string once.
|
* calls of newstr() on the same string allocate memory for the string once.
|
||||||
* Strings are never actually freed.
|
* Strings are never actually freed.
|
||||||
|
*
|
||||||
|
* 11/04/02 (seiwald) - const-ing for string literals
|
||||||
*/
|
*/
|
||||||
|
|
||||||
typedef char *STRING;
|
# include "jam.h"
|
||||||
|
# include "newstr.h"
|
||||||
|
# include "hash.h"
|
||||||
|
|
||||||
|
typedef const char *STRING;
|
||||||
|
|
||||||
static struct hash *strhash = 0;
|
static struct hash *strhash = 0;
|
||||||
static int strtotal = 0;
|
static int strtotal = 0;
|
||||||
@@ -37,8 +39,8 @@ static int strtotal = 0;
|
|||||||
* newstr() - return a malloc'ed copy of a string
|
* newstr() - return a malloc'ed copy of a string
|
||||||
*/
|
*/
|
||||||
|
|
||||||
char *
|
const char *
|
||||||
newstr( char *string )
|
newstr( const char *string )
|
||||||
{
|
{
|
||||||
STRING str, *s = &str;
|
STRING str, *s = &str;
|
||||||
|
|
||||||
@@ -67,8 +69,8 @@ newstr( char *string )
|
|||||||
* copystr() - return a copy of a string previously returned by newstr()
|
* copystr() - return a copy of a string previously returned by newstr()
|
||||||
*/
|
*/
|
||||||
|
|
||||||
char *
|
const char *
|
||||||
copystr( char *s )
|
copystr( const char *s )
|
||||||
{
|
{
|
||||||
return s;
|
return s;
|
||||||
}
|
}
|
||||||
@@ -78,7 +80,7 @@ copystr( char *s )
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
void
|
void
|
||||||
freestr( char *s )
|
freestr( const char *s )
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -6,9 +6,11 @@
|
|||||||
|
|
||||||
/*
|
/*
|
||||||
* newstr.h - string manipulation routines
|
* newstr.h - string manipulation routines
|
||||||
|
*
|
||||||
|
* 11/04/02 (seiwald) - const-ing for string literals
|
||||||
*/
|
*/
|
||||||
|
|
||||||
char *newstr( char *string );
|
const char *newstr( const char *string );
|
||||||
char *copystr( char *s );
|
const char *copystr( const char *s );
|
||||||
void freestr( char *s );
|
void freestr( const char *s );
|
||||||
void donestr();
|
void donestr();
|
||||||
|
|||||||
@@ -4,9 +4,6 @@
|
|||||||
* This file is part of Jam - see jam.c for Copyright information.
|
* This file is part of Jam - see jam.c for Copyright information.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
# include "jam.h"
|
|
||||||
# include "option.h"
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* option.c - command line option processing
|
* option.c - command line option processing
|
||||||
*
|
*
|
||||||
@@ -15,13 +12,18 @@
|
|||||||
* Return the number of argv[] elements used up by options,
|
* Return the number of argv[] elements used up by options,
|
||||||
* or -1 if an invalid option flag was given or an argument
|
* or -1 if an invalid option flag was given or an argument
|
||||||
* was supplied for an option that does not require one."
|
* was supplied for an option that does not require one."
|
||||||
|
*
|
||||||
|
* 11/04/02 (seiwald) - const-ing for string literals
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
# include "jam.h"
|
||||||
|
# include "option.h"
|
||||||
|
|
||||||
int
|
int
|
||||||
getoptions(
|
getoptions(
|
||||||
int argc,
|
int argc,
|
||||||
char **argv,
|
char **argv,
|
||||||
char *opts,
|
const char *opts,
|
||||||
option *optv )
|
option *optv )
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
@@ -44,7 +46,7 @@ getoptions(
|
|||||||
|
|
||||||
for( arg = &argv[i][1]; *arg; arg++ )
|
for( arg = &argv[i][1]; *arg; arg++ )
|
||||||
{
|
{
|
||||||
char *f;
|
const char *f;
|
||||||
|
|
||||||
for( f = opts; *f; f++ )
|
for( f = opts; *f; f++ )
|
||||||
if( *f == *arg )
|
if( *f == *arg )
|
||||||
@@ -87,7 +89,7 @@ getoptions(
|
|||||||
* Name: getoptval() - find an option given its character
|
* Name: getoptval() - find an option given its character
|
||||||
*/
|
*/
|
||||||
|
|
||||||
char *
|
const char *
|
||||||
getoptval(
|
getoptval(
|
||||||
option *optv,
|
option *optv,
|
||||||
char opt,
|
char opt,
|
||||||
|
|||||||
@@ -9,15 +9,17 @@
|
|||||||
*
|
*
|
||||||
* {o >o
|
* {o >o
|
||||||
* \ -) "Command line option."
|
* \ -) "Command line option."
|
||||||
|
*
|
||||||
|
* 11/04/02 (seiwald) - const-ing for string literals
|
||||||
*/
|
*/
|
||||||
|
|
||||||
typedef struct option
|
typedef struct option
|
||||||
{
|
{
|
||||||
char flag; /* filled in by getoption() */
|
char flag; /* filled in by getoption() */
|
||||||
char *val; /* set to random address if true */
|
const char *val; /* set to random address if true */
|
||||||
} option;
|
} option;
|
||||||
|
|
||||||
# define N_OPTS 256
|
# define N_OPTS 256
|
||||||
|
|
||||||
int getoptions( int argc, char **argv, char *opts, option *optv );
|
int getoptions( int argc, char **argv, const char *opts, option *optv );
|
||||||
char * getoptval( option *optv, char opt, int subopt );
|
const char * getoptval( option *optv, char opt, int subopt );
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/* Keep JAMVERSYM in sync with VERSION. */
|
/* Keep JAMVERSYM in sync with VERSION. */
|
||||||
/* It can be accessed as $(JAMVERSION) in the Jamfile. */
|
/* It can be accessed as $(JAMVERSION) in the Jamfile. */
|
||||||
|
|
||||||
#define VERSION "2.4"
|
#define VERSION "2.5rc3"
|
||||||
#define JAMVERSYM "JAMVERSION=2.4"
|
#define JAMVERSYM "JAMVERSION=2.5"
|
||||||
|
|||||||
+12
-11
@@ -4,13 +4,6 @@
|
|||||||
* This file is part of Jam - see jam.c for Copyright information.
|
* This file is part of Jam - see jam.c for Copyright information.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
# include "jam.h"
|
|
||||||
# include "pathsys.h"
|
|
||||||
|
|
||||||
# ifdef OS_MAC
|
|
||||||
|
|
||||||
# define DELIM ':'
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* pathunix.c - manipulate file names on UNIX, NT, OS2
|
* pathunix.c - manipulate file names on UNIX, NT, OS2
|
||||||
*
|
*
|
||||||
@@ -39,19 +32,27 @@
|
|||||||
* 01/10/01 (seiwald) - path_parse now strips the trailing : from the
|
* 01/10/01 (seiwald) - path_parse now strips the trailing : from the
|
||||||
* directory name, unless the directory name is all
|
* directory name, unless the directory name is all
|
||||||
* :'s, so that $(d:P) works.
|
* :'s, so that $(d:P) works.
|
||||||
|
* 11/04/02 (seiwald) - const-ing for string literals
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
# include "jam.h"
|
||||||
|
# include "pathsys.h"
|
||||||
|
|
||||||
|
# ifdef OS_MAC
|
||||||
|
|
||||||
|
# define DELIM ':'
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* path_parse() - split a file name into dir/base/suffix/member
|
* path_parse() - split a file name into dir/base/suffix/member
|
||||||
*/
|
*/
|
||||||
|
|
||||||
void
|
void
|
||||||
path_parse(
|
path_parse(
|
||||||
char *file,
|
const char *file,
|
||||||
PATHNAME *f )
|
PATHNAME *f )
|
||||||
{
|
{
|
||||||
char *p, *q;
|
const char *p, *q;
|
||||||
char *end;
|
const char *end;
|
||||||
|
|
||||||
memset( (char *)f, 0, sizeof( *f ) );
|
memset( (char *)f, 0, sizeof( *f ) );
|
||||||
|
|
||||||
@@ -142,7 +143,7 @@ char grid[5][5] = {
|
|||||||
|
|
||||||
static int
|
static int
|
||||||
file_flags(
|
file_flags(
|
||||||
char *ptr,
|
const char *ptr,
|
||||||
int len )
|
int len )
|
||||||
{
|
{
|
||||||
if( !len )
|
if( !len )
|
||||||
|
|||||||
@@ -6,6 +6,8 @@
|
|||||||
|
|
||||||
/*
|
/*
|
||||||
* pathsys.h - PATHNAME struct
|
* pathsys.h - PATHNAME struct
|
||||||
|
*
|
||||||
|
* 11/04/02 (seiwald) - const-ing for string literals
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@@ -24,7 +26,7 @@ typedef struct _pathname PATHNAME;
|
|||||||
typedef struct _pathpart PATHPART;
|
typedef struct _pathpart PATHPART;
|
||||||
|
|
||||||
struct _pathpart {
|
struct _pathpart {
|
||||||
char *ptr;
|
const char *ptr;
|
||||||
int len;
|
int len;
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -44,6 +46,6 @@ struct _pathname {
|
|||||||
} ;
|
} ;
|
||||||
|
|
||||||
void path_build( PATHNAME *f, char *file, int binding );
|
void path_build( PATHNAME *f, char *file, int binding );
|
||||||
void path_parse( char *file, PATHNAME *f );
|
void path_parse( const char *file, PATHNAME *f );
|
||||||
void path_parent( PATHNAME *f );
|
void path_parent( PATHNAME *f );
|
||||||
|
|
||||||
|
|||||||
@@ -4,11 +4,6 @@
|
|||||||
* This file is part of Jam - see jam.c for Copyright information.
|
* This file is part of Jam - see jam.c for Copyright information.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
# include "jam.h"
|
|
||||||
# include "pathsys.h"
|
|
||||||
|
|
||||||
# ifdef USE_PATHUNIX
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* pathunix.c - manipulate file names on UNIX, NT, OS2, AmigaOS
|
* pathunix.c - manipulate file names on UNIX, NT, OS2, AmigaOS
|
||||||
*
|
*
|
||||||
@@ -34,20 +29,26 @@
|
|||||||
* 05/03/96 (seiwald) - split from filent.c, fileunix.c
|
* 05/03/96 (seiwald) - split from filent.c, fileunix.c
|
||||||
* 12/20/96 (seiwald) - when looking for the rightmost . in a file name,
|
* 12/20/96 (seiwald) - when looking for the rightmost . in a file name,
|
||||||
* don't include the archive member name.
|
* don't include the archive member name.
|
||||||
* 01/13/01 (seiwald) - turn on \ handling on UNIX, on by accident
|
* 01/13/01 (seiwald) - turn off \ handling on UNIX, on by accident
|
||||||
|
* 11/04/02 (seiwald) - const-ing for string literals
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
# include "jam.h"
|
||||||
|
# include "pathsys.h"
|
||||||
|
|
||||||
|
# ifdef USE_PATHUNIX
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* path_parse() - split a file name into dir/base/suffix/member
|
* path_parse() - split a file name into dir/base/suffix/member
|
||||||
*/
|
*/
|
||||||
|
|
||||||
void
|
void
|
||||||
path_parse(
|
path_parse(
|
||||||
char *file,
|
const char *file,
|
||||||
PATHNAME *f )
|
PATHNAME *f )
|
||||||
{
|
{
|
||||||
char *p, *q;
|
const char *p, *q;
|
||||||
char *end;
|
const char *end;
|
||||||
|
|
||||||
memset( (char *)f, 0, sizeof( *f ) );
|
memset( (char *)f, 0, sizeof( *f ) );
|
||||||
|
|
||||||
|
|||||||
+18
-17
@@ -4,13 +4,6 @@
|
|||||||
* This file is part of Jam - see jam.c for Copyright information.
|
* This file is part of Jam - see jam.c for Copyright information.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
# include "jam.h"
|
|
||||||
# include "pathsys.h"
|
|
||||||
|
|
||||||
# ifdef OS_VMS
|
|
||||||
|
|
||||||
# define DEBUG
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* pathvms.c - manipulate file names on VMS
|
* pathvms.c - manipulate file names on VMS
|
||||||
*
|
*
|
||||||
@@ -29,19 +22,27 @@
|
|||||||
*
|
*
|
||||||
* 02/09/95 (seiwald) - bungled R=[xxx] - was using directory length!
|
* 02/09/95 (seiwald) - bungled R=[xxx] - was using directory length!
|
||||||
* 05/03/96 (seiwald) - split from filevms.c
|
* 05/03/96 (seiwald) - split from filevms.c
|
||||||
|
* 11/04/02 (seiwald) - const-ing for string literals
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
# include "jam.h"
|
||||||
|
# include "pathsys.h"
|
||||||
|
|
||||||
|
# ifdef OS_VMS
|
||||||
|
|
||||||
|
# define DEBUG
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* path_parse() - split a file name into dir/base/suffix/member
|
* path_parse() - split a file name into dir/base/suffix/member
|
||||||
*/
|
*/
|
||||||
|
|
||||||
void
|
void
|
||||||
path_parse(
|
path_parse(
|
||||||
char *file,
|
const char *file,
|
||||||
PATHNAME *f )
|
PATHNAME *f )
|
||||||
{
|
{
|
||||||
char *p, *q;
|
const char *p, *q;
|
||||||
char *end;
|
const char *end;
|
||||||
|
|
||||||
memset( (char *)f, 0, sizeof( *f ) );
|
memset( (char *)f, 0, sizeof( *f ) );
|
||||||
|
|
||||||
@@ -179,11 +180,11 @@ strnchr(
|
|||||||
|
|
||||||
static void
|
static void
|
||||||
dir_flags(
|
dir_flags(
|
||||||
char *buf,
|
const char *buf,
|
||||||
int len,
|
int len,
|
||||||
struct dirinf *i )
|
struct dirinf *i )
|
||||||
{
|
{
|
||||||
char *p;
|
const char *p;
|
||||||
|
|
||||||
if( !buf || !len )
|
if( !buf || !len )
|
||||||
{
|
{
|
||||||
@@ -193,19 +194,19 @@ dir_flags(
|
|||||||
i->dev.len =
|
i->dev.len =
|
||||||
i->dir.len = 0;
|
i->dir.len = 0;
|
||||||
}
|
}
|
||||||
else if( p = strnchr( buf, ':', len ) )
|
else if( p = strnchr( (char *)buf, ':', len ) )
|
||||||
{
|
{
|
||||||
i->dev.ptr = buf;
|
i->dev.ptr = (char *)buf;
|
||||||
i->dev.len = p + 1 - buf;
|
i->dev.len = p + 1 - buf;
|
||||||
i->dir.ptr = buf + i->dev.len;
|
i->dir.ptr = (char *)buf + i->dev.len;
|
||||||
i->dir.len = len - i->dev.len;
|
i->dir.len = len - i->dev.len;
|
||||||
i->flags = i->dir.len && *i->dir.ptr == '[' ? DIR_DEVDIR : DIR_DEV;
|
i->flags = i->dir.len && *i->dir.ptr == '[' ? DIR_DEVDIR : DIR_DEV;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
i->dev.ptr = buf;
|
i->dev.ptr = (char *)buf;
|
||||||
i->dev.len = 0;
|
i->dev.len = 0;
|
||||||
i->dir.ptr = buf;
|
i->dir.ptr = (char *)buf;
|
||||||
i->dir.len = len;
|
i->dir.len = len;
|
||||||
|
|
||||||
if( *buf == '[' && buf[1] == ']' )
|
if( *buf == '[' && buf[1] == ']' )
|
||||||
|
|||||||
+22
-14
@@ -36,6 +36,8 @@
|
|||||||
*** happily defined in string.h).
|
*** happily defined in string.h).
|
||||||
*** THIS IS AN ALTERED VERSION. It was altered by Christopher Seiwald
|
*** THIS IS AN ALTERED VERSION. It was altered by Christopher Seiwald
|
||||||
*** [email protected], on 20 January 2000, to use function prototypes.
|
*** [email protected], on 20 January 2000, to use function prototypes.
|
||||||
|
*** THIS IS AN ALTERED VERSION. It was altered by Christopher Seiwald
|
||||||
|
*** [email protected], on 05 November 2002, to const string literals.
|
||||||
*
|
*
|
||||||
* Beware that some of this code is subtly aware of the way operator
|
* Beware that some of this code is subtly aware of the way operator
|
||||||
* precedence is structured in regular expressions. Serious changes in
|
* precedence is structured in regular expressions. Serious changes in
|
||||||
@@ -210,7 +212,7 @@ STATIC int strcspn();
|
|||||||
* of the structure of the compiled regexp.
|
* of the structure of the compiled regexp.
|
||||||
*/
|
*/
|
||||||
regexp *
|
regexp *
|
||||||
regcomp( char *exp )
|
regcomp( const char *exp )
|
||||||
{
|
{
|
||||||
register regexp *r;
|
register regexp *r;
|
||||||
register char *scan;
|
register char *scan;
|
||||||
@@ -767,15 +769,15 @@ regoptail(
|
|||||||
/*
|
/*
|
||||||
* Global work variables for regexec().
|
* Global work variables for regexec().
|
||||||
*/
|
*/
|
||||||
static char *reginput; /* String-input pointer. */
|
static const char *reginput; /* String-input pointer. */
|
||||||
static char *regbol; /* Beginning of input, for ^ check. */
|
static char *regbol; /* Beginning of input, for ^ check. */
|
||||||
static char **regstartp; /* Pointer to startp array. */
|
static const char **regstartp; /* Pointer to startp array. */
|
||||||
static char **regendp; /* Ditto for endp. */
|
static const char **regendp; /* Ditto for endp. */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Forwards.
|
* Forwards.
|
||||||
*/
|
*/
|
||||||
STATIC int regtry( regexp *prog, char *string );
|
STATIC int regtry( regexp *prog, const char *string );
|
||||||
STATIC int regmatch( char *prog );
|
STATIC int regmatch( char *prog );
|
||||||
STATIC int regrepeat( char *p );
|
STATIC int regrepeat( char *p );
|
||||||
|
|
||||||
@@ -791,7 +793,7 @@ STATIC char *regprop();
|
|||||||
int
|
int
|
||||||
regexec(
|
regexec(
|
||||||
register regexp *prog,
|
register regexp *prog,
|
||||||
register char *string )
|
register const char *string )
|
||||||
{
|
{
|
||||||
register char *s;
|
register char *s;
|
||||||
|
|
||||||
@@ -852,11 +854,11 @@ regexec(
|
|||||||
static int /* 0 failure, 1 success */
|
static int /* 0 failure, 1 success */
|
||||||
regtry(
|
regtry(
|
||||||
regexp *prog,
|
regexp *prog,
|
||||||
char *string )
|
const char *string )
|
||||||
{
|
{
|
||||||
register int i;
|
register int i;
|
||||||
register char **sp;
|
register const char **sp;
|
||||||
register char **ep;
|
register const char **ep;
|
||||||
|
|
||||||
reginput = string;
|
reginput = string;
|
||||||
regstartp = prog->startp;
|
regstartp = prog->startp;
|
||||||
@@ -971,7 +973,7 @@ regmatch( char *prog )
|
|||||||
case OPEN+8:
|
case OPEN+8:
|
||||||
case OPEN+9: {
|
case OPEN+9: {
|
||||||
register int no;
|
register int no;
|
||||||
register char *save;
|
register const char *save;
|
||||||
|
|
||||||
no = OP(scan) - OPEN;
|
no = OP(scan) - OPEN;
|
||||||
save = reginput;
|
save = reginput;
|
||||||
@@ -999,7 +1001,7 @@ regmatch( char *prog )
|
|||||||
case CLOSE+8:
|
case CLOSE+8:
|
||||||
case CLOSE+9: {
|
case CLOSE+9: {
|
||||||
register int no;
|
register int no;
|
||||||
register char *save;
|
register const char *save;
|
||||||
|
|
||||||
no = OP(scan) - CLOSE;
|
no = OP(scan) - CLOSE;
|
||||||
save = reginput;
|
save = reginput;
|
||||||
@@ -1018,7 +1020,7 @@ regmatch( char *prog )
|
|||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case BRANCH: {
|
case BRANCH: {
|
||||||
register char *save;
|
register const char *save;
|
||||||
|
|
||||||
if (OP(next) != BRANCH) /* No choice. */
|
if (OP(next) != BRANCH) /* No choice. */
|
||||||
next = OPERAND(scan); /* Avoid recursion. */
|
next = OPERAND(scan); /* Avoid recursion. */
|
||||||
@@ -1039,7 +1041,7 @@ regmatch( char *prog )
|
|||||||
case PLUS: {
|
case PLUS: {
|
||||||
register char nextch;
|
register char nextch;
|
||||||
register int no;
|
register int no;
|
||||||
register char *save;
|
register const char *save;
|
||||||
register int min;
|
register int min;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@@ -1091,7 +1093,7 @@ static int
|
|||||||
regrepeat( char *p )
|
regrepeat( char *p )
|
||||||
{
|
{
|
||||||
register int count = 0;
|
register int count = 0;
|
||||||
register char *scan;
|
register const char *scan;
|
||||||
register char *opnd;
|
register char *opnd;
|
||||||
|
|
||||||
scan = reginput;
|
scan = reginput;
|
||||||
@@ -1315,3 +1317,9 @@ strcspn(
|
|||||||
return(count);
|
return(count);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
void
|
||||||
|
regerror( const char *s )
|
||||||
|
{
|
||||||
|
printf( "re error %s\n", s );
|
||||||
|
}
|
||||||
|
|||||||
@@ -3,11 +3,14 @@
|
|||||||
*
|
*
|
||||||
* Caveat: this is V8 regexp(3) [actually, a reimplementation thereof],
|
* Caveat: this is V8 regexp(3) [actually, a reimplementation thereof],
|
||||||
* not the System V one.
|
* not the System V one.
|
||||||
|
*
|
||||||
|
* 11/04/02 (seiwald) - const-ing for string literals
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define NSUBEXP 10
|
#define NSUBEXP 10
|
||||||
typedef struct regexp {
|
typedef struct regexp {
|
||||||
char *startp[NSUBEXP];
|
const char *startp[NSUBEXP];
|
||||||
char *endp[NSUBEXP];
|
const char *endp[NSUBEXP];
|
||||||
char regstart; /* Internal use only. */
|
char regstart; /* Internal use only. */
|
||||||
char reganch; /* Internal use only. */
|
char reganch; /* Internal use only. */
|
||||||
char *regmust; /* Internal use only. */
|
char *regmust; /* Internal use only. */
|
||||||
@@ -15,9 +18,9 @@ typedef struct regexp {
|
|||||||
char program[1]; /* Unwarranted chumminess with compiler. */
|
char program[1]; /* Unwarranted chumminess with compiler. */
|
||||||
} regexp;
|
} regexp;
|
||||||
|
|
||||||
regexp *regcomp( char *exp );
|
regexp *regcomp( const char *exp );
|
||||||
int regexec( regexp *prog, char *string );
|
int regexec( regexp *prog, const char *string );
|
||||||
void regerror( char *s );
|
void regerror( const char *s );
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* The first byte of the regexp internal "program" is actually this magic
|
* The first byte of the regexp internal "program" is actually this magic
|
||||||
|
|||||||
+128
-32
@@ -4,6 +4,35 @@
|
|||||||
* This file is part of Jam - see jam.c for Copyright information.
|
* This file is part of Jam - see jam.c for Copyright information.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
/*
|
||||||
|
* rules.c - access to RULEs, TARGETs, and ACTIONs
|
||||||
|
*
|
||||||
|
* External routines:
|
||||||
|
*
|
||||||
|
* bindrule() - return pointer to RULE, creating it if necessary
|
||||||
|
* bindtarget() - return pointer to TARGET, creating it if necessary
|
||||||
|
* copytarget() - make a new target with the old target's name
|
||||||
|
* touchtarget() - mark a target to simulate being new
|
||||||
|
* targetlist() - turn list of target names into a TARGET chain
|
||||||
|
* targetentry() - add a TARGET to a chain of TARGETS
|
||||||
|
* targetchain() - append two TARGET chains
|
||||||
|
* actionlist() - append to an ACTION chain
|
||||||
|
* addsettings() - add a deferred "set" command to a target
|
||||||
|
* copysettings() - copy a settings list for temp use
|
||||||
|
* pushsettings() - set all target specific variables
|
||||||
|
* popsettings() - reset target specific variables to their pre-push values
|
||||||
|
* freesettings() - delete a settings list
|
||||||
|
* donerules() - free RULE and TARGET tables
|
||||||
|
*
|
||||||
|
* 04/12/94 (seiwald) - actionlist() now just appends a single action.
|
||||||
|
* 08/23/94 (seiwald) - Support for '+=' (append to variable)
|
||||||
|
* 06/21/02 (seiwald) - support for named parameters
|
||||||
|
* 11/04/02 (seiwald) - const-ing for string literals
|
||||||
|
* 12/03/02 (seiwald) - fix odd includes support by grafting them onto depends
|
||||||
|
* 12/17/02 (seiwald) - new copysettings() to protect target-specific vars
|
||||||
|
* 01/14/03 (seiwald) - fix includes fix with new internal includes TARGET
|
||||||
|
*/
|
||||||
|
|
||||||
# include "jam.h"
|
# include "jam.h"
|
||||||
# include "lists.h"
|
# include "lists.h"
|
||||||
# include "parse.h"
|
# include "parse.h"
|
||||||
@@ -12,28 +41,6 @@
|
|||||||
# include "newstr.h"
|
# include "newstr.h"
|
||||||
# include "hash.h"
|
# include "hash.h"
|
||||||
|
|
||||||
/*
|
|
||||||
* rules.c - access to RULEs, TARGETs, and ACTIONs
|
|
||||||
*
|
|
||||||
* External routines:
|
|
||||||
*
|
|
||||||
* bindrule() - return pointer to RULE, creating it if necessary
|
|
||||||
* bindtarget() - return pointer to TARGET, creating it if necessary
|
|
||||||
* touchtarget() - mark a target to simulate being new
|
|
||||||
* targetlist() - turn list of target names into a TARGET chain
|
|
||||||
* targetentry() - add a TARGET to a chain of TARGETS
|
|
||||||
* actionlist() - append to an ACTION chain
|
|
||||||
* addsettings() - add a deferred "set" command to a target
|
|
||||||
* usesettings() - set all target specific variables
|
|
||||||
* pushsettings() - set all target specific variables
|
|
||||||
* popsettings() - reset target specific variables to their pre-push values
|
|
||||||
* freesettings() - delete a settings list
|
|
||||||
* donerules() - free RULE and TARGET tables
|
|
||||||
*
|
|
||||||
* 04/12/94 (seiwald) - actionlist() now just appends a single action.
|
|
||||||
* 08/23/94 (seiwald) - Support for '+=' (append to variable)
|
|
||||||
*/
|
|
||||||
|
|
||||||
static struct hash *rulehash = 0;
|
static struct hash *rulehash = 0;
|
||||||
static struct hash *targethash = 0;
|
static struct hash *targethash = 0;
|
||||||
|
|
||||||
@@ -43,7 +50,7 @@ static struct hash *targethash = 0;
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
RULE *
|
RULE *
|
||||||
bindrule( char *rulename )
|
bindrule( const char *rulename )
|
||||||
{
|
{
|
||||||
RULE rule, *r = &rule;
|
RULE rule, *r = &rule;
|
||||||
|
|
||||||
@@ -58,6 +65,7 @@ bindrule( char *rulename )
|
|||||||
r->procedure = (PARSE *)0;
|
r->procedure = (PARSE *)0;
|
||||||
r->actions = (char *)0;
|
r->actions = (char *)0;
|
||||||
r->bindlist = L0;
|
r->bindlist = L0;
|
||||||
|
r->params = L0;
|
||||||
r->flags = 0;
|
r->flags = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -69,7 +77,7 @@ bindrule( char *rulename )
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
TARGET *
|
TARGET *
|
||||||
bindtarget( char *targetname )
|
bindtarget( const char *targetname )
|
||||||
{
|
{
|
||||||
TARGET target, *t = ⌖
|
TARGET target, *t = ⌖
|
||||||
|
|
||||||
@@ -88,12 +96,33 @@ bindtarget( char *targetname )
|
|||||||
return t;
|
return t;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* copytarget() - make a new target with the old target's name
|
||||||
|
*
|
||||||
|
* Not entered into hash table -- for internal nodes.
|
||||||
|
*/
|
||||||
|
|
||||||
|
TARGET *
|
||||||
|
copytarget( const TARGET *ot )
|
||||||
|
{
|
||||||
|
TARGET *t;
|
||||||
|
|
||||||
|
t = (TARGET *)malloc( sizeof( *t ) );
|
||||||
|
memset( (char *)t, '\0', sizeof( *t ) );
|
||||||
|
t->name = copystr( ot->name );
|
||||||
|
t->boundname = t->name;
|
||||||
|
|
||||||
|
t->flags |= T_FLAG_NOTFILE | T_FLAG_INTERNAL;
|
||||||
|
|
||||||
|
return t;
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* touchtarget() - mark a target to simulate being new
|
* touchtarget() - mark a target to simulate being new
|
||||||
*/
|
*/
|
||||||
|
|
||||||
void
|
void
|
||||||
touchtarget( char *t )
|
touchtarget( const char *t )
|
||||||
{
|
{
|
||||||
bindtarget( t )->flags |= T_FLAG_TOUCHED;
|
bindtarget( t )->flags |= T_FLAG_TOUCHED;
|
||||||
}
|
}
|
||||||
@@ -143,6 +172,32 @@ targetentry(
|
|||||||
return chain;
|
return chain;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* targetchain() - append two TARGET chains
|
||||||
|
*
|
||||||
|
* Inputs:
|
||||||
|
* chain exisitng TARGETS to append to
|
||||||
|
* target new target to append
|
||||||
|
*/
|
||||||
|
|
||||||
|
TARGETS *
|
||||||
|
targetchain(
|
||||||
|
TARGETS *chain,
|
||||||
|
TARGETS *targets )
|
||||||
|
{
|
||||||
|
TARGETS *c;
|
||||||
|
|
||||||
|
if( !targets )
|
||||||
|
return chain;
|
||||||
|
else if( !chain )
|
||||||
|
return targets;
|
||||||
|
|
||||||
|
chain->tail->next = targets;
|
||||||
|
chain->tail = targets->tail;
|
||||||
|
|
||||||
|
return chain;
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* actionlist() - append to an ACTION chain
|
* actionlist() - append to an ACTION chain
|
||||||
*/
|
*/
|
||||||
@@ -176,8 +231,8 @@ actionlist(
|
|||||||
SETTINGS *
|
SETTINGS *
|
||||||
addsettings(
|
addsettings(
|
||||||
SETTINGS *head,
|
SETTINGS *head,
|
||||||
int append,
|
int setflag,
|
||||||
char *symbol,
|
const char *symbol,
|
||||||
LIST *value )
|
LIST *value )
|
||||||
{
|
{
|
||||||
SETTINGS *v;
|
SETTINGS *v;
|
||||||
@@ -200,14 +255,23 @@ addsettings(
|
|||||||
v->next = head;
|
v->next = head;
|
||||||
head = v;
|
head = v;
|
||||||
}
|
}
|
||||||
else if( append )
|
else switch( setflag )
|
||||||
{
|
|
||||||
v->value = list_append( v->value, value );
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
{
|
||||||
|
case VAR_SET:
|
||||||
|
/* Toss old, set new */
|
||||||
list_free( v->value );
|
list_free( v->value );
|
||||||
v->value = value;
|
v->value = value;
|
||||||
|
break;
|
||||||
|
|
||||||
|
case VAR_APPEND:
|
||||||
|
/* Append new to old */
|
||||||
|
v->value = list_append( v->value, value );
|
||||||
|
break;
|
||||||
|
|
||||||
|
case VAR_DEFAULT:
|
||||||
|
/* Toss new, old already set */
|
||||||
|
list_free( value );
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Return (new) head of list. */
|
/* Return (new) head of list. */
|
||||||
@@ -215,6 +279,38 @@ addsettings(
|
|||||||
return head;
|
return head;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* copysettings() - copy a settings list for temp use
|
||||||
|
*
|
||||||
|
* When target-specific variables are pushed into place with pushsettings(),
|
||||||
|
* any global variables with the same name are swapped onto the target's
|
||||||
|
* SETTINGS chain. If that chain gets modified (by using the "on target"
|
||||||
|
* syntax), popsettings() would wrongly swap those modified values back
|
||||||
|
* as the new global values.
|
||||||
|
*
|
||||||
|
* copysettings() protects the target's SETTINGS chain by providing a
|
||||||
|
* copy of the chain to pass to pushsettings() and popsettings(), so that
|
||||||
|
* the target's original SETTINGS chain can be modified using the usual
|
||||||
|
* "on target" syntax.
|
||||||
|
*/
|
||||||
|
|
||||||
|
SETTINGS *
|
||||||
|
copysettings( SETTINGS *from )
|
||||||
|
{
|
||||||
|
SETTINGS *head = 0, *v;
|
||||||
|
|
||||||
|
for( ; from; from = from->next )
|
||||||
|
{
|
||||||
|
SETTINGS *v = (SETTINGS *)malloc( sizeof( *v ) );
|
||||||
|
v->symbol = copystr( from->symbol );
|
||||||
|
v->value = list_copy( 0, from->value );
|
||||||
|
v->next = head;
|
||||||
|
head = v;
|
||||||
|
}
|
||||||
|
|
||||||
|
return head;
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* pushsettings() - set all target specific variables
|
* pushsettings() - set all target specific variables
|
||||||
*/
|
*/
|
||||||
|
|||||||
+30
-22
@@ -27,6 +27,13 @@
|
|||||||
* 01/19/95 (seiwald) - split DONTKNOW into CANTFIND/CANTMAKE.
|
* 01/19/95 (seiwald) - split DONTKNOW into CANTFIND/CANTMAKE.
|
||||||
* 02/02/95 (seiwald) - new LEAVES modifier on targets.
|
* 02/02/95 (seiwald) - new LEAVES modifier on targets.
|
||||||
* 02/14/95 (seiwald) - new NOUPDATE modifier on targets.
|
* 02/14/95 (seiwald) - new NOUPDATE modifier on targets.
|
||||||
|
* 02/28/02 (seiwald) - merge EXEC_xxx flags in with RULE_xxx
|
||||||
|
* 06/21/02 (seiwald) - support for named parameters
|
||||||
|
* 07/17/02 (seiwald) - TEMPORARY sources for headers now get built
|
||||||
|
* 11/04/02 (seiwald) - const-ing for string literals
|
||||||
|
* 12/03/02 (seiwald) - fix odd includes support by grafting them onto depends
|
||||||
|
* 12/17/02 (seiwald) - new copysettings() to protect target-specific vars
|
||||||
|
* 01/14/03 (seiwald) - fix includes fix with new internal includes TARGET
|
||||||
*/
|
*/
|
||||||
|
|
||||||
typedef struct _rule RULE;
|
typedef struct _rule RULE;
|
||||||
@@ -39,10 +46,11 @@ typedef struct _settings SETTINGS ;
|
|||||||
/* RULE - a generic jam rule, the product of RULE and ACTIONS */
|
/* RULE - a generic jam rule, the product of RULE and ACTIONS */
|
||||||
|
|
||||||
struct _rule {
|
struct _rule {
|
||||||
char *name;
|
const char *name;
|
||||||
PARSE *procedure; /* parse tree from RULE */
|
PARSE *procedure; /* parse tree from RULE */
|
||||||
char *actions; /* command string from ACTIONS */
|
const char *actions; /* command string from ACTIONS */
|
||||||
LIST *bindlist; /* variable to bind for actions */
|
LIST *bindlist; /* variable to bind for actions */
|
||||||
|
LIST *params; /* bind args to local vars */
|
||||||
int flags; /* modifiers on ACTIONS */
|
int flags; /* modifiers on ACTIONS */
|
||||||
|
|
||||||
# define RULE_UPDATED 0x01 /* $(>) is updated sources only */
|
# define RULE_UPDATED 0x01 /* $(>) is updated sources only */
|
||||||
@@ -51,6 +59,7 @@ struct _rule {
|
|||||||
# define RULE_QUIETLY 0x08 /* don't mention it unless verbose */
|
# define RULE_QUIETLY 0x08 /* don't mention it unless verbose */
|
||||||
# define RULE_PIECEMEAL 0x10 /* split exec so each $(>) is small */
|
# define RULE_PIECEMEAL 0x10 /* split exec so each $(>) is small */
|
||||||
# define RULE_EXISTING 0x20 /* $(>) is pre-exisitng sources only */
|
# define RULE_EXISTING 0x20 /* $(>) is pre-exisitng sources only */
|
||||||
|
# define RULE_MAXLINE 0x40 /* cmd specific maxline (last) */
|
||||||
|
|
||||||
} ;
|
} ;
|
||||||
|
|
||||||
@@ -76,7 +85,7 @@ struct _action {
|
|||||||
|
|
||||||
struct _settings {
|
struct _settings {
|
||||||
SETTINGS *next;
|
SETTINGS *next;
|
||||||
char *symbol; /* symbol name for var_set() */
|
const char *symbol; /* symbol name for var_set() */
|
||||||
LIST *value; /* symbol value for var_set() */
|
LIST *value; /* symbol value for var_set() */
|
||||||
} ;
|
} ;
|
||||||
|
|
||||||
@@ -91,8 +100,8 @@ struct _targets {
|
|||||||
/* TARGET - a file or "thing" that can be built */
|
/* TARGET - a file or "thing" that can be built */
|
||||||
|
|
||||||
struct _target {
|
struct _target {
|
||||||
char *name;
|
const char *name;
|
||||||
char *boundname; /* if search() relocates target */
|
const char *boundname; /* if search() relocates target */
|
||||||
ACTIONS *actions; /* rules to execute, if any */
|
ACTIONS *actions; /* rules to execute, if any */
|
||||||
SETTINGS *settings; /* variables to define */
|
SETTINGS *settings; /* variables to define */
|
||||||
|
|
||||||
@@ -104,6 +113,7 @@ struct _target {
|
|||||||
# define T_FLAG_TOUCHED 0x08 /* ALWAYS applied or -t target */
|
# define T_FLAG_TOUCHED 0x08 /* ALWAYS applied or -t target */
|
||||||
# define T_FLAG_LEAVES 0x10 /* LEAVES applied */
|
# define T_FLAG_LEAVES 0x10 /* LEAVES applied */
|
||||||
# define T_FLAG_NOUPDATE 0x20 /* NOUPDATE applied */
|
# define T_FLAG_NOUPDATE 0x20 /* NOUPDATE applied */
|
||||||
|
# define T_FLAG_INTERNAL 0x40 /* internal INCLUDES node */
|
||||||
|
|
||||||
char binding; /* how target relates to real file */
|
char binding; /* how target relates to real file */
|
||||||
|
|
||||||
@@ -112,18 +122,12 @@ struct _target {
|
|||||||
# define T_BIND_PARENTS 2 /* using parent's timestamp */
|
# define T_BIND_PARENTS 2 /* using parent's timestamp */
|
||||||
# define T_BIND_EXISTS 3 /* real file, timestamp valid */
|
# define T_BIND_EXISTS 3 /* real file, timestamp valid */
|
||||||
|
|
||||||
TARGETS *deps[2]; /* dependencies */
|
TARGETS *depends; /* dependencies */
|
||||||
|
TARGET *includes; /* includes */
|
||||||
# define T_DEPS_DEPENDS 0 /* due to DEPENDS */
|
|
||||||
# define T_DEPS_INCLUDES 1 /* due to INCLUDES */
|
|
||||||
|
|
||||||
time_t time; /* update time */
|
time_t time; /* update time */
|
||||||
time_t leaf; /* update time of leaf sources */
|
time_t leaf; /* update time of leaf sources */
|
||||||
time_t htime; /* header's time */
|
|
||||||
time_t hleaf; /* update time of leaf headers */
|
|
||||||
|
|
||||||
char fate; /* make0()'s diagnosis */
|
char fate; /* make0()'s diagnosis */
|
||||||
char hfate; /* collected fate for headers */
|
|
||||||
|
|
||||||
# define T_FATE_INIT 0 /* nothing done to target */
|
# define T_FATE_INIT 0 /* nothing done to target */
|
||||||
# define T_FATE_MAKING 1 /* make0(target) on stack */
|
# define T_FATE_MAKING 1 /* make0(target) on stack */
|
||||||
@@ -137,12 +141,13 @@ struct _target {
|
|||||||
# define T_FATE_BUILD 5 /* >= BUILD rebuilds target */
|
# define T_FATE_BUILD 5 /* >= BUILD rebuilds target */
|
||||||
# define T_FATE_TOUCHED 5 /* manually touched with -t */
|
# define T_FATE_TOUCHED 5 /* manually touched with -t */
|
||||||
# define T_FATE_MISSING 6 /* is missing, needs updating */
|
# define T_FATE_MISSING 6 /* is missing, needs updating */
|
||||||
# define T_FATE_OUTDATED 7 /* is out of date, needs updating */
|
# define T_FATE_NEEDTMP 7 /* missing temp that must be rebuild */
|
||||||
# define T_FATE_UPDATE 8 /* deps updated, needs updating */
|
# define T_FATE_OUTDATED 8 /* is out of date, needs updating */
|
||||||
|
# define T_FATE_UPDATE 9 /* deps updated, needs updating */
|
||||||
|
|
||||||
# define T_FATE_BROKEN 9 /* >= BROKEN ruins parents */
|
# define T_FATE_BROKEN 10 /* >= BROKEN ruins parents */
|
||||||
# define T_FATE_CANTFIND 9 /* no rules to make missing target */
|
# define T_FATE_CANTFIND 10 /* no rules to make missing target */
|
||||||
# define T_FATE_CANTMAKE 10 /* can't find dependents */
|
# define T_FATE_CANTMAKE 11 /* can't find dependents */
|
||||||
|
|
||||||
char progress; /* tracks make1() progress */
|
char progress; /* tracks make1() progress */
|
||||||
|
|
||||||
@@ -159,13 +164,16 @@ struct _target {
|
|||||||
char *cmds; /* type-punned command list */
|
char *cmds; /* type-punned command list */
|
||||||
} ;
|
} ;
|
||||||
|
|
||||||
RULE *bindrule( char *rulename );
|
RULE *bindrule( const char *rulename );
|
||||||
TARGET *bindtarget( char *targetname );
|
TARGET *bindtarget( const char *targetname );
|
||||||
void touchtarget( char *t );
|
TARGET *copytarget( const TARGET *t );
|
||||||
|
void touchtarget( const char *t );
|
||||||
TARGETS *targetlist( TARGETS *chain, LIST *targets );
|
TARGETS *targetlist( TARGETS *chain, LIST *targets );
|
||||||
TARGETS *targetentry( TARGETS *chain, TARGET *target );
|
TARGETS *targetentry( TARGETS *chain, TARGET *target );
|
||||||
|
TARGETS *targetchain( TARGETS *chain, TARGETS *targets );
|
||||||
ACTIONS *actionlist( ACTIONS *chain, ACTION *action );
|
ACTIONS *actionlist( ACTIONS *chain, ACTION *action );
|
||||||
SETTINGS *addsettings( SETTINGS *head, int append, char *symbol, LIST *value );
|
SETTINGS *addsettings( SETTINGS *v, int setflag, const char *sym, LIST *val );
|
||||||
|
SETTINGS *copysettings( SETTINGS *v );
|
||||||
void pushsettings( SETTINGS *v );
|
void pushsettings( SETTINGS *v );
|
||||||
void popsettings( SETTINGS *v );
|
void popsettings( SETTINGS *v );
|
||||||
void freesettings( SETTINGS *v );
|
void freesettings( SETTINGS *v );
|
||||||
|
|||||||
@@ -21,6 +21,8 @@
|
|||||||
* handle action strings (look only for the closing }) and a mode to
|
* handle action strings (look only for the closing }) and a mode to
|
||||||
* ignore most keywords when looking for a punctuation keyword. This
|
* ignore most keywords when looking for a punctuation keyword. This
|
||||||
* allows non-punctuation keywords to be used in lists without quoting.
|
* allows non-punctuation keywords to be used in lists without quoting.
|
||||||
|
*
|
||||||
|
* 11/04/02 (seiwald) - const-ing for string literals
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@@ -31,7 +33,7 @@
|
|||||||
|
|
||||||
typedef struct _YYSTYPE {
|
typedef struct _YYSTYPE {
|
||||||
int type;
|
int type;
|
||||||
char *string;
|
const char *string;
|
||||||
PARSE *parse;
|
PARSE *parse;
|
||||||
LIST *list;
|
LIST *list;
|
||||||
int number;
|
int number;
|
||||||
@@ -40,9 +42,9 @@ typedef struct _YYSTYPE {
|
|||||||
extern YYSTYPE yylval;
|
extern YYSTYPE yylval;
|
||||||
|
|
||||||
void yymode( int n );
|
void yymode( int n );
|
||||||
void yyerror( char *s );
|
void yyerror( const char *s );
|
||||||
int yyanyerrors();
|
int yyanyerrors();
|
||||||
void yyfparse( char *s );
|
void yyfparse( const char *s );
|
||||||
int yyline();
|
int yyline();
|
||||||
int yylex();
|
int yylex();
|
||||||
int yyparse();
|
int yyparse();
|
||||||
|
|||||||
@@ -4,6 +4,12 @@
|
|||||||
* This file is part of Jam - see jam.c for Copyright information.
|
* This file is part of Jam - see jam.c for Copyright information.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
/*
|
||||||
|
* search.c - find a target along $(SEARCH) or $(LOCATE)
|
||||||
|
*
|
||||||
|
* 11/04/02 (seiwald) - const-ing for string literals
|
||||||
|
*/
|
||||||
|
|
||||||
# include "jam.h"
|
# include "jam.h"
|
||||||
# include "lists.h"
|
# include "lists.h"
|
||||||
# include "search.h"
|
# include "search.h"
|
||||||
@@ -12,13 +18,9 @@
|
|||||||
# include "variable.h"
|
# include "variable.h"
|
||||||
# include "newstr.h"
|
# include "newstr.h"
|
||||||
|
|
||||||
/*
|
const char *
|
||||||
* search.c - find a target along $(SEARCH) or $(LOCATE)
|
|
||||||
*/
|
|
||||||
|
|
||||||
char *
|
|
||||||
search(
|
search(
|
||||||
char *target,
|
const char *target,
|
||||||
time_t *time )
|
time_t *time )
|
||||||
{
|
{
|
||||||
PATHNAME f[1];
|
PATHNAME f[1];
|
||||||
|
|||||||
@@ -6,6 +6,8 @@
|
|||||||
|
|
||||||
/*
|
/*
|
||||||
* search.h - find a target along $(SEARCH) or $(LOCATE)
|
* search.h - find a target along $(SEARCH) or $(LOCATE)
|
||||||
|
*
|
||||||
|
* 11/04/02 (seiwald) - const-ing for string literals
|
||||||
*/
|
*/
|
||||||
|
|
||||||
char *search( char *target, time_t *time );
|
const char *search( const char *target, time_t *time );
|
||||||
|
|||||||
+12
-10
@@ -4,6 +4,14 @@
|
|||||||
* This file is part of Jam - see jam.c for Copyright information.
|
* This file is part of Jam - see jam.c for Copyright information.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
/*
|
||||||
|
* timestamp.c - get the timestamp of a file or archive member
|
||||||
|
*
|
||||||
|
* 09/22/00 (seiwald) - downshift names on OS2, too
|
||||||
|
* 01/08/01 (seiwald) - closure param for file_dirscan/file_archscan
|
||||||
|
* 11/04/02 (seiwald) - const-ing for string literals
|
||||||
|
*/
|
||||||
|
|
||||||
# include "jam.h"
|
# include "jam.h"
|
||||||
# include "hash.h"
|
# include "hash.h"
|
||||||
# include "filesys.h"
|
# include "filesys.h"
|
||||||
@@ -11,12 +19,6 @@
|
|||||||
# include "timestamp.h"
|
# include "timestamp.h"
|
||||||
# include "newstr.h"
|
# include "newstr.h"
|
||||||
|
|
||||||
/*
|
|
||||||
* timestamp.c - get the timestamp of a file or archive member
|
|
||||||
*
|
|
||||||
* 09/22/00 (seiwald) - downshift names on OS2, too
|
|
||||||
*/
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* BINDING - all known files
|
* BINDING - all known files
|
||||||
*/
|
*/
|
||||||
@@ -24,7 +26,7 @@
|
|||||||
typedef struct _binding BINDING;
|
typedef struct _binding BINDING;
|
||||||
|
|
||||||
struct _binding {
|
struct _binding {
|
||||||
char *name;
|
const char *name;
|
||||||
short flags;
|
short flags;
|
||||||
|
|
||||||
# define BIND_SCANNED 0x01 /* if directory or arch, has been scanned */
|
# define BIND_SCANNED 0x01 /* if directory or arch, has been scanned */
|
||||||
@@ -41,9 +43,9 @@ struct _binding {
|
|||||||
} ;
|
} ;
|
||||||
|
|
||||||
static struct hash *bindhash = 0;
|
static struct hash *bindhash = 0;
|
||||||
static void time_enter( void *, char *, int , time_t );
|
static void time_enter( void *, const char *, int , time_t );
|
||||||
|
|
||||||
static char *time_progress[] =
|
static const char *time_progress[] =
|
||||||
{
|
{
|
||||||
"INIT",
|
"INIT",
|
||||||
"NOENTRY",
|
"NOENTRY",
|
||||||
@@ -162,7 +164,7 @@ timestamp(
|
|||||||
static void
|
static void
|
||||||
time_enter(
|
time_enter(
|
||||||
void *closure,
|
void *closure,
|
||||||
char *target,
|
const char *target,
|
||||||
int found,
|
int found,
|
||||||
time_t time )
|
time_t time )
|
||||||
{
|
{
|
||||||
|
|||||||
+31
-27
@@ -4,14 +4,6 @@
|
|||||||
* This file is part of Jam - see jam.c for Copyright information.
|
* This file is part of Jam - see jam.c for Copyright information.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
# include "jam.h"
|
|
||||||
# include "lists.h"
|
|
||||||
# include "parse.h"
|
|
||||||
# include "variable.h"
|
|
||||||
# include "expand.h"
|
|
||||||
# include "hash.h"
|
|
||||||
# include "newstr.h"
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* variable.c - handle jam multi-element variables
|
* variable.c - handle jam multi-element variables
|
||||||
*
|
*
|
||||||
@@ -34,8 +26,18 @@
|
|||||||
* 01/22/95 (seiwald) - split environment variables at blanks or :'s
|
* 01/22/95 (seiwald) - split environment variables at blanks or :'s
|
||||||
* 05/10/95 (seiwald) - split path variables at SPLITPATH (not :)
|
* 05/10/95 (seiwald) - split path variables at SPLITPATH (not :)
|
||||||
* 09/11/00 (seiwald) - defunct var_list() removed
|
* 09/11/00 (seiwald) - defunct var_list() removed
|
||||||
|
* 10/22/02 (seiwald) - list_new() now does its own newstr()/copystr()
|
||||||
|
* 11/04/02 (seiwald) - const-ing for string literals
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
# include "jam.h"
|
||||||
|
# include "lists.h"
|
||||||
|
# include "parse.h"
|
||||||
|
# include "variable.h"
|
||||||
|
# include "expand.h"
|
||||||
|
# include "hash.h"
|
||||||
|
# include "newstr.h"
|
||||||
|
|
||||||
static struct hash *varhash = 0;
|
static struct hash *varhash = 0;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@@ -45,12 +47,12 @@ static struct hash *varhash = 0;
|
|||||||
typedef struct _variable VARIABLE ;
|
typedef struct _variable VARIABLE ;
|
||||||
|
|
||||||
struct _variable {
|
struct _variable {
|
||||||
char *symbol;
|
const char *symbol;
|
||||||
LIST *value;
|
LIST *value;
|
||||||
} ;
|
} ;
|
||||||
|
|
||||||
static VARIABLE *var_enter( char *symbol );
|
static VARIABLE *var_enter( const char *symbol );
|
||||||
static void var_dump( char *symbol, LIST *value, char *what );
|
static void var_dump( const char *symbol, LIST *value, const char *what );
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -62,11 +64,11 @@ static void var_dump( char *symbol, LIST *value, char *what );
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
void
|
void
|
||||||
var_defines( char **e )
|
var_defines( const char **e )
|
||||||
{
|
{
|
||||||
for( ; *e; e++ )
|
for( ; *e; e++ )
|
||||||
{
|
{
|
||||||
char *val;
|
const char *val;
|
||||||
|
|
||||||
/* Just say "no": windows defines this in the env, */
|
/* Just say "no": windows defines this in the env, */
|
||||||
/* but we don't want it to override our notion of OS. */
|
/* but we don't want it to override our notion of OS. */
|
||||||
@@ -84,7 +86,7 @@ var_defines( char **e )
|
|||||||
# endif
|
# endif
|
||||||
{
|
{
|
||||||
LIST *l = L0;
|
LIST *l = L0;
|
||||||
char *pp, *p;
|
const char *pp, *p;
|
||||||
# ifdef OS_MAC
|
# ifdef OS_MAC
|
||||||
char split = ',';
|
char split = ',';
|
||||||
# else
|
# else
|
||||||
@@ -108,10 +110,10 @@ var_defines( char **e )
|
|||||||
{
|
{
|
||||||
strncpy( buf, pp, p - pp );
|
strncpy( buf, pp, p - pp );
|
||||||
buf[ p - pp ] = '\0';
|
buf[ p - pp ] = '\0';
|
||||||
l = list_new( l, newstr( buf ) );
|
l = list_new( l, buf, 0 );
|
||||||
}
|
}
|
||||||
|
|
||||||
l = list_new( l, newstr( pp ) );
|
l = list_new( l, pp, 0 );
|
||||||
|
|
||||||
/* Get name */
|
/* Get name */
|
||||||
|
|
||||||
@@ -131,7 +133,7 @@ var_defines( char **e )
|
|||||||
|
|
||||||
int
|
int
|
||||||
var_string(
|
var_string(
|
||||||
char *in,
|
const char *in,
|
||||||
char *out,
|
char *out,
|
||||||
int outsize,
|
int outsize,
|
||||||
LOL *lol )
|
LOL *lol )
|
||||||
@@ -174,13 +176,11 @@ var_string(
|
|||||||
|
|
||||||
if( dollar )
|
if( dollar )
|
||||||
{
|
{
|
||||||
LIST *l;
|
LIST *l = var_expand( L0, lastword, out, lol, 0 );
|
||||||
|
|
||||||
l = var_expand( L0, lastword, out, lol, 0 );
|
|
||||||
|
|
||||||
out = lastword;
|
out = lastword;
|
||||||
|
|
||||||
for( ; l; l = list_next( l ) )
|
while( l )
|
||||||
{
|
{
|
||||||
int so = strlen( l->string );
|
int so = strlen( l->string );
|
||||||
|
|
||||||
@@ -189,6 +189,10 @@ var_string(
|
|||||||
|
|
||||||
strcpy( out, l->string );
|
strcpy( out, l->string );
|
||||||
out += so;
|
out += so;
|
||||||
|
|
||||||
|
/* Separate with space */
|
||||||
|
|
||||||
|
if( l = list_next( l ) )
|
||||||
*out++ = ' ';
|
*out++ = ' ';
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -211,7 +215,7 @@ var_string(
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
LIST *
|
LIST *
|
||||||
var_get( char *symbol )
|
var_get( const char *symbol )
|
||||||
{
|
{
|
||||||
VARIABLE var, *v = &var;
|
VARIABLE var, *v = &var;
|
||||||
|
|
||||||
@@ -240,7 +244,7 @@ var_get( char *symbol )
|
|||||||
|
|
||||||
void
|
void
|
||||||
var_set(
|
var_set(
|
||||||
char *symbol,
|
const char *symbol,
|
||||||
LIST *value,
|
LIST *value,
|
||||||
int flag )
|
int flag )
|
||||||
{
|
{
|
||||||
@@ -278,7 +282,7 @@ var_set(
|
|||||||
|
|
||||||
LIST *
|
LIST *
|
||||||
var_swap(
|
var_swap(
|
||||||
char *symbol,
|
const char *symbol,
|
||||||
LIST *value )
|
LIST *value )
|
||||||
{
|
{
|
||||||
VARIABLE *v = var_enter( symbol );
|
VARIABLE *v = var_enter( symbol );
|
||||||
@@ -299,7 +303,7 @@ var_swap(
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
static VARIABLE *
|
static VARIABLE *
|
||||||
var_enter( char *symbol )
|
var_enter( const char *symbol )
|
||||||
{
|
{
|
||||||
VARIABLE var, *v = &var;
|
VARIABLE var, *v = &var;
|
||||||
|
|
||||||
@@ -321,9 +325,9 @@ var_enter( char *symbol )
|
|||||||
|
|
||||||
static void
|
static void
|
||||||
var_dump(
|
var_dump(
|
||||||
char *symbol,
|
const char *symbol,
|
||||||
LIST *value,
|
LIST *value,
|
||||||
char *what )
|
const char *what )
|
||||||
{
|
{
|
||||||
printf( "%s %s = ", what, symbol );
|
printf( "%s %s = ", what, symbol );
|
||||||
list_print( value );
|
list_print( value );
|
||||||
|
|||||||
@@ -6,13 +6,15 @@
|
|||||||
|
|
||||||
/*
|
/*
|
||||||
* variable.h - handle jam multi-element variables
|
* variable.h - handle jam multi-element variables
|
||||||
|
*
|
||||||
|
* 11/04/02 (seiwald) - const-ing for string literals
|
||||||
*/
|
*/
|
||||||
|
|
||||||
void var_defines( char **e );
|
void var_defines( const char **e );
|
||||||
int var_string( char *in, char *out, int outsize, LOL *lol );
|
int var_string( const char *in, char *out, int outsize, LOL *lol );
|
||||||
LIST * var_get( char *symbol );
|
LIST * var_get( const char *symbol );
|
||||||
void var_set( char *symbol, LIST *value, int flag );
|
void var_set( const char *symbol, LIST *value, int flag );
|
||||||
LIST * var_swap( char *symbol, LIST *value );
|
LIST * var_swap( const char *symbol, LIST *value );
|
||||||
void var_done();
|
void var_done();
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|||||||
+5
-6
@@ -15,13 +15,12 @@
|
|||||||
# file.y yacc grammar
|
# file.y yacc grammar
|
||||||
# filetab.h array of string <-> token mappings
|
# filetab.h array of string <-> token mappings
|
||||||
#
|
#
|
||||||
# 3-13-93
|
# 03-13-93 - Documented and p moved in sed command (for some reason,
|
||||||
# Documented and p moved in sed command (for some reason,
|
|
||||||
# s/x/y/p doesn't work).
|
# s/x/y/p doesn't work).
|
||||||
# 10-12-93
|
# 10-12-93 - Take basename as second argument.
|
||||||
# Take basename as second argument.
|
# 12-31-96 - reversed order of args to be compatible with GenFile rule
|
||||||
# 12-31-96
|
# 03/19/02 (seiwald) - suffix symbols with _t to avoid conflicts
|
||||||
# reversed order of args to be compatible with GenFile rule
|
#
|
||||||
|
|
||||||
outy=${1?}
|
outy=${1?}
|
||||||
outh=${2?}
|
outh=${2?}
|
||||||
|
|||||||
Reference in New Issue
Block a user