From d21c1de651807373b01a047f86fd5203ab2922e2 Mon Sep 17 00:00:00 2001
From: SDL Wiki Bot <[EMAIL REDACTED]>
Date: Fri, 13 Sep 2024 22:20:35 +0000
Subject: [PATCH] Sync SDL3 wiki -> header
---
include/SDL3/SDL_iostream.h | 13 ++-
include/SDL3/SDL_process.h | 221 ++++++++++++++++++++++++------------
2 files changed, 159 insertions(+), 75 deletions(-)
diff --git a/include/SDL3/SDL_iostream.h b/include/SDL3/SDL_iostream.h
index 745e35aae1123..f026cca310e4c 100644
--- a/include/SDL3/SDL_iostream.h
+++ b/include/SDL3/SDL_iostream.h
@@ -244,7 +244,8 @@ typedef struct SDL_IOStream SDL_IOStream;
* than your app, trying to use this pointer will almost certainly result in
* a crash! This is mostly a problem on Windows; make sure you build SDL and
* your app with the same compiler and settings to avoid it.
- * - `SDL_PROP_IOSTREAM_FILE_DESCRIPTOR_NUMBER`: a file descriptor that this SDL_IOStream is using to access the filesystem.
+ * - `SDL_PROP_IOSTREAM_FILE_DESCRIPTOR_NUMBER`: a file descriptor that this
+ * SDL_IOStream is using to access the filesystem.
* - `SDL_PROP_IOSTREAM_ANDROID_AASSET_POINTER`: a pointer, that can be cast
* to an Android NDK `AAsset *`, that this SDL_IOStream is using to access
* the filesystem. If SDL used some other method to access the filesystem,
@@ -480,7 +481,8 @@ extern SDL_DECLSPEC Sint64 SDLCALL SDL_GetIOSize(SDL_IOStream *context);
* negative.
* \param whence any of `SDL_IO_SEEK_SET`, `SDL_IO_SEEK_CUR`,
* `SDL_IO_SEEK_END`.
- * \returns the final offset in the data stream after the seek or -1 on failure; call SDL_GetError() for more information.
+ * \returns the final offset in the data stream after the seek or -1 on
+ * failure; call SDL_GetError() for more information.
*
* \since This function is available since SDL 3.0.0.
*
@@ -598,7 +600,9 @@ extern SDL_DECLSPEC size_t SDLCALL SDL_IOvprintf(SDL_IOStream *context, SDL_PRIN
/**
* Flush any buffered data in the stream.
*
- * This function makes sure that any buffered data is written to the stream. Normally this isn't necessary but if the stream is a pipe or socket it guarantees that any pending data is sent.
+ * This function makes sure that any buffered data is written to the stream.
+ * Normally this isn't necessary but if the stream is a pipe or socket it
+ * guarantees that any pending data is sent.
*
* \param context SDL_IOStream structure to flush.
* \returns SDL_TRUE on success or SDL_FALSE on failure; call SDL_GetError()
@@ -621,7 +625,8 @@ extern SDL_DECLSPEC SDL_bool SDLCALL SDL_FlushIO(SDL_IOStream *context);
* The data should be freed with SDL_free().
*
* \param src the SDL_IOStream to read all available data from.
- * \param datasize a pointer filled in with the number of bytes read, may be NULL.
+ * \param datasize a pointer filled in with the number of bytes read, may be
+ * NULL.
* \param closeio if SDL_TRUE, calls SDL_CloseIO() on `src` before returning,
* even in the case of an error.
* \returns the data or NULL on failure; call SDL_GetError() for more
diff --git a/include/SDL3/SDL_process.h b/include/SDL3/SDL_process.h
index fc0926333fd48..609c4c4df4ad9 100644
--- a/include/SDL3/SDL_process.h
+++ b/include/SDL3/SDL_process.h
@@ -27,9 +27,13 @@
* These functions provide a cross-platform way to spawn and manage OS-level
* processes.
*
- * You can create a new subprocess with SDL_CreateProcess() and optionally read and write to it using SDL_ReadProcess() and SDL_WriteProcess(). If more advanced functionality like chaining input between processes is necessary, you can use SDL_CreateProcessWithProperties().
+ * You can create a new subprocess with SDL_CreateProcess() and optionally
+ * read and write to it using SDL_ReadProcess() and SDL_WriteProcess(). If
+ * more advanced functionality like chaining input between processes is
+ * necessary, you can use SDL_CreateProcessWithProperties().
*
- * You can get the status of a created process with SDL_WaitProcess(), or terminate the process with SDL_KillProcess().
+ * You can get the status of a created process with SDL_WaitProcess(), or
+ * terminate the process with SDL_KillProcess().
*
* Don't forget to call SDL_DestroyProcess() to clean up, whether the process
* process was killed, terminated on its own, or is still running!
@@ -51,19 +55,32 @@ typedef struct SDL_Process SDL_Process;
/**
* Create a new process.
*
- * The path to the executable is supplied in args[0]. args[1..N] are additional arguments passed on the command line of the new process, and the argument list should be terminated with a NULL, e.g.:
+ * The path to the executable is supplied in args[0]. args[1..N] are
+ * additional arguments passed on the command line of the new process, and the
+ * argument list should be terminated with a NULL, e.g.:
*
* ```c
* const char *args[] = { "myprogram", "argument", NULL };
* ```
*
- * Setting pipe_stdio to SDL_TRUE is equivalent to setting `SDL_PROP_PROCESS_CREATE_STDIN_NUMBER` and `SDL_PROP_PROCESS_CREATE_STDOUT_NUMBER` to `SDL_PROCESS_STDIO_APP`, and will allow the use of SDL_ReadProcess() and SDL_WriteProcess().
+ * Setting pipe_stdio to SDL_TRUE is equivalent to setting
+ * `SDL_PROP_PROCESS_CREATE_STDIN_NUMBER` and
+ * `SDL_PROP_PROCESS_CREATE_STDOUT_NUMBER` to `SDL_PROCESS_STDIO_APP`, and
+ * will allow the use of SDL_ReadProcess() and SDL_WriteProcess().
*
* See SDL_CreateProcessWithProperties() for more details.
*
* \param args the path and arguments for the new process.
- * \param pipe_stdio SDL_TRUE to create pipes to the process's standard input and from the process's standard output, SDL_FALSE for the process to have no input and inherit the application's standard output.
- * \returns the newly created and running process, or NULL if the process couldn't be created.
+ * \param pipe_stdio SDL_TRUE to create pipes to the process's standard input
+ * and from the process's standard output, SDL_FALSE for the
+ * process to have no input and inherit the application's
+ * standard output.
+ * \returns the newly created and running process, or NULL if the process
+ * couldn't be created.
+ *
+ * \threadsafety It is safe to call this function from any thread.
+ *
+ * \since This function is available since SDL 3.0.0.
*
* \sa SDL_CreateProcessWithProperties
* \sa SDL_GetProcessProperties
@@ -72,32 +89,48 @@ typedef struct SDL_Process SDL_Process;
* \sa SDL_KillProcess
* \sa SDL_WaitProcess
* \sa SDL_DestroyProcess
- *
- * \threadsafety It is safe to call this function from any thread.
- *
- * \since This function is available since SDL 3.0.0.
*/
extern SDL_DECLSPEC SDL_Process *SDLCALL SDL_CreateProcess(const char * const *args, SDL_bool pipe_stdio);
/**
- * Description of where standard I/O should be directed when creating a process.
+ * Description of where standard I/O should be directed when creating a
+ * process.
+ *
+ * If a standard I/O stream is set to SDL_PROCESS_STDIO_INHERIT, it will go to
+ * the same place as the application's I/O stream. This is the default for
+ * standard output and standard error.
+ *
+ * If a standard I/O stream is set to SDL_PROCESS_STDIO_NULL, it is connected
+ * to `NUL:` on Windows and `/dev/null` on POSIX systems. This is the default
+ * for standard input.
+ *
+ * If a standard I/O stream is set to SDL_PROCESS_STDIO_APP, it is connected
+ * to a new SDL_IOStream that is available to the application. Standard input
+ * will be available as `SDL_PROP_PROCESS_STDIN_POINTER` and allows
+ * SDL_WriteProcess(), standard output will be available as
+ * `SDL_PROP_PROCESS_STDOUT_POINTER` and allows SDL_ReadProcess(), and
+ * standard error will be available as `SDL_PROP_PROCESS_STDERR_POINTER` in
+ * the properties for the created process.
+ *
+ * If a standard I/O stream is set to SDL_PROCESS_STDIO_REDIRECT, it is
+ * connected to an existing SDL_IOStream provided by the application. Standard
+ * input is provided using `SDL_PROP_PROCESS_CREATE_STDIN_POINTER`, standard
+ * output is provided using `SDL_PROP_PROCESS_CREATE_STDOUT_POINTER`, and
+ * standard error is provided using `SDL_PROP_PROCESS_CREATE_STDERR_POINTER`
+ * in the creation properties. These existing streams should be closed by the
+ * application once the new process is created.
+ *
+ * In order to use an SDL_IOStream with SDL_PROCESS_STDIO_REDIRECT, it must
+ * have `SDL_PROP_IOSTREAM_WINDOWS_HANDLE_POINTER` or
+ * `SDL_PROP_IOSTREAM_FILE_DESCRIPTOR_NUMBER` set. This is true for streams
+ * representing files and process I/O.
*
- * If a standard I/O stream is set to SDL_PROCESS_STDIO_INHERIT, it will go to the same place as the application's I/O stream. This is the default for standard output and standard error.
- *
- * If a standard I/O stream is set to SDL_PROCESS_STDIO_NULL, it is connected to `NUL:` on Windows and `/dev/null` on POSIX systems. This is the default for standard input.
- *
- * If a standard I/O stream is set to SDL_PROCESS_STDIO_APP, it is connected to a new SDL_IOStream that is available to the application. Standard input will be available as `SDL_PROP_PROCESS_STDIN_POINTER` and allows SDL_WriteProcess(), standard output will be available as `SDL_PROP_PROCESS_STDOUT_POINTER` and allows SDL_ReadProcess(), and standard error will be available as `SDL_PROP_PROCESS_STDERR_POINTER` in the properties for the created process.
- *
- * If a standard I/O stream is set to SDL_PROCESS_STDIO_REDIRECT, it is connected to an existing SDL_IOStream provided by the application. Standard input is provided using `SDL_PROP_PROCESS_CREATE_STDIN_POINTER`, standard output is provided using `SDL_PROP_PROCESS_CREATE_STDOUT_POINTER`, and standard error is provided using `SDL_PROP_PROCESS_CREATE_STDERR_POINTER` in the creation properties. These existing streams should be closed by the application once the new process is created.
- *
- * In order to use an SDL_IOStream with SDL_PROCESS_STDIO_REDIRECT, it must have `SDL_PROP_IOSTREAM_WINDOWS_HANDLE_POINTER` or `SDL_PROP_IOSTREAM_FILE_DESCRIPTOR_NUMBER` set. This is true for streams representing files and process I/O.
+ * \since This enum is available since SDL 3.0.0.
*
* \sa SDL_CreateProcessWithProperties
* \sa SDL_GetProcessProperties
* \sa SDL_ReadProcess
* \sa SDL_WriteProcess
- *
- * \since This enum is available since SDL 3.0.0.
*/
typedef enum SDL_ProcessIO
{
@@ -112,20 +145,49 @@ typedef enum SDL_ProcessIO
*
* These are the supported properties:
*
- * - `SDL_PROP_PROCESS_CREATE_ARGS_POINTER`: an array of strings containing the program to run, any arguments, and a NULL pointer, e.g. const char *args[] = { "myprogram", "argument", NULL }. This is a required property.
- * - `SDL_PROP_PROCESS_CREATE_ENVIRONMENT_POINTER`: an array of strings containing variable=value, and a NULL pointer, e.g. const char *env[] = { "PATH=/bin:/usr/bin", NULL }. If this property is set, it will be the entire environment for the process, otherwise the current environment is used.
- * - `SDL_PROP_PROCESS_CREATE_STDIN_NUMBER`: an SDL_ProcessIO value describing where standard input for the process comes from, defaults to `SDL_PROCESS_STDIO_NULL`.
- * - `SDL_PROP_PROCESS_CREATE_STDIN_POINTER`: an SDL_IOStream pointer used for standard input when `SDL_PROP_PROCESS_CREATE_STDIN_NUMBER` is set to `SDL_PROCESS_STDIO_REDIRECT`.
- * - `SDL_PROP_PROCESS_CREATE_STDOUT_NUMBER`: an SDL_ProcessIO value describing where standard output for the process goes go, defaults to `SDL_PROCESS_STDIO_INHERITED`.
- * - `SDL_PROP_PROCESS_CREATE_STDOUT_POINTER`: an SDL_IOStream pointer used for standard output when `SDL_PROP_PROCESS_CREATE_STDOUT_NUMBER` is set to `SDL_PROCESS_STDIO_REDIRECT`.
- * - `SDL_PROP_PROCESS_CREATE_STDERR_NUMBER`: an SDL_ProcessIO value describing where standard error for the process goes go, defaults to `SDL_PROCESS_STDIO_INHERITED`.
- * - `SDL_PROP_PROCESS_CREATE_STDERR_POINTER`: an SDL_IOStream pointer used for standard error when `SDL_PROP_PROCESS_CREATE_STDERR_NUMBER` is set to `SDL_PROCESS_STDIO_REDIRECT`.
- * - `SDL_PROP_PROCESS_CREATE_STDERR_TO_STDOUT_BOOLEAN`: true if the error output of the process should be redirected into the standard output of the process. This property has no effect if `SDL_PROP_PROCESS_CREATE_STDERR_NUMBER` is set.
- *
- * On POSIX platforms, wait() and waitpid(-1, ...) should not be called, and SIGCHLD should not be ignored or handled because those would prevent SDL from properly tracking the lifetime of the underlying process. You should use SDL_WaitProcess() instead.
+ * - `SDL_PROP_PROCESS_CREATE_ARGS_POINTER`: an array of strings containing
+ * the program to run, any arguments, and a NULL pointer, e.g. const char
+ * *args[] = { "myprogram", "argument", NULL }. This is a required property.
+ * - `SDL_PROP_PROCESS_CREATE_ENVIRONMENT_POINTER`: an array of strings
+ * containing variable=value, and a NULL pointer, e.g. const char *env[] = {
+ * "PATH=/bin:/usr/bin", NULL }. If this property is set, it will be the
+ * entire environment for the process, otherwise the current environment is
+ * used.
+ * - `SDL_PROP_PROCESS_CREATE_STDIN_NUMBER`: an SDL_ProcessIO value describing
+ * where standard input for the process comes from, defaults to
+ * `SDL_PROCESS_STDIO_NULL`.
+ * - `SDL_PROP_PROCESS_CREATE_STDIN_POINTER`: an SDL_IOStream pointer used for
+ * standard input when `SDL_PROP_PROCESS_CREATE_STDIN_NUMBER` is set to
+ * `SDL_PROCESS_STDIO_REDIRECT`.
+ * - `SDL_PROP_PROCESS_CREATE_STDOUT_NUMBER`: an SDL_ProcessIO value
+ * describing where standard output for the process goes go, defaults to
+ * `SDL_PROCESS_STDIO_INHERITED`.
+ * - `SDL_PROP_PROCESS_CREATE_STDOUT_POINTER`: an SDL_IOStream pointer used
+ * for standard output when `SDL_PROP_PROCESS_CREATE_STDOUT_NUMBER` is set
+ * to `SDL_PROCESS_STDIO_REDIRECT`.
+ * - `SDL_PROP_PROCESS_CREATE_STDERR_NUMBER`: an SDL_ProcessIO value
+ * describing where standard error for the process goes go, defaults to
+ * `SDL_PROCESS_STDIO_INHERITED`.
+ * - `SDL_PROP_PROCESS_CREATE_STDERR_POINTER`: an SDL_IOStream pointer used
+ * for standard error when `SDL_PROP_PROCESS_CREATE_STDERR_NUMBER` is set to
+ * `SDL_PROCESS_STDIO_REDIRECT`.
+ * - `SDL_PROP_PROCESS_CREATE_STDERR_TO_STDOUT_BOOLEAN`: true if the error
+ * output of the process should be redirected into the standard output of
+ * the process. This property has no effect if
+ * `SDL_PROP_PROCESS_CREATE_STDERR_NUMBER` is set.
+ *
+ * On POSIX platforms, wait() and waitpid(-1, ...) should not be called, and
+ * SIGCHLD should not be ignored or handled because those would prevent SDL
+ * from properly tracking the lifetime of the underlying process. You should
+ * use SDL_WaitProcess() instead.
*
* \param props the properties to use.
- * \returns the newly created and running process, or NULL if the process couldn't be created.
+ * \returns the newly created and running process, or NULL if the process
+ * couldn't be created.
+ *
+ * \threadsafety It is safe to call this function from any thread.
+ *
+ * \since This function is available since SDL 3.0.0.
*
* \sa SDL_CreateProcess
* \sa SDL_GetProcessProperties
@@ -134,10 +196,6 @@ typedef enum SDL_ProcessIO
* \sa SDL_KillProcess
* \sa SDL_WaitProcess
* \sa SDL_DestroyProcess
- *
- * \threadsafety It is safe to call this function from any thread.
- *
- * \since This function is available since SDL 3.0.0.
*/
extern SDL_DECLSPEC SDL_Process *SDLCALL SDL_CreateProcessWithProperties(SDL_PropertiesID props);
@@ -182,9 +240,13 @@ extern SDL_DECLSPEC SDL_PropertiesID SDL_GetProcessProperties(SDL_Process *proce
/**
* Read all the output from a process.
*
- * If a process was created with I/O enabled, you can use this function to read the output. This function blocks until the process is complete, capturing all output, and providing the process exit code.
+ * If a process was created with I/O enabled, you can use this function to
+ * read the output. This function blocks until the process is complete,
+ * capturing all output, and providing the process exit code.
*
- * This is just a convenience function. If you need more control over the process, you can get the output stream from the process properties and read it directly.
+ * This is just a convenience function. If you need more control over the
+ * process, you can get the output stream from the process properties and read
+ * it directly.
*
* The data is allocated with a zero byte at the end (null terminated) for
* convenience. This extra byte is not included in the value reported via
@@ -193,47 +255,54 @@ extern SDL_DECLSPEC SDL_PropertiesID SDL_GetProcessProperties(SDL_Process *proce
* The data should be freed with SDL_free().
*
* \param process The process to read.
- * \param datasize a pointer filled in with the number of bytes read, may be NULL.
- * \param exitcode a pointer filled in with the process exit code if the process has exited, may be NULL.
+ * \param datasize a pointer filled in with the number of bytes read, may be
+ * NULL.
+ * \param exitcode a pointer filled in with the process exit code if the
+ * process has exited, may be NULL.
* \returns the data or NULL on failure; call SDL_GetError() for more
* information.
*
+ * \threadsafety This function is not thread safe.
+ *
+ * \since This function is available since SDL 3.0.0.
+ *
* \sa SDL_CreateProcess
* \sa SDL_CreateProcessWithProperties
* \sa SDL_GetProcessProperties
* \sa SDL_WriteProcess
* \sa SDL_DestroyProcess
- *
- * \threadsafety This function is not thread safe.
- *
- * \since This function is available since SDL 3.0.0.
*/
extern SDL_DECLSPEC void * SDLCALL SDL_ReadProcess(SDL_Process *process, size_t *datasize, int *exitcode);
/**
* Write to a process.
*
- * If a process was created with I/O enabled, you can use this function to send data as input to the process. This function blocks until the data is written.
+ * If a process was created with I/O enabled, you can use this function to
+ * send data as input to the process. This function blocks until the data is
+ * written.
*
- * This is just a convenience function. If the process is structured so it takes large amounts of input and generates lots of output, you should get the input and output streams from the process properties and handle them simultaneously to prevent the process from being blocked waiting for I/O.
+ * This is just a convenience function. If the process is structured so it
+ * takes large amounts of input and generates lots of output, you should get
+ * the input and output streams from the process properties and handle them
+ * simultaneously to prevent the process from being blocked waiting for I/O.
*
* \param process The process to write.
* \param ptr a pointer to a buffer containing data to write.
* \param size the number of bytes to write.
- * \param closeio if SDL_TRUE, closes the process input before returning,
- * even in the case of an error.
+ * \param closeio if SDL_TRUE, closes the process input before returning, even
+ * in the case of an error.
* \returns SDL_TRUE on success or SDL_FALSE on failure; call SDL_GetError()
* for more information.
*
+ * \threadsafety This function is not thread safe.
+ *
+ * \since This function is available since SDL 3.0.0.
+ *
* \sa SDL_CreateProcess
* \sa SDL_CreateProcessWithProperties
* \sa SDL_GetProcessProperties
* \sa SDL_ReadProcess
* \sa SDL_DestroyProcess
- *
- * \threadsafety This function is not thread safe.
- *
- * \since This function is available since SDL 3.0.0.
*/
extern SDL_DECLSPEC SDL_bool SDLCALL SDL_WriteProcess(SDL_Process *process, const void *ptr, size_t size, SDL_bool closeio);
@@ -241,18 +310,22 @@ extern SDL_DECLSPEC SDL_bool SDLCALL SDL_WriteProcess(SDL_Process *process, cons
* Stop a process.
*
* \param process The process to stop.
- * \param force SDL_TRUE to terminate the process immediately, SDL_FALSE to try to stop the process gracefully. In general you should try to stop the process gracefully first as terminating a process may leave it with half-written data or in some other unstable state.
+ * \param force SDL_TRUE to terminate the process immediately, SDL_FALSE to
+ * try to stop the process gracefully. In general you should try
+ * to stop the process gracefully first as terminating a process
+ * may leave it with half-written data or in some other unstable
+ * state.
* \returns SDL_TRUE on success or SDL_FALSE on failure; call SDL_GetError()
* for more information.
*
+ * \threadsafety This function is not thread safe.
+ *
+ * \since This function is available since SDL 3.0.0.
+ *
* \sa SDL_CreateProcess
* \sa SDL_CreateProcessWithProperties
* \sa SDL_WaitProcess
* \sa SDL_DestroyProcess
- *
- * \threadsafety This function is not thread safe.
- *
- * \since This function is available since SDL 3.0.0.
*/
extern SDL_DECLSPEC SDL_bool SDLCALL SDL_KillProcess(SDL_Process *process, SDL_bool force);
@@ -261,38 +334,44 @@ extern SDL_DECLSPEC SDL_bool SDLCALL SDL_KillProcess(SDL_Process *process, SDL_b
*
* This can be called multiple times to get the status of a process.
*
- * The exit code will be the exit code of the process if it terminates normally, a negative signal if it terminated due to a signal, or -255 otherwise. It will not be changed if the process is still running.
+ * The exit code will be the exit code of the process if it terminates
+ * normally, a negative signal if it terminated due to a signal, or -255
+ * otherwise. It will not be changed if the process is still running.
*
* \param process The process to wait for.
- * \param block If true, block until the process finishes; otherwise, report on the process' status.
- * \param exitcode a pointer filled in with the process exit code if the process has exited, may be NULL.
+ * \param block If true, block until the process finishes; otherwise, report
+ * on the process' status.
+ * \param exitcode a pointer filled in with the process exit code if the
+ * process has exited, may be NULL.
* \returns SDL_TRUE if the process exited, SDL_FALSE otherwise.
*
+ * \threadsafety This function is not thread safe.
+ *
+ * \since This function is available since SDL 3.0.0.
+ *
* \sa SDL_CreateProcess
* \sa SDL_CreateProcessWithProperties
* \sa SDL_KillProcess
* \sa SDL_DestroyProcess
- *
- * \threadsafety This function is not thread safe.
- *
- * \since This function is available since SDL 3.0.0.
*/
extern SDL_DECLSPEC SDL_bool SDLCALL SDL_WaitProcess(SDL_Process *process, SDL_bool block, int *exitcode);
/**
* Destroy a previously created process object.
*
- * Note that this does not stop the process, just destroys the SDL object used to track it. If you want to stop the process you should use SDL_KillProcess().
+ * Note that this does not stop the process, just destroys the SDL object used
+ * to track it. If you want to stop the process you should use
+ * SDL_KillProcess().
*
* \param process The process object to destroy.
*
- * \sa SDL_CreateProcess
- * \sa SDL_CreateProcessWithProperties
- * \sa SDL_KillProcess
- *
* \threadsafety This function is not thread safe.
*
* \since This function is available since SDL 3.0.0.
+ *
+ * \sa SDL_CreateProcess
+ * \sa SDL_CreateProcessWithProperties
+ * \sa SDL_KillProcess
*/
extern SDL_DECLSPEC void SDLCALL SDL_DestroyProcess(SDL_Process *process);