[PATCH 1/2] Show hostname and CWD in logfile

[Wilson Snyder]

---
 ccache.c |    4 ++++
 ccache.h |    1 +
 util.c   |   25 +++++++++++++++++++------
 3 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/ccache.c b/ccache.c
index cbbfdc8..ba3b6ad 100644
--- a/ccache.c
+++ b/ccache.c
@@ -1673,6 +1673,10 @@ static void ccache(int argc, char *argv[])
 	process_args(orig_args->argc, orig_args->argv, &preprocessor_args,
 		     &compiler_args);
 
+	cc_log("Hostname: %s", get_hostname());
+
+	cc_log("Cwd: %s", current_working_dir);
+
 	cc_log("Source file: %s", input_file);
 	if (generating_dependencies) {
 		cc_log("Dependency file: %s", output_dep);
diff --git a/ccache.h b/ccache.h
index f514057..2277344 100644
--- a/ccache.h
+++ b/ccache.h
@@ -73,6 +73,7 @@ int move_file(const char *src, const char *dest, int compress_dest);
 int test_if_compressed(const char *filename);
 
 int create_dir(const char *dir);
+const char *get_hostname(void);
 const char *tmp_string(void);
 char *format_hash_as_string(const unsigned char *hash, unsigned size);
 int create_hash_dir(char **dir, const char *hash, const char *cache_dir);
diff --git a/util.c b/util.c
index 34f1b5e..c50a7d5 100644
--- a/util.c
+++ b/util.c
@@ -272,6 +272,24 @@ int create_dir(const char *dir)
 }
 
 /*
+ * Return a string with the current hostname.
+ */
+const char *get_hostname(void)
+{
+    static char hostname[200] = "";
+
+    if (!hostname[0]) {
+	strcpy(hostname, "unknown");
+#if HAVE_GETHOSTNAME
+	gethostname(hostname, sizeof(hostname)-1);
+#endif
+	hostname[sizeof(hostname)-1] = 0;
+    }
+
+    return hostname;
+}
+
+/*
  * Return a string to be used to distinguish temporary files. Also tries to
  * cope with NFS by adding the local hostname.
  */
@@ -280,12 +298,7 @@ const char *tmp_string(void)
 	static char *ret;
 
 	if (!ret) {
-		char hostname[200];
-		strcpy(hostname, "unknown");
-#if HAVE_GETHOSTNAME
-		gethostname(hostname, sizeof(hostname)-1);
-#endif
-		hostname[sizeof(hostname)-1] = 0;
+		const char *hostname = get_hostname();
 		x_asprintf(&ret, "%s.%u", hostname, (unsigned)getpid());
 	}
 
-- 
1.6.4.2