mirror of
git://git.gnupg.org/gnupg.git
synced 2025-01-10 13:04:23 +01:00
See ChangeLog: Mon Sep 18 12:13:52 CEST 2000 Werner Koch
This commit is contained in:
parent
8f45e56ad9
commit
fe88f35c40
@ -299,16 +299,21 @@ gather_random_fast( void (*add)(const void*, size_t, int), int requester )
|
||||
* Definitions which are missing from the current GNU Windows32Api
|
||||
*/
|
||||
|
||||
#ifndef TH32CS_SNAPHEAPLIST
|
||||
#define TH32CS_SNAPHEAPLIST 1
|
||||
#define TH32CS_SNAPPROCESS 2
|
||||
#define TH32CS_SNAPTHREAD 4
|
||||
#define TH32CS_SNAPMODULE 8
|
||||
#define TH32CS_SNAPALL (1|2|4|8)
|
||||
#define TH32CS_INHERIT 0x80000000
|
||||
#endif /*TH32CS_SNAPHEAPLIST*/
|
||||
|
||||
#ifndef IOCTL_DISK_PERFORMANCE
|
||||
#define IOCTL_DISK_PERFORMANCE 0x00070020
|
||||
#define VER_PLATFORM_WIN32_WINDOWS 1
|
||||
|
||||
#endif
|
||||
#ifndef IOCTL_DISK_PERFORMANCE
|
||||
#define VER_PLATFORM_WIN32_WINDOWSw 1
|
||||
#endif
|
||||
|
||||
typedef struct {
|
||||
DWORD dwSize;
|
||||
|
@ -1,3 +1,7 @@
|
||||
Mon Sep 18 12:13:52 CEST 2000 Werner Koch <wk@openit.de>
|
||||
|
||||
* hkp.c (not_implemented): Print a notice for W32
|
||||
|
||||
Fri Sep 15 18:40:36 CEST 2000 Werner Koch <wk@openit.de>
|
||||
|
||||
* keygen.c (keygen_add_std_prefs): Changed order of preferences to
|
||||
|
12
g10/hkp.c
12
g10/hkp.c
@ -38,6 +38,15 @@
|
||||
static int urlencode_filter( void *opaque, int control,
|
||||
IOBUF a, byte *buf, size_t *ret_len);
|
||||
|
||||
#ifdef HAVE_DOSISH_SYSTEM
|
||||
static void
|
||||
not_implemented(void)
|
||||
{
|
||||
log_error("keyserver access ist not yet available for MS-Windows\n");
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
/****************
|
||||
* Try to import the key with KEYID from a keyserver but ask the user
|
||||
* before doing so.
|
||||
@ -50,6 +59,7 @@ int
|
||||
hkp_ask_import( u32 *keyid )
|
||||
{
|
||||
#ifdef HAVE_DOSISH_SYSTEM
|
||||
not_implemented();
|
||||
return -1;
|
||||
#else
|
||||
struct http_context hd;
|
||||
@ -92,6 +102,7 @@ int
|
||||
hkp_import( STRLIST users )
|
||||
{
|
||||
#ifdef HAVE_DOSISH_SYSTEM
|
||||
not_implemented();
|
||||
return -1;
|
||||
#else
|
||||
if( !opt.keyserver_name ) {
|
||||
@ -122,6 +133,7 @@ int
|
||||
hkp_export( STRLIST users )
|
||||
{
|
||||
#ifdef HAVE_DOSISH_SYSTEM
|
||||
not_implemented();
|
||||
return -1;
|
||||
#else
|
||||
int rc;
|
||||
|
@ -274,10 +274,10 @@ make_printable_string( const byte *p, size_t n, int delim )
|
||||
int
|
||||
answer_is_yes( const char *s )
|
||||
{
|
||||
char *long_yes = _("yes");
|
||||
char *short_yes = _("yY");
|
||||
char *long_no = _("no");
|
||||
char *short_no = _("nN");
|
||||
const char *long_yes = _("yes");
|
||||
const char *short_yes = _("yY");
|
||||
const char *long_no = _("no");
|
||||
const char *short_no = _("nN");
|
||||
|
||||
if( !stricmp(s, long_yes ) )
|
||||
return 1;
|
||||
@ -303,12 +303,12 @@ answer_is_yes( const char *s )
|
||||
int
|
||||
answer_is_yes_no_quit( const char *s )
|
||||
{
|
||||
char *long_yes = _("yes");
|
||||
char *long_no = _("no");
|
||||
char *long_quit = _("quit");
|
||||
char *short_yes = _("yY");
|
||||
char *short_no = _("nN");
|
||||
char *short_quit = _("qQ");
|
||||
const char *long_yes = _("yes");
|
||||
const char *long_no = _("no");
|
||||
const char *long_quit = _("quit");
|
||||
const char *short_yes = _("yY");
|
||||
const char *short_no = _("nN");
|
||||
const char *short_quit = _("qQ");
|
||||
|
||||
if( !stricmp(s, long_no ) )
|
||||
return 0;
|
||||
|
@ -193,7 +193,7 @@ tty_printf( const char *fmt, ... )
|
||||
if( !WriteConsoleA( con.out, buf, n, &nwritten, NULL ) )
|
||||
log_fatal("WriteConsole failed: rc=%d", (int)GetLastError() );
|
||||
if( n != nwritten )
|
||||
log_fatal("WriteConsole failed: %d != %ld\n", n, nwritten );
|
||||
log_fatal("WriteConsole failed: %d != %d\n", n, nwritten );
|
||||
last_prompt_len += n;
|
||||
}
|
||||
#else
|
||||
|
Loading…
x
Reference in New Issue
Block a user