From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id BD08E431FBC for ; Sun, 30 Mar 2014 04:23:47 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: 0 X-Spam-Level: X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] autolearn=disabled Received: from olra.theworths.org ([127.0.0.1]) by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id CXd66+iA+4IA for ; Sun, 30 Mar 2014 04:23:38 -0700 (PDT) Received: from yantan.tethera.net (yantan.tethera.net [199.188.72.155]) (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id EB82E431FB6 for ; Sun, 30 Mar 2014 04:23:37 -0700 (PDT) Received: from remotemail by yantan.tethera.net with local (Exim 4.80) (envelope-from ) id 1WUDpr-0002vi-CJ; Sun, 30 Mar 2014 08:23:31 -0300 Received: (nullmailer pid 7793 invoked by uid 1000); Sun, 30 Mar 2014 11:23:27 -0000 From: David Bremner To: notmuch@notmuchmail.org Subject: [Patch v3] util: add gzreadline Date: Sun, 30 Mar 2014 08:23:22 -0300 Message-Id: <1396178602-7583-1-git-send-email-david@tethera.net> X-Mailer: git-send-email 1.9.0 In-Reply-To: References: X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Mar 2014 11:23:47 -0000 The idea is to provide a more or less drop in replacement for readline to read from zlib/gzip streams. Take the opportunity to replace malloc with talloc. --- This corrects one nasty bug, and a few style/optimization issues brought up by Tomi. I'm not sure about the name. I agree in principle it would be good to signal "talloc". I'm just not sure the best way to do that. I'm also not sure about the error handling. the "real" getline sets errno. Should we? util/Makefile.local | 2 +- util/zlib-extra.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++++ util/zlib-extra.h | 10 +++++++++ 3 files changed, 73 insertions(+), 1 deletion(-) create mode 100644 util/zlib-extra.c create mode 100644 util/zlib-extra.h diff --git a/util/Makefile.local b/util/Makefile.local index 29c0ce6..e2a5b65 100644 --- a/util/Makefile.local +++ b/util/Makefile.local @@ -4,7 +4,7 @@ dir := util extra_cflags += -I$(srcdir)/$(dir) libutil_c_srcs := $(dir)/xutil.c $(dir)/error_util.c $(dir)/hex-escape.c \ - $(dir)/string-util.c $(dir)/talloc-extra.c + $(dir)/string-util.c $(dir)/talloc-extra.c $(dir)/zlib-extra.c libutil_modules := $(libutil_c_srcs:.c=.o) diff --git a/util/zlib-extra.c b/util/zlib-extra.c new file mode 100644 index 0000000..7afe175 --- /dev/null +++ b/util/zlib-extra.c @@ -0,0 +1,62 @@ +/* zlib-extra.c - Extra or enhanced routines for compressed I/O. + * + * Copyright (c) 2014 David Bremner + * + * 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, either version 3 of the License, or + * (at your option) any later version. + * + * 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, see http://www.gnu.org/licenses/ . + * + * Author: David Bremner + */ + +#include "zlib-extra.h" +#include +#include +#include + +/* mimic POSIX/glibc getline, but on a zlib gzFile stream, and using talloc */ +ssize_t +gzgetline (void *ctx, char **lineptr, size_t *n, gzFile stream) { + + size_t len = *n; + char *buf = *lineptr; + size_t offset = 0; + + if (len == 0 || buf == NULL) { + /* same as getdelim from gnulib */ + len = 120; + buf = talloc_size (ctx, len); + if (buf == NULL) + return -1; + } + + while (1) { + + if (!gzgets (stream, buf + offset, len - offset)) + return -1; + + offset += strlen (buf+offset); + + if ( buf[offset-1] == '\n' ) + break; + + len *= 2; + buf = talloc_realloc (ctx, buf, char, len); + if (buf == NULL) + return -1; + + } + + *lineptr = buf; + *n = len; + return offset; +} diff --git a/util/zlib-extra.h b/util/zlib-extra.h new file mode 100644 index 0000000..c18480f --- /dev/null +++ b/util/zlib-extra.h @@ -0,0 +1,10 @@ +#ifndef _ZLIB_EXTRA_H +#define _ZLIB_EXTRA_H + +#include + +/* Like getline, but read from a gzFile. Allocation is with talloc */ +ssize_t +gzgetline (void *ctx, char **lineptr, size_t *n, gzFile stream); + +#endif -- 1.9.0