summaryrefslogtreecommitdiff
path: root/src/libposixplz
diff options
context:
space:
mode:
Diffstat (limited to 'src/libposixplz')
-rw-r--r--src/libposixplz/execvep.c33
-rw-r--r--src/libposixplz/execvep_internal.c37
-rw-r--r--src/libposixplz/execvep_loose.c13
-rw-r--r--src/libposixplz/posixplz-internal.h8
4 files changed, 62 insertions, 29 deletions
diff --git a/src/libposixplz/execvep.c b/src/libposixplz/execvep.c
index acdf11f..461f238 100644
--- a/src/libposixplz/execvep.c
+++ b/src/libposixplz/execvep.c
@@ -2,38 +2,13 @@
#include <unistd.h>
#include <string.h>
-#include <errno.h>
-#include <skalibs/bytestr.h>
#include <skalibs/posixplz.h>
+#include "posixplz-internal.h"
void execvep (char const *file, char const *const *argv, char const *const *envp, char const *path)
{
- if (!path) errno = EINVAL ;
- else if (file[str_chr(file, '/')])
- execve(file, (char *const *)argv, (char *const *)envp) ; /* execve prototype sucks */
+ if (strchr(file, '/'))
+ execve(file, (char *const *)argv, (char *const *)envp) ;
else
- {
- size_t pathlen = strlen(path) + 1 ;
- size_t filelen = strlen(file) ;
- int savederrno = 0 ;
- while (pathlen)
- {
- size_t split = byte_chr(path, pathlen - 1, ':') ;
- if (split)
- {
- char tmp[split + 2 + filelen] ;
- memcpy(tmp, path, split) ;
- tmp[split] = '/' ;
- memcpy(tmp + split + 1, file, filelen + 1) ;
- execve(tmp, (char *const *)argv, (char *const *)envp) ;
- if (errno != ENOENT)
- {
- savederrno = errno ;
- if ((errno != EACCES) && (errno != EPERM) && (errno != EISDIR)) break ;
- }
- }
- path += split+1 ; pathlen -= split+1 ;
- }
- if (savederrno) errno = savederrno ;
- }
+ execvep_internal(file, argv, envp, path) ;
}
diff --git a/src/libposixplz/execvep_internal.c b/src/libposixplz/execvep_internal.c
new file mode 100644
index 0000000..17858f0
--- /dev/null
+++ b/src/libposixplz/execvep_internal.c
@@ -0,0 +1,37 @@
+/* ISC license. */
+
+#include <unistd.h>
+#include <string.h>
+#include <errno.h>
+#include <skalibs/bytestr.h>
+#include <skalibs/posixplz.h>
+
+void execvep_internal (char const *file, char const *const *argv, char const *const *envp, char const *path)
+{
+ if (!path) errno = EINVAL ;
+ else
+ {
+ size_t pathlen = strlen(path) + 1 ;
+ size_t filelen = strlen(file) ;
+ int savederrno = 0 ;
+ while (pathlen)
+ {
+ size_t split = byte_chr(path, pathlen - 1, ':') ;
+ if (split)
+ {
+ char tmp[split + 2 + filelen] ;
+ memcpy(tmp, path, split) ;
+ tmp[split] = '/' ;
+ memcpy(tmp + split + 1, file, filelen + 1) ;
+ execve(tmp, (char *const *)argv, (char *const *)envp) ;
+ if (errno != ENOENT)
+ {
+ savederrno = errno ;
+ if ((errno != EACCES) && (errno != EPERM) && (errno != EISDIR)) break ;
+ }
+ }
+ path += split+1 ; pathlen -= split+1 ;
+ }
+ if (savederrno) errno = savederrno ;
+ }
+}
diff --git a/src/libposixplz/execvep_loose.c b/src/libposixplz/execvep_loose.c
new file mode 100644
index 0000000..7506362
--- /dev/null
+++ b/src/libposixplz/execvep_loose.c
@@ -0,0 +1,13 @@
+/* ISC license. */
+
+#include <unistd.h>
+#include <skalibs/posixplz.h>
+#include "posixplz-internal.h"
+
+void execvep_loose (char const *file, char const *const *argv, char const *const *envp, char const *path)
+{
+ if (file[0] == '/')
+ execve(file, (char *const *)argv, (char *const *)envp) ;
+ else
+ execvep_internal(file, argv, envp, path) ;
+}
diff --git a/src/libposixplz/posixplz-internal.h b/src/libposixplz/posixplz-internal.h
new file mode 100644
index 0000000..c3da73a
--- /dev/null
+++ b/src/libposixplz/posixplz-internal.h
@@ -0,0 +1,8 @@
+/* ISC license. */
+
+#ifndef POSIXPLZ_INTERNAL_H
+#define POSIXPLZ_INTERNAL_H
+
+extern void execvep_internal (char const *, char const *const *, char const *const *, char const *) ;
+
+#endif