brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

shell_global_reexec_self: add support for FreeBSD

Browse Source 
https://bugzilla.gnome.org/show_bug.cgi?id=747788
This commit is contained in:
Ting-Wei Lan 2015-04-13 12:07:35 +08:00
parent 5afd04781c
commit e4718d3f7f
1 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/shell-global.c
View File

@ -39,7 +39,7 @@
#include <malloc.h> #include <malloc.h>
#endif #endif
#ifdef __OpenBSD__ #if defined __OpenBSD__ || defined __FreeBSD__
#include <sys/sysctl.h> #include <sys/sysctl.h>
#endif #endif
@ -1278,6 +1278,30 @@ shell_global_reexec_self (ShellGlobal *global)
g_ptr_array_add (arr, *args_p); g_ptr_array_add (arr, *args_p);
} }
g_ptr_array_add (arr, NULL);
#elif defined __FreeBSD__
char *buf;
char *buf_p;
char *buf_end;
gint mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_ARGS, getpid() };
if (sysctl (mib, G_N_ELEMENTS (mib), NULL, &len, NULL, 0) == -1)
return;
buf = g_malloc0 (len);
if (sysctl (mib, G_N_ELEMENTS (mib), buf, &len, NULL, 0) == -1) {
g_warning ("failed to get command line args: %d", errno);
g_free (buf);
return;
}
buf_end = buf+len;
arr = g_ptr_array_new ();
/* The value returned by sysctl is NUL-separated */
for (buf_p = buf; buf_p < buf_end; buf_p = buf_p + strlen (buf_p) + 1)
g_ptr_array_add (arr, buf_p);
g_ptr_array_add (arr, NULL); g_ptr_array_add (arr, NULL);
#else #else
return; return;
@ -1297,7 +1321,7 @@ shell_global_reexec_self (ShellGlobal *global)
execvp (arr->pdata[0], (char**)arr->pdata); execvp (arr->pdata[0], (char**)arr->pdata);
g_warning ("failed to reexec: %s", g_strerror (errno)); g_warning ("failed to reexec: %s", g_strerror (errno));
g_ptr_array_free (arr, TRUE); g_ptr_array_free (arr, TRUE);
#if defined __linux__ #if defined __linux__ || defined __FreeBSD__
g_free (buf); g_free (buf);
#elif defined __OpenBSD__ #elif defined __OpenBSD__
g_free (args); g_free (args);