2007-06-09 23:06:15 -04:00
|
|
|
#include "ruby/config.h"
|
2006-09-16 03:21:02 -04:00
|
|
|
#ifdef RUBY_EXTCONF_H
|
|
|
|
#include RUBY_EXTCONF_H
|
|
|
|
#endif
|
2008-12-16 05:49:12 -05:00
|
|
|
#include <stdlib.h>
|
1999-08-13 01:37:52 -04:00
|
|
|
#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
|
2008-12-17 05:38:19 -05:00
|
|
|
#ifdef HAVE_UTIL_H
|
|
|
|
#include <util.h>
|
|
|
|
#endif
|
2001-11-21 10:42:12 -05:00
|
|
|
#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>
|
|
|
|
|
2007-06-09 23:06:15 -04:00
|
|
|
#include "ruby/ruby.h"
|
|
|
|
#include "ruby/io.h"
|
|
|
|
#include "ruby/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)
|
2007-08-07 01:56:52 -04:00
|
|
|
static const
|
|
|
|
char MasterDevice[] = "/dev/ptym/pty%s",
|
|
|
|
SlaveDevice[] = "/dev/pty/tty%s",
|
|
|
|
*const deviceNo[] = {
|
1999-08-13 01:37:52 -04:00
|
|
|
"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 */
|
2007-08-07 01:56:52 -04:00
|
|
|
static const
|
|
|
|
char MasterDevice[] = "/dev/ptyp%s",
|
|
|
|
SlaveDevice[] = "/dev/ttyp%s",
|
|
|
|
*const deviceNo[] = {
|
1999-08-13 01:37:52 -04:00
|
|
|
"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)
|
2007-08-07 01:56:52 -04:00
|
|
|
static const
|
|
|
|
char MasterDevice[] = "/dev/pty%s",
|
|
|
|
SlaveDevice[] = "/dev/tty%s",
|
|
|
|
*const deviceNo[] = {
|
1999-08-13 01:37:52 -04:00
|
|
|
"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) */
|
|
|
|
|
|
|
|
#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
|
* sprintf.c (rb_str_format): allow %c to print one character
string (e.g. ?x).
* lib/tempfile.rb (Tempfile::make_tmpname): put dot between
basename and pid. [ruby-talk:196272]
* parse.y (do_block): remove -> style block.
* parse.y (parser_yylex): remove tLAMBDA_ARG.
* eval.c (rb_call0): binding for the return event hook should have
consistent scope. [ruby-core:07928]
* eval.c (proc_invoke): return behavior should depend whether it
is surrounded by a lambda or a mere block.
* eval.c (formal_assign): handles post splat arguments.
* eval.c (rb_call0): ditto.
* st.c (strhash): use FNV-1a hash.
* parse.y (parser_yylex): removed experimental ';;' terminator.
* eval.c (rb_node_arity): should be aware of post splat arguments.
* eval.c (rb_proc_arity): ditto.
* parse.y (f_args): syntax rule enhanced to support arguments
after the splat.
* parse.y (block_param): ditto for block parameters.
* parse.y (f_post_arg): mandatory formal arguments after the splat
argument.
* parse.y (new_args_gen): generate nodes for mandatory formal
arguments after the splat argument.
* eval.c (rb_eval): dispatch mandatory formal arguments after the
splat argument.
* parse.y (args): allow more than one splat in the argument list.
* parse.y (method_call): allow aref [] to accept all kind of
method argument, including assocs, splat, and block argument.
* eval.c (SETUP_ARGS0): prepare block argument as well.
* lib/mathn.rb (Integer): remove Integer#gcd2. [ruby-core:07931]
* eval.c (error_line): print receivers true/false/nil specially.
* eval.c (rb_proc_yield): handles parameters in yield semantics.
* eval.c (nil_yield): gives LocalJumpError to denote no block
error.
* io.c (rb_io_getc): now takes one-character string.
* string.c (rb_str_hash): use FNV-1a hash from Fowler/Noll/Vo
hashing algorithm.
* string.c (rb_str_aref): str[0] now returns 1 character string,
instead of a fixnum. [Ruby2]
* parse.y (parser_yylex): ?c now returns 1 character string,
instead of a fixnum. [Ruby2]
* string.c (rb_str_aset): no longer support fixnum insertion.
* eval.c (umethod_bind): should not update original class.
[ruby-dev:28636]
* eval.c (ev_const_get): should support constant access from
within instance_eval(). [ruby-dev:28327]
* time.c (time_timeval): should round for usec floating
number. [ruby-core:07896]
* time.c (time_add): ditto.
* dir.c (sys_warning): should not call a vararg function
rb_sys_warning() indirectly. [ruby-core:07886]
* numeric.c (flo_divmod): the first element of Float#divmod should
be an integer. [ruby-dev:28589]
* test/ruby/test_float.rb: add tests for divmod, div, modulo and remainder.
* re.c (rb_reg_initialize): should not allow modifying literal
regexps. frozen check moved from rb_reg_initialize_m as well.
* re.c (rb_reg_initialize): should not modify untainted objects in
safe levels higher than 3.
* re.c (rb_memcmp): type change from char* to const void*.
* dir.c (dir_close): should not close untainted dir stream.
* dir.c (GetDIR): add tainted/frozen check for each dir operation.
* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_symbol_arg):
typo fixed. a patch from Florian Gross <florg at florg.net>.
* eval.c (EXEC_EVENT_HOOK): trace_func may remove itself from
event_hooks. no guarantee for arbitrary hook deletion.
[ruby-dev:28632]
* util.c (ruby_strtod): differ addition to minimize error.
[ruby-dev:28619]
* util.c (ruby_strtod): should not raise ERANGE when the input
string does not have any digits. [ruby-dev:28629]
* eval.c (proc_invoke): should restore old ruby_frame->block.
thanks to ts <decoux at moulon.inra.fr>. [ruby-core:07833]
also fix [ruby-dev:28614] as well.
* signal.c (trap): sig should be less then NSIG. Coverity found
this bug. a patch from Kevin Tew <tewk at tewk.com>.
[ruby-core:07823]
* math.c (math_log2): add new method inspired by
[ruby-talk:191237].
* math.c (math_log): add optional base argument to Math::log().
[ruby-talk:191308]
* ext/syck/emitter.c (syck_scan_scalar): avoid accessing
uninitialized array element. a patch from Pat Eyler
<rubypate at gmail.com>. [ruby-core:07809]
* array.c (rb_ary_fill): initialize local variables first. a
patch from Pat Eyler <rubypate at gmail.com>. [ruby-core:07810]
* ext/syck/yaml2byte.c (syck_yaml2byte_handler): need to free
type_tag. a patch from Pat Eyler <rubypate at gmail.com>.
[ruby-core:07808]
* ext/socket/socket.c (make_hostent_internal): accept ai_family
check from Sam Roberts <sroberts at uniserve.com>.
[ruby-core:07691]
* util.c (ruby_strtod): should not cut off 18 digits for no
reason. [ruby-core:07796]
* array.c (rb_ary_fill): internalize local variable "beg" to
pacify Coverity. [ruby-core:07770]
* pack.c (pack_unpack): now supports CRLF newlines. a patch from
<tommy at tmtm.org>. [ruby-dev:28601]
* applied code clean-up patch from Stefan Huehner
<stefan at huehner.org>. [ruby-core:07764]
* lib/jcode.rb (String::tr_s): should have translated non
squeezing character sequence (i.e. a character) as well. thanks
to Hiroshi Ichikawa <gimite at gimite.ddo.jp> [ruby-list:42090]
* ext/socket/socket.c: document update patch from Sam Roberts
<sroberts at uniserve.com>. [ruby-core:07701]
* lib/mathn.rb (Integer): need not to remove gcd2. a patch from
NARUSE, Yui <naruse at airemix.com>. [ruby-dev:28570]
* parse.y (arg): too much NEW_LIST()
* eval.c (SETUP_ARGS0): remove unnecessary access to nd_alen.
* eval.c (rb_eval): use ARGSCAT for NODE_OP_ASGN1.
[ruby-dev:28585]
* parse.y (arg): use NODE_ARGSCAT for placeholder.
* lib/getoptlong.rb (GetoptLong::get): RDoc update patch from
mathew <meta at pobox.com>. [ruby-core:07738]
* variable.c (rb_const_set): raise error when no target klass is
supplied. [ruby-dev:28582]
* prec.c (prec_prec_f): documentation patch from
<gerardo.santana at gmail.com>. [ruby-core:07689]
* bignum.c (rb_big_pow): second operand may be too big even if
it's a Fixnum. [ruby-talk:187984]
* README.EXT: update symbol description. [ruby-talk:188104]
* COPYING: explicitly note GPLv2. [ruby-talk:187922]
* parse.y: remove some obsolete syntax rules (unparenthesized
method calls in argument list).
* eval.c (rb_call0): insecure calling should be checked for non
NODE_SCOPE method invocations too.
* eval.c (rb_alias): should preserve the current safe level as
well as method definition.
* process.c (rb_f_sleep): remove RDoc description about SIGALRM
which is not valid on the current implementation. [ruby-dev:28464]
Thu Mar 23 21:40:47 2006 K.Kosako <sndgk393 AT ybb.ne.jp>
* eval.c (method_missing): should support argument splat in
super. a bug in combination of super, splat and
method_missing. [ruby-talk:185438]
* configure.in: Solaris SunPro compiler -rapth patch from
<kuwa at labs.fujitsu.com>. [ruby-dev:28443]
* configure.in: remove enable_rpath=no for Solaris.
[ruby-dev:28440]
* ext/win32ole/win32ole.c (ole_val2olevariantdata): change behavior
of converting OLE Variant object with VT_ARRAY|VT_UI1 and Ruby
String object.
* ruby.1: a clarification patch from David Lutterkort
<dlutter at redhat.com>. [ruby-core:7508]
* lib/rdoc/ri/ri_paths.rb (RI::Paths): adding paths from rubygems
directories. a patch from Eric Hodel <drbrain at segment7.net>.
[ruby-core:07423]
* eval.c (rb_clear_cache_by_class): clearing wrong cache.
* ext/extmk.rb: use :remove_destination to install extension libraries
to avoid SEGV. [ruby-dev:28417]
* eval.c (rb_thread_fd_writable): should not re-schedule output
from KILLED thread (must be error printing).
* array.c (rb_ary_flatten_bang): allow specifying recursion
level. [ruby-talk:182170]
* array.c (rb_ary_flatten): ditto.
* gc.c (add_heap): a heap_slots may overflow. a patch from Stefan
Weil <weil at mail.berlios.de>.
* eval.c (rb_call): use separate cache for fcall/vcall
invocation.
* eval.c (rb_eval): NODE_FCALL, NODE_VCALL can call local
functions.
* eval.c (rb_mod_local): a new method to specify newly added
visibility "local".
* eval.c (search_method): search for local methods which are
visible only from the current class.
* class.c (rb_class_local_methods): a method to list local methods.
* object.c (Init_Object): add BasicObject class as a top level
BlankSlate class.
* ruby.h (SYM2ID): should not cast to signed long.
[ruby-core:07414]
* class.c (rb_include_module): allow module duplication.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10235 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2006-06-09 17:20:17 -04:00
|
|
|
echild_status(VALUE self)
|
2001-11-21 10:42:12 -05:00
|
|
|
{
|
|
|
|
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;
|
1999-08-13 01:37:52 -04:00
|
|
|
};
|
|
|
|
|
2008-12-16 06:39:17 -05:00
|
|
|
static void getDevice(int*, int*, char [DEVICELEN], int);
|
1999-08-13 01:37:52 -04:00
|
|
|
|
2001-11-21 10:42:12 -05:00
|
|
|
struct exec_info {
|
|
|
|
int argc;
|
|
|
|
VALUE *argv;
|
|
|
|
};
|
|
|
|
|
|
|
|
static VALUE
|
2006-09-16 03:21:02 -04:00
|
|
|
pty_exec(VALUE v)
|
2001-11-21 10:42:12 -05:00
|
|
|
{
|
2006-09-16 03:21:02 -04:00
|
|
|
struct exec_info *arg = (struct exec_info *)v;
|
2001-11-21 10:42:12 -05:00
|
|
|
return rb_f_exec(arg->argc, arg->argv);
|
|
|
|
}
|
|
|
|
|
2008-12-13 11:40:01 -05:00
|
|
|
struct child_info {
|
|
|
|
int master, slave;
|
2008-12-15 07:01:08 -05:00
|
|
|
char *slavename;
|
2008-12-13 11:40:01 -05:00
|
|
|
int argc;
|
|
|
|
VALUE *argv;
|
|
|
|
};
|
|
|
|
|
2008-12-15 07:02:09 -05:00
|
|
|
static int
|
2009-02-05 17:53:44 -05:00
|
|
|
chfunc(void *data)
|
2008-12-13 11:40:01 -05:00
|
|
|
{
|
|
|
|
struct child_info *carg = data;
|
|
|
|
int master = carg->master;
|
|
|
|
int slave = carg->slave;
|
|
|
|
int argc = carg->argc;
|
|
|
|
VALUE *argv = carg->argv;
|
|
|
|
|
|
|
|
struct exec_info arg;
|
|
|
|
int status;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* 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, getpid()) == -1)
|
|
|
|
rb_sys_fail("setpgrp()");
|
|
|
|
{
|
|
|
|
int i = open("/dev/tty", O_RDONLY);
|
|
|
|
if (i < 0) rb_sys_fail("/dev/tty");
|
|
|
|
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);
|
2008-12-15 07:01:08 -05:00
|
|
|
slave = open(carg->slavename, O_RDWR);
|
2008-12-13 11:40:01 -05:00
|
|
|
if (slave < 0) {
|
|
|
|
perror("open: pty slave");
|
|
|
|
_exit(1);
|
|
|
|
}
|
|
|
|
close(master);
|
|
|
|
#endif
|
|
|
|
write(slave, "", 1);
|
|
|
|
dup2(slave,0);
|
|
|
|
dup2(slave,1);
|
|
|
|
dup2(slave,2);
|
|
|
|
close(slave);
|
|
|
|
#if defined(HAVE_SETEUID) || defined(HAVE_SETREUID) || defined(HAVE_SETRESUID)
|
|
|
|
seteuid(getuid());
|
|
|
|
#endif
|
|
|
|
|
|
|
|
arg.argc = argc;
|
|
|
|
arg.argv = argv;
|
|
|
|
rb_protect(pty_exec, (VALUE)&arg, &status);
|
|
|
|
sleep(1);
|
|
|
|
_exit(1);
|
|
|
|
}
|
|
|
|
|
1999-08-13 01:37:52 -04:00
|
|
|
static void
|
2007-08-07 01:56:52 -04:00
|
|
|
establishShell(int argc, VALUE *argv, struct pty_info *info,
|
|
|
|
char SlaveName[DEVICELEN])
|
2006-09-16 03:21:02 -04:00
|
|
|
{
|
2007-06-09 23:06:15 -04:00
|
|
|
int master,slave;
|
* configure.in (pid_t, uid_t, gid_t): check if defined.
* intern.h, process.c, rubyio.h, ext/etc/etc.c, ext/pty/pty.c: use
rb_{pid,uid,gid}_t instead of plain int. [ruby-dev:30376]
* ext/etc/extconf.rb (PIDT2NUM, NUM2PIDT, UIDT2NUM, NUM2UIDT, GIDT2NUM,
NUM2GIDT): moved to configure.in.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11770 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-17 23:13:09 -05:00
|
|
|
rb_pid_t pid;
|
2007-08-07 01:58:41 -04:00
|
|
|
char *p, tmp, *getenv();
|
1999-08-13 01:37:52 -04:00
|
|
|
struct passwd *pwent;
|
2001-11-21 10:42:12 -05:00
|
|
|
VALUE v;
|
2008-12-13 11:40:01 -05:00
|
|
|
struct child_info carg;
|
2001-11-19 00:03:03 -05:00
|
|
|
|
|
|
|
if (argc == 0) {
|
2006-06-20 14:02:17 -04:00
|
|
|
const char *shellname;
|
2001-11-19 00:03:03 -05:00
|
|
|
|
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
|
|
|
}
|
|
|
|
|
2008-12-16 06:39:17 -05:00
|
|
|
getDevice(&master, &slave, SlaveName, 0);
|
1999-08-13 01:37:52 -04:00
|
|
|
|
2008-12-13 11:40:01 -05:00
|
|
|
carg.master = master;
|
|
|
|
carg.slave = slave;
|
2008-12-15 07:01:08 -05:00
|
|
|
carg.slavename = SlaveName;
|
2008-12-13 11:40:01 -05:00
|
|
|
carg.argc = argc;
|
|
|
|
carg.argv = argv;
|
2009-02-05 06:33:19 -05:00
|
|
|
pid = rb_fork(0, chfunc, &carg, Qnil);
|
1999-08-13 01:37:52 -04:00
|
|
|
|
2008-12-13 11:40:01 -05:00
|
|
|
if (pid < 0) {
|
1999-08-13 01:37:52 -04:00
|
|
|
close(master);
|
|
|
|
close(slave);
|
2008-12-13 11:40:01 -05:00
|
|
|
rb_sys_fail("fork failed");
|
1999-08-13 01:37:52 -04:00
|
|
|
}
|
|
|
|
|
2007-08-07 01:58:41 -04:00
|
|
|
read(master, &tmp, 1);
|
1999-08-13 01:37:52 -04:00
|
|
|
close(slave);
|
|
|
|
|
* configure.in (pid_t, uid_t, gid_t): check if defined.
* intern.h, process.c, rubyio.h, ext/etc/etc.c, ext/pty/pty.c: use
rb_{pid,uid,gid}_t instead of plain int. [ruby-dev:30376]
* ext/etc/extconf.rb (PIDT2NUM, NUM2PIDT, UIDT2NUM, NUM2UIDT, GIDT2NUM,
NUM2GIDT): moved to configure.in.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11770 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-17 23:13:09 -05:00
|
|
|
info->child_pid = pid;
|
1999-08-13 01:37:52 -04:00
|
|
|
info->fd = master;
|
|
|
|
}
|
|
|
|
|
2006-07-26 05:15:31 -04:00
|
|
|
static int
|
2008-12-16 06:39:17 -05:00
|
|
|
no_mesg(char *slavedevice, int nomesg)
|
|
|
|
{
|
|
|
|
if (nomesg)
|
|
|
|
return chmod(slavedevice, 0600);
|
|
|
|
else
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
get_device_once(int *master, int *slave, char SlaveName[DEVICELEN], int nomesg, int fail)
|
2006-07-26 05:15:31 -04:00
|
|
|
{
|
2008-12-16 05:49:12 -05:00
|
|
|
#if defined(HAVE_POSIX_OPENPT)
|
2008-12-16 06:39:17 -05:00
|
|
|
int masterfd = -1, slavefd = -1;
|
2008-12-16 05:49:12 -05:00
|
|
|
char *slavedevice;
|
|
|
|
struct sigaction dfl, old;
|
|
|
|
|
|
|
|
dfl.sa_handler = SIG_DFL;
|
|
|
|
dfl.sa_flags = 0;
|
|
|
|
sigemptyset(&dfl.sa_mask);
|
|
|
|
|
2008-12-16 06:39:17 -05:00
|
|
|
if ((masterfd = posix_openpt(O_RDWR|O_NOCTTY)) == -1) goto error;
|
|
|
|
if (sigaction(SIGCHLD, &dfl, &old) == -1) goto error;
|
|
|
|
if (grantpt(masterfd) == -1) goto grantpt_error;
|
|
|
|
if (sigaction(SIGCHLD, &old, NULL) == -1) goto error;
|
|
|
|
if (unlockpt(masterfd) == -1) goto error;
|
|
|
|
if ((slavedevice = ptsname(masterfd)) == NULL) goto error;
|
|
|
|
if (no_mesg(slavedevice, nomesg) == -1) goto error;
|
|
|
|
if ((slavefd = open(slavedevice, O_RDWR|O_NOCTTY, 0)) == -1) goto error;
|
|
|
|
|
2008-12-16 05:49:12 -05:00
|
|
|
#if defined I_PUSH && !defined linux
|
2008-12-16 06:39:17 -05:00
|
|
|
if (ioctl(slavefd, I_PUSH, "ptem") == -1) goto error;
|
|
|
|
if (ioctl(slavefd, I_PUSH, "ldterm") == -1) goto error;
|
|
|
|
if (ioctl(slavefd, I_PUSH, "ttcompat") == -1) goto error;
|
2008-12-16 05:49:12 -05:00
|
|
|
#endif
|
2008-12-16 06:39:17 -05:00
|
|
|
|
|
|
|
*master = masterfd;
|
|
|
|
*slave = slavefd;
|
|
|
|
strlcpy(SlaveName, slavedevice, DEVICELEN);
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
grantpt_error:
|
|
|
|
sigaction(SIGCHLD, &old, NULL);
|
|
|
|
error:
|
|
|
|
if (slavefd != -1) close(slavefd);
|
|
|
|
if (masterfd != -1) close(masterfd);
|
|
|
|
if (!fail) {
|
|
|
|
rb_raise(rb_eRuntimeError, "can't get Master/Slave device");
|
2008-12-16 05:49:12 -05:00
|
|
|
}
|
|
|
|
return -1;
|
|
|
|
#elif defined HAVE_OPENPTY
|
1999-08-13 01:37:52 -04:00
|
|
|
/*
|
|
|
|
* Use openpty(3) of 4.3BSD Reno and later,
|
|
|
|
* or the same interface function.
|
|
|
|
*/
|
|
|
|
if (openpty(master, slave, SlaveName,
|
|
|
|
(struct termios *)0, (struct winsize *)0) == -1) {
|
2006-07-26 05:15:31 -04:00
|
|
|
if (!fail) return -1;
|
1999-08-13 01:37:52 -04:00
|
|
|
rb_raise(rb_eRuntimeError, "openpty() failed");
|
|
|
|
}
|
2008-12-17 05:38:19 -05:00
|
|
|
if (no_mesg(SlaveName, nomesg) == -1) {
|
2008-12-16 06:39:17 -05:00
|
|
|
if (!fail) return -1;
|
|
|
|
rb_raise(rb_eRuntimeError, "can't chmod slave pty");
|
|
|
|
}
|
2006-07-26 05:15:31 -04:00
|
|
|
|
|
|
|
return 0;
|
2008-12-16 06:39:17 -05:00
|
|
|
|
2006-07-26 05:15:31 -04:00
|
|
|
#elif defined HAVE__GETPTY
|
1999-08-13 01:37:52 -04:00
|
|
|
char *name;
|
2008-12-16 06:39:17 -05:00
|
|
|
mode_t mode = nomesg ? 0600 : 0622;
|
1999-08-13 01:37:52 -04:00
|
|
|
|
2008-12-16 06:39:17 -05:00
|
|
|
if (!(name = _getpty(master, O_RDWR, mode, 0))) {
|
2006-07-26 05:15:31 -04:00
|
|
|
if (!fail) return -1;
|
1999-08-13 01:37:52 -04:00
|
|
|
rb_raise(rb_eRuntimeError, "_getpty() failed");
|
|
|
|
}
|
|
|
|
|
|
|
|
*slave = open(name, O_RDWR);
|
2008-12-15 07:25:03 -05:00
|
|
|
strlcpy(SlaveName, name, DEVICELEN);
|
2006-07-26 05:15:31 -04:00
|
|
|
|
|
|
|
return 0;
|
2008-12-16 05:49:12 -05:00
|
|
|
#elif defined(HAVE_PTSNAME)
|
2008-12-16 06:39:17 -05:00
|
|
|
int masterfd = -1, slavefd = -1;
|
|
|
|
char *slavedevice;
|
1999-08-13 01:37:52 -04:00
|
|
|
void (*s)();
|
|
|
|
|
|
|
|
extern char *ptsname(int);
|
|
|
|
extern int unlockpt(int);
|
|
|
|
extern int grantpt(int);
|
|
|
|
|
2008-12-16 06:39:17 -05:00
|
|
|
if((masterfd = open("/dev/ptmx", O_RDWR, 0)) == -1) goto error;
|
|
|
|
s = signal(SIGCHLD, SIG_DFL);
|
|
|
|
if(grantpt(masterfd) == -1) goto error;
|
|
|
|
signal(SIGCHLD, s);
|
|
|
|
if(unlockpt(masterfd) == -1) goto error;
|
|
|
|
if((slavedevice = ptsname(masterfd)) == NULL) goto error;
|
|
|
|
if (no_mesg(slavedevice, nomesg) == -1) goto error;
|
|
|
|
if((slavefd = open(slavedevice, O_RDWR, 0)) == -1) goto error;
|
2001-11-27 05:00:35 -05:00
|
|
|
#if defined I_PUSH && !defined linux
|
2008-12-16 06:39:17 -05:00
|
|
|
if(ioctl(slavefd, I_PUSH, "ptem") == -1) goto error;
|
|
|
|
if(ioctl(slavefd, I_PUSH, "ldterm") == -1) goto error;
|
|
|
|
ioctl(slavefd, I_PUSH, "ttcompat");
|
1999-08-13 01:37:52 -04:00
|
|
|
#endif
|
2008-12-16 06:39:17 -05:00
|
|
|
*master = masterfd;
|
|
|
|
*slave = slavefd;
|
|
|
|
strlcpy(SlaveName, slavedevice, DEVICELEN);
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
error:
|
|
|
|
if (slavefd != -1) close(slavefd);
|
|
|
|
if (masterfd != -1) close(masterfd);
|
2006-07-26 05:15:31 -04:00
|
|
|
if (!fail) rb_raise(rb_eRuntimeError, "can't get Master/Slave device");
|
|
|
|
return -1;
|
1999-08-13 01:37:52 -04:00
|
|
|
#else
|
2008-12-16 06:39:17 -05:00
|
|
|
int masterfd = -1, slavefd = -1;
|
2008-07-12 17:57:11 -04:00
|
|
|
const char *const *p;
|
2003-12-10 21:39:59 -05:00
|
|
|
char MasterName[DEVICELEN];
|
|
|
|
|
1999-08-13 01:37:52 -04:00
|
|
|
for (p = deviceNo; *p != NULL; p++) {
|
2007-08-07 01:56:52 -04:00
|
|
|
snprintf(MasterName, sizeof MasterName, MasterDevice, *p);
|
2008-12-16 06:39:17 -05:00
|
|
|
if ((masterfd = open(MasterName,O_RDWR,0)) >= 0) {
|
|
|
|
*master = masterfd;
|
2008-12-15 07:25:03 -05:00
|
|
|
snprintf(SlaveName, DEVICELEN, SlaveDevice, *p);
|
2008-12-16 06:39:17 -05:00
|
|
|
if ((slavefd = open(SlaveName,O_RDWR,0)) >= 0) {
|
|
|
|
*slave = slavefd;
|
|
|
|
if (chown(SlaveName, getuid(), getgid()) != 0) goto error;
|
|
|
|
if (chmod(SlaveName, nomesg ? 0600 : 0622) != 0) goto error;
|
2006-07-26 05:15:31 -04:00
|
|
|
return 0;
|
1999-08-13 01:37:52 -04:00
|
|
|
}
|
2008-12-16 06:39:17 -05:00
|
|
|
close(masterfd);
|
1999-08-13 01:37:52 -04:00
|
|
|
}
|
|
|
|
}
|
2008-12-16 06:39:17 -05:00
|
|
|
error:
|
|
|
|
if (slavefd != -1) close(slavefd);
|
|
|
|
if (masterfd != -1) close(masterfd);
|
2006-07-26 05:15:31 -04:00
|
|
|
if (fail) rb_raise(rb_eRuntimeError, "can't get %s", SlaveName);
|
|
|
|
return -1;
|
1999-08-13 01:37:52 -04:00
|
|
|
#endif
|
2006-07-26 05:15:31 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2008-12-16 06:39:17 -05:00
|
|
|
getDevice(int *master, int *slave, char SlaveName[DEVICELEN], int nomesg)
|
2006-07-26 05:15:31 -04:00
|
|
|
{
|
2008-12-16 06:39:17 -05:00
|
|
|
if (get_device_once(master, slave, SlaveName, nomesg, 0)) {
|
2006-07-26 05:15:31 -04:00
|
|
|
rb_gc();
|
2008-12-16 06:39:17 -05:00
|
|
|
get_device_once(master, slave, SlaveName, nomesg, 1);
|
2006-07-26 05:15:31 -04:00
|
|
|
}
|
1999-08-13 01:37:52 -04:00
|
|
|
}
|
|
|
|
|
2008-12-15 08:48:51 -05:00
|
|
|
static VALUE
|
|
|
|
pty_close_pty(VALUE assoc)
|
|
|
|
{
|
|
|
|
VALUE io;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < 2; i++) {
|
|
|
|
io = rb_ary_entry(assoc, i);
|
|
|
|
if (TYPE(io) == T_FILE && 0 <= RFILE(io)->fptr->fd)
|
|
|
|
rb_io_close(io);
|
|
|
|
}
|
|
|
|
return Qnil;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
2009-05-22 08:32:30 -04:00
|
|
|
* PTY.open => [master_io, slave_file]
|
|
|
|
* PTY.open {|master_io, slave_file| ... } => block value
|
2008-12-15 08:48:51 -05:00
|
|
|
*
|
|
|
|
* Allocates a pty (pseudo-terminal).
|
|
|
|
*
|
|
|
|
* It returns an array which contains an IO object and a File object.
|
|
|
|
* The former is the master of the pty.
|
|
|
|
* The latter is the slave of the pty.
|
|
|
|
*
|
|
|
|
* If a block is given, it yields the array instead of return.
|
|
|
|
* The value of the block is returned.
|
|
|
|
* master_io and slave_file is closed when return if they are not closed.
|
|
|
|
*
|
2009-05-22 08:32:30 -04:00
|
|
|
* The path name of the terminal device can be gotten by slave_file.path.
|
2008-12-18 09:33:31 -05:00
|
|
|
*
|
|
|
|
* PTY.open {|m, s|
|
|
|
|
* p m #=> #<IO: pty /dev/pts/1>
|
|
|
|
* p s #=> #<File:/dev/pts/1>
|
|
|
|
* p s.path #=> "/dev/pts/1"
|
|
|
|
* }
|
2008-12-17 05:38:19 -05:00
|
|
|
*
|
2008-12-17 10:48:22 -05:00
|
|
|
* # Change the buffering type in factor command,
|
2008-12-18 09:33:31 -05:00
|
|
|
* # assuming that factor uses stdio for stdout buffering.
|
2008-12-17 10:48:22 -05:00
|
|
|
* # If IO.pipe is used instead of PTY.open,
|
2008-12-18 09:33:31 -05:00
|
|
|
* # this code deadlocks because factor's stdout is fully buffered.
|
2008-12-17 10:48:22 -05:00
|
|
|
* m, s = PTY.open
|
2008-12-17 05:38:19 -05:00
|
|
|
* system("stty raw", :in=>s) # disable newline conversion.
|
|
|
|
* r, w = IO.pipe
|
2008-12-17 10:48:22 -05:00
|
|
|
* pid = spawn("factor", :in=>r, :out=>s)
|
2008-12-17 05:38:19 -05:00
|
|
|
* r.close
|
|
|
|
* s.close
|
2008-12-17 10:48:22 -05:00
|
|
|
* w.puts "42"
|
|
|
|
* p m.gets #=> "42: 2 3 7\n"
|
|
|
|
* w.puts "144"
|
|
|
|
* p m.gets #=> "144: 2 2 2 2 3 3\n"
|
2008-12-17 05:38:19 -05:00
|
|
|
*
|
2008-12-15 08:48:51 -05:00
|
|
|
*/
|
|
|
|
static VALUE
|
|
|
|
pty_open(VALUE klass)
|
|
|
|
{
|
|
|
|
int master_fd, slave_fd;
|
|
|
|
char slavename[DEVICELEN];
|
|
|
|
VALUE master_io, slave_file;
|
|
|
|
rb_io_t *master_fptr, *slave_fptr;
|
|
|
|
VALUE assoc;
|
|
|
|
|
2008-12-16 06:39:17 -05:00
|
|
|
getDevice(&master_fd, &slave_fd, slavename, 1);
|
2008-12-15 08:48:51 -05:00
|
|
|
|
|
|
|
master_io = rb_obj_alloc(rb_cIO);
|
|
|
|
MakeOpenFile(master_io, master_fptr);
|
2008-12-15 09:35:00 -05:00
|
|
|
master_fptr->mode = FMODE_READWRITE | FMODE_SYNC | FMODE_DUPLEX;
|
2008-12-15 08:48:51 -05:00
|
|
|
master_fptr->fd = master_fd;
|
|
|
|
master_fptr->pathv = rb_obj_freeze(rb_sprintf(" pty %s", slavename));
|
|
|
|
|
|
|
|
slave_file = rb_obj_alloc(rb_cFile);
|
|
|
|
MakeOpenFile(slave_file, slave_fptr);
|
2008-12-15 09:35:00 -05:00
|
|
|
slave_fptr->mode = FMODE_READWRITE | FMODE_SYNC | FMODE_DUPLEX | FMODE_TTY;
|
2008-12-15 08:48:51 -05:00
|
|
|
slave_fptr->fd = slave_fd;
|
|
|
|
slave_fptr->pathv = rb_obj_freeze(rb_str_new_cstr(slavename));
|
|
|
|
|
|
|
|
assoc = rb_assoc_new(master_io, slave_file);
|
|
|
|
if (rb_block_given_p()) {
|
|
|
|
return rb_ensure(rb_yield, assoc, pty_close_pty, assoc);
|
|
|
|
}
|
|
|
|
return assoc;
|
|
|
|
}
|
|
|
|
|
2008-11-21 13:45:01 -05:00
|
|
|
static VALUE
|
|
|
|
pty_detach_process(struct pty_info *info)
|
|
|
|
{
|
|
|
|
rb_detach_process(info->child_pid);
|
|
|
|
return Qnil;
|
|
|
|
}
|
|
|
|
|
2009-06-26 09:01:16 -04:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* PTY.spawn(command...) {|r, w, pid| ... } => nil
|
|
|
|
* PTY.spawn(command...) => r, w, pid
|
|
|
|
* PTY.getpty(command...) {|r, w, pid| ... } => nil
|
|
|
|
* PTY.getpty(command...) => r, w, pid
|
|
|
|
*
|
|
|
|
* spawns the specified command on a newly allocated pty.
|
|
|
|
*
|
|
|
|
* The command's controlling tty is set to the slave device of the pty.
|
|
|
|
* Also its standard input/output/error is redirected to the slave device.
|
|
|
|
*
|
|
|
|
* PTY.spawn returns two IO objects and PID.
|
|
|
|
* PID is the process ID of the command.
|
|
|
|
* The two IO objects are connected to the master device of the pty.
|
|
|
|
* The first IO object is opened as read mode and
|
|
|
|
* The second is opened as write mode.
|
|
|
|
*
|
|
|
|
* If a block is given, two IO objects and PID is yielded.
|
|
|
|
*
|
|
|
|
*/
|
1999-08-13 01:37:52 -04:00
|
|
|
static VALUE
|
* sprintf.c (rb_str_format): allow %c to print one character
string (e.g. ?x).
* lib/tempfile.rb (Tempfile::make_tmpname): put dot between
basename and pid. [ruby-talk:196272]
* parse.y (do_block): remove -> style block.
* parse.y (parser_yylex): remove tLAMBDA_ARG.
* eval.c (rb_call0): binding for the return event hook should have
consistent scope. [ruby-core:07928]
* eval.c (proc_invoke): return behavior should depend whether it
is surrounded by a lambda or a mere block.
* eval.c (formal_assign): handles post splat arguments.
* eval.c (rb_call0): ditto.
* st.c (strhash): use FNV-1a hash.
* parse.y (parser_yylex): removed experimental ';;' terminator.
* eval.c (rb_node_arity): should be aware of post splat arguments.
* eval.c (rb_proc_arity): ditto.
* parse.y (f_args): syntax rule enhanced to support arguments
after the splat.
* parse.y (block_param): ditto for block parameters.
* parse.y (f_post_arg): mandatory formal arguments after the splat
argument.
* parse.y (new_args_gen): generate nodes for mandatory formal
arguments after the splat argument.
* eval.c (rb_eval): dispatch mandatory formal arguments after the
splat argument.
* parse.y (args): allow more than one splat in the argument list.
* parse.y (method_call): allow aref [] to accept all kind of
method argument, including assocs, splat, and block argument.
* eval.c (SETUP_ARGS0): prepare block argument as well.
* lib/mathn.rb (Integer): remove Integer#gcd2. [ruby-core:07931]
* eval.c (error_line): print receivers true/false/nil specially.
* eval.c (rb_proc_yield): handles parameters in yield semantics.
* eval.c (nil_yield): gives LocalJumpError to denote no block
error.
* io.c (rb_io_getc): now takes one-character string.
* string.c (rb_str_hash): use FNV-1a hash from Fowler/Noll/Vo
hashing algorithm.
* string.c (rb_str_aref): str[0] now returns 1 character string,
instead of a fixnum. [Ruby2]
* parse.y (parser_yylex): ?c now returns 1 character string,
instead of a fixnum. [Ruby2]
* string.c (rb_str_aset): no longer support fixnum insertion.
* eval.c (umethod_bind): should not update original class.
[ruby-dev:28636]
* eval.c (ev_const_get): should support constant access from
within instance_eval(). [ruby-dev:28327]
* time.c (time_timeval): should round for usec floating
number. [ruby-core:07896]
* time.c (time_add): ditto.
* dir.c (sys_warning): should not call a vararg function
rb_sys_warning() indirectly. [ruby-core:07886]
* numeric.c (flo_divmod): the first element of Float#divmod should
be an integer. [ruby-dev:28589]
* test/ruby/test_float.rb: add tests for divmod, div, modulo and remainder.
* re.c (rb_reg_initialize): should not allow modifying literal
regexps. frozen check moved from rb_reg_initialize_m as well.
* re.c (rb_reg_initialize): should not modify untainted objects in
safe levels higher than 3.
* re.c (rb_memcmp): type change from char* to const void*.
* dir.c (dir_close): should not close untainted dir stream.
* dir.c (GetDIR): add tainted/frozen check for each dir operation.
* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_symbol_arg):
typo fixed. a patch from Florian Gross <florg at florg.net>.
* eval.c (EXEC_EVENT_HOOK): trace_func may remove itself from
event_hooks. no guarantee for arbitrary hook deletion.
[ruby-dev:28632]
* util.c (ruby_strtod): differ addition to minimize error.
[ruby-dev:28619]
* util.c (ruby_strtod): should not raise ERANGE when the input
string does not have any digits. [ruby-dev:28629]
* eval.c (proc_invoke): should restore old ruby_frame->block.
thanks to ts <decoux at moulon.inra.fr>. [ruby-core:07833]
also fix [ruby-dev:28614] as well.
* signal.c (trap): sig should be less then NSIG. Coverity found
this bug. a patch from Kevin Tew <tewk at tewk.com>.
[ruby-core:07823]
* math.c (math_log2): add new method inspired by
[ruby-talk:191237].
* math.c (math_log): add optional base argument to Math::log().
[ruby-talk:191308]
* ext/syck/emitter.c (syck_scan_scalar): avoid accessing
uninitialized array element. a patch from Pat Eyler
<rubypate at gmail.com>. [ruby-core:07809]
* array.c (rb_ary_fill): initialize local variables first. a
patch from Pat Eyler <rubypate at gmail.com>. [ruby-core:07810]
* ext/syck/yaml2byte.c (syck_yaml2byte_handler): need to free
type_tag. a patch from Pat Eyler <rubypate at gmail.com>.
[ruby-core:07808]
* ext/socket/socket.c (make_hostent_internal): accept ai_family
check from Sam Roberts <sroberts at uniserve.com>.
[ruby-core:07691]
* util.c (ruby_strtod): should not cut off 18 digits for no
reason. [ruby-core:07796]
* array.c (rb_ary_fill): internalize local variable "beg" to
pacify Coverity. [ruby-core:07770]
* pack.c (pack_unpack): now supports CRLF newlines. a patch from
<tommy at tmtm.org>. [ruby-dev:28601]
* applied code clean-up patch from Stefan Huehner
<stefan at huehner.org>. [ruby-core:07764]
* lib/jcode.rb (String::tr_s): should have translated non
squeezing character sequence (i.e. a character) as well. thanks
to Hiroshi Ichikawa <gimite at gimite.ddo.jp> [ruby-list:42090]
* ext/socket/socket.c: document update patch from Sam Roberts
<sroberts at uniserve.com>. [ruby-core:07701]
* lib/mathn.rb (Integer): need not to remove gcd2. a patch from
NARUSE, Yui <naruse at airemix.com>. [ruby-dev:28570]
* parse.y (arg): too much NEW_LIST()
* eval.c (SETUP_ARGS0): remove unnecessary access to nd_alen.
* eval.c (rb_eval): use ARGSCAT for NODE_OP_ASGN1.
[ruby-dev:28585]
* parse.y (arg): use NODE_ARGSCAT for placeholder.
* lib/getoptlong.rb (GetoptLong::get): RDoc update patch from
mathew <meta at pobox.com>. [ruby-core:07738]
* variable.c (rb_const_set): raise error when no target klass is
supplied. [ruby-dev:28582]
* prec.c (prec_prec_f): documentation patch from
<gerardo.santana at gmail.com>. [ruby-core:07689]
* bignum.c (rb_big_pow): second operand may be too big even if
it's a Fixnum. [ruby-talk:187984]
* README.EXT: update symbol description. [ruby-talk:188104]
* COPYING: explicitly note GPLv2. [ruby-talk:187922]
* parse.y: remove some obsolete syntax rules (unparenthesized
method calls in argument list).
* eval.c (rb_call0): insecure calling should be checked for non
NODE_SCOPE method invocations too.
* eval.c (rb_alias): should preserve the current safe level as
well as method definition.
* process.c (rb_f_sleep): remove RDoc description about SIGALRM
which is not valid on the current implementation. [ruby-dev:28464]
Thu Mar 23 21:40:47 2006 K.Kosako <sndgk393 AT ybb.ne.jp>
* eval.c (method_missing): should support argument splat in
super. a bug in combination of super, splat and
method_missing. [ruby-talk:185438]
* configure.in: Solaris SunPro compiler -rapth patch from
<kuwa at labs.fujitsu.com>. [ruby-dev:28443]
* configure.in: remove enable_rpath=no for Solaris.
[ruby-dev:28440]
* ext/win32ole/win32ole.c (ole_val2olevariantdata): change behavior
of converting OLE Variant object with VT_ARRAY|VT_UI1 and Ruby
String object.
* ruby.1: a clarification patch from David Lutterkort
<dlutter at redhat.com>. [ruby-core:7508]
* lib/rdoc/ri/ri_paths.rb (RI::Paths): adding paths from rubygems
directories. a patch from Eric Hodel <drbrain at segment7.net>.
[ruby-core:07423]
* eval.c (rb_clear_cache_by_class): clearing wrong cache.
* ext/extmk.rb: use :remove_destination to install extension libraries
to avoid SEGV. [ruby-dev:28417]
* eval.c (rb_thread_fd_writable): should not re-schedule output
from KILLED thread (must be error printing).
* array.c (rb_ary_flatten_bang): allow specifying recursion
level. [ruby-talk:182170]
* array.c (rb_ary_flatten): ditto.
* gc.c (add_heap): a heap_slots may overflow. a patch from Stefan
Weil <weil at mail.berlios.de>.
* eval.c (rb_call): use separate cache for fcall/vcall
invocation.
* eval.c (rb_eval): NODE_FCALL, NODE_VCALL can call local
functions.
* eval.c (rb_mod_local): a new method to specify newly added
visibility "local".
* eval.c (search_method): search for local methods which are
visible only from the current class.
* class.c (rb_class_local_methods): a method to list local methods.
* object.c (Init_Object): add BasicObject class as a top level
BlankSlate class.
* ruby.h (SYM2ID): should not cast to signed long.
[ruby-core:07414]
* class.c (rb_include_module): allow module duplication.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10235 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2006-06-09 17:20:17 -04:00
|
|
|
pty_getpty(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;
|
* file.c, gc.c, io.c, ruby.h, rubyio.h, win32/win32.h (rb_io_t):
renamed from OpenFile.
* ext/dl/cptr.c, ext/io/wait/wait.c, ext/openssl/ossl.h,
ext/openssl/ossl_bio.c, ext/openssl/ossl_ssl.c, ext/pty/pty.c,
ext/readline/readline.c, ext/socket/socket.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11869 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-24 05:30:50 -05:00
|
|
|
rb_io_t *wfptr,*rfptr;
|
2001-10-03 03:19:19 -04:00
|
|
|
VALUE rport = rb_obj_alloc(rb_cFile);
|
|
|
|
VALUE wport = rb_obj_alloc(rb_cFile);
|
2007-08-07 01:56:52 -04:00
|
|
|
char SlaveName[DEVICELEN];
|
2006-09-16 03:21:02 -04:00
|
|
|
|
1999-08-13 01:37:52 -04:00
|
|
|
MakeOpenFile(rport, rfptr);
|
|
|
|
MakeOpenFile(wport, wfptr);
|
|
|
|
|
2007-08-07 01:56:52 -04:00
|
|
|
establishShell(argc, argv, &info, SlaveName);
|
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;
|
2008-08-22 21:49:56 -04:00
|
|
|
rfptr->pathv = rb_obj_freeze(rb_str_new_cstr(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);
|
2009-06-26 09:01:16 -04:00
|
|
|
if (wfptr->fd == -1)
|
|
|
|
rb_sys_fail("dup()");
|
2008-08-22 21:49:56 -04:00
|
|
|
wfptr->pathv = rfptr->pathv;
|
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);
|
* configure.in (pid_t, uid_t, gid_t): check if defined.
* intern.h, process.c, rubyio.h, ext/etc/etc.c, ext/pty/pty.c: use
rb_{pid,uid,gid}_t instead of plain int. [ruby-dev:30376]
* ext/etc/extconf.rb (PIDT2NUM, NUM2PIDT, UIDT2NUM, NUM2UIDT, GIDT2NUM,
NUM2GIDT): moved to configure.in.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11770 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-17 23:13:09 -05:00
|
|
|
rb_ary_store(res,2,PIDT2NUM(info.child_pid));
|
1999-08-13 01:37:52 -04:00
|
|
|
|
2000-05-24 00:34:26 -04:00
|
|
|
if (rb_block_given_p()) {
|
2008-11-21 13:45:01 -05:00
|
|
|
rb_ensure(rb_yield, res, pty_detach_process, (VALUE)&info);
|
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
|
|
|
}
|
|
|
|
|
2008-11-21 13:45:01 -05:00
|
|
|
static void
|
|
|
|
raise_from_check(pid_t pid, int status)
|
1999-08-13 01:37:52 -04:00
|
|
|
{
|
2008-11-21 13:45:01 -05:00
|
|
|
const char *state;
|
|
|
|
char buf[1024];
|
|
|
|
VALUE exc;
|
|
|
|
|
|
|
|
#if defined(WIFSTOPPED)
|
|
|
|
#elif defined(IF_STOPPED)
|
|
|
|
#define WIFSTOPPED(status) IF_STOPPED(status)
|
|
|
|
#else
|
|
|
|
---->> Either IF_STOPPED or WIFSTOPPED is needed <<----
|
|
|
|
#endif /* WIFSTOPPED | IF_STOPPED */
|
|
|
|
if (WIFSTOPPED(status)) { /* suspend */
|
|
|
|
state = "stopped";
|
|
|
|
}
|
|
|
|
else if (kill(pid, 0) == 0) {
|
|
|
|
state = "changed";
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
state = "exited";
|
|
|
|
}
|
|
|
|
snprintf(buf, sizeof(buf), "pty - %s: %ld", state, (long)pid);
|
|
|
|
exc = rb_exc_new2(eChildExited, buf);
|
|
|
|
rb_iv_set(exc, "status", rb_last_status_get());
|
|
|
|
rb_exc_raise(exc);
|
1999-08-13 01:37:52 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
2008-11-21 13:45:01 -05:00
|
|
|
pty_check(int argc, VALUE *argv, VALUE self)
|
1999-08-13 01:37:52 -04:00
|
|
|
{
|
2008-11-21 13:45:01 -05:00
|
|
|
VALUE pid, exc;
|
|
|
|
pid_t cpid;
|
|
|
|
int status;
|
|
|
|
|
|
|
|
rb_scan_args(argc, argv, "11", &pid, &exc);
|
|
|
|
cpid = rb_waitpid(NUM2PIDT(pid), &status, WUNTRACED);
|
|
|
|
if (cpid == -1) return Qnil;
|
|
|
|
|
|
|
|
if (!RTEST(exc)) return status;
|
|
|
|
raise_from_check(pid, status);
|
|
|
|
return Qnil; /* not reached */
|
1999-08-13 01:37:52 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
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);
|
2008-12-02 12:05:46 -05:00
|
|
|
rb_define_singleton_method(cPTY,"check",pty_check,-1);
|
2008-12-15 08:48:51 -05:00
|
|
|
rb_define_singleton_method(cPTY,"open",pty_open,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
|
|
|
}
|