1999-08-13 01:37:52 -04:00
|
|
|
#include "config.h"
|
|
|
|
|
#include <stdio.h>
|
|
|
|
|
#include <sys/types.h>
|
2001-11-19 00:03:03 -05:00
|
|
|
#include <sys/stat.h>
|
1999-08-13 01:37:52 -04:00
|
|
|
#include <sys/file.h>
|
|
|
|
|
#include <fcntl.h>
|
|
|
|
|
#include <errno.h>
|
|
|
|
|
#include <pwd.h>
|
2003-12-10 00:50:12 -05:00
|
|
|
#ifdef HAVE_SYS_IOCTL_H
|
1999-08-13 01:37:52 -04:00
|
|
|
#include <sys/ioctl.h>
|
|
|
|
|
#endif
|
2001-11-21 10:42:12 -05:00
|
|
|
#ifdef HAVE_LIBUTIL_H
|
|
|
|
|
#include <libutil.h>
|
|
|
|
|
#endif
|
|
|
|
|
#ifdef HAVE_PTY_H
|
|
|
|
|
#include <pty.h>
|
|
|
|
|
#endif
|
1999-08-13 01:37:52 -04:00
|
|
|
#ifdef HAVE_SYS_WAIT_H
|
|
|
|
|
#include <sys/wait.h>
|
|
|
|
|
#else
|
|
|
|
|
#define WIFSTOPPED(status) (((status) & 0xff) == 0x7f)
|
|
|
|
|
#endif
|
|
|
|
|
#include <ctype.h>
|
|
|
|
|
|
2000-05-25 01:55:12 -04:00
|
|
|
#include "ruby.h"
|
|
|
|
|
#include "rubyio.h"
|
* gc.c (Init_stack): stack region is far smaller than usual if
pthread is used.
* marshal.c (w_extended): singleton methods should not be checked
when dumping via marshal_dump() or _dump(). [ruby-talk:85909]
* file.c (getcwdofdrv): avoid using getcwd() directly, use
my_getcwd() instead.
* merged NeXT, OpenStep, Rhapsody ports patch from Eric Sunshine
<sunshine@sunshineco.com>. [ruby-core:01596]
* marshal.c (w_object): LINK check earlier than anything else,
i.e. do not dump TYPE_IVAR for already dumped objects.
(ruby-bugs PR#1220)
* eval.c (rb_eval): call "inherited" only when a new class is
generated; not on reopening.
* eval.c (eval): prepend error position in evaluating string to
* configure.in: revived NextStep, OpenStep, and Rhapsody ports which
had become unbuildable; enhanced --enable-fat-binary option so that
it accepts a list of desired architectures (rather than assuming a
fixed list), or defaults to a platform-appropriate list if user does
not provide an explicit list; made the default list of architectures
for MAB (fat binary) more comprehensive; now uses -fno-common even
when building the interpreter (in addition to using it for
extensions), thus allowing the interpreter to be embedded into a
plugin module of an external project (in addition to allowing
embedding directly into an application); added checks for
<netinet/in_systm.h> (needed by `socket' extension) and getcwd(); now
ensures that -I/usr/local/include is employed when extensions'
extconf.rb scripts invoke have_header() since extension checks on
NextStep and OpenStep will fail without it if the desired resource
resides in the /usr/local tree; fixed formatting of --help message.
* Makefile.in: $(LIBRUBY_A) rule now deletes the archive before
invoking $(AR) since `ar' on Apple/NeXT can not "update" MAB archives
(see configure's --enable-fat-binary option); added rule for new
missing/getcwd.c.
* defines.h: fixed endian handling during MAB build (see configure's
--enable-fat-binary option) to ensure that all portions of the
project see the correct WORDS_BIGENDIAN value (some extension modules
were getting the wrong endian setting); added missing constants
GETPGRP_VOID, WNOHANG, WUNTRACED, X_OK, and type pid_t for NextStep
and OpenStep; removed unnecessary and problematic HAVE_SYS_WAIT_H
define in NeXT section.
* dir.c: do not allow NAMLEN() macro to trust dirent::d_namlen on
NextStep since, on some installations, this value always resolves
uselessly to zero.
* dln.c: added error reporting to NextStep extension loader since the
previous behavior of failing silently was not useful; now ensures
that NSLINKMODULE_OPTION_BINDNOW compatibility constant is defined
for OpenStep and Rhapsody; no longer includes <mach-o/dyld.h> twice
on Rhapsody since this header lacks multiple-include protection,
which resulted in "redefinition" compilation errors.
* main.c: also create hard reference to objc_msgSend() on NeXT
platforms (in addition to Apple platforms).
* lib/mkmf.rb: now exports XCFLAGS from configure script to extension
makefiles so that extensions can be built MAB (see configure's
--enable-fat-binary option); also utilize XCFLAGS in cc_command()
(but not cpp_command() because MAB flags are incompatible with
direct invocation of `cpp').
* ext/curses/extconf.rb: now additionally checks for presence of these
curses functions which are not present on NextStep or Openstep:
bkgd(), bkgdset(), color(), curs(), getbkgd(), init(), scrl(), set(),
setscrreg(), wattroff(), wattron(), wattrset(), wbkgd(), wbkgdset(),
wscrl(), wsetscrreg()
* ext/curses/curses.c: added appropriate #ifdef's for additional set of
curses functions now checked by extconf.rb; fixed curses_bkgd() and
window_bkgd() to correctly return boolean result rather than numeric
result; fixed window_getbkgd() to correctly signal an error by
returning nil rather than -1.
* ext/etc/etc.c: setup_passwd() and setup_group() now check for null
pointers before invoking rb_tainted_str_new2() upon fields extracted
from `struct passwd' and `struct group' since null pointers in some
fields are common on NextStep/OpenStep (especially so for the
`pw_comment' field) and rb_tainted_str_new2() throws an exception
when it receives a null pointer.
* ext/pty/pty.c: include "util.h" for strdup()/ruby_strdup() for
platforms such as NextStep and OpenStep which lack strdup().
* ext/socket/getaddrinfo.c: cast first argument of getservbyname(),
gethostbyaddr(), and gethostbyname() from (const char*) to non-const
(char*) for older platforms such as NextStep and OpenStep.
* ext/socket/socket.c: include "util.h" for strdup()/ruby_strdup() for
platforms such as NextStep and OpenStep which lack strdup(); include
<netinet/in_systm.h> if present for NextStep and OpenStep; cast first
argument of gethostbyaddr() and getservbyname() from (const char*) to
non-const (char*) for older platforms.
* ext/syslog/syslog.c: include "util.h" for strdup()/ruby_strdup() for
platforms such as NextStep and OpenStep which lack strdup().
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5002 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2003-11-21 23:00:03 -05:00
|
|
|
#include "util.h"
|
1999-08-13 01:37:52 -04:00
|
|
|
|
|
|
|
|
#include <signal.h>
|
|
|
|
|
#ifdef HAVE_SYS_STROPTS_H
|
|
|
|
|
#include <sys/stropts.h>
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#ifdef HAVE_UNISTD_H
|
|
|
|
|
#include <unistd.h>
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#define DEVICELEN 16
|
|
|
|
|
|
|
|
|
|
#if !defined(HAVE_OPENPTY)
|
2003-12-10 21:39:59 -05:00
|
|
|
#if defined(__hpux)
|
2001-11-19 00:03:03 -05:00
|
|
|
static
|
1999-08-13 01:37:52 -04:00
|
|
|
char *MasterDevice = "/dev/ptym/pty%s",
|
|
|
|
|
*SlaveDevice = "/dev/pty/tty%s",
|
|
|
|
|
*deviceNo[] = {
|
|
|
|
|
"p0","p1","p2","p3","p4","p5","p6","p7",
|
|
|
|
|
"p8","p9","pa","pb","pc","pd","pe","pf",
|
|
|
|
|
"q0","q1","q2","q3","q4","q5","q6","q7",
|
|
|
|
|
"q8","q9","qa","qb","qc","qd","qe","qf",
|
|
|
|
|
"r0","r1","r2","r3","r4","r5","r6","r7",
|
|
|
|
|
"r8","r9","ra","rb","rc","rd","re","rf",
|
|
|
|
|
"s0","s1","s2","s3","s4","s5","s6","s7",
|
|
|
|
|
"s8","s9","sa","sb","sc","sd","se","sf",
|
|
|
|
|
"t0","t1","t2","t3","t4","t5","t6","t7",
|
|
|
|
|
"t8","t9","ta","tb","tc","td","te","tf",
|
|
|
|
|
"u0","u1","u2","u3","u4","u5","u6","u7",
|
|
|
|
|
"u8","u9","ua","ub","uc","ud","ue","uf",
|
|
|
|
|
"v0","v1","v2","v3","v4","v5","v6","v7",
|
|
|
|
|
"v8","v9","va","vb","vc","vd","ve","vf",
|
|
|
|
|
"w0","w1","w2","w3","w4","w5","w6","w7",
|
|
|
|
|
"w8","w9","wa","wb","wc","wd","we","wf",
|
|
|
|
|
0,
|
|
|
|
|
};
|
2003-12-10 21:39:59 -05:00
|
|
|
#elif defined(_IBMESA) /* AIX/ESA */
|
2001-11-19 00:03:03 -05:00
|
|
|
static
|
1999-08-13 01:37:52 -04:00
|
|
|
char *MasterDevice = "/dev/ptyp%s",
|
|
|
|
|
*SlaveDevice = "/dev/ttyp%s",
|
|
|
|
|
*deviceNo[] = {
|
|
|
|
|
"00","01","02","03","04","05","06","07","08","09","0a","0b","0c","0d","0e","0f",
|
|
|
|
|
"10","11","12","13","14","15","16","17","18","19","1a","1b","1c","1d","1e","1f",
|
|
|
|
|
"20","21","22","23","24","25","26","27","28","29","2a","2b","2c","2d","2e","2f",
|
|
|
|
|
"30","31","32","33","34","35","36","37","38","39","3a","3b","3c","3d","3e","3f",
|
|
|
|
|
"40","41","42","43","44","45","46","47","48","49","4a","4b","4c","4d","4e","4f",
|
|
|
|
|
"50","51","52","53","54","55","56","57","58","59","5a","5b","5c","5d","5e","5f",
|
|
|
|
|
"60","61","62","63","64","65","66","67","68","69","6a","6b","6c","6d","6e","6f",
|
|
|
|
|
"70","71","72","73","74","75","76","77","78","79","7a","7b","7c","7d","7e","7f",
|
|
|
|
|
"80","81","82","83","84","85","86","87","88","89","8a","8b","8c","8d","8e","8f",
|
|
|
|
|
"90","91","92","93","94","95","96","97","98","99","9a","9b","9c","9d","9e","9f",
|
|
|
|
|
"a0","a1","a2","a3","a4","a5","a6","a7","a8","a9","aa","ab","ac","ad","ae","af",
|
|
|
|
|
"b0","b1","b2","b3","b4","b5","b6","b7","b8","b9","ba","bb","bc","bd","be","bf",
|
|
|
|
|
"c0","c1","c2","c3","c4","c5","c6","c7","c8","c9","ca","cb","cc","cd","ce","cf",
|
|
|
|
|
"d0","d1","d2","d3","d4","d5","d6","d7","d8","d9","da","db","dc","dd","de","df",
|
|
|
|
|
"e0","e1","e2","e3","e4","e5","e6","e7","e8","e9","ea","eb","ec","ed","ee","ef",
|
|
|
|
|
"f0","f1","f2","f3","f4","f5","f6","f7","f8","f9","fa","fb","fc","fd","fe","ff",
|
|
|
|
|
};
|
2003-12-10 21:39:59 -05:00
|
|
|
#elif !defined(HAVE_PTSNAME)
|
2001-11-19 00:03:03 -05:00
|
|
|
static
|
1999-08-13 01:37:52 -04:00
|
|
|
char *MasterDevice = "/dev/pty%s",
|
|
|
|
|
*SlaveDevice = "/dev/tty%s",
|
|
|
|
|
*deviceNo[] = {
|
|
|
|
|
"p0","p1","p2","p3","p4","p5","p6","p7",
|
|
|
|
|
"p8","p9","pa","pb","pc","pd","pe","pf",
|
|
|
|
|
"q0","q1","q2","q3","q4","q5","q6","q7",
|
|
|
|
|
"q8","q9","qa","qb","qc","qd","qe","qf",
|
|
|
|
|
"r0","r1","r2","r3","r4","r5","r6","r7",
|
|
|
|
|
"r8","r9","ra","rb","rc","rd","re","rf",
|
2001-11-21 10:42:12 -05:00
|
|
|
"s0","s1","s2","s3","s4","s5","s6","s7",
|
|
|
|
|
"s8","s9","sa","sb","sc","sd","se","sf",
|
1999-08-13 01:37:52 -04:00
|
|
|
0,
|
|
|
|
|
};
|
2003-12-10 21:39:59 -05:00
|
|
|
#endif
|
1999-08-13 01:37:52 -04:00
|
|
|
#endif /* !defined(HAVE_OPENPTY) */
|
|
|
|
|
|
2001-11-19 00:03:03 -05:00
|
|
|
static char SlaveName[DEVICELEN];
|
1999-08-13 01:37:52 -04:00
|
|
|
|
|
|
|
|
extern int errno;
|
|
|
|
|
|
|
|
|
|
#ifndef HAVE_SETEUID
|
|
|
|
|
# ifdef HAVE_SETREUID
|
|
|
|
|
# define seteuid(e) setreuid(-1, (e))
|
|
|
|
|
# else /* NOT HAVE_SETREUID */
|
|
|
|
|
# ifdef HAVE_SETRESUID
|
|
|
|
|
# define seteuid(e) setresuid(-1, (e), -1)
|
|
|
|
|
# else /* NOT HAVE_SETRESUID */
|
|
|
|
|
/* I can't set euid. (;_;) */
|
|
|
|
|
# endif /* HAVE_SETRESUID */
|
|
|
|
|
# endif /* HAVE_SETREUID */
|
|
|
|
|
#endif /* NO_SETEUID */
|
|
|
|
|
|
2001-11-21 10:42:12 -05:00
|
|
|
static VALUE eChildExited;
|
|
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
|
echild_status(self)
|
|
|
|
|
VALUE self;
|
|
|
|
|
{
|
|
|
|
|
return rb_ivar_get(self, rb_intern("status"));
|
|
|
|
|
}
|
|
|
|
|
|
1999-08-13 01:37:52 -04:00
|
|
|
struct pty_info {
|
2001-11-19 00:03:03 -05:00
|
|
|
int fd;
|
2005-05-14 10:57:53 -04:00
|
|
|
rb_pid_t child_pid;
|
2001-11-19 00:03:03 -05:00
|
|
|
VALUE thread;
|
1999-08-13 01:37:52 -04:00
|
|
|
};
|
|
|
|
|
|
2003-03-07 00:59:42 -05:00
|
|
|
static void
|
|
|
|
|
raise_from_wait(state, info)
|
|
|
|
|
struct pty_info *info;
|
|
|
|
|
char *state;
|
|
|
|
|
{
|
|
|
|
|
extern VALUE rb_last_status;
|
|
|
|
|
char buf[1024];
|
|
|
|
|
VALUE exc;
|
|
|
|
|
|
|
|
|
|
snprintf(buf, sizeof(buf), "pty - %s: %d", state, info->child_pid);
|
|
|
|
|
exc = rb_exc_new2(eChildExited, buf);
|
|
|
|
|
rb_iv_set(exc, "status", rb_last_status);
|
|
|
|
|
rb_funcall(info->thread, rb_intern("raise"), 1, exc);
|
|
|
|
|
}
|
|
|
|
|
|
2001-08-05 23:05:23 -04:00
|
|
|
static VALUE
|
2001-11-19 00:03:03 -05:00
|
|
|
pty_syswait(info)
|
|
|
|
|
struct pty_info *info;
|
1999-08-13 01:37:52 -04:00
|
|
|
{
|
2001-08-05 23:05:23 -04:00
|
|
|
int cpid, status;
|
1999-08-13 01:37:52 -04:00
|
|
|
|
2003-03-07 00:59:42 -05:00
|
|
|
for (;;) {
|
|
|
|
|
cpid = rb_waitpid(info->child_pid, &status, WUNTRACED);
|
|
|
|
|
if (cpid == -1) return Qnil;
|
1999-08-13 01:37:52 -04:00
|
|
|
|
2003-03-07 00:59:42 -05:00
|
|
|
#if defined(IF_STOPPED)
|
|
|
|
|
if (IF_STOPPED(status)) { /* suspend */
|
|
|
|
|
raise_from_wait("stopped", info);
|
|
|
|
|
}
|
|
|
|
|
#elif defined(WIFSTOPPED)
|
|
|
|
|
if (WIFSTOPPED(status)) { /* suspend */
|
|
|
|
|
raise_from_wait("stopped", info);
|
|
|
|
|
}
|
1999-08-13 01:37:52 -04:00
|
|
|
#else
|
|
|
|
|
---->> Either IF_STOPPED or WIFSTOPPED is needed <<----
|
2003-03-07 00:59:42 -05:00
|
|
|
#endif /* WIFSTOPPED | IF_STOPPED */
|
|
|
|
|
else if (kill(info->child_pid, 0) == 0) {
|
|
|
|
|
raise_from_wait("changed", info);
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
raise_from_wait("exited", info);
|
|
|
|
|
return Qnil;
|
|
|
|
|
}
|
2001-11-21 10:42:12 -05:00
|
|
|
}
|
1999-08-13 01:37:52 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void getDevice _((int*, int*));
|
|
|
|
|
|
2001-11-21 10:42:12 -05:00
|
|
|
struct exec_info {
|
|
|
|
|
int argc;
|
|
|
|
|
VALUE *argv;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
|
pty_exec(arg)
|
|
|
|
|
struct exec_info *arg;
|
|
|
|
|
{
|
|
|
|
|
return rb_f_exec(arg->argc, arg->argv);
|
|
|
|
|
}
|
|
|
|
|
|
1999-08-13 01:37:52 -04:00
|
|
|
static void
|
2001-11-19 00:03:03 -05:00
|
|
|
establishShell(argc, argv, info)
|
|
|
|
|
int argc;
|
|
|
|
|
VALUE *argv;
|
1999-08-13 01:37:52 -04:00
|
|
|
struct pty_info *info;
|
|
|
|
|
{
|
2001-11-19 00:03:03 -05:00
|
|
|
static int i,master,slave,currentPid;
|
1999-08-13 01:37:52 -04:00
|
|
|
char *p,*getenv();
|
|
|
|
|
struct passwd *pwent;
|
2001-11-21 10:42:12 -05:00
|
|
|
VALUE v;
|
|
|
|
|
struct exec_info arg;
|
|
|
|
|
int status;
|
2001-11-19 00:03:03 -05:00
|
|
|
|
|
|
|
|
if (argc == 0) {
|
|
|
|
|
char *shellname;
|
|
|
|
|
|
1999-08-13 01:37:52 -04:00
|
|
|
if ((p = getenv("SHELL")) != NULL) {
|
|
|
|
|
shellname = p;
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
pwent = getpwuid(getuid());
|
|
|
|
|
if (pwent && pwent->pw_shell)
|
|
|
|
|
shellname = pwent->pw_shell;
|
|
|
|
|
else
|
|
|
|
|
shellname = "/bin/sh";
|
|
|
|
|
}
|
2001-11-19 00:03:03 -05:00
|
|
|
v = rb_str_new2(shellname);
|
|
|
|
|
argc = 1;
|
|
|
|
|
argv = &v;
|
1999-08-13 01:37:52 -04:00
|
|
|
}
|
|
|
|
|
getDevice(&master,&slave);
|
|
|
|
|
|
2001-11-21 10:42:12 -05:00
|
|
|
info->thread = rb_thread_current();
|
1999-08-13 01:37:52 -04:00
|
|
|
currentPid = getpid();
|
2001-11-19 00:03:03 -05:00
|
|
|
if((i = fork()) < 0) {
|
2003-12-10 00:50:12 -05:00
|
|
|
close(master);
|
|
|
|
|
close(slave);
|
1999-08-13 01:37:52 -04:00
|
|
|
rb_sys_fail("fork failed");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if(i == 0) { /* child */
|
|
|
|
|
currentPid = getpid();
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Set free from process group and controlling terminal
|
|
|
|
|
*/
|
|
|
|
|
#ifdef HAVE_SETSID
|
|
|
|
|
(void) setsid();
|
|
|
|
|
#else /* HAS_SETSID */
|
|
|
|
|
# ifdef HAVE_SETPGRP
|
|
|
|
|
# ifdef SETGRP_VOID
|
|
|
|
|
if (setpgrp() == -1)
|
|
|
|
|
perror("setpgrp()");
|
|
|
|
|
# else /* SETGRP_VOID */
|
|
|
|
|
if (setpgrp(0, currentPid) == -1)
|
|
|
|
|
rb_sys_fail("setpgrp()");
|
|
|
|
|
if ((i = open("/dev/tty", O_RDONLY)) < 0)
|
|
|
|
|
rb_sys_fail("/dev/tty");
|
|
|
|
|
else {
|
|
|
|
|
if (ioctl(i, TIOCNOTTY, (char *)0))
|
|
|
|
|
perror("ioctl(TIOCNOTTY)");
|
|
|
|
|
close(i);
|
|
|
|
|
}
|
|
|
|
|
# endif /* SETGRP_VOID */
|
|
|
|
|
# endif /* HAVE_SETPGRP */
|
|
|
|
|
#endif /* HAS_SETSID */
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* obtain new controlling terminal
|
|
|
|
|
*/
|
|
|
|
|
#if defined(TIOCSCTTY)
|
|
|
|
|
close(master);
|
|
|
|
|
(void) ioctl(slave, TIOCSCTTY, (char *)0);
|
|
|
|
|
/* errors ignored for sun */
|
|
|
|
|
#else
|
|
|
|
|
close(slave);
|
|
|
|
|
slave = open(SlaveName, O_RDWR);
|
|
|
|
|
if (slave < 0) {
|
|
|
|
|
perror("open: pty slave");
|
|
|
|
|
_exit(1);
|
|
|
|
|
}
|
|
|
|
|
close(master);
|
|
|
|
|
#endif
|
|
|
|
|
dup2(slave,0);
|
|
|
|
|
dup2(slave,1);
|
|
|
|
|
dup2(slave,2);
|
|
|
|
|
close(slave);
|
2000-02-08 03:54:01 -05:00
|
|
|
#if defined(HAVE_SETEUID) || defined(HAVE_SETREUID) || defined(HAVE_SETRESUID)
|
1999-08-13 01:37:52 -04:00
|
|
|
seteuid(getuid());
|
2000-02-08 03:54:01 -05:00
|
|
|
#endif
|
1999-08-13 01:37:52 -04:00
|
|
|
|
2001-11-21 10:42:12 -05:00
|
|
|
arg.argc = argc;
|
|
|
|
|
arg.argv = argv;
|
|
|
|
|
rb_protect(pty_exec, (VALUE)&arg, &status);
|
1999-08-13 01:37:52 -04:00
|
|
|
sleep(1);
|
|
|
|
|
_exit(1);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
close(slave);
|
|
|
|
|
|
|
|
|
|
info->child_pid = i;
|
|
|
|
|
info->fd = master;
|
|
|
|
|
}
|
|
|
|
|
|
2001-11-21 10:42:12 -05:00
|
|
|
static VALUE
|
2003-03-07 00:59:42 -05:00
|
|
|
pty_finalize_syswait(info)
|
2001-11-21 10:42:12 -05:00
|
|
|
struct pty_info *info;
|
|
|
|
|
{
|
2003-03-07 00:59:42 -05:00
|
|
|
rb_thread_kill(info->thread);
|
2003-05-19 11:45:46 -04:00
|
|
|
rb_funcall(info->thread, rb_intern("value"), 0);
|
2003-03-07 00:59:42 -05:00
|
|
|
rb_detach_process(info->child_pid);
|
2001-11-21 10:42:12 -05:00
|
|
|
return Qnil;
|
|
|
|
|
}
|
|
|
|
|
|
1999-08-13 01:37:52 -04:00
|
|
|
#ifdef HAVE_OPENPTY
|
|
|
|
|
/*
|
|
|
|
|
* Use openpty(3) of 4.3BSD Reno and later,
|
|
|
|
|
* or the same interface function.
|
|
|
|
|
*/
|
|
|
|
|
static void
|
|
|
|
|
getDevice(master,slave)
|
|
|
|
|
int *master,*slave;
|
|
|
|
|
{
|
|
|
|
|
if (openpty(master, slave, SlaveName,
|
|
|
|
|
(struct termios *)0, (struct winsize *)0) == -1) {
|
|
|
|
|
rb_raise(rb_eRuntimeError, "openpty() failed");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
#else /* HAVE_OPENPTY */
|
|
|
|
|
#ifdef HAVE__GETPTY
|
|
|
|
|
static void
|
|
|
|
|
getDevice(master,slave)
|
|
|
|
|
int *master,*slave;
|
|
|
|
|
{
|
|
|
|
|
char *name;
|
|
|
|
|
|
|
|
|
|
if (!(name = _getpty(master, O_RDWR, 0622, 0))) {
|
|
|
|
|
rb_raise(rb_eRuntimeError, "_getpty() failed");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
*slave = open(name, O_RDWR);
|
|
|
|
|
strcpy(SlaveName, name);
|
|
|
|
|
}
|
|
|
|
|
#else /* HAVE__GETPTY */
|
|
|
|
|
static void
|
|
|
|
|
getDevice(master,slave)
|
|
|
|
|
int *master,*slave;
|
|
|
|
|
{
|
|
|
|
|
int i,j;
|
|
|
|
|
|
2001-11-27 05:00:35 -05:00
|
|
|
#ifdef HAVE_PTSNAME
|
1999-08-13 01:37:52 -04:00
|
|
|
char *pn;
|
|
|
|
|
void (*s)();
|
|
|
|
|
|
|
|
|
|
extern char *ptsname(int);
|
|
|
|
|
extern int unlockpt(int);
|
|
|
|
|
extern int grantpt(int);
|
|
|
|
|
|
|
|
|
|
if((i = open("/dev/ptmx", O_RDWR, 0)) != -1) {
|
|
|
|
|
s = signal(SIGCHLD, SIG_DFL);
|
|
|
|
|
if(grantpt(i) != -1) {
|
|
|
|
|
signal(SIGCHLD, s);
|
|
|
|
|
if(unlockpt(i) != -1) {
|
|
|
|
|
if((pn = ptsname(i)) != NULL) {
|
|
|
|
|
if((j = open(pn, O_RDWR, 0)) != -1) {
|
2001-11-27 05:00:35 -05:00
|
|
|
#if defined I_PUSH && !defined linux
|
1999-08-13 01:37:52 -04:00
|
|
|
if(ioctl(j, I_PUSH, "ptem") != -1) {
|
|
|
|
|
if(ioctl(j, I_PUSH, "ldterm") != -1) {
|
|
|
|
|
#endif
|
|
|
|
|
*master = i;
|
|
|
|
|
*slave = j;
|
|
|
|
|
strcpy(SlaveName, pn);
|
|
|
|
|
return;
|
2001-11-27 05:00:35 -05:00
|
|
|
#if defined I_PUSH && !defined linux
|
1999-08-13 01:37:52 -04:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
close(i);
|
|
|
|
|
}
|
* array.c: replace rb_protect_inspect() and rb_inspecting_p() by
rb_exec_recursive() in eval.c.
* eval.c (rb_exec_recursive): new function.
* array.c (rb_ary_join): use rb_exec_recursive().
* array.c (rb_ary_inspect, rb_ary_hash): ditto.
* file.c (rb_file_join): ditto.
* hash.c (rb_hash_inspect, rb_hash_to_s, rb_hash_hash): ditto.
* io.c (rb_io_puts): ditto.
* object.c (rb_obj_inspect): ditto
* struct.c (rb_struct_inspect): ditto.
* lib/set.rb (SortedSet::setup): a hack to shut up warning.
[ruby-talk:132866]
* lib/time.rb (Time::strptime): add new function. inspired by
[ruby-talk:132815].
* lib/parsedate.rb (ParseDate::strptime): ditto.
* regparse.c: move st_*_strend() functions from st.c. fixed some
potential memory leaks.
* exception error messages updated. [ruby-core:04497]
* ext/socket/socket.c (Init_socket): add bunch of Socket
constants. Patch from Sam Roberts <sroberts@uniserve.com>.
[ruby-core:04409]
* array.c (rb_ary_s_create): no need for negative argc check.
[ruby-core:04463]
* array.c (rb_ary_unshift_m): ditto.
* lib/xmlrpc/parser.rb (XMLRPC::FaultException): make it subclass
of StandardError class, not Exception class. [ruby-core:04429]
* parse.y (fcall_gen): lvar(arg) will be evaluated as
lvar.call(arg) when lvar is a defined local variable. [new]
* object.c (rb_class_initialize): call inherited method before
calling initializing block.
* eval.c (rb_thread_start_1): initialize newly pushed frame.
* lib/open3.rb (Open3::popen3): $? should not be EXIT_FAILURE.
fixed: [ruby-core:04444]
* eval.c (is_defined): NODE_IASGN is an assignment.
* ext/readline/readline.c (Readline.readline): use rl_outstream
and rl_instream. [ruby-dev:25699]
* ext/etc/etc.c (Init_etc): sGroup needs HAVE_ST_GR_PASSWD check
[ruby-dev:25675]
* misc/ruby-mode.el: [ruby-core:04415]
* lib/rdoc/generators/html_generator.rb: [ruby-core:04412]
* lib/rdoc/generators/ri_generator.rb: ditto.
* struct.c (make_struct): fixed: [ruby-core:04402]
* ext/curses/curses.c (window_color_set): [ruby-core:04393]
* ext/socket/socket.c (Init_socket): SO_REUSEPORT added.
[ruby-talk:130092]
* object.c: [ruby-doc:818]
* parse.y (open_args): fix too verbose warnings for the space
before argument parentheses. [ruby-dev:25492]
* parse.y (parser_yylex): ditto.
* parse.y (parser_yylex): the first expression in the parentheses
should not be a command. [ruby-dev:25492]
* lib/irb/context.rb (IRB::Context::initialize): [ruby-core:04330]
* object.c (Init_Object): remove Object#type. [ruby-core:04335]
* st.c (st_foreach): report success/failure by return value.
[ruby-Bugs-1396]
* parse.y: forgot to initialize parser struct. [ruby-dev:25492]
* parse.y (parser_yylex): no tLABEL on EXPR_BEG.
[ruby-talk:127711]
* document updates - [ruby-core:04296], [ruby-core:04301],
[ruby-core:04302], [ruby-core:04307]
* dir.c (rb_push_glob): should work for NUL delimited patterns.
* dir.c (rb_glob2): should aware of offset in the pattern.
* string.c (rb_str_new4): should propagate taintedness.
* env.h: rename member names in struct FRAME; last_func -> callee,
orig_func -> this_func, last_class -> this_class.
* struct.c (rb_struct_set): use original method name, not callee
name, to retrieve member slot. [ruby-core:04268]
* time.c (time_strftime): protect from format modification from GC
finalizers.
* object.c (Init_Object): remove rb_obj_id_obsolete()
* eval.c (rb_mod_define_method): incomplete subclass check.
[ruby-dev:25464]
* gc.c (rb_data_object_alloc): klass may be NULL.
[ruby-list:40498]
* bignum.c (rb_big_rand): should return positive random number.
[ruby-dev:25401]
* bignum.c (rb_big_rand): do not use rb_big_modulo to generate
random bignums. [ruby-dev:25396]
* variable.c (rb_autoload): [ruby-dev:25373]
* eval.c (svalue_to_avalue): [ruby-dev:25366]
* string.c (rb_str_justify): [ruby-dev:25367]
* io.c (rb_f_select): [ruby-dev:25312]
* ext/socket/socket.c (sock_s_getservbyport): [ruby-talk:124072]
* struct.c (make_struct): [ruby-dev:25249]
* dir.c (dir_open_dir): new function. [ruby-dev:25242]
* io.c (rb_f_open): add type check for return value from to_open.
* lib/pstore.rb (PStore#transaction): Use the empty content when a
file is not found. [ruby-dev:24561]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8068 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-03-04 01:47:45 -05:00
|
|
|
rb_raise(rb_eRuntimeError, "can't get Master/Slave device");
|
1999-08-13 01:37:52 -04:00
|
|
|
#else
|
2003-12-10 21:39:59 -05:00
|
|
|
char **p;
|
|
|
|
|
char MasterName[DEVICELEN];
|
|
|
|
|
|
1999-08-13 01:37:52 -04:00
|
|
|
for (p = deviceNo; *p != NULL; p++) {
|
2001-11-27 05:00:35 -05:00
|
|
|
sprintf(MasterName,MasterDevice,*p);
|
1999-08-13 01:37:52 -04:00
|
|
|
if ((i = open(MasterName,O_RDWR,0)) >= 0) {
|
|
|
|
|
*master = i;
|
2001-11-27 05:00:35 -05:00
|
|
|
sprintf(SlaveName,SlaveDevice,*p);
|
1999-08-13 01:37:52 -04:00
|
|
|
if ((j = open(SlaveName,O_RDWR,0)) >= 0) {
|
|
|
|
|
*slave = j;
|
|
|
|
|
chown(SlaveName, getuid(), getgid());
|
|
|
|
|
chmod(SlaveName, 0622);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
close(i);
|
|
|
|
|
}
|
|
|
|
|
}
|
* array.c: replace rb_protect_inspect() and rb_inspecting_p() by
rb_exec_recursive() in eval.c.
* eval.c (rb_exec_recursive): new function.
* array.c (rb_ary_join): use rb_exec_recursive().
* array.c (rb_ary_inspect, rb_ary_hash): ditto.
* file.c (rb_file_join): ditto.
* hash.c (rb_hash_inspect, rb_hash_to_s, rb_hash_hash): ditto.
* io.c (rb_io_puts): ditto.
* object.c (rb_obj_inspect): ditto
* struct.c (rb_struct_inspect): ditto.
* lib/set.rb (SortedSet::setup): a hack to shut up warning.
[ruby-talk:132866]
* lib/time.rb (Time::strptime): add new function. inspired by
[ruby-talk:132815].
* lib/parsedate.rb (ParseDate::strptime): ditto.
* regparse.c: move st_*_strend() functions from st.c. fixed some
potential memory leaks.
* exception error messages updated. [ruby-core:04497]
* ext/socket/socket.c (Init_socket): add bunch of Socket
constants. Patch from Sam Roberts <sroberts@uniserve.com>.
[ruby-core:04409]
* array.c (rb_ary_s_create): no need for negative argc check.
[ruby-core:04463]
* array.c (rb_ary_unshift_m): ditto.
* lib/xmlrpc/parser.rb (XMLRPC::FaultException): make it subclass
of StandardError class, not Exception class. [ruby-core:04429]
* parse.y (fcall_gen): lvar(arg) will be evaluated as
lvar.call(arg) when lvar is a defined local variable. [new]
* object.c (rb_class_initialize): call inherited method before
calling initializing block.
* eval.c (rb_thread_start_1): initialize newly pushed frame.
* lib/open3.rb (Open3::popen3): $? should not be EXIT_FAILURE.
fixed: [ruby-core:04444]
* eval.c (is_defined): NODE_IASGN is an assignment.
* ext/readline/readline.c (Readline.readline): use rl_outstream
and rl_instream. [ruby-dev:25699]
* ext/etc/etc.c (Init_etc): sGroup needs HAVE_ST_GR_PASSWD check
[ruby-dev:25675]
* misc/ruby-mode.el: [ruby-core:04415]
* lib/rdoc/generators/html_generator.rb: [ruby-core:04412]
* lib/rdoc/generators/ri_generator.rb: ditto.
* struct.c (make_struct): fixed: [ruby-core:04402]
* ext/curses/curses.c (window_color_set): [ruby-core:04393]
* ext/socket/socket.c (Init_socket): SO_REUSEPORT added.
[ruby-talk:130092]
* object.c: [ruby-doc:818]
* parse.y (open_args): fix too verbose warnings for the space
before argument parentheses. [ruby-dev:25492]
* parse.y (parser_yylex): ditto.
* parse.y (parser_yylex): the first expression in the parentheses
should not be a command. [ruby-dev:25492]
* lib/irb/context.rb (IRB::Context::initialize): [ruby-core:04330]
* object.c (Init_Object): remove Object#type. [ruby-core:04335]
* st.c (st_foreach): report success/failure by return value.
[ruby-Bugs-1396]
* parse.y: forgot to initialize parser struct. [ruby-dev:25492]
* parse.y (parser_yylex): no tLABEL on EXPR_BEG.
[ruby-talk:127711]
* document updates - [ruby-core:04296], [ruby-core:04301],
[ruby-core:04302], [ruby-core:04307]
* dir.c (rb_push_glob): should work for NUL delimited patterns.
* dir.c (rb_glob2): should aware of offset in the pattern.
* string.c (rb_str_new4): should propagate taintedness.
* env.h: rename member names in struct FRAME; last_func -> callee,
orig_func -> this_func, last_class -> this_class.
* struct.c (rb_struct_set): use original method name, not callee
name, to retrieve member slot. [ruby-core:04268]
* time.c (time_strftime): protect from format modification from GC
finalizers.
* object.c (Init_Object): remove rb_obj_id_obsolete()
* eval.c (rb_mod_define_method): incomplete subclass check.
[ruby-dev:25464]
* gc.c (rb_data_object_alloc): klass may be NULL.
[ruby-list:40498]
* bignum.c (rb_big_rand): should return positive random number.
[ruby-dev:25401]
* bignum.c (rb_big_rand): do not use rb_big_modulo to generate
random bignums. [ruby-dev:25396]
* variable.c (rb_autoload): [ruby-dev:25373]
* eval.c (svalue_to_avalue): [ruby-dev:25366]
* string.c (rb_str_justify): [ruby-dev:25367]
* io.c (rb_f_select): [ruby-dev:25312]
* ext/socket/socket.c (sock_s_getservbyport): [ruby-talk:124072]
* struct.c (make_struct): [ruby-dev:25249]
* dir.c (dir_open_dir): new function. [ruby-dev:25242]
* io.c (rb_f_open): add type check for return value from to_open.
* lib/pstore.rb (PStore#transaction): Use the empty content when a
file is not found. [ruby-dev:24561]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8068 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-03-04 01:47:45 -05:00
|
|
|
rb_raise(rb_eRuntimeError, "can't get %s", SlaveName);
|
1999-08-13 01:37:52 -04:00
|
|
|
#endif
|
|
|
|
|
}
|
|
|
|
|
#endif /* HAVE__GETPTY */
|
|
|
|
|
#endif /* HAVE_OPENPTY */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
freeDevice()
|
|
|
|
|
{
|
|
|
|
|
chmod(SlaveName, 0666);
|
|
|
|
|
chown(SlaveName, 0, 0);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* ruby function: getpty */
|
|
|
|
|
static VALUE
|
2001-11-19 00:03:03 -05:00
|
|
|
pty_getpty(argc, argv, self)
|
|
|
|
|
int argc;
|
|
|
|
|
VALUE *argv;
|
|
|
|
|
VALUE self;
|
1999-08-13 01:37:52 -04:00
|
|
|
{
|
2003-03-10 10:05:18 -05:00
|
|
|
VALUE res;
|
|
|
|
|
struct pty_info info;
|
|
|
|
|
struct pty_info thinfo;
|
1999-08-13 01:37:52 -04:00
|
|
|
OpenFile *wfptr,*rfptr;
|
2001-10-03 03:19:19 -04:00
|
|
|
VALUE rport = rb_obj_alloc(rb_cFile);
|
|
|
|
|
VALUE wport = rb_obj_alloc(rb_cFile);
|
1999-08-13 01:37:52 -04:00
|
|
|
|
|
|
|
|
MakeOpenFile(rport, rfptr);
|
|
|
|
|
MakeOpenFile(wport, wfptr);
|
|
|
|
|
|
2001-11-19 00:03:03 -05:00
|
|
|
establishShell(argc, argv, &info);
|
1999-08-13 01:37:52 -04:00
|
|
|
|
|
|
|
|
rfptr->mode = rb_io_mode_flags("r");
|
* rubyio.h, intern.h, io.c, file.c, process.c, ext/socket/socket.c,
ext/pty/pty.c, ext/io/wait/wait.c, ext/openssl/ossl_ssl.c:
Use own buffering mechanism instead of stdio.
* io.c, ext/stringio/stringio.c, test/ruby/ut_eof.rb:
EOF flag removed.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7473 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2004-12-06 03:40:30 -05:00
|
|
|
rfptr->fd = info.fd;
|
2001-11-21 10:42:12 -05:00
|
|
|
rfptr->path = strdup(SlaveName);
|
1999-08-13 01:37:52 -04:00
|
|
|
|
2002-01-28 03:44:45 -05:00
|
|
|
wfptr->mode = rb_io_mode_flags("w") | FMODE_SYNC;
|
* rubyio.h, intern.h, io.c, file.c, process.c, ext/socket/socket.c,
ext/pty/pty.c, ext/io/wait/wait.c, ext/openssl/ossl_ssl.c:
Use own buffering mechanism instead of stdio.
* io.c, ext/stringio/stringio.c, test/ruby/ut_eof.rb:
EOF flag removed.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7473 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2004-12-06 03:40:30 -05:00
|
|
|
wfptr->fd = dup(info.fd);
|
2001-11-21 10:42:12 -05:00
|
|
|
wfptr->path = strdup(SlaveName);
|
1999-08-13 01:37:52 -04:00
|
|
|
|
2001-05-06 11:06:00 -04:00
|
|
|
res = rb_ary_new2(3);
|
1999-08-13 01:37:52 -04:00
|
|
|
rb_ary_store(res,0,(VALUE)rport);
|
|
|
|
|
rb_ary_store(res,1,(VALUE)wport);
|
|
|
|
|
rb_ary_store(res,2,INT2FIX(info.child_pid));
|
|
|
|
|
|
2003-03-10 10:05:18 -05:00
|
|
|
thinfo.thread = rb_thread_create(pty_syswait, (void*)&info);
|
2001-11-21 10:42:12 -05:00
|
|
|
thinfo.child_pid = info.child_pid;
|
2003-05-19 11:45:46 -04:00
|
|
|
rb_thread_schedule();
|
2001-11-21 10:42:12 -05:00
|
|
|
|
2000-05-24 00:34:26 -04:00
|
|
|
if (rb_block_given_p()) {
|
2003-03-07 00:59:42 -05:00
|
|
|
rb_ensure(rb_yield, res, pty_finalize_syswait, (VALUE)&thinfo);
|
2001-11-21 10:42:12 -05:00
|
|
|
return Qnil;
|
1999-08-13 01:37:52 -04:00
|
|
|
}
|
2001-11-19 00:03:03 -05:00
|
|
|
return res;
|
1999-08-13 01:37:52 -04:00
|
|
|
}
|
|
|
|
|
|
2001-08-05 23:05:23 -04:00
|
|
|
/* ruby function: protect_signal - obsolete */
|
1999-08-13 01:37:52 -04:00
|
|
|
static VALUE
|
|
|
|
|
pty_protect(self)
|
|
|
|
|
VALUE self;
|
|
|
|
|
{
|
2001-08-05 23:05:23 -04:00
|
|
|
rb_warn("PTY::protect_signal is no longer needed");
|
1999-08-13 01:37:52 -04:00
|
|
|
rb_yield(Qnil);
|
|
|
|
|
return self;
|
|
|
|
|
}
|
|
|
|
|
|
2001-08-05 23:05:23 -04:00
|
|
|
/* ruby function: reset_signal - obsolete */
|
1999-08-13 01:37:52 -04:00
|
|
|
static VALUE
|
|
|
|
|
pty_reset_signal(self)
|
|
|
|
|
VALUE self;
|
|
|
|
|
{
|
2001-08-05 23:05:23 -04:00
|
|
|
rb_warn("PTY::reset_signal is no longer needed");
|
1999-08-13 01:37:52 -04:00
|
|
|
return self;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static VALUE cPTY;
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
Init_pty()
|
|
|
|
|
{
|
|
|
|
|
cPTY = rb_define_module("PTY");
|
2001-11-19 00:03:03 -05:00
|
|
|
rb_define_module_function(cPTY,"getpty",pty_getpty,-1);
|
|
|
|
|
rb_define_module_function(cPTY,"spawn",pty_getpty,-1);
|
1999-08-13 01:37:52 -04:00
|
|
|
rb_define_module_function(cPTY,"protect_signal",pty_protect,0);
|
|
|
|
|
rb_define_module_function(cPTY,"reset_signal",pty_reset_signal,0);
|
2001-11-21 10:42:12 -05:00
|
|
|
|
|
|
|
|
eChildExited = rb_define_class_under(cPTY,"ChildExited",rb_eRuntimeError);
|
|
|
|
|
rb_define_method(eChildExited,"status",echild_status,0);
|
1999-08-13 01:37:52 -04:00
|
|
|
}
|