X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=x2p%2Futil.c;h=519fae5a8ab4c37ca70d9b337172d5c1606cf930;hb=1fd81fbbe87d964ad1f7dbdce41e36f3781dcf82;hp=0d98de807c8f2949a4464297048a916bc414f2d0;hpb=378cc40b38293ffc7298c6a7ed3cd740ad79be52;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/x2p/util.c b/x2p/util.c
index 0d98de8..519fae5 100644
--- a/x2p/util.c
+++ b/x2p/util.c
@@ -1,36 +1,36 @@
-/* $Header: util.c,v 2.0 88/06/05 00:16:07 root Exp $
+/* $RCSfile: util.c,v $$Revision: 4.1 $$Date: 92/08/07 18:29:29 $
+ *
+ *    Copyright (c) 1991, Larry Wall
+ *
+ *    You may distribute under the terms of either the GNU General Public
+ *    License or the Artistic License, as specified in the README file.
  *
  * $Log:	util.c,v $
- * Revision 2.0  88/06/05  00:16:07  root
- * Baseline version 2.0.
- * 
  */
 
-#include <stdio.h>
-
-#include "handy.h"
 #include "EXTERN.h"
 #include "a2p.h"
 #include "INTERN.h"
 #include "util.h"
 
+#ifdef I_STDARG
+#  include <stdarg.h>
+#endif
 #define FLUSH
-#define MEM_SIZE unsigned int
 
 static char nomem[] = "Out of memory!\n";
 
 /* paranoid version of malloc */
 
-static int an = 0;
 
-char *
+Malloc_t
 safemalloc(size)
 MEM_SIZE size;
 {
-    char *ptr;
-    char *malloc();
+    Malloc_t ptr;
 
-    ptr = malloc(size?size:1);	/* malloc(0) is NASTY on our system */
+    /* malloc(0) is NASTY on some systems */
+    ptr = malloc(size ? size : 1);
 #ifdef DEBUGGING
     if (debug & 128)
 	fprintf(stderr,"0x%x: (%05d) malloc %d bytes\n",ptr,an++,size);
@@ -46,15 +46,15 @@ MEM_SIZE size;
 
 /* paranoid version of realloc */
 
-char *
+Malloc_t
 saferealloc(where,size)
-char *where;
+Malloc_t where;
 MEM_SIZE size;
 {
-    char *ptr;
-    char *realloc();
+    Malloc_t ptr;
 
-    ptr = realloc(where,size?size:1);	/* realloc(0) is NASTY on our system */
+    /* realloc(0) is NASTY on some systems */
+    ptr = realloc(where, size ? size : 1);
 #ifdef DEBUGGING
     if (debug & 128) {
 	fprintf(stderr,"0x%x: (%05d) rfree\n",where,an++);
@@ -72,8 +72,9 @@ MEM_SIZE size;
 
 /* safe version of free */
 
+Free_t
 safefree(where)
-char *where;
+Malloc_t where;
 {
 #ifdef DEBUGGING
     if (debug & 128)
@@ -98,36 +99,6 @@ register int len;
     return to;
 }
 
-#ifdef undef
-/* safe version of string concatenate, with \n deletion and space padding */
-
-char *
-safecat(to,from,len)
-char *to;
-register char *from;
-register int len;
-{
-    register char *dest = to;
-
-    len--;				/* leave room for null */
-    if (*dest) {
-	while (len && *dest++) len--;
-	if (len) {
-	    len--;
-	    *(dest-1) = ' ';
-	}
-    }
-    if (from != Nullch)
-	while (len && (*dest++ = *from++)) len--;
-    if (len)
-	dest--;
-    if (*(dest-1) == '\n')
-	dest--;
-    *dest = '\0';
-    return to;
-}
-#endif
-
 /* copy a string up to some (non-backslashed) delimiter, if any */
 
 char *
@@ -220,61 +191,65 @@ int newlen;
     }
 }
 
+void
+#if defined(I_STDARG) && defined(HAS_VPRINTF)
+croak(char *pat,...)
+#else /* I_STDARG */
 /*VARARGS1*/
-fatal(pat,a1,a2,a3,a4)
-char *pat;
+croak(pat,a1,a2,a3,a4)
+    char *pat;
+    int a1,a2,a3,a4;
+#endif /* I_STDARG */
 {
+#if defined(I_STDARG) && defined(HAS_VPRINTF)
+    va_list args;
+
+    va_start(args, pat);
+    vfprintf(stderr,pat,args);
+#else
     fprintf(stderr,pat,a1,a2,a3,a4);
+#endif
     exit(1);
 }
 
-static bool firstsetenv = TRUE;
-extern char **environ;
-
 void
-setenv(nam,val)
-char *nam, *val;
+#if defined(I_STDARG) && defined(HAS_VPRINTF)
+fatal(char *pat,...)
+#else /* I_STDARG */
+/*VARARGS1*/
+fatal(pat,a1,a2,a3,a4)
+    char *pat;
+    int a1,a2,a3,a4;
+#endif /* I_STDARG */
 {
-    register int i=envix(nam);		/* where does it go? */
-
-    if (!environ[i]) {			/* does not exist yet */
-	if (firstsetenv) {		/* need we copy environment? */
-	    int j;
-#ifndef lint
-	    char **tmpenv = (char**)	/* point our wand at memory */
-		safemalloc((i+2) * sizeof(char*));
+#if defined(I_STDARG) && defined(HAS_VPRINTF)
+    va_list args;
+
+    va_start(args, pat);
+    vfprintf(stderr,pat,args);
 #else
-	    char **tmpenv = Null(char **);
-#endif /* lint */
-    
-	    firstsetenv = FALSE;
-	    for (j=0; j<i; j++)		/* copy environment */
-		tmpenv[j] = environ[j];
-	    environ = tmpenv;		/* tell exec where it is now */
-	}
-#ifndef lint
-	else
-	    environ = (char**) saferealloc((char*) environ,
-		(i+2) * sizeof(char*));
-					/* just expand it a bit */
-#endif /* lint */
-	environ[i+1] = Nullch;	/* make sure it's null terminated */
-    }
-    environ[i] = safemalloc(strlen(nam) + strlen(val) + 2);
-					/* this may or may not be in */
-					/* the old environ structure */
-    sprintf(environ[i],"%s=%s",nam,val);/* all that work just for this */
+    fprintf(stderr,pat,a1,a2,a3,a4);
+#endif
+    exit(1);
 }
 
-int
-envix(nam)
-char *nam;
+void
+#if defined(I_STDARG) && defined(HAS_VPRINTF)
+warn(char *pat,...)
+#else /* I_STDARG */
+/*VARARGS1*/
+warn(pat,a1,a2,a3,a4)
+    char *pat;
+    int a1,a2,a3,a4;
+#endif /* I_STDARG */
 {
-    register int i, len = strlen(nam);
+#if defined(I_STDARG) && defined(HAS_VPRINTF)
+    va_list args;
 
-    for (i = 0; environ[i]; i++) {
-	if (strnEQ(environ[i],nam,len) && environ[i][len] == '=')
-	    break;			/* strnEQ must come first to avoid */
-    }					/* potential SEGV's */
-    return i;
+    va_start(args, pat);
+    vfprintf(stderr,pat,args);
+#else
+    fprintf(stderr,pat,a1,a2,a3,a4);
+#endif
 }
+