mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-04-07 08:21:02 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

spawn: don’t error out if we fail to chdir()

Browse source
This commit is contained in:
Daniel Eklöf 2021-08-30 17:55:36 +02:00
parent 064121ee95
commit ac30da7a01
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -76,6 +76,8 @@
now translated to pixel values using the monitor’s scaling factor now translated to pixel values using the monitor’s scaling factor
when `dpi-aware=no`, or `dpi-aware=auto` and the scaling factor is when `dpi-aware=no`, or `dpi-aware=auto` and the scaling factor is
larger than 1 (https://codeberg.org/dnkl/foot/issues/680). larger than 1 (https://codeberg.org/dnkl/foot/issues/680).
* Spawning a new terminal with a working directory that does not exist
is no longer a fatal error.
### Removed ### Removed

6
spawn.c
View file

@ -48,6 +48,11 @@ spawn(struct reaper *reaper, const char *cwd, char *const argv[],
if (sigaction(SIGHUP, &(struct sigaction){.sa_handler = SIG_DFL}, NULL) < 0) if (sigaction(SIGHUP, &(struct sigaction){.sa_handler = SIG_DFL}, NULL) < 0)
goto child_err; goto child_err;
if (cwd != NULL && chdir(cwd) < 0) {
LOG_WARN("failed to change working directory to %s: %s",
cwd, strerror(errno));
}
bool close_stderr = stderr_fd >= 0; bool close_stderr = stderr_fd >= 0;
bool close_stdout = stdout_fd >= 0 && stdout_fd != stderr_fd; bool close_stdout = stdout_fd >= 0 && stdout_fd != stderr_fd;
bool close_stdin = stdin_fd >= 0 && stdin_fd != stdout_fd && stdin_fd != stderr_fd; bool close_stdin = stdin_fd >= 0 && stdin_fd != stdout_fd && stdin_fd != stderr_fd;
@ -58,7 +63,6 @@ spawn(struct reaper *reaper, const char *cwd, char *const argv[],
|| (close_stdout && close(stdout_fd) < 0))) || || (close_stdout && close(stdout_fd) < 0))) ||
(stderr_fd >= 0 && (dup2(stderr_fd, STDERR_FILENO) < 0 (stderr_fd >= 0 && (dup2(stderr_fd, STDERR_FILENO) < 0
|| (close_stderr && close(stderr_fd) < 0))) || || (close_stderr && close(stderr_fd) < 0))) ||
(cwd != NULL && chdir(cwd) < 0) ||
execvp(argv[0], argv) < 0) execvp(argv[0], argv) < 0)
{ {
goto child_err; goto child_err;