From 7d0a0206d85ab0338305a90c7d4f5afeb517f455 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 17 Dec 2006 20:22:20 +0000 Subject: [PATCH] Improve docs --- ChangeLog | 3 +++ docs/reference/ChangeLog | 3 +++ docs/reference/glib/tmpl/spawn.sgml | 4 ++-- glib/gspawn.c | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 18332867..6f842538 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2006-12-17 Matthias Clasen + * glib/gspawn.c: Refer to g_child_watch_add() in addition + to waitpid(). + * glib/gstrfuncs.c (g_strndup, g_strnfill): Move docs inline, and improve wording. (#372598, Behdad Esfahbod) diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog index c0deac4d..ace6f865 100644 --- a/docs/reference/ChangeLog +++ b/docs/reference/ChangeLog @@ -1,5 +1,8 @@ 2006-12-17 Matthias Clasen + * glib/tmpl/spawn.sgml: Refer to g_child_watch_add() in addition + to waitpid(). + * gobject/tmpl/objects.sgml: Expand GObject::notify documentation. (#381722, Nickolay V. Shmyrev) diff --git a/docs/reference/glib/tmpl/spawn.sgml b/docs/reference/glib/tmpl/spawn.sgml index 87143369..a14ba126 100644 --- a/docs/reference/glib/tmpl/spawn.sgml +++ b/docs/reference/glib/tmpl/spawn.sgml @@ -61,8 +61,8 @@ Flags passed to g_spawn_sync(), g_spawn_async() and g_spawn_async_with_pipes(). inherited by the child; otherwise all descriptors except stdin/stdout/stderr will be closed before calling exec() in the child. @G_SPAWN_DO_NOT_REAP_CHILD: the child will not be automatically reaped; you - must call waitpid() or handle SIGCHLD - yourself, or the child will become a zombie. + must use g_child_watch_add() yourself (or call waitpid() + or handle SIGCHLD yourself), or the child will become a zombie. @G_SPAWN_SEARCH_PATH: argv[0] need not be an absolute path, it will be looked for in the user's PATH. @G_SPAWN_STDOUT_TO_DEV_NULL: the child's standad output will be discarded, diff --git a/glib/gspawn.c b/glib/gspawn.c index ea183a59..2cd8cc17 100644 --- a/glib/gspawn.c +++ b/glib/gspawn.c @@ -529,7 +529,7 @@ g_spawn_sync (const gchar *working_directory, * * If non-%NULL, @child_pid will on Unix be filled with the child's * process ID. You can use the process ID to send signals to the - * child, or to waitpid() if you specified the + * child, or to use g_child_watch_add() (or waitpid()) if you specified the * %G_SPAWN_DO_NOT_REAP_CHILD flag. On Windows, @child_pid will be * filled with a handle to the child process only if you specified the * %G_SPAWN_DO_NOT_REAP_CHILD flag. You can then access the child -- 2.34.1