RepoMirrors/musl
1
0
Fork 0
mirror of git://git.musl-libc.org/musl synced 2024-12-17 04:05:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

add ptsname_r (nonstandard) and split ptsname (standard) to separate file

Browse Source 
this eliminates the ugly static buffer in programs that use ptsname_r.
This commit is contained in:
Rich Felker 2011-04-13 08:35:32 -04:00
parent e2915eeeea
commit 750b738e53
3 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/stdlib.h
View File

@ -125,6 +125,7 @@ char *mktemp (char *);
void *valloc (size_t);
void *memalign(size_t, size_t);
int clearenv(void);
int ptsname_r(int, char *, size_t);
#endif

9
src/misc/ptsname.c Normal file
View File

@ -0,0 +1,9 @@
#include <stdlib.h>
int __ptsname_r(int, char *, size_t);
char *ptsname(int fd)
{
static char buf[9 + sizeof(int)*3 + 1];
return __ptsname_r(fd, buf, sizeof buf) < 0 ? 0 : buf;
}

18
src/misc/pty.c
View File

@ -2,6 +2,7 @@
#include <sys/ioctl.h>
#include <stdio.h>
#include <fcntl.h>
#include "libc.h"
int posix_openpt(int flags)
{
@ -19,17 +20,12 @@ int unlockpt(int fd)
return ioctl(fd, TIOCSPTLCK, &unlock);
}
char *ptsname(int fd)
int __ptsname_r(int fd, char *buf, size_t len)
{
static char buf[9 + sizeof(int)*3 + 1];
char *s = buf+sizeof(buf)-1;
int pty;
if (ioctl (fd, TIOCGPTN, &pty))
return NULL;
if (pty) for (; pty; pty/=10) *--s = '0' + pty%10;
else *--s = '0';
s -= 9;
s[0] = '/'; s[1] = 'd'; s[2] = 'e'; s[3] = 'v';
s[4] = '/'; s[5] = 'p'; s[6] = 't'; s[7] = 's'; s[8] = '/';
return s;
if (!buf) len = 0;
return -( ioctl (fd, TIOCGPTN, &pty) < 0
|| snprintf(buf, len, "/dev/pts/%d", pty) >= len );
}
weak_alias(__ptsname_r, ptsname_r);