Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix old pty name resolution for ptys > 256

This commit is contained in:
christos 2006-03-23 23:53:54 +00:00
parent d292467748
commit ed99bb9996
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
sys/kern/tty_bsdpty.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: tty_bsdpty.c,v 1.5 2005/12/11 12:24:30 christos Exp $ */
/* $NetBSD: tty_bsdpty.c,v 1.6 2006/03/23 23:53:54 christos Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: tty_bsdpty.c,v 1.5 2005/12/11 12:24:30 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: tty_bsdpty.c,v 1.6 2006/03/23 23:53:54 christos Exp $");
#include "opt_ptm.h"
@ -94,22 +94,25 @@ pty_makename(struct ptm_pty *ptm, char *bf, size_t bufsiz, dev_t dev, char c)
{
size_t nt;
dev_t minor = minor(dev);
const char *suffix;
if (bufsiz < TTY_NAMESIZE)
return EINVAL;
(void)memcpy(bf, TTY_TEMPLATE, TTY_NAMESIZE);
bf[5] = c;
if (minor < 256) {
suffix = TTY_OLD_SUFFIX;
nt = sizeof(TTY_OLD_SUFFIX) - 1;
bf[8] = TTY_LETTERS[minor / nt];
bf[9] = TTY_OLD_SUFFIX[minor % nt];
} else {
minor -= 256;
nt = sizeof(TTY_NEW_SUFFIX) - sizeof(TTY_OLD_SUFFIX);
bf[8] = TTY_LETTERS[minor / nt];
bf[9] = TTY_NEW_SUFFIX[minor % nt];
suffix = TTY_NEW_SUFFIX;
nt = sizeof(TTY_NEW_SUFFIX) - 1;
}
bf[5] = c;
bf[8] = TTY_LETTERS[minor / nt];
bf[9] = suffix[minor % nt];
return 0;
}