mirrors/cosmopolitan
1
0
Fork 0
mirror of https://github.com/jart/cosmopolitan.git synced 2025-03-03 15:38:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix redbean browser launch before server starts (#359)

Browse source
This commit is contained in:
Paul Kulchenko 2022-03-04 17:41:19 -08:00 • committed by GitHub
parent d6a039821f
commit d938b89f4f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
tool/net/redbean.c
View file

@ -2566,13 +2566,19 @@ static void LaunchBrowser(const char *path) {
const char *u, *prog; const char *u, *prog;
sigset_t chldmask, savemask; sigset_t chldmask, savemask;
struct sigaction ignore, saveint, savequit; struct sigaction ignore, saveint, savequit;
uint16_t port = 80;
path = firstnonnull(path, "/"); path = firstnonnull(path, "/");
addr = serveraddr->sin_addr; // use the first server address if there is at least one server
if (!addr.s_addr) addr.s_addr = htonl(INADDR_LOOPBACK); if (servers.n) {
addr = servers.p[0].addr.sin_addr;
port = ntohs(servers.p[0].addr.sin_port);
}
// assign a loopback address if no server or unknown server address
if (!servers.n || !addr.s_addr) addr.s_addr = htonl(INADDR_LOOPBACK);
if (*path != '/') path = gc(xasprintf("/%s", path)); if (*path != '/') path = gc(xasprintf("/%s", path));
if ((prog = commandv(GetSystemUrlLauncherCommand(), gc(malloc(PATH_MAX))))) { if ((prog = commandv(GetSystemUrlLauncherCommand(), gc(malloc(PATH_MAX))))) {
u = gc(xasprintf("http://%s:%d%s", inet_ntoa(addr), u = gc(xasprintf("http://%s:%d%s", inet_ntoa(addr),
ntohs(serveraddr->sin_port), gc(EscapePath(path, -1, 0)))); port, gc(EscapePath(path, -1, 0))));
DEBUGF("(srvr) opening browser with command %`'s %s", prog, u); DEBUGF("(srvr) opening browser with command %`'s %s", prog, u);
ignore.sa_flags = 0; ignore.sa_flags = 0;
ignore.sa_handler = SIG_IGN; ignore.sa_handler = SIG_IGN;