X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=x2p%2Fstr.c;h=0b1c94016771755005d0b067165f2d54e7657222;hb=e91d68d56f1589ba6c8f530bcf8cdeb3d8943dcf;hp=310bcd6e3bf1d3c562965dad7839d8e7276d54fe;hpb=0e06870bf080a38cda51c06c6612359afc2334e1;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/x2p/str.c b/x2p/str.c
index 310bcd6..0b1c940 100644
--- a/x2p/str.c
+++ b/x2p/str.c
@@ -1,11 +1,10 @@
-/* $RCSfile: str.c,v $$Revision: 4.1 $$Date: 92/08/07 18:29:26 $
+/*    str.c
  *
- *    Copyright (c) 1991-2001, Larry Wall
+ *    Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1999,
+ *    2001, 2002, 2005 by Larry Wall and others
  *
  *    You may distribute under the terms of either the GNU General Public
  *    License or the Artistic License, as specified in the README file.
- *
- * $Log:	str.c,v $
  */
 
 #include "EXTERN.h"
@@ -43,23 +42,6 @@ str_2ptr(register STR *str)
     return str->str_ptr;
 }
 
-double
-str_2num(register STR *str)
-{
-    if (!str)
-	return 0.0;
-    if (str->str_len && str->str_pok)
-	str->str_nval = atof(str->str_ptr);
-    else
-	str->str_nval = 0.0;
-    str->str_nok = 1;
-#ifdef DEBUGGING
-    if (debug & 32)
-	fprintf(stderr,"0x%lx num(%g)\n",(unsigned long)str,str->str_nval);
-#endif
-    return str->str_nval;
-}
-
 void
 str_sset(STR *dstr, register STR *sstr)
 {
@@ -77,7 +59,7 @@ void
 str_nset(register STR *str, register char *ptr, register int len)
 {
     GROWSTR(&(str->str_ptr), &(str->str_len), len + 1);
-    bcopy(ptr,str->str_ptr,len);
+    memcpy(str->str_ptr,ptr,len);
     str->str_cur = len;
     *(str->str_ptr+str->str_cur) = '\0';
     str->str_nok = 0;		/* invalidate number */
@@ -93,32 +75,19 @@ str_set(register STR *str, register char *ptr)
 	ptr = "";
     len = strlen(ptr);
     GROWSTR(&(str->str_ptr), &(str->str_len), len + 1);
-    bcopy(ptr,str->str_ptr,len+1);
+    memcpy(str->str_ptr,ptr,len+1);
     str->str_cur = len;
     str->str_nok = 0;		/* invalidate number */
     str->str_pok = 1;		/* validate pointer */
 }
 
 void
-str_chop(register STR *str, register char *ptr)	/* like set but assuming ptr is in str */
-                  
-                   
-{
-    if (!(str->str_pok))
-	str_2ptr(str);
-    str->str_cur -= (ptr - str->str_ptr);
-    bcopy(ptr,str->str_ptr, str->str_cur + 1);
-    str->str_nok = 0;		/* invalidate number */
-    str->str_pok = 1;		/* validate pointer */
-}
-
-void
 str_ncat(register STR *str, register char *ptr, register int len)
 {
     if (!(str->str_pok))
 	str_2ptr(str);
     GROWSTR(&(str->str_ptr), &(str->str_len), str->str_cur + len + 1);
-    bcopy(ptr,str->str_ptr+str->str_cur,len);
+    memcpy(str->str_ptr+str->str_cur, ptr, len);
     str->str_cur += len;
     *(str->str_ptr+str->str_cur) = '\0';
     str->str_nok = 0;		/* invalidate number */
@@ -145,47 +114,12 @@ str_cat(register STR *str, register char *ptr)
 	str_2ptr(str);
     len = strlen(ptr);
     GROWSTR(&(str->str_ptr), &(str->str_len), str->str_cur + len + 1);
-    bcopy(ptr,str->str_ptr+str->str_cur,len+1);
+    memcpy(str->str_ptr+str->str_cur, ptr, len+1);
     str->str_cur += len;
     str->str_nok = 0;		/* invalidate number */
     str->str_pok = 1;		/* validate pointer */
 }
 
-char *
-str_append_till(register STR *str, register char *from, register int delim, char *keeplist)
-{
-    register char *to;
-    register int len;
-
-    if (!from)
-	return Nullch;
-    len = strlen(from);
-    GROWSTR(&(str->str_ptr), &(str->str_len), str->str_cur + len + 1);
-    str->str_nok = 0;		/* invalidate number */
-    str->str_pok = 1;		/* validate pointer */
-    to = str->str_ptr+str->str_cur;
-    for (; *from; from++,to++) {
-	if (*from == '\\' && from[1] && delim != '\\') {
-	    if (!keeplist) {
-		if (from[1] == delim || from[1] == '\\')
-		    from++;
-		else
-		    *to++ = *from++;
-	    }
-	    else if (strchr(keeplist,from[1]))
-		*to++ = *from++;
-	    else
-		from++;
-	}
-	else if (*from == delim)
-	    break;
-	*to = *from;
-    }
-    *to = '\0';
-    str->str_cur = to - str->str_ptr;
-    return from;
-}
-
 STR *
 str_new(int len)
 {
@@ -197,36 +131,16 @@ str_new(int len)
     }
     else {
 	str = (STR *) safemalloc(sizeof(STR));
-	bzero((char*)str,sizeof(STR));
+	memset((char*)str,0,sizeof(STR));
     }
     if (len)
 	GROWSTR(&(str->str_ptr), &(str->str_len), len + 1);
     return str;
 }
 
-void
-str_grow(register STR *str, int len)
-{
-    if (len && str)
-	GROWSTR(&(str->str_ptr), &(str->str_len), len + 1);
-}
-
 /* make str point to what nstr did */
 
 void
-str_replace(register STR *str, register STR *nstr)
-{
-    safefree(str->str_ptr);
-    str->str_ptr = nstr->str_ptr;
-    str->str_len = nstr->str_len;
-    str->str_cur = nstr->str_cur;
-    str->str_pok = nstr->str_pok;
-    if (str->str_nok = nstr->str_nok)
-	str->str_nval = nstr->str_nval;
-    safefree((char*)nstr);
-}
-
-void
 str_free(register STR *str)
 {
     if (!str)
@@ -282,23 +196,24 @@ str_gets(register STR *str, register FILE *fp)
     if (str->str_len <= cnt)		/* make sure we have the room */
 	GROWSTR(&(str->str_ptr), &(str->str_len), cnt+1);
     bp = str->str_ptr;			/* move these two too to registers */
-    ptr = FILE_ptr(fp);
+    ptr = (STDCHAR*)FILE_ptr(fp);
     for (;;) {
 	while (--cnt >= 0) {
-	    if ((*bp++ = *ptr++) == newline)
+	    if ((*bp++ = *ptr++) == newline) {
 		if (bp <= str->str_ptr || bp[-2] != '\\')
 		    goto thats_all_folks;
 		else {
 		    line++;
 		    bp -= 2;
 		}
+	    }
 	}
 	
 	FILE_cnt(fp) = cnt;		/* deregisterize cnt and ptr */
-	FILE_ptr(fp) = ptr;
+	FILE_ptr(fp) = (void*)ptr; /* LHS STDCHAR* cast non-portable */
 	i = getc(fp);		/* get more characters */
 	cnt = FILE_cnt(fp);
-	ptr = FILE_ptr(fp);		/* reregisterize cnt and ptr */
+	ptr = (STDCHAR*)FILE_ptr(fp);		/* reregisterize cnt and ptr */
 
 	bpx = bp - str->str_ptr;	/* prepare for possible relocation */
 	GROWSTR(&(str->str_ptr), &(str->str_len), str->str_cur + cnt + 1);
@@ -315,7 +230,7 @@ str_gets(register STR *str, register FILE *fp)
 
 thats_all_folks:
     FILE_cnt(fp) = cnt;			/* put these back or we're in trouble */
-    FILE_ptr(fp) = ptr;
+    FILE_ptr(fp) = (void*)ptr; /* LHS STDCHAR* cast non-portable */
     *bp = '\0';
     str->str_cur = bp - str->str_ptr;	/* set length */
 
@@ -334,95 +249,6 @@ thats_all_folks:
     return str->str_cur ? str->str_ptr : Nullch;
 }
 
-void
-str_inc(register STR *str)
-{
-    register char *d;
-
-    if (!str)
-	return;
-    if (str->str_nok) {
-	str->str_nval += 1.0;
-	str->str_pok = 0;
-	return;
-    }
-    if (!str->str_pok) {
-	str->str_nval = 1.0;
-	str->str_nok = 1;
-	return;
-    }
-    for (d = str->str_ptr; *d && *d != '.'; d++) ;
-    d--;
-    if (!isdigit(*str->str_ptr) || !isdigit(*d) ) {
-        str_numset(str,atof(str->str_ptr) + 1.0);  /* punt */
-	return;
-    }
-    while (d >= str->str_ptr) {
-	if (++*d <= '9')
-	    return;
-	*(d--) = '0';
-    }
-    /* oh,oh, the number grew */
-    GROWSTR(&(str->str_ptr), &(str->str_len), str->str_cur + 2);
-    str->str_cur++;
-    for (d = str->str_ptr + str->str_cur; d > str->str_ptr; d--)
-	*d = d[-1];
-    *d = '1';
-}
-
-void
-str_dec(register STR *str)
-{
-    register char *d;
-
-    if (!str)
-	return;
-    if (str->str_nok) {
-	str->str_nval -= 1.0;
-	str->str_pok = 0;
-	return;
-    }
-    if (!str->str_pok) {
-	str->str_nval = -1.0;
-	str->str_nok = 1;
-	return;
-    }
-    for (d = str->str_ptr; *d && *d != '.'; d++) ;
-    d--;
-    if (!isdigit(*str->str_ptr) || !isdigit(*d) || (*d == '0' && d == str->str_ptr)) {
-        str_numset(str,atof(str->str_ptr) - 1.0);  /* punt */
-	return;
-    }
-    while (d >= str->str_ptr) {
-	if (--*d >= '0')
-	    return;
-	*(d--) = '9';
-    }
-}
-
-/* make a string that will exist for the duration of the expression eval */
-
-STR *
-str_mortal(STR *oldstr)
-{
-    register STR *str = str_new(0);
-    static long tmps_size = -1;
-
-    str_sset(str,oldstr);
-    if (++tmps_max > tmps_size) {
-	tmps_size = tmps_max;
-	if (!(tmps_size & 127)) {
-	    if (tmps_size)
-		tmps_list = (STR**)saferealloc((char*)tmps_list,
-		    (tmps_size + 128) * sizeof(STR*) );
-	    else
-		tmps_list = (STR**)safemalloc(128 * sizeof(char*));
-	}
-    }
-    tmps_list[tmps_max] = str;
-    return str;
-}
-
 STR *
 str_make(char *s)
 {
@@ -432,11 +258,3 @@ str_make(char *s)
     return str;
 }
 
-STR *
-str_nmake(double n)
-{
-    register STR *str = str_new(0);
-
-    str_numset(str,n);
-    return str;
-}