security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-22 14:57:02 +01:00
Code Activity

* passphrase.c (readline, agent_send_option, agent_open,

Browse Source 
agent_get_passphrase, passphrase_clear_cache): Rename readline() to
readaline() to keep readline library namespace clear.
This commit is contained in:
David Shaw 2005-01-10 22:56:46 +00:00
parent 1f91ed775c
commit 74ca58ee94
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
g10/ChangeLog
View File

@ -1,3 +1,9 @@
2005-01-10 David Shaw <dshaw@jabberwocky.com>
* passphrase.c (readline, agent_send_option, agent_open,
agent_get_passphrase, passphrase_clear_cache): Rename readline()
to readaline() to keep readline library namespace clear.
2005-01-06 David Shaw <dshaw@jabberwocky.com> 2005-01-06 David Shaw <dshaw@jabberwocky.com>
* filter.h, armor.c (armor_filter): Use the eol string from the * filter.h, armor.c (armor_filter): Use the eol string from the

12
g10/passphrase.c
View File

@ -299,7 +299,7 @@ readn (int fd, void *buf, size_t buflen, size_t *ret_nread)
/* read an entire line */ /* read an entire line */
static int static int
readline (int fd, char *buf, size_t buflen) readaline (int fd, char *buf, size_t buflen)
{ {
size_t nleft = buflen; size_t nleft = buflen;
char *p; char *p;
@ -360,7 +360,7 @@ agent_send_option (int fd, const char *name, const char *value)
return -1; return -1;
/* get response */ /* get response */
nread = readline (fd, buf, DIM(buf)-1); nread = readaline (fd, buf, DIM(buf)-1);
if (nread < 3) if (nread < 3)
return -1; return -1;
@ -584,7 +584,7 @@ agent_open (int *ret_prot)
char line[200]; char line[200];
int nread; int nread;
nread = readline (fd, line, DIM(line)); nread = readaline (fd, line, DIM(line));
if (nread < 3 || !(line[0] == 'O' && line[1] == 'K' if (nread < 3 || !(line[0] == 'O' && line[1] == 'K'
&& (line[2] == '\n' || line[2] == ' ')) ) { && (line[2] == '\n' || line[2] == ' ')) ) {
log_error ( _("communication problem with gpg-agent\n")); log_error ( _("communication problem with gpg-agent\n"));
@ -900,7 +900,7 @@ agent_get_passphrase ( u32 *keyid, int mode, const char *tryagain_text,
/* get response */ /* get response */
pw = m_alloc_secure (500); pw = m_alloc_secure (500);
nread = readline (fd, pw, 499); nread = readaline (fd, pw, 499);
if (nread < 3) if (nread < 3)
goto failure; goto failure;
@ -1035,7 +1035,7 @@ passphrase_clear_cache ( u32 *keyid, int algo )
goto failure; goto failure;
/* get response */ /* get response */
nread = readline (fd, buf, DIM(buf)-1); nread = readaline (fd, buf, DIM(buf)-1);
if (nread < 3) if (nread < 3)
goto failure; goto failure;
@ -1056,8 +1056,6 @@ passphrase_clear_cache ( u32 *keyid, int algo )
} }
/**************** /****************
* Ask for a passphrase and return that string. * Ask for a passphrase and return that string.
*/ */