Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-cw
Commits
70f486c2
Commit
70f486c2
authored
Oct 23, 2021
by
Damjan Jovanovic
Committed by
Alexandre Julliard
Oct 25, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ntdll: Use sysctl instead of /proc/curproc/file on FreeBSD.
Signed-off-by:
Damjan Jovanovic
<
damjan.jov@gmail.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
f5e51cfc
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
1 deletion
+12
-1
loader.c
dlls/ntdll/unix/loader.c
+12
-1
No files found.
dlls/ntdll/unix/loader.c
View file @
70f486c2
...
...
@@ -58,6 +58,10 @@
#ifdef HAVE_SYS_WAIT_H
#include <sys/wait.h>
#endif
#include <limits.h>
#ifdef HAVE_SYS_SYSCTL_H
# include <sys/sysctl.h>
#endif
#ifdef __APPLE__
# include <CoreFoundation/CoreFoundation.h>
# define LoadResource MacLoadResource
...
...
@@ -600,7 +604,14 @@ static void init_paths( char *argv[] )
#if (defined(__linux__) && !defined(__ANDROID__)) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)
bin_dir
=
realpath_dirname
(
"/proc/self/exe"
);
#elif defined (__FreeBSD__) || defined(__DragonFly__)
bin_dir
=
realpath_dirname
(
"/proc/curproc/file"
);
{
static
int
pathname
[]
=
{
CTL_KERN
,
KERN_PROC
,
KERN_PROC_PATHNAME
,
-
1
};
size_t
path_size
=
PATH_MAX
;
char
*
path
=
malloc
(
path_size
);
if
(
path
&&
!
sysctl
(
pathname
,
sizeof
(
pathname
)
/
sizeof
(
pathname
[
0
]),
path
,
&
path_size
,
NULL
,
0
))
bin_dir
=
realpath_dirname
(
path
);
free
(
path
);
}
#else
bin_dir
=
realpath_dirname
(
argv0
);
#endif
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment