mirror of
https://github.com/jart/cosmopolitan.git
synced 2025-08-06 18:00:28 +00:00
Merge branch 'master' into no-realpath
This commit is contained in:
commit
e582b1c286
1 changed files with 22 additions and 2 deletions
|
@ -23,6 +23,7 @@
|
|||
#include "libc/cosmo.h"
|
||||
#include "libc/dce.h"
|
||||
#include "libc/errno.h"
|
||||
#include "libc/fmt/libgen.h"
|
||||
#include "libc/intrin/getenv.internal.h"
|
||||
#include "libc/serialize.h"
|
||||
#include "libc/limits.h"
|
||||
|
@ -51,6 +52,25 @@ static inline int IsAlpha(int c) {
|
|||
return ('A' <= c && c <= 'Z') || ('a' <= c && c <= 'z');
|
||||
}
|
||||
|
||||
static inline int AllNumDot(const char *s) {
|
||||
while (true) {
|
||||
switch (*s++) {
|
||||
default: return 0;
|
||||
case 0: return 1;
|
||||
case '0': case '1': case '2': case '3': case '4':
|
||||
case '5': case '6': case '7': case '8': case '9': case '.':
|
||||
/* continue */
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static int IsApeLoader(char *s) {
|
||||
char *b;
|
||||
return !strcmp(s, "/usr/bin/ape") ||
|
||||
(!strncmp((b = basename(s)), ".ape-", 5) &&
|
||||
AllNumDot(b + 5));
|
||||
}
|
||||
|
||||
// if q exists then turn it into an absolute path. we also try adding
|
||||
// a .com suffix since the ape auto-appends it when resolving
|
||||
static int TryPath(const char *q, int com) {
|
||||
|
@ -145,7 +165,7 @@ static inline void InitProgramExecutableNameImpl(void) {
|
|||
}
|
||||
cmd[3] = -1; // current process
|
||||
if (sys_sysctl(cmd, ARRAYLEN(cmd), b, &n, 0, 0) != -1) {
|
||||
if (strcmp(b, "/usr/bin/ape")) { // XX old loader; warn?
|
||||
if (!IsApeLoader(b)) {
|
||||
goto UseBuf;
|
||||
}
|
||||
}
|
||||
|
@ -154,7 +174,7 @@ static inline void InitProgramExecutableNameImpl(void) {
|
|||
if ((got = sys_readlinkat(AT_FDCWD, "/proc/self/exe", b, n)) > 0 ||
|
||||
(got = sys_readlinkat(AT_FDCWD, "/proc/curproc/file", b, n)) > 0) {
|
||||
b[got] = 0;
|
||||
if (strcmp(b, "/usr/bin/ape")) {
|
||||
if (!IsApeLoader(b)) {
|
||||
goto UseBuf;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue