Implement compare_executable_name() helper function

diff --git a/ccache.c b/ccache.c
index 9073ce19b4a04917ba5bbba75f90fa0d638ad873..725b81d4e25432f7dba68fd4da127d72d77c49f6 100644 (file)
--- a/ccache.c
+++ b/ccache.c
@@ -1263,7 +1263,7 @@ static void find_compiler(int argc, char **argv)
        base = basename(argv[0]);
 
        /* we might be being invoked like "ccache gcc -c foo.c" */
-       if (strcmp(base, MYNAME) == 0) {
+       if (compare_executable_name(base, MYNAME)) {
                args_remove_first(orig_args);
                free(base);
                if (strchr(argv[1],'/')) {
@@ -2127,7 +2127,7 @@ int main(int argc, char *argv[])
 
        /* check if we are being invoked as "ccache" */
        program_name = basename(argv[0]);
-       if (strcmp(program_name, MYNAME) == 0) {
+       if (compare_executable_name(program_name, MYNAME)) {
                if (argc < 2) {
                        fputs(USAGE_TEXT, stderr);
                        exit(1);

diff --git a/ccache.h b/ccache.h
index 900b12cc74ef06294e9dec5e8d32a1051f3dfa1a..2cf1fa89e7a836643fa5244dc05b021f81e1cef7 100644 (file)
--- a/ccache.h
+++ b/ccache.h
@@ -105,6 +105,7 @@ char *gnu_getcwd(void);
 int create_empty_file(const char *fname);
 const char *get_home_directory(void);
 char *get_cwd();
+int compare_executable_name(const char *s1, const char *s2);
 size_t common_dir_prefix_length(const char *s1, const char *s2);
 char *get_relative_path(const char *from, const char *to);
 int is_absolute_path(const char *path);

diff --git a/util.c b/util.c
index 5dbe0548b35b6f342d54641c0bfb369afcc4f905..204075938922b48bc0911d3d1da207d042725c27 100644 (file)
--- a/util.c
+++ b/util.c
@@ -878,6 +878,15 @@ char *get_cwd(void)
        }
 }
 
+/*
+ * Check whether s1 and s2 have the same executable name.
+ */
+int
+compare_executable_name(const char *s1, const char *s2)
+{
+       return !strcmp(s1, s2);
+}
+
 /*
  * Compute the length of the longest directory path that is common to two
  * strings.