berns 4.2.0 → 4.3.0

data/ext/berns/strxcat.c

@@ -0,0 +1,20 @@
+#include <stdarg.h>
+
+#include "strxcat.h"
+#include "strxcpy.h"
+
+char * strxcat(char *destination, size_t size, ...) {
+	va_list sources;
+	va_start(sources, size);
+
+	while(size > 1) {
+		char *source = va_arg(sources, char*);
+		size_t position = strxcpy(destination, source, size);
+		destination += position;
+		size -= position;
+	}
+
+	va_end(sources);
+
+	return destination;
+}

data/ext/berns/strxcat.h

@@ -0,0 +1,11 @@
+#ifndef STRXCAT_H
+#define STRXCAT_H
+#include <stddef.h>
+
+/*
+ * Concatenate an arbitrary number of char* into a destination. Copies at most
+ * size characters into the destination.
+ */
+extern char * strxcat(char *destination, size_t size, ...);
+
+#endif

data/ext/berns/strxcpy.c

@@ -0,0 +1,50 @@
+#include "strxcpy.h"
+
+/* The below is simply OpenBSD's strlcpy function, renamed so it can be vendored. */
+
+/* $OpenBSD: strlcpy.c,v 1.16 2019/01/25 00:19:25 millert Exp $	*/
+
+/*
+ * Copyright (c) 1998, 2015 Todd C. Miller <millert@openbsd.org>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/*
+ * Copy string src to buffer dst of size dsize. At most dsize-1 chars will be
+ * copied. Always NUL terminates (unless dsize == 0). Returns strlen(src); if
+ * retval >= dsize, truncation occurred.
+ */
+size_t strxcpy(char *dst, const char *src, size_t dsize) {
+	const char *osrc = src;
+	size_t nleft = dsize;
+
+	/* Copy as many bytes as will fit. */
+	if (nleft != 0) {
+		while (--nleft != 0) {
+			if ((*dst++ = *src++) == '\0') {
+				break;
+			}
+		}
+	}
+
+	/* Not enough room in dst, add NUL and traverse rest of src. */
+	if (nleft == 0) {
+		if (dsize != 0)
+			*dst = '\0'; /* NUL-terminate dst */
+		while (*src++)
+			;
+	}
+
+	return(src - osrc - 1); /* count does not include NUL */
+}

data/ext/berns/strxcpy.h

@@ -0,0 +1,32 @@
+#ifndef STRXCPY_H
+#define STRXCPY_H
+#include <stddef.h>
+
+/* The below is simply OpenBSD's strlcpy function, renamed so it can be vendored. */
+
+/* $OpenBSD: strlcpy.c,v 1.16 2019/01/25 00:19:25 millert Exp $	*/
+
+/*
+ * Copyright (c) 1998, 2015 Todd C. Miller <millert@openbsd.org>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/*
+ * Copy string src to buffer dst of size dsize. At most dsize-1 chars will be
+ * copied. Always NUL terminates (unless dsize == 0). Returns strlen(src); if
+ * retval >= dsize, truncation occurred.
+ */
+extern size_t strxcpy(char *dst, const char *src, size_t dsize);
+
+#endif

data/ext/berns/strxempty.c

@@ -0,0 +1,9 @@
+#import "strxempty.h"
+#import "strxnew.h"
+
+char * strxempty() {
+  char *str = strxnew(1);
+  str[0] = '\0';
+
+  return str;
+}

data/ext/berns/strxempty.h

@@ -0,0 +1,9 @@
+#ifndef STRXEMPTY_H
+#define STRXEMPTY_H
+
+/*
+ * Allocate an empty, NULL-terminated string.
+ */
+extern char * strxempty();
+
+#endif

data/ext/berns/strxfree.c

@@ -0,0 +1,6 @@
+#include "strxfree.h"
+#include "ruby.h"
+
+void strxfree(char * memory) {
+	return ruby_xfree(memory);
+}

data/ext/berns/strxfree.h

@@ -0,0 +1,9 @@
+#ifndef STRXFREE_H
+#define STRXFREE_H
+
+/*
+ * Frees a block of memory allocated by strxnew.
+ */
+extern void strxfree(char * memory);
+
+#endif

data/ext/berns/strxnew.c

@@ -0,0 +1,8 @@
+#include "ruby.h"
+#include "strxnew.h"
+
+char * strxnew(size_t size) {
+	char *string = ruby_xmalloc(size);
+
+	return string;
+}

data/ext/berns/strxnew.h

@@ -0,0 +1,11 @@
+#ifndef STRXNEW_H
+#define STRXNEW_H
+#include <stddef.h>
+
+/*
+ * Allocates a new string using Ruby's ruby_xmalloc. Should be freed by
+ * strxfree.
+ */
+extern char * strxnew(size_t size);
+
+#endif

data/ext/berns/strxresize.c

@@ -0,0 +1,6 @@
+#include "ruby.h"
+#include "strxresize.h"
+
+char * strxresize(char * memory, size_t size) {
+	return ruby_xrealloc(memory, size);
+}

data/ext/berns/strxresize.h

@@ -0,0 +1,10 @@
+#ifndef STRXRESIZE_H
+#define STRXRESIZE_H
+#include <stddef.h>
+
+/*
+ * Resize a string allocated with strxnew.
+ */
+char * strxresize(char * memory, size_t size);
+
+#endif

data/lib/berns/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Berns
-  VERSION = '4.2.0'
+  VERSION = '4.3.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berns
 version: !ruby/object:Gem::Version
-  version: 4.2.0
+  version: 4.3.0
 platform: ruby
 authors:
 - Taylor Beck
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-01 00:00:00.000000000 Z
+date: 2023-05-04 00:00:00.000000000 Z
 dependencies: []
 description: A utility library for generating HTML strings.
 email:
@@ -21,11 +21,23 @@ extensions:
 extra_rdoc_files: []
 files:
 - LICENSE.txt
-- README.org
+- README.md
 - ext/berns/berns.c
 - ext/berns/extconf.rb
 - ext/berns/hescape.c
 - ext/berns/hescape.h
+- ext/berns/strxcat.c
+- ext/berns/strxcat.h
+- ext/berns/strxcpy.c
+- ext/berns/strxcpy.h
+- ext/berns/strxempty.c
+- ext/berns/strxempty.h
+- ext/berns/strxfree.c
+- ext/berns/strxfree.h
+- ext/berns/strxnew.c
+- ext/berns/strxnew.h
+- ext/berns/strxresize.c
+- ext/berns/strxresize.h
 - lib/berns.rb
 - lib/berns/berns.bundle
 - lib/berns/builder.rb
@@ -35,7 +47,7 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/evanleck/berns/issues
-  changelog_uri: https://github.com/evanleck/berns/blob/main/CHANGELOG.org
+  changelog_uri: https://github.com/evanleck/berns/blob/main/CHANGELOG.md
   homepage_uri: https://github.com/evanleck/berns
   rubygems_mfa_required: 'true'
   source_code_uri: https://github.com/evanleck/berns
@@ -54,7 +66,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '2.0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: A utility library for generating HTML strings.