[git commit master] forgotten "git add"...

Denys Vlasenko vda.linux at googlemail.com
Sun May 30 01:47:40 UTC 2010


commit: http://git.busybox.net/busybox/commit/?id=fb6c76cb6eaade5693b7e99c33846c902689f1db
branch: http://git.busybox.net/busybox/commit/?id=refs/heads/master

Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 archival/libunarchive/decompress_unxz.c |  116 +++++++++++++++++++++++++++++++
 1 files changed, 116 insertions(+), 0 deletions(-)
 create mode 100644 archival/libunarchive/decompress_unxz.c

diff --git a/archival/libunarchive/decompress_unxz.c b/archival/libunarchive/decompress_unxz.c
new file mode 100644
index 0000000..0ae7891
--- /dev/null
+++ b/archival/libunarchive/decompress_unxz.c
@@ -0,0 +1,116 @@
+/*
+ * This file uses XZ Embedded library code which is written
+ * by Lasse Collin <lasse.collin at tukaani.org>
+ * and Igor Pavlov <http://7-zip.org/>
+ *
+ * See README file in unxzbz/ directory for more information.
+ *
+ * This file is:
+ * Copyright (C) 2010 Denys Vlasenko <vda.linux at googlemail.com>
+ * Licensed under GPLv2, see file LICENSE in this tarball for details.
+ */
+#include "libbb.h"
+#include "unarchive.h"
+
+//#define XZ_DEBUG_MSG(...) bb_error_msg(__VA_ARGS)
+#define XZ_REALLOC_DICT_BUF(ptr, size) xrealloc(ptr, size)
+#define XZ_FUNC FAST_FUNC
+#define XZ_EXTERN static
+
+#define xz_crc32_init(table) crc32_filltable(table, /*endian:*/ 0)
+static uint32_t xz_crc32(uint32_t *crc32_table,
+		const uint8_t *buf, size_t size, uint32_t crc)
+{
+	crc = ~crc;
+
+	while (size != 0) {
+		crc = crc32_table[*buf++ ^ (crc & 0xFF)] ^ (crc >> 8);
+		--size;
+	}
+
+	return ~crc;
+}
+#define xz_crc32 xz_crc32
+
+#define get_unaligned_le32(buf) ({ uint32_t v; move_from_unaligned32(v, buf); SWAP_LE32(v); })
+#define get_unaligned_be32(buf) ({ uint32_t v; move_from_unaligned32(v, buf); SWAP_BE32(v); })
+#define put_unaligned_le32(val, buf) move_to_unaligned16(buf, SWAP_LE32(val))
+#define put_unaligned_be32(val, buf) move_to_unaligned16(buf, SWAP_BE32(val))
+
+#include "unxz/xz.h"
+#include "unxz/xz_config.h"
+
+#include "unxz/xz_dec_bcj.c"
+#include "unxz/xz_dec_lzma2.c"
+#include "unxz/xz_dec_stream.c"
+#include "unxz/xz_lzma2.h"
+#include "unxz/xz_private.h"
+#include "unxz/xz_stream.h"
+
+IF_DESKTOP(long long) int FAST_FUNC
+unpack_xz_stream_stdin(void)
+{
+	struct xz_buf iobuf;
+	struct xz_dec *state;
+	unsigned char *membuf;
+	IF_DESKTOP(long long) int total = 0;
+	enum {
+		IN_SIZE = 4 * 1024,
+		OUT_SIZE = 60 * 1024,
+	};
+
+	membuf = xmalloc(IN_SIZE + OUT_SIZE);
+	memset(&iobuf, 0, sizeof(iobuf));
+	iobuf.in = membuf;
+	iobuf.out = membuf + IN_SIZE;
+	iobuf.out_size = OUT_SIZE;
+
+	state = xz_dec_init(64*1024); /* initial dict of 64k */
+	xz_crc32_init(state->crc32_table);
+
+	while (1) {
+		enum xz_ret r;
+                int insz, rd, outpos;
+
+		iobuf.in_size -= iobuf.in_pos;
+		insz = iobuf.in_size;
+		if (insz)
+			memmove(membuf, membuf + iobuf.in_pos, insz);
+		iobuf.in_pos = 0;
+		rd = IN_SIZE - insz;
+		if (rd) {
+			rd = safe_read(STDIN_FILENO, membuf + insz, rd);
+			if (rd < 0) {
+				bb_error_msg("read error");
+				total = -1;
+				break;
+			}
+			iobuf.in_size = insz + rd;
+		}
+//		bb_error_msg(">in pos:%d size:%d out pos:%d size:%d",
+//				iobuf.in_pos, iobuf.in_size, iobuf.out_pos, iobuf.out_size);
+		r = xz_dec_run(state, &iobuf);
+//		bb_error_msg("<in pos:%d size:%d out pos:%d size:%d r:%d",
+//				iobuf.in_pos, iobuf.in_size, iobuf.out_pos, iobuf.out_size, r);
+		outpos = iobuf.out_pos;
+		if (outpos) {
+			xwrite(STDOUT_FILENO, iobuf.out, outpos);
+			IF_DESKTOP(total += outpos;)
+		}
+		if (r == XZ_STREAM_END
+		 || (r == XZ_BUF_ERROR && insz == 0 && outpos == 0)
+		) {
+			break;
+		}
+		if (r != XZ_OK) {
+			bb_error_msg("corrupted data");
+			total = -1;
+			break;
+		}
+		iobuf.out_pos = 0;
+	}
+	xz_dec_end(state);
+	free(membuf);
+
+	return total;
+}
-- 
1.6.3.3



More information about the busybox-cvs mailing list