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

See ChangeLog: Fri Sep 17 12:56:42 CEST 1999 Werner Koch

Browse source
This commit is contained in:
Werner Koch 1999-09-17 10:58:20 +00:00
parent 49f0fe535a
commit 9caad6d24d
12 changed files with 81 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

10
util/ChangeLog
View file

@ -1,3 +1,13 @@
Fri Sep 17 12:56:42 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>
* secmem.c (lock_pool): Check for ENOSYS return my mlock() on
old SCOs.
* ttyio.c (do_get): Replaced #if __MINGW32__ by #ifdef becuase
gcc 2.95.1 assigns a floating point value (0.2) to this macro,
which in turn can't be used in an expression.
Wed Sep 15 16:22:17 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>

10
util/secmem.c
View file

@ -97,8 +97,11 @@ lock_pool( void *p, size_t n )
#ifdef EAGAIN /* OpenBSD returns this */
&& errno != EAGAIN
#endif
#ifdef ENOSYS /* Some SCOs return this (function not implemented) */
&& errno != ENOSYS
#endif
)
log_error("can´t lock memory: %s\n", strerror(err));
log_error("can't lock memory: %s\n", strerror(err));
show_warning = 1;
}
@ -134,8 +137,11 @@ lock_pool( void *p, size_t n )
#ifdef EAGAIN /* OpenBSD returns this */
&& errno != EAGAIN
#endif
#ifdef ENOSYS /* Some SCOs return this (function not implemented) */
&& errno != ENOSYS
#endif
)
log_error("can´t lock memory: %s\n", strerror(err));
log_error("can't lock memory: %s\n", strerror(err));
show_warning = 1;
}

15
util/simple-gettext.c
View file

@ -464,5 +464,20 @@ gettext( const char *msgid )
return msgid;
}
#if 0
unsigned int cp1, cp2;
cp1 = GetConsoleCP();
cp2 = GetConsoleOutputCP();
log_info("InputCP=%u OutputCP=%u\n", cp1, cp2 );
if( !SetConsoleOutputCP( 1252 ) )
log_info("SetConsoleOutputCP failed: %d\n", (int)GetLastError() );
cp1 = GetConsoleCP();
cp2 = GetConsoleOutputCP();
log_info("InputCP=%u OutputCP=%u after switch1\n", cp1, cp2 );
#endif
#endif /* USE_SIMPLE_GETTEXT */

21
util/ttyio.c
View file

@ -107,23 +107,6 @@ init_ttyfp(void)
SetConsoleMode(con.in, DEF_INPMODE );
SetConsoleMode(con.out, DEF_OUTMODE );
#warning DEBUG CODE
{
unsigned int cp1, cp2;
cp1 = GetConsoleCP();
cp2 = GetConsoleOutputCP();
log_info("InputCP=%u OutputCP=%u\n", cp1, cp2 );
if( !SetConsoleOutputCP( 1252 ) )
log_info("SetConsoleOutputCP failed: %d\n", (int)GetLastError() );
cp1 = GetConsoleCP();
cp2 = GetConsoleOutputCP();
log_info("InputCP=%u OutputCP=%u after switch1\n", cp1, cp2 );
}
#elif defined(__EMX__)
ttyfp = stdout; /* Fixme: replace by the real functions: see wklib */
#else
@ -304,7 +287,7 @@ do_get( const char *prompt, int hidden )
buf = m_alloc(n=50);
i = 0;
#if __MINGW32__ /* windoze version */
#ifdef __MINGW32__ /* windoze version */
if( hidden )
SetConsoleMode(con.in, HID_INPMODE );
@ -419,7 +402,7 @@ tty_kill_prompt()
last_prompt_len = 0;
if( !last_prompt_len )
return;
#if __MINGW32__
#ifdef __MINGW32__
tty_printf("\r%*s\r", last_prompt_len, "");
#else
{