Module Name: src
Committed By: nia
Date: Wed Apr 24 15:46:20 UTC 2024
Modified Files:
src/bin/csh: alloc.c extern.h
Log Message:
csh: add a reallocarray function for using inside csh
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/bin/csh/alloc.c
cvs rdiff -u -r1.34 -r1.35 src/bin/csh/extern.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/csh/alloc.c
diff -u src/bin/csh/alloc.c:1.15 src/bin/csh/alloc.c:1.16
--- src/bin/csh/alloc.c:1.15 Sat Jan 5 16:54:00 2019
+++ src/bin/csh/alloc.c Wed Apr 24 15:46:20 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: alloc.c,v 1.15 2019/01/05 16:54:00 christos Exp $ */
+/* $NetBSD: alloc.c,v 1.16 2024/04/24 15:46:20 nia Exp $ */
/*-
* Copyright (c) 1983, 1991, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)alloc.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: alloc.c,v 1.15 2019/01/05 16:54:00 christos Exp $");
+__RCSID("$NetBSD: alloc.c,v 1.16 2024/04/24 15:46:20 nia Exp $");
#endif
#endif /* not lint */
@@ -72,6 +72,19 @@ Realloc(void *p, size_t n)
}
void *
+Reallocarray(void *p, size_t n, size_t sz)
+{
+ void *ptr = p;
+
+ if (reallocarr(&ptr, n, sz) != 0) {
+ child++;
+ stderror(ERR_NOMEM);
+ return (p);
+ }
+ return (ptr);
+}
+
+void *
Calloc(size_t s, size_t n)
{
void *ptr;
Index: src/bin/csh/extern.h
diff -u src/bin/csh/extern.h:1.34 src/bin/csh/extern.h:1.35
--- src/bin/csh/extern.h:1.34 Thu Sep 15 11:35:06 2022
+++ src/bin/csh/extern.h Wed Apr 24 15:46:20 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: extern.h,v 1.34 2022/09/15 11:35:06 martin Exp $ */
+/* $NetBSD: extern.h,v 1.35 2024/04/24 15:46:20 nia Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -314,6 +314,7 @@ void psecs(long);
void Free(void *);
void * Malloc(size_t);
void *Realloc(void *, size_t);
+void *Reallocarray(void *, size_t, size_t);
void *Calloc(size_t, size_t);
/*
