GpgFrontend/gpgme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2002-09-02 Marcus Brinkmann <marcus@g10code.de>

Browse Source 
* posix-io.c (_gpgme_io_select): Don't use a non-constant struct initializer.
	* version.c (_gpgme_get_program_version): Likewise.
	Reported by Dr. Stefan Dalibor <Dr.Stefan.Dalibor@bfa.de>.
This commit is contained in:
Marcus Brinkmann 2002-09-02 12:17:51 +00:00
parent 43eb40838c
commit ad264f924b
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gpgme/ChangeLog
View File

@ -1,3 +1,9 @@
2002-09-02 Marcus Brinkmann <marcus@g10code.de>
* posix-io.c (_gpgme_io_select): Don't use a non-constant struct initializer.
* version.c (_gpgme_get_program_version): Likewise.
Reported by Dr. Stefan Dalibor <Dr.Stefan.Dalibor@bfa.de>.
2002-09-02 Marcus Brinkmann <marcus@g10code.de> 2002-09-02 Marcus Brinkmann <marcus@g10code.de>
* conversion.c (_gpgme_decode_c_string): Set DESTP before modifying DEST. * conversion.c (_gpgme_decode_c_string): Set DESTP before modifying DEST.

4
gpgme/posix-io.c
View File

@ -306,12 +306,14 @@ _gpgme_io_select (struct io_select_fd_s *fds, size_t nfds, int nonblock)
fd_set readfds; fd_set readfds;
fd_set writefds; fd_set writefds;
int any, i, max_fd, n, count; int any, i, max_fd, n, count;
struct timeval timeout = { nonblock ? 0 : 1, 0 }; /* Use a 1s timeout. */ struct timeval timeout = { 1, 0 }; /* Use a 1s timeout. */
void *dbg_help = NULL; void *dbg_help = NULL;
FD_ZERO (&readfds); FD_ZERO (&readfds);
FD_ZERO (&writefds); FD_ZERO (&writefds);
max_fd = 0; max_fd = 0;
if (nonblock)
timeout.tv_sec = 0;
DEBUG_BEGIN (dbg_help, 3, "gpgme:select on [ "); DEBUG_BEGIN (dbg_help, 3, "gpgme:select on [ ");
any = 0; any = 0;

3
gpgme/version.c
View File

@ -220,13 +220,14 @@ _gpgme_get_program_version (const char *const path)
char *mark = NULL; char *mark = NULL;
int rp[2]; int rp[2];
int nread; int nread;
char *argv[] = {(char *) path, "--version", 0}; char *argv[] = {NULL /* path */, "--version", 0};
struct spawn_fd_item_s pfd[] = { {0, -1}, {-1, -1} }; struct spawn_fd_item_s pfd[] = { {0, -1}, {-1, -1} };
struct spawn_fd_item_s cfd[] = { {-1, 1 /* STDOUT_FILENO */}, {-1, -1} }; struct spawn_fd_item_s cfd[] = { {-1, 1 /* STDOUT_FILENO */}, {-1, -1} };
int status; int status;
if (!path) if (!path)
return NULL; return NULL;
argv[0] = (char *) path;
if (_gpgme_io_pipe (rp, 1) < 0) if (_gpgme_io_pipe (rp, 1) < 0)
return NULL; return NULL;