X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=secnet.git;a=blobdiff_plain;f=util.c;h=241196227a80cd71e655daea6d5368fabadf37dd;hp=6f4854f8a010207783b8d41ccb1be8e714b011fe;hb=7dae56bc17f51e875b436ec63e035be12c4a6fcf;hpb=25c1c9be88f92d4398167d5b0bc5a799c21d92e6 diff --git a/util.c b/util.c index 6f4854f..2411962 100644 --- a/util.c +++ b/util.c @@ -361,6 +361,73 @@ void buf_append_string(struct buffer_if *buf, cstring_t s) BUF_ADD_BYTES(append,buf,s,len); } +void truncmsg_add_string(struct buffer_if *buf, cstring_t s) +{ + int32_t l = MIN((int32_t)strlen(s), buf_remaining_space(buf)); + BUF_ADD_BYTES(append, buf, s, l); +} +void truncmsg_add_packet_string(struct buffer_if *buf, int32_t l, + const uint8_t *s) +{ + char c; + while (l-- > 0) { + c = *s++; + if (c >= ' ' && c <= 126 && c != '\\' && c != '"' && c != '\'') { + if (!buf_remaining_space(buf)) break; + buf->start[buf->size++] = c; + continue; + } + char quoted[5]; + quoted[0] = '\\'; + quoted[2] = 0; + switch (c) { + case '\n': quoted[1] = 'n'; break; + case '\r': quoted[1] = 'r'; break; + case '\t': quoted[1] = 't'; break; + case '\\': case '"': case '\'': quoted[1] = c; break; + default: sprintf(quoted, "\\x%02x", (unsigned)c); + } + truncmsg_add_string(buf, quoted); + } +} +const char *truncmsg_terminate(const struct buffer_if *buf) +{ + if (buf_remaining_space(buf)) { + buf->start[buf->size] = 0; + } else { + assert(buf->size >= 4); + strcpy(buf->start + buf->size - 4, "..."); + } + return buf->start; +} + +void priomsg_new(struct priomsg *pm, int32_t maxlen) +{ + buffer_new(&pm->m, maxlen); + pm->prio = INT_MIN; +} +void priomsg_reset(struct priomsg *pm) +{ + buffer_init(&pm->m, 0); + pm->prio = INT_MIN; +} +bool_t priomsg_update_p(struct priomsg *pm, int prio) +{ + if (!pm) return False; + if (prio <= pm->prio) return False; + buffer_init(&pm->m, 0); + pm->prio = prio; + return True; +} +const char *priomsg_getmessage(const struct priomsg *pm, const char *defmsg) +{ + if (pm->prio >= INT_MIN) + return truncmsg_terminate(&pm->m); + else + return defmsg; +} + + void buffer_new(struct buffer_if *buf, int32_t len) { buf->free=True;