Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

libspl: lift common bits of getexecname() 

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/libspl/Makefile.am
View File

@ -21,6 +21,8 @@ libspl_assert_la_SOURCES = \
assert.c
USER_C = \
libspl_impl.h \
getexecname.c \
list.c \
mkdirp.c \
page.c \

59
lib/libspl/getexecname.c Normal file
View File

@ -0,0 +1,59 @@
/*
* CDDL HEADER START
*
* The contents of this file are subject to the terms of the
* Common Development and Distribution License, Version 1.0 only
* (the "License"). You may not use this file except in compliance
* with the License.
*
* You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
* or http://www.opensolaris.org/os/licensing.
* See the License for the specific language governing permissions
* and limitations under the License.
*
* When distributing Covered Code, include this CDDL HEADER in each
* file and include the License file at usr/src/OPENSOLARIS.LICENSE.
* If applicable, add the following below this CDDL HEADER, with the
* fields enclosed by brackets "[]" replaced with your own identifying
* information: Portions Copyright [yyyy] [name of copyright owner]
*
* 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 <unistd.h>
#include "libspl_impl.h"
const char *
getexecname(void)
{
static char execname[PATH_MAX + 1] = "";
static pthread_mutex_t mtx = PTHREAD_MUTEX_INITIALIZER;
char *ptr = execname;
ssize_t rc;
(void) pthread_mutex_lock(&mtx);
if (strlen(execname) == 0) {
rc = getexecname_impl(execname);
if (rc == -1) {
execname[0] = '\0';
ptr = NULL;
} else {
execname[rc] = '\0';
}
}
(void) pthread_mutex_unlock(&mtx);
return (ptr);
}

24
lib/libspl/libspl_impl.h Normal file
View File

@ -0,0 +1,24 @@
/*
* CDDL HEADER START
*
* The contents of this file are subject to the terms of the
* Common Development and Distribution License, Version 1.0 only
* (the "License"). You may not use this file except in compliance
* with the License.
*
* You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
* or http://www.opensolaris.org/os/licensing.
* See the License for the specific language governing permissions
* and limitations under the License.
*
* When distributing Covered Code, include this CDDL HEADER in each
* file and include the License file at usr/src/OPENSOLARIS.LICENSE.
* If applicable, add the following below this CDDL HEADER, with the
* fields enclosed by brackets "[]" replaced with your own identifying
* information: Portions Copyright [yyyy] [name of copyright owner]
*
* CDDL HEADER END
*/
extern ssize_t getexecname_impl(char *execname);

49
lib/libspl/os/freebsd/getexecname.c
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);
}

37
lib/libspl/os/linux/getexecname.c
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));
}