diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-01-26 23:22:54 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-01-26 23:22:54 +0000 |
| commit | d6eb807878922b2976831236c3f6235ccfb6edb4 () | |
| tree | 2a846a26b262bc242b1b3bd183ece068c9f551b0 | |
| parent | c8e5ba0e841e2629d282c5853fc334309f36293f (diff) | |
* dln_find.c (dln_find_1): use rb_warning and return immediately
if fname is longer than buffer. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30660 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | dln_find.c | 21 | ||||
| -rw-r--r-- | version.h | 4 |
3 files changed, 23 insertions, 7 deletions
@@ -1,3 +1,8 @@ Wed Jan 26 22:57:30 2011 CHIKANAGA Tomoyuki <[email protected]> * class.c (clone_method): add GC guard to prevent intermediate @@ -15,10 +15,14 @@ #define dln_memerror rb_memerror #define dln_exit rb_exit #define dln_loaderror rb_loaderror #else #define dln_notimplement --->>> dln not implemented <<<--- #define dln_memerror abort #define dln_exit exit static void dln_loaderror(const char *format, ...); #endif #include "dln.h" @@ -141,16 +145,23 @@ dln_find_1(const char *fname, const char *path, char *fbuf, size_t size, static const char pathname_too_long[] = "openpath: pathname too long (ignored)\n\ \tDirectory \"%.*s\"%s\n\tFile \"%.*s\"%s\n"; -#define PATHNAME_TOO_LONG() fprintf(stderr, pathname_too_long, \ - ((bp - fbuf) > 100 ? 100 : (int)(bp - fbuf)), fbuf, \ - ((bp - fbuf) > 100 ? "..." : ""), \ - (fnlen > 100 ? 100 : (int)fnlen), fname, \ - (fnlen > 100 ? "..." : "")) #define RETURN_IF(expr) if (expr) return (char *)fname; RETURN_IF(!fname); fnlen = strlen(fname); #ifdef DOSISH # ifndef CharNext # define CharNext(p) ((p)+1) @@ -1,11 +1,11 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_RELEASE_DATE "2011-01-26" #define RUBY_LEVEL -1 #define RUBY_BRANCH_NAME "trunk" #define RUBY_RELEASE_YEAR 2011 #define RUBY_RELEASE_MONTH 1 -#define RUBY_RELEASE_DAY 26 #include "ruby/version.h" |