1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-02 22:46:30 +02:00

See ChangeLog: Mon Jan 31 17:48:10 CET 2000 Werner Koch

This commit is contained in:
Werner Koch 2000-01-31 16:48:54 +00:00
parent 100fc8da59
commit f00d949f87
9 changed files with 51 additions and 25 deletions

View file

@ -15,6 +15,7 @@
#ifdef HAVE_SYS_SHM_H
#include <sys/shm.h>
#endif
#include <gcrypt.h>
#include "util.h"
#include "ttyio.h"
#include "i18n.h"
@ -36,12 +37,6 @@ my_usage(void)
exit(1);
}
const char *
strusage( int level )
{
return default_strusage(level);
}
static void
i18n_init(void)
{
@ -51,7 +46,7 @@ i18n_init(void)
#else
setlocale( LC_ALL, "" );
#endif
bindtextdomain( PACKAGE, G10_LOCALEDIR );
bindtextdomain( PACKAGE, GNUPG_LOCALEDIR );
textdomain( PACKAGE );
#endif
}
@ -77,7 +72,7 @@ do_get_string( int mode, const char *keyword, byte *area, size_t areasize )
memcpy( area+n+2, p, len );
area[n] = len >> 8;
area[n+1] = len;
m_free(p);
gcry_free(p);
}
else { /* bool */
area[n] = 0;
@ -112,7 +107,7 @@ main(int argc, char **argv)
for(n=0,i=1; i < argc; i++ )
n += strlen(argv[i]) + 1;
p = m_alloc( 100 + n );
p = gcry_xmalloc( 100 + n );
strcpy( p, "../g10/gpg --status-fd 1 --run-as-shm-coprocess 0");
for(i=1; i < argc; i++ ) {
strcat(p, " " );
@ -120,7 +115,7 @@ main(int argc, char **argv)
}
fp = popen( p, "r" );
m_free( p );
gcry_free( p );
if( !fp )
log_error("popen failed: %s\n", strerror(errno));