diff options
author | djm@openbsd.org <djm@openbsd.org> | 2020-01-24 23:54:40 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2020-01-25 11:27:29 +1100 |
commit | 8075fccbd4f70a4371acabcfb47562471ff0de6f (patch) | |
tree | e8e16278bb3aa2eb8d124290c1495d0fd2140ca9 /misc.c | |
parent | d15c8adf2c6f1a6b4845131074383eb9c3d05c3d (diff) |
upstream: add xextendf() to extend a string with a format
(reallocating as necessary). ok aja@ as part of a larger diff
OpenBSD-Commit-ID: 30796b50d330b3e0e201747fe40cdf9aa70a77f9
Diffstat (limited to 'misc.c')
-rw-r--r-- | misc.c | 29 |
1 files changed, 28 insertions, 1 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: misc.c,v 1.144 2020/01/23 07:10:22 dtucker Exp $ */ | 1 | /* $OpenBSD: misc.c,v 1.145 2020/01/24 23:54:40 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
4 | * Copyright (c) 2005,2006 Damien Miller. All rights reserved. | 4 | * Copyright (c) 2005,2006 Damien Miller. All rights reserved. |
@@ -1244,6 +1244,33 @@ tohex(const void *vp, size_t l) | |||
1244 | return (r); | 1244 | return (r); |
1245 | } | 1245 | } |
1246 | 1246 | ||
1247 | /* | ||
1248 | * Extend string *sp by the specified format. If *sp is not NULL (or empty), | ||
1249 | * then the separator 'sep' will be prepended before the formatted arguments. | ||
1250 | * Extended strings are heap allocated. | ||
1251 | */ | ||
1252 | void | ||
1253 | xextendf(char **sp, const char *sep, const char *fmt, ...) | ||
1254 | { | ||
1255 | va_list ap; | ||
1256 | char *tmp1, *tmp2; | ||
1257 | |||
1258 | va_start(ap, fmt); | ||
1259 | xvasprintf(&tmp1, fmt, ap); | ||
1260 | va_end(ap); | ||
1261 | |||
1262 | if (*sp == NULL || **sp == '\0') { | ||
1263 | free(*sp); | ||
1264 | *sp = tmp1; | ||
1265 | return; | ||
1266 | } | ||
1267 | xasprintf(&tmp2, "%s%s%s", *sp, sep == NULL ? "" : sep, tmp1); | ||
1268 | free(tmp1); | ||
1269 | free(*sp); | ||
1270 | *sp = tmp2; | ||
1271 | } | ||
1272 | |||
1273 | |||
1247 | u_int64_t | 1274 | u_int64_t |
1248 | get_u64(const void *vp) | 1275 | get_u64(const void *vp) |
1249 | { | 1276 | { |