diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2000-02-08 08:54:01 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2000-02-08 08:54:01 +0000 |
| commit | e9bdbbdb755ee451302c3d834ad20f77d80754f0 (patch) | |
| tree | 8cb36dd73ebbf3f35093283babb3838cc88a97bc /ext | |
| parent | c0228ba5567253cca38bf671f0df51b247de2a8c (diff) | |
2000-02-08
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_4@616 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/extmk.rb.in | 2 | ||||
| -rw-r--r-- | ext/pty/pty.c | 2 | ||||
| -rw-r--r-- | ext/socket/socket.c | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/ext/extmk.rb.in b/ext/extmk.rb.in index 3e3ec3992e..20da2a4e47 100644 --- a/ext/extmk.rb.in +++ b/ext/extmk.rb.in @@ -500,7 +500,7 @@ def extmake(target) $objs = nil $local_flags = "" case RUBY_PLATFORM - when /cygwin|beos|openstep|nextstep|rhapsody/ + when /cygwin|beos|openstep|nextstep|rhapsody|i386-os2_emx/ $libs = "" when /mswin32/ $LIBEXT = "lib" diff --git a/ext/pty/pty.c b/ext/pty/pty.c index 98be9044b7..b8c4e9acae 100644 --- a/ext/pty/pty.c +++ b/ext/pty/pty.c @@ -282,7 +282,9 @@ establishShell(shellname, info) dup2(slave,2); close(slave); +#if defined(HAVE_SETEUID) || defined(HAVE_SETREUID) || defined(HAVE_SETRESUID) seteuid(getuid()); +#endif argc = 0; for (i = 0; shellname[i];) { diff --git a/ext/socket/socket.c b/ext/socket/socket.c index 108b94b603..ce5b12dfc2 100644 --- a/ext/socket/socket.c +++ b/ext/socket/socket.c @@ -391,8 +391,8 @@ s_recv(sock, argc, argv, from) GetOpenFile(sock, fptr); fd = fileno(fptr->f); rb_thread_wait_fd(fd); - TRAP_BEG; retry: + TRAP_BEG; RSTRING(str)->len = recvfrom(fd, RSTRING(str)->ptr, RSTRING(str)->len, flags, (struct sockaddr*)buf, &alen); TRAP_END; |