X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/e125f273e351a19a92b69d6244af55abbbf0a26d..c02d599bfd636e89753a6ed00b136798dc1661c3:/x2p/str.c

diff --git a/x2p/str.c b/x2p/str.c
index 88b3c60..e12e5e9 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-1997, 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"
@@ -13,9 +12,7 @@
 #include "util.h"
 
 void
-str_numset(str,num)
-register STR *str;
-double num;
+str_numset(STR *str, double num)
 {
     str->str_nval = num;
     str->str_pok = 0;		/* invalidate pointer */
@@ -23,13 +20,12 @@ double num;
 }
 
 char *
-str_2ptr(str)
-register STR *str;
+str_2ptr(STR *str)
 {
-    register char *s;
+    char *s;
 
     if (!str)
-	return "";
+	return (char *)"";	/* probably safe - won't be written to */
     GROWSTR(&(str->str_ptr), &(str->str_len), 24);
     s = str->str_ptr;
     if (str->str_nok) {
@@ -46,28 +42,8 @@ register STR *str;
     return str->str_ptr;
 }
 
-double
-str_2num(str)
-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(dstr,sstr)
-STR *dstr;
-register STR *sstr;
+str_sset(STR *dstr, STR *sstr)
 {
     if (!sstr)
 	str_nset(dstr,No,0);
@@ -80,13 +56,10 @@ register STR *sstr;
 }
 
 void
-str_nset(str,ptr,len)
-register STR *str;
-register char *ptr;
-register int len;
+str_nset(STR *str, const char *ptr, 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 */
@@ -94,45 +67,27 @@ register int len;
 }
 
 void
-str_set(str,ptr)
-register STR *str;
-register char *ptr;
+str_set(STR *str, const char *ptr)
 {
-    register int len;
+    int len;
 
     if (!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(str,ptr)	/* like set but assuming ptr is in str */
-register STR *str;
-register char *ptr;
-{
-    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(str,ptr,len)
-register STR *str;
-register char *ptr;
-register int len;
+str_ncat(STR *str, const char *ptr, 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 */
@@ -140,9 +95,7 @@ register int len;
 }
 
 void
-str_scat(dstr,sstr)
-STR *dstr;
-register STR *sstr;
+str_scat(STR *dstr, STR *sstr)
 {
     if (!(sstr->str_pok))
 	str_2ptr(sstr);
@@ -151,11 +104,9 @@ register STR *sstr;
 }
 
 void
-str_cat(str,ptr)
-register STR *str;
-register char *ptr;
+str_cat(STR *str, const char *ptr)
 {
-    register int len;
+    int len;
 
     if (!ptr)
 	return;
@@ -163,56 +114,16 @@ 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(str,from,delim,keeplist)
-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(len)
-int len;
+str_new(int len)
 {
-    register STR *str;
+    STR *str;
     
     if (freestrroot) {
 	str = freestrroot;
@@ -220,42 +131,17 @@ 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(str,len)
-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(str,nstr)
-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(str)
-register STR *str;
+str_free(STR *str)
 {
     if (!str)
 	return;
@@ -269,8 +155,7 @@ register STR *str;
 }
 
 int
-str_len(str)
-register STR *str;
+str_len(STR *str)
 {
     if (!str)
 	return 0;
@@ -283,17 +168,15 @@ register STR *str;
 }
 
 char *
-str_gets(str,fp)
-register STR *str;
-register FILE *fp;
+str_gets(STR *str, FILE *fp)
 {
 #if defined(USE_STDIO_PTR) && defined(STDIO_PTR_LVALUE) && defined(STDIO_CNT_LVALUE)
     /* Here is some breathtakingly efficient cheating */
 
-    register char *bp;		/* we're going to steal some values */
-    register int cnt;		/*  from the stdio struct and put EVERYTHING */
-    register STDCHAR *ptr;	/*   in the innermost loop into registers */
-    register char newline = '\n';	/* (assuming at least 6 registers) */
+    char *bp;		/* we're going to steal some values */
+    int cnt;		/*  from the stdio struct and put EVERYTHING */
+    STDCHAR *ptr;	/*   in the innermost loop into registers */
+    char newline = '\n';	/* (assuming at least 6 registers) */
     int i;
     int bpx;
 
@@ -302,7 +185,7 @@ register FILE *fp;
      * buffer, so we getc() it back out and stuff it in the buffer.
      */
     i = getc(fp);
-    if (i == EOF) return Nullch;
+    if (i == EOF) return NULL;
     *(--((*fp)->_ptr)) = (unsigned char) i;
     (*fp)->_cnt++;
 #endif
@@ -313,23 +196,24 @@ 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 <= str->str_ptr || bp[-2] != '\\')
+	    if ((*bp++ = *ptr++) == newline) {
+		if (bp <= str->str_ptr + 1 || bp[-2] != '\\')
 		    goto thats_all_folks;
 		else {
 		    line++;
 		    bp -= 2;
 		}
+	    }
 	}
 	
 	FILE_cnt(fp) = cnt;		/* deregisterize cnt and ptr */
 	FILE_ptr(fp) = ptr;
 	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);
@@ -355,124 +239,22 @@ thats_all_folks:
 
     static char buf[4192];
 
-    if (fgets(buf, sizeof buf, fp) != Nullch)
+    if (fgets(buf, sizeof buf, fp) != NULL)
 	str_set(str, buf);
     else
 	str_set(str, No);
 
 #endif /* USE_STDIO_PTR && STDIO_PTR_LVALUE && STDIO_CNT_LVALUE */
 
-    return str->str_cur ? str->str_ptr : Nullch;
-}
-
-void
-str_inc(str)
-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(str)
-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(oldstr)
-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;
+    return str->str_cur ? str->str_ptr : NULL;
 }
 
 STR *
-str_make(s)
-char *s;
+str_make(const char *s)
 {
-    register STR *str = str_new(0);
+    STR *str = str_new(0);
 
     str_set(str,s);
     return str;
 }
 
-STR *
-str_nmake(n)
-double n;
-{
-    register STR *str = str_new(0);
-
-    str_numset(str,n);
-    return str;
-}