* userv - lib.c
* useful utility routines, used in daemon, but not very dependent on it
*
- * Copyright (C)1996-1997 Ian Jackson
+ * Copyright (C)1996-1997,1999 Ian Jackson
*
* This is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by
#include <stdarg.h>
#include <stdio.h>
#include <string.h>
+#include <assert.h>
+#include <sys/types.h>
#include "config.h"
+#include "common.h"
#include "lib.h"
+#include "both.h"
-char *xmstrcat3save(const char *a, const char *b, const char *c) {
+char *xstrcat3save(const char *a, const char *b, const char *c) {
char *r;
r= xmalloc(strlen(a)+strlen(b)+strlen(c)+1);
return r;
}
-char *xmstrsave(const char *s) {
- char *r;
-
- r= xmalloc(strlen(s)+1);
- strcpy(r,s);
- return r;
-}
-
-char *xmstrsubsave(const char *begin, int len) {
+char *xstrsubsave(const char *begin, int len) {
char *r;
r= xmalloc(len+1);
return r;
}
-void *xmalloc(size_t s) {
- void *p;
- p= malloc(s?s:1); if (!p) syscallerror("malloc");
- return p;
-}
-
-void *xrealloc(void *p, size_t s) {
- p= realloc(p,s); if (!p) syscallerror("realloc");
- return p;
-}
-
-char *xstrdup(const char *str) {
- char *r;
- r= xmalloc(strlen(str)+1);
- strcpy(r,str); return r;
-}
-
-void makeroom(char **buffer, int *size, int needed) {
- if (*size >= needed) return;
+int makeroom(char **buffer, int *size, int needed) {
+ if (needed > MAX_GENERAL_STRING) return -1;
+ if (*size >= needed) return 0;
*buffer= xrealloc(*buffer,needed);
*size= needed;
+ return 0;
}
void vsnyprintf(char *buffer, size_t size, const char *fmt, va_list al) {
vsnytprintfcat(buffer,size,fmt,al);
va_end(al);
}
+
+#ifndef HAVE_SETENV
+int setenv(const char *name, const char *value, int overwrite) {
+ char *buffer= 0;
+
+ assert(overwrite==1);
+ buffer= xmalloc(strlen(name)+strlen(value)+2);
+
+ sprintf(buffer,"%s=%s",name,value);
+ return putenv(buffer);
+}
+#endif /* HAVE_SETENV */