emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libbb: use ptsname_r, it's smaller

Browse Source 
function                                             old     new   delta
xgetpty                                               91      81     -10
ptsname                                               33       -     -33

   text    data     bss     dec     hex filename
 793828     592    6692  801112   c3958 busybox_old
 793796     592    6660  801048   c3918 busybox_unstripped
This commit is contained in:
Denis Vlasenko
2008-08-17 12:47:19 +00:00
parent 34c73c499b
commit eb084779d7
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
libbb/getpty.c
View File

@@ -13,18 +13,26 @@
int FAST_FUNC xgetpty(char *line) int FAST_FUNC xgetpty(char *line)
{ {
int p; int p;
#if ENABLE_FEATURE_DEVPTS #if ENABLE_FEATURE_DEVPTS
p = open("/dev/ptmx", O_RDWR); p = open("/dev/ptmx", O_RDWR);
if (p > 0) { if (p > 0) {
grantpt(p); /* chmod+chown corresponding slave pty */
unlockpt(p); /* (what does this do?) */
#if 0 /* if ptsname_r is not available... */
const char *name; const char *name;
grantpt(p); name = ptsname(p); /* find out the name of slave pty */
unlockpt(p);
name = ptsname(p);
if (!name) { if (!name) {
bb_perror_msg("ptsname error (is /dev/pts mounted?)"); bb_perror_msg_and_die("ptsname error (is /dev/pts mounted?)");
goto fail;
} }
safe_strncpy(line, name, GETPTY_BUFSIZE); safe_strncpy(line, name, GETPTY_BUFSIZE);
#else
/* find out the name of slave pty */
if (ptsname_r(p, line, GETPTY_BUFSIZE-1) != 0) {
bb_perror_msg_and_die("ptsname error (is /dev/pts mounted?)");
}
line[GETPTY_BUFSIZE-1] = '\0';
#endif
return p; return p;
} }
#else #else
@@ -52,9 +60,5 @@ int FAST_FUNC xgetpty(char *line)
} }
} }
#endif /* FEATURE_DEVPTS */ #endif /* FEATURE_DEVPTS */
USE_FEATURE_DEVPTS( fail:) bb_error_msg_and_die("can't find free pty");
bb_error_msg_and_die("open pty");
return -1; /* never get here */
} }