summaryrefslogtreecommitdiff
path: root/libc/termios
diff options
context:
space:
mode:
Diffstat (limited to 'libc/termios')
-rw-r--r--libc/termios/tcgetattr.c8
-rw-r--r--libc/termios/tcsetattr.c2
-rw-r--r--libc/termios/ttyname.c10
3 files changed, 10 insertions, 10 deletions
diff --git a/libc/termios/tcgetattr.c b/libc/termios/tcgetattr.c
index e671309b6..1f1f0562b 100644
--- a/libc/termios/tcgetattr.c
+++ b/libc/termios/tcgetattr.c
@@ -16,7 +16,7 @@
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
-#define mempcpy __libc_mempcpy
+#define mempcpy __mempcpy
#include <features.h>
#define __USE_GNU
@@ -55,18 +55,18 @@ int tcgetattr (int fd, struct termios *termios_p)
if (sizeof (cc_t) == 1 || _POSIX_VDISABLE == 0
|| (unsigned char) _POSIX_VDISABLE == (unsigned char) -1)
{
- memset (mempcpy (&termios_p->c_cc[0], &k_termios.c_cc[0],
+ __memset (mempcpy (&termios_p->c_cc[0], &k_termios.c_cc[0],
__KERNEL_NCCS * sizeof (cc_t)),
_POSIX_VDISABLE, (NCCS - __KERNEL_NCCS) * sizeof (cc_t));
#if 0
- memset ( (memcpy (&termios_p->c_cc[0], &k_termios.c_cc[0],
+ __memset ( (__memcpy (&termios_p->c_cc[0], &k_termios.c_cc[0],
__KERNEL_NCCS * sizeof (cc_t)) + (__KERNEL_NCCS * sizeof (cc_t))) ,
_POSIX_VDISABLE, (NCCS - __KERNEL_NCCS) * sizeof (cc_t));
#endif
} else {
size_t cnt;
- memcpy (&termios_p->c_cc[0], &k_termios.c_cc[0],
+ __memcpy (&termios_p->c_cc[0], &k_termios.c_cc[0],
__KERNEL_NCCS * sizeof (cc_t));
for (cnt = __KERNEL_NCCS; cnt < NCCS; ++cnt)
diff --git a/libc/termios/tcsetattr.c b/libc/termios/tcsetattr.c
index 83bf61d99..76d73796e 100644
--- a/libc/termios/tcsetattr.c
+++ b/libc/termios/tcsetattr.c
@@ -80,7 +80,7 @@ int tcsetattr (int fd, int optional_actions, const struct termios *termios_p)
#ifdef _HAVE_C_OSPEED
k_termios.c_ospeed = termios_p->c_ospeed;
#endif
- memcpy (&k_termios.c_cc[0], &termios_p->c_cc[0],
+ __memcpy (&k_termios.c_cc[0], &termios_p->c_cc[0],
__KERNEL_NCCS * sizeof (cc_t));
retval = ioctl (fd, cmd, &k_termios);
diff --git a/libc/termios/ttyname.c b/libc/termios/ttyname.c
index 7b937fb0b..15093f8a5 100644
--- a/libc/termios/ttyname.c
+++ b/libc/termios/ttyname.c
@@ -68,7 +68,7 @@ int ttyname_r(int fd, char *ubuf, size_t ubuflen)
assert(len + 2 <= TTYNAME_BUFLEN); /* dirname + 1 char + nul */
- strcpy(buf, p);
+ __strcpy(buf, p);
s = buf + len;
len = (TTYNAME_BUFLEN-2) - len; /* Available non-nul space. */
@@ -79,11 +79,11 @@ int ttyname_r(int fd, char *ubuf, size_t ubuflen)
while ((d = readdir(fp)) != NULL) {
/* This should never trigger for standard names, but we
* check it to be safe. */
- if (strlen(d->d_name) > len) { /* Too big? */
+ if (__strlen(d->d_name) > len) { /* Too big? */
continue;
}
- strcpy(s, d->d_name);
+ __strcpy(s, d->d_name);
if ((lstat(buf, &dst) == 0)
#if 0
@@ -100,8 +100,8 @@ int ttyname_r(int fd, char *ubuf, size_t ubuflen)
/* We treat NULL buf as ERANGE rather than EINVAL. */
rv = ERANGE;
- if (ubuf && (strlen(buf) <= ubuflen)) {
- strcpy(ubuf, buf);
+ if (ubuf && (__strlen(buf) <= ubuflen)) {
+ __strcpy(ubuf, buf);
rv = 0;
}
goto DONE;