projects
/
debian
/
gzip
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
maint: use noreturn, not ATTRIBUTE_NORETURN
[debian/gzip]
/
trees.c
diff --git
a/trees.c
b/trees.c
index e3e514676eee8a98086cb433671d4264e43c5809..f40f8f41a8ae3f6e1a867ff99867fce33c58c9e5 100644
(file)
--- a/
trees.c
+++ b/
trees.c
@@
-1,6
+1,6
@@
/* trees.c -- output deflated data using Huffman coding
/* trees.c -- output deflated data using Huffman coding
- Copyright (C) 1997-1999, 2009-201
4
Free Software Foundation, Inc.
+ Copyright (C) 1997-1999, 2009-201
7
Free Software Foundation, Inc.
Copyright (C) 1992-1993 Jean-loup Gailly
This program is free software; you can redistribute it and/or modify
Copyright (C) 1992-1993 Jean-loup Gailly
This program is free software; you can redistribute it and/or modify
@@
-856,9
+856,10
@@
local void send_all_trees(lcodes, dcodes, blcodes)
* trees or store, and output the encoded block to the zip file. This function
* returns the total compressed length for the file so far.
*/
* trees or store, and output the encoded block to the zip file. This function
* returns the total compressed length for the file so far.
*/
-off_t flush_block(buf, stored_len, eof)
+off_t flush_block(buf, stored_len,
pad,
eof)
char *buf; /* input block, or NULL if too old */
ulg stored_len; /* length of input block */
char *buf; /* input block, or NULL if too old */
ulg stored_len; /* length of input block */
+ int pad; /* pad output to byte boundary */
int eof; /* true if this is the last block for a file */
{
ulg opt_lenb, static_lenb; /* opt_len and static_len in bytes */
int eof; /* true if this is the last block for a file */
{
ulg opt_lenb, static_lenb; /* opt_len and static_len in bytes */
@@
-951,6
+952,10
@@
off_t flush_block(buf, stored_len, eof)
Assert (input_len == bytes_in, "bad input size");
bi_windup();
compressed_len += 7; /* align on byte boundary */
Assert (input_len == bytes_in, "bad input size");
bi_windup();
compressed_len += 7; /* align on byte boundary */
+ } else if (pad && (compressed_len % 8) != 0) {
+ send_bits((STORED_BLOCK<<1)+eof, 3); /* send block type */
+ compressed_len = (compressed_len + 3 + 7) & ~7L;
+ copy_block(buf, 0, 1); /* with header */
}
return compressed_len >> 3;
}
return compressed_len >> 3;