Merge branch 'master' into config

* master:
  while (1) -> while (true)
  Fixup after merge: Make directory creation failure fatal
  Update NEWS
  Also recognize -specs=file in addition to --specs=file
  Revert GCC bug compatibility for -MTarg and -MQarg
  Fix minor memory leaks
  Correct log message when unify mode is enabled
  Hash environment variables that affect the preprocessor output
  Hash mtime or content of GCC plugins specified with -fplugin=
  Use hash_compiler for explicit --specs= options as well
  Refactor code into a hash_compiler function
  Improve description on how to fix bad object files in the cache
  Make failure to create files in cache fatal
  Make failure to create cache directories fatal
  Remove unused print_executed_command function
  Handle non-writable CCACHE_DIR gracefully

Conflicts:
	manifest.c
	test/framework.c

diff --cc ccache.c
index ddc919b7cc0b12adf92af4d2a04a47cc1bc1051e,3bf3ee575e2d2015fb2374dd00da5644e14bb5d7..7b93f5c2aa517630f50a3e7817f7d12827dcc193
--- 1/ccache.c
--- 2/ccache.c
+++ b/ccache.c
@@@ -928,10 -951,12 +924,12 @@@ calculate_common_hash(struct args *args
         * behave differently depending on the real name.
         */
        hash_delimiter(hash, "cc_name");
-       hash_string(hash, basename(args->argv[0]));
+       p = basename(args->argv[0]);
+       hash_string(hash, p);
+       free(p);
  
        /* Possibly hash the current working directory. */
 -      if (getenv("CCACHE_HASHDIR")) {
 +      if (conf->hash_dir) {
                char *cwd = gnu_getcwd();
                if (cwd) {
                        hash_delimiter(hash, "cwd");

diff --cc manifest.c
index 6d9c409aafc572d4c197d9a41925fb2c1b0a34e9,51e6682f9f5ab8586e7243eb1f9a7614d2b82a5c..ae6c2ff4a52131a7ac6e32bb852fb92a0b533b01
--- 1/manifest.c
--- 2/manifest.c
+++ b/manifest.c
@@@ -1,5 -1,5 +1,5 @@@
  /*
-  * Copyright (C) 2009-2011 Joel Rosdahl
 - * Copyright (C) 2009-2010, 2012 Joel Rosdahl
++ * Copyright (C) 2009-2012 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

diff --cc stats.c
Simple merge

diff --cc test/framework.c
index 425e9ff530b198e1feff9fcda69d432e79ad1935,9abbb0585c5bee4d1c3f5b7e9719196852ca097b..fd6ce721d008da9e81ffdf877f2deb234b2e4d08
--- 1/test/framework.c
--- 2/test/framework.c
+++ b/test/framework.c
@@@ -1,5 -1,5 +1,5 @@@
  /*
-  * Copyright (C) 2010-2011 Joel Rosdahl
 - * Copyright (C) 2010, 2012 Joel Rosdahl
++ * Copyright (C) 2010-2012 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

diff --cc test/test_argument_processing.c
Simple merge

diff --cc util.c
Simple merge