From e4859569295d3fd108b5ab91ae12b66bd12fa186 Mon Sep 17 00:00:00 2001 From: Joel Rosdahl Date: Sat, 27 Feb 2010 10:56:22 +0100 Subject: [PATCH] Improve detection of program name being MYNAME --- ccache.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ccache.c b/ccache.c index 839dc0921..c3d31aea4 100644 --- a/ccache.c +++ b/ccache.c @@ -1779,6 +1779,7 @@ static void setup_uncached_err(void) int main(int argc, char *argv[]) { char *p; + char *program_name; current_working_dir = get_cwd(); cache_dir = getenv("CCACHE_DIR"); @@ -1790,8 +1791,8 @@ int main(int argc, char *argv[]) } /* check if we are being invoked as "ccache" */ - if (strlen(argv[0]) >= strlen(MYNAME) && - strcmp(argv[0] + strlen(argv[0]) - strlen(MYNAME), MYNAME) == 0) { + program_name = str_basename(argv[0]); + if (strcmp(program_name, MYNAME) == 0) { if (argc < 2) { fputs(USAGE_TEXT, stderr); exit(1); @@ -1802,6 +1803,7 @@ int main(int argc, char *argv[]) return ccache_main(argc, argv); } } + free(program_name); check_cache_dir(); -- 2.47.3