From 4313cc4a340627228b376bb6e31a4520d7ba8a72 Mon Sep 17 00:00:00 2001 From: Austin Clements Date: Wed, 2 Apr 2014 23:26:44 +2000 Subject: [PATCH] Re: [Patch v5 3/6] util: add gz_readline --- 49/897b3847c02d5e3ca038a999b6a049664b0c9a | 253 ++++++++++++++++++++++ 1 file changed, 253 insertions(+) create mode 100644 49/897b3847c02d5e3ca038a999b6a049664b0c9a diff --git a/49/897b3847c02d5e3ca038a999b6a049664b0c9a b/49/897b3847c02d5e3ca038a999b6a049664b0c9a new file mode 100644 index 000000000..13ea5a626 --- /dev/null +++ b/49/897b3847c02d5e3ca038a999b6a049664b0c9a @@ -0,0 +1,253 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 8BD82431FBF + for ; Tue, 1 Apr 2014 20:26:56 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -0.7 +X-Spam-Level: +X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5 + tests=[RCVD_IN_DNSWL_LOW=-0.7] 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 arQb2BlrWfO3 for ; + Tue, 1 Apr 2014 20:26:48 -0700 (PDT) +Received: from dmz-mailsec-scanner-2.mit.edu (dmz-mailsec-scanner-2.mit.edu + [18.9.25.13]) + (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 86B08431FBD + for ; Tue, 1 Apr 2014 20:26:48 -0700 (PDT) +X-AuditID: 1209190d-f79776d000000ce9-3a-533b83778d2e +Received: from mailhub-auth-3.mit.edu ( [18.9.21.43]) + (using TLS with cipher AES256-SHA (256/256 bits)) + (Client did not present a certificate) + by dmz-mailsec-scanner-2.mit.edu (Symantec Messaging Gateway) with SMTP + id F4.61.03305.7738B335; Tue, 1 Apr 2014 23:26:47 -0400 (EDT) +Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11]) + by mailhub-auth-3.mit.edu (8.13.8/8.9.2) with ESMTP id s323QkkI020348; + Tue, 1 Apr 2014 23:26:47 -0400 +Received: from awakening.csail.mit.edu (awakening.csail.mit.edu [18.26.4.91]) + (authenticated bits=0) + (User authenticated as amdragon@ATHENA.MIT.EDU) + by outgoing.mit.edu (8.13.8/8.12.4) with ESMTP id s323Qi9D007890 + (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NOT); + Tue, 1 Apr 2014 23:26:46 -0400 +Received: from amthrax by awakening.csail.mit.edu with local (Exim 4.80) + (envelope-from ) + id 1WVBp6-0004YY-MZ; Tue, 01 Apr 2014 23:26:44 -0400 +Date: Tue, 1 Apr 2014 23:26:44 -0400 +From: Austin Clements +To: David Bremner +Subject: Re: [Patch v5 3/6] util: add gz_readline +Message-ID: <20140402032644.GB25677@mit.edu> +References: <1396401381-18128-1-git-send-email-david@tethera.net> + <1396401381-18128-4-git-send-email-david@tethera.net> +MIME-Version: 1.0 +Content-Type: text/plain; charset=us-ascii +Content-Disposition: inline +In-Reply-To: <1396401381-18128-4-git-send-email-david@tethera.net> +User-Agent: Mutt/1.5.21 (2010-09-15) +X-Brightmail-Tracker: + H4sIAAAAAAAAA+NgFuplleLIzCtJLcpLzFFi42IR4hTV1i1vtg42uDRL2+JGazejxfWbM5kd + mDyerbrF7LHl0HvmAKYoLpuU1JzMstQifbsEroye3RfYCuZrVJxqdWlg/CPXxcjJISFgIjH/ + 7EM2CFtM4sK99UA2F4eQwGwmiZ6mzUwQzgZGiUfHlzGDVAkJnGKS2LTKDMJewihx7LINiM0i + oCLRvb6ZBcRmE9CQ2LZ/OSOILSKgKnF122SwDcwC0hLffjczgdjCAoYS/5c9A6vnFdCROLJh + NwvEzEqJnvWLmCDighInZz5hgejVkrjx7yVQnANszvJ/HCBhTgEniTentoOViAKdMOXkNrYJ + jEKzkHTPQtI9C6F7ASPzKkbZlNwq3dzEzJzi1GTd4uTEvLzUIl0jvdzMEr3UlNJNjOCQluTd + wfjuoNIhRgEORiUe3gPnrYKFWBPLiitzDzFKcjApifJyBFsHC/El5adUZiQWZ8QXleakFh9i + lOBgVhLh/e4LlONNSaysSi3Kh0lJc7AoifO+tQaaJJCeWJKanZpakFoEk5Xh4FCS4PVuAmoU + LEpNT61Iy8wpQUgzcXCCDOcBGi4HUsNbXJCYW5yZDpE/xajL8WnDmkYmIZa8/LxUKXFeJZAi + AZCijNI8uDmwVPSKURzoLWFefZAqHmAag5v0CmgJE9AS7nVWIEtKEhFSUg2Mgs4FZ5daeLgt + dOeolJQ5M2PjL955fR9qWCLXLJ5ofZx5h+eVsLIbBZ5OhW1hLtuWrwg6f7W/fPVfpROf2cv3 + K2289PP58n2f0o9NKD9r1vJ0A1v6vE59pXfWq7rYsy/PNtC/IJYv4yGUOsPI7Ue8s6AIn0ty + fOKHbvPcczKZB5mMb/C8lVdSYinOSDTUYi4qTgQARaRAISADAAA= +Cc: notmuch@notmuchmail.org +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: Wed, 02 Apr 2014 03:26:56 -0000 + +Quoth David Bremner on Apr 01 at 10:16 pm: +> 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. +> --- +> util/Makefile.local | 2 +- +> util/util.h | 12 +++++++++ +> util/zlib-extra.c | 76 +++++++++++++++++++++++++++++++++++++++++++++++++++++ +> util/zlib-extra.h | 11 ++++++++ +> 4 files changed, 100 insertions(+), 1 deletion(-) +> create mode 100644 util/util.h +> 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/util.h b/util/util.h +> new file mode 100644 +> index 0000000..8663cfc +> --- /dev/null +> +++ b/util/util.h +> @@ -0,0 +1,12 @@ +> +#ifndef _UTIL_H +> +#define _UTIL_H +> + +> +typedef enum util_status { +> + UTIL_SUCCESS = 0, +> + UTIL_ERROR = 1, +> + UTIL_OUT_OF_MEMORY, +> + UTIL_EOF, +> + UTIL_FILE, +> +} util_status_t; +> + +> +#endif +> diff --git a/util/zlib-extra.c b/util/zlib-extra.c +> new file mode 100644 +> index 0000000..cb1eba0 +> --- /dev/null +> +++ b/util/zlib-extra.c +> @@ -0,0 +1,76 @@ +> +/* 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 */ +> +util_status_t +> +gz_getline (void *talloc_ctx, char **bufptr, size_t *bufsiz, ssize_t *bytes_read, + +Talloc chunks know their size, so rather than taking bufsize, use +talloc_get_size (or talloc_array_length if you switch to talloc array +functions below). + +> + gzFile stream) +> +{ +> + size_t len = *bufsiz; +> + char *buf = *bufptr; +> + size_t offset = 0; +> + +> + if (len == 0 || buf == NULL) { +> + /* same as getdelim from gnulib */ +> + len = 120; + +This is presumably because glibc's malloc has an 8 byte header. Fun +fact: talloc has a 104 byte header (on 64-bit and including the malloc +header). + +> + buf = talloc_size (talloc_ctx, len); +> + if (buf == NULL) +> + return UTIL_OUT_OF_MEMORY; +> + } +> + +> + while (1) { +> + if (! gzgets (stream, buf + offset, len - offset)) { +> + int zlib_status = 0; +> + (void) gzerror (stream, &zlib_status); +> + switch (zlib_status) { +> + case Z_OK: +> + /* follow getline behaviour */ +> + *bytes_read = -1; + +Is this really what getline does when the last line of a file isn't +\n-terminated? + +> + return UTIL_EOF; +> + break; +> + case Z_ERRNO: +> + return UTIL_FILE; +> + break; +> + default: +> + return UTIL_ERROR; +> + } +> + } +> + +> + offset += strlen (buf + offset); +> + +> + if ( buf[offset - 1] == '\n' ) + +Too many spaces! + +> + break; +> + +> + len *= 2; +> + buf = talloc_realloc (talloc_ctx, buf, char, len); + +Or talloc_realloc_size, to match the initial talloc_size. +Alternatively, the initial talloc_size could be a talloc_array. + +> + if (buf == NULL) +> + return UTIL_OUT_OF_MEMORY; +> + } +> + +> + *bufptr = buf; +> + *bufsiz = len; +> + *bytes_read = offset; +> + return UTIL_SUCCESS; +> +} +> diff --git a/util/zlib-extra.h b/util/zlib-extra.h +> new file mode 100644 +> index 0000000..ed46ac1 +> --- /dev/null +> +++ b/util/zlib-extra.h +> @@ -0,0 +1,11 @@ +> +#ifndef _ZLIB_EXTRA_H +> +#define _ZLIB_EXTRA_H +> + +> +#include +> +#include "util.h" + +I'd put "util.h" first so we're more likely to catch missing header +dependencies (obviously util.h doesn't have any right now, but in the +future). + +Also, I'd put a blank line after the #includes. + +> +/* Like getline, but read from a gzFile. Allocation is with talloc */ +> +util_status_t +> +gz_getline (void *ctx, char **lineptr, size_t *line_size, ssize_t *bytes_read, +> + gzFile stream); +> + +> +#endif -- 2.26.2