[前][次][番号順一覧][スレッド一覧]

ruby-changes:55496

From: git <ko1@a...>
Date: Tue, 23 Apr 2019 17:49:51 +0900 (JST)
Subject: [ruby-changes:55496] git:27f0ce42c3 (ruby_1_6): * 2019-04-23

git	2019-04-23 10:41:14 +0900 (Tue, 23 Apr 2019)

  New Revision: 27f0ce42c3

  https://git.ruby-lang.org/ruby.git/commit/?id=27f0ce42c3

  Log:
    * 2019-04-23

  Modified files:
    version.h
Index: v1_1r/ruby.c
===================================================================
--- v1_1r/ruby.c	(revision 26)
+++ v1_1r/ruby.c	(revision 27)
@@ -475,7 +475,7 @@ load_file(fname, script) https://github.com/ruby/ruby/blob/trunk/v1_1r/ruby.c#L475
 		    char *path;
 		    char *pend = RSTRING(line)->ptr + RSTRING(line)->len;
 
-		    p = RSTRING(line)->ptr + 2;	/* skip `#!' */
+		    p = RSTRING(line)->ptr + 1;	/* skip `#!' */
 		    if (pend[-1] == '\n') pend--; /* chomp line */
 		    if (pend[-1] == '\r') pend--;
 		    *pend = '\0';
Index: v1_1r/process.c
===================================================================
--- v1_1r/process.c	(revision 26)
+++ v1_1r/process.c	(revision 27)
@@ -579,6 +579,7 @@ rb_syswait(pid) https://github.com/ruby/ruby/blob/trunk/v1_1r/process.c#L579
 {
     RETSIGTYPE (*hfunc)(), (*qfunc)(), (*ifunc)();
     int status;
+    int i;
 
 #ifdef SIGHUP
     hfunc = signal(SIGHUP, SIG_IGN);
@@ -588,7 +589,9 @@ rb_syswait(pid) https://github.com/ruby/ruby/blob/trunk/v1_1r/process.c#L589
 #endif
     ifunc = signal(SIGINT, SIG_IGN);
 
-    if (rb_waitpid(pid, 0, &status) < 0) rb_sys_fail("wait");
+    do {
+	i = rb_waitpid(pid, 0, &status);
+    } while (i == -1 && errno == EINTR);
 
 #ifdef SIGHUP
     signal(SIGHUP, hfunc);
Index: v1_1r/ChangeLog
===================================================================
--- v1_1r/ChangeLog	(revision 26)
+++ v1_1r/ChangeLog	(revision 27)
@@ -1,3 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/v1_1r/ChangeLog#L1
+Mon Jan 19 16:30:05 1998  Yukihiro Matsumoto  <matz@n...>
+
+	* process.c (rb_syswait): no exception raised.
+
 Fri Jan 16 00:43:43 1998  Yukihiro Matsumoto  <matz@n...>
 
 	* ruby.h (CLONESETUP): copies its singleton classes too.
Index: v1_1r/version.h
===================================================================
--- v1_1r/version.h	(revision 26)
+++ v1_1r/version.h	(revision 27)
@@ -1,2 +1,2 @@ https://github.com/ruby/ruby/blob/trunk/v1_1r/version.h#L1
 #define RUBY_VERSION "1.1b5"
-#define VERSION_DATE "98/01/16"
+#define VERSION_DATE "98/01/19"

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]