From: JinWang An Date: Tue, 3 Aug 2021 07:18:22 +0000 (+0900) Subject: Imported Upstream version 3.3.6 X-Git-Tag: upstream/3.3.6^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=555d6df1f551e41988d10592a76ea287ff6ead38;p=platform%2Fupstream%2Fccache.git Imported Upstream version 3.3.6 --- diff --git a/AUTHORS.html b/AUTHORS.html index 8894164..b0d38b3 100644 --- a/AUTHORS.html +++ b/AUTHORS.html @@ -734,7 +734,7 @@ asciidoc.install(2);

ccache authors

-version 3.3.5 +version 3.3.6

Table of Contents

@@ -924,7 +924,7 @@ Leanid Chaika <leanid.chaika@gmail.c

-LuboÅ¡ LuÅÃ¡k <l.lunak@suse.cz> +LuboÅ¡ LuÅÃ¡k <l.lunak@centrum.cz>

@@ -1105,9 +1105,9 @@ Yiding Jia <yiding@fb.com>

diff --git a/AUTHORS.txt b/AUTHORS.txt index 0dc0670..dc2cec4 100644 --- a/AUTHORS.txt +++ b/AUTHORS.txt @@ -41,7 +41,7 @@ ccache is a collective work with contributions from many people, including: * Lalit Chhabra * Lars GustÃ¤bel * Leanid Chaika -* LuboÅ¡ LuÅÃ¡k +* LuboÅ¡ LuÅÃ¡k * Mark Starovoytov * Martin Pool * Matthias Kretz diff --git a/LICENSE.html b/LICENSE.html index 3f7ee31..0673b9c 100644 --- a/LICENSE.html +++ b/LICENSE.html @@ -734,7 +734,7 @@ asciidoc.install(2);

ccache copyright and license

-version 3.3.5 +version 3.3.5+dirty

Table of Contents

@@ -1205,9 +1205,9 @@ following license:

diff --git a/MANUAL.html b/MANUAL.html index 3bf053d..5b0c105 100644 --- a/MANUAL.html +++ b/MANUAL.html @@ -734,7 +734,7 @@ asciidoc.install(2);

CCACHE(1)

-version 3.3.5 +version 3.3.6

Table of Contents

@@ -1087,12 +1087,12 @@ setting key.

rewrites absolute paths into relative paths before computing the hash that identifies the compilation, but only for paths under the specified directory. If set to the empty string (which is the default), no rewriting - is done. See also the discussion under - COMPILING IN DIFFERENT DIRECTORIES. - If using GCC or newer versions of Clang, you might want to look into the - -fdebug-prefix-map=old=new option for relocating debug info to a common - prefix (mapping prefix with old=new). + is done. A typical path to use as the base directory is your home directory + or another directory that is a parent of your build directories. Don’t use + / as the base directory since that will make ccache also rewrite paths to + system header files, which doesn’t gain anything.

See also the discussion under COMPILING IN DIFFERENT DIRECTORIES.

cache_dir (CCACHE_DIR) @@ -1302,6 +1302,8 @@ the prefix_command setting if possible. See when generating debug info (compiler option -g with variations). Exception: The CWD will not be included in the hash if base_dir is set (and matches the CWD) and the compiler option -fdebug-prefix-map is used. + See also the discussion under + COMPILING IN DIFFERENT DIRECTORIES.

The reason for including the CWD in the hash by default is to prevent a problem with the storage of the current working directory in the debug info of an @@ -1991,7 +1993,7 @@ the cache.

Compiling in different directories

Some information included in the hash that identifies a unique compilation may +

Some information included in the hash that identifies a unique compilation can contain absolute paths:

@@ -2003,8 +2005,8 @@ The preprocessed source code may contain absolute paths to include files if
-Paths specified by compiler options (such as -I, -MF, etc) may be - absolute. +Paths specified by compiler options (such as -I, -MF, etc) on the command + line may be absolute.
@@ -2018,29 +2020,39 @@ The source code file path may be absolute, and that path may substituted for
This means that if you compile the same code in different locations, you can’t share compilation results between the different build directories since you get cache misses because of the absolute build directory paths that are part of the -hash. To mitigate this problem, you can specify a “base directory” in the -configuration setting base_dir to an absolute path to the directory. ccache -will then rewrite absolute paths that are under the base directory (i.e., paths -that have the base directory as a prefix) to relative paths when constructing -the hash. A typical path to use as the base directory is your home directory or -another directory that is a parent of your build directories. (Don’t use / as -the base directory since that will make ccache also rewrite paths to system -header files, which doesn’t gain anything.)
-
The drawbacks of using a base directory are:
+hash.

Here’s what can be done to enable cache hits between different build +directories:

+
+If you build with -g (or similar) to add debug information to the object + file, you must either: +
+
+
- -If you specify an absolute path to the source code file, __FILE__ macros - will be expanded to a relative path instead. +use the -fdebug-prefix-map=old=new option for relocating debug info to + a common prefix (e.g. -fdebug-prefix-map=$PWD=.); or
- -If you specify an absolute path to the source code file and compile with - -g, the source code path stored in the object file may point to the wrong - directory, which may prevent debuggers like GDB from finding the source code. - Sometimes, a work-around is to change the directory explicitly with the - “cd” command in GDB. +set hash_dir = false. +
  +
+
+
+
+If you use absolute paths anywhere on the command line (e.g. the source code + file path or an argument to compiler options like -I and -MF), you must + to set base_dir to an absolute path to a “base directory”. ccache will + then rewrite absolute paths under that directory to relative before computing + the hash.

@@ -2419,9 +2431,9 @@ maintained by Joel Rosdahl. See AUTHORS.txt or AUTHORS.html and

diff --git a/MANUAL.txt b/MANUAL.txt index 1d4127d..c6ebca3 100644 --- a/MANUAL.txt +++ b/MANUAL.txt @@ -242,11 +242,13 @@ setting key. rewrites absolute paths into relative paths before computing the hash that identifies the compilation, but only for paths under the specified directory. If set to the empty string (which is the default), no rewriting - is done. See also the discussion under - <<_compiling_in_different_directories,COMPILING IN DIFFERENT DIRECTORIES>>. - If using GCC or newer versions of Clang, you might want to look into the - *-fdebug-prefix-map=old=new* option for relocating debug info to a common - prefix (mapping prefix with old=new). + is done. A typical path to use as the base directory is your home directory + or another directory that is a parent of your build directories. Don't use + +/+ as the base directory since that will make ccache also rewrite paths to + system header files, which doesn't gain anything. ++ +See also the discussion under <<_compiling_in_different_directories,COMPILING +IN DIFFERENT DIRECTORIES>>. *cache_dir* (*CCACHE_DIR*):: @@ -381,6 +383,8 @@ WRAPPERS>>. when generating debug info (compiler option *-g* with variations). Exception: The CWD will not be included in the hash if *base_dir* is set (and matches the CWD) and the compiler option *-fdebug-prefix-map* is used. + See also the discussion under + <<_compiling_in_different_directories,COMPILING IN DIFFERENT DIRECTORIES>>. + The reason for including the CWD in the hash by default is to prevent a problem with the storage of the current working directory in the debug info of an @@ -822,14 +826,14 @@ the cache. Compiling in different directories ---------------------------------- -Some information included in the hash that identifies a unique compilation may +Some information included in the hash that identifies a unique compilation can contain absolute paths: * The preprocessed source code may contain absolute paths to include files if the compiler option *-g* is used or if absolute paths are given to *-I* and similar compiler options. -* Paths specified by compiler options (such as *-I*, *-MF*, etc) may be - absolute. +* Paths specified by compiler options (such as *-I*, *-MF*, etc) on the command + line may be absolute. * The source code file path may be absolute, and that path may substituted for *\_\_FILE__* macros in the source code or included in warnings emitted to standard error by the preprocessor. @@ -837,24 +841,24 @@ contain absolute paths: This means that if you compile the same code in different locations, you can't share compilation results between the different build directories since you get cache misses because of the absolute build directory paths that are part of the -hash. To mitigate this problem, you can specify a ``base directory'' in the -configuration setting *base_dir* to an absolute path to the directory. ccache -will then rewrite absolute paths that are under the base directory (i.e., paths -that have the base directory as a prefix) to relative paths when constructing -the hash. A typical path to use as the base directory is your home directory or -another directory that is a parent of your build directories. (Don't use +/+ as -the base directory since that will make ccache also rewrite paths to system -header files, which doesn't gain anything.) - -The drawbacks of using a base directory are: - -* If you specify an absolute path to the source code file, *\_\_FILE__* macros - will be expanded to a relative path instead. -* If you specify an absolute path to the source code file and compile with - *-g*, the source code path stored in the object file may point to the wrong - directory, which may prevent debuggers like GDB from finding the source code. - Sometimes, a work-around is to change the directory explicitly with the - ``cd'' command in GDB. +hash. + +Here's what can be done to enable cache hits between different build +directories: + +* If you build with *-g* (or similar) to add debug information to the object + file, you must either: ++ +-- +** use the *-fdebug-prefix-map=_old_=_new_* option for relocating debug info to + a common prefix (e.g. *-fdebug-prefix-map=$PWD=.*); or +** set *hash_dir = false*. +-- +* If you use absolute paths anywhere on the command line (e.g. the source code + file path or an argument to compiler options like *-I* and *-MF*), you must + to set *base_dir* to an absolute path to a ``base directory''. ccache will + then rewrite absolute paths under that directory to relative before computing + the hash. Precompiled headers diff --git a/NEWS.html b/NEWS.html index 24de53d..396f60d 100644 --- a/NEWS.html +++ b/NEWS.html @@ -734,7 +734,7 @@ asciidoc.install(2);

ccache news

-version 3.3.5 +version 3.3.6

Table of Contents

@@ -742,11 +742,38 @@ asciidoc.install(2);

ccache 3.3.6

Release date: 2018-01-28

New features and improvements

+
+Improved instructions on how to get cache hits between different working + directories. +
+

Bug fixes

+
+Fixed regression in ccache 3.3.5 related to the UNCACHED_ERR_FD feature. +
+

ccache 3.3.5

Release date: 2018-01-13

New features and improvements

@@ -756,7 +783,7 @@ Documented how automatic cache cleanup works.

Bug fixes

@@ -829,7 +856,7 @@ Fixed a bug where ccache would skip hashing the compiler argument following a
Release date: 2017-02-17
-
New features and improvements
+
New features and improvements
- @@ -839,7 +866,7 @@ Documented the different cache statistics counters.
-
Bug fixes
+
Bug fixes
- @@ -869,7 +896,7 @@ Fixed undefined behavior warnings in ccache found by -fsanitize=undefined<
  Release date: 2016-10-26 -Bug fixes +Bug fixes @@ -886,7 +913,7 @@ ccache now detects usage of .incbin assembler directives in the sou Release date: 2016-09-28 -Bug fixes +Bug fixes @@ -911,7 +938,7 @@ Fixed a regression in ccache 3.3.1: ccache could get confused when using the Release date: 2016-09-07 -Bug fixes +Bug fixes @@ -946,7 +973,7 @@ A C99-compatible compiler is now required to build ccache. -New features and improvements +New features and improvements @@ -1093,7 +1120,7 @@ Increased buffer size used when reading file data. This improves performance -Bug fixes +Bug fixes @@ -1119,7 +1146,7 @@ Fixed build and test for MinGW32 and Windows. Release date: 2016-09-28 -Bug fixes +Bug fixes @@ -1137,7 +1164,7 @@ Fixed a regression in ccache 3.2.8: ccache could get confused when using the Release date: 2016-09-07 -Bug fixes +Bug fixes @@ -1161,7 +1188,7 @@ ccache now understands the undocumented -coverage (only one dash) G Release date: 2016-07-20 -Bug fixes +Bug fixes @@ -1184,7 +1211,7 @@ ccache now knows how to work around a glitch in the output of GCC 6’s Release date: 2016-07-12 -Bug fixes +Bug fixes @@ -1213,7 +1240,7 @@ Fixed a bug where (due to ccache rewriting paths) the compiler could choose Release date: 2016-04-17 -New features and improvements +New features and improvements @@ -1234,7 +1261,7 @@ Made it harder to misinterpret documentation of boolean environment settings' -Bug fixes +Bug fixes @@ -1294,7 +1321,7 @@ The man page is now built when running “make install” from Git repos Release date: 2015-10-08 -Bug fixes +Bug fixes @@ -1339,7 +1366,7 @@ Fixed a bug where cache cleanup could be run too early for caches larger than Release date: 2015-08-16 -New features and improvements +New features and improvements @@ -1349,7 +1376,7 @@ Added support for compiler option -gsplit-dwarf. -Bug fixes +Bug fixes @@ -1386,7 +1413,7 @@ Only log "Disabling direct mode" once when failing to read potential include Release date: 2015-05-10 -New features and improvements +New features and improvements @@ -1403,7 +1430,7 @@ Add support for caching code coverage results (compiling for gcov). -Bug fixes +Bug fixes @@ -1474,7 +1501,7 @@ Fixed build error when compiling ccache with recent clang versions. Release date: 2014-12-10 -Bug fixes +Bug fixes @@ -1515,7 +1542,7 @@ Added missing documentation for max_files and max_size Release date: 2014-11-17 -New features and improvements +New features and improvements @@ -1706,7 +1733,7 @@ Various other improvements of the test suite. -Bug fixes +Bug fixes @@ -1737,7 +1764,7 @@ Fixed test suite failures when CC is a ccache-wrapped compiler. Release date: 2016-07-12 -Bug fixes +Bug fixes @@ -1755,7 +1782,7 @@ Fixed a bug where (due to ccache rewriting paths) the compiler could choose Release date: 2015-03-07 -Bug fixes +Bug fixes @@ -1786,7 +1813,7 @@ Don’t try to reset a non-existing stats file. This avoids “No such f Release date: 2014-10-19 -New features and improvements +New features and improvements @@ -1838,7 +1865,7 @@ Stale files in the internal temporary directory (<ccache_dir>/tmp -Bug fixes +Bug fixes @@ -1878,7 +1905,7 @@ Fixed problem with logging of current working directory. Release date: 2013-01-06 -Bug fixes +Bug fixes @@ -1928,7 +1955,7 @@ Fixed test suite to work on ecryptfs. Release date: 2012-08-11 -New features and improvements +New features and improvements @@ -1949,7 +1976,7 @@ Clang plugins are now hashed to catch plugin upgrades. -Bug fixes +Bug fixes @@ -1997,7 +2024,7 @@ Fixed static_assert macro definition clash with GCC 4.7. Release date: 2012-01-08 -Bug fixes +Bug fixes @@ -2070,7 +2097,7 @@ Improved documentation on how to fix bad object files in the cache. Release date: 2011-08-21 -New features and improvements +New features and improvements @@ -2080,7 +2107,7 @@ Rewrite argument to --sysroot if CCACHE_BASEDIR is use -Bug fixes +Bug fixes @@ -2101,7 +2128,7 @@ Fixed alignment of “called for preprocessing” counter. Release date: 2011-05-29 -New features and improvements +New features and improvements @@ -2133,7 +2160,7 @@ Improved order of statistics counters in ccache -s output. -Bug fixes +Bug fixes @@ -2166,7 +2193,7 @@ Systems that lack (and don’t need to be linked with) libm are now supporte Release date: 2011-01-09 -Bug fixes +Bug fixes @@ -2199,7 +2226,7 @@ The file handle in now correctly closed on write error when trying to create Release date: 2010-11-28 -Bug fixes +Bug fixes @@ -2226,7 +2253,7 @@ Portability fixes for HP-UX 11.00 and other esoteric systems. Release date: 2010-11-21 -Bug fixes +Bug fixes @@ -2274,7 +2301,7 @@ The test suite now also works on systems that lack a /dev/zero. Release date: 2010-11-07 -Bug fixes +Bug fixes @@ -2328,7 +2355,7 @@ Minor debug log message improvements. Release date: 2010-09-16 -New features and improvements +New features and improvements @@ -2396,7 +2423,7 @@ Added -install_name as an option known to take an argument. (This i -Bug fixes +Bug fixes @@ -2482,7 +2509,7 @@ New HACKING.txt file with some notes about ccache code conventions. Release date: 2010-07-15 -Bug fixes +Bug fixes @@ -2528,7 +2555,7 @@ The way the hashes are calculated has changed, so you won’t get cache hits -New features and improvements +New features and improvements @@ -2671,7 +2698,7 @@ The following options are no longer hashed in the preprocessor mode: -Bug fixes +Bug fixes @@ -2816,9 +2843,9 @@ Statistics counters are now correctly updated for -E option failures and -Version 3.3.5 +Version 3.3.6 Last updated - 2018-01-13 17:52:20 CET + 2018-01-28 16:21:15 CET diff --git a/NEWS.txt b/NEWS.txt index 96bdd04..7c6f042 100644 --- a/NEWS.txt +++ b/NEWS.txt @@ -1,6 +1,23 @@ ccache news =========== +ccache 3.3.6 +------------ +Release date: 2018-01-28 + +New features and improvements +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +- Improved instructions on how to get cache hits between different working + directories. + + +Bug fixes +~~~~~~~~~ + +- Fixed regression in ccache 3.3.5 related to the `UNCACHED_ERR_FD` feature. + + ccache 3.3.5 ------------ Release date: 2018-01-13 diff --git a/ccache.1 b/ccache.1 index 433cf39..03398d6 100644 --- a/ccache.1 +++ b/ccache.1 @@ -2,12 +2,12 @@ .\" Title: ccache .\" Author: [see the "Author" section] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 01/13/2018 +.\" Date: 01/28/2018 .\" Manual: ccache Manual -.\" Source: ccache 3.3.5 +.\" Source: ccache 3.3.6 .\" Language: English .\" -.TH "CCACHE" "1" "01/13/2018" "ccache 3\&.3\&.5" "ccache Manual" +.TH "CCACHE" "1" "01/28/2018" "ccache 3\&.3\&.6" "ccache Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -371,10 +371,12 @@ Below is a list of available configuration settings\&. The corresponding environ .PP \fBbase_dir\fR (\fBCCACHE_BASEDIR\fR) .RS 4 -This setting should be an absolute path to a directory\&. ccache then rewrites absolute paths into relative paths before computing the hash that identifies the compilation, but only for paths under the specified directory\&. If set to the empty string (which is the default), no rewriting is done\&. See also the discussion under -COMPILING IN DIFFERENT DIRECTORIES\&. If using GCC or newer versions of Clang, you might want to look into the -\fB\-fdebug\-prefix\-map=old=new\fR -option for relocating debug info to a common prefix (mapping prefix with old=new)\&. +This setting should be an absolute path to a directory\&. ccache then rewrites absolute paths into relative paths before computing the hash that identifies the compilation, but only for paths under the specified directory\&. If set to the empty string (which is the default), no rewriting is done\&. A typical path to use as the base directory is your home directory or another directory that is a parent of your build directories\&. Don\(cqt use +/ +as the base directory since that will make ccache also rewrite paths to system header files, which doesn\(cqt gain anything\&. +.sp +See also the discussion under +COMPILING IN DIFFERENT DIRECTORIES\&. .RE .PP \fBcache_dir\fR (\fBCCACHE_DIR\fR) @@ -511,7 +513,8 @@ with variations)\&. Exception: The CWD will not be included in the hash if \fBbase_dir\fR is set (and matches the CWD) and the compiler option \fB\-fdebug\-prefix\-map\fR -is used\&. +is used\&. See also the discussion under +COMPILING IN DIFFERENT DIRECTORIES\&. .sp The reason for including the CWD in the hash by default is to prevent a problem with the storage of the current working directory in the debug info of an object file, which can lead ccache to return a cached object file that has the working directory in the debug info set incorrectly\&. .sp @@ -1294,7 +1297,7 @@ any standard error output generated by the preprocessor Based on the hash, the cached compilation result can be looked up directly in the cache\&. .SH "COMPILING IN DIFFERENT DIRECTORIES" .sp -Some information included in the hash that identifies a unique compilation may contain absolute paths: +Some information included in the hash that identifies a unique compilation can contain absolute paths: .sp .RS 4 .ie n \{\ @@ -1321,7 +1324,7 @@ and similar compiler options\&. .\} Paths specified by compiler options (such as \fB\-I\fR, -\fB\-MF\fR, etc) may be absolute\&. +\fB\-MF\fR, etc) on the command line may be absolute\&. .RE .sp .RS 4 @@ -1337,9 +1340,9 @@ The source code file path may be absolute, and that path may substituted for macros in the source code or included in warnings emitted to standard error by the preprocessor\&. .RE .sp -This means that if you compile the same code in different locations, you can\(cqt share compilation results between the different build directories since you get cache misses because of the absolute build directory paths that are part of the hash\&. To mitigate this problem, you can specify a \(lqbase directory\(rq in the configuration setting \fBbase_dir\fR to an absolute path to the directory\&. ccache will then rewrite absolute paths that are under the base directory (i\&.e\&., paths that have the base directory as a prefix) to relative paths when constructing the hash\&. A typical path to use as the base directory is your home directory or another directory that is a parent of your build directories\&. (Don\(cqt use / as the base directory since that will make ccache also rewrite paths to system header files, which doesn\(cqt gain anything\&.) +This means that if you compile the same code in different locations, you can\(cqt share compilation results between the different build directories since you get cache misses because of the absolute build directory paths that are part of the hash\&. .sp -The drawbacks of using a base directory are: +Here\(cqs what can be done to enable cache hits between different build directories: .sp .RS 4 .ie n \{\ @@ -1349,9 +1352,22 @@ The drawbacks of using a base directory are: .sp -1 .IP \(bu 2.3 .\} -If you specify an absolute path to the source code file, -\fB__FILE__\fR -macros will be expanded to a relative path instead\&. +If you build with +\fB\-g\fR +(or similar) to add debug information to the object file, you must either: +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +use the +\fB\-fdebug\-prefix\-map=\fR\fB\fIold\fR\fR\fB=\fR\fB\fInew\fR\fR +option for relocating debug info to a common prefix (e\&.g\&. +\fB\-fdebug\-prefix\-map=$PWD=\&.\fR); or .RE .sp .RS 4 @@ -1362,8 +1378,25 @@ macros will be expanded to a relative path instead\&. .sp -1 .IP \(bu 2.3 .\} -If you specify an absolute path to the source code file and compile with -\fB\-g\fR, the source code path stored in the object file may point to the wrong directory, which may prevent debuggers like GDB from finding the source code\&. Sometimes, a work\-around is to change the directory explicitly with the \(lqcd\(rq command in GDB\&. +set +\fBhash_dir = false\fR\&. +.RE +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +If you use absolute paths anywhere on the command line (e\&.g\&. the source code file path or an argument to compiler options like +\fB\-I\fR +and +\fB\-MF\fR), you must to set +\fBbase_dir\fR +to an absolute path to a \(lqbase directory\(rq\&. ccache will then rewrite absolute paths under that directory to relative before computing the hash\&. .RE .SH "PRECOMPILED HEADERS" .sp diff --git a/ccache.c b/ccache.c index f72a9bd..d863a5a 100644 --- a/ccache.c +++ b/ccache.c @@ -844,11 +844,11 @@ process_preprocessed_file(struct mdfour *hash, const char *path) p = q; // Everything of interest between p and q has been hashed now. } else if (q[0] == '.' && q[1] == 'i' && q[2] == 'n' && q[3] == 'c' && q[4] == 'b' && q[5] == 'i' && q[6] == 'n') { - // An assembler .incbin statement (which could be part of inline - // assembly) refers to an external file. If the file changes, the hash - // should change as well, but finding out what file to hash is too hard - // for ccache, so just bail out. - cc_log("Found unsupported .incbin directive in source code"); + // An assembler .inc bin (without the space) statement, which could be + // part of inline assembly, refers to an external file. If the file + // changes, the hash should change as well, but finding out what file to + // hash is too hard for ccache, so just bail out. + cc_log("Found unsupported .inc" "bin directive in source code"); stats_update(STATS_UNSUPPORTED_DIRECTIVE); failed(); } else { @@ -3138,11 +3138,11 @@ static void setup_uncached_err(void) { int uncached_fd = dup(2); - set_cloexec_flag(uncached_fd); if (uncached_fd == -1) { cc_log("dup(2) failed: %s", strerror(errno)); failed(); } + // Leak the file descriptor. // Leak a pointer to the environment. char *buf = format("UNCACHED_ERR_FD=%d", uncached_fd); diff --git a/mdfour.c b/mdfour.c index 36b55fe..f557a20 100644 --- a/mdfour.c +++ b/mdfour.c @@ -1,5 +1,5 @@ // Copyright (C) 1997-1998 Andrew Tridgell -// Copyright (C) 2009-2016 Joel Rosdahl +// Copyright (C) 2009-2018 Joel Rosdahl // // This program is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the Free @@ -162,7 +162,7 @@ void mdfour_update(struct mdfour *md, const unsigned char *in, size_t n) { #ifdef CCACHE_DEBUG_HASH - if (getenv("CCACHE_DEBUG_HASH")) { + if (n > 0 && getenv("CCACHE_DEBUG_HASH")) { FILE *f = fopen("ccache-debug-hash.bin", "a"); fwrite(in, 1, n, f); fclose(f); diff --git a/test.sh b/test.sh index b2d6bf9..d750afe 100755 --- a/test.sh +++ b/test.sh @@ -1076,6 +1076,38 @@ EOF expect_stat 'cache hit (preprocessed)' 0 expect_stat 'cache miss' 0 expect_stat 'unsupported code directive' 1 + + # ------------------------------------------------------------------------- + TEST "UNCACHED_ERR_FD" + + cat >compiler.sh <<'EOF' +#!/bin/sh +if [ "$1" = "-E" ]; then + echo preprocessed + printf ${N}Pu >&$UNCACHED_ERR_FD +else + echo compiled >test1.o + printf ${N}Cc >&2 + printf ${N}Cu >&$UNCACHED_ERR_FD +fi +EOF + chmod +x compiler.sh + + N=1 $CCACHE ./compiler.sh -c test1.c 2>stderr.txt + stderr=$(cat stderr.txt) + expect_stat 'cache hit (preprocessed)' 0 + expect_stat 'cache miss' 1 + if [ "$stderr" != "1Pu1Cu1Cc" ]; then + test_failed "Unexpected stderr: $stderr != 1Pu1Cu1Cc" + fi + + N=2 $CCACHE ./compiler.sh -c test1.c 2>stderr.txt + stderr=$(cat stderr.txt) + expect_stat 'cache hit (preprocessed)' 1 + expect_stat 'cache miss' 1 + if [ "$stderr" != "2Pu1Cc" ]; then + test_failed "Unexpected stderr: $stderr != 2Pu1Cc" + fi } # ============================================================================= diff --git a/version.c b/version.c index 21b8c76..6bce7fa 100644 --- a/version.c +++ b/version.c @@ -1 +1 @@ -const char CCACHE_VERSION[] = "3.3.5"; +const char CCACHE_VERSION[] = "3.3.6";