mirror of
https://git.FreeBSD.org/ports.git
synced 2024-12-24 04:33:24 +00:00
51 lines
1.3 KiB
Plaintext
51 lines
1.3 KiB
Plaintext
--- appl/libpty/getpty.c.orig Wed Jan 9 14:28:37 2002
|
|
+++ appl/libpty/getpty.c Thu Jan 10 21:30:40 2002
|
|
@@ -24,13 +24,26 @@
|
|
#include "libpty.h"
|
|
#include "pty-int.h"
|
|
|
|
+#ifdef __FreeBSD__
|
|
+#define PTYCHARS1 "pqrsPQRS"
|
|
+#define PTYCHARS2 "0123456789abcdefghijklmnopqrstuv"
|
|
+#endif
|
|
+
|
|
+#ifndef PTYCHARS1
|
|
+#define PTYCHARS1 "pqrstuvwxyzPQRST"
|
|
+#endif
|
|
+
|
|
+#ifndef PTYCHARS2
|
|
+#define PTYCHARS2 "0123456789abcdef"
|
|
+#endif
|
|
+
|
|
long
|
|
ptyint_getpty_ext(int *fd, char *slave, int slavelength, int do_grantpt)
|
|
{
|
|
+ int ptynum;
|
|
+ char *cp1, *cp2;
|
|
#if !defined(HAVE__GETPTY) && !defined(HAVE_OPENPTY)
|
|
- char *cp;
|
|
char *p;
|
|
- int i,ptynum;
|
|
struct stat stb;
|
|
char slavebuf[1024];
|
|
#endif
|
|
@@ -115,14 +128,14 @@
|
|
strncpy(slave, slavebuf, slavelength);
|
|
return 0;
|
|
} else {
|
|
- for (cp = "pqrstuvwxyzPQRST";*cp; cp++) {
|
|
+ for (cp1 = PTYCHARS1; *cp1 != '\0'; cp1++) {
|
|
sprintf(slavebuf,"/dev/ptyXX");
|
|
- slavebuf[sizeof("/dev/pty") - 1] = *cp;
|
|
+ slavebuf[sizeof("/dev/pty") - 1] = *cp1;
|
|
slavebuf[sizeof("/dev/ptyp") - 1] = '0';
|
|
if (stat(slavebuf, &stb) < 0)
|
|
break;
|
|
- for (i = 0; i < 16; i++) {
|
|
- slavebuf[sizeof("/dev/ptyp") - 1] = "0123456789abcdef"[i];
|
|
+ for (cp2 = PTYCHARS2; *cp2 != '\0'; cp2++) {
|
|
+ slavebuf[sizeof("/dev/ptyp") - 1] = *cp2;
|
|
*fd = open(slavebuf, O_RDWR);
|
|
if (*fd < 0) continue;
|
|
|