mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
Minor cleanups
This commit is contained in:
parent
ab430c4b24
commit
ccb1f8c175
5 changed files with 28 additions and 18 deletions
|
@ -1,6 +1,10 @@
|
|||
2001-12-22 Timo Schulz <ts@winpt.org>
|
||||
2001-12-22 Werner Koch <wk@gnupg.org>
|
||||
|
||||
* encode.c (encode_simple, encode_crypt): Use is_file_compressed
|
||||
* encode.c (encode_simple, encode_crypt): i18n 2 strings.
|
||||
|
||||
2001-12-22 Timo Schulz <ts@winpt.org>
|
||||
|
||||
* encode.c (encode_simple, encode_crypt): Use is_file_compressed
|
||||
to avoid to compress compressed files.
|
||||
|
||||
2001-12-22 Werner Koch <wk@gnupg.org>
|
||||
|
|
31
g10/encode.c
31
g10/encode.c
|
@ -86,11 +86,12 @@ encode_simple( const char *filename, int mode )
|
|||
memset( &tfx, 0, sizeof tfx);
|
||||
init_packet(&pkt);
|
||||
|
||||
if (is_file_compressed(filename, &rc)) {
|
||||
if (opt.verbose)
|
||||
log_info("`%s' already compressed\n", filename);
|
||||
do_compress = 0;
|
||||
}
|
||||
if (is_file_compressed(filename, &rc))
|
||||
{
|
||||
if (opt.verbose)
|
||||
log_info(_("`%s' already compressed\n"), filename);
|
||||
do_compress = 0;
|
||||
}
|
||||
if (rc)
|
||||
return rc;
|
||||
|
||||
|
@ -284,15 +285,17 @@ encode_crypt( const char *filename, STRLIST remusr )
|
|||
}
|
||||
}
|
||||
|
||||
if (is_file_compressed(filename, &rc2)) {
|
||||
if (opt.verbose)
|
||||
log_info("`%s' already compressed\n", filename);
|
||||
do_compress = 0;
|
||||
}
|
||||
if (rc2) {
|
||||
rc = rc2;
|
||||
goto leave;
|
||||
}
|
||||
if (is_file_compressed(filename, &rc2))
|
||||
{
|
||||
if (opt.verbose)
|
||||
log_info(_("`%s' already compressed\n"), filename);
|
||||
do_compress = 0;
|
||||
}
|
||||
if (rc2)
|
||||
{
|
||||
rc = rc2;
|
||||
goto leave;
|
||||
}
|
||||
|
||||
/* prepare iobufs */
|
||||
if( !(inp = iobuf_open(filename)) ) {
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
2001-12-22 Timo Schulz <ts@winpt.org>
|
||||
|
||||
* util.h: Add is_file_compressed().
|
||||
* util.h (is_file_compressed): New.
|
||||
|
||||
2001-12-19 Werner Koch <wk@gnupg.org>
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
2001-12-22 Timo Schulz <ts@winpt.org>
|
||||
|
||||
* fileutil.c (is_file_compressed): New.
|
||||
* fileutil.c (is_file_compressed): New.
|
||||
|
||||
2001-12-19 Werner Koch <wk@gnupg.org>
|
||||
|
||||
|
|
|
@ -227,3 +227,6 @@ leave:
|
|||
iobuf_close(a);
|
||||
return rc;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue