summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Wooding <mdw@distorted.org.uk>2013-01-29 23:53:55 +0000
committerMark Wooding <mdw@distorted.org.uk>2013-01-30 00:42:17 +0000
commit44a77f4851d3c819f9b364018a9695f332758a71 (patch)
treeeb12024acaf976f9af60be52967e060124f7a877
parent1ba0145fe6fe72f63af15e12716c13071523eaa4 (diff)
downloaduserv-utils-44a77f4851d3c819f9b364018a9695f332758a71.tar.gz
www-cgi/: Move `xrealloc' to `ucgicommon'.
Both programs will want it soon enough.
-rw-r--r--www-cgi/ucgi.h1
-rw-r--r--www-cgi/ucgicommon.c8
-rw-r--r--www-cgi/ucgitarget.c8
3 files changed, 9 insertions, 8 deletions
diff --git a/www-cgi/ucgi.h b/www-cgi/ucgi.h
index 5915321..5a51a77 100644
--- a/www-cgi/ucgi.h
+++ b/www-cgi/ucgi.h
@@ -32,6 +32,7 @@ void syserror(const char *m);
void error(const char *m);
void *xmalloc(size_t sz);
void xsetenv(const char *en, const char *ev, int overwrite);
+void *xrealloc(void *ptr, size_t sz);
extern const char *const envok[];
extern const int nenvok;
diff --git a/www-cgi/ucgicommon.c b/www-cgi/ucgicommon.c
index 4a8749a..43b7d94 100644
--- a/www-cgi/ucgicommon.c
+++ b/www-cgi/ucgicommon.c
@@ -103,6 +103,14 @@ void *xmalloc(size_t sz) {
return r;
}
+void *xrealloc(void *ptr, size_t sz) {
+ void *r;
+
+ r= realloc(ptr,sz);
+ if (!r) syserror("realloc failed");
+ return r;
+}
+
void xsetenv(const char *en, const char *ev, int overwrite) {
if (setenv(en,ev,overwrite)) syserror("setenv");
}
diff --git a/www-cgi/ucgitarget.c b/www-cgi/ucgitarget.c
index 4228951..e38ad30 100644
--- a/www-cgi/ucgitarget.c
+++ b/www-cgi/ucgitarget.c
@@ -32,14 +32,6 @@
#include "ucgi.h"
-static void *xrealloc(void *ptr, size_t sz) {
- void *r;
-
- r= realloc(ptr,sz);
- if (!r) syserror("realloc failed");
- return r;
-}
-
int main(int argc, const char **argv) {
char *uservarn, *scriptpath, *newvar;
const char *nextslash, *lastslash, *pathi, *ev, *ev2, *en, *scriptdir, *av;