c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2026-05-22 18:40:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

libspl: lift common bits of getexecname()

Browse Source 
Merge the actual implementations of getexecname() and slightly clean
up the FreeBSD one.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Closes #11879
This commit is contained in:
наб
2021-04-10 03:28:53 +02:00
committed by Brian Behlendorf
parent 375bdb2b20
commit 2d14207c98
5 changed files with 99 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/libspl/os/freebsd/getexecname.c
+9 -40
View File
@@ -20,52 +20,21 @@
* CDDL HEADER END
*/
#include <errno.h>
#include <stdint.h>
#include <limits.h>
#include <pthread.h>
#include <stdlib.h>
#include <string.h>
#include <sys/param.h>
#include <sys/sysctl.h>
#include <sys/types.h>
#include <unistd.h>
#include "../../libspl_impl.h"
const char *
getexecname(void)
__attribute__((visibility("hidden"))) ssize_t
getexecname_impl(char *execname)
{
static char execname[PATH_MAX + 1] = "";
static pthread_mutex_t mtx = PTHREAD_MUTEX_INITIALIZER;
char *ptr = NULL;
ssize_t rc;
size_t len = PATH_MAX;
int name[4] = {CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1};
(void) pthread_mutex_lock(&mtx);
if (sysctl(name, nitems(name), execname, &len, NULL, 0) != 0)
return (-1);
if (strlen(execname) == 0) {
int error, name[4];
size_t len;
name[0] = CTL_KERN;
name[1] = KERN_PROC;
name[2] = KERN_PROC_PATHNAME;
name[3] = -1;
len = PATH_MAX;
error = sysctl(name, nitems(name), execname, &len, NULL, 0);
if (error != 0) {
rc = -1;
} else {
rc = len;
}
if (rc == -1) {
execname[0] = '\0';
} else {
execname[rc] = '\0';
ptr = execname;
}
} else {
ptr = execname;
}
(void) pthread_mutex_unlock(&mtx);
return (ptr);
return (len);
}
lib/libspl/os/linux/getexecname.c
+5 -32
View File
@@ -19,41 +19,14 @@
*
* CDDL HEADER END
*/
/*
* Copyright 2007 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
#include <limits.h>
#include <pthread.h>
#include <stdlib.h>
#include <string.h>
#include <stdint.h>
#include <unistd.h>
#include "../../libspl_impl.h"
const char *
getexecname(void)
__attribute__((visibility("hidden"))) ssize_t
getexecname_impl(char *execname)
{
static char execname[PATH_MAX + 1] = "";
static pthread_mutex_t mtx = PTHREAD_MUTEX_INITIALIZER;
char *ptr = NULL;
ssize_t rc;
(void) pthread_mutex_lock(&mtx);
if (strlen(execname) == 0) {
rc = readlink("/proc/self/exe",
execname, sizeof (execname) - 1);
if (rc == -1) {
execname[0] = '\0';
} else {
execname[rc] = '\0';
ptr = execname;
}
} else {
ptr = execname;
}
(void) pthread_mutex_unlock(&mtx);
return (ptr);
return (readlink("/proc/self/exe", execname, PATH_MAX));
}