From 64cb99a36d07d49b966755a4fc72d1519637b4bd Mon Sep 17 00:00:00 2001 From: Mark Eichin Date: Wed, 15 Jun 1994 22:38:19 +0000 Subject: [PATCH] step 3: bcopy->memcpy or memmove (chose by hand), twiddle args git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@3815 dc483132-0cff-0310-8789-dd5450dbe970 --- src/appl/telnet/telnetd/authenc.c | 2 +- src/appl/telnet/telnetd/slc.c | 2 +- src/appl/telnet/telnetd/state.c | 2 +- src/appl/telnet/telnetd/sys_term.c | 2 +- src/appl/telnet/telnetd/telnetd-ktd.c | 10 +++++----- src/appl/telnet/telnetd/telnetd.c | 12 ++++++------ src/appl/telnet/telnetd/utility.c | 4 ++-- src/include/kerberosIV/krb.h | 8 ++++---- 8 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/appl/telnet/telnetd/authenc.c b/src/appl/telnet/telnetd/authenc.c index fcd17fcf7..cee4ebb1d 100644 --- a/src/appl/telnet/telnetd/authenc.c +++ b/src/appl/telnet/telnetd/authenc.c @@ -45,7 +45,7 @@ net_write(str, len) int len; { if (nfrontp + len < netobuf + BUFSIZ) { - bcopy((void *)str, (void *)nfrontp, len); + memcpy((void *)nfrontp, (void *)str, len); nfrontp += len; return(len); } diff --git a/src/appl/telnet/telnetd/slc.c b/src/appl/telnet/telnetd/slc.c index 145746afe..b7dabf323 100644 --- a/src/appl/telnet/telnetd/slc.c +++ b/src/appl/telnet/telnetd/slc.c @@ -465,7 +465,7 @@ do_opt_slc(ptr, len) def_slcbuf = (unsigned char *)malloc((unsigned)len); if (def_slcbuf == (unsigned char *)0) return; /* too bad */ - bcopy(ptr, def_slcbuf, len); + memcpy(def_slcbuf, ptr, len); } } diff --git a/src/appl/telnet/telnetd/state.c b/src/appl/telnet/telnetd/state.c index 0349ce619..4fa88e463 100644 --- a/src/appl/telnet/telnetd/state.c +++ b/src/appl/telnet/telnetd/state.c @@ -366,7 +366,7 @@ gotiac: switch (c) { char xbuf2[BUFSIZ]; register char *cp; int n = pfrontp - opfrontp, oc; - bcopy(opfrontp, xptyobuf, n); + memcpy(xptyobuf, opfrontp, n); pfrontp = opfrontp; pfrontp += term_input(xptyobuf, pfrontp, n, BUFSIZ+NETSLOP, xbuf2, &oc, BUFSIZ); diff --git a/src/appl/telnet/telnetd/sys_term.c b/src/appl/telnet/telnetd/sys_term.c index 750568ce0..5181dc268 100644 --- a/src/appl/telnet/telnetd/sys_term.c +++ b/src/appl/telnet/telnetd/sys_term.c @@ -223,7 +223,7 @@ copy_termbuf(cp, len) { if (len > sizeof(termbuf)) len = sizeof(termbuf); - bcopy(cp, (char *)&termbuf, len); + memcpy((char *)&termbuf, cp, len); termbuf2 = termbuf; } #endif /* defined(LINEMODE) && defined(TIOCPKT_IOCTL) */ diff --git a/src/appl/telnet/telnetd/telnetd-ktd.c b/src/appl/telnet/telnetd/telnetd-ktd.c index f73a4d4f8..825757130 100644 --- a/src/appl/telnet/telnetd/telnetd-ktd.c +++ b/src/appl/telnet/telnetd/telnetd-ktd.c @@ -549,24 +549,24 @@ getterminaltype(name) if (his_state_is_will(TELOPT_TSPEED)) { static char sbbuf[] = { IAC, SB, TELOPT_TSPEED, TELQUAL_SEND, IAC, SE }; - bcopy(sbbuf, nfrontp, sizeof sbbuf); + memcpy(nfrontp, sbbuf, sizeof sbbuf); nfrontp += sizeof sbbuf; } if (his_state_is_will(TELOPT_XDISPLOC)) { static char sbbuf[] = { IAC, SB, TELOPT_XDISPLOC, TELQUAL_SEND, IAC, SE }; - bcopy(sbbuf, nfrontp, sizeof sbbuf); + memcpy(nfrontp, sbbuf, sizeof sbbuf); nfrontp += sizeof sbbuf; } if (his_state_is_will(TELOPT_ENVIRON)) { static char sbbuf[] = { IAC, SB, TELOPT_ENVIRON, TELQUAL_SEND, IAC, SE }; - bcopy(sbbuf, nfrontp, sizeof sbbuf); + memcpy(nfrontp, sbbuf, sizeof sbbuf); nfrontp += sizeof sbbuf; } if (his_state_is_will(TELOPT_TTYPE)) { - bcopy(ttytype_sbbuf, nfrontp, sizeof ttytype_sbbuf); + memcpy(nfrontp, ttytype_sbbuf, sizeof ttytype_sbbuf); nfrontp += sizeof ttytype_sbbuf; } if (his_state_is_will(TELOPT_TSPEED)) { @@ -636,7 +636,7 @@ _gettermname() if (his_state_is_wont(TELOPT_TTYPE)) return; settimer(baseline); - bcopy(ttytype_sbbuf, nfrontp, sizeof ttytype_sbbuf); + memcpy(nfrontp, ttytype_sbbuf, sizeof ttytype_sbbuf); nfrontp += sizeof ttytype_sbbuf; while (sequenceIs(ttypesubopt, baseline)) ttloop(); diff --git a/src/appl/telnet/telnetd/telnetd.c b/src/appl/telnet/telnetd/telnetd.c index d1c3c3176..7e97b0c72 100644 --- a/src/appl/telnet/telnetd/telnetd.c +++ b/src/appl/telnet/telnetd/telnetd.c @@ -637,33 +637,33 @@ getterminaltype(name) static unsigned char sb[] = { IAC, SB, TELOPT_TSPEED, TELQUAL_SEND, IAC, SE }; - bcopy(sb, nfrontp, sizeof sb); + memcpy(nfrontp, sb, sizeof sb); nfrontp += sizeof sb; } if (his_state_is_will(TELOPT_XDISPLOC)) { static unsigned char sb[] = { IAC, SB, TELOPT_XDISPLOC, TELQUAL_SEND, IAC, SE }; - bcopy(sb, nfrontp, sizeof sb); + memcpy(nfrontp, sb, sizeof sb); nfrontp += sizeof sb; } if (his_state_is_will(TELOPT_NEW_ENVIRON)) { static unsigned char sb[] = { IAC, SB, TELOPT_NEW_ENVIRON, TELQUAL_SEND, IAC, SE }; - bcopy(sb, nfrontp, sizeof sb); + memcpy(nfrontp, sb, sizeof sb); nfrontp += sizeof sb; } else if (his_state_is_will(TELOPT_OLD_ENVIRON)) { static unsigned char sb[] = { IAC, SB, TELOPT_OLD_ENVIRON, TELQUAL_SEND, IAC, SE }; - bcopy(sb, nfrontp, sizeof sb); + memcpy(nfrontp, sb, sizeof sb); nfrontp += sizeof sb; } if (his_state_is_will(TELOPT_TTYPE)) { - bcopy(ttytype_sbbuf, nfrontp, sizeof ttytype_sbbuf); + memcpy(nfrontp, ttytype_sbbuf, sizeof ttytype_sbbuf); nfrontp += sizeof ttytype_sbbuf; } if (his_state_is_will(TELOPT_TSPEED)) { @@ -737,7 +737,7 @@ _gettermname() if (his_state_is_wont(TELOPT_TTYPE)) return; settimer(baseline); - bcopy(ttytype_sbbuf, nfrontp, sizeof ttytype_sbbuf); + memcpy(nfrontp, ttytype_sbbuf, sizeof ttytype_sbbuf); nfrontp += sizeof ttytype_sbbuf; while (sequenceIs(ttypesubopt, baseline)) ttloop(); diff --git a/src/appl/telnet/telnetd/utility.c b/src/appl/telnet/telnetd/utility.c index 29625cd7a..6fe838abe 100644 --- a/src/appl/telnet/telnetd/utility.c +++ b/src/appl/telnet/telnetd/utility.c @@ -220,7 +220,7 @@ netclear() next = nextitem(next); } while (wewant(next) && (nfrontp > next)); length = next-thisitem; - bcopy(thisitem, good, length); + memcpy(good, thisitem, length); good += length; thisitem = next; } else { @@ -327,7 +327,7 @@ writenet(ptr, len) netflush(); } - bcopy(ptr, nfrontp, len); + memcpy(nfrontp, ptr, len); nfrontp += len; } /* end of writenet */ diff --git a/src/include/kerberosIV/krb.h b/src/include/kerberosIV/krb.h index 06b84ba43..a0d0ec42d 100644 --- a/src/include/kerberosIV/krb.h +++ b/src/include/kerberosIV/krb.h @@ -293,7 +293,7 @@ typedef struct msg_dat MSG_DAT; swab(((char *) x) +10,((char *) _krb_swap_tmp) +4 ,2); \ swab(((char *) x) +12,((char *) _krb_swap_tmp) +2 ,2); \ swab(((char *) x) +14,((char *) _krb_swap_tmp) +0 ,2); \ - bcopy((char *)_krb_swap_tmp,(char *)x,16);\ + memcpy((char *)x,(char *)_krb_swap_tmp,16);\ } #define swap_u_12(x) {\ @@ -304,7 +304,7 @@ typedef struct msg_dat MSG_DAT; swab(((char *) x) +6, ((char *) _krb_swap_tmp) +4 ,2); \ swab(((char *) x) +8, ((char *) _krb_swap_tmp) +2 ,2); \ swab(((char *) x) +10,((char *) _krb_swap_tmp) +0 ,2); \ - bcopy((char *)_krb_swap_tmp,(char *)x,12);\ + memcpy((char *)x,(char *)_krb_swap_tmp,12);\ } #define swap_C_Block(x) {\ @@ -313,7 +313,7 @@ typedef struct msg_dat MSG_DAT; swab(((char *) x) +2,((char *) _krb_swap_tmp) +4 ,2); \ swab(((char *) x) +4,((char *) _krb_swap_tmp) +2 ,2); \ swab(((char *) x) +6,((char *) _krb_swap_tmp) ,2); \ - bcopy((char *)_krb_swap_tmp,(char *)x,8);\ + memcpy((char *)x,(char *)_krb_swap_tmp,8);\ } #define swap_u_quad(x) {\ unsigned long _krb_swap_tmp[4];\ @@ -321,7 +321,7 @@ typedef struct msg_dat MSG_DAT; swab(((char *) &x) +2,((char *) _krb_swap_tmp) +4 ,2); \ swab(((char *) &x) +4,((char *) _krb_swap_tmp) +2 ,2); \ swab(((char *) &x) +6,((char *) _krb_swap_tmp) ,2); \ - bcopy((char *)_krb_swap_tmp,(char *)&x,8);\ + memcpy((char *)&x,(char *)_krb_swap_tmp,8);\ } #define swap_u_long(x) {\ -- 2.26.2