chiark
/
gitweb
/
~ian
/
userv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
debian/control: Add missing build-dependency on flex. Fixes FTBFS. Report from Aurel...
[userv.git]
/
lib.c
diff --git
a/lib.c
b/lib.c
index bd40ee08ab77376f74b1ce5715b9740a16c82e71..8b31ec9be1a81e09ce282c8e6b80d09682798eff 100644
(file)
--- a/
lib.c
+++ b/
lib.c
@@
-2,11
+2,12
@@
* userv - lib.c
* useful utility routines, used in daemon, but not very dependent on it
*
* userv - lib.c
* useful utility routines, used in daemon, but not very dependent on it
*
- * Copyright (C)1996-1997,1999 Ian Jackson
+ * userv is copyright Ian Jackson and other contributors.
+ * See README for full authorship information.
*
* This is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by
*
* This is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version
2
of the License, or
+ * the Free Software Foundation; either version
3
of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
@@
-15,8
+16,7
@@
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with userv; if not, write to the Free Software
- * Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with userv; if not, see <http://www.gnu.org/licenses/>.
*/
#include <errno.h>
*/
#include <errno.h>
@@
-31,6
+31,7
@@
#include "config.h"
#include "common.h"
#include "lib.h"
#include "config.h"
#include "common.h"
#include "lib.h"
+#include "both.h"
char *xstrcat3save(const char *a, const char *b, const char *c) {
char *r;
char *xstrcat3save(const char *a, const char *b, const char *c) {
char *r;
@@
-42,14
+43,6
@@
char *xstrcat3save(const char *a, const char *b, const char *c) {
return r;
}
return r;
}
-char *xstrsave(const char *s) {
- char *r;
-
- r= xmalloc(strlen(s)+1);
- strcpy(r,s);
- return r;
-}
-
char *xstrsubsave(const char *begin, int len) {
char *r;
char *xstrsubsave(const char *begin, int len) {
char *r;
@@
-59,17
+52,6
@@
char *xstrsubsave(const char *begin, int len) {
return r;
}
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;
-}
-
int makeroom(char **buffer, int *size, int needed) {
if (needed > MAX_GENERAL_STRING) return -1;
if (*size >= needed) return 0;
int makeroom(char **buffer, int *size, int needed) {
if (needed > MAX_GENERAL_STRING) return -1;
if (*size >= needed) return 0;
@@
-116,14
+98,10
@@
void snytprintfcat(char *buffer, size_t size, const char *fmt, ...) {
#ifndef HAVE_SETENV
int setenv(const char *name, const char *value, int overwrite) {
#ifndef HAVE_SETENV
int setenv(const char *name, const char *value, int overwrite) {
- static char *buffer= 0;
- static int avail= 0;
-
- int r;
+ char *buffer= 0;
assert(overwrite==1);
assert(overwrite==1);
- r= makeroom(&buffer,&avail,strlen(name)+strlen(value)+2);
- if (r) { errno= EINVAL; return -1; }
+ buffer= xmalloc(strlen(name)+strlen(value)+2);
sprintf(buffer,"%s=%s",name,value);
return putenv(buffer);
sprintf(buffer,"%s=%s",name,value);
return putenv(buffer);