security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-11-10 21:38:50 +01:00
Code Activity

Minor cleanups

Browse Source
This commit is contained in:
Werner Koch 2001-12-22 13:12:24 +00:00
parent ab430c4b24
commit ccb1f8c175
5 changed files with 28 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
g10/ChangeLog
View File

@ -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. to avoid to compress compressed files.
2001-12-22 Werner Koch <wk@gnupg.org> 2001-12-22 Werner Koch <wk@gnupg.org>

31
g10/encode.c
View File

@ -86,11 +86,12 @@ encode_simple( const char *filename, int mode )
memset( &tfx, 0, sizeof tfx); memset( &tfx, 0, sizeof tfx);
init_packet(&pkt); init_packet(&pkt);
if (is_file_compressed(filename, &rc)) { if (is_file_compressed(filename, &rc))
if (opt.verbose) {
log_info("`%s' already compressed\n", filename); if (opt.verbose)
do_compress = 0; log_info(_("`%s' already compressed\n"), filename);
} do_compress = 0;
}
if (rc) if (rc)
return rc; return rc;
@ -284,15 +285,17 @@ encode_crypt( const char *filename, STRLIST remusr )
} }
} }
if (is_file_compressed(filename, &rc2)) { if (is_file_compressed(filename, &rc2))
if (opt.verbose) {
log_info("`%s' already compressed\n", filename); if (opt.verbose)
do_compress = 0; log_info(_("`%s' already compressed\n"), filename);
} do_compress = 0;
if (rc2) { }
rc = rc2; if (rc2)
goto leave; {
} rc = rc2;
goto leave;
}
/* prepare iobufs */ /* prepare iobufs */
if( !(inp = iobuf_open(filename)) ) { if( !(inp = iobuf_open(filename)) ) {

2
include/ChangeLog
View File

@ -1,6 +1,6 @@
2001-12-22 Timo Schulz <ts@winpt.org> 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> 2001-12-19 Werner Koch <wk@gnupg.org>

2
util/ChangeLog
View File

@ -1,6 +1,6 @@
2001-12-22 Timo Schulz <ts@winpt.org> 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> 2001-12-19 Werner Koch <wk@gnupg.org>

3
util/fileutil.c
View File

@ -227,3 +227,6 @@ leave:
iobuf_close(a); iobuf_close(a);
return rc; return rc;
} }