X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/d48672a2009b4897fb5bf74d6723c050cdd015e0..99a767497aefe18d89f5797f9871483537389bbf:/x2p/str.c

diff --git a/x2p/str.c b/x2p/str.c
index 5c25050..58798c0 100644
--- a/x2p/str.c
+++ b/x2p/str.c
@@ -1,27 +1,18 @@
-/* $RCSfile: str.c,v $$Revision: 4.0.1.1 $$Date: 91/06/07 12:20:08 $
+/*    str.c
  *
- *    Copyright (c) 1991, 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 $
- * Revision 4.0.1.1  91/06/07  12:20:08  lwall
- * patch4: new copyright notice
- * 
- * Revision 4.0  91/03/20  01:58:15  lwall
- * 4.0 baseline.
- * 
  */
 
-#include "handy.h"
 #include "EXTERN.h"
-#include "util.h"
 #include "a2p.h"
+#include "util.h"
 
-str_numset(str,num)
-register STR *str;
-double num;
+void
+str_numset(register STR *str, double num)
 {
     str->str_nval = num;
     str->str_pok = 0;		/* invalidate pointer */
@@ -29,13 +20,12 @@ double num;
 }
 
 char *
-str_2ptr(str)
-register STR *str;
+str_2ptr(register STR *str)
 {
     register 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) {
@@ -47,32 +37,13 @@ register STR *str;
     str->str_pok = 1;
 #ifdef DEBUGGING
     if (debug & 32)
-	fprintf(stderr,"0x%lx ptr(%s)\n",str,str->str_ptr);
+	fprintf(stderr,"0x%lx ptr(%s)\n",(unsigned long)str,str->str_ptr);
 #endif
     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",str,str->str_nval);
-#endif
-    return str->str_nval;
-}
-
-str_sset(dstr,sstr)
-STR *dstr;
-register STR *sstr;
+void
+str_sset(STR *dstr, register STR *sstr)
 {
     if (!sstr)
 	str_nset(dstr,No,0);
@@ -84,22 +55,19 @@ register STR *sstr;
 	str_nset(dstr,"",0);
 }
 
-str_nset(str,ptr,len)
-register STR *str;
-register char *ptr;
-register int len;
+void
+str_nset(register STR *str, register const 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 */
     str->str_pok = 1;		/* validate pointer */
 }
 
-str_set(str,ptr)
-register STR *str;
-register char *ptr;
+void
+str_set(register STR *str, register const char *ptr)
 {
     register int len;
 
@@ -107,42 +75,27 @@ 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 */
 }
 
-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 */
-}
-
-str_ncat(str,ptr,len)
-register STR *str;
-register char *ptr;
-register int len;
+void
+str_ncat(register STR *str, register const 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 */
     str->str_pok = 1;		/* validate pointer */
 }
 
-str_scat(dstr,sstr)
-STR *dstr;
-register STR *sstr;
+void
+str_scat(STR *dstr, register STR *sstr)
 {
     if (!(sstr->str_pok))
 	str_2ptr(sstr);
@@ -150,9 +103,8 @@ register STR *sstr;
 	str_ncat(dstr,sstr->str_ptr,sstr->str_cur);
 }
 
-str_cat(str,ptr)
-register STR *str;
-register char *ptr;
+void
+str_cat(register STR *str, register const char *ptr)
 {
     register int len;
 
@@ -162,54 +114,14 @@ 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 (index(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;
     
@@ -219,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(register STR *str)
 {
     if (!str)
 	return;
@@ -267,8 +154,8 @@ register STR *str;
     freestrroot = str;
 }
 
-str_len(str)
-register STR *str;
+int
+str_len(register STR *str)
 {
     if (!str)
 	return 0;
@@ -281,11 +168,10 @@ register STR *str;
 }
 
 char *
-str_gets(str,fp)
-register STR *str;
-register FILE *fp;
+str_gets(register STR *str, register FILE *fp)
 {
-#ifdef STDSTDIO		/* Here is some breathtakingly efficient cheating */
+#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 */
@@ -294,29 +180,40 @@ register FILE *fp;
     int i;
     int bpx;
 
-    cnt = fp->_cnt;			/* get count into register */
+#if defined(VMS)
+    /* An ungetc()d char is handled separately from the regular
+     * buffer, so we getc() it back out and stuff it in the buffer.
+     */
+    i = getc(fp);
+    if (i == EOF) return NULL;
+    *(--((*fp)->_ptr)) = (unsigned char) i;
+    (*fp)->_cnt++;
+#endif
+
+    cnt = FILE_cnt(fp);			/* get count into register */
     str->str_nok = 0;			/* invalidate number */
     str->str_pok = 1;			/* validate pointer */
     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 = fp->_ptr;
+    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;
 		}
+	    }
 	}
 	
-	fp->_cnt = cnt;			/* deregisterize cnt and ptr */
-	fp->_ptr = ptr;
-	i = _filbuf(fp);		/* get more characters */
-	cnt = fp->_cnt;
-	ptr = fp->_ptr;			/* reregisterize cnt and ptr */
+	FILE_cnt(fp) = cnt;		/* deregisterize cnt and ptr */
+	FILE_ptr(fp) = (void*)ptr; /* LHS STDCHAR* cast non-portable */
+	i = getc(fp);		/* get more characters */
+	cnt = FILE_cnt(fp);
+	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);
@@ -332,120 +229,28 @@ register FILE *fp;
     }
 
 thats_all_folks:
-    fp->_cnt = cnt;			/* put these back or we're in trouble */
-    fp->_ptr = ptr;
+    FILE_cnt(fp) = cnt;			/* put these back or we're in trouble */
+    FILE_ptr(fp) = (void*)ptr; /* LHS STDCHAR* cast non-portable */
     *bp = '\0';
     str->str_cur = bp - str->str_ptr;	/* set length */
 
-#else /* !STDSTDIO */	/* The big, slow, and stupid way */
+#else /* USE_STDIO_PTR && STDIO_PTR_LVALUE && STDIO_CNT_LVALUE */
+    /* The big, slow, and stupid way */
 
     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 /* STDSTDIO */
-
-    return str->str_cur ? str->str_ptr : Nullch;
-}
-
-void
-str_inc(str)
-register STR *str;
-{
-    register char *d;
+#endif /* USE_STDIO_PTR && STDIO_PTR_LVALUE && STDIO_CNT_LVALUE */
 
-    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';
+    return str->str_cur ? str->str_ptr : NULL;
 }
 
-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;
-}
-
-STR *
-str_make(s)
-char *s;
+str_make(const char *s)
 {
     register STR *str = str_new(0);
 
@@ -453,12 +258,3 @@ char *s;
     return str;
 }
 
-STR *
-str_nmake(n)
-double n;
-{
-    register STR *str = str_new(0);
-
-    str_numset(str,n);
-    return str;
-}