fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-25 21:00:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

util: Merge the __getProgramName code under HAIKU os

Browse source 
Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Acked-by: Jesse Natalie <jenatali@microsoft.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19645>
This commit is contained in:
Yonggang Luo 2022-11-10 18:31:42 +08:00 • committed by Marge Bot
parent ed4fd1d90e
commit 3f4586575e
2 changed files with 6 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/gallium/auxiliary/os/os_process.c
View file

@ -78,11 +78,6 @@ os_get_process_name(char *procname, size_t size)
}
name = lpProcessName;
#elif defined(PIPE_OS_HAIKU)
image_info info;
get_image_info(B_CURRENT_TEAM, &info);
name = info.name;
#else
name = util_get_process_name();
#endif

18
src/util/u_process.c
View file

@ -150,21 +150,15 @@ __getProgramName()
progname = buf;
return strdup(progname);
}
#elif defined(__HAIKU__)
# include <libgen.h>
extern char **__libc_argv;
extern int __libc_argc;
#elif DETECT_OS_HAIKU
# include <kernel/OS.h>
# include <kernel/image.h>
static char *
__getProgramName()
{
char *progname = NULL;
char *n = strdup(__libc_argv[0]);
if (n != NULL) {
progname = strdup(basename(n));
free(n);
}
return progname;
image_info info;
get_image_info(B_CURRENT_TEAM, &info);
return strdup(info.name);
}
#else
#define GET_PROGRAM_NAME_NOT_AVAILABLE