mirror of
https://github.com/jart/cosmopolitan.git
synced 2025-07-08 12:18:31 +00:00
Greatly expand system() shell code features
The cosmopolitan command interpreter now has 13 builtin commands, variable support, support for ; / && / || syntax, asynchronous support, and plenty of unit tests with bug fixes. This change fixes a bug in posix_spawn() with null envp arg. strace logging now uses atomic writes for scatter functions. Breaking change renaming GetCpuCount() to _getcpucount(). TurfWar is now updated to use the new token bucket algorithm. WIN32 affinity masks now inherit across fork() and execve().
This commit is contained in:
Justine Tunney
parent
e7329b7cba
commit
b41f91c658
80 changed files with 1370 additions and 344 deletions
46
test/libc/stdio/makedirs_test.c
Normal file
46
test/libc/stdio/makedirs_test.c
Normal file
|
|
@ -0,0 +1,46 @@
|
|||
/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│
|
||||
│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│
|
||||
╞══════════════════════════════════════════════════════════════════════════════╡
|
||||
│ Copyright 2022 Justine Alexandra Roberts Tunney │
|
||||
│ │
|
||||
│ Permission to use, copy, modify, and/or distribute this software for │
|
||||
│ any purpose with or without fee is hereby granted, provided that the │
|
||||
│ above copyright notice and this permission notice appear in all copies. │
|
||||
│ │
|
||||
│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │
|
||||
│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │
|
||||
│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │
|
||||
│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │
|
||||
│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │
|
||||
│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │
|
||||
│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │
|
||||
│ PERFORMANCE OF THIS SOFTWARE. │
|
||||
╚─────────────────────────────────────────────────────────────────────────────*/
|
||||
#include "libc/mem/gc.internal.h"
|
||||
#include "libc/mem/mem.h"
|
||||
#include "libc/stdio/stdio.h"
|
||||
#include "libc/testlib/testlib.h"
|
||||
#include "libc/thread/spawn.h"
|
||||
#include "libc/thread/thread.h"
|
||||
|
||||
#define DIR \
|
||||
"a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/A/B/C/D/E/F/G/H/I/J/K/" \
|
||||
"L/M/N/O/P/Q/R/S/T/U/V/W/X/Y/Z"
|
||||
|
||||
pthread_barrier_t barrier;
|
||||
char testlib_enable_tmp_setup_teardown;
|
||||
|
||||
int Worker(void *arg, int tid) {
|
||||
pthread_barrier_wait(&barrier);
|
||||
ASSERT_EQ(0, makedirs(DIR, 0755));
|
||||
return 0;
|
||||
}
|
||||
|
||||
TEST(makedirs, test) {
|
||||
int i, n = 8;
|
||||
struct spawn *t = gc(malloc(sizeof(struct spawn) * n));
|
||||
ASSERT_EQ(0, pthread_barrier_init(&barrier, 0, n));
|
||||
for (i = 0; i < n; ++i) ASSERT_SYS(0, 0, _spawn(Worker, 0, t + i));
|
||||
for (i = 0; i < n; ++i) EXPECT_SYS(0, 0, _join(t + i));
|
||||
ASSERT_EQ(0, pthread_barrier_destroy(&barrier));
|
||||
}
|
||||
95
test/libc/stdio/popen_test.c
Normal file
95
test/libc/stdio/popen_test.c
Normal file
|
|
@ -0,0 +1,95 @@
|
|||
/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│
|
||||
│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│
|
||||
╞══════════════════════════════════════════════════════════════════════════════╡
|
||||
│ Copyright 2022 Justine Alexandra Roberts Tunney │
|
||||
│ │
|
||||
│ Permission to use, copy, modify, and/or distribute this software for │
|
||||
│ any purpose with or without fee is hereby granted, provided that the │
|
||||
│ above copyright notice and this permission notice appear in all copies. │
|
||||
│ │
|
||||
│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │
|
||||
│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │
|
||||
│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │
|
||||
│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │
|
||||
│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │
|
||||
│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │
|
||||
│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │
|
||||
│ PERFORMANCE OF THIS SOFTWARE. │
|
||||
╚─────────────────────────────────────────────────────────────────────────────*/
|
||||
#include "libc/calls/calls.h"
|
||||
#include "libc/calls/struct/sigaction.h"
|
||||
#include "libc/dce.h"
|
||||
#include "libc/fmt/fmt.h"
|
||||
#include "libc/runtime/runtime.h"
|
||||
#include "libc/stdio/stdio.h"
|
||||
#include "libc/sysv/consts/sig.h"
|
||||
#include "libc/testlib/testlib.h"
|
||||
|
||||
FILE *f;
|
||||
char buf[32];
|
||||
char testlib_enable_tmp_setup_teardown;
|
||||
|
||||
TEST(popen, command) {
|
||||
char foo[6];
|
||||
testlib_extract("/zip/echo.com", "echo.com", 0755);
|
||||
ASSERT_NE(NULL, (f = popen("./echo.com hello", "r")));
|
||||
ASSERT_NE(NULL, fgets(foo, sizeof(foo), f));
|
||||
ASSERT_STREQ("hello", foo);
|
||||
ASSERT_EQ(0, pclose(f));
|
||||
}
|
||||
|
||||
TEST(popen, semicolon) {
|
||||
ASSERT_NE(NULL, (f = popen("echo hello;echo there", "r")));
|
||||
ASSERT_STREQ("hello\n", fgets(buf, sizeof(buf), f));
|
||||
ASSERT_STREQ("there\n", fgets(buf, sizeof(buf), f));
|
||||
ASSERT_EQ(0, pclose(f));
|
||||
}
|
||||
|
||||
TEST(popen, singleQuotes) {
|
||||
setenv("there", "a b c", true);
|
||||
ASSERT_NE(NULL, (f = popen("echo -l 'hello $there' yo", "r")));
|
||||
ASSERT_STREQ("hello $there\n", fgets(buf, sizeof(buf), f));
|
||||
ASSERT_STREQ("yo\n", fgets(buf, sizeof(buf), f));
|
||||
ASSERT_EQ(0, pclose(f));
|
||||
}
|
||||
|
||||
TEST(popen, doubleQuotes) {
|
||||
setenv("hello", "a b c", true);
|
||||
ASSERT_NE(NULL, (f = popen("echo -l \"$hello there\"", "r")));
|
||||
ASSERT_STREQ("a b c there\n", fgets(buf, sizeof(buf), f));
|
||||
ASSERT_EQ(0, pclose(f));
|
||||
}
|
||||
|
||||
TEST(popen, quoteless) {
|
||||
setenv("there", "a b c", true);
|
||||
ASSERT_NE(NULL, (f = popen("echo -l hello a$there yo", "r")));
|
||||
ASSERT_STREQ("hello\n", fgets(buf, sizeof(buf), f));
|
||||
ASSERT_STREQ("aa b c\n", fgets(buf, sizeof(buf), f)); // mixed feelings
|
||||
ASSERT_STREQ("yo\n", fgets(buf, sizeof(buf), f));
|
||||
ASSERT_EQ(0, pclose(f));
|
||||
}
|
||||
|
||||
TEST(popen, pipe) {
|
||||
setenv("there", "a b c", true);
|
||||
ASSERT_NE(NULL, (f = popen("echo hello | toupper", "r")));
|
||||
ASSERT_STREQ("HELLO\n", fgets(buf, sizeof(buf), f));
|
||||
ASSERT_EQ(0, pclose(f));
|
||||
}
|
||||
|
||||
sig_atomic_t gotsig;
|
||||
|
||||
void OnSig(int sig) {
|
||||
gotsig = 1;
|
||||
}
|
||||
|
||||
TEST(popen, complicated) {
|
||||
if (IsWindows()) return; // windows treats sigusr1 as terminate
|
||||
char cmd[64];
|
||||
signal(SIGUSR1, OnSig);
|
||||
sprintf(cmd, "read a ; test \"x$a\" = xhello && kill -USR1 %d", getpid());
|
||||
ASSERT_NE(NULL, (f = popen(cmd, "w")));
|
||||
ASSERT_GE(fputs("hello", f), 0);
|
||||
ASSERT_EQ(0, pclose(f));
|
||||
ASSERT_EQ(1, gotsig);
|
||||
signal(SIGUSR1, SIG_DFL);
|
||||
}
|
||||
|
|
@ -29,20 +29,18 @@
|
|||
#include "libc/testlib/ezbench.h"
|
||||
#include "libc/testlib/testlib.h"
|
||||
|
||||
void SetUpOnce(void) {
|
||||
__enable_threads();
|
||||
}
|
||||
char testlib_enable_tmp_setup_teardown;
|
||||
|
||||
__attribute__((__constructor__)) static void init(void) {
|
||||
if (atoi(nulltoempty(getenv("THE_DOGE"))) == 42) {
|
||||
exit(42);
|
||||
switch (atoi(nulltoempty(getenv("THE_DOGE")))) {
|
||||
case 42:
|
||||
exit(42);
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
TEST(spawn, test) {
|
||||
if (atoi(nulltoempty(getenv("THE_DOGE"))) == 42) {
|
||||
exit(42);
|
||||
}
|
||||
int rc, ws, pid;
|
||||
char *prog = GetProgramExecutableName();
|
||||
char *args[] = {program_invocation_name, NULL};
|
||||
|
|
@ -53,6 +51,25 @@ TEST(spawn, test) {
|
|||
EXPECT_EQ(42, WEXITSTATUS(ws));
|
||||
}
|
||||
|
||||
TEST(spawn, pipe) {
|
||||
char buf[10];
|
||||
int p[2], pid, status;
|
||||
const char *pn = "./echo.com";
|
||||
posix_spawn_file_actions_t fa;
|
||||
testlib_extract("/zip/echo.com", "echo.com", 0755);
|
||||
ASSERT_SYS(0, 0, pipe(p));
|
||||
ASSERT_EQ(0, posix_spawn_file_actions_init(&fa));
|
||||
ASSERT_EQ(0, posix_spawn_file_actions_addclose(&fa, p[0]));
|
||||
ASSERT_EQ(0, posix_spawn_file_actions_adddup2(&fa, p[1], 1));
|
||||
ASSERT_EQ(0, posix_spawn_file_actions_addclose(&fa, p[1]));
|
||||
ASSERT_EQ(0, posix_spawnp(&pid, pn, &fa, 0, (char *[]){pn, "hello", 0}, 0));
|
||||
ASSERT_SYS(0, 0, close(p[1]));
|
||||
ASSERT_SYS(0, pid, waitpid(pid, &status, 0));
|
||||
ASSERT_SYS(0, 6, read(p[0], buf, sizeof(buf)));
|
||||
ASSERT_SYS(0, 0, close(p[0]));
|
||||
ASSERT_EQ(0, posix_spawn_file_actions_destroy(&fa));
|
||||
}
|
||||
|
||||
/*
|
||||
* BEST LINUX FORK+EXEC+EXIT+WAIT PERFORMANCE
|
||||
* The fastest it can go with fork() is 40µs
|
||||
|
|
|
|||
|
|
@ -29,27 +29,79 @@
|
|||
|
||||
char testlib_enable_tmp_setup_teardown;
|
||||
|
||||
TEST(system, testStdoutRedirect) {
|
||||
int ws;
|
||||
testlib_extract("/zip/echo.com", "echo.com", 0755);
|
||||
TEST(system, haveShell) {
|
||||
ASSERT_TRUE(system(0));
|
||||
ws = system("./echo.com hello >hello.txt");
|
||||
ASSERT_TRUE(WIFEXITED(ws));
|
||||
ASSERT_EQ(0, WEXITSTATUS(ws));
|
||||
}
|
||||
|
||||
TEST(system, echo) {
|
||||
ASSERT_EQ(0, system("echo hello >\"hello there.txt\""));
|
||||
EXPECT_STREQ("hello\n", _gc(xslurp("hello there.txt", 0)));
|
||||
}
|
||||
|
||||
TEST(system, exit) {
|
||||
ASSERT_EQ(123, WEXITSTATUS(system("exit 123")));
|
||||
}
|
||||
|
||||
TEST(system, testStdoutRedirect) {
|
||||
testlib_extract("/zip/echo.com", "echo.com", 0755);
|
||||
ASSERT_EQ(0, system("./echo.com hello >hello.txt"));
|
||||
EXPECT_STREQ("hello\n", _gc(xslurp("hello.txt", 0)));
|
||||
}
|
||||
|
||||
TEST(system, testStdoutRedirect_withSpacesInFilename) {
|
||||
int ws;
|
||||
testlib_extract("/zip/echo.com", "echo.com", 0755);
|
||||
ASSERT_TRUE(system(0));
|
||||
ws = system("./echo.com hello >\"hello there.txt\"");
|
||||
ASSERT_TRUE(WIFEXITED(ws));
|
||||
ASSERT_EQ(0, WEXITSTATUS(ws));
|
||||
ASSERT_EQ(0, system("./echo.com hello >\"hello there.txt\""));
|
||||
EXPECT_STREQ("hello\n", _gc(xslurp("hello there.txt", 0)));
|
||||
}
|
||||
|
||||
BENCH(system, bench) {
|
||||
testlib_extract("/zip/echo.com", "echo.com", 0755);
|
||||
EZBENCH2("system", donothing, system("./echo.com hi >/dev/null"));
|
||||
EZBENCH2("system cmd", donothing, system("./echo.com hi >/dev/null"));
|
||||
EZBENCH2("cocmd echo", donothing, system("echo hi >/dev/null"));
|
||||
EZBENCH2("cocmd exit", donothing, system("exit"));
|
||||
}
|
||||
|
||||
TEST(system, and) {
|
||||
ASSERT_EQ(1, WEXITSTATUS(system("false && false")));
|
||||
ASSERT_EQ(1, WEXITSTATUS(system("true&& false")));
|
||||
ASSERT_EQ(1, WEXITSTATUS(system("false &&true")));
|
||||
ASSERT_EQ(0, WEXITSTATUS(system("true&&true")));
|
||||
}
|
||||
|
||||
TEST(system, or) {
|
||||
ASSERT_EQ(1, WEXITSTATUS(system("false || false")));
|
||||
ASSERT_EQ(0, WEXITSTATUS(system("true|| false")));
|
||||
ASSERT_EQ(0, WEXITSTATUS(system("false ||true")));
|
||||
ASSERT_EQ(0, WEXITSTATUS(system("true||true")));
|
||||
}
|
||||
|
||||
TEST(system, async1) {
|
||||
ASSERT_EQ(123, WEXITSTATUS(system("exit 123 & "
|
||||
"wait $!")));
|
||||
}
|
||||
|
||||
TEST(system, async4) {
|
||||
ASSERT_EQ(0, WEXITSTATUS(system("echo a >a & "
|
||||
"echo b >b & "
|
||||
"echo c >c & "
|
||||
"echo d >d & "
|
||||
"wait")));
|
||||
ASSERT_TRUE(fileexists("a"));
|
||||
ASSERT_TRUE(fileexists("b"));
|
||||
ASSERT_TRUE(fileexists("c"));
|
||||
ASSERT_TRUE(fileexists("d"));
|
||||
}
|
||||
|
||||
TEST(system, equals) {
|
||||
setenv("var", "wand", true);
|
||||
ASSERT_EQ(0, WEXITSTATUS(system("test a = a")));
|
||||
ASSERT_EQ(1, WEXITSTATUS(system("test a = b")));
|
||||
ASSERT_EQ(0, WEXITSTATUS(system("test x$var = xwand")));
|
||||
ASSERT_EQ(0, WEXITSTATUS(system("[ a = a ]")));
|
||||
ASSERT_EQ(1, WEXITSTATUS(system("[ a = b ]")));
|
||||
}
|
||||
|
||||
TEST(system, notequals) {
|
||||
ASSERT_EQ(1, WEXITSTATUS(system("test a != a")));
|
||||
ASSERT_EQ(0, WEXITSTATUS(system("test a != b")));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -74,6 +74,26 @@ o/$(MODE)/test/libc/stdio/system_test.com.dbg: \
|
|||
$(APE_NO_MODIFY_SELF)
|
||||
@$(APELINK)
|
||||
|
||||
o/$(MODE)/test/libc/stdio/popen_test.com.dbg: \
|
||||
$(TEST_LIBC_STDIO_DEPS) \
|
||||
o/$(MODE)/test/libc/stdio/popen_test.o \
|
||||
o/$(MODE)/test/libc/stdio/stdio.pkg \
|
||||
o/$(MODE)/tool/build/echo.com.zip.o \
|
||||
$(LIBC_TESTMAIN) \
|
||||
$(CRT) \
|
||||
$(APE_NO_MODIFY_SELF)
|
||||
@$(APELINK)
|
||||
|
||||
o/$(MODE)/test/libc/stdio/spawn_test.com.dbg: \
|
||||
$(TEST_LIBC_STDIO_DEPS) \
|
||||
o/$(MODE)/test/libc/stdio/spawn_test.o \
|
||||
o/$(MODE)/test/libc/stdio/stdio.pkg \
|
||||
o/$(MODE)/tool/build/echo.com.zip.o \
|
||||
$(LIBC_TESTMAIN) \
|
||||
$(CRT) \
|
||||
$(APE_NO_MODIFY_SELF)
|
||||
@$(APELINK)
|
||||
|
||||
$(TEST_LIBC_STDIO_OBJS): private \
|
||||
DEFAULT_CCFLAGS += \
|
||||
-fno-builtin
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue