* ext/digest/digest.c (rb_digest_instance_update,

	  rb_digest_instance_finish, rb_digest_instance_reset,
	  rb_digest_instance_block_length): %s in rb_raise() expects char*.
	  [ruby-dev:31222]
	* ext/openssl/ossl.h: include ossl_pkcs5.h.  [ruby-dev:31231]
	* ext/openssl/ossl_pkcs5.h: new file for PKCS5.  [ruby-dev:31231]
	* ext/openssl/ossl_x509name.c (ossl_x509name_to_s): use ossl_raise()
	  instead of rb_raise().  [ruby-dev:31222]
	* ext/sdbm/_sdbm.c: DOSISH platforms need io.h.  [ruby-dev:31232]
	* ext/syck/syck.h: include stdlib.h for malloc() and free().
	  [ruby-dev:31232]
	* ext/syck/syck.h (syck_parser_set_input_type): prototype added.
	  [ruby-dev:31231]
	* win32/win32.c: include mbstring.h for _mbspbrk().  [ruby-dev:31232]
	* win32.h (rb_w32_getcwd): prototype added.  [ruby-dev:31232]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@13176 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

10 files changed, 45 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index c2bf1929a1..d2f90166e3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,29 @@
+Wed Aug 22 10:13:45 2007  pegacorn  <subscriber.jp AT gmail.com>
+
+	* ext/digest/digest.c (rb_digest_instance_update,
+	  rb_digest_instance_finish, rb_digest_instance_reset,
+	  rb_digest_instance_block_length): %s in rb_raise() expects char*.
+	  [ruby-dev:31222]
+
+	* ext/openssl/ossl.h: include ossl_pkcs5.h.  [ruby-dev:31231]
+
+	* ext/openssl/ossl_pkcs5.h: new file for PKCS5.  [ruby-dev:31231]
+
+	* ext/openssl/ossl_x509name.c (ossl_x509name_to_s): use ossl_raise()
+	  instead of rb_raise().  [ruby-dev:31222]
+
+	* ext/sdbm/_sdbm.c: DOSISH platforms need io.h.  [ruby-dev:31232]
+
+	* ext/syck/syck.h: include stdlib.h for malloc() and free().
+	  [ruby-dev:31232]
+
+	* ext/syck/syck.h (syck_parser_set_input_type): prototype added.
+	  [ruby-dev:31231]
+
+	* win32/win32.c: include mbstring.h for _mbspbrk().  [ruby-dev:31232]
+
+	* win32.h (rb_w32_getcwd): prototype added.  [ruby-dev:31232]
+
 Wed Aug 22 10:11:59 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* bignum.c (rb_cstr_to_inum): check leading non-digits.
diff --git a/ext/digest/digest.c b/ext/digest/digest.c
index 92a925c616..0b910e8c47 100644
--- a/ext/digest/digest.c
+++ b/ext/digest/digest.c
@@ -97,7 +97,7 @@ rb_digest_s_hexencode(VALUE klass, VALUE str)
 static VALUE
 rb_digest_instance_update(VALUE self, VALUE str)
 {
-    rb_raise(rb_eRuntimeError, "%s does not implement update()", rb_inspect(self));
+    rb_raise(rb_eRuntimeError, "%s does not implement update()", RSTRING_PTR(rb_inspect(self)));
 }
 
 /*
@@ -115,7 +115,7 @@ rb_digest_instance_update(VALUE self, VALUE str)
 static VALUE
 rb_digest_instance_finish(VALUE self)
 {
-    rb_raise(rb_eRuntimeError, "%s does not implement finish()", rb_inspect(self));
+    rb_raise(rb_eRuntimeError, "%s does not implement finish()", RSTRING_PTR(rb_inspect(self)));
 }
 
 /*
@@ -129,7 +129,7 @@ rb_digest_instance_finish(VALUE self)
 static VALUE
 rb_digest_instance_reset(VALUE self)
 {
-    rb_raise(rb_eRuntimeError, "%s does not implement reset()", rb_inspect(self));
+    rb_raise(rb_eRuntimeError, "%s does not implement reset()", RSTRING_PTR(rb_inspect(self)));
 }
 
 /*
@@ -358,7 +358,7 @@ rb_digest_instance_length(VALUE self)
 static VALUE
 rb_digest_instance_block_length(VALUE self)
 {
-    rb_raise(rb_eRuntimeError, "%s does not implement block_length()", rb_inspect(self));
+    rb_raise(rb_eRuntimeError, "%s does not implement block_length()", RSTRING_PTR(rb_inspect(self)));
 }
 
 /*
@@ -381,7 +381,6 @@ static VALUE
 rb_digest_class_s_digest(int argc, VALUE *argv, VALUE klass)
 {
     VALUE str;
-    void *pctx;
     volatile VALUE obj;
 
     if (argc < 1) {
diff --git a/ext/openssl/ossl.h b/ext/openssl/ossl.h
index c0325229c1..598bfb69da 100644
--- a/ext/openssl/ossl.h
+++ b/ext/openssl/ossl.h
@@ -202,6 +202,7 @@ void ossl_debug(const char *, ...);
 #include "ossl_ocsp.h"
 #include "ossl_pkcs12.h"
 #include "ossl_pkcs7.h"
+#include "ossl_pkcs5.h"
 #include "ossl_pkey.h"
 #include "ossl_rand.h"
 #include "ossl_ssl.h"
diff --git a/ext/openssl/ossl_pkcs5.h b/ext/openssl/ossl_pkcs5.h
new file mode 100644
index 0000000000..a3b132bc50
--- /dev/null
+++ b/ext/openssl/ossl_pkcs5.h
@@ -0,0 +1,6 @@
+#if !defined(_OSSL_PKCS5_H_)
+#define _OSSL_PKCS5_H_
+
+void Init_ossl_pkcs5(void);
+
+#endif /* _OSSL_PKCS5_H_ */
diff --git a/ext/openssl/ossl_x509name.c b/ext/openssl/ossl_x509name.c
index c5ed8b5457..076d61fb96 100644
--- a/ext/openssl/ossl_x509name.c
+++ b/ext/openssl/ossl_x509name.c
@@ -188,11 +188,11 @@ ossl_x509name_to_s(int argc, VALUE *argv, VALUE self)
 	return ossl_x509name_to_s_old(self);
     else iflag = NUM2ULONG(flag);
     if (!(out = BIO_new(BIO_s_mem())))
-	rb_raise(eX509NameError, NULL);
+	ossl_raise(eX509NameError, NULL);
     GetX509Name(self, name);
     if (!X509_NAME_print_ex(out, name, 0, iflag)){
 	BIO_free(out);
-	rb_raise(eX509NameError, NULL);
+	ossl_raise(eX509NameError, NULL);
     }
     str = ossl_membio2str(out);
 
diff --git a/ext/sdbm/_sdbm.c b/ext/sdbm/_sdbm.c
index d4cf621ea5..5b34824afc 100644
--- a/ext/sdbm/_sdbm.c
+++ b/ext/sdbm/_sdbm.c
@@ -71,7 +71,7 @@ static int   duppair proto((char *, datum));
 
 #include <stdio.h>
 #include <stdlib.h>
-#ifdef MSDOS
+#ifdef DOSISH
 #include <io.h>
 #endif
 #include <sys/types.h>
diff --git a/ext/syck/syck.h b/ext/syck/syck.h
index c49f740173..e7d07e9c0d 100644
--- a/ext/syck/syck.h
+++ b/ext/syck/syck.h
@@ -17,6 +17,7 @@
 #define YAML_DOMAIN     "yaml.org,2002"
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <ctype.h>
 #include "st.h"
 
@@ -399,6 +400,7 @@ int syck_scan_scalar( int, char *, long );
 void syck_parser_handler( SyckParser *, SyckNodeHandler );
 void syck_parser_error_handler( SyckParser *, SyckErrorHandler );
 void syck_parser_bad_anchor_handler( SyckParser *, SyckBadAnchorHandler );
+void syck_parser_set_input_type( SyckParser *, enum syck_parser_input );
 void syck_parser_file( SyckParser *, FILE *, SyckIoFileRead );
 void syck_parser_str( SyckParser *, char *, long, SyckIoStrRead );
 void syck_parser_str_auto( SyckParser *, char *, SyckIoStrRead );
diff --git a/version.h b/version.h
index 2d5de26580..1724049cb8 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2007-08-22"
 #define RUBY_VERSION_CODE 186
 #define RUBY_RELEASE_CODE 20070822
-#define RUBY_PATCHLEVEL 64
+#define RUBY_PATCHLEVEL 65
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
diff --git a/win32/win32.c b/win32/win32.c
index af4631e11b..0989735faf 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -27,6 +27,7 @@
 #include <wincon.h>
 #ifdef __MINGW32__
 #include <mswsock.h>
+#include <mbstring.h>
 #endif
 #include "win32.h"
 #include "win32/dir.h"
diff --git a/win32/win32.h b/win32/win32.h
index e74dbc7653..87f4d4867a 100644
--- a/win32/win32.h
+++ b/win32/win32.h
@@ -193,6 +193,7 @@ extern struct protoent * rb_w32_getprotobyname(char *);
 extern struct protoent * rb_w32_getprotobynumber(int);
 extern struct servent  * rb_w32_getservbyname(char *, char *);
 extern struct servent  * rb_w32_getservbyport(int, char *);
+extern char * rb_w32_getcwd(char *, int);
 extern char * rb_w32_getenv(const char *);
 extern int    rb_w32_rename(const char *, const char *);
 extern int    rb_w32_stat(const char *, struct stat *);