platform/upstream/ninja.git
10 years agoMore robust escaping of $in, $out paths
Nicholas Hutchinson [Sat, 30 Nov 2013 22:33:02 +0000 (22:33 +0000)]
More robust escaping of $in, $out paths

In summary: don’t escape if the path doesn’t contain problematic characters, otherwise:
- Shell: enclose string in single quotes, escape embedded single quotes with the magic quote-backslash-quote sequence
- Win32: Escape double quotes by doubling the number of consecutive backslashes that precede them (if any) and adding one more. Finally, double the number of trailing backslashes, and enclose the whole thing in double quotes.

10 years agoMerge pull request #691 from TheOneRing/fix-msvc13
Nico Weber [Fri, 6 Dec 2013 00:10:29 +0000 (16:10 -0800)]
Merge pull request #691 from TheOneRing/fix-msvc13

fixed platform_helper.py msvc_needs_fs test for python 3

10 years agofixed platform_helper.py msvc_needs_fs test
Patrick von Reth [Thu, 5 Dec 2013 09:37:52 +0000 (10:37 +0100)]
fixed platform_helper.py msvc_needs_fs test

10 years agoMerge pull request #688 from ndmitchell/master
Nico Weber [Mon, 18 Nov 2013 10:00:36 +0000 (02:00 -0800)]
Merge pull request #688 from ndmitchell/master

Fix up platform_helper for MSVC

10 years agoFix up platform_helper for MSVC, with Python 2.6.8 the arguments have to be in a...
Neil Mitchell [Mon, 18 Nov 2013 06:32:32 +0000 (06:32 +0000)]
Fix up platform_helper for MSVC, with Python 2.6.8 the arguments have to be in a list, not space separated (unless you set Shell to true)

10 years agoMerge pull request #683 from nico/ruletest
Evan Martin [Mon, 28 Oct 2013 17:21:12 +0000 (10:21 -0700)]
Merge pull request #683 from nico/ruletest

Add a test that shows that there is a single global namespace for rules.

10 years agoAdd a test that shows that there is a single global namespace for rules.
Nico Weber [Sun, 27 Oct 2013 19:38:34 +0000 (12:38 -0700)]
Add a test that shows that there is a single global namespace for rules.

10 years agoMerge pull request #682 from nico/pep8
Nico Weber [Sun, 27 Oct 2013 03:16:07 +0000 (20:16 -0700)]
Merge pull request #682 from nico/pep8

Wrap to 79 colums. No functionality change.

10 years agoWrap to 79 colums. No functionality change.
Nico Weber [Sun, 27 Oct 2013 03:15:23 +0000 (20:15 -0700)]
Wrap to 79 colums. No functionality change.

10 years agoMerge pull request #674 from nico/style
Nico Weber [Sat, 19 Oct 2013 18:03:51 +0000 (11:03 -0700)]
Merge pull request #674 from nico/style

Minor style fixes. No functionality change.

10 years agoMinor style fixes. No functionality change.
Nico Weber [Sat, 19 Oct 2013 18:03:15 +0000 (11:03 -0700)]
Minor style fixes. No functionality change.

10 years agoMerge pull request #665 from syntheticpp/localized-showinclude
Nico Weber [Fri, 18 Oct 2013 23:43:05 +0000 (16:43 -0700)]
Merge pull request #665 from syntheticpp/localized-showinclude

add deps_prefix for localized /showIncludes' output parsing

10 years agoadd deps_prefix for localized /showIncludes' output parsing
Peter Kümmel [Sun, 13 Oct 2013 10:20:17 +0000 (12:20 +0200)]
add deps_prefix for localized /showIncludes' output parsing

10 years agoMerge pull request #671 from sgraham/compile-vs2013
Nico Weber [Fri, 18 Oct 2013 04:16:13 +0000 (21:16 -0700)]
Merge pull request #671 from sgraham/compile-vs2013

Fix compilation on VS2013

10 years agoFix compilation on VS2013
Scott Graham [Fri, 18 Oct 2013 04:12:11 +0000 (21:12 -0700)]
Fix compilation on VS2013

10 years agomark this 1.4.0.git, update RELEASING
Evan Martin [Thu, 12 Sep 2013 02:05:21 +0000 (19:05 -0700)]
mark this 1.4.0.git, update RELEASING

10 years agoMerge pull request #657 from sgraham/keeprsp2
Nico Weber [Wed, 11 Sep 2013 21:50:04 +0000 (14:50 -0700)]
Merge pull request #657 from sgraham/keeprsp2

add -d keeprsp to preserve @rsp files on success on windows

10 years agoadd -d keeprsp to preserve @rsp files on success on windows
Scott Graham [Tue, 10 Sep 2013 22:34:01 +0000 (15:34 -0700)]
add -d keeprsp to preserve @rsp files on success on windows

10 years agoMerge pull request #655 from nico/simp
Nico Weber [Sun, 8 Sep 2013 02:16:49 +0000 (19:16 -0700)]
Merge pull request #655 from nico/simp

Simplify.

10 years agoSimplify.
Nico Weber [Sun, 8 Sep 2013 02:16:21 +0000 (19:16 -0700)]
Simplify.

10 years agoMerge pull request #654 from rgeary1/buildTestFix
Nico Weber [Sun, 8 Sep 2013 02:14:17 +0000 (19:14 -0700)]
Merge pull request #654 from rgeary1/buildTestFix

Fix for build test for BuildWithDepsLogTest.RestatMissingDepfileDepslog

10 years agoFix for build test for BuildWithDepsLogTest.RestatMissingDepfileDepslog
Richard Geary [Sat, 7 Sep 2013 14:03:00 +0000 (10:03 -0400)]
Fix for build test for BuildWithDepsLogTest.RestatMissingDepfileDepslog

10 years agoMerge pull request #653 from nico/msg
Nico Weber [Fri, 6 Sep 2013 21:37:33 +0000 (14:37 -0700)]
Merge pull request #653 from nico/msg

Make depslog v1->v3 message less scary.

10 years agoMake depslog v1->v3 message less scary.
Nico Weber [Fri, 6 Sep 2013 21:29:32 +0000 (14:29 -0700)]
Make depslog v1->v3 message less scary.

See the comment 5 lines up for details.

10 years agoMerge pull request #650 from nico/simplify
Nico Weber [Mon, 2 Sep 2013 23:10:59 +0000 (16:10 -0700)]
Merge pull request #650 from nico/simplify

Simplify.

10 years agoSimplify.
Nico Weber [Mon, 2 Sep 2013 23:09:00 +0000 (16:09 -0700)]
Simplify.

10 years agoMerge pull request #649 from nico/fff
Nico Weber [Mon, 2 Sep 2013 23:02:44 +0000 (16:02 -0700)]
Merge pull request #649 from nico/fff

Delete a line I failed to delete in d7a46654a7be1.

10 years agoDelete a line I failed to delete in d7a46654a7be1.
Nico Weber [Mon, 2 Sep 2013 23:01:46 +0000 (16:01 -0700)]
Delete a line I failed to delete in d7a46654a7be1.

10 years agoMerge pull request #648 from nico/landmaxim
Nico Weber [Mon, 2 Sep 2013 22:52:21 +0000 (15:52 -0700)]
Merge pull request #648 from nico/landmaxim

Land the majority of pull request #608.

10 years agoFix restat rebuild if deps are missing.
Maxim Kalaev [Mon, 2 Sep 2013 22:44:32 +0000 (15:44 -0700)]
Fix restat rebuild if deps are missing.

Fixes issue #603.

Apparently, the problem was caused by my fix r "consider target dirty if
depfile is missing" (bcc8ad1), which was not working correctly with
restat rules cleaning nodes.  Switching to deps only triggered an easily
observable issue.

Fix by setting a flag in edges with invalid deps, and not cleaning edges
with that flag set.

10 years agoShare more code between CleanNode() and RecomputeDirty().
Maxim Kalaev [Mon, 2 Sep 2013 22:32:19 +0000 (15:32 -0700)]
Share more code between CleanNode() and RecomputeDirty().

Move a common loop into the new function RecomputeOutputsDirty().
Simplifies things a bit, and makes it harder for the restat path to have
different behavior from the regular path.

No dramatic behavior change (the restat path now also calls
RestatIfNecessary()).

10 years agoCheck depslog timestamp in LoadDepsFromLog(), not in RecomputeOutputDirty().
Maxim Kalaev [Mon, 2 Sep 2013 22:24:26 +0000 (15:24 -0700)]
Check depslog timestamp in LoadDepsFromLog(), not in RecomputeOutputDirty().

RecomputeOutputDirty() is called from two places:

1. RecomputeDirty(), which calls LoadDeps().
2. CleanNode(), which always passes 0 for the deps mtime.

So this is no behavior change in either case.

deps_mtime was nonzero only in deps mode, and it got passed all over the
place.  This makes things simpler.

10 years agoMerge pull request #647 from bmeurer/SimplifyGetProcessorCount
Evan Martin [Mon, 2 Sep 2013 19:12:23 +0000 (12:12 -0700)]
Merge pull request #647 from bmeurer/SimplifyGetProcessorCount

Simplify implementation of GetProcessorCount().

10 years agoSimplify implementation of GetProcessorCount().
Benedikt Meurer [Sun, 1 Sep 2013 09:12:23 +0000 (11:12 +0200)]
Simplify implementation of GetProcessorCount().

The current implementation is unnecessarily complex, because:

- The BSD derived systems implement sysconf(_SC_NPROCESSORS_ONLN)
  in terms of sysctl({CTL_HW,HW_NCPU}).
- get_nprocs() is a GNU extension, and glibc implements
  sysconf(_SC_NPROCESSORS_ONLN) in terms of get_nprocs().

10 years agoMerge pull request #645 from nico/maximfix
Nico Weber [Wed, 28 Aug 2013 22:03:10 +0000 (15:03 -0700)]
Merge pull request #645 from nico/maximfix

Fix an issue with more than 64k deps, spotted by maximuska.

10 years agoFix an issue with more than 64k deps, spotted by maximuska.
Nico Weber [Wed, 28 Aug 2013 22:00:05 +0000 (15:00 -0700)]
Fix an issue with more than 64k deps, spotted by maximuska.

Also add a test for this case, which would have spotted the issue too.

10 years agoMerge pull request #644 from nico/v3
Nico Weber [Wed, 28 Aug 2013 21:05:04 +0000 (14:05 -0700)]
Merge pull request #644 from nico/v3

Deps log format v3

10 years agodocument an assumption
Nico Weber [Wed, 28 Aug 2013 21:03:53 +0000 (14:03 -0700)]
document an assumption

10 years agoDeps log format v3
Nico Weber [Wed, 28 Aug 2013 20:29:02 +0000 (13:29 -0700)]
Deps log format v3

This fixes two bugs.

1.) It makes the record size field 4 byte instead of 2, and allows a max
    record size of 512kB. This fixes #605, ninja "only" supporting 8k
    dependencies per file -- 512kB have room for 128k dependencies. (If that's
    still not enough, the current design can support at least 4x that if the
    constant is tweaked.)

2.) It makes all records 4-byte aligned, which is probably needed to make the
    `reinterpret_cast<int*>(buf)` work on SPARC (cf issue #481), and it's
    generally nicer too. (Since there's already one reinterpret_cast, convert
    a memcpy() to reinterpret_cast in another branch too).

10 years agoMerge pull request #642 from nico/depslogidx
Nico Weber [Mon, 26 Aug 2013 23:10:24 +0000 (16:10 -0700)]
Merge pull request #642 from nico/depslogidx

Suffix depslog path records with their expected index.

10 years agoSuffix depslog path records with their expected index.
Nico Weber [Mon, 26 Aug 2013 22:19:21 +0000 (15:19 -0700)]
Suffix depslog path records with their expected index.

ninja assumes that numbering path entries in the deps log in order produces
valid dense integer ids.  If two ninja processes write to the same deps log
concurrently, this is not true.  Store the expected indices of path records
in the log and treat the rest of a deps log as invalid if the dense id of a
path record doesn't match the expected id stored in the log.  Addresses the
rest of issue #595.

This requires bumping the deps log file format version.  Do not migrate the
old version to the new, as the old format did not have this protection, and
might hence contain invalid data.  (Unlikely, but possible.)

Also store the record id as one's complement, to make them look less like
regular deps record values.  Since each record is written atomically this
isn't really necessary, but it makes the format somewhat more robust (and
easier to read in a hex editor).

10 years agoMerge pull request #641 from nico/ocd2
Nico Weber [Fri, 23 Aug 2013 19:22:08 +0000 (12:22 -0700)]
Merge pull request #641 from nico/ocd2

Minor style fixes, no behavior change.

10 years agoMinor style fixes, no behavior change.
Nico Weber [Fri, 23 Aug 2013 19:20:55 +0000 (15:20 -0400)]
Minor style fixes, no behavior change.

10 years agoMerge pull request #628 from rnk/wstr
Nico Weber [Fri, 23 Aug 2013 13:59:05 +0000 (06:59 -0700)]
Merge pull request #628 from rnk/wstr

Use fwrite in the msvc tool instead of printf

10 years agoMerge pull request #640 from nico/edgetest
Nico Weber [Thu, 22 Aug 2013 23:27:29 +0000 (16:27 -0700)]
Merge pull request #640 from nico/edgetest

Add a test for issue #638.

10 years agoAdd a test for issue #638.
Nico Weber [Thu, 22 Aug 2013 23:24:04 +0000 (19:24 -0400)]
Add a test for issue #638.

10 years agoMerge pull request #639 from rgeary1/StatusMessageFix
Nico Weber [Thu, 22 Aug 2013 23:16:23 +0000 (16:16 -0700)]
Merge pull request #639 from rgeary1/StatusMessageFix

Fix for #638 incorrect number of total edges in the status message

10 years agoFix for incorrect number of total edges in the status message
Richard Geary [Thu, 22 Aug 2013 22:08:12 +0000 (18:08 -0400)]
Fix for incorrect number of total edges in the status message

10 years agoMerge branch 'master' into wstr
Reid Kleckner [Mon, 19 Aug 2013 23:44:30 +0000 (16:44 -0700)]
Merge branch 'master' into wstr

10 years agoAvoid indexing into an empty string.
Reid Kleckner [Mon, 19 Aug 2013 23:44:16 +0000 (16:44 -0700)]
Avoid indexing into an empty string.

10 years agoMerge pull request #635 from johan/patch-1
Nico Weber [Tue, 13 Aug 2013 22:49:38 +0000 (15:49 -0700)]
Merge pull request #635 from johan/patch-1

Proof reading

10 years agoProof reading
Johan Sundström [Tue, 13 Aug 2013 01:47:06 +0000 (18:47 -0700)]
Proof reading

10 years agoMerge pull request #633 from rgeary1/NestedPhonyPrintsDone
Evan Martin [Sun, 11 Aug 2013 17:02:06 +0000 (10:02 -0700)]
Merge pull request #633 from rgeary1/NestedPhonyPrintsDone

Fix : Pure nested phony rules do not print "no work to do"

10 years agoFix for missing "no work to do." message if all build edges are phony rules.
Richard Geary [Sun, 11 Aug 2013 00:14:49 +0000 (20:14 -0400)]
Fix for missing "no work to do." message if all build edges are phony rules.
Added NestedPhonyPrintsDone unit test

10 years agoAdd to .gitignore : SublimeText project files, *.patch files, ..ninja_deps, .ninja_log
Richard Geary [Sun, 11 Aug 2013 00:13:41 +0000 (20:13 -0400)]
Add to .gitignore : SublimeText project files, *.patch files, ..ninja_deps, .ninja_log

10 years agoMerge pull request #631 from kimgr/master
Evan Martin [Wed, 7 Aug 2013 16:19:47 +0000 (09:19 -0700)]
Merge pull request #631 from kimgr/master

Fix tabs/spaces inconsistency.

10 years agoFix tabs/spaces inconsistency.
Kim Grasman [Mon, 5 Aug 2013 15:52:51 +0000 (17:52 +0200)]
Fix tabs/spaces inconsistency.

11 years agoMerge pull request #627 from idealisms/master
Evan Martin [Fri, 26 Jul 2013 22:32:39 +0000 (15:32 -0700)]
Merge pull request #627 from idealisms/master

Fix the browse tool.

11 years agoUse fwrite in the msvc tool instead of printf
Reid Kleckner [Fri, 26 Jul 2013 22:27:30 +0000 (15:27 -0700)]
Use fwrite in the msvc tool instead of printf

This allows wide characters from the compiler to propagate through the
msvc tool.  Similar to ad76e867f782e75e0fed620e7b39f7099af154a9.

11 years agoFix the browse tool.
Tony Chang [Fri, 26 Jul 2013 21:24:52 +0000 (14:24 -0700)]
Fix the browse tool.

ReadFlags was altering argv in real_main causing us
to pass the wrong value into the NinjaMain constructor.
Fix this by storing the ninja command before real_main
runs.

11 years agoMerge pull request #626 from nico/logwrite
Evan Martin [Wed, 24 Jul 2013 22:38:12 +0000 (15:38 -0700)]
Merge pull request #626 from nico/logwrite

Build log write error checking.

11 years agoBuild log write error checking.
Nico Weber [Wed, 24 Jul 2013 21:07:12 +0000 (14:07 -0700)]
Build log write error checking.

Like f6f00aa40f0c541df06, but for the build log instead of the deps log.

11 years agoMerge pull request #612 from maximuska/proposed/deps_log_write_errors_checking
Nico Weber [Wed, 24 Jul 2013 20:30:29 +0000 (13:30 -0700)]
Merge pull request #612 from maximuska/proposed/deps_log_write_errors_checking

Proposed/deps log write errors checking

11 years agoMerge pull request #625 from nico/land
Nico Weber [Sat, 20 Jul 2013 19:14:07 +0000 (12:14 -0700)]
Merge pull request #625 from nico/land

Merge pull request #617.

11 years agoAdd test for correct restat logic
Chris Hopman [Tue, 16 Jul 2013 23:00:28 +0000 (16:00 -0700)]
Add test for correct restat logic

When a single output of an edge is dirty, the restat check should
leave all outputs of that edge dirty.

11 years agoFix restat dirty check logic for edges with multiple outputs
Chris Hopman [Wed, 3 Jul 2013 21:26:25 +0000 (14:26 -0700)]
Fix restat dirty check logic for edges with multiple outputs

In a normal dependency scan (see DependencyScan::RecomputeDirty) we mark
all outputs of an Edge as dirty if any of the outputs is dirty.  This is
the correct behavior because if any output is dirty, we will run the
command for that Edge and that can touch any of the outputs of the Edge
and so all the outputs should be marked dirty.

When updating the dirty state of Node's for a restat check, we were not
applying this logic, instead only those outputs that were actually
"dirty" were marked dirty.

Before this patch, restat edges with multiple outputs caused not all
dependent edges to run.

11 years agoMerge pull request #624 from nico/landmaxim
Nico Weber [Sat, 20 Jul 2013 04:47:00 +0000 (21:47 -0700)]
Merge pull request #624 from nico/landmaxim

Land the first two commits of pull request #608.

11 years agominor: removing noop call to MarkDirty(), fixing comment
Maxim Kalaev [Fri, 28 Jun 2013 17:48:30 +0000 (20:48 +0300)]
minor: removing noop call to MarkDirty(), fixing comment

11 years agoRemoving a redundant stat() call with 'deps' and 'restat = 1'
Maxim Kalaev [Thu, 27 Jun 2013 18:55:38 +0000 (21:55 +0300)]
Removing a redundant stat() call with 'deps' and 'restat = 1'

11 years agoMerge pull request #623 from nico/fix
Nico Weber [Fri, 19 Jul 2013 00:54:33 +0000 (17:54 -0700)]
Merge pull request #623 from nico/fix

Fix diagnostic formatting regression caused by adaa91a33eb2cf23b88.

11 years agoFix diagnostic formatting regression caused by adaa91a33eb2cf23b88.
Nico Weber [Fri, 19 Jul 2013 00:51:10 +0000 (17:51 -0700)]
Fix diagnostic formatting regression caused by adaa91a33eb2cf23b88.

Ninja regressed to include a location for every file on the include stack for
nested diagnostics, i.e. it would print:

  input:1: include.ninja:1: expected path

Fix this so that it prints only the current file location, like it used to:

  include.ninja:1: expected path

Also add a test for this.

11 years agoMerge pull request #622 from nico/test
Nico Weber [Thu, 18 Jul 2013 21:41:16 +0000 (14:41 -0700)]
Merge pull request #622 from nico/test

Add test for a manifest ending in the middle of a keyword.

11 years agoAdd test for a manifest ending in the middle of a keyword.
Nico Weber [Thu, 18 Jul 2013 21:39:41 +0000 (14:39 -0700)]
Add test for a manifest ending in the middle of a keyword.

11 years agoMerge pull request #621 from nico/ninjaload
Evan Martin [Thu, 18 Jul 2013 20:36:58 +0000 (13:36 -0700)]
Merge pull request #621 from nico/ninjaload

Reuse ManifestParser::Load() in ManifestParser::ParseFileInclude().

11 years agoAdd back contents.resize(), but with a comment and just 1 instead of 10.
Nico Weber [Thu, 18 Jul 2013 00:55:36 +0000 (17:55 -0700)]
Add back contents.resize(), but with a comment and just 1 instead of 10.

11 years agoLet the ".ninja parse" metric include the time to read the toplevel ninja file.
Nico Weber [Thu, 11 Jul 2013 00:43:29 +0000 (17:43 -0700)]
Let the ".ninja parse" metric include the time to read the toplevel ninja file.

Loads of included ninja files were covered by the ".ninja parse" in Parse()
further up the stack from the toplevel file, but the load of the toplevel
file wasn't counted. Fix that.

11 years agoReuse ManifestParser::Load() in ManifestParser::ParseFileInclude().
Nico Weber [Thu, 11 Jul 2013 00:30:16 +0000 (17:30 -0700)]
Reuse ManifestParser::Load() in ManifestParser::ParseFileInclude().

ParseFileInclude() was doing the work that Load() was doing. Instead, just
make it call Load().

Also, remove a FIXME about using ReadPath() in ParseFileInclude() -- it's
already being used. (The FIXME was added in the same commit that added the
call to ReadPath() -- 8a0c96075786c19 -- it probably should've been deleted
before that commit.)

Also, remove a `contents.resize(contents.size() + 10);`. It's not clear what
it's for, but if it was important then ManifestParser::ParseFileInclude()
would have needed that call too, and it didn't have it.

No intended behavior change.

11 years agoMerge pull request #616 from nico/recompact
Evan Martin [Mon, 8 Jul 2013 20:55:23 +0000 (13:55 -0700)]
Merge pull request #616 from nico/recompact

Add a 'recompact' tool, which forces recompaction of the build and deps ...

11 years agoMerge pull request #614 from nico/pooldoc
Evan Martin [Mon, 8 Jul 2013 20:53:22 +0000 (13:53 -0700)]
Merge pull request #614 from nico/pooldoc

Mention pools in the discussion of ninja's toplevel declarations.

11 years agoMerge pull request #611 from nico/testparse
Evan Martin [Mon, 8 Jul 2013 20:53:04 +0000 (13:53 -0700)]
Merge pull request #611 from nico/testparse

Improve error message for duplicate rules and unknown pools.

11 years agoIntroducing tool 'deps' dumping ninja deps log entries
Maxim Kalaev [Sun, 30 Jun 2013 19:59:54 +0000 (22:59 +0300)]
Introducing tool 'deps' dumping ninja deps log entries

11 years agoAdd a 'recompact' tool, which forces recompaction of the build and deps logs.
Nico Weber [Mon, 8 Jul 2013 19:34:46 +0000 (12:34 -0700)]
Add a 'recompact' tool, which forces recompaction of the build and deps logs.

This is useful for performance comparisons between two build directories.

11 years agoMerge pull request #615 from mdempsky/strict-murmur
Nico Weber [Mon, 8 Jul 2013 18:58:18 +0000 (11:58 -0700)]
Merge pull request #615 from mdempsky/strict-murmur

Fix murmur hash implementations to work on strict alignment architectures

11 years agoFix murmur hash implementations to work on strict alignment
Matthew Dempsky [Mon, 8 Jul 2013 17:47:57 +0000 (10:47 -0700)]
Fix murmur hash implementations to work on strict alignment
architectures like OpenBSD/mips64el and OpenBSD/hppa64.

11 years agoMention pools in the discussion of ninja's toplevel declarations.
Nico Weber [Sun, 7 Jul 2013 19:22:38 +0000 (12:22 -0700)]
Mention pools in the discussion of ninja's toplevel declarations.

11 years agoImprove error message for duplicate rules and unknown pools.
Nico Weber [Tue, 2 Jul 2013 22:43:40 +0000 (15:43 -0700)]
Improve error message for duplicate rules and unknown pools.

Also add more tests for invalid manifests. According to gcov, these invalid
inputs weren't tested before.

11 years agoMerge pull request #610 from rnk/wstr
Nico Weber [Tue, 2 Jul 2013 18:13:00 +0000 (11:13 -0700)]
Merge pull request #610 from rnk/wstr

Use fwrite to print whatever the subcommand wrote

11 years agoUse fwrite to print whatever the subcommand wrote
Reid Kleckner [Tue, 2 Jul 2013 06:00:22 +0000 (02:00 -0400)]
Use fwrite to print whatever the subcommand wrote

Subcommands can write things like UTF-16, which some terminals can
understand.  printf() will interpret the null bytes as the end of the
string.

In particular, MSVC's assert() will print wide characters by default,
and I can't find a way to disable it, leading to clang assertion
failures looking like:
  FAILED: ...clang.exe ...
  Aninja: build stopped: subcommand failed.

With this fix, I get the desired:
  FAILED: ...clang.exe ...
  Assertion failed: SymbolMap...
  ninja: build stopped: subcommand failed.

11 years agoMerge pull request #607 from dajohi/master
Nico Weber [Mon, 1 Jul 2013 21:34:05 +0000 (14:34 -0700)]
Merge pull request #607 from dajohi/master

Support Bitrig

11 years agoAdding checks for record overflow in deps_log
Maxim Kalaev [Mon, 1 Jul 2013 21:09:43 +0000 (00:09 +0300)]
Adding checks for record overflow in deps_log

11 years agouse !defined(NOT_PPOLL)
David Hill [Mon, 1 Jul 2013 20:05:30 +0000 (16:05 -0400)]
use !defined(NOT_PPOLL)

11 years agoAdding error checking on fwrite/fflush in deps_log
Maxim Kalaev [Mon, 1 Jul 2013 18:33:12 +0000 (21:33 +0300)]
Adding error checking on fwrite/fflush in deps_log

11 years agoExclude Windows as well
David Hill [Mon, 1 Jul 2013 18:11:05 +0000 (14:11 -0400)]
Exclude Windows as well

11 years agough, missing #
David Hill [Sat, 29 Jun 2013 23:21:15 +0000 (19:21 -0400)]
ugh, missing #

11 years agocleanup based on comments from martine
David Hill [Sat, 29 Jun 2013 23:16:51 +0000 (19:16 -0400)]
cleanup based on comments from martine

11 years agosupport Bitrig
David Hill [Sat, 29 Jun 2013 21:34:51 +0000 (17:34 -0400)]
support Bitrig

11 years agoMerge pull request #601 from nico/109fix
Nico Weber [Sat, 22 Jun 2013 00:42:15 +0000 (17:42 -0700)]
Merge pull request #601 from nico/109fix

Add stdlib.h include for atol().

11 years agoAdd stdlib.h include for atol().
Nico Weber [Sat, 22 Jun 2013 00:40:40 +0000 (17:40 -0700)]
Add stdlib.h include for atol().

This attempts to fix issue #600. `man atol` claims that atol() is in
stdlib.h, which wasn't included yet.

11 years agoMerge pull request #596 from nico/chunk
Evan Martin [Fri, 14 Jun 2013 06:17:10 +0000 (23:17 -0700)]
Merge pull request #596 from nico/chunk

Make sure to not write partial deps entries.

11 years agoMake sure to not write partial deps entries.
Nico Weber [Fri, 14 Jun 2013 05:11:34 +0000 (22:11 -0700)]
Make sure to not write partial deps entries.

When two ninja instances run in parallel in the same build directory,
one instance could write a deps entry header and a few ids, and then the
other instance could write a file name in the middle of the deps header.
When ninja reads this deps log on the next run, it will deserialize the
file name as indices, which will cause an out-of-bounds read.

(This can happen if a user runs a "compile this file" that uses ninja to
compile the current buffer in an editor, and also does a full build in a
terminal at the same time for example.)

While running two ninja instances in parallel in the same build
directory isn't a good idea, it happens to mostly work in non-deps mode:
There's redundant edge execution, but nothing crashes. This is partially
because the command log is line-buffered and a single log entry only
consists of a single line.

This change makes sure that deps entries are always written in one go,
like command log entries currently are. Running two ninja binaries in
parallel on the same build directory still isn't a great idea, but it's
less likely to lead to crashes.

See issue #595.