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

2006-07-16 Marcus Brinkmann <marcus@g10code.de>

Browse Source 
* rungpg.c (read_status): Strip potential carriage return.
	* genkey.c (get_key_parameter): Skip potential carriage return.
	* version.c (_gpgme_get_program_version): Strip potential carriage
	return.
This commit is contained in:
Marcus Brinkmann 2006-07-16 13:27:08 +00:00
parent c7762497fe
commit 6bde056355
4 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gpgme/ChangeLog
View File

@ -1,5 +1,10 @@
2006-07-16 Marcus Brinkmann <marcus@g10code.de> 2006-07-16 Marcus Brinkmann <marcus@g10code.de>
* rungpg.c (read_status): Strip potential carriage return.
* genkey.c (get_key_parameter): Skip potential carriage return.
* version.c (_gpgme_get_program_version): Strip potential carriage
return.
* data.c (gpgme_data_set_file_name): Allow to clear the file name * data.c (gpgme_data_set_file_name): Allow to clear the file name
by passing NULL. by passing NULL.

3
gpgme/genkey.c
View File

@ -142,7 +142,8 @@ get_key_parameter (const char *parms, gpgme_data_t *key_parameter)
endtag = strstr (content, "</GnupgKeyParms>"); endtag = strstr (content, "</GnupgKeyParms>");
/* FIXME: Check that there are no control statements inside. */ /* FIXME: Check that there are no control statements inside. */
while (*content == '\n') while (content[0] == '\n'
|| (content[0] == '\r' && content[1] == '\n'))
content++; content++;
return gpgme_data_new_from_mem (key_parameter, content, return gpgme_data_new_from_mem (key_parameter, content,

2
gpgme/rungpg.c
View File

@ -845,6 +845,8 @@ read_status (engine_gpg_t gpg)
if (*p == '\n') if (*p == '\n')
{ {
/* (we require that the last line is terminated by a LF) */ /* (we require that the last line is terminated by a LF) */
if (p > buffer && p[-1] = '\r')
p[-1] = 0;
*p = 0; *p = 0;
if (!strncmp (buffer, "[GNUPG:] ", 9) if (!strncmp (buffer, "[GNUPG:] ", 9)
&& buffer[9] >= 'A' && buffer[9] <= 'Z') && buffer[9] >= 'A' && buffer[9] <= 'Z')

2
gpgme/version.c
View File

@ -200,6 +200,8 @@ _gpgme_get_program_version (const char *const file_name)
mark = strchr (&line[linelen], '\n'); mark = strchr (&line[linelen], '\n');
if (mark) if (mark)
{ {
if (mark > &line[0] && *mark == '\r')
mark--;
*mark = '\0'; *mark = '\0';
break; break;
} }