diff options
| author | Eli Zaretskii | 2023-10-07 03:48:00 -0400 |
|---|---|---|
| committer | Eli Zaretskii | 2023-10-07 03:48:00 -0400 |
| commit | 5384619921783bc6d411ea88976ea55b1198ed91 (patch) | |
| tree | 00771c6c29945109eb722063e8dfb6823bff542c /src/process.c | |
| parent | 2132d8d8dd61424af33f5b7d7543d8d30120aec3 (diff) | |
| parent | a74e51cfd1518507220de2ba317bb862409541cf (diff) | |
| download | emacs-5384619921783bc6d411ea88976ea55b1198ed91.tar.gz emacs-5384619921783bc6d411ea88976ea55b1198ed91.zip | |
Merge from origin/emacs-29
a74e51cfd15 Fix a defcustom :type
c27b90d04bf Fix 'ido--ffap-find-file'
1594d5f17ad Fix setting the pipe capacity for subprocesses
aad8b5d78f3 Handle LANG on macOS differently (bug#65908)
# Conflicts:
# src/process.c
Diffstat (limited to 'src/process.c')
| -rw-r--r-- | src/process.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/process.c b/src/process.c index 2376d0f288d..e885f771139 100644 --- a/src/process.c +++ b/src/process.c | |||
| @@ -2206,10 +2206,15 @@ create_process (Lisp_Object process, char **new_argv, Lisp_Object current_dir) | |||
| 2206 | inchannel = p->open_fd[READ_FROM_SUBPROCESS]; | 2206 | inchannel = p->open_fd[READ_FROM_SUBPROCESS]; |
| 2207 | forkout = p->open_fd[SUBPROCESS_STDOUT]; | 2207 | forkout = p->open_fd[SUBPROCESS_STDOUT]; |
| 2208 | 2208 | ||
| 2209 | #if (defined (GNU_LINUX) || defined __ANDROID__) \ | 2209 | #if defined(F_SETPIPE_SZ) && defined(F_GETPIPE_SZ) |
| 2210 | && defined (F_SETPIPE_SZ) | 2210 | /* If they requested larger reads than the default system pipe |
| 2211 | fcntl (inchannel, F_SETPIPE_SZ, read_process_output_max); | 2211 | capacity, try enlarging the capacity to match the request. */ |
| 2212 | #endif /* (GNU_LINUX || __ANDROID__) && F_SETPIPE_SZ */ | 2212 | if (read_process_output_max > fcntl (inchannel, F_GETPIPE_SZ)) |
| 2213 | { | ||
| 2214 | int readmax = clip_to_bounds (1, read_process_output_max, INT_MAX); | ||
| 2215 | fcntl (inchannel, F_SETPIPE_SZ, readmax); | ||
| 2216 | } | ||
| 2217 | #endif | ||
| 2213 | } | 2218 | } |
| 2214 | 2219 | ||
| 2215 | if (!NILP (p->stderrproc)) | 2220 | if (!NILP (p->stderrproc)) |