security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-06-14 00:19:50 +02:00
Code Activity

Replace printf by es_printf in keyserver.c

Browse Source 
This is similar to the change in keylist.c and elsewhere.
This commit is contained in:
Werner Koch 2011-02-09 19:46:00 +01:00
parent 1cdcab6892
commit ba23e88faa
2 changed files with 28 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
g10/ChangeLog
View File

@ -1,3 +1,7 @@
2011-02-09 Werner Koch <wk@g10code.com>
* keyserver.c: Replace all printf by es_printf.
2011-02-08 Werner Koch <wk@g10code.com> 2011-02-08 Werner Koch <wk@g10code.com>
* call-dirmngr.c (gpg_dirmngr_ks_fetch): New. * call-dirmngr.c (gpg_dirmngr_ks_fetch): New.

51
g10/keyserver.c
View File

@ -18,9 +18,6 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>. * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/ */
/* !!! FIXME: Replace all printf by es_printf. FIXME !!! */
#include <config.h> #include <config.h>
#include <ctype.h> #include <ctype.h>
#include <stdio.h> #include <stdio.h>
@ -501,19 +498,19 @@ print_keyrec(int number,struct keyrec *keyrec)
iobuf_writebyte(keyrec->uidbuf,0); iobuf_writebyte(keyrec->uidbuf,0);
iobuf_flush_temp(keyrec->uidbuf); iobuf_flush_temp(keyrec->uidbuf);
printf("(%d)\t%s ",number,iobuf_get_temp_buffer(keyrec->uidbuf)); es_printf ("(%d)\t%s ", number, iobuf_get_temp_buffer (keyrec->uidbuf));
if(keyrec->size>0) if (keyrec->size>0)
printf("%d bit ",keyrec->size); es_printf ("%d bit ", keyrec->size);
if(keyrec->type) if(keyrec->type)
{ {
const char *str = gcry_pk_algo_name (keyrec->type); const char *str = gcry_pk_algo_name (keyrec->type);
if(str) if(str)
printf("%s ",str); es_printf ("%s ",str);
else else
printf("unknown "); es_printf ("unknown ");
} }
switch(keyrec->desc.mode) switch(keyrec->desc.mode)
@ -522,28 +519,28 @@ print_keyrec(int number,struct keyrec *keyrec)
choice but to use it. Do check --keyid-format to add a 0x if choice but to use it. Do check --keyid-format to add a 0x if
needed. */ needed. */
case KEYDB_SEARCH_MODE_SHORT_KID: case KEYDB_SEARCH_MODE_SHORT_KID:
printf("key %s%08lX", es_printf ("key %s%08lX",
(opt.keyid_format==KF_0xSHORT (opt.keyid_format==KF_0xSHORT
|| opt.keyid_format==KF_0xLONG)?"0x":"", || opt.keyid_format==KF_0xLONG)?"0x":"",
(ulong)keyrec->desc.u.kid[1]); (ulong)keyrec->desc.u.kid[1]);
break; break;
/* However, if it gave us a long keyid, we can honor /* However, if it gave us a long keyid, we can honor
--keyid-format */ --keyid-format */
case KEYDB_SEARCH_MODE_LONG_KID: case KEYDB_SEARCH_MODE_LONG_KID:
printf("key %s",keystr(keyrec->desc.u.kid)); es_printf ("key %s",keystr(keyrec->desc.u.kid));
break; break;
case KEYDB_SEARCH_MODE_FPR16: case KEYDB_SEARCH_MODE_FPR16:
printf("key "); es_printf ("key ");
for(i=0;i<16;i++) for(i=0;i<16;i++)
printf("%02X",keyrec->desc.u.fpr[i]); es_printf ("%02X",keyrec->desc.u.fpr[i]);
break; break;
case KEYDB_SEARCH_MODE_FPR20: case KEYDB_SEARCH_MODE_FPR20:
printf("key "); es_printf ("key ");
for(i=0;i<20;i++) for(i=0;i<20;i++)
printf("%02X",keyrec->desc.u.fpr[i]); es_printf ("%02X", keyrec->desc.u.fpr[i]);
break; break;
default: default:
@ -553,24 +550,24 @@ print_keyrec(int number,struct keyrec *keyrec)
if(keyrec->createtime>0) if(keyrec->createtime>0)
{ {
printf(", "); es_printf (", ");
printf(_("created: %s"),strtimestamp(keyrec->createtime)); es_printf (_("created: %s"), strtimestamp(keyrec->createtime));
} }
if(keyrec->expiretime>0) if(keyrec->expiretime>0)
{ {
printf(", "); es_printf (", ");
printf(_("expires: %s"),strtimestamp(keyrec->expiretime)); es_printf (_("expires: %s"), strtimestamp(keyrec->expiretime));
} }
if(keyrec->flags&1) if (keyrec->flags&1)
printf(" (%s)",_("revoked")); es_printf (" (%s)", _("revoked"));
if(keyrec->flags&2) if(keyrec->flags&2)
printf(" (%s)",_("disabled")); es_printf (" (%s)", _("disabled"));
if(keyrec->flags&4) if(keyrec->flags&4)
printf(" (%s)",_("expired")); es_printf (" (%s)", _("expired"));
printf("\n"); es_printf ("\n");
} }
/* Returns a keyrec (which must be freed) once a key is complete, and /* Returns a keyrec (which must be freed) once a key is complete, and
@ -756,7 +753,7 @@ show_prompt (ctrl_t ctrl, KEYDB_SEARCH_DESC *desc, int numdesc,
gpg_error_t err; gpg_error_t err;
char *answer = NULL; char *answer = NULL;
fflush (stdout); es_fflush (es_stdout);
if (count && opt.command_fd == -1) if (count && opt.command_fd == -1)
{ {