/* -*-c-*-
*
- * $Id: dstr.c,v 1.10 1999/10/04 21:44:47 mdw Exp $
+ * $Id: dstr.c,v 1.16 2004/04/08 01:36:11 mdw Exp $
*
* Handle dynamically growing strings
*
* MA 02111-1307, USA.
*/
-/*----- Revision history --------------------------------------------------*
- *
- * $Log: dstr.c,v $
- * Revision 1.10 1999/10/04 21:44:47 mdw
- * Move `dstr_putf' and `dstr_vputf' into a separate source file.
- *
- * Revision 1.9 1999/07/06 19:16:06 mdw
- * Simplify buffer-growing algorithm. Just double it each time.
- *
- * Revision 1.8 1999/06/01 09:47:52 mdw
- * Fix nasty bugs in `dstr_vputf'.
- *
- * Revision 1.7 1999/05/21 22:14:30 mdw
- * Take advantage of the new dynamic string macros.
- *
- * Revision 1.6 1999/05/21 08:38:33 mdw
- * Implement some more functions in terms of macros.
- *
- * Revision 1.5 1999/05/13 22:47:57 mdw
- * Misc documentation fixes. Change `-ise' to `-ize' throughout.
- *
- * Revision 1.4 1999/05/06 19:51:35 mdw
- * Reformatted the LGPL notice a little bit.
- *
- * Revision 1.3 1999/05/05 18:50:31 mdw
- * Change licensing conditions to LGPL.
- *
- * Revision 1.2 1998/12/15 23:53:22 mdw
- * New functions `dstr_putf' and `dstr_vputf' which do `printf'-style
- * formatting in a safe way.
- *
- * Revision 1.1.1.1 1998/06/17 23:44:42 mdw
- * Initial version of mLib
- *
- */
-
/*----- Header files ------------------------------------------------------*/
#include <stdio.h>
* memory-hungry, but efficient.
*/
-#define DSTR_INITSZ 256 /* Initial buffer size */
+#define DSTR_INITSZ 64 /* Initial buffer size */
/*----- Main code ---------------------------------------------------------*/
/* --- @dstr_reset@ --- *
*
- * Arguments: @dstr *d@ = pointer to a dynaimc string block
+ * Arguments: @dstr *d@ = pointer to a dynamic string block
*
* Returns: ---
*
nsz = d->sz;
- if (nsz == 0 && rq < DSTR_INITSZ)
- nsz = DSTR_INITSZ;
- else
- do nsz <<= 1; while (nsz < rq);
+ if (nsz == 0)
+ nsz = (DSTR_INITSZ >> 1);
+ do nsz <<= 1; while (nsz < rq);
if (d->buf)
- d->buf = xrealloc(d->buf, nsz);
+ d->buf = x_realloc(d->a, d->buf, nsz, d->sz);
else
- d->buf = xmalloc(nsz);
+ d->buf = x_alloc(d->a, nsz);
d->sz = nsz;
}
void dstr_tidy(dstr *d)
{
- dstr_putz(d);
- d->buf = xrealloc(d->buf, d->len + 1);
+ d->buf = x_realloc(d->a, d->buf, d->len + 1, d->sz);
+ d->buf[d->len] = 0;
d->sz = d->len + 1;
}
for (;;) {
- /* --- Make sure there's some buffer space --- */
-
- if (!left) {
- dstr_ensure(d, 1);
- left = d->sz - off;
- }
-
/* --- Read the next byte --- */
ch = getc(fp);
if (ch == EOF && !rd)
return (EOF);
+ /* --- Make sure there's some buffer space --- */
+
+ if (!left) {
+ d->len = off;
+ dstr_ensure(d, 1);
+ left = d->sz - off;
+ }
+
/* --- End-of-file or newline ends the loop --- */
if (ch == EOF || ch == '\n') {