[pan2] quickfix for missing files
- From: Heinrich MÃller <henmull src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pan2] quickfix for missing files
- Date: Wed, 9 Jan 2013 06:16:24 +0000 (UTC)
commit 09d34ae2a5ef00c4b83b0178de29323b02e10b6f
Author: Heinrich MÃller <henmull src gnome org>
Date: Wed Jan 9 07:15:00 2013 +0100
quickfix for missing files
pan/general/compression.cc | 348 +++++++++++++++++++++++++++++++++++
pan/icons/icon_filter_only_read.png | Bin 0 -> 1371 bytes
pan/tasks/nntp.cc | 7 +-
pan/tasks/socket-impl-gio.cc | 4 +-
pan/tasks/socket-impl-openssl.cc | 4 +-
pan/tasks/task-groups.cc | 4 +-
6 files changed, 358 insertions(+), 9 deletions(-)
---
diff --git a/pan/general/compression.cc b/pan/general/compression.cc
new file mode 100644
index 0000000..821c7d3
--- /dev/null
+++ b/pan/general/compression.cc
@@ -0,0 +1,348 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/*
+ * Pan - A Newsreader for Gtk+
+ * Copyright (C) 2002-2006 Charles Kerr <charles rebelbase com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+extern "C"
+{
+ #include <zlib.h>
+ #include <assert.h>
+ #include <stdlib.h>
+}
+
+#include <sstream>
+#include <vector>
+
+#include "compression.h"
+
+using namespace pan;
+//using compression::CompressionType;
+
+namespace
+{
+
+ unsigned int crc_table[] = { /* CRC polynomial 0xedb88320 */
+ 0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f,
+ 0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988,
+ 0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91, 0x1db71064, 0x6ab020f2,
+ 0xf3b97148, 0x84be41de, 0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7,
+ 0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9,
+ 0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172,
+ 0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b, 0x35b5a8fa, 0x42b2986c,
+ 0xdbbbc9d6, 0xacbcf940, 0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59,
+ 0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423,
+ 0xcfba9599, 0xb8bda50f, 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924,
+ 0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, 0x76dc4190, 0x01db7106,
+ 0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433,
+ 0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818, 0x7f6a0dbb, 0x086d3d2d,
+ 0x91646c97, 0xe6635c01, 0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e,
+ 0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950,
+ 0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65,
+ 0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2, 0x4adfa541, 0x3dd895d7,
+ 0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0,
+ 0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9, 0x5005713c, 0x270241aa,
+ 0xbe0b1010, 0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f,
+ 0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17, 0x2eb40d81,
+ 0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a,
+ 0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683, 0xe3630b12, 0x94643b84,
+ 0x0d6d6a3e, 0x7a6a5aa8, 0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1,
+ 0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb,
+ 0x196c3671, 0x6e6b06e7, 0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc,
+ 0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5, 0xd6d6a3e8, 0xa1d1937e,
+ 0x38d8c2c4, 0x4fdff252, 0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b,
+ 0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55,
+ 0x316e8eef, 0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236,
+ 0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe, 0xb2bd0b28,
+ 0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d,
+ 0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a, 0x9c0906a9, 0xeb0e363f,
+ 0x72076785, 0x05005713, 0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38,
+ 0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242,
+ 0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777,
+ 0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c, 0x8f659eff, 0xf862ae69,
+ 0x616bffd3, 0x166ccf45, 0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2,
+ 0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db, 0xaed16a4a, 0xd9d65adc,
+ 0x40df0b66, 0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9,
+ 0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605, 0xcdd70693,
+ 0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94,
+ 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d };
+
+ unsigned int
+ _crc32(const char *buf, size_t len, unsigned int crc)
+ {
+ crc ^= 0xffffffffU;
+
+ while (len--)
+ crc = (crc >> 8) ^ crc_table[(crc ^ *buf++) & 0xff];
+
+ return crc ^ 0xffffffffU;
+ }
+
+ #define MEMCHUNK 4096
+
+ #define LINELEN_MIN 2048
+ #define LINELEN_MAX 32768
+
+ struct gzip_line {
+ std::stringstream* stream;
+ char *start;
+ char *where;
+ size_t remaining;
+ size_t allocated;
+ int eof;
+ };
+
+ void
+ line_init(struct gzip_line *line, std::stringstream* stream)
+ {
+ line->stream = stream;
+ line->allocated = LINELEN_MIN;
+ line->where = line->start = (char*)calloc(1, line->allocated);
+ line->remaining = 0;
+ line->eof = 0;
+ }
+
+ int
+ line_read(struct gzip_line *line, char **p)
+ {
+ char *where;
+ char *lf = NULL;
+
+ if (line->remaining != 0) {
+ if (line->start != line->where) {
+ memmove(line->start, line->where, line->remaining);
+ lf = (char*)memchr(line->start, '\n', line->remaining);
+ }
+ }
+ where = line->start + line->remaining;
+
+ if (lf == NULL) {
+ do {
+ ssize_t count;
+ if (where == line->start + line->allocated) {
+ size_t newsize = line->allocated * 2;
+ if (newsize > LINELEN_MAX)
+ newsize = LINELEN_MAX;
+ if (newsize == line->allocated) {
+ where = line->start;
+ line->eof = 1;
+ } else {
+ line->start = (char*)realloc(line->start, newsize);
+ where = line->start + line->allocated;
+ line->allocated = newsize;
+ }
+ }
+
+ do {
+ count = line->stream->readsome(where, line->allocated - (where - line->start));
+ } while (count == -1);
+
+ if (count < 0) {
+ count = 0;
+ }
+
+ if (count == 0) {
+ line->eof = 1;
+ lf = where;
+ where++;
+ break;
+ }
+ lf = (char*)memchr(where, '\n', count);
+ where += count;
+ } while (lf == NULL);
+ }
+
+ line->where = lf + 1;
+ line->remaining = where - line->where;
+
+ *lf = '\0';
+ *p = line->start;
+ if (line->eof)
+ return lf - line->start;
+ return lf - line->start + 1; /* <<=== length includes terminator '\0' */
+ }
+
+
+}
+
+void
+compression::ydecode(std::stringstream* in, std::stringstream* out)
+{
+ int gotbeg = 0, len, outlen = 0;
+ char buf1[512], buf2[512], c, *p, *p2 = buf2;
+ //unsigned int crc1 = 0, crc = _crc32(NULL, 0, 0);
+
+ while (!in->getline(buf1, sizeof(buf1)).eof())
+ {
+ if (gotbeg == 0 && strncmp(buf1, "=ybegin ", 8) == 0)
+ {
+ gotbeg = 1;
+ }
+ else if (gotbeg == 1 && strncmp(buf1, "=yend ", 6) == 0)
+ {
+ //p = strstr(buf1, "crc32=");
+ //if (p)
+ // sscanf(p + 6, "%x", &crc1);
+ break;
+ }
+ else if (gotbeg == 1)
+ {
+ len = strlen(buf1);
+ /* strip the CR LF */
+ if (len > 2 && buf1[len - 1])
+ {
+ buf1[len - 1] = '\0';
+ len--;
+ }
+ p = buf1;
+ while (*p)
+ {
+ c = *p++;
+ if (c == '=')
+ {
+ c = *p++;
+ if (c == 0)
+ break; /* can't have escape char as last char in line */
+ c = (unsigned char) (c - 64);
+ }
+
+ c = (unsigned char) (c - 42);
+ *p2++ = c;
+ /* flush when buffer full */
+ if (++outlen >= sizeof(buf2))
+ {
+ //crc = _crc32(buf2, outlen, crc);
+ out->write(buf2, outlen);
+ p2 = buf2;
+ outlen = 0;
+ }
+ }
+ }
+ }
+ /* flush remaining data */
+ if (outlen)
+ {
+ //crc = _crc32(buf2, outlen, crc);
+ out->write(buf2, outlen);
+ }
+
+ // todo log, callback
+ //assert(crc == crc1);
+}
+
+int
+compression::inflate_zlib(std::stringstream *source, std::stringstream *dest,
+ const CompressionType& compression)
+{
+ int ret;
+ size_t have;
+ z_stream strm;
+ char in[MEMCHUNK];
+ char out[MEMCHUNK];
+
+ /* allocate inflate state */
+ strm.zalloc = Z_NULL;
+ strm.zfree = Z_NULL;
+ strm.opaque = Z_NULL;
+ strm.avail_in = 0;
+ strm.next_in = Z_NULL;
+
+ if (compression == HEADER_COMPRESS_XZVER)
+ ret = inflateInit2(&strm, -MAX_WBITS); /* use -MAX_WBITS to indicate gzip style */
+
+ if (compression == HEADER_COMPRESS_XFEATURE
+ || compression == HEADER_COMPRESS_DIABLO)
+ ret = inflateInit(&strm);
+
+ if (ret != Z_OK)
+ return ret;
+
+ /* decompress until deflate stream ends or end of file */
+ do
+ {
+ strm.avail_in = source->read(in, MEMCHUNK).gcount();
+ if (source->bad())
+ {
+ (void) inflateEnd(&strm);
+ return Z_ERRNO;
+ }
+ if (strm.avail_in == 0)
+ break;
+ strm.next_in = (unsigned char*) in;
+
+ /* run inflate() on input until output buffer not full */
+ do
+ {
+ strm.avail_out = MEMCHUNK;
+ strm.next_out = (unsigned char*) out;
+ ret = inflate(&strm, Z_NO_FLUSH);
+ assert(ret != Z_STREAM_ERROR);
+ /* state not clobbered */
+ switch (ret)
+ {
+ case Z_NEED_DICT:
+ ret = Z_DATA_ERROR; /* and fall through */
+ case Z_DATA_ERROR:
+ case Z_MEM_ERROR:
+ (void) inflateEnd(&strm);
+ return ret;
+ }
+ have = MEMCHUNK - strm.avail_out;
+ dest->write(out, have);
+ }
+ while (strm.avail_out == 0);
+
+ /* done when inflate() says it's done */
+ }
+ while (ret != Z_STREAM_END);
+
+ /* clean up and return */
+ (void) inflateEnd(&strm);
+ return ret == Z_STREAM_END ? Z_OK : Z_DATA_ERROR;
+}
+
+void compression::inflate_gzip (std::stringstream* stream, std::vector<std::string>& fillme)
+{
+ struct gzip_line g_line;
+ size_t len;
+ char* buf;
+ char buf2[4096];
+
+ std::stringstream dest, dest2;
+ //line_init(&g_line, stream);
+
+ /*
+ while (!g_line.eof) {
+ while ((len = line_read(&g_line, &buf)) > 0) {
+ buf[len-1] = '\n';
+ dest.write(buf, len);
+ if (len >= 3 && strncmp(buf + len - 3, ".\r\n", 3) == 0) {
+ g_line.eof = 1;
+ break;
+ }
+ }
+ }*/
+
+ std::ofstream out ("/home/imhotep/compression/out");
+ out << stream->str();
+ out.close();
+
+ std::cerr<<"inflate : "<<inflate_zlib(stream, &dest2, HEADER_COMPRESS_XFEATURE)<<"\n\n";
+
+ while (!dest2.getline(buf2,4096).eof())
+ fillme.push_back(std::string(buf2));
+
+}
diff --git a/pan/icons/icon_filter_only_read.png b/pan/icons/icon_filter_only_read.png
new file mode 100644
index 0000000..4b2574f
Binary files /dev/null and b/pan/icons/icon_filter_only_read.png differ
diff --git a/pan/tasks/nntp.cc b/pan/tasks/nntp.cc
index 0d52cc5..604cfbe 100644
--- a/pan/tasks/nntp.cc
+++ b/pan/tasks/nntp.cc
@@ -103,15 +103,16 @@ NNTP :: on_socket_response (Socket * sock UNUSED, const StringView& line_in)
if (_compression)
{
- state = CMD_MORE;
+ state = CMD_DONE;
assert (_listener != 0);
if (_listener)
_listener->on_nntp_line (this, line_in);
- if (line_in.len >= 3 && line_in.strstr(".\r\n"))
+ if (line_in.len >= 3 && line.str[line.len-1] == '.')
{
_compression = false;
_nntp_response_text = false;
- line = ".";
+ line = "COMPRESS_DONE";
+ state = CMD_DONE;
}
}
}
diff --git a/pan/tasks/socket-impl-gio.cc b/pan/tasks/socket-impl-gio.cc
index 252d590..b81c0cb 100644
--- a/pan/tasks/socket-impl-gio.cc
+++ b/pan/tasks/socket-impl-gio.cc
@@ -338,8 +338,8 @@ GIOChannelSocket :: do_read ()
debug_v ("read [" << g->str << "]"); // verbose debug, if --debug --debug was on the command-line
increment_xfer_byte_count (g->len);
- //if (g_str_has_suffix (g->str, "\r\n"))
- // g_string_truncate (g, g->len-2);
+ if (g_str_has_suffix (g->str, "\r\n"))
+ g_string_truncate (g, g->len-2);
more = _listener->on_socket_response (this, StringView (g->str, g->len));
_listener->on_socket_bytes_transferred(g->len, this);
diff --git a/pan/tasks/socket-impl-openssl.cc b/pan/tasks/socket-impl-openssl.cc
index 2b33479..229788e 100644
--- a/pan/tasks/socket-impl-openssl.cc
+++ b/pan/tasks/socket-impl-openssl.cc
@@ -623,8 +623,8 @@ GIOChannelSocketGnuTLS :: do_read ()
debug_v ("read [" << g->str << "]");
increment_xfer_byte_count (g->len);
- //if (g_str_has_suffix (g->str, "\r\n"))
- // g_string_truncate (g, g->len-2);
+ if (g_str_has_suffix (g->str, "\r\n"))
+ g_string_truncate (g, g->len-2);
more = _listener->on_socket_response (this, StringView (g->str, g->len));
//_listener->on_socket_bytes_transferred(g->len, this);
}
diff --git a/pan/tasks/task-groups.cc b/pan/tasks/task-groups.cc
index 271c082..0bc8be7 100644
--- a/pan/tasks/task-groups.cc
+++ b/pan/tasks/task-groups.cc
@@ -148,13 +148,13 @@ TaskGroups :: on_nntp_done (NNTP * nntp,
}
else // health is OK or FAIL
{
- if (response == ".")
+ if (response == "COMPRESS_DONE")
{
std::vector<std::string> lines;
compression::inflate_gzip (&stream, lines);
foreach (std::vector<std::string>, lines, it)
on_nntp_line_process (nntp, *it);
- stream.str().clear();
+ std::cerr<<"len "<<stream.str().length()<<"\n";
}
if (_step == LIST_NEWSGROUPS)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
