* fileutil.c (is_file_compressed): Fixed checking for "-" filename.

This commit is contained in:
Werner Koch 2003-05-21 08:49:03 +00:00
parent d0573d3db6
commit 67a6cd7168
2 changed files with 6 additions and 2 deletions

View File

@ -1,3 +1,7 @@
2003-05-21 Werner Koch <wk@gnupg.org>
* fileutil.c (is_file_compressed): Fixed checking for "-" filename.
2003-04-13 David Shaw <dshaw@jabberwocky.com> 2003-04-13 David Shaw <dshaw@jabberwocky.com>
* srv.c (main): Test against wwwkeys.pgp.net. * srv.c (main): Test against wwwkeys.pgp.net.

View File

@ -1,5 +1,5 @@
/* fileutil.c - file utilities /* fileutil.c - file utilities
* Copyright (C) 1998 Free Software Foundation, Inc. * Copyright (C) 1998, 2003 Free Software Foundation, Inc.
* *
* This file is part of GnuPG. * This file is part of GnuPG.
* *
@ -200,7 +200,7 @@ is_file_compressed( const char *s, int *ret_rc )
{ 4, { 0x50, 0x4b, 0x03, 0x04 } }, /* (pk)zip */ { 4, { 0x50, 0x4b, 0x03, 0x04 } }, /* (pk)zip */
}; };
if ( !s || *s == '-' || !ret_rc ) if ( !s || (*s == '-' && !s[1]) || !ret_rc )
return 0; /* We can't check stdin or no file was given */ return 0; /* We can't check stdin or no file was given */
a = iobuf_open( s ); a = iobuf_open( s );