Support make commands that ignore errors

17451k · Sep 10, 2018 · 517dd6d · 517dd6d
1 parent 87a438d
commit 517dd6d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/clade/libinterceptor/data.c b/clade/libinterceptor/data.c
@@ -77,7 +77,7 @@ static char *prepare_data(const char *path, char const *const argv[]) {
 
     // Sometimes "path" contains incorrect values ("gcc" instead of "/usr/bin/gcc")
     char *correct_path = NULL;
-    if (path == argv[0]) {
+    if (access(path, X_OK)) {
         correct_path = which(path);
     }
 

diff --git a/clade/libinterceptor/interceptor.c b/clade/libinterceptor/interceptor.c
@@ -65,7 +65,7 @@ int posix_spawn(pid_t *restrict pid, const char *restrict path, const posix_spaw
                 const posix_spawnattr_t *restrict attrp, char *const argv[restrict], char *const envp[restrict])
 {
     int (*posix_spawn_real)(pid_t *restrict, const char *restrict, const posix_spawn_file_actions_t *,
-                const posix_spawnattr_t *restrict, char *const *, char *const *) = dlsym(RTLD_NEXT, "posix_spawn");
+                const posix_spawnattr_t *restrict, char *const *restrict, char *const *restrict) = dlsym(RTLD_NEXT, "posix_spawn");
 
     // DO NOT check if (! intercepted) here: it will result in command loss
     if (access(path, F_OK ) != -1) {