|
 |
03eee96 |
From 82764cd53a519b552fb4f62814ca65cd77105f14 Mon Sep 17 00:00:00 2001
|
|
|
03eee96 |
From: Peter Lemenkov <lemenkov@gmail.com>
|
|
|
03eee96 |
Date: Mon, 19 Apr 2010 15:23:49 +0400
|
|
|
03eee96 |
Subject: [PATCH 8/8] Fix for run_erl utility
|
|
|
03eee96 |
|
|
|
03eee96 |
---
|
|
|
03eee96 |
erts/etc/common/Makefile.in | 2 +-
|
|
|
03eee96 |
erts/etc/unix/run_erl.c | 12 ++++++++++++
|
|
|
03eee96 |
2 files changed, 13 insertions(+), 1 deletions(-)
|
|
|
03eee96 |
|
|
|
03eee96 |
diff --git a/erts/etc/common/Makefile.in b/erts/etc/common/Makefile.in
|
|
|
03eee96 |
index d0b9a7f..18c2f8d 100644
|
|
|
03eee96 |
--- a/erts/etc/common/Makefile.in
|
|
|
03eee96 |
+++ b/erts/etc/common/Makefile.in
|
|
|
03eee96 |
@@ -280,7 +280,7 @@ $(BINDIR)/inet_gethost@EXEEXT@: $(OBJDIR)/inet_gethost.o $(ENTRY_OBJ)
|
|
|
03eee96 |
$(PURIFY) $(LD) $(LDFLAGS) $(ENTRY_LDFLAGS) -o $@ $(OBJDIR)/inet_gethost.o $(ENTRY_OBJ) $(LIBS)
|
|
|
03eee96 |
|
|
|
03eee96 |
$(BINDIR)/run_erl: $(OBJDIR)/run_erl.o
|
|
|
03eee96 |
- $(LD) $(LDFLAGS) -o $@ $(OBJDIR)/run_erl.o
|
|
|
03eee96 |
+ $(LD) $(LDFLAGS) -lutil -o $@ $(OBJDIR)/run_erl.o
|
|
|
03eee96 |
|
|
|
03eee96 |
$(OBJDIR)/run_erl.o: ../unix/run_erl.c
|
|
|
03eee96 |
$(CC) $(CFLAGS) -o $@ -c ../unix/run_erl.c
|
|
|
03eee96 |
diff --git a/erts/etc/unix/run_erl.c b/erts/etc/unix/run_erl.c
|
|
|
03eee96 |
index a39ace3..ec73a68 100644
|
|
|
03eee96 |
--- a/erts/etc/unix/run_erl.c
|
|
|
03eee96 |
+++ b/erts/etc/unix/run_erl.c
|
|
|
03eee96 |
@@ -42,6 +42,8 @@
|
|
|
03eee96 |
#include <dirent.h>
|
|
|
03eee96 |
#include <termios.h>
|
|
|
03eee96 |
#include <time.h>
|
|
|
03eee96 |
+#include <pty.h>
|
|
|
03eee96 |
+#include <utmp.h>
|
|
|
03eee96 |
#if !defined(NO_SYSLOG)
|
|
|
03eee96 |
#include <syslog.h>
|
|
|
03eee96 |
#endif
|
|
|
03eee96 |
@@ -803,6 +805,7 @@ static int create_fifo(char *name, int perm)
|
|
|
03eee96 |
static int open_pty_master(char **ptyslave)
|
|
|
03eee96 |
{
|
|
|
03eee96 |
int mfd;
|
|
|
03eee96 |
+ int sfd;
|
|
|
03eee96 |
char *major, *minor;
|
|
|
03eee96 |
|
|
|
03eee96 |
static char majorchars[] = "pqrstuvwxyzabcdePQRSTUVWXYZABCDE";
|
|
|
03eee96 |
@@ -818,6 +821,15 @@ static int open_pty_master(char **ptyslave)
|
|
|
03eee96 |
/* http://www.xcf.berkeley.edu/~ali/K0D/UNIX/PTY/code/upty.h.html */
|
|
|
03eee96 |
|
|
|
03eee96 |
{
|
|
|
03eee96 |
+ static char ttyname[] = " ";
|
|
|
03eee96 |
+ if (0 == openpty(&mfd, &sfd, ttyname, NULL, NULL)) {
|
|
|
03eee96 |
+ close(sfd);
|
|
|
03eee96 |
+ *ptyslave = ttyname;
|
|
|
03eee96 |
+ return mfd;
|
|
|
03eee96 |
+ }
|
|
|
03eee96 |
+ }
|
|
|
03eee96 |
+
|
|
|
03eee96 |
+ {
|
|
|
03eee96 |
/* New style devpts or devfs /dev/pty/{m,s}{0,1....} */
|
|
|
03eee96 |
|
|
|
03eee96 |
static char ptyname[] = "/dev/pty/mX";
|
|
|
03eee96 |
--
|
|
|
03eee96 |
1.6.6.1
|
|
|
03eee96 |
|