X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=x2p%2Fstr.c;h=7cddccbf504ff34669897ab8dff4435fb8da25c8;hb=8bbf3450a1ff0a3996dade29a4194cc0939d871f;hp=94aeab1c93a90450f278ad161de78c6b871c9240;hpb=a687059cbaf2c6fdccb5e0fae2aee80ec15625a8;p=p5sagit%2Fp5-mst-13.2.git diff --git a/x2p/str.c b/x2p/str.c index 94aeab1..7cddccb 100644 --- a/x2p/str.c +++ b/x2p/str.c @@ -1,24 +1,20 @@ -/* $Header: str.c,v 3.0 89/10/18 15:35:18 lwall Locked $ +/* $RCSfile: str.c,v $$Revision: 4.1 $$Date: 92/08/07 18:29:26 $ * - * Copyright (c) 1989, Larry Wall + * Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1999, + * 2001, 2002, by Larry Wall and others * - * You may distribute under the terms of the GNU General Public License - * as specified in the README file that comes with the perl 3.0 kit. + * 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 3.0 89/10/18 15:35:18 lwall - * 3.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 */ @@ -26,8 +22,7 @@ double num; } char * -str_2ptr(str) -register STR *str; +str_2ptr(register STR *str) { register char *s; @@ -44,14 +39,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; +str_2num(register STR *str) { if (!str) return 0.0; @@ -62,14 +56,13 @@ register STR *str; str->str_nok = 1; #ifdef DEBUGGING if (debug & 32) - fprintf(stderr,"0x%lx num(%g)\n",str,str->str_nval); + fprintf(stderr,"0x%lx num(%g)\n",(unsigned long)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); @@ -81,22 +74,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 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 char *ptr) { register int len; @@ -104,42 +94,40 @@ 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; +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); + memcpy(str->str_ptr, 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 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); @@ -147,9 +135,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 char *ptr) { register int len; @@ -159,18 +146,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; +str_append_till(register STR *str, register char *from, register int delim, char *keeplist) { register char *to; register int len; @@ -190,7 +173,7 @@ char *keeplist; else *to++ = *from++; } - else if (index(keeplist,from[1])) + else if (strchr(keeplist,from[1])) *to++ = *from++; else from++; @@ -205,8 +188,7 @@ char *keeplist; } STR * -str_new(len) -int len; +str_new(int len) { register STR *str; @@ -216,7 +198,7 @@ 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); @@ -224,9 +206,7 @@ int len; } void -str_grow(str,len) -register STR *str; -int len; +str_grow(register STR *str, int len) { if (len && str) GROWSTR(&(str->str_ptr), &(str->str_len), len + 1); @@ -235,23 +215,20 @@ int len; /* make str point to what nstr did */ void -str_replace(str,nstr) -register STR *str; -register STR *nstr; +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) + 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; @@ -264,8 +241,8 @@ register STR *str; freestrroot = str; } -str_len(str) -register STR *str; +int +str_len(register STR *str) { if (!str) return 0; @@ -278,11 +255,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 */ @@ -291,29 +267,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 Nullch; + *(--((*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); @@ -329,12 +316,13 @@ 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]; @@ -343,14 +331,13 @@ thats_all_folks: else str_set(str, No); -#endif /* STDSTDIO */ +#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; +str_inc(register STR *str) { register char *d; @@ -368,7 +355,7 @@ register STR *str; } for (d = str->str_ptr; *d && *d != '.'; d++) ; d--; - if (!isdigit(*str->str_ptr) || !isdigit(*d) ) { + if (!isDIGIT(*str->str_ptr) || !isDIGIT(*d) ) { str_numset(str,atof(str->str_ptr) + 1.0); /* punt */ return; } @@ -386,8 +373,7 @@ register STR *str; } void -str_dec(str) -register STR *str; +str_dec(register STR *str) { register char *d; @@ -405,7 +391,7 @@ register STR *str; } for (d = str->str_ptr; *d && *d != '.'; d++) ; d--; - if (!isdigit(*str->str_ptr) || !isdigit(*d) || (*d == '0' && d == str->str_ptr)) { + if (!isDIGIT(*str->str_ptr) || !isDIGIT(*d) || (*d == '0' && d == str->str_ptr)) { str_numset(str,atof(str->str_ptr) - 1.0); /* punt */ return; } @@ -419,8 +405,7 @@ register STR *str; /* make a string that will exist for the duration of the expression eval */ STR * -str_static(oldstr) -STR *oldstr; +str_mortal(STR *oldstr) { register STR *str = str_new(0); static long tmps_size = -1; @@ -441,8 +426,7 @@ STR *oldstr; } STR * -str_make(s) -char *s; +str_make(char *s) { register STR *str = str_new(0); @@ -451,8 +435,7 @@ char *s; } STR * -str_nmake(n) -double n; +str_nmake(double n) { register STR *str = str_new(0);