Skip to content

Fix 256 and more #257

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix 256 and more #257

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ce4c710
Fixes issue #256. If config path in envvar is not absolute, make it so.
Sep 1, 2018
369f926
Make sure preload library path is absolute. This fixes issues where a…
Sep 1, 2018
f7efb1e
Make all PDEBUG calls print the PID, helpful for multiprocess applica…
Sep 1, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions src/common.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#include "common.h"
#include "debug.h"
#include <stdlib.h>
#include <unistd.h>
#include <stdio.h>
Expand Down Expand Up @@ -94,5 +95,11 @@ char *get_config_path(char* default_path, char* pbuf, size_t bufsize) {

return NULL;
have:
if(path[0] != '/') {
path = realpath(path, NULL);
setenv(PROXYCHAINS_CONF_FILE_ENV_VAR, path, 1);
free(path);
path = getenv(PROXYCHAINS_CONF_FILE_ENV_VAR);
}
return path;
}
2 changes: 1 addition & 1 deletion src/debug.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#ifdef DEBUG
# include <stdio.h>
# define PSTDERR(fmt, args...) do { dprintf(2,fmt, ## args); } while(0)
# define PDEBUG(fmt, args...) PSTDERR("DEBUG:"fmt, ## args)
# define PDEBUG(fmt, args...) PSTDERR("DEBUG:pid[%d]:"fmt, getpid(), ## args)
# define DEBUGDECL(args...) args

# include "core.h"
Expand Down
12 changes: 10 additions & 2 deletions src/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,14 @@ int main(int argc, char *argv[]) {
if(!quiet)
fprintf(stderr, LOG_PREFIX "preloading %s/%s\n", prefix, dll_name);

snprintf(path=pbuf, sizeof(pbuf), "%s/%s", prefix, dll_name);
if (path[0] != '/'){
path = realpath(path, NULL);
snprintf(pbuf, sizeof(pbuf), "%s", path);
free(path);
path = pbuf;
}

#ifdef IS_MAC
putenv("DYLD_FORCE_FLAT_NAMESPACE=1");
#define LD_PRELOAD_ENV "DYLD_INSERT_LIBRARIES"
Expand All @@ -143,8 +151,8 @@ int main(int argc, char *argv[]) {
#define LD_PRELOAD_SEP " "
#endif
char *old_val = getenv(LD_PRELOAD_ENV);
snprintf(buf, sizeof(buf), LD_PRELOAD_ENV "=%s/%s%s%s",
prefix, dll_name,
snprintf(buf, sizeof(buf), LD_PRELOAD_ENV "=%s%s%s",
path,
/* append previous LD_PRELOAD content, if existent */
old_val ? LD_PRELOAD_SEP : "",
old_val ? old_val : "");
Expand Down