mirrors/cosmopolitan
1
0
Fork 0
mirror of https://github.com/jart/cosmopolitan.git synced 2025-08-09 11:20:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move closing file descriptors during daemonization earlier

Browse source 
This should fix using opened file descriptors, for example, SQLite DB
files and redbean itself when StoreAsset is used. Fixes #182.
This commit is contained in:
Paul Kulchenko 2022-07-22 22:44:06 -07:00
parent fa4174a0ad
commit f19347eb2f
1 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

18
tool/net/redbean.c
View file

@ -1044,15 +1044,10 @@ static void ChangeUser(void) {
static void Daemonize(void) { static void Daemonize(void) {
char ibuf[21]; char ibuf[21];
int i, fd, pid; int fd;
for (i = 0; i < 256; ++i) { if (fork() > 0) exit(0);
if (!IsServerFd(i)) {
close(i);
}
}
if ((pid = fork()) > 0) exit(0);
setsid(); setsid();
if ((pid = fork()) > 0) _exit(0); if (fork() > 0) _exit(0);
umask(0); umask(0);
if (pidpath) { if (pidpath) {
fd = open(pidpath, O_CREAT | O_WRONLY, 0644); fd = open(pidpath, O_CREAT | O_WRONLY, 0644);
@ -7309,6 +7304,13 @@ void RedBean(int argc, char *argv[]) {
(shared = mmap(NULL, ROUNDUP(sizeof(struct Shared), FRAMESIZE), (shared = mmap(NULL, ROUNDUP(sizeof(struct Shared), FRAMESIZE),
PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS,
-1, 0))); -1, 0)));
if (daemonize) {
for (int i = 0; i < 256; ++i) {
if (!IsServerFd(i)) {
close(i);
}
}
}
zpath = GetProgramExecutableName(); zpath = GetProgramExecutableName();
CHECK_NE(-1, (zfd = open(zpath, O_RDONLY))); CHECK_NE(-1, (zfd = open(zpath, O_RDONLY)));
CHECK_NE(-1, fstat(zfd, &zst)); CHECK_NE(-1, fstat(zfd, &zst));