[ruby-dev:10652] Forward: patches for mktemp -> mkstemp

　knu です。

　昨日 Ruby の FreeBSD port を 1.4.6 にアップデートしたところ、
Ruby に興味を持ちはじめてくれた FreeBSD デベロッパーのひとりが、
mktemp() を使わずに mkstemp() を使うようにするパッチを送ってくれ
ました。(参考までにメールを添付します)


　ところが、 HEAD の該当部分を見てみたところすでに mktemp() は
なくなっているようです。その変更を ruby_1_4 ブランチへマージして
いただけるとうれしいのですが、マージの予定はありますでしょうか？

-- 
                           /
                          /__  __       
                         / )  )  ) )  /
Akinori -Aki- MUSHA aka / (_ /  ( (__(  @ idaemons.org / FreeBSD.org

"We're only at home when we're on the run, on the wing, on the fly"
Delivered-To: [e-mail]
Date: Fri, 18 Aug 2000 15:28:43 +0200
From: Ollivier Robert <[e-mail]>
To: [e-mail]
Subject: patches for mktemp -> mkstemp
Message-ID: <[e-mail]>
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="45Z9DzgjV8m4Oswq"
Content-Disposition: inline
User-Agent: Mutt/1.2i
X-Operating-System: FreeBSD 5.0-CURRENT


--45Z9DzgjV8m4Oswq
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

Here are my patches, if you can get them integrated, it would be nice.

Enjoy!
-- 
Ollivier ROBERT -=- Eurocontrol EEC/ITM -=- [e-mail]
The Postman hits! The Postman hits! You have new mail.

--45Z9DzgjV8m4Oswq
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename=patch-aa

--- ruby.c.old	Mon Jul 31 11:20:15 2000
+++ ruby.c	Fri Aug 18 13:46:07 2000
@@ -345,12 +345,8 @@
 	    }
 	    if (!e_fp) {
 		int fd;
-		e_tmpname = ruby_mktemp();
-		if (!e_tmpname) rb_fatal("Can't mktemp");
-		fd = open(e_tmpname, O_CREAT|O_EXCL|O_RDWR, 0600);
-		if (fd < 0) {
-		    rb_fatal("Cannot open temporary file: %s", e_tmpname);
-		}
+		fd = ruby_mkstemp(&e_tmpname);
+		if (fd < 0) rb_fatal("Can't mkstemp for %s", e_tmpname);
 		e_fp = fdopen(fd, "w");
 		if (!e_fp) {
 		    rb_fatal("Cannot open temporary file: %s", e_tmpname);

--45Z9DzgjV8m4Oswq
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename=patch-ab

--- util.c.old	Mon Jan 17 09:24:14 2000
+++ util.c	Fri Aug 18 13:45:57 2000
@@ -20,7 +20,7 @@
 #include "ruby.h"
 
 #ifdef USE_CWGUSI
-extern char* mktemp(char*);
+extern char* mkstemp(char*);
 #endif
 
 VALUE
@@ -138,22 +138,22 @@
     return dir;
 }
 
-char *
-ruby_mktemp()
+int
+ruby_mkstemp(file)
+	char **file;
 {
+	int fd;
     char *dir;
-    char *buf;
 
     dir = check_dir(getenv("TMP"));
     if (!dir) dir = check_dir(getenv("TMPDIR"));
     if (!dir) dir = "/tmp";
 
-    buf = ALLOC_N(char,strlen(dir)+10);
-    sprintf(buf, "%s/rbXXXXXX", dir);
-    dir = mktemp(buf);
-    if (dir == NULL) free(buf);
+    *file = ALLOC_N(char,strlen(dir)+10);
+    sprintf(*file, "%s/rbXXXXXX", dir);
+    fd = mkstemp(*file);
 
-    return dir;
+    return fd;
 }
 
 #if defined(MSDOS) || defined(__CYGWIN32__) || defined(NT)

--45Z9DzgjV8m4Oswq
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename=patch-ac

--- util.h.old	Mon Jan 17 09:24:15 2000
+++ util.h	Fri Aug 18 13:46:45 2000
@@ -35,7 +35,7 @@
 #define add_suffix ruby_add_suffix
 #endif
 
-char *ruby_mktemp _((void));
+int ruby_mkstemp _((char**));
 
 void ruby_qsort _((void*, int, int, int (*)()));
 #define qsort(b,n,s,c) ruby_qsort(b,n,s,c)

--45Z9DzgjV8m4Oswq--