From: Wilson Snyder <wsnyder@wsnyder.org>
Date: Sun, 9 May 2010 11:12:32 +0000 (+0200)
Subject: Show hostname and CWD in logfile
X-Git-Tag: v3.0pre1~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=45b4932efb4c13ae3d6a63a67fbc9e1ab4adcf70;p=thirdparty%2Fccache.git

Show hostname and CWD in logfile
---

diff --git a/ccache.c b/ccache.c
index de08a5c8e..b2a55c2ec 100644
--- a/ccache.c
+++ b/ccache.c
@@ -1674,6 +1674,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 f514057d2..227734410 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 34f1b5e65..e10e1ca9c 100644
--- a/util.c
+++ b/util.c
@@ -272,21 +272,33 @@ int create_dir(const char *dir)
 }
 
 /*
- * Return a string to be used to distinguish temporary files. Also tries to
- * cope with NFS by adding the local hostname.
+ * Return a static string with the current hostname.
  */
-const char *tmp_string(void)
+const char *get_hostname(void)
 {
-	static char *ret;
+	static char hostname[200] = "";
 
-	if (!ret) {
-		char hostname[200];
+	if (!hostname[0]) {
 		strcpy(hostname, "unknown");
 #if HAVE_GETHOSTNAME
 		gethostname(hostname, sizeof(hostname)-1);
 #endif
 		hostname[sizeof(hostname)-1] = 0;
-		x_asprintf(&ret, "%s.%u", hostname, (unsigned)getpid());
+	}
+
+	return hostname;
+}
+
+/*
+ * Return a string to be used to distinguish temporary files. Also tries to
+ * cope with NFS by adding the local hostname.
+ */
+const char *tmp_string(void)
+{
+	static char *ret;
+
+	if (!ret) {
+		x_asprintf(&ret, "%s.%u", get_hostname(), (unsigned)getpid());
 	}
 
 	return ret;