* include/ruby/intern.h (rb_path_next, rb_path_skip_prefix,

  rb_path_last_separator, rb_path_end, ruby_find_basename,
  ruby_find_extname): restore the declarations of these functions for
  backword compatibility.

* filc.c (rb_path_next, rb_path_skip_prefix, rb_path_last_separator,
  rb_path_end, ruby_find_basename, ruby_find_extname): implements
  these functions as the wrapper of rb_enc_*().


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

4 files changed, 60 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index b06e155bef..8784df9fff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+Wed Jul 10 10:27:12 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* include/ruby/intern.h (rb_path_next, rb_path_skip_prefix,
+	  rb_path_last_separator, rb_path_end, ruby_find_basename,
+	  ruby_find_extname): restore the declarations of these functions for
+	  backword compatibility.
+
+	* filc.c (rb_path_next, rb_path_skip_prefix, rb_path_last_separator,
+	  rb_path_end, ruby_find_basename, ruby_find_extname): implements
+	  these functions as the wrapper of rb_enc_*().
+
 Wed Jul 10 10:05:40 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* include/ruby/intern.h (rb_f_lambda): restore the declaration of
diff --git a/file.c b/file.c
index c60de23302..e7e0885e98 100644
--- a/file.c
+++ b/file.c
@@ -2784,6 +2784,34 @@ rb_enc_path_end(const char *path, const char *end, rb_encoding *enc)
     return chompdirsep(path, end, enc);
 }
 
+char *
+rb_path_next(const char *path)
+{
+    rb_warn("rb_path_next() is deprecated");
+    return rb_enc_path_next(path, path + strlen(path), rb_filesystem_encoding());
+}
+
+char *
+rb_path_skip_prefix(const char *path)
+{
+    rb_warn("rb_path_skip_prefix() is deprecated");
+    return rb_enc_path_skip_prefix(path, path + strlen(path), rb_filesystem_encoding());
+}
+
+char *
+rb_path_last_separator(const char *path)
+{
+    rb_warn("rb_path_last_separator() is deprecated");
+    return rb_enc_path_last_separator(path, path + strlen(path), rb_filesystem_encoding());
+}
+
+char *rb_path_end(const char *path)
+{
+    rb_warn("rb_path_end() is deprecated");
+    return rb_enc_path_end(path, path + strlen(path), rb_filesystem_encoding());
+}
+
+
 #if USE_NTFS
 static char *
 ntfs_tail(const char *path, const char *end, rb_encoding *enc)
@@ -3629,6 +3657,13 @@ ruby_enc_find_basename(const char *name, long *baselen, long *alllen, rb_encodin
     return p;
 }
 
+const char *
+ruby_find_basename(const char *name, long *baselen, long *alllen)
+{
+    rb_warn("ruby_find_basename() is deprecated");
+    return ruby_enc_find_basename(name, baselen, alllen, rb_filesystem_encoding());
+}
+
 /*
  *  call-seq:
  *     File.basename(file_name [, suffix] )  ->  base_name
@@ -3818,6 +3853,13 @@ ruby_enc_find_extname(const char *name, long *len, rb_encoding *enc)
     return e;
 }
 
+const char *
+ruby_find_extname(const char *name, long *len)
+{
+    rb_warn("ruby_find_extname() is deprecated");
+    return ruby_enc_find_extname(name, len, rb_filesystem_encoding());
+}
+
 /*
  *  call-seq:
  *     File.extname(path)  ->  string
diff --git a/include/ruby/intern.h b/include/ruby/intern.h
index 43de3ba878..032f9af097 100644
--- a/include/ruby/intern.h
+++ b/include/ruby/intern.h
@@ -413,9 +413,15 @@ int rb_find_file_ext_safe(VALUE*, const char* const*, int);
 VALUE rb_find_file_safe(VALUE, int);
 int rb_find_file_ext(VALUE*, const char* const*);
 VALUE rb_find_file(VALUE);
+DEPRECATED(char *rb_path_next(const char *));
+DEPRECATED(char *rb_path_skip_prefix(const char *));
+DEPRECATED(char *rb_path_last_separator(const char *));
+DEPRECATED(char *rb_path_end(const char *));
 VALUE rb_file_directory_p(VALUE,VALUE);
 VALUE rb_str_encode_ospath(VALUE);
 int rb_is_absolute_path(const char *);
+DEPRECATED(const char *ruby_find_basename(const char *name, long *baselen, long *alllen));
+DEPRECATED(const char *ruby_find_extname(const char *name, long *len));
 /* gc.c */
 void ruby_set_stack_size(size_t);
 NORETURN(void rb_memerror(void));
diff --git a/version.h b/version.h
index 8d9236a758..66f6c51bd0 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 450
+#define RUBY_PATCHLEVEL 451
 
 #define RUBY_RELEASE_DATE "2013-07-10"
 #define RUBY_RELEASE_YEAR 2013