X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=phpstr%2Fphpstr.c;h=eb2f87a715d29d6975f0528e479ee81c18da9bac;hp=8ab8737d0d68e424426eda5ec1b75f12155de096;hb=refs%2Fheads%2Fv1.7.x;hpb=a0bca521b491711e43aef74fe19c23a8eb4d0777

diff --git a/phpstr/phpstr.c b/phpstr/phpstr.c
index 8ab8737..eb2f87a 100644
--- a/phpstr/phpstr.c
+++ b/phpstr/phpstr.c
@@ -4,8 +4,6 @@
 #include "php.h"
 #include "phpstr.h"
 
-#define NOMEM ((size_t) -1)
-
 PHPSTR_API phpstr *phpstr_init_ex(phpstr *buf, size_t chunk_size, int flags)
 {
 	if (!buf) {
@@ -13,7 +11,7 @@ PHPSTR_API phpstr *phpstr_init_ex(phpstr *buf, size_t chunk_size, int flags)
 	}
 
 	if (buf) {
-		buf->size = (chunk_size > 0) ? chunk_size : PHPSTR_DEFAULT_SIZE;
+		buf->size = (chunk_size) ? chunk_size : PHPSTR_DEFAULT_SIZE;
 		buf->pmem = (flags & PHPSTR_INIT_PERSISTENT) ? 1 : 0;
 		buf->data = (flags & PHPSTR_INIT_PREALLOC) ? pemalloc(buf->size, buf->pmem) : NULL;
 		buf->free = (flags & PHPSTR_INIT_PREALLOC) ? buf->size : 0;
@@ -26,7 +24,7 @@ PHPSTR_API phpstr *phpstr_init_ex(phpstr *buf, size_t chunk_size, int flags)
 PHPSTR_API phpstr *phpstr_from_string_ex(phpstr *buf, const char *string, size_t length)
 {
 	if ((buf = phpstr_init(buf))) {
-		if (NOMEM == phpstr_append(buf, string, length)) {
+		if (PHPSTR_NOMEM == phpstr_append(buf, string, length)) {
 			pefree(buf, buf->pmem);
 			buf = NULL;
 		}
@@ -34,39 +32,57 @@ PHPSTR_API phpstr *phpstr_from_string_ex(phpstr *buf, const char *string, size_t
 	return buf;
 }
 
-PHPSTR_API size_t phpstr_resize_ex(phpstr *buf, size_t len, size_t override_size)
+PHPSTR_API size_t phpstr_resize_ex(phpstr *buf, size_t len, size_t override_size, int allow_error)
 {
+	char *ptr = NULL;
+#if 0
+	fprintf(stderr, "RESIZE: size=%lu, used=%lu, free=%lu\n", buf->size, buf->used, buf->free);
+#endif
 	if (buf->free < len) {
 		size_t size = override_size ? override_size : buf->size;
 		
 		while ((size + buf->free) < len) {
-			size *= 2;
+			size <<= 1;
 		}
-		if (buf->data) {
-			char *ptr = perealloc(buf->data, buf->used + buf->free + size, buf->pmem);
-			
-			if (ptr) {
-				buf->data = ptr;
-			} else {
-				return NOMEM;
-			}
+		
+		if (allow_error) {
+			ptr = perealloc_recoverable(buf->data, buf->used + buf->free + size, buf->pmem);
 		} else {
-			buf->data = pemalloc(size, buf->pmem);
-			
-			if (!buf->data) {
-				return NOMEM;
-			}
+			ptr = perealloc(buf->data, buf->used + buf->free + size, buf->pmem);
 		}
+		
+		if (ptr) {
+			buf->data = ptr;
+		} else {
+			return PHPSTR_NOMEM;
+		}
+		
 		buf->free += size;
 		return size;
 	}
 	return 0;
 }
 
+PHPSTR_API size_t phpstr_shrink(phpstr *buf)
+{
+	/* avoid another realloc on fixation */
+	if (buf->free > 1) {
+		char *ptr = perealloc(buf->data, buf->used + 1, buf->pmem);
+		
+		if (ptr) {
+			buf->data = ptr;
+		} else {
+			return PHPSTR_NOMEM;
+		}
+		buf->free = 1;
+	}
+	return buf->used;
+}
+
 PHPSTR_API size_t phpstr_append(phpstr *buf, const char *append, size_t append_len)
 {
-	if (NOMEM == phpstr_resize(buf, append_len)) {
-		return NOMEM;
+	if (PHPSTR_NOMEM == phpstr_resize(buf, append_len)) {
+		return PHPSTR_NOMEM;
 	}
 	memcpy(buf->data + buf->used, append, append_len);
 	buf->used += append_len;
@@ -87,16 +103,16 @@ PHPSTR_API size_t phpstr_appendf(phpstr *buf, const char *format, ...)
 	alloc = phpstr_append(buf, append, append_len);
 	efree(append);
 
-	if (NOMEM == alloc) {
-		return NOMEM;
+	if (PHPSTR_NOMEM == alloc) {
+		return PHPSTR_NOMEM;
 	}
 	return append_len;
 }
 
 PHPSTR_API size_t phpstr_insert(phpstr *buf, const char *insert, size_t insert_len, size_t offset)
 {
-	if (NOMEM == phpstr_resize(buf, insert_len)) {
-		return NOMEM;
+	if (PHPSTR_NOMEM == phpstr_resize(buf, insert_len)) {
+		return PHPSTR_NOMEM;
 	}
 	memmove(buf->data + offset + insert_len, buf->data + offset, insert_len);
 	memcpy(buf->data + offset, insert, insert_len);
@@ -118,16 +134,16 @@ PHPSTR_API size_t phpstr_insertf(phpstr *buf, size_t offset, const char *format,
 	alloc = phpstr_insert(buf, insert, insert_len, offset);
 	efree(insert);
 
-	if (NOMEM == alloc) {
-		return NOMEM;
+	if (PHPSTR_NOMEM == alloc) {
+		return PHPSTR_NOMEM;
 	}
 	return insert_len;
 }
 
 PHPSTR_API size_t phpstr_prepend(phpstr *buf, const char *prepend, size_t prepend_len)
 {
-	if (NOMEM == phpstr_resize(buf, prepend_len)) {
-		return NOMEM;
+	if (PHPSTR_NOMEM == phpstr_resize(buf, prepend_len)) {
+		return PHPSTR_NOMEM;
 	}
 	memmove(buf->data + prepend_len, buf->data, buf->used);
 	memcpy(buf->data, prepend, prepend_len);
@@ -149,8 +165,8 @@ PHPSTR_API size_t phpstr_prependf(phpstr *buf, const char *format, ...)
 	alloc = phpstr_prepend(buf, prepend, prepend_len);
 	efree(prepend);
 
-	if (NOMEM == alloc) {
-		return NOMEM;
+	if (PHPSTR_NOMEM == alloc) {
+		return PHPSTR_NOMEM;
 	}
 	return prepend_len;
 }
@@ -171,7 +187,7 @@ PHPSTR_API char *phpstr_data(const phpstr *buf, char **into, size_t *len)
 PHPSTR_API phpstr *phpstr_dup(const phpstr *buf)
 {
 	phpstr *dup = phpstr_clone(buf);
-	if (NOMEM == phpstr_append(dup, buf->data, buf->used)) {
+	if (PHPSTR_NOMEM == phpstr_append(dup, buf->data, buf->used)) {
 		phpstr_free(&dup);
 	}
 	return dup;
@@ -196,10 +212,10 @@ PHPSTR_API phpstr *phpstr_sub(const phpstr *buf, size_t offset, size_t length)
 	if (offset >= buf->used) {
 		return NULL;
 	} else {
-		size_t need = (length + offset) > buf->used ? (buf->used - offset) : (length - offset);
+		size_t need = 1 + ((length + offset) > buf->used ? (buf->used - offset) : (length - offset));
 		phpstr *sub = phpstr_init_ex(NULL, need, PHPSTR_INIT_PREALLOC | (buf->pmem ? PHPSTR_INIT_PERSISTENT:0));
 		if (sub) {
-			if (NOMEM == phpstr_append(sub, buf->data + offset, need)) {
+			if (PHPSTR_NOMEM == phpstr_append(sub, buf->data + offset, need)) {
 				phpstr_free(&sub);
 			} else {
 				sub->size = buf->size;
@@ -221,22 +237,16 @@ PHPSTR_API phpstr *phpstr_right(const phpstr *buf, size_t length)
 
 PHPSTR_API phpstr *phpstr_merge_va(phpstr *buf, unsigned argc, va_list argv)
 {
-	unsigned f = 0, i = 0;
+	unsigned i = 0;
 	buf = phpstr_init(buf);
 
 	if (buf) {
 		while (argc > i++) {
 			phpstr_free_t f = va_arg(argv, phpstr_free_t);
 			phpstr *current = va_arg(argv, phpstr *);
-			if (NOMEM == phpstr_append(buf, current->data, current->used)) {
-				f = 1;
-			}
+			phpstr_append(buf, current->data, current->used);
 			FREE_PHPSTR(f, current);
 		}
-		
-		if (f) {
-			phpstr_free(&buf);
-		}
 	}
 
 	return buf;
@@ -266,7 +276,7 @@ PHPSTR_API phpstr *phpstr_merge(unsigned argc, ...)
 
 PHPSTR_API phpstr *phpstr_fix(phpstr *buf)
 {
-	if (NOMEM == phpstr_resize_ex(buf, 1, 1)) {
+	if (PHPSTR_NOMEM == phpstr_resize_ex(buf, 1, 1, 0)) {
 		return NULL;
 	}
 	buf->data[buf->used] = '\0';
@@ -316,7 +326,7 @@ PHPSTR_API size_t phpstr_chunk_buffer(phpstr **s, const char *data, size_t data_
 	*chunk = NULL;
 	
 	if (!*s) {
-		*s = phpstr_init_ex(NULL, chunk_size * 2, chunk_size ? PHPSTR_INIT_PREALLOC : 0);
+		*s = phpstr_init_ex(NULL, chunk_size << 1, chunk_size ? PHPSTR_INIT_PREALLOC : 0);
 	}
 	storage = *s;
 	
@@ -330,24 +340,22 @@ PHPSTR_API size_t phpstr_chunk_buffer(phpstr **s, const char *data, size_t data_
 		return chunk_size;
 	}
 	
-	if (storage->used >= storage->size/2) {
-		phpstr *avail = phpstr_left(storage, storage->size/2);
-		*chunk = estrndup(PHPSTR_VAL(avail), PHPSTR_LEN(avail));
-		phpstr_free(&avail);
-		phpstr_cut(storage, 0, storage->size/2);
-		return storage->size/2;
+	if (storage->used >= (chunk_size = storage->size >> 1)) {
+		*chunk = estrndup(storage->data, chunk_size);
+		phpstr_cut(storage, 0, chunk_size);
+		return chunk_size;
 	}
 	
 	return 0;
 }
 
-PHPSTR_API void phpstr_chunked_output(phpstr **s, const char *data, size_t data_len, size_t chunk_len, void (*passthru)(const char *, size_t TSRMLS_DC) TSRMLS_DC)
+PHPSTR_API void phpstr_chunked_output(phpstr **s, const char *data, size_t data_len, size_t chunk_len, phpstr_passthru_func passthru, void *opaque TSRMLS_DC)
 {
 	char *chunk = NULL;
 	size_t got = 0;
 	
 	while ((got = phpstr_chunk_buffer(s, data, data_len, &chunk, chunk_len))) {
-		passthru(chunk, got TSRMLS_CC);
+		passthru(opaque, chunk, got TSRMLS_CC);
 		if (!chunk_len) {
 			/* 	we already got the last chunk,
 				and freed all resources */