pike.git/ src/ stralloc.c

2006-03-20

2006-03-20 18:57:00 by Henrik Grubbström (Grubba) <grubba@grubba.org>

• 711f444ea72a63d488f21fd18bf1219f33820dbc (25 lines) (+18/-7) ^{[ Show | Annotate ]}
  Branch: 7.9

Some API changes to string_builder_quote_string(). Added QUOTE_BREAK_AT_LF.

Rev: src/modules/sprintf/sprintf.c:1.134
Rev: src/stralloc.c:1.209
Rev: src/stralloc.h:1.98

2:   || This file is part of Pike. For copyright information see COPYRIGHT.   || Pike is distributed under GPL, LGPL and MPL. See the file COPYING   || for more information. - || $Id: stralloc.c,v 1.208 2006/03/20 18:39:16 grubba Exp $ + || $Id: stralloc.c,v 1.209 2006/03/20 18:57:00 grubba Exp $   */      #include "global.h"
2444:    s->s->str[s->s->len << s->s->size_shift] = 0;   }    - PMOD_EXPORT void string_builder_quote_string(struct string_builder *buf, + PMOD_EXPORT ptrdiff_t string_builder_quote_string(struct string_builder *buf,    struct pike_string *str, -  int flags, ptrdiff_t max_len) +  ptrdiff_t i, +  ptrdiff_t max_len, +  int flags)   {    ptrdiff_t old_len = buf->s->len; -  ptrdiff_t i; +     -  for (i = 0; i < str->len; i++) { +  for (; i < str->len; i++) {    p_wchar2 ch = index_shared_string(str, i);    if (ch > 0xffff) {    /* Huge character. */
2477:    string_builder_putchar(buf, '\\');    if ((ch > 6) && (ch < 14)) {    string_builder_putchar(buf, "0123456abtnvfr"[ch]); +  if ((ch == 10) && (flags & QUOTE_BREAK_AT_LF)) { +  if (buf->s->len > max_len) { +  /* Too bad; no place for the lf. */ +  buf->s->len = old_len; +  return i; +  } +  return i+1; +  }    goto next;    }    if (ch == 27) {
2502:    next:    if (buf->s->len > max_len) {    buf->s->len = old_len; -  break; +  return i;    }    old_len = buf->s->len;    } -  +  return i;   }      PMOD_EXPORT void string_builder_append_integer(struct string_builder *s,