From af328b152b68bb21549e52df230b17a8672795c3 Mon Sep 17 00:00:00 2001
From: matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 8 Nov 2000 05:29:37 +0000
Subject: matz

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1031 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ext/dbm/dbm.c       | 6 +++---
 ext/gdbm/gdbm.c     | 4 ++--
 ext/sdbm/init.c     | 4 ++--
 ext/socket/socket.c | 1 -
 4 files changed, 7 insertions(+), 8 deletions(-)

(limited to 'ext')

diff --git a/ext/dbm/dbm.c b/ext/dbm/dbm.c
index b1564793d1..830a616804 100644
--- a/ext/dbm/dbm.c
+++ b/ext/dbm/dbm.c
@@ -76,14 +76,14 @@ fdbm_s_open(argc, argv, klass)
 	dbm = dbm_open(RSTRING(file)->ptr, O_RDWR|O_CREAT, mode);
     }
     if (!dbm) {
-	mode = 0666;
-	dbm = dbm_open(RSTRING(file)->ptr, O_RDWR, mode);
+	dbm = dbm_open(RSTRING(file)->ptr, O_RDWR, 0);
     }
     if (!dbm) {
-	dbm = dbm_open(RSTRING(file)->ptr, O_RDONLY, mode);
+	dbm = dbm_open(RSTRING(file)->ptr, O_RDONLY, 0);
     }
 
     if (!dbm) {
+	printf("mode: %o\n", mode);
 	if (mode == -1) return Qnil;
 	rb_sys_fail(RSTRING(file)->ptr);
     }
diff --git a/ext/gdbm/gdbm.c b/ext/gdbm/gdbm.c
index da57a79dd6..d84c7bedd4 100644
--- a/ext/gdbm/gdbm.c
+++ b/ext/gdbm/gdbm.c
@@ -72,10 +72,10 @@ fgdbm_s_open(argc, argv, klass)
 			O_RDWR|O_CREAT, mode, MY_FATAL_FUNC);
     if (!dbm)
 	dbm = gdbm_open(RSTRING(file)->ptr, MY_BLOCK_SIZE, 
-			O_RDWR, mode, MY_FATAL_FUNC);
+			O_RDWR, 0, MY_FATAL_FUNC);
     if (!dbm)
 	dbm = gdbm_open(RSTRING(file)->ptr, MY_BLOCK_SIZE, 
-			O_RDONLY, mode, MY_FATAL_FUNC);
+			O_RDONLY, 0, MY_FATAL_FUNC);
 
     if (!dbm) {
 	if (mode == -1) return Qnil;
diff --git a/ext/sdbm/init.c b/ext/sdbm/init.c
index f6dd73b9bc..87136e9bdb 100644
--- a/ext/sdbm/init.c
+++ b/ext/sdbm/init.c
@@ -70,9 +70,9 @@ fsdbm_s_open(argc, argv, klass)
     if (mode >= 0)
 	dbm = sdbm_open(RSTRING(file)->ptr, O_RDWR|O_CREAT, mode);
     if (!dbm)
-	dbm = sdbm_open(RSTRING(file)->ptr, O_RDWR, mode);
+	dbm = sdbm_open(RSTRING(file)->ptr, O_RDWR, 0);
     if (!dbm)
-	dbm = sdbm_open(RSTRING(file)->ptr, O_RDONLY, mode);
+	dbm = sdbm_open(RSTRING(file)->ptr, O_RDONLY, 0);
 
     if (!dbm) {
 	if (mode == -1) return Qnil;
diff --git a/ext/socket/socket.c b/ext/socket/socket.c
index c9df07c279..b815c3f935 100644
--- a/ext/socket/socket.c
+++ b/ext/socket/socket.c
@@ -768,7 +768,6 @@ ruby_connect(fd, sockaddr, len, socks)
 	    }
 	}
 #ifdef HAVE_FCNTL
-	mode &= ~NONBLOCKING;
 	fcntl(fd, F_SETFL, mode);
 #endif
 	return status;
-- 
cgit v1.2.3