X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=lib%2Fecoli_string.c;h=77238181350e33d72297069cd7eab53d91564060;hb=15718f19cbf3868bf6fba79f4e26b5254c57873e;hp=49e4a37cd82fa9f73e8352e61bfc3932c1b33b6b;hpb=1bc00866d54d42d0e357ebd8f6c4edcde3456119;p=protos%2Flibecoli.git

diff --git a/lib/ecoli_string.c b/lib/ecoli_string.c
index 49e4a37..7723818 100644
--- a/lib/ecoli_string.c
+++ b/lib/ecoli_string.c
@@ -1,33 +1,14 @@
-/*
- * Copyright (c) 2016, Olivier MATZ <zer0@droids-corp.org>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the University of California, Berkeley nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE REGENTS AND CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright 2016, Olivier MATZ <zer0@droids-corp.org>
  */
 
+#include <stdarg.h>
 #include <stddef.h>
 #include <string.h>
+#include <stdio.h>
 
+#include <ecoli_assert.h>
+#include <ecoli_malloc.h>
 #include <ecoli_string.h>
 
 /* count the number of identical chars at the beginning of 2 strings */
@@ -51,3 +32,47 @@ int ec_str_startswith(const char *s, const char *beginning)
 
 	return 0;
 }
+
+int ec_vasprintf(char **buf, const char *fmt, va_list ap)
+{
+	char dummy;
+	int buflen, ret;
+	va_list aq;
+
+	va_copy(aq, ap);
+	*buf = NULL;
+	ret = vsnprintf(&dummy, 1, fmt, aq);
+	va_end(aq);
+	if (ret < 0)
+		return ret;
+
+	buflen = ret + 1;
+	*buf = ec_malloc(buflen);
+	if (*buf == NULL)
+		return -1;
+
+	va_copy(aq, ap);
+	ret = vsnprintf(*buf, buflen, fmt, aq);
+	va_end(aq);
+
+	ec_assert_print(ret < buflen, "invalid return value for vsnprintf");
+	if (ret < 0) {
+		free(*buf);
+		*buf = NULL;
+		return -1;
+	}
+
+	return ret;
+}
+
+int ec_asprintf(char **buf, const char *fmt, ...)
+{
+	va_list ap;
+	int ret;
+
+	va_start(ap, fmt);
+	ret = ec_vasprintf(buf, fmt, ap);
+	va_end(ap);
+
+	return ret;
+}