This is a live mirror of the Perl 5 development currently hosted at
https://github.com/perl/perl5
https://perl5.git.perl.org
/
perl5.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Re: [ID 20010911.001] Not OK: perl v5.7.2 +DEVEL11978 on
[perl5.git]
/
x2p
/
str.c
diff --git
a/x2p/str.c
b/x2p/str.c
index
b820a8d
..
47dc9ec
100644
(file)
--- a/
x2p/str.c
+++ b/
x2p/str.c
@@
-1,6
+1,6
@@
/* $RCSfile: str.c,v $$Revision: 4.1 $$Date: 92/08/07 18:29:26 $
*
/* $RCSfile: str.c,v $$Revision: 4.1 $$Date: 92/08/07 18:29:26 $
*
- * Copyright (c) 1991-
1997
, Larry Wall
+ * Copyright (c) 1991-
2001
, 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.
*
* You may distribute under the terms of either the GNU General Public
* License or the Artistic License, as specified in the README file.
@@
-77,7
+77,7
@@
void
str_nset(register STR *str, register char *ptr, register int len)
{
GROWSTR(&(str->str_ptr), &(str->str_len), len + 1);
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_cur = len;
*(str->str_ptr+str->str_cur) = '\0';
str->str_nok = 0; /* invalidate number */
@@
-93,7
+93,7
@@
str_set(register STR *str, register char *ptr)
ptr = "";
len = strlen(ptr);
GROWSTR(&(str->str_ptr), &(str->str_len), len + 1);
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->str_cur = len;
str->str_nok = 0; /* invalidate number */
str->str_pok = 1; /* validate pointer */
@@
-107,7
+107,7
@@
str_chop(register STR *str, register char *ptr) /* like set but assuming ptr is
if (!(str->str_pok))
str_2ptr(str);
str->str_cur -= (ptr - str->str_ptr);
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->str_nok = 0; /* invalidate number */
str->str_pok = 1; /* validate pointer */
}
@@
-118,7
+118,7
@@
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);
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_cur += len;
*(str->str_ptr+str->str_cur) = '\0';
str->str_nok = 0; /* invalidate number */
@@
-145,7
+145,7
@@
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);
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 */
str->str_cur += len;
str->str_nok = 0; /* invalidate number */
str->str_pok = 1; /* validate pointer */
@@
-197,7
+197,7
@@
str_new(int len)
}
else {
str = (STR *) safemalloc(sizeof(STR));
}
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);
}
if (len)
GROWSTR(&(str->str_ptr), &(str->str_len), len + 1);
@@
-221,7
+221,7
@@
str_replace(register STR *str, register STR *nstr)
str->str_len = nstr->str_len;
str->str_cur = nstr->str_cur;
str->str_pok = nstr->str_pok;
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);
}
str->str_nval = nstr->str_nval;
safefree((char*)nstr);
}
@@
-285,13
+285,14
@@
str_gets(register STR *str, register FILE *fp)
ptr = FILE_ptr(fp);
for (;;) {
while (--cnt >= 0) {
ptr = 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;
}
if (bp <= str->str_ptr || bp[-2] != '\\')
goto thats_all_folks;
else {
line++;
bp -= 2;
}
+ }
}
FILE_cnt(fp) = cnt; /* deregisterize cnt and ptr */
}
FILE_cnt(fp) = cnt; /* deregisterize cnt and ptr */
@@
-353,7
+354,7
@@
str_inc(register STR *str)
}
for (d = str->str_ptr; *d && *d != '.'; d++) ;
d--;
}
for (d = str->str_ptr; *d && *d != '.'; d++) ;
d--;
- if (!is
digit(*str->str_ptr) || !isdigit
(*d) ) {
+ if (!is
DIGIT(*str->str_ptr) || !isDIGIT
(*d) ) {
str_numset(str,atof(str->str_ptr) + 1.0); /* punt */
return;
}
str_numset(str,atof(str->str_ptr) + 1.0); /* punt */
return;
}
@@
-389,7
+390,7
@@
str_dec(register STR *str)
}
for (d = str->str_ptr; *d && *d != '.'; d++) ;
d--;
}
for (d = str->str_ptr; *d && *d != '.'; d++) ;
d--;
- if (!is
digit(*str->str_ptr) || !isdigit
(*d) || (*d == '0' && d == str->str_ptr)) {
+ if (!is
DIGIT(*str->str_ptr) || !isDIGIT
(*d) || (*d == '0' && d == str->str_ptr)) {
str_numset(str,atof(str->str_ptr) - 1.0); /* punt */
return;
}
str_numset(str,atof(str->str_ptr) - 1.0); /* punt */
return;
}