diff options
Diffstat (limited to 'libkdenetwork/libgpgme-copy')
| -rw-r--r-- | libkdenetwork/libgpgme-copy/assuan/assuan-pipe-connect.c | 4 | ||||
| -rw-r--r-- | libkdenetwork/libgpgme-copy/gpgme/io.h | 2 | ||||
| -rw-r--r-- | libkdenetwork/libgpgme-copy/gpgme/posix-io.c | 6 | ||||
| -rw-r--r-- | libkdenetwork/libgpgme-copy/gpgme/priv-io.h | 2 | ||||
| -rw-r--r-- | libkdenetwork/libgpgme-copy/gpgme/rungpg.c | 22 | ||||
| -rw-r--r-- | libkdenetwork/libgpgme-copy/gpgme/w32-io.c | 6 |
6 files changed, 21 insertions, 21 deletions
diff --git a/libkdenetwork/libgpgme-copy/assuan/assuan-pipe-connect.c b/libkdenetwork/libgpgme-copy/assuan/assuan-pipe-connect.c index ebae5ea38..a4dc17add 100644 --- a/libkdenetwork/libgpgme-copy/assuan/assuan-pipe-connect.c +++ b/libkdenetwork/libgpgme-copy/assuan/assuan-pipe-connect.c @@ -325,7 +325,7 @@ pipe_connect_unix (assuan_context_t *ctx, } errno = 0; - /* We store our tqparents pid in the environment so that the + /* We store our parents pid in the environment so that the execed assuan server is able to read the actual pid of the client. The server can't use getppid because it might have been double forked before the assuan server has been @@ -493,7 +493,7 @@ socketpair_connect (assuan_context_t *ctx, } errno = 0; - /* We store our tqparents pid in the environment so that the + /* We store our parents pid in the environment so that the execed assuan server is able to read the actual pid of the client. The server can't use getppid becuase it might have been double forked before the assuan server has been diff --git a/libkdenetwork/libgpgme-copy/gpgme/io.h b/libkdenetwork/libgpgme-copy/gpgme/io.h index cd0a47070..33dc5d9a1 100644 --- a/libkdenetwork/libgpgme-copy/gpgme/io.h +++ b/libkdenetwork/libgpgme-copy/gpgme/io.h @@ -54,7 +54,7 @@ int _gpgme_io_set_nonblocking (int fd); fds in FD_CHILD_LIST in the child. */ int _gpgme_io_spawn (const char *path, char **argv, struct spawn_fd_item_s *fd_child_list, - struct spawn_fd_item_s *fd_tqparent_list); + struct spawn_fd_item_s *fd_parent_list); int _gpgme_io_waitpid (int pid, int hang, int *r_status, int *r_signal); int _gpgme_io_kill (int pid, int hard); int _gpgme_io_select (struct io_select_fd_s *fds, size_t nfds, int nonblock); diff --git a/libkdenetwork/libgpgme-copy/gpgme/posix-io.c b/libkdenetwork/libgpgme-copy/gpgme/posix-io.c index 5be777401..3c9fa4b13 100644 --- a/libkdenetwork/libgpgme-copy/gpgme/posix-io.c +++ b/libkdenetwork/libgpgme-copy/gpgme/posix-io.c @@ -212,7 +212,7 @@ _gpgme_io_waitpid (int pid, int hang, int *r_status, int *r_signal) int _gpgme_io_spawn (const char *path, char **argv, struct spawn_fd_item_s *fd_child_list, - struct spawn_fd_item_s *fd_tqparent_list) + struct spawn_fd_item_s *fd_parent_list) { pid_t pid; int i; @@ -300,8 +300,8 @@ _gpgme_io_spawn (const char *path, char **argv, return -1; /* .dup_to is not used in the tqparent list. */ - for (i = 0; fd_tqparent_list[i].fd != -1; i++) - _gpgme_io_close (fd_tqparent_list[i].fd); + for (i = 0; fd_parent_list[i].fd != -1; i++) + _gpgme_io_close (fd_parent_list[i].fd); return 0; } diff --git a/libkdenetwork/libgpgme-copy/gpgme/priv-io.h b/libkdenetwork/libgpgme-copy/gpgme/priv-io.h index a64f1467d..1d05ba03f 100644 --- a/libkdenetwork/libgpgme-copy/gpgme/priv-io.h +++ b/libkdenetwork/libgpgme-copy/gpgme/priv-io.h @@ -56,7 +56,7 @@ int _gpgme_io_set_nonblocking (int fd); fds in FD_CHILD_LIST in the child. */ int _gpgme_io_spawn (const char *path, char **argv, struct spawn_fd_item_s *fd_child_list, - struct spawn_fd_item_s *fd_tqparent_list); + struct spawn_fd_item_s *fd_parent_list); int _gpgme_io_select (struct io_select_fd_s *fds, size_t nfds, int nonblock); /* Write the printable version of FD to the buffer BUF of length diff --git a/libkdenetwork/libgpgme-copy/gpgme/rungpg.c b/libkdenetwork/libgpgme-copy/gpgme/rungpg.c index 42fff0032..1a25dac00 100644 --- a/libkdenetwork/libgpgme-copy/gpgme/rungpg.c +++ b/libkdenetwork/libgpgme-copy/gpgme/rungpg.c @@ -1211,7 +1211,7 @@ start (engine_gpg_t gpg) int saved_errno; int i, n; int status; - struct spawn_fd_item_s *fd_child_list, *fd_tqparent_list; + struct spawn_fd_item_s *fd_child_list, *fd_parent_list; if (!gpg) return gpg_error (GPG_ERR_INV_VALUE); @@ -1247,7 +1247,7 @@ start (engine_gpg_t gpg) fd_child_list = calloc (n + n, sizeof *fd_child_list); if (!fd_child_list) return gpg_error_from_errno (errno); - fd_tqparent_list = fd_child_list + n; + fd_parent_list = fd_child_list + n; /* build the fd list for the child */ n = 0; @@ -1273,28 +1273,28 @@ start (engine_gpg_t gpg) n = 0; if (gpg->status.fd[1] != -1) { - fd_tqparent_list[n].fd = gpg->status.fd[1]; - fd_tqparent_list[n].dup_to = -1; + fd_parent_list[n].fd = gpg->status.fd[1]; + fd_parent_list[n].dup_to = -1; n++; } if (gpg->colon.fd[1] != -1) { - fd_tqparent_list[n].fd = gpg->colon.fd[1]; - fd_tqparent_list[n].dup_to = -1; + fd_parent_list[n].fd = gpg->colon.fd[1]; + fd_parent_list[n].dup_to = -1; n++; } for (i = 0; gpg->fd_data_map[i].data; i++) { - fd_tqparent_list[n].fd = gpg->fd_data_map[i].peer_fd; - fd_tqparent_list[n].dup_to = -1; + fd_parent_list[n].fd = gpg->fd_data_map[i].peer_fd; + fd_parent_list[n].dup_to = -1; n++; } - fd_tqparent_list[n].fd = -1; - fd_tqparent_list[n].dup_to = -1; + fd_parent_list[n].fd = -1; + fd_parent_list[n].dup_to = -1; status = _gpgme_io_spawn (gpg->file_name ? gpg->file_name : _gpgme_get_gpg_path (), - gpg->argv, fd_child_list, fd_tqparent_list); + gpg->argv, fd_child_list, fd_parent_list); saved_errno = errno; free (fd_child_list); if (status == -1) diff --git a/libkdenetwork/libgpgme-copy/gpgme/w32-io.c b/libkdenetwork/libgpgme-copy/gpgme/w32-io.c index 9625178ae..677c14e30 100644 --- a/libkdenetwork/libgpgme-copy/gpgme/w32-io.c +++ b/libkdenetwork/libgpgme-copy/gpgme/w32-io.c @@ -857,7 +857,7 @@ build_commandline (char **argv) int _gpgme_io_spawn ( const char *path, char **argv, struct spawn_fd_item_s *fd_child_list, - struct spawn_fd_item_s *fd_tqparent_list ) + struct spawn_fd_item_s *fd_parent_list ) { SECURITY_ATTRIBUTES sec_attr; PROCESS_INFORMATION pi = { @@ -966,8 +966,8 @@ _gpgme_io_spawn ( const char *path, char **argv, } /* Close the other ends of the pipes. */ - for (i = 0; fd_tqparent_list[i].fd != -1; i++) - _gpgme_io_close (fd_tqparent_list[i].fd); + for (i = 0; fd_parent_list[i].fd != -1; i++) + _gpgme_io_close (fd_parent_list[i].fd); DEBUG4 ("CreateProcess ready\n" "- hProcess=%p hThread=%p\n" |