diff options
Diffstat (limited to 'g10')
| -rw-r--r-- | g10/ChangeLog | 6 | ||||
| -rw-r--r-- | g10/keygen.c | 8 | ||||
| -rw-r--r-- | g10/status.c | 4 |
3 files changed, 14 insertions, 4 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index e776f171c..d5f62ae1a 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,9 @@ +2000-10-23 Werner Koch <[email protected]> + + * keygen.c (read_parameter_file): Add a cast for isspace(). + + * status.c (myread): Use SIGINT instead of SIGHUP for DOS. + 2000-10-19 Werner Koch <[email protected]> * g10.c: New option --ignore-crc-error diff --git a/g10/keygen.c b/g10/keygen.c index 51cdbd611..2ebad085d 100644 --- a/g10/keygen.c +++ b/g10/keygen.c @@ -1269,17 +1269,17 @@ read_parameter_file( const char *fname ) err = "line too long"; break; } - for( p = line; isspace(*p); p++ ) + for( p = line; isspace(*(byte*)p); p++ ) ; if( !*p || *p == '#' ) continue; keyword = p; if( *keyword == '%' ) { - for( ; !isspace(*p); p++ ) + for( ; !isspace(*(byte*)p); p++ ) ; if( *p ) *p++ = 0; - for( ; isspace(*p); p++ ) + for( ; isspace(*(byte*)p); p++ ) ; value = p; trim_trailing_ws( value, strlen(value) ); @@ -1325,7 +1325,7 @@ read_parameter_file( const char *fname ) } if( *p ) *p++ = 0; - for( ; isspace(*p); p++ ) + for( ; isspace(*(byte*)p); p++ ) ; if( !*p ) { err = "missing argument"; diff --git a/g10/status.c b/g10/status.c index 116d146de..6c1388316 100644 --- a/g10/status.c +++ b/g10/status.c @@ -360,7 +360,11 @@ myread(int fd, void *buf, size_t count) eof_emmited++; } else { /* Ctrl-D not caught - do something reasonable */ + #ifdef HAVE_DOSISH_SYSTEM + raise (SIGINT); /* nothing to hangup under DOS */ + #else raise (SIGHUP); /* no more input data */ + #endif } } return rc; |