diff options
author | dt <dt@FreeBSD.org> | 1999-04-04 21:47:11 +0000 |
---|---|---|
committer | dt <dt@FreeBSD.org> | 1999-04-04 21:47:11 +0000 |
commit | 99745231197e298b34f23e9f8c7147a812d6de87 (patch) | |
tree | 94b724eb59b6881ab2c87b11f06b0f4c7562956d /usr.bin | |
parent | 7d58f8f5343edfa21d75cfcb0418b9f876b2ef99 (diff) | |
download | FreeBSD-src-99745231197e298b34f23e9f8c7147a812d6de87.zip FreeBSD-src-99745231197e298b34f23e9f8c7147a812d6de87.tar.gz |
Rename a function to avoid conflict with the new syscall 'pwrite'.
Diffstat (limited to 'usr.bin')
-rw-r--r-- | usr.bin/tip/tip/acu.c | 8 | ||||
-rw-r--r-- | usr.bin/tip/tip/cmds.c | 14 | ||||
-rw-r--r-- | usr.bin/tip/tip/tip.c | 12 | ||||
-rw-r--r-- | usr.bin/tip/tip/tip.h | 2 |
4 files changed, 18 insertions, 18 deletions
diff --git a/usr.bin/tip/tip/acu.c b/usr.bin/tip/tip/acu.c index 4ad58cf..3f65c55 100644 --- a/usr.bin/tip/tip/acu.c +++ b/usr.bin/tip/tip/acu.c @@ -36,7 +36,7 @@ static char sccsid[] = "@(#)acu.c 8.1 (Berkeley) 6/6/93"; #endif static const char rcsid[] = - "$Id$"; + "$Id: acu.c,v 1.3 1997/08/18 07:15:58 charnier Exp $"; #endif /* not lint */ #include "tipconf.h" @@ -77,7 +77,7 @@ connect() if (!DU) { /* regular connect message */ if (CM != NOSTR) - pwrite(FD, CM, size(CM)); + xpwrite(FD, CM, size(CM)); logent(value(HOST), "", DV, "call completed"); return (NOSTR); } @@ -112,7 +112,7 @@ connect() if ((conflag = (*acu->acu_dialer)(phnum, CU))) { if (CM != NOSTR) - pwrite(FD, CM, size(CM)); + xpwrite(FD, CM, size(CM)); logent(value(HOST), phnum, acu->acu_name, "call completed"); return (NOSTR); @@ -150,7 +150,7 @@ connect() if ((conflag = (*acu->acu_dialer)(phnum, CU))) { fclose(fd); if (CM != NOSTR) - pwrite(FD, CM, size(CM)); + xpwrite(FD, CM, size(CM)); logent(value(HOST), phnum, acu->acu_name, "call completed"); return (NOSTR); diff --git a/usr.bin/tip/tip/cmds.c b/usr.bin/tip/tip/cmds.c index 2141dfc..c605022 100644 --- a/usr.bin/tip/tip/cmds.c +++ b/usr.bin/tip/tip/cmds.c @@ -36,7 +36,7 @@ static char sccsid[] = "@(#)cmds.c 8.1 (Berkeley) 6/6/93"; #endif static const char rcsid[] = - "$Id: cmds.c,v 1.7 1998/06/09 04:28:02 imp Exp $"; + "$Id: cmds.c,v 1.8 1998/10/03 11:01:39 dfr Exp $"; #endif /* not lint */ #include "tipconf.h" @@ -212,7 +212,7 @@ xfer(buf, fd, eofchars) return; } - pwrite(FD, buf, size(buf)); + xpwrite(FD, buf, size(buf)); quit = 0; kill(pid, SIGIOT); read(repdes[0], (char *)&ccc, 1); /* Wait until read process stops */ @@ -221,7 +221,7 @@ xfer(buf, fd, eofchars) * finish command */ r = '\r'; - pwrite(FD, &r, 1); + xpwrite(FD, &r, 1); do read(FD, &c, 1); while ((c&0177) != '\n'); @@ -298,7 +298,7 @@ transfer(buf, fd, eofchars) return; } - pwrite(FD, buf, size(buf)); + xpwrite(FD, buf, size(buf)); quit = 0; kill(pid, SIGIOT); read(repdes[0], (char *)&ccc, 1); /* Wait until read process stops */ @@ -307,7 +307,7 @@ transfer(buf, fd, eofchars) * finish command */ r = '\r'; - pwrite(FD, &r, 1); + xpwrite(FD, &r, 1); do read(FD, &c, 1); while ((c&0177) != '\n'); @@ -572,7 +572,7 @@ send(c) int retry = 0; cc = c; - pwrite(FD, &cc, 1); + xpwrite(FD, &cc, 1); #ifdef notdef if (number(value(CDELAY)) > 0 && c != '\r') nap(number(value(CDELAY))); @@ -593,7 +593,7 @@ tryagain: printf("\r\ntimeout error (%s)\r\n", ctrl(c)); if (retry++ > 3) return; - pwrite(FD, &null, 1); /* poke it */ + xpwrite(FD, &null, 1); /* poke it */ goto tryagain; } } diff --git a/usr.bin/tip/tip/tip.c b/usr.bin/tip/tip/tip.c index 737a97e..124286e 100644 --- a/usr.bin/tip/tip/tip.c +++ b/usr.bin/tip/tip/tip.c @@ -42,7 +42,7 @@ static const char copyright[] = static char sccsid[] = "@(#)tip.c 8.1 (Berkeley) 6/6/93"; #endif static const char rcsid[] = - "$Id: tip.c,v 1.8 1998/06/09 04:28:05 imp Exp $"; + "$Id: tip.c,v 1.9 1998/06/09 14:51:05 imp Exp $"; #endif /* not lint */ /* @@ -87,7 +87,7 @@ char PNbuf[256]; /* This limits the size of a number */ static void usage __P((void)); void setparity __P((char *)); -void pwrite __P((int, char *, int)); +void xpwrite __P((int, char *, int)); char escape __P((void)); void tipin __P((void)); int prompt __P((char *, char *, size_t)); @@ -451,7 +451,7 @@ tipin() continue; } else if (gch == '\r') { bol = 1; - pwrite(FD, &gch, 1); + xpwrite(FD, &gch, 1); if (boolean(value(HALFDUPLEX))) printf("\r\n"); continue; @@ -464,7 +464,7 @@ tipin() bol = any(gch, value(EOL)); if (boolean(value(RAISE)) && islower(gch)) gch = toupper(gch); - pwrite(FD, &gch, 1); + xpwrite(FD, &gch, 1); if (boolean(value(HALFDUPLEX))) printf("%c", gch); } @@ -498,7 +498,7 @@ escape() } /* ESCAPE ESCAPE forces ESCAPE */ if (c != gch) - pwrite(FD, &c, 1); + xpwrite(FD, &c, 1); return (gch); } @@ -659,7 +659,7 @@ static int bits8; * with the right parity and output it. */ void -pwrite(fd, buf, n) +xpwrite(fd, buf, n) int fd; char *buf; register int n; diff --git a/usr.bin/tip/tip/tip.h b/usr.bin/tip/tip/tip.h index 759c154..ea841ff 100644 --- a/usr.bin/tip/tip/tip.h +++ b/usr.bin/tip/tip/tip.h @@ -316,7 +316,7 @@ extern void daemon_uid __P((void)); extern void disconnect __P((char *)); extern void shell_uid __P((void)); extern void unraw __P((void)); -extern void pwrite __P((int, char *, int)); +extern void xpwrite __P((int, char *, int)); extern int prompt __P((char *, char *, size_t)); extern void consh __P((int)); extern void tipabort __P((char *)); |