diff options
| author | Joseph Hunkeler <jhunkeler@gmail.com> | 2020-02-17 00:13:30 -0500 |
|---|---|---|
| committer | Joseph Hunkeler <jhunkeler@gmail.com> | 2020-02-17 00:13:30 -0500 |
| commit | 1c2cdc4d8e28ce1b4c0d1ba75686f05fd5dd772d (patch) | |
| tree | 32257d5a12cc0dc06c62e4212806573477065080 /src/rpath.c | |
| parent | b5dc6f2c428b4555d3e56e628605f54e4a63b16e (diff) | |
| download | spmc-1c2cdc4d8e28ce1b4c0d1ba75686f05fd5dd772d.tar.gz | |
Refactor continues:
* Implement multiple manifests
* Random bug fixes
* More bugs added
* Start removing references to SPM_GLOBAL.package_dir
* Start using manifests for everything
* Simplify mkmanifest_interface
Diffstat (limited to 'src/rpath.c')
| -rw-r--r-- | src/rpath.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/rpath.c b/src/rpath.c index 5758939..2976ed8 100644 --- a/src/rpath.c +++ b/src/rpath.c @@ -16,8 +16,8 @@ Process *patchelf(const char *_filename, const char *_args) { char sh_cmd[PATH_MAX]; sh_cmd[0] = '\0'; - strchrdel(args, "&;|"); - strchrdel(filename, "&;|"); + strchrdel(args, SHELL_INVALID); + strchrdel(filename, SHELL_INVALID); sprintf(sh_cmd, "patchelf %s %s 2>&1", args, filename); shell(&proc_info, SHELL_OUTPUT, sh_cmd); @@ -44,7 +44,7 @@ int has_rpath(const char *_filename) { } // sanitize input path - strchrdel(filename, "&;|"); + strchrdel(filename, SHELL_INVALID); Process *pe = patchelf(filename, "--print-rpath"); strip(pe->output); @@ -87,7 +87,7 @@ char *rpath_get(const char *_filename) { char *rpath = NULL; // sanitize input path - strchrdel(path, "&;|"); + strchrdel(path, SHELL_INVALID); Process *pe = patchelf(filename, "--print-rpath"); if (pe->returncode != 0) { |