2000-05-01 13:42:38 +04:00
|
|
|
/**********************************************************************
|
1998-01-16 15:13:05 +03:00
|
|
|
|
|
|
|
dir.c -
|
|
|
|
|
|
|
|
$Author$
|
|
|
|
created at: Wed Jan 5 09:51:01 JST 1994
|
|
|
|
|
* encoding.c: provide basic features for M17N.
* parse.y: encoding aware parsing.
* parse.y (pragma_encoding): encoding specification pragma.
* parse.y (rb_intern3): encoding specified symbols.
* string.c (rb_str_length): length based on characters.
for older behavior, bytesize method added.
* string.c (rb_str_index_m): index based on characters. rindex as
well.
* string.c (succ_char): encoding aware succeeding string.
* string.c (rb_str_reverse): reverse based on characters.
* string.c (rb_str_inspect): encoding aware string description.
* string.c (rb_str_upcase_bang): encoding aware case conversion.
downcase, capitalize, swapcase as well.
* string.c (rb_str_tr_bang): tr based on characters. delete,
squeeze, tr_s, count as well.
* string.c (rb_str_split_m): split based on characters.
* string.c (rb_str_each_line): encoding aware each_line.
* string.c (rb_str_each_char): added. iteration based on
characters.
* string.c (rb_str_strip_bang): encoding aware whitespace
stripping. lstrip, rstrip as well.
* string.c (rb_str_justify): encoding aware justifying (ljust,
rjust, center).
* string.c (str_encoding): get encoding attribute from a string.
* re.c (rb_reg_initialize): encoding aware regular expression
* sprintf.c (rb_str_format): formatting (i.e. length count) based
on characters.
* io.c (rb_io_getc): getc to return one-character string.
for older behavior, getbyte method added.
* ext/stringio/stringio.c (strio_getc): ditto.
* io.c (rb_io_ungetc): allow pushing arbitrary string at the
current reading point.
* ext/stringio/stringio.c (strio_ungetc): ditto.
* ext/strscan/strscan.c: encoding support.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13261 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-08-25 07:29:39 +04:00
|
|
|
Copyright (C) 1993-2007 Yukihiro Matsumoto
|
2000-05-01 13:42:38 +04:00
|
|
|
Copyright (C) 2000 Network Applied Communication Laboratory, Inc.
|
2000-05-09 08:53:16 +04:00
|
|
|
Copyright (C) 2000 Information-technology Promotion Agency, Japan
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2000-05-01 13:42:38 +04:00
|
|
|
**********************************************************************/
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2007-06-10 07:06:15 +04:00
|
|
|
#include "ruby/ruby.h"
|
2008-06-17 02:29:05 +04:00
|
|
|
#include "ruby/encoding.h"
|
* internal.h: declare internal functions here.
* node.h: declare NODE dependent internal functions here.
* iseq.h: declare rb_iseq_t dependent internal functions here.
* vm_core.h: declare rb_thread_t dependent internal functions here.
* bignum.c, class.c, compile.c, complex.c, cont.c, dir.c, encoding.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c, io.c,
iseq.c, load.c, marshal.c, math.c, numeric.c, object.c, parse.y,
proc.c, process.c, range.c, rational.c, re.c, ruby.c, string.c,
thread.c, time.c, transcode.c, variable.c, vm.c,
tool/compile_prelude.rb: don't declare internal functions declared
in above headers. include above headers if required.
Note that rb_thread_mark() was declared as
void rb_thread_mark(rb_thread_t *th) in cont.c but defined as
void rb_thread_mark(void *ptr) in vm.c. Now it is declared as
the later in internal.h.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32156 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-06-18 02:43:38 +04:00
|
|
|
#include "internal.h"
|
1998-01-16 15:13:05 +03:00
|
|
|
|
|
|
|
#include <sys/types.h>
|
1998-01-16 15:19:22 +03:00
|
|
|
#include <sys/stat.h>
|
1998-01-16 15:13:05 +03:00
|
|
|
|
1998-01-16 15:19:22 +03:00
|
|
|
#ifdef HAVE_UNISTD_H
|
|
|
|
#include <unistd.h>
|
|
|
|
#endif
|
1998-01-16 15:13:05 +03:00
|
|
|
|
* configure.in, defines.h, dir.c, dir.h, dln.c, error.c,
eval.c, file.c, hash.c, io.c, main.c, missing.c,
process.c, ruby.c, rubysig.h, signal.c, st.c, util.c, util.h,
bcc/Makefile.sub, win32/Makefile.sub, win32/win32.h,
ext/Win32API/Win32API.c, ext/socket/getaddrinfo.c,
ext/socket/getnameinfo.c, ext/socket/socket.c,
ext/tcltklib/stubs.c
: replace "NT" with "_WIN32", add DOSISH_DRIVE_LETTER
* wince/exe.mak : delete \r at the end of lines.
* wince/mswince-ruby17.def : delete rb_obj_become
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3148 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2002-12-15 06:18:08 +03:00
|
|
|
#if defined HAVE_DIRENT_H && !defined _WIN32
|
1998-01-16 15:13:05 +03:00
|
|
|
# include <dirent.h>
|
|
|
|
# define NAMLEN(dirent) strlen((dirent)->d_name)
|
* configure.in, defines.h, dir.c, dir.h, dln.c, error.c,
eval.c, file.c, hash.c, io.c, main.c, missing.c,
process.c, ruby.c, rubysig.h, signal.c, st.c, util.c, util.h,
bcc/Makefile.sub, win32/Makefile.sub, win32/win32.h,
ext/Win32API/Win32API.c, ext/socket/getaddrinfo.c,
ext/socket/getnameinfo.c, ext/socket/socket.c,
ext/tcltklib/stubs.c
: replace "NT" with "_WIN32", add DOSISH_DRIVE_LETTER
* wince/exe.mak : delete \r at the end of lines.
* wince/mswince-ruby17.def : delete rb_obj_become
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3148 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2002-12-15 06:18:08 +03:00
|
|
|
#elif defined HAVE_DIRECT_H && !defined _WIN32
|
1999-01-20 07:59:39 +03:00
|
|
|
# include <direct.h>
|
|
|
|
# define NAMLEN(dirent) strlen((dirent)->d_name)
|
1998-01-16 15:13:05 +03:00
|
|
|
#else
|
|
|
|
# define dirent direct
|
2011-09-26 04:19:03 +04:00
|
|
|
# define NAMLEN(dirent) (dirent)->d_namlen
|
1998-01-16 15:13:05 +03:00
|
|
|
# if HAVE_SYS_NDIR_H
|
|
|
|
# include <sys/ndir.h>
|
|
|
|
# endif
|
|
|
|
# if HAVE_SYS_DIR_H
|
|
|
|
# include <sys/dir.h>
|
|
|
|
# endif
|
|
|
|
# if HAVE_NDIR_H
|
|
|
|
# include <ndir.h>
|
|
|
|
# endif
|
* configure.in, defines.h, dir.c, dir.h, dln.c, error.c,
eval.c, file.c, hash.c, io.c, main.c, missing.c,
process.c, ruby.c, rubysig.h, signal.c, st.c, util.c, util.h,
bcc/Makefile.sub, win32/Makefile.sub, win32/win32.h,
ext/Win32API/Win32API.c, ext/socket/getaddrinfo.c,
ext/socket/getnameinfo.c, ext/socket/socket.c,
ext/tcltklib/stubs.c
: replace "NT" with "_WIN32", add DOSISH_DRIVE_LETTER
* wince/exe.mak : delete \r at the end of lines.
* wince/mswince-ruby17.def : delete rb_obj_become
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3148 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2002-12-15 06:18:08 +03:00
|
|
|
# ifdef _WIN32
|
2001-03-19 06:20:24 +03:00
|
|
|
# include "win32/dir.h"
|
1998-01-16 15:13:05 +03:00
|
|
|
# endif
|
|
|
|
#endif
|
2012-05-17 06:48:59 +04:00
|
|
|
#if defined(__native_client__) && defined(NACL_NEWLIB)
|
|
|
|
# include "nacl/dirent.h"
|
|
|
|
# include "nacl/stat.h"
|
|
|
|
#endif
|
1998-01-16 15:13:05 +03:00
|
|
|
|
|
|
|
#include <errno.h>
|
|
|
|
|
1999-08-13 09:45:20 +04:00
|
|
|
#ifndef HAVE_STDLIB_H
|
1998-01-16 15:13:05 +03:00
|
|
|
char *getenv();
|
|
|
|
#endif
|
|
|
|
|
1999-08-13 09:45:20 +04:00
|
|
|
#ifndef HAVE_STRING_H
|
* bignum.c: changed `foo _((boo))' to `foo(boo)`. [ruby-dev:27056]
* defines.h, dir.c, dln.h, enumerator.c, env.h, error.c, eval.c, file.c,
gc.c, hash.c, inits.c, intern.h, io.c, lex.c, marshal.c, missing.h,
node.h, numeric.c, pack.c, process.c, re.h, ruby.c, ruby.h, rubyio.h,
rubysig.h, signal.c, sprintf.c, st.h, string.c, struct.c, time.c,
util.c, util.h, variable.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9155 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-14 10:32:32 +04:00
|
|
|
char *strchr(char*,char);
|
1999-01-20 07:59:39 +03:00
|
|
|
#endif
|
|
|
|
|
1999-10-21 11:52:15 +04:00
|
|
|
#include <ctype.h>
|
|
|
|
|
2007-06-10 07:06:15 +04:00
|
|
|
#include "ruby/util.h"
|
2001-11-08 09:43:14 +03:00
|
|
|
|
2005-04-11 17:30:10 +04:00
|
|
|
#if !defined HAVE_LSTAT && !defined lstat
|
|
|
|
#define lstat stat
|
2001-02-13 17:15:55 +03:00
|
|
|
#endif
|
|
|
|
|
* merge some patches from win32-uncode-test branch.
see #1685.
* file.c, include/ruby/intern.h (rb_str_encode_ospath): new function
to convert encoding for pathname.
* win32.c, include/ruby/win32.h (rb_w32_ulink, rb_w32_urename,
rb_w32_ustati64, rb_w32_uopen, rb_w32_uutime, rb_w32_uchdir,
rb_w32_umkdir, rb_w32_urmdir, rb_w32_uunlink): new functions to
accept UTF-8 path.
* win32/win32.c (rb_w32_opendir, link, rb_w32_stati64, rb_w32_utime,
rb_w32_unlink): use WCHAR path internally.
* file.c (rb_stat, eaccess, access_internal, rb_file_s_ftype,
chmod_internal, rb_file_chmod, rb_file_chown, utime_internal,
rb_file_s_link, unlink_internal, rb_file_s_rename): use UTF-8 version
functions on Win32.
* file.c (apply2files, rb_stat, rb_file_s_lstat, rb_file_symlink_p,
rb_file_readable_p, rb_file_writable_p, rb_file_executable_p,
check3rdbyte, rb_file_identical_p, rb_file_chmod, rb_file_chown,
rb_file_s_link, rb_file_s_symlink, rb_file_s_rename): call
rb_str_encode_ospath() before passing the path to system.
* io.c (rb_sysopen): ditto.
* dir.c (dir_chdir, dir_s_mkdir, dir_s_rmdir): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27570 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-04-30 21:56:23 +04:00
|
|
|
/* define system APIs */
|
|
|
|
#ifdef _WIN32
|
|
|
|
#undef chdir
|
|
|
|
#define chdir(p) rb_w32_uchdir(p)
|
|
|
|
#undef mkdir
|
2010-12-08 14:38:29 +03:00
|
|
|
#define mkdir(p, m) rb_w32_umkdir((p), (m))
|
* merge some patches from win32-uncode-test branch.
see #1685.
* file.c, include/ruby/intern.h (rb_str_encode_ospath): new function
to convert encoding for pathname.
* win32.c, include/ruby/win32.h (rb_w32_ulink, rb_w32_urename,
rb_w32_ustati64, rb_w32_uopen, rb_w32_uutime, rb_w32_uchdir,
rb_w32_umkdir, rb_w32_urmdir, rb_w32_uunlink): new functions to
accept UTF-8 path.
* win32/win32.c (rb_w32_opendir, link, rb_w32_stati64, rb_w32_utime,
rb_w32_unlink): use WCHAR path internally.
* file.c (rb_stat, eaccess, access_internal, rb_file_s_ftype,
chmod_internal, rb_file_chmod, rb_file_chown, utime_internal,
rb_file_s_link, unlink_internal, rb_file_s_rename): use UTF-8 version
functions on Win32.
* file.c (apply2files, rb_stat, rb_file_s_lstat, rb_file_symlink_p,
rb_file_readable_p, rb_file_writable_p, rb_file_executable_p,
check3rdbyte, rb_file_identical_p, rb_file_chmod, rb_file_chown,
rb_file_s_link, rb_file_s_symlink, rb_file_s_rename): call
rb_str_encode_ospath() before passing the path to system.
* io.c (rb_sysopen): ditto.
* dir.c (dir_chdir, dir_s_mkdir, dir_s_rmdir): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27570 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-04-30 21:56:23 +04:00
|
|
|
#undef rmdir
|
|
|
|
#define rmdir(p) rb_w32_urmdir(p)
|
2011-04-28 11:22:18 +04:00
|
|
|
#undef opendir
|
|
|
|
#define opendir(p) rb_w32_uopendir(p)
|
* merge some patches from win32-uncode-test branch.
see #1685.
* file.c, include/ruby/intern.h (rb_str_encode_ospath): new function
to convert encoding for pathname.
* win32.c, include/ruby/win32.h (rb_w32_ulink, rb_w32_urename,
rb_w32_ustati64, rb_w32_uopen, rb_w32_uutime, rb_w32_uchdir,
rb_w32_umkdir, rb_w32_urmdir, rb_w32_uunlink): new functions to
accept UTF-8 path.
* win32/win32.c (rb_w32_opendir, link, rb_w32_stati64, rb_w32_utime,
rb_w32_unlink): use WCHAR path internally.
* file.c (rb_stat, eaccess, access_internal, rb_file_s_ftype,
chmod_internal, rb_file_chmod, rb_file_chown, utime_internal,
rb_file_s_link, unlink_internal, rb_file_s_rename): use UTF-8 version
functions on Win32.
* file.c (apply2files, rb_stat, rb_file_s_lstat, rb_file_symlink_p,
rb_file_readable_p, rb_file_writable_p, rb_file_executable_p,
check3rdbyte, rb_file_identical_p, rb_file_chmod, rb_file_chown,
rb_file_s_link, rb_file_s_symlink, rb_file_s_rename): call
rb_str_encode_ospath() before passing the path to system.
* io.c (rb_sysopen): ditto.
* dir.c (dir_chdir, dir_s_mkdir, dir_s_rmdir): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27570 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-04-30 21:56:23 +04:00
|
|
|
#endif
|
|
|
|
|
2012-02-24 11:48:34 +04:00
|
|
|
#define rb_sys_fail_path(path) rb_sys_fail_str(path)
|
2012-02-24 11:37:48 +04:00
|
|
|
|
1999-10-21 11:52:15 +04:00
|
|
|
#define FNM_NOESCAPE 0x01
|
|
|
|
#define FNM_PATHNAME 0x02
|
2002-03-13 13:11:09 +03:00
|
|
|
#define FNM_DOTMATCH 0x04
|
2001-06-13 14:51:39 +04:00
|
|
|
#define FNM_CASEFOLD 0x08
|
2012-11-04 05:19:11 +04:00
|
|
|
#define FNM_EXTGLOB 0x10
|
2005-12-14 17:40:14 +03:00
|
|
|
#if CASEFOLD_FILESYSTEM
|
|
|
|
#define FNM_SYSCASE FNM_CASEFOLD
|
|
|
|
#else
|
|
|
|
#define FNM_SYSCASE 0
|
|
|
|
#endif
|
1999-10-21 11:52:15 +04:00
|
|
|
|
|
|
|
#define FNM_NOMATCH 1
|
|
|
|
#define FNM_ERROR 2
|
|
|
|
|
2010-12-08 14:38:29 +03:00
|
|
|
# define Next(p, e, enc) ((p)+ rb_enc_mbclen((p), (e), (enc)))
|
|
|
|
# define Inc(p, e, enc) ((p) = Next((p), (e), (enc)))
|
2004-01-02 19:21:26 +03:00
|
|
|
|
2004-03-12 18:00:39 +03:00
|
|
|
static char *
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
bracket(
|
|
|
|
const char *p, /* pattern (next to '[') */
|
2009-04-12 14:54:59 +04:00
|
|
|
const char *pend,
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
const char *s, /* string */
|
2009-04-12 14:54:59 +04:00
|
|
|
const char *send,
|
2008-07-07 21:29:44 +04:00
|
|
|
int flags,
|
|
|
|
rb_encoding *enc)
|
1999-10-21 11:52:15 +04:00
|
|
|
{
|
2004-03-08 09:10:22 +03:00
|
|
|
const int nocase = flags & FNM_CASEFOLD;
|
|
|
|
const int escape = !(flags & FNM_NOESCAPE);
|
2009-04-12 14:54:59 +04:00
|
|
|
unsigned int c1, c2;
|
|
|
|
int r;
|
2004-03-12 18:00:39 +03:00
|
|
|
int ok = 0, not = 0;
|
|
|
|
|
2010-09-20 18:23:16 +04:00
|
|
|
if (p >= pend) return NULL;
|
2004-03-08 09:10:22 +03:00
|
|
|
if (*p == '!' || *p == '^') {
|
|
|
|
not = 1;
|
|
|
|
p++;
|
|
|
|
}
|
1999-10-21 11:52:15 +04:00
|
|
|
|
2004-03-12 18:00:39 +03:00
|
|
|
while (*p != ']') {
|
|
|
|
const char *t1 = p;
|
2004-03-08 09:10:22 +03:00
|
|
|
if (escape && *t1 == '\\')
|
|
|
|
t1++;
|
|
|
|
if (!*t1)
|
2004-07-17 22:20:57 +04:00
|
|
|
return NULL;
|
2009-04-16 19:48:25 +04:00
|
|
|
p = t1 + (r = rb_enc_mbclen(t1, pend, enc));
|
2010-09-20 18:23:16 +04:00
|
|
|
if (p >= pend) return NULL;
|
2004-03-12 18:00:39 +03:00
|
|
|
if (p[0] == '-' && p[1] != ']') {
|
|
|
|
const char *t2 = p + 1;
|
2009-04-12 14:54:59 +04:00
|
|
|
int r2;
|
2004-03-08 09:10:22 +03:00
|
|
|
if (escape && *t2 == '\\')
|
|
|
|
t2++;
|
|
|
|
if (!*t2)
|
2004-07-17 22:20:57 +04:00
|
|
|
return NULL;
|
2009-04-12 14:54:59 +04:00
|
|
|
p = t2 + (r2 = rb_enc_mbclen(t2, pend, enc));
|
|
|
|
if (ok) continue;
|
|
|
|
if ((r <= (send-s) && memcmp(t1, s, r) == 0) ||
|
|
|
|
(r2 <= (send-s) && memcmp(t2, s, r) == 0)) {
|
2004-03-08 09:10:22 +03:00
|
|
|
ok = 1;
|
2009-04-12 14:54:59 +04:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
c1 = rb_enc_codepoint(s, send, enc);
|
|
|
|
if (nocase) c1 = rb_enc_toupper(c1, enc);
|
|
|
|
c2 = rb_enc_codepoint(t1, pend, enc);
|
|
|
|
if (nocase) c2 = rb_enc_toupper(c2, enc);
|
|
|
|
if (c1 < c2) continue;
|
|
|
|
c2 = rb_enc_codepoint(t2, pend, enc);
|
|
|
|
if (nocase) c2 = rb_enc_toupper(c2, enc);
|
|
|
|
if (c1 > c2) continue;
|
2004-03-08 09:10:22 +03:00
|
|
|
}
|
2009-04-12 14:54:59 +04:00
|
|
|
else {
|
|
|
|
if (ok) continue;
|
2009-04-14 13:11:29 +04:00
|
|
|
if (r <= (send-s) && memcmp(t1, s, r) == 0) {
|
|
|
|
ok = 1;
|
|
|
|
continue;
|
|
|
|
}
|
2009-04-12 14:54:59 +04:00
|
|
|
if (!nocase) continue;
|
|
|
|
c1 = rb_enc_toupper(rb_enc_codepoint(s, send, enc), enc);
|
|
|
|
c2 = rb_enc_toupper(rb_enc_codepoint(p, pend, enc), enc);
|
|
|
|
if (c1 != c2) continue;
|
|
|
|
}
|
|
|
|
ok = 1;
|
1999-10-21 11:52:15 +04:00
|
|
|
}
|
2004-03-08 09:10:22 +03:00
|
|
|
|
2004-07-17 22:20:57 +04:00
|
|
|
return ok == not ? NULL : (char *)p + 1;
|
1999-10-21 11:52:15 +04:00
|
|
|
}
|
|
|
|
|
2004-03-12 18:00:39 +03:00
|
|
|
/* If FNM_PATHNAME is set, only path element will be matched. (upto '/' or '\0')
|
|
|
|
Otherwise, entire string will be matched.
|
|
|
|
End marker itself won't be compared.
|
|
|
|
And if function succeeds, *pcur reaches end marker.
|
|
|
|
*/
|
2004-04-09 12:06:01 +04:00
|
|
|
#define UNESCAPE(p) (escape && *(p) == '\\' ? (p) + 1 : (p))
|
2004-03-16 05:24:47 +03:00
|
|
|
#define ISEND(p) (!*(p) || (pathname && *(p) == '/'))
|
2004-03-12 18:00:39 +03:00
|
|
|
#define RETURN(val) return *pcur = p, *scur = s, (val);
|
|
|
|
|
1999-10-21 11:52:15 +04:00
|
|
|
static int
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
fnmatch_helper(
|
|
|
|
const char **pcur, /* pattern */
|
|
|
|
const char **scur, /* string */
|
2008-07-07 21:29:44 +04:00
|
|
|
int flags,
|
|
|
|
rb_encoding *enc)
|
1999-10-21 11:52:15 +04:00
|
|
|
{
|
2004-03-12 18:00:39 +03:00
|
|
|
const int period = !(flags & FNM_DOTMATCH);
|
2004-03-16 05:24:47 +03:00
|
|
|
const int pathname = flags & FNM_PATHNAME;
|
2004-03-12 18:00:39 +03:00
|
|
|
const int escape = !(flags & FNM_NOESCAPE);
|
|
|
|
const int nocase = flags & FNM_CASEFOLD;
|
1999-10-21 11:52:15 +04:00
|
|
|
|
2004-03-12 18:00:39 +03:00
|
|
|
const char *ptmp = 0;
|
|
|
|
const char *stmp = 0;
|
2004-01-07 16:28:15 +03:00
|
|
|
|
2004-03-12 18:00:39 +03:00
|
|
|
const char *p = *pcur;
|
2008-07-08 03:00:58 +04:00
|
|
|
const char *pend = p + strlen(p);
|
2004-03-12 18:00:39 +03:00
|
|
|
const char *s = *scur;
|
2008-07-08 03:00:58 +04:00
|
|
|
const char *send = s + strlen(s);
|
1999-10-21 11:52:15 +04:00
|
|
|
|
2009-04-12 14:54:59 +04:00
|
|
|
int r;
|
|
|
|
|
2004-03-16 05:24:47 +03:00
|
|
|
if (period && *s == '.' && *UNESCAPE(p) != '.') /* leading period */
|
2004-03-12 18:00:39 +03:00
|
|
|
RETURN(FNM_NOMATCH);
|
1999-10-21 11:52:15 +04:00
|
|
|
|
2004-03-12 18:00:39 +03:00
|
|
|
while (1) {
|
2004-03-16 05:24:47 +03:00
|
|
|
switch (*p) {
|
|
|
|
case '*':
|
2004-03-12 18:00:39 +03:00
|
|
|
do { p++; } while (*p == '*');
|
2004-03-16 05:24:47 +03:00
|
|
|
if (ISEND(UNESCAPE(p))) {
|
|
|
|
p = UNESCAPE(p);
|
2004-03-12 18:00:39 +03:00
|
|
|
RETURN(0);
|
2004-03-16 05:24:47 +03:00
|
|
|
}
|
|
|
|
if (ISEND(s))
|
|
|
|
RETURN(FNM_NOMATCH);
|
2004-03-12 18:00:39 +03:00
|
|
|
ptmp = p;
|
|
|
|
stmp = s;
|
2004-03-16 05:24:47 +03:00
|
|
|
continue;
|
|
|
|
|
2004-03-12 18:00:39 +03:00
|
|
|
case '?':
|
2004-03-16 05:24:47 +03:00
|
|
|
if (ISEND(s))
|
|
|
|
RETURN(FNM_NOMATCH);
|
2004-03-12 18:00:39 +03:00
|
|
|
p++;
|
2008-07-08 03:00:58 +04:00
|
|
|
Inc(s, send, enc);
|
2004-03-12 18:00:39 +03:00
|
|
|
continue;
|
1999-10-21 11:52:15 +04:00
|
|
|
|
2004-03-12 18:00:39 +03:00
|
|
|
case '[': {
|
2004-03-16 05:24:47 +03:00
|
|
|
const char *t;
|
|
|
|
if (ISEND(s))
|
|
|
|
RETURN(FNM_NOMATCH);
|
2009-04-12 14:54:59 +04:00
|
|
|
if ((t = bracket(p + 1, pend, s, send, flags, enc)) != 0) {
|
2004-03-12 18:00:39 +03:00
|
|
|
p = t;
|
2008-07-08 03:00:58 +04:00
|
|
|
Inc(s, send, enc);
|
2004-03-12 18:00:39 +03:00
|
|
|
continue;
|
1999-10-21 11:52:15 +04:00
|
|
|
}
|
2004-03-12 18:00:39 +03:00
|
|
|
goto failed;
|
|
|
|
}
|
|
|
|
}
|
1999-10-21 11:52:15 +04:00
|
|
|
|
2004-03-12 18:00:39 +03:00
|
|
|
/* ordinary */
|
2004-03-16 05:24:47 +03:00
|
|
|
p = UNESCAPE(p);
|
|
|
|
if (ISEND(s))
|
|
|
|
RETURN(ISEND(p) ? 0 : FNM_NOMATCH);
|
|
|
|
if (ISEND(p))
|
|
|
|
goto failed;
|
2009-04-15 07:00:31 +04:00
|
|
|
r = rb_enc_precise_mbclen(p, pend, enc);
|
|
|
|
if (!MBCLEN_CHARFOUND_P(r))
|
|
|
|
goto failed;
|
2009-04-12 14:54:59 +04:00
|
|
|
if (r <= (send-s) && memcmp(p, s, r) == 0) {
|
|
|
|
p += r;
|
|
|
|
s += r;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if (!nocase) goto failed;
|
|
|
|
if (rb_enc_toupper(rb_enc_codepoint(p, pend, enc), enc) !=
|
|
|
|
rb_enc_toupper(rb_enc_codepoint(s, send, enc), enc))
|
2004-03-12 18:00:39 +03:00
|
|
|
goto failed;
|
2009-04-12 14:54:59 +04:00
|
|
|
p += r;
|
2008-07-08 03:00:58 +04:00
|
|
|
Inc(s, send, enc);
|
2004-03-12 18:00:39 +03:00
|
|
|
continue;
|
|
|
|
|
|
|
|
failed: /* try next '*' position */
|
|
|
|
if (ptmp && stmp) {
|
|
|
|
p = ptmp;
|
2008-07-08 03:00:58 +04:00
|
|
|
Inc(stmp, send, enc); /* !ISEND(*stmp) */
|
2004-03-12 18:00:39 +03:00
|
|
|
s = stmp;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
RETURN(FNM_NOMATCH);
|
1999-10-21 11:52:15 +04:00
|
|
|
}
|
2004-03-12 18:00:39 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
fnmatch(
|
2008-07-08 06:44:12 +04:00
|
|
|
const char *pattern,
|
|
|
|
rb_encoding *enc,
|
|
|
|
const char *string,
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
int flags)
|
2004-03-12 18:00:39 +03:00
|
|
|
{
|
2008-07-08 06:44:12 +04:00
|
|
|
const char *p = pattern;
|
|
|
|
const char *s = string;
|
|
|
|
const char *send = s + strlen(string);
|
2004-03-12 18:00:39 +03:00
|
|
|
const int period = !(flags & FNM_DOTMATCH);
|
|
|
|
const int pathname = flags & FNM_PATHNAME;
|
|
|
|
|
|
|
|
const char *ptmp = 0;
|
|
|
|
const char *stmp = 0;
|
|
|
|
|
|
|
|
if (pathname) {
|
|
|
|
while (1) {
|
|
|
|
if (p[0] == '*' && p[1] == '*' && p[2] == '/') {
|
|
|
|
do { p += 3; } while (p[0] == '*' && p[1] == '*' && p[2] == '/');
|
|
|
|
ptmp = p;
|
|
|
|
stmp = s;
|
|
|
|
}
|
2008-07-07 21:29:44 +04:00
|
|
|
if (fnmatch_helper(&p, &s, flags, enc) == 0) {
|
2008-07-08 03:00:58 +04:00
|
|
|
while (*s && *s != '/') Inc(s, send, enc);
|
2004-03-12 18:00:39 +03:00
|
|
|
if (*p && *s) {
|
|
|
|
p++;
|
|
|
|
s++;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if (!*p && !*s)
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
/* failed : try next recursion */
|
2004-03-16 05:24:47 +03:00
|
|
|
if (ptmp && stmp && !(period && *stmp == '.')) {
|
2008-07-08 03:00:58 +04:00
|
|
|
while (*stmp && *stmp != '/') Inc(stmp, send, enc);
|
2004-03-12 18:00:39 +03:00
|
|
|
if (*stmp) {
|
|
|
|
p = ptmp;
|
|
|
|
stmp++;
|
|
|
|
s = stmp;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return FNM_NOMATCH;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
2008-07-07 21:29:44 +04:00
|
|
|
return fnmatch_helper(&p, &s, flags, enc);
|
1999-10-21 11:52:15 +04:00
|
|
|
}
|
|
|
|
|
1999-01-20 07:59:39 +03:00
|
|
|
VALUE rb_cDir;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2001-09-19 10:54:11 +04:00
|
|
|
struct dir_data {
|
|
|
|
DIR *dir;
|
2008-07-30 17:13:57 +04:00
|
|
|
VALUE path;
|
2008-09-08 17:32:53 +04:00
|
|
|
rb_encoding *enc;
|
2001-09-19 10:54:11 +04:00
|
|
|
};
|
|
|
|
|
2008-07-30 17:13:57 +04:00
|
|
|
static void
|
2009-09-09 06:28:21 +04:00
|
|
|
dir_mark(void *ptr)
|
2008-07-30 17:13:57 +04:00
|
|
|
{
|
2009-09-09 06:28:21 +04:00
|
|
|
struct dir_data *dir = ptr;
|
2008-07-30 17:13:57 +04:00
|
|
|
rb_gc_mark(dir->path);
|
|
|
|
}
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static void
|
2009-09-09 06:28:21 +04:00
|
|
|
dir_free(void *ptr)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2009-09-09 06:28:21 +04:00
|
|
|
struct dir_data *dir = ptr;
|
2004-08-19 11:33:15 +04:00
|
|
|
if (dir) {
|
|
|
|
if (dir->dir) closedir(dir->dir);
|
|
|
|
}
|
* array.c, bignum.c, cont.c, dir.c, dln.c, encoding.c, enumerator.c,
enumerator.c (enumerator_allocate), eval_jump.c, file.c, hash.c,
io.c, load.c, pack.c, proc.c, random.c, re.c, ruby.c, st.c,
string.c, thread.c, thread_pthread.c, time.c, util.c, variable.c,
vm.c, gc.c:
allocated memory objects by xmalloc (ruby_xmalloc) should be
freed by xfree (ruby_xfree).
* ext/curses/curses.c, ext/dbm/dbm.c, ext/digest/digest.c,
ext/gdbm/gdbm.c, ext/json/ext/parser/parser.c,
ext/json/ext/parser/unicode.c, ext/openssl/ossl_cipher.c,
ext/openssl/ossl_hmac.c, ext/openssl/ossl_pkey_ec.c,
ext/sdbm/init.c, ext/strscan/strscan.c, ext/zlib/zlib.c:
ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@17017 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-06-08 14:01:40 +04:00
|
|
|
xfree(dir);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2009-09-09 06:28:21 +04:00
|
|
|
static size_t
|
|
|
|
dir_memsize(const void *ptr)
|
|
|
|
{
|
|
|
|
return ptr ? sizeof(struct dir_data) : 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static const rb_data_type_t dir_data_type = {
|
|
|
|
"dir",
|
2010-07-18 11:31:54 +04:00
|
|
|
{dir_mark, dir_free, dir_memsize,},
|
2009-09-09 06:28:21 +04:00
|
|
|
};
|
|
|
|
|
* bignum.c: changed `foo _((boo))' to `foo(boo)`. [ruby-dev:27056]
* defines.h, dir.c, dln.h, enumerator.c, env.h, error.c, eval.c, file.c,
gc.c, hash.c, inits.c, intern.h, io.c, lex.c, marshal.c, missing.h,
node.h, numeric.c, pack.c, process.c, re.h, ruby.c, ruby.h, rubyio.h,
rubysig.h, signal.c, sprintf.c, st.h, string.c, struct.c, time.c,
util.c, util.h, variable.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9155 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-14 10:32:32 +04:00
|
|
|
static VALUE dir_close(VALUE);
|
1999-01-20 07:59:39 +03:00
|
|
|
|
2009-09-18 11:06:29 +04:00
|
|
|
#define GlobPathValue(str, safe) \
|
|
|
|
/* can contain null bytes as separators */ \
|
2010-12-08 14:38:29 +03:00
|
|
|
(!RB_TYPE_P((str), T_STRING) ? \
|
2010-07-27 11:13:43 +04:00
|
|
|
(void)FilePathValue(str) : \
|
2010-12-08 14:38:29 +03:00
|
|
|
(void)(check_safe_glob((str), (safe)), \
|
2009-09-19 12:33:01 +04:00
|
|
|
check_glob_encoding(str), (str)))
|
|
|
|
#define check_safe_glob(str, safe) ((safe) ? rb_check_safe_obj(str) : (void)0)
|
|
|
|
#define check_glob_encoding(str) rb_enc_check((str), rb_enc_from_encoding(rb_usascii_encoding()))
|
2009-09-18 11:06:29 +04:00
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
dir_s_alloc(VALUE klass)
|
2000-02-29 11:05:32 +03:00
|
|
|
{
|
2001-09-19 10:54:11 +04:00
|
|
|
struct dir_data *dirp;
|
2009-09-09 06:28:21 +04:00
|
|
|
VALUE obj = TypedData_Make_Struct(klass, struct dir_data, &dir_data_type, dirp);
|
2000-02-29 11:05:32 +03:00
|
|
|
|
2001-09-19 10:54:11 +04:00
|
|
|
dirp->dir = NULL;
|
2008-07-30 17:13:57 +04:00
|
|
|
dirp->path = Qnil;
|
2008-09-08 17:32:53 +04:00
|
|
|
dirp->enc = NULL;
|
2000-02-29 11:05:32 +03:00
|
|
|
|
|
|
|
return obj;
|
|
|
|
}
|
|
|
|
|
2003-12-19 18:18:09 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* Dir.new( string ) -> aDir
|
|
|
|
*
|
|
|
|
* Returns a new directory object for the named directory.
|
|
|
|
*/
|
2000-02-29 11:05:32 +03:00
|
|
|
static VALUE
|
2008-06-17 02:29:05 +04:00
|
|
|
dir_initialize(int argc, VALUE *argv, VALUE dir)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2001-09-19 10:54:11 +04:00
|
|
|
struct dir_data *dp;
|
2008-09-08 17:32:53 +04:00
|
|
|
rb_encoding *fsenc;
|
2012-02-25 02:53:42 +04:00
|
|
|
VALUE dirname, opt, orig;
|
2008-09-08 17:32:53 +04:00
|
|
|
static VALUE sym_enc;
|
2008-06-17 02:29:05 +04:00
|
|
|
|
2008-09-08 17:32:53 +04:00
|
|
|
if (!sym_enc) {
|
|
|
|
sym_enc = ID2SYM(rb_intern("encoding"));
|
2008-06-17 02:29:05 +04:00
|
|
|
}
|
2008-09-08 17:32:53 +04:00
|
|
|
fsenc = rb_filesystem_encoding();
|
2008-06-17 02:29:05 +04:00
|
|
|
|
2012-06-20 01:49:27 +04:00
|
|
|
rb_scan_args(argc, argv, "1:", &dirname, &opt);
|
2008-06-17 02:29:05 +04:00
|
|
|
|
|
|
|
if (!NIL_P(opt)) {
|
2010-10-21 18:47:13 +04:00
|
|
|
VALUE enc = rb_hash_aref(opt, sym_enc);
|
2008-09-08 17:32:53 +04:00
|
|
|
if (!NIL_P(enc)) {
|
|
|
|
fsenc = rb_to_encoding(enc);
|
2008-06-17 02:29:05 +04:00
|
|
|
}
|
|
|
|
}
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2009-09-18 11:06:29 +04:00
|
|
|
GlobPathValue(dirname, FALSE);
|
2012-02-25 02:53:42 +04:00
|
|
|
orig = rb_str_dup_frozen(dirname);
|
2011-04-28 11:22:18 +04:00
|
|
|
dirname = rb_str_encode_ospath(dirname);
|
2012-02-25 02:53:42 +04:00
|
|
|
dirname = rb_str_dup_frozen(dirname);
|
2008-06-17 02:29:05 +04:00
|
|
|
|
2009-09-09 06:28:21 +04:00
|
|
|
TypedData_Get_Struct(dir, struct dir_data, &dir_data_type, dp);
|
2001-09-19 10:54:11 +04:00
|
|
|
if (dp->dir) closedir(dp->dir);
|
|
|
|
dp->dir = NULL;
|
2008-07-30 17:13:57 +04:00
|
|
|
dp->path = Qnil;
|
2008-09-08 17:32:53 +04:00
|
|
|
dp->enc = fsenc;
|
2006-08-31 14:47:44 +04:00
|
|
|
dp->dir = opendir(RSTRING_PTR(dirname));
|
2001-09-19 10:54:11 +04:00
|
|
|
if (dp->dir == NULL) {
|
1998-01-16 15:13:05 +03:00
|
|
|
if (errno == EMFILE || errno == ENFILE) {
|
1999-01-20 07:59:39 +03:00
|
|
|
rb_gc();
|
2006-08-31 14:47:44 +04:00
|
|
|
dp->dir = opendir(RSTRING_PTR(dirname));
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
2001-09-19 10:54:11 +04:00
|
|
|
if (dp->dir == NULL) {
|
2012-02-25 02:53:42 +04:00
|
|
|
rb_sys_fail_path(orig);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
}
|
2012-02-25 02:53:42 +04:00
|
|
|
dp->path = orig;
|
2000-05-24 08:34:26 +04:00
|
|
|
|
2000-02-29 11:05:32 +03:00
|
|
|
return dir;
|
|
|
|
}
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2003-12-19 18:18:09 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-18 01:07:33 +04:00
|
|
|
* Dir.open( string ) -> aDir
|
|
|
|
* Dir.open( string ) {| aDir | block } -> anObject
|
2003-12-19 18:18:09 +03:00
|
|
|
*
|
|
|
|
* With no block, <code>open</code> is a synonym for
|
|
|
|
* <code>Dir::new</code>. If a block is present, it is passed
|
|
|
|
* <i>aDir</i> as a parameter. The directory is closed at the end of
|
|
|
|
* the block, and <code>Dir::open</code> returns the value of the
|
|
|
|
* block.
|
|
|
|
*/
|
2000-02-29 11:05:32 +03:00
|
|
|
static VALUE
|
2008-06-17 02:29:05 +04:00
|
|
|
dir_s_open(int argc, VALUE *argv, VALUE klass)
|
2000-02-29 11:05:32 +03:00
|
|
|
{
|
2001-09-19 10:54:11 +04:00
|
|
|
struct dir_data *dp;
|
2009-09-09 06:28:21 +04:00
|
|
|
VALUE dir = TypedData_Make_Struct(klass, struct dir_data, &dir_data_type, dp);
|
2000-05-25 09:55:12 +04:00
|
|
|
|
2008-06-17 02:29:05 +04:00
|
|
|
dir_initialize(argc, argv, dir);
|
2000-05-24 08:34:26 +04:00
|
|
|
if (rb_block_given_p()) {
|
2001-02-27 10:52:11 +03:00
|
|
|
return rb_ensure(rb_yield, dir, dir_close, dir);
|
2000-05-24 08:34:26 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
return dir;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
dir_closed(void)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
1999-01-20 07:59:39 +03:00
|
|
|
rb_raise(rb_eIOError, "closed directory");
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2009-11-04 02:26:02 +03:00
|
|
|
static struct dir_data *
|
* sprintf.c (rb_str_format): allow %c to print one character
string (e.g. ?x).
* lib/tempfile.rb (Tempfile::make_tmpname): put dot between
basename and pid. [ruby-talk:196272]
* parse.y (do_block): remove -> style block.
* parse.y (parser_yylex): remove tLAMBDA_ARG.
* eval.c (rb_call0): binding for the return event hook should have
consistent scope. [ruby-core:07928]
* eval.c (proc_invoke): return behavior should depend whether it
is surrounded by a lambda or a mere block.
* eval.c (formal_assign): handles post splat arguments.
* eval.c (rb_call0): ditto.
* st.c (strhash): use FNV-1a hash.
* parse.y (parser_yylex): removed experimental ';;' terminator.
* eval.c (rb_node_arity): should be aware of post splat arguments.
* eval.c (rb_proc_arity): ditto.
* parse.y (f_args): syntax rule enhanced to support arguments
after the splat.
* parse.y (block_param): ditto for block parameters.
* parse.y (f_post_arg): mandatory formal arguments after the splat
argument.
* parse.y (new_args_gen): generate nodes for mandatory formal
arguments after the splat argument.
* eval.c (rb_eval): dispatch mandatory formal arguments after the
splat argument.
* parse.y (args): allow more than one splat in the argument list.
* parse.y (method_call): allow aref [] to accept all kind of
method argument, including assocs, splat, and block argument.
* eval.c (SETUP_ARGS0): prepare block argument as well.
* lib/mathn.rb (Integer): remove Integer#gcd2. [ruby-core:07931]
* eval.c (error_line): print receivers true/false/nil specially.
* eval.c (rb_proc_yield): handles parameters in yield semantics.
* eval.c (nil_yield): gives LocalJumpError to denote no block
error.
* io.c (rb_io_getc): now takes one-character string.
* string.c (rb_str_hash): use FNV-1a hash from Fowler/Noll/Vo
hashing algorithm.
* string.c (rb_str_aref): str[0] now returns 1 character string,
instead of a fixnum. [Ruby2]
* parse.y (parser_yylex): ?c now returns 1 character string,
instead of a fixnum. [Ruby2]
* string.c (rb_str_aset): no longer support fixnum insertion.
* eval.c (umethod_bind): should not update original class.
[ruby-dev:28636]
* eval.c (ev_const_get): should support constant access from
within instance_eval(). [ruby-dev:28327]
* time.c (time_timeval): should round for usec floating
number. [ruby-core:07896]
* time.c (time_add): ditto.
* dir.c (sys_warning): should not call a vararg function
rb_sys_warning() indirectly. [ruby-core:07886]
* numeric.c (flo_divmod): the first element of Float#divmod should
be an integer. [ruby-dev:28589]
* test/ruby/test_float.rb: add tests for divmod, div, modulo and remainder.
* re.c (rb_reg_initialize): should not allow modifying literal
regexps. frozen check moved from rb_reg_initialize_m as well.
* re.c (rb_reg_initialize): should not modify untainted objects in
safe levels higher than 3.
* re.c (rb_memcmp): type change from char* to const void*.
* dir.c (dir_close): should not close untainted dir stream.
* dir.c (GetDIR): add tainted/frozen check for each dir operation.
* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_symbol_arg):
typo fixed. a patch from Florian Gross <florg at florg.net>.
* eval.c (EXEC_EVENT_HOOK): trace_func may remove itself from
event_hooks. no guarantee for arbitrary hook deletion.
[ruby-dev:28632]
* util.c (ruby_strtod): differ addition to minimize error.
[ruby-dev:28619]
* util.c (ruby_strtod): should not raise ERANGE when the input
string does not have any digits. [ruby-dev:28629]
* eval.c (proc_invoke): should restore old ruby_frame->block.
thanks to ts <decoux at moulon.inra.fr>. [ruby-core:07833]
also fix [ruby-dev:28614] as well.
* signal.c (trap): sig should be less then NSIG. Coverity found
this bug. a patch from Kevin Tew <tewk at tewk.com>.
[ruby-core:07823]
* math.c (math_log2): add new method inspired by
[ruby-talk:191237].
* math.c (math_log): add optional base argument to Math::log().
[ruby-talk:191308]
* ext/syck/emitter.c (syck_scan_scalar): avoid accessing
uninitialized array element. a patch from Pat Eyler
<rubypate at gmail.com>. [ruby-core:07809]
* array.c (rb_ary_fill): initialize local variables first. a
patch from Pat Eyler <rubypate at gmail.com>. [ruby-core:07810]
* ext/syck/yaml2byte.c (syck_yaml2byte_handler): need to free
type_tag. a patch from Pat Eyler <rubypate at gmail.com>.
[ruby-core:07808]
* ext/socket/socket.c (make_hostent_internal): accept ai_family
check from Sam Roberts <sroberts at uniserve.com>.
[ruby-core:07691]
* util.c (ruby_strtod): should not cut off 18 digits for no
reason. [ruby-core:07796]
* array.c (rb_ary_fill): internalize local variable "beg" to
pacify Coverity. [ruby-core:07770]
* pack.c (pack_unpack): now supports CRLF newlines. a patch from
<tommy at tmtm.org>. [ruby-dev:28601]
* applied code clean-up patch from Stefan Huehner
<stefan at huehner.org>. [ruby-core:07764]
* lib/jcode.rb (String::tr_s): should have translated non
squeezing character sequence (i.e. a character) as well. thanks
to Hiroshi Ichikawa <gimite at gimite.ddo.jp> [ruby-list:42090]
* ext/socket/socket.c: document update patch from Sam Roberts
<sroberts at uniserve.com>. [ruby-core:07701]
* lib/mathn.rb (Integer): need not to remove gcd2. a patch from
NARUSE, Yui <naruse at airemix.com>. [ruby-dev:28570]
* parse.y (arg): too much NEW_LIST()
* eval.c (SETUP_ARGS0): remove unnecessary access to nd_alen.
* eval.c (rb_eval): use ARGSCAT for NODE_OP_ASGN1.
[ruby-dev:28585]
* parse.y (arg): use NODE_ARGSCAT for placeholder.
* lib/getoptlong.rb (GetoptLong::get): RDoc update patch from
mathew <meta at pobox.com>. [ruby-core:07738]
* variable.c (rb_const_set): raise error when no target klass is
supplied. [ruby-dev:28582]
* prec.c (prec_prec_f): documentation patch from
<gerardo.santana at gmail.com>. [ruby-core:07689]
* bignum.c (rb_big_pow): second operand may be too big even if
it's a Fixnum. [ruby-talk:187984]
* README.EXT: update symbol description. [ruby-talk:188104]
* COPYING: explicitly note GPLv2. [ruby-talk:187922]
* parse.y: remove some obsolete syntax rules (unparenthesized
method calls in argument list).
* eval.c (rb_call0): insecure calling should be checked for non
NODE_SCOPE method invocations too.
* eval.c (rb_alias): should preserve the current safe level as
well as method definition.
* process.c (rb_f_sleep): remove RDoc description about SIGALRM
which is not valid on the current implementation. [ruby-dev:28464]
Thu Mar 23 21:40:47 2006 K.Kosako <sndgk393 AT ybb.ne.jp>
* eval.c (method_missing): should support argument splat in
super. a bug in combination of super, splat and
method_missing. [ruby-talk:185438]
* configure.in: Solaris SunPro compiler -rapth patch from
<kuwa at labs.fujitsu.com>. [ruby-dev:28443]
* configure.in: remove enable_rpath=no for Solaris.
[ruby-dev:28440]
* ext/win32ole/win32ole.c (ole_val2olevariantdata): change behavior
of converting OLE Variant object with VT_ARRAY|VT_UI1 and Ruby
String object.
* ruby.1: a clarification patch from David Lutterkort
<dlutter at redhat.com>. [ruby-core:7508]
* lib/rdoc/ri/ri_paths.rb (RI::Paths): adding paths from rubygems
directories. a patch from Eric Hodel <drbrain at segment7.net>.
[ruby-core:07423]
* eval.c (rb_clear_cache_by_class): clearing wrong cache.
* ext/extmk.rb: use :remove_destination to install extension libraries
to avoid SEGV. [ruby-dev:28417]
* eval.c (rb_thread_fd_writable): should not re-schedule output
from KILLED thread (must be error printing).
* array.c (rb_ary_flatten_bang): allow specifying recursion
level. [ruby-talk:182170]
* array.c (rb_ary_flatten): ditto.
* gc.c (add_heap): a heap_slots may overflow. a patch from Stefan
Weil <weil at mail.berlios.de>.
* eval.c (rb_call): use separate cache for fcall/vcall
invocation.
* eval.c (rb_eval): NODE_FCALL, NODE_VCALL can call local
functions.
* eval.c (rb_mod_local): a new method to specify newly added
visibility "local".
* eval.c (search_method): search for local methods which are
visible only from the current class.
* class.c (rb_class_local_methods): a method to list local methods.
* object.c (Init_Object): add BasicObject class as a top level
BlankSlate class.
* ruby.h (SYM2ID): should not cast to signed long.
[ruby-core:07414]
* class.c (rb_include_module): allow module duplication.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10235 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2006-06-10 01:20:17 +04:00
|
|
|
dir_check(VALUE dir)
|
|
|
|
{
|
2009-11-04 02:26:02 +03:00
|
|
|
struct dir_data *dirp;
|
* object.c (rb_obj_untrusted): new method Object#untrusted?.
(rb_obj_untrust): new method Object#untrust.
(rb_obj_trust): new method Object#trust.
* array.c, debug.c, time.c, include/ruby/ruby.h, re.c, variable.c,
string.c, io.c, dir.c, vm_method.c, struct.c, class.c, hash.c,
ruby.c, marshal.c: fixes for Object#untrusted?.
* test/ruby/test_module.rb, test/ruby/test_array.rb,
test/ruby/test_object.rb, test/ruby/test_string.rb,
test/ruby/test_marshal.rb, test/ruby/test_hash.rb: added tests for
Object#untrusted?.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18568 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-08-13 11:25:05 +04:00
|
|
|
if (!OBJ_UNTRUSTED(dir) && rb_safe_level() >= 4)
|
|
|
|
rb_raise(rb_eSecurityError, "Insecure: operation on trusted Dir");
|
* sprintf.c (rb_str_format): allow %c to print one character
string (e.g. ?x).
* lib/tempfile.rb (Tempfile::make_tmpname): put dot between
basename and pid. [ruby-talk:196272]
* parse.y (do_block): remove -> style block.
* parse.y (parser_yylex): remove tLAMBDA_ARG.
* eval.c (rb_call0): binding for the return event hook should have
consistent scope. [ruby-core:07928]
* eval.c (proc_invoke): return behavior should depend whether it
is surrounded by a lambda or a mere block.
* eval.c (formal_assign): handles post splat arguments.
* eval.c (rb_call0): ditto.
* st.c (strhash): use FNV-1a hash.
* parse.y (parser_yylex): removed experimental ';;' terminator.
* eval.c (rb_node_arity): should be aware of post splat arguments.
* eval.c (rb_proc_arity): ditto.
* parse.y (f_args): syntax rule enhanced to support arguments
after the splat.
* parse.y (block_param): ditto for block parameters.
* parse.y (f_post_arg): mandatory formal arguments after the splat
argument.
* parse.y (new_args_gen): generate nodes for mandatory formal
arguments after the splat argument.
* eval.c (rb_eval): dispatch mandatory formal arguments after the
splat argument.
* parse.y (args): allow more than one splat in the argument list.
* parse.y (method_call): allow aref [] to accept all kind of
method argument, including assocs, splat, and block argument.
* eval.c (SETUP_ARGS0): prepare block argument as well.
* lib/mathn.rb (Integer): remove Integer#gcd2. [ruby-core:07931]
* eval.c (error_line): print receivers true/false/nil specially.
* eval.c (rb_proc_yield): handles parameters in yield semantics.
* eval.c (nil_yield): gives LocalJumpError to denote no block
error.
* io.c (rb_io_getc): now takes one-character string.
* string.c (rb_str_hash): use FNV-1a hash from Fowler/Noll/Vo
hashing algorithm.
* string.c (rb_str_aref): str[0] now returns 1 character string,
instead of a fixnum. [Ruby2]
* parse.y (parser_yylex): ?c now returns 1 character string,
instead of a fixnum. [Ruby2]
* string.c (rb_str_aset): no longer support fixnum insertion.
* eval.c (umethod_bind): should not update original class.
[ruby-dev:28636]
* eval.c (ev_const_get): should support constant access from
within instance_eval(). [ruby-dev:28327]
* time.c (time_timeval): should round for usec floating
number. [ruby-core:07896]
* time.c (time_add): ditto.
* dir.c (sys_warning): should not call a vararg function
rb_sys_warning() indirectly. [ruby-core:07886]
* numeric.c (flo_divmod): the first element of Float#divmod should
be an integer. [ruby-dev:28589]
* test/ruby/test_float.rb: add tests for divmod, div, modulo and remainder.
* re.c (rb_reg_initialize): should not allow modifying literal
regexps. frozen check moved from rb_reg_initialize_m as well.
* re.c (rb_reg_initialize): should not modify untainted objects in
safe levels higher than 3.
* re.c (rb_memcmp): type change from char* to const void*.
* dir.c (dir_close): should not close untainted dir stream.
* dir.c (GetDIR): add tainted/frozen check for each dir operation.
* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_symbol_arg):
typo fixed. a patch from Florian Gross <florg at florg.net>.
* eval.c (EXEC_EVENT_HOOK): trace_func may remove itself from
event_hooks. no guarantee for arbitrary hook deletion.
[ruby-dev:28632]
* util.c (ruby_strtod): differ addition to minimize error.
[ruby-dev:28619]
* util.c (ruby_strtod): should not raise ERANGE when the input
string does not have any digits. [ruby-dev:28629]
* eval.c (proc_invoke): should restore old ruby_frame->block.
thanks to ts <decoux at moulon.inra.fr>. [ruby-core:07833]
also fix [ruby-dev:28614] as well.
* signal.c (trap): sig should be less then NSIG. Coverity found
this bug. a patch from Kevin Tew <tewk at tewk.com>.
[ruby-core:07823]
* math.c (math_log2): add new method inspired by
[ruby-talk:191237].
* math.c (math_log): add optional base argument to Math::log().
[ruby-talk:191308]
* ext/syck/emitter.c (syck_scan_scalar): avoid accessing
uninitialized array element. a patch from Pat Eyler
<rubypate at gmail.com>. [ruby-core:07809]
* array.c (rb_ary_fill): initialize local variables first. a
patch from Pat Eyler <rubypate at gmail.com>. [ruby-core:07810]
* ext/syck/yaml2byte.c (syck_yaml2byte_handler): need to free
type_tag. a patch from Pat Eyler <rubypate at gmail.com>.
[ruby-core:07808]
* ext/socket/socket.c (make_hostent_internal): accept ai_family
check from Sam Roberts <sroberts at uniserve.com>.
[ruby-core:07691]
* util.c (ruby_strtod): should not cut off 18 digits for no
reason. [ruby-core:07796]
* array.c (rb_ary_fill): internalize local variable "beg" to
pacify Coverity. [ruby-core:07770]
* pack.c (pack_unpack): now supports CRLF newlines. a patch from
<tommy at tmtm.org>. [ruby-dev:28601]
* applied code clean-up patch from Stefan Huehner
<stefan at huehner.org>. [ruby-core:07764]
* lib/jcode.rb (String::tr_s): should have translated non
squeezing character sequence (i.e. a character) as well. thanks
to Hiroshi Ichikawa <gimite at gimite.ddo.jp> [ruby-list:42090]
* ext/socket/socket.c: document update patch from Sam Roberts
<sroberts at uniserve.com>. [ruby-core:07701]
* lib/mathn.rb (Integer): need not to remove gcd2. a patch from
NARUSE, Yui <naruse at airemix.com>. [ruby-dev:28570]
* parse.y (arg): too much NEW_LIST()
* eval.c (SETUP_ARGS0): remove unnecessary access to nd_alen.
* eval.c (rb_eval): use ARGSCAT for NODE_OP_ASGN1.
[ruby-dev:28585]
* parse.y (arg): use NODE_ARGSCAT for placeholder.
* lib/getoptlong.rb (GetoptLong::get): RDoc update patch from
mathew <meta at pobox.com>. [ruby-core:07738]
* variable.c (rb_const_set): raise error when no target klass is
supplied. [ruby-dev:28582]
* prec.c (prec_prec_f): documentation patch from
<gerardo.santana at gmail.com>. [ruby-core:07689]
* bignum.c (rb_big_pow): second operand may be too big even if
it's a Fixnum. [ruby-talk:187984]
* README.EXT: update symbol description. [ruby-talk:188104]
* COPYING: explicitly note GPLv2. [ruby-talk:187922]
* parse.y: remove some obsolete syntax rules (unparenthesized
method calls in argument list).
* eval.c (rb_call0): insecure calling should be checked for non
NODE_SCOPE method invocations too.
* eval.c (rb_alias): should preserve the current safe level as
well as method definition.
* process.c (rb_f_sleep): remove RDoc description about SIGALRM
which is not valid on the current implementation. [ruby-dev:28464]
Thu Mar 23 21:40:47 2006 K.Kosako <sndgk393 AT ybb.ne.jp>
* eval.c (method_missing): should support argument splat in
super. a bug in combination of super, splat and
method_missing. [ruby-talk:185438]
* configure.in: Solaris SunPro compiler -rapth patch from
<kuwa at labs.fujitsu.com>. [ruby-dev:28443]
* configure.in: remove enable_rpath=no for Solaris.
[ruby-dev:28440]
* ext/win32ole/win32ole.c (ole_val2olevariantdata): change behavior
of converting OLE Variant object with VT_ARRAY|VT_UI1 and Ruby
String object.
* ruby.1: a clarification patch from David Lutterkort
<dlutter at redhat.com>. [ruby-core:7508]
* lib/rdoc/ri/ri_paths.rb (RI::Paths): adding paths from rubygems
directories. a patch from Eric Hodel <drbrain at segment7.net>.
[ruby-core:07423]
* eval.c (rb_clear_cache_by_class): clearing wrong cache.
* ext/extmk.rb: use :remove_destination to install extension libraries
to avoid SEGV. [ruby-dev:28417]
* eval.c (rb_thread_fd_writable): should not re-schedule output
from KILLED thread (must be error printing).
* array.c (rb_ary_flatten_bang): allow specifying recursion
level. [ruby-talk:182170]
* array.c (rb_ary_flatten): ditto.
* gc.c (add_heap): a heap_slots may overflow. a patch from Stefan
Weil <weil at mail.berlios.de>.
* eval.c (rb_call): use separate cache for fcall/vcall
invocation.
* eval.c (rb_eval): NODE_FCALL, NODE_VCALL can call local
functions.
* eval.c (rb_mod_local): a new method to specify newly added
visibility "local".
* eval.c (search_method): search for local methods which are
visible only from the current class.
* class.c (rb_class_local_methods): a method to list local methods.
* object.c (Init_Object): add BasicObject class as a top level
BlankSlate class.
* ruby.h (SYM2ID): should not cast to signed long.
[ruby-core:07414]
* class.c (rb_include_module): allow module duplication.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10235 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2006-06-10 01:20:17 +04:00
|
|
|
rb_check_frozen(dir);
|
2009-11-04 02:26:02 +03:00
|
|
|
dirp = rb_check_typeddata(dir, &dir_data_type);
|
|
|
|
if (!dirp->dir) dir_closed();
|
|
|
|
return dirp;
|
* sprintf.c (rb_str_format): allow %c to print one character
string (e.g. ?x).
* lib/tempfile.rb (Tempfile::make_tmpname): put dot between
basename and pid. [ruby-talk:196272]
* parse.y (do_block): remove -> style block.
* parse.y (parser_yylex): remove tLAMBDA_ARG.
* eval.c (rb_call0): binding for the return event hook should have
consistent scope. [ruby-core:07928]
* eval.c (proc_invoke): return behavior should depend whether it
is surrounded by a lambda or a mere block.
* eval.c (formal_assign): handles post splat arguments.
* eval.c (rb_call0): ditto.
* st.c (strhash): use FNV-1a hash.
* parse.y (parser_yylex): removed experimental ';;' terminator.
* eval.c (rb_node_arity): should be aware of post splat arguments.
* eval.c (rb_proc_arity): ditto.
* parse.y (f_args): syntax rule enhanced to support arguments
after the splat.
* parse.y (block_param): ditto for block parameters.
* parse.y (f_post_arg): mandatory formal arguments after the splat
argument.
* parse.y (new_args_gen): generate nodes for mandatory formal
arguments after the splat argument.
* eval.c (rb_eval): dispatch mandatory formal arguments after the
splat argument.
* parse.y (args): allow more than one splat in the argument list.
* parse.y (method_call): allow aref [] to accept all kind of
method argument, including assocs, splat, and block argument.
* eval.c (SETUP_ARGS0): prepare block argument as well.
* lib/mathn.rb (Integer): remove Integer#gcd2. [ruby-core:07931]
* eval.c (error_line): print receivers true/false/nil specially.
* eval.c (rb_proc_yield): handles parameters in yield semantics.
* eval.c (nil_yield): gives LocalJumpError to denote no block
error.
* io.c (rb_io_getc): now takes one-character string.
* string.c (rb_str_hash): use FNV-1a hash from Fowler/Noll/Vo
hashing algorithm.
* string.c (rb_str_aref): str[0] now returns 1 character string,
instead of a fixnum. [Ruby2]
* parse.y (parser_yylex): ?c now returns 1 character string,
instead of a fixnum. [Ruby2]
* string.c (rb_str_aset): no longer support fixnum insertion.
* eval.c (umethod_bind): should not update original class.
[ruby-dev:28636]
* eval.c (ev_const_get): should support constant access from
within instance_eval(). [ruby-dev:28327]
* time.c (time_timeval): should round for usec floating
number. [ruby-core:07896]
* time.c (time_add): ditto.
* dir.c (sys_warning): should not call a vararg function
rb_sys_warning() indirectly. [ruby-core:07886]
* numeric.c (flo_divmod): the first element of Float#divmod should
be an integer. [ruby-dev:28589]
* test/ruby/test_float.rb: add tests for divmod, div, modulo and remainder.
* re.c (rb_reg_initialize): should not allow modifying literal
regexps. frozen check moved from rb_reg_initialize_m as well.
* re.c (rb_reg_initialize): should not modify untainted objects in
safe levels higher than 3.
* re.c (rb_memcmp): type change from char* to const void*.
* dir.c (dir_close): should not close untainted dir stream.
* dir.c (GetDIR): add tainted/frozen check for each dir operation.
* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_symbol_arg):
typo fixed. a patch from Florian Gross <florg at florg.net>.
* eval.c (EXEC_EVENT_HOOK): trace_func may remove itself from
event_hooks. no guarantee for arbitrary hook deletion.
[ruby-dev:28632]
* util.c (ruby_strtod): differ addition to minimize error.
[ruby-dev:28619]
* util.c (ruby_strtod): should not raise ERANGE when the input
string does not have any digits. [ruby-dev:28629]
* eval.c (proc_invoke): should restore old ruby_frame->block.
thanks to ts <decoux at moulon.inra.fr>. [ruby-core:07833]
also fix [ruby-dev:28614] as well.
* signal.c (trap): sig should be less then NSIG. Coverity found
this bug. a patch from Kevin Tew <tewk at tewk.com>.
[ruby-core:07823]
* math.c (math_log2): add new method inspired by
[ruby-talk:191237].
* math.c (math_log): add optional base argument to Math::log().
[ruby-talk:191308]
* ext/syck/emitter.c (syck_scan_scalar): avoid accessing
uninitialized array element. a patch from Pat Eyler
<rubypate at gmail.com>. [ruby-core:07809]
* array.c (rb_ary_fill): initialize local variables first. a
patch from Pat Eyler <rubypate at gmail.com>. [ruby-core:07810]
* ext/syck/yaml2byte.c (syck_yaml2byte_handler): need to free
type_tag. a patch from Pat Eyler <rubypate at gmail.com>.
[ruby-core:07808]
* ext/socket/socket.c (make_hostent_internal): accept ai_family
check from Sam Roberts <sroberts at uniserve.com>.
[ruby-core:07691]
* util.c (ruby_strtod): should not cut off 18 digits for no
reason. [ruby-core:07796]
* array.c (rb_ary_fill): internalize local variable "beg" to
pacify Coverity. [ruby-core:07770]
* pack.c (pack_unpack): now supports CRLF newlines. a patch from
<tommy at tmtm.org>. [ruby-dev:28601]
* applied code clean-up patch from Stefan Huehner
<stefan at huehner.org>. [ruby-core:07764]
* lib/jcode.rb (String::tr_s): should have translated non
squeezing character sequence (i.e. a character) as well. thanks
to Hiroshi Ichikawa <gimite at gimite.ddo.jp> [ruby-list:42090]
* ext/socket/socket.c: document update patch from Sam Roberts
<sroberts at uniserve.com>. [ruby-core:07701]
* lib/mathn.rb (Integer): need not to remove gcd2. a patch from
NARUSE, Yui <naruse at airemix.com>. [ruby-dev:28570]
* parse.y (arg): too much NEW_LIST()
* eval.c (SETUP_ARGS0): remove unnecessary access to nd_alen.
* eval.c (rb_eval): use ARGSCAT for NODE_OP_ASGN1.
[ruby-dev:28585]
* parse.y (arg): use NODE_ARGSCAT for placeholder.
* lib/getoptlong.rb (GetoptLong::get): RDoc update patch from
mathew <meta at pobox.com>. [ruby-core:07738]
* variable.c (rb_const_set): raise error when no target klass is
supplied. [ruby-dev:28582]
* prec.c (prec_prec_f): documentation patch from
<gerardo.santana at gmail.com>. [ruby-core:07689]
* bignum.c (rb_big_pow): second operand may be too big even if
it's a Fixnum. [ruby-talk:187984]
* README.EXT: update symbol description. [ruby-talk:188104]
* COPYING: explicitly note GPLv2. [ruby-talk:187922]
* parse.y: remove some obsolete syntax rules (unparenthesized
method calls in argument list).
* eval.c (rb_call0): insecure calling should be checked for non
NODE_SCOPE method invocations too.
* eval.c (rb_alias): should preserve the current safe level as
well as method definition.
* process.c (rb_f_sleep): remove RDoc description about SIGALRM
which is not valid on the current implementation. [ruby-dev:28464]
Thu Mar 23 21:40:47 2006 K.Kosako <sndgk393 AT ybb.ne.jp>
* eval.c (method_missing): should support argument splat in
super. a bug in combination of super, splat and
method_missing. [ruby-talk:185438]
* configure.in: Solaris SunPro compiler -rapth patch from
<kuwa at labs.fujitsu.com>. [ruby-dev:28443]
* configure.in: remove enable_rpath=no for Solaris.
[ruby-dev:28440]
* ext/win32ole/win32ole.c (ole_val2olevariantdata): change behavior
of converting OLE Variant object with VT_ARRAY|VT_UI1 and Ruby
String object.
* ruby.1: a clarification patch from David Lutterkort
<dlutter at redhat.com>. [ruby-core:7508]
* lib/rdoc/ri/ri_paths.rb (RI::Paths): adding paths from rubygems
directories. a patch from Eric Hodel <drbrain at segment7.net>.
[ruby-core:07423]
* eval.c (rb_clear_cache_by_class): clearing wrong cache.
* ext/extmk.rb: use :remove_destination to install extension libraries
to avoid SEGV. [ruby-dev:28417]
* eval.c (rb_thread_fd_writable): should not re-schedule output
from KILLED thread (must be error printing).
* array.c (rb_ary_flatten_bang): allow specifying recursion
level. [ruby-talk:182170]
* array.c (rb_ary_flatten): ditto.
* gc.c (add_heap): a heap_slots may overflow. a patch from Stefan
Weil <weil at mail.berlios.de>.
* eval.c (rb_call): use separate cache for fcall/vcall
invocation.
* eval.c (rb_eval): NODE_FCALL, NODE_VCALL can call local
functions.
* eval.c (rb_mod_local): a new method to specify newly added
visibility "local".
* eval.c (search_method): search for local methods which are
visible only from the current class.
* class.c (rb_class_local_methods): a method to list local methods.
* object.c (Init_Object): add BasicObject class as a top level
BlankSlate class.
* ruby.h (SYM2ID): should not cast to signed long.
[ruby-core:07414]
* class.c (rb_include_module): allow module duplication.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10235 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2006-06-10 01:20:17 +04:00
|
|
|
}
|
|
|
|
|
2010-12-08 14:38:29 +03:00
|
|
|
#define GetDIR(obj, dirp) ((dirp) = dir_check(obj))
|
2001-09-19 10:54:11 +04:00
|
|
|
|
2008-06-17 02:29:05 +04:00
|
|
|
|
2004-01-10 16:46:21 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-18 01:07:33 +04:00
|
|
|
* dir.inspect -> string
|
2004-01-10 16:46:21 +03:00
|
|
|
*
|
|
|
|
* Return a string describing this Dir object.
|
|
|
|
*/
|
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
dir_inspect(VALUE dir)
|
2004-01-10 16:46:21 +03:00
|
|
|
{
|
|
|
|
struct dir_data *dirp;
|
|
|
|
|
2009-09-09 06:28:21 +04:00
|
|
|
TypedData_Get_Struct(dir, struct dir_data, &dir_data_type, dirp);
|
2008-07-30 17:13:57 +04:00
|
|
|
if (!NIL_P(dirp->path)) {
|
2012-02-25 02:53:51 +04:00
|
|
|
VALUE str = rb_str_new_cstr("#<");
|
|
|
|
rb_str_append(str, rb_class_name(CLASS_OF(dir)));
|
|
|
|
rb_str_cat2(str, ":");
|
|
|
|
rb_str_append(str, dirp->path);
|
|
|
|
rb_str_cat2(str, ">");
|
|
|
|
return str;
|
2004-01-10 16:46:21 +03:00
|
|
|
}
|
|
|
|
return rb_funcall(dir, rb_intern("to_s"), 0, 0);
|
|
|
|
}
|
|
|
|
|
2003-12-19 18:18:09 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-18 01:07:33 +04:00
|
|
|
* dir.path -> string or nil
|
2003-12-19 18:18:09 +03:00
|
|
|
*
|
|
|
|
* Returns the path parameter passed to <em>dir</em>'s constructor.
|
|
|
|
*
|
|
|
|
* d = Dir.new("..")
|
|
|
|
* d.path #=> ".."
|
|
|
|
*/
|
2001-09-19 10:54:11 +04:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
dir_path(VALUE dir)
|
2001-09-19 10:54:11 +04:00
|
|
|
{
|
|
|
|
struct dir_data *dirp;
|
|
|
|
|
2009-09-09 06:28:21 +04:00
|
|
|
TypedData_Get_Struct(dir, struct dir_data, &dir_data_type, dirp);
|
2008-07-30 17:13:57 +04:00
|
|
|
if (NIL_P(dirp->path)) return Qnil;
|
|
|
|
return rb_str_dup(dirp->path);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2009-04-21 04:25:43 +04:00
|
|
|
#if defined HAVE_READDIR_R
|
2010-12-08 14:38:29 +03:00
|
|
|
# define READDIR(dir, enc, entry, dp) (readdir_r((dir), (entry), &(dp)) == 0 && (dp) != 0)
|
2009-04-21 04:25:43 +04:00
|
|
|
#elif defined _WIN32
|
2012-12-21 17:06:17 +04:00
|
|
|
# define READDIR(dir, enc, entry, dp) (((dp) = rb_w32_readdir((dir), (enc))) != 0)
|
2009-04-21 04:25:43 +04:00
|
|
|
#else
|
2010-12-08 14:38:29 +03:00
|
|
|
# define READDIR(dir, enc, entry, dp) (((dp) = readdir(dir)) != 0)
|
2009-04-21 04:25:43 +04:00
|
|
|
#endif
|
|
|
|
#if defined HAVE_READDIR_R
|
|
|
|
# define IF_HAVE_READDIR_R(something) something
|
|
|
|
#else
|
|
|
|
# define IF_HAVE_READDIR_R(something) /* nothing */
|
|
|
|
#endif
|
|
|
|
|
2009-08-19 20:10:06 +04:00
|
|
|
#if defined SIZEOF_STRUCT_DIRENT_TOO_SMALL
|
|
|
|
# include <limits.h>
|
|
|
|
# define NAME_MAX_FOR_STRUCT_DIRENT 255
|
|
|
|
# if defined NAME_MAX
|
|
|
|
# if NAME_MAX_FOR_STRUCT_DIRENT < NAME_MAX
|
|
|
|
# undef NAME_MAX_FOR_STRUCT_DIRENT
|
|
|
|
# define NAME_MAX_FOR_STRUCT_DIRENT NAME_MAX
|
|
|
|
# endif
|
|
|
|
# endif
|
|
|
|
# if defined _POSIX_NAME_MAX
|
|
|
|
# if NAME_MAX_FOR_STRUCT_DIRENT < _POSIX_NAME_MAX
|
|
|
|
# undef NAME_MAX_FOR_STRUCT_DIRENT
|
|
|
|
# define NAME_MAX_FOR_STRUCT_DIRENT _POSIX_NAME_MAX
|
|
|
|
# endif
|
|
|
|
# endif
|
|
|
|
# if defined _XOPEN_NAME_MAX
|
|
|
|
# if NAME_MAX_FOR_STRUCT_DIRENT < _XOPEN_NAME_MAX
|
|
|
|
# undef NAME_MAX_FOR_STRUCT_DIRENT
|
|
|
|
# define NAME_MAX_FOR_STRUCT_DIRENT _XOPEN_NAME_MAX
|
|
|
|
# endif
|
|
|
|
# endif
|
|
|
|
# define DEFINE_STRUCT_DIRENT \
|
|
|
|
union { \
|
|
|
|
struct dirent dirent; \
|
|
|
|
char dummy[offsetof(struct dirent, d_name) + \
|
|
|
|
NAME_MAX_FOR_STRUCT_DIRENT + 1]; \
|
|
|
|
}
|
|
|
|
# define STRUCT_DIRENT(entry) ((entry).dirent)
|
|
|
|
#else
|
|
|
|
# define DEFINE_STRUCT_DIRENT struct dirent
|
|
|
|
# define STRUCT_DIRENT(entry) (entry)
|
|
|
|
#endif
|
|
|
|
|
2003-12-19 18:18:09 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-18 01:07:33 +04:00
|
|
|
* dir.read -> string or nil
|
2003-12-19 18:18:09 +03:00
|
|
|
*
|
|
|
|
* Reads the next entry from <em>dir</em> and returns it as a string.
|
|
|
|
* Returns <code>nil</code> at the end of the stream.
|
|
|
|
*
|
|
|
|
* d = Dir.new("testdir")
|
|
|
|
* d.read #=> "."
|
|
|
|
* d.read #=> ".."
|
|
|
|
* d.read #=> "config.h"
|
|
|
|
*/
|
2009-02-06 22:04:44 +03:00
|
|
|
static VALUE
|
|
|
|
dir_read(VALUE dir)
|
|
|
|
{
|
2001-09-19 10:54:11 +04:00
|
|
|
struct dir_data *dirp;
|
1999-01-20 07:59:39 +03:00
|
|
|
struct dirent *dp;
|
2009-08-19 20:10:06 +04:00
|
|
|
IF_HAVE_READDIR_R(DEFINE_STRUCT_DIRENT entry);
|
1999-01-20 07:59:39 +03:00
|
|
|
|
|
|
|
GetDIR(dir, dirp);
|
|
|
|
errno = 0;
|
2009-08-19 20:10:06 +04:00
|
|
|
if (READDIR(dirp->dir, dirp->enc, &STRUCT_DIRENT(entry), dp)) {
|
2008-10-18 14:36:20 +04:00
|
|
|
return rb_external_str_new_with_enc(dp->d_name, NAMLEN(dp), dirp->enc);
|
2001-09-19 10:54:11 +04:00
|
|
|
}
|
1999-01-20 07:59:39 +03:00
|
|
|
else {
|
2012-04-15 04:06:13 +04:00
|
|
|
if (errno != 0) rb_sys_fail(0);
|
|
|
|
return Qnil; /* end of stream */
|
1999-01-20 07:59:39 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2003-12-19 18:18:09 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-18 01:07:33 +04:00
|
|
|
* dir.each { |filename| block } -> dir
|
|
|
|
* dir.each -> an_enumerator
|
2003-12-19 18:18:09 +03:00
|
|
|
*
|
|
|
|
* Calls the block once for each entry in this directory, passing the
|
|
|
|
* filename of each entry as a parameter to the block.
|
|
|
|
*
|
2010-05-13 09:49:55 +04:00
|
|
|
* If no block is given, an enumerator is returned instead.
|
|
|
|
*
|
2003-12-19 18:18:09 +03:00
|
|
|
* d = Dir.new("testdir")
|
|
|
|
* d.each {|x| puts "Got #{x}" }
|
|
|
|
*
|
|
|
|
* <em>produces:</em>
|
|
|
|
*
|
|
|
|
* Got .
|
|
|
|
* Got ..
|
|
|
|
* Got config.h
|
|
|
|
* Got main.rb
|
|
|
|
*/
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
dir_each(VALUE dir)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2001-09-19 10:54:11 +04:00
|
|
|
struct dir_data *dirp;
|
1998-01-16 15:13:05 +03:00
|
|
|
struct dirent *dp;
|
2009-08-19 20:10:06 +04:00
|
|
|
IF_HAVE_READDIR_R(DEFINE_STRUCT_DIRENT entry);
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2005-08-30 18:49:51 +04:00
|
|
|
RETURN_ENUMERATOR(dir, 0, 0);
|
1998-01-16 15:13:05 +03:00
|
|
|
GetDIR(dir, dirp);
|
2005-07-27 11:27:19 +04:00
|
|
|
rewinddir(dirp->dir);
|
2009-08-19 20:10:06 +04:00
|
|
|
while (READDIR(dirp->dir, dirp->enc, &STRUCT_DIRENT(entry), dp)) {
|
2008-10-18 14:36:20 +04:00
|
|
|
rb_yield(rb_external_str_new_with_enc(dp->d_name, NAMLEN(dp), dirp->enc));
|
2001-09-19 10:54:11 +04:00
|
|
|
if (dirp->dir == NULL) dir_closed();
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
return dir;
|
|
|
|
}
|
|
|
|
|
2009-04-16 20:58:06 +04:00
|
|
|
#ifdef HAVE_TELLDIR
|
2003-12-19 18:18:09 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-18 01:07:33 +04:00
|
|
|
* dir.pos -> integer
|
|
|
|
* dir.tell -> integer
|
2003-12-19 18:18:09 +03:00
|
|
|
*
|
|
|
|
* Returns the current position in <em>dir</em>. See also
|
|
|
|
* <code>Dir#seek</code>.
|
|
|
|
*
|
|
|
|
* d = Dir.new("testdir")
|
|
|
|
* d.tell #=> 0
|
|
|
|
* d.read #=> "."
|
|
|
|
* d.tell #=> 12
|
|
|
|
*/
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
dir_tell(VALUE dir)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2001-09-19 10:54:11 +04:00
|
|
|
struct dir_data *dirp;
|
1999-08-13 09:45:20 +04:00
|
|
|
long pos;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2008-04-06 04:45:02 +04:00
|
|
|
GetDIR(dir, dirp);
|
2001-09-19 10:54:11 +04:00
|
|
|
pos = telldir(dirp->dir);
|
1999-01-20 07:59:39 +03:00
|
|
|
return rb_int2inum(pos);
|
2009-04-16 20:58:06 +04:00
|
|
|
}
|
1998-01-16 15:13:05 +03:00
|
|
|
#else
|
2009-04-16 20:58:06 +04:00
|
|
|
#define dir_tell rb_f_notimplement
|
1998-01-16 15:13:05 +03:00
|
|
|
#endif
|
|
|
|
|
2009-04-16 20:58:06 +04:00
|
|
|
#ifdef HAVE_SEEKDIR
|
2003-12-19 18:18:09 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-18 01:07:33 +04:00
|
|
|
* dir.seek( integer ) -> dir
|
2003-12-19 18:18:09 +03:00
|
|
|
*
|
|
|
|
* Seeks to a particular location in <em>dir</em>. <i>integer</i>
|
|
|
|
* must be a value returned by <code>Dir#tell</code>.
|
|
|
|
*
|
|
|
|
* d = Dir.new("testdir") #=> #<Dir:0x401b3c40>
|
|
|
|
* d.read #=> "."
|
|
|
|
* i = d.tell #=> 12
|
|
|
|
* d.read #=> ".."
|
|
|
|
* d.seek(i) #=> #<Dir:0x401b3c40>
|
|
|
|
* d.read #=> ".."
|
|
|
|
*/
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
dir_seek(VALUE dir, VALUE pos)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2001-09-19 10:54:11 +04:00
|
|
|
struct dir_data *dirp;
|
2009-03-11 19:18:10 +03:00
|
|
|
long p = NUM2LONG(pos);
|
1998-01-16 15:13:05 +03:00
|
|
|
|
|
|
|
GetDIR(dir, dirp);
|
2004-11-21 18:33:56 +03:00
|
|
|
seekdir(dirp->dir, p);
|
2002-01-21 10:44:06 +03:00
|
|
|
return dir;
|
2009-04-16 20:58:06 +04:00
|
|
|
}
|
1998-01-16 15:13:05 +03:00
|
|
|
#else
|
2009-04-16 20:58:06 +04:00
|
|
|
#define dir_seek rb_f_notimplement
|
1998-01-16 15:13:05 +03:00
|
|
|
#endif
|
|
|
|
|
2003-12-19 18:18:09 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-18 01:07:33 +04:00
|
|
|
* dir.pos( integer ) -> integer
|
2003-12-19 18:18:09 +03:00
|
|
|
*
|
|
|
|
* Synonym for <code>Dir#seek</code>, but returns the position
|
|
|
|
* parameter.
|
|
|
|
*
|
|
|
|
* d = Dir.new("testdir") #=> #<Dir:0x401b3c40>
|
|
|
|
* d.read #=> "."
|
|
|
|
* i = d.pos #=> 12
|
|
|
|
* d.read #=> ".."
|
|
|
|
* d.pos = i #=> 12
|
|
|
|
* d.read #=> ".."
|
|
|
|
*/
|
2002-01-21 10:44:06 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
dir_set_pos(VALUE dir, VALUE pos)
|
2002-01-21 10:44:06 +03:00
|
|
|
{
|
|
|
|
dir_seek(dir, pos);
|
|
|
|
return pos;
|
|
|
|
}
|
|
|
|
|
2003-12-19 18:18:09 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-18 01:07:33 +04:00
|
|
|
* dir.rewind -> dir
|
2003-12-19 18:18:09 +03:00
|
|
|
*
|
|
|
|
* Repositions <em>dir</em> to the first entry.
|
|
|
|
*
|
|
|
|
* d = Dir.new("testdir")
|
|
|
|
* d.read #=> "."
|
|
|
|
* d.rewind #=> #<Dir:0x401b3fb0>
|
|
|
|
* d.read #=> "."
|
|
|
|
*/
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
dir_rewind(VALUE dir)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2001-09-19 10:54:11 +04:00
|
|
|
struct dir_data *dirp;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
* object.c (rb_obj_untrusted): new method Object#untrusted?.
(rb_obj_untrust): new method Object#untrust.
(rb_obj_trust): new method Object#trust.
* array.c, debug.c, time.c, include/ruby/ruby.h, re.c, variable.c,
string.c, io.c, dir.c, vm_method.c, struct.c, class.c, hash.c,
ruby.c, marshal.c: fixes for Object#untrusted?.
* test/ruby/test_module.rb, test/ruby/test_array.rb,
test/ruby/test_object.rb, test/ruby/test_string.rb,
test/ruby/test_marshal.rb, test/ruby/test_hash.rb: added tests for
Object#untrusted?.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18568 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-08-13 11:25:05 +04:00
|
|
|
if (rb_safe_level() >= 4 && !OBJ_UNTRUSTED(dir)) {
|
* sprintf.c (rb_str_format): allow %c to print one character
string (e.g. ?x).
* lib/tempfile.rb (Tempfile::make_tmpname): put dot between
basename and pid. [ruby-talk:196272]
* parse.y (do_block): remove -> style block.
* parse.y (parser_yylex): remove tLAMBDA_ARG.
* eval.c (rb_call0): binding for the return event hook should have
consistent scope. [ruby-core:07928]
* eval.c (proc_invoke): return behavior should depend whether it
is surrounded by a lambda or a mere block.
* eval.c (formal_assign): handles post splat arguments.
* eval.c (rb_call0): ditto.
* st.c (strhash): use FNV-1a hash.
* parse.y (parser_yylex): removed experimental ';;' terminator.
* eval.c (rb_node_arity): should be aware of post splat arguments.
* eval.c (rb_proc_arity): ditto.
* parse.y (f_args): syntax rule enhanced to support arguments
after the splat.
* parse.y (block_param): ditto for block parameters.
* parse.y (f_post_arg): mandatory formal arguments after the splat
argument.
* parse.y (new_args_gen): generate nodes for mandatory formal
arguments after the splat argument.
* eval.c (rb_eval): dispatch mandatory formal arguments after the
splat argument.
* parse.y (args): allow more than one splat in the argument list.
* parse.y (method_call): allow aref [] to accept all kind of
method argument, including assocs, splat, and block argument.
* eval.c (SETUP_ARGS0): prepare block argument as well.
* lib/mathn.rb (Integer): remove Integer#gcd2. [ruby-core:07931]
* eval.c (error_line): print receivers true/false/nil specially.
* eval.c (rb_proc_yield): handles parameters in yield semantics.
* eval.c (nil_yield): gives LocalJumpError to denote no block
error.
* io.c (rb_io_getc): now takes one-character string.
* string.c (rb_str_hash): use FNV-1a hash from Fowler/Noll/Vo
hashing algorithm.
* string.c (rb_str_aref): str[0] now returns 1 character string,
instead of a fixnum. [Ruby2]
* parse.y (parser_yylex): ?c now returns 1 character string,
instead of a fixnum. [Ruby2]
* string.c (rb_str_aset): no longer support fixnum insertion.
* eval.c (umethod_bind): should not update original class.
[ruby-dev:28636]
* eval.c (ev_const_get): should support constant access from
within instance_eval(). [ruby-dev:28327]
* time.c (time_timeval): should round for usec floating
number. [ruby-core:07896]
* time.c (time_add): ditto.
* dir.c (sys_warning): should not call a vararg function
rb_sys_warning() indirectly. [ruby-core:07886]
* numeric.c (flo_divmod): the first element of Float#divmod should
be an integer. [ruby-dev:28589]
* test/ruby/test_float.rb: add tests for divmod, div, modulo and remainder.
* re.c (rb_reg_initialize): should not allow modifying literal
regexps. frozen check moved from rb_reg_initialize_m as well.
* re.c (rb_reg_initialize): should not modify untainted objects in
safe levels higher than 3.
* re.c (rb_memcmp): type change from char* to const void*.
* dir.c (dir_close): should not close untainted dir stream.
* dir.c (GetDIR): add tainted/frozen check for each dir operation.
* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_symbol_arg):
typo fixed. a patch from Florian Gross <florg at florg.net>.
* eval.c (EXEC_EVENT_HOOK): trace_func may remove itself from
event_hooks. no guarantee for arbitrary hook deletion.
[ruby-dev:28632]
* util.c (ruby_strtod): differ addition to minimize error.
[ruby-dev:28619]
* util.c (ruby_strtod): should not raise ERANGE when the input
string does not have any digits. [ruby-dev:28629]
* eval.c (proc_invoke): should restore old ruby_frame->block.
thanks to ts <decoux at moulon.inra.fr>. [ruby-core:07833]
also fix [ruby-dev:28614] as well.
* signal.c (trap): sig should be less then NSIG. Coverity found
this bug. a patch from Kevin Tew <tewk at tewk.com>.
[ruby-core:07823]
* math.c (math_log2): add new method inspired by
[ruby-talk:191237].
* math.c (math_log): add optional base argument to Math::log().
[ruby-talk:191308]
* ext/syck/emitter.c (syck_scan_scalar): avoid accessing
uninitialized array element. a patch from Pat Eyler
<rubypate at gmail.com>. [ruby-core:07809]
* array.c (rb_ary_fill): initialize local variables first. a
patch from Pat Eyler <rubypate at gmail.com>. [ruby-core:07810]
* ext/syck/yaml2byte.c (syck_yaml2byte_handler): need to free
type_tag. a patch from Pat Eyler <rubypate at gmail.com>.
[ruby-core:07808]
* ext/socket/socket.c (make_hostent_internal): accept ai_family
check from Sam Roberts <sroberts at uniserve.com>.
[ruby-core:07691]
* util.c (ruby_strtod): should not cut off 18 digits for no
reason. [ruby-core:07796]
* array.c (rb_ary_fill): internalize local variable "beg" to
pacify Coverity. [ruby-core:07770]
* pack.c (pack_unpack): now supports CRLF newlines. a patch from
<tommy at tmtm.org>. [ruby-dev:28601]
* applied code clean-up patch from Stefan Huehner
<stefan at huehner.org>. [ruby-core:07764]
* lib/jcode.rb (String::tr_s): should have translated non
squeezing character sequence (i.e. a character) as well. thanks
to Hiroshi Ichikawa <gimite at gimite.ddo.jp> [ruby-list:42090]
* ext/socket/socket.c: document update patch from Sam Roberts
<sroberts at uniserve.com>. [ruby-core:07701]
* lib/mathn.rb (Integer): need not to remove gcd2. a patch from
NARUSE, Yui <naruse at airemix.com>. [ruby-dev:28570]
* parse.y (arg): too much NEW_LIST()
* eval.c (SETUP_ARGS0): remove unnecessary access to nd_alen.
* eval.c (rb_eval): use ARGSCAT for NODE_OP_ASGN1.
[ruby-dev:28585]
* parse.y (arg): use NODE_ARGSCAT for placeholder.
* lib/getoptlong.rb (GetoptLong::get): RDoc update patch from
mathew <meta at pobox.com>. [ruby-core:07738]
* variable.c (rb_const_set): raise error when no target klass is
supplied. [ruby-dev:28582]
* prec.c (prec_prec_f): documentation patch from
<gerardo.santana at gmail.com>. [ruby-core:07689]
* bignum.c (rb_big_pow): second operand may be too big even if
it's a Fixnum. [ruby-talk:187984]
* README.EXT: update symbol description. [ruby-talk:188104]
* COPYING: explicitly note GPLv2. [ruby-talk:187922]
* parse.y: remove some obsolete syntax rules (unparenthesized
method calls in argument list).
* eval.c (rb_call0): insecure calling should be checked for non
NODE_SCOPE method invocations too.
* eval.c (rb_alias): should preserve the current safe level as
well as method definition.
* process.c (rb_f_sleep): remove RDoc description about SIGALRM
which is not valid on the current implementation. [ruby-dev:28464]
Thu Mar 23 21:40:47 2006 K.Kosako <sndgk393 AT ybb.ne.jp>
* eval.c (method_missing): should support argument splat in
super. a bug in combination of super, splat and
method_missing. [ruby-talk:185438]
* configure.in: Solaris SunPro compiler -rapth patch from
<kuwa at labs.fujitsu.com>. [ruby-dev:28443]
* configure.in: remove enable_rpath=no for Solaris.
[ruby-dev:28440]
* ext/win32ole/win32ole.c (ole_val2olevariantdata): change behavior
of converting OLE Variant object with VT_ARRAY|VT_UI1 and Ruby
String object.
* ruby.1: a clarification patch from David Lutterkort
<dlutter at redhat.com>. [ruby-core:7508]
* lib/rdoc/ri/ri_paths.rb (RI::Paths): adding paths from rubygems
directories. a patch from Eric Hodel <drbrain at segment7.net>.
[ruby-core:07423]
* eval.c (rb_clear_cache_by_class): clearing wrong cache.
* ext/extmk.rb: use :remove_destination to install extension libraries
to avoid SEGV. [ruby-dev:28417]
* eval.c (rb_thread_fd_writable): should not re-schedule output
from KILLED thread (must be error printing).
* array.c (rb_ary_flatten_bang): allow specifying recursion
level. [ruby-talk:182170]
* array.c (rb_ary_flatten): ditto.
* gc.c (add_heap): a heap_slots may overflow. a patch from Stefan
Weil <weil at mail.berlios.de>.
* eval.c (rb_call): use separate cache for fcall/vcall
invocation.
* eval.c (rb_eval): NODE_FCALL, NODE_VCALL can call local
functions.
* eval.c (rb_mod_local): a new method to specify newly added
visibility "local".
* eval.c (search_method): search for local methods which are
visible only from the current class.
* class.c (rb_class_local_methods): a method to list local methods.
* object.c (Init_Object): add BasicObject class as a top level
BlankSlate class.
* ruby.h (SYM2ID): should not cast to signed long.
[ruby-core:07414]
* class.c (rb_include_module): allow module duplication.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10235 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2006-06-10 01:20:17 +04:00
|
|
|
rb_raise(rb_eSecurityError, "Insecure: can't close");
|
|
|
|
}
|
1998-01-16 15:13:05 +03:00
|
|
|
GetDIR(dir, dirp);
|
2001-09-19 10:54:11 +04:00
|
|
|
rewinddir(dirp->dir);
|
1998-01-16 15:13:05 +03:00
|
|
|
return dir;
|
|
|
|
}
|
|
|
|
|
2003-12-19 18:18:09 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-18 01:07:33 +04:00
|
|
|
* dir.close -> nil
|
2003-12-19 18:18:09 +03:00
|
|
|
*
|
|
|
|
* Closes the directory stream. Any further attempts to access
|
|
|
|
* <em>dir</em> will raise an <code>IOError</code>.
|
|
|
|
*
|
|
|
|
* d = Dir.new("testdir")
|
|
|
|
* d.close #=> nil
|
|
|
|
*/
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
dir_close(VALUE dir)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2001-09-19 10:54:11 +04:00
|
|
|
struct dir_data *dirp;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2001-09-19 10:54:11 +04:00
|
|
|
GetDIR(dir, dirp);
|
|
|
|
closedir(dirp->dir);
|
|
|
|
dirp->dir = NULL;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
|
|
|
return Qnil;
|
|
|
|
}
|
|
|
|
|
2001-03-16 11:30:09 +03:00
|
|
|
static void
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
dir_chdir(VALUE path)
|
2001-03-16 11:30:09 +03:00
|
|
|
{
|
2006-08-31 14:47:44 +04:00
|
|
|
if (chdir(RSTRING_PTR(path)) < 0)
|
2012-02-24 11:37:48 +04:00
|
|
|
rb_sys_fail_path(path);
|
2001-03-16 11:30:09 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
static int chdir_blocking = 0;
|
2001-07-14 19:17:19 +04:00
|
|
|
static VALUE chdir_thread = Qnil;
|
2001-03-16 11:30:09 +03:00
|
|
|
|
2004-09-17 13:24:13 +04:00
|
|
|
struct chdir_data {
|
2004-09-21 07:08:33 +04:00
|
|
|
VALUE old_path, new_path;
|
|
|
|
int done;
|
2004-09-17 13:24:13 +04:00
|
|
|
};
|
|
|
|
|
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
chdir_yield(struct chdir_data *args)
|
2004-09-17 13:24:13 +04:00
|
|
|
{
|
2004-09-21 07:08:33 +04:00
|
|
|
dir_chdir(args->new_path);
|
2009-07-18 12:05:32 +04:00
|
|
|
args->done = TRUE;
|
2004-09-21 07:08:33 +04:00
|
|
|
chdir_blocking++;
|
|
|
|
if (chdir_thread == Qnil)
|
|
|
|
chdir_thread = rb_thread_current();
|
|
|
|
return rb_yield(args->new_path);
|
2004-09-17 13:24:13 +04:00
|
|
|
}
|
|
|
|
|
2001-03-16 11:30:09 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
chdir_restore(struct chdir_data *args)
|
2001-03-16 11:30:09 +03:00
|
|
|
{
|
2004-09-21 07:08:33 +04:00
|
|
|
if (args->done) {
|
|
|
|
chdir_blocking--;
|
|
|
|
if (chdir_blocking == 0)
|
|
|
|
chdir_thread = Qnil;
|
|
|
|
dir_chdir(args->old_path);
|
|
|
|
}
|
2001-03-16 11:30:09 +03:00
|
|
|
return Qnil;
|
|
|
|
}
|
|
|
|
|
2003-12-19 18:18:09 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-18 01:07:33 +04:00
|
|
|
* Dir.chdir( [ string] ) -> 0
|
|
|
|
* Dir.chdir( [ string] ) {| path | block } -> anObject
|
2003-12-19 18:18:09 +03:00
|
|
|
*
|
|
|
|
* Changes the current working directory of the process to the given
|
|
|
|
* string. When called without an argument, changes the directory to
|
|
|
|
* the value of the environment variable <code>HOME</code>, or
|
|
|
|
* <code>LOGDIR</code>. <code>SystemCallError</code> (probably
|
|
|
|
* <code>Errno::ENOENT</code>) if the target directory does not exist.
|
|
|
|
*
|
|
|
|
* If a block is given, it is passed the name of the new current
|
|
|
|
* directory, and the block is executed with that as the current
|
|
|
|
* directory. The original working directory is restored when the block
|
|
|
|
* exits. The return value of <code>chdir</code> is the value of the
|
|
|
|
* block. <code>chdir</code> blocks can be nested, but in a
|
|
|
|
* multi-threaded program an error will be raised if a thread attempts
|
|
|
|
* to open a <code>chdir</code> block while another thread has one
|
|
|
|
* open.
|
|
|
|
*
|
|
|
|
* Dir.chdir("/var/spool/mail")
|
|
|
|
* puts Dir.pwd
|
|
|
|
* Dir.chdir("/tmp") do
|
|
|
|
* puts Dir.pwd
|
|
|
|
* Dir.chdir("/usr") do
|
|
|
|
* puts Dir.pwd
|
|
|
|
* end
|
|
|
|
* puts Dir.pwd
|
|
|
|
* end
|
|
|
|
* puts Dir.pwd
|
|
|
|
*
|
|
|
|
* <em>produces:</em>
|
|
|
|
*
|
|
|
|
* /var/spool/mail
|
|
|
|
* /tmp
|
|
|
|
* /usr
|
|
|
|
* /tmp
|
|
|
|
* /var/spool/mail
|
|
|
|
*/
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
dir_s_chdir(int argc, VALUE *argv, VALUE obj)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2001-03-16 11:30:09 +03:00
|
|
|
VALUE path = Qnil;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
|
|
|
rb_secure(2);
|
1999-01-20 07:59:39 +03:00
|
|
|
if (rb_scan_args(argc, argv, "01", &path) == 1) {
|
2004-04-07 10:30:15 +04:00
|
|
|
FilePathValue(path);
|
2012-01-21 06:43:48 +04:00
|
|
|
path = rb_str_encode_ospath(path);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
else {
|
2004-09-21 07:08:33 +04:00
|
|
|
const char *dist = getenv("HOME");
|
1998-01-16 15:13:05 +03:00
|
|
|
if (!dist) {
|
|
|
|
dist = getenv("LOGDIR");
|
2001-09-06 12:48:07 +04:00
|
|
|
if (!dist) rb_raise(rb_eArgError, "HOME/LOGDIR not set");
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
2004-09-21 07:08:33 +04:00
|
|
|
path = rb_str_new2(dist);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2001-07-14 19:17:19 +04:00
|
|
|
if (chdir_blocking > 0) {
|
|
|
|
if (!rb_block_given_p() || rb_thread_current() != chdir_thread)
|
|
|
|
rb_warn("conflicting chdir during another chdir block");
|
|
|
|
}
|
2001-03-16 11:30:09 +03:00
|
|
|
|
|
|
|
if (rb_block_given_p()) {
|
2004-09-17 13:24:13 +04:00
|
|
|
struct chdir_data args;
|
|
|
|
|
2012-01-21 06:43:48 +04:00
|
|
|
args.old_path = rb_str_encode_ospath(rb_dir_getwd());
|
2004-09-21 07:08:33 +04:00
|
|
|
args.new_path = path;
|
2009-07-18 12:05:32 +04:00
|
|
|
args.done = FALSE;
|
2004-09-21 07:08:33 +04:00
|
|
|
return rb_ensure(chdir_yield, (VALUE)&args, chdir_restore, (VALUE)&args);
|
2001-03-16 11:30:09 +03:00
|
|
|
}
|
2004-09-21 07:08:33 +04:00
|
|
|
dir_chdir(path);
|
1998-01-16 15:13:05 +03:00
|
|
|
|
|
|
|
return INT2FIX(0);
|
|
|
|
}
|
|
|
|
|
2010-01-12 03:32:22 +03:00
|
|
|
VALUE
|
|
|
|
rb_dir_getwd(void)
|
|
|
|
{
|
|
|
|
char *path;
|
|
|
|
VALUE cwd;
|
|
|
|
|
|
|
|
rb_secure(4);
|
|
|
|
path = my_getcwd();
|
|
|
|
cwd = rb_tainted_str_new2(path);
|
|
|
|
rb_enc_associate(cwd, rb_filesystem_encoding());
|
|
|
|
|
|
|
|
xfree(path);
|
|
|
|
return cwd;
|
|
|
|
}
|
|
|
|
|
2003-12-19 18:18:09 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-18 01:07:33 +04:00
|
|
|
* Dir.getwd -> string
|
|
|
|
* Dir.pwd -> string
|
2003-12-19 18:18:09 +03:00
|
|
|
*
|
|
|
|
* Returns the path to the current working directory of this process as
|
|
|
|
* a string.
|
|
|
|
*
|
|
|
|
* Dir.chdir("/tmp") #=> 0
|
|
|
|
* Dir.getwd #=> "/tmp"
|
|
|
|
*/
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
dir_s_getwd(VALUE dir)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2010-01-12 03:32:22 +03:00
|
|
|
return rb_dir_getwd();
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2003-12-15 07:07:03 +03:00
|
|
|
static void
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
check_dirname(volatile VALUE *dir)
|
2003-12-15 07:07:03 +03:00
|
|
|
{
|
2012-01-21 06:43:48 +04:00
|
|
|
VALUE d = *dir;
|
2003-12-15 07:07:03 +03:00
|
|
|
char *path, *pend;
|
2012-01-25 06:32:06 +04:00
|
|
|
long len;
|
|
|
|
rb_encoding *enc;
|
2003-12-15 07:07:03 +03:00
|
|
|
|
|
|
|
rb_secure(2);
|
2012-01-21 06:43:48 +04:00
|
|
|
FilePathValue(d);
|
2012-01-25 06:32:06 +04:00
|
|
|
enc = rb_enc_get(d);
|
|
|
|
RSTRING_GETMEM(d, path, len);
|
|
|
|
pend = path + len;
|
|
|
|
pend = rb_enc_path_end(rb_enc_path_skip_prefix(path, pend, enc), pend, enc);
|
|
|
|
if (pend - path < len) {
|
2012-01-21 06:43:48 +04:00
|
|
|
d = rb_str_subseq(d, 0, pend - path);
|
2003-12-15 07:07:03 +03:00
|
|
|
}
|
2012-01-21 06:43:48 +04:00
|
|
|
*dir = rb_str_encode_ospath(d);
|
2003-12-15 07:07:03 +03:00
|
|
|
}
|
|
|
|
|
2009-06-22 16:23:06 +04:00
|
|
|
#if defined(HAVE_CHROOT)
|
2003-12-19 18:18:09 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-18 01:07:33 +04:00
|
|
|
* Dir.chroot( string ) -> 0
|
2003-12-19 18:18:09 +03:00
|
|
|
*
|
|
|
|
* Changes this process's idea of the file system root. Only a
|
|
|
|
* privileged process may make this call. Not available on all
|
|
|
|
* platforms. On Unix systems, see <code>chroot(2)</code> for more
|
|
|
|
* information.
|
|
|
|
*/
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
dir_s_chroot(VALUE dir, VALUE path)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2003-12-15 07:07:03 +03:00
|
|
|
check_dirname(&path);
|
2006-08-31 14:47:44 +04:00
|
|
|
if (chroot(RSTRING_PTR(path)) == -1)
|
2012-02-24 11:37:48 +04:00
|
|
|
rb_sys_fail_path(path);
|
1998-01-16 15:13:05 +03:00
|
|
|
|
|
|
|
return INT2FIX(0);
|
2009-04-16 20:58:06 +04:00
|
|
|
}
|
1998-01-16 15:13:05 +03:00
|
|
|
#else
|
2009-04-16 20:58:06 +04:00
|
|
|
#define dir_s_chroot rb_f_notimplement
|
1998-01-16 15:13:05 +03:00
|
|
|
#endif
|
|
|
|
|
2003-12-19 18:18:09 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-18 01:07:33 +04:00
|
|
|
* Dir.mkdir( string [, integer] ) -> 0
|
2003-12-19 18:18:09 +03:00
|
|
|
*
|
|
|
|
* Makes a new directory named by <i>string</i>, with permissions
|
|
|
|
* specified by the optional parameter <i>anInteger</i>. The
|
|
|
|
* permissions may be modified by the value of
|
|
|
|
* <code>File::umask</code>, and are ignored on NT. Raises a
|
|
|
|
* <code>SystemCallError</code> if the directory cannot be created. See
|
|
|
|
* also the discussion of permissions in the class documentation for
|
|
|
|
* <code>File</code>.
|
|
|
|
*
|
2011-01-13 14:58:20 +03:00
|
|
|
* Dir.mkdir(File.join(Dir.home, ".foo"), 0700) #=> 0
|
|
|
|
*
|
2003-12-19 18:18:09 +03:00
|
|
|
*/
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
dir_s_mkdir(int argc, VALUE *argv, VALUE obj)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
|
|
|
VALUE path, vmode;
|
|
|
|
int mode;
|
|
|
|
|
|
|
|
if (rb_scan_args(argc, argv, "11", &path, &vmode) == 2) {
|
|
|
|
mode = NUM2INT(vmode);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
mode = 0777;
|
|
|
|
}
|
|
|
|
|
2003-12-15 07:07:03 +03:00
|
|
|
check_dirname(&path);
|
2006-08-31 14:47:44 +04:00
|
|
|
if (mkdir(RSTRING_PTR(path), mode) == -1)
|
2012-02-24 11:37:48 +04:00
|
|
|
rb_sys_fail_path(path);
|
1998-01-16 15:13:05 +03:00
|
|
|
|
|
|
|
return INT2FIX(0);
|
|
|
|
}
|
|
|
|
|
2003-12-19 18:18:09 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-18 01:07:33 +04:00
|
|
|
* Dir.delete( string ) -> 0
|
|
|
|
* Dir.rmdir( string ) -> 0
|
|
|
|
* Dir.unlink( string ) -> 0
|
2003-12-19 18:18:09 +03:00
|
|
|
*
|
|
|
|
* Deletes the named directory. Raises a subclass of
|
|
|
|
* <code>SystemCallError</code> if the directory isn't empty.
|
|
|
|
*/
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
dir_s_rmdir(VALUE obj, VALUE dir)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2003-12-15 07:07:03 +03:00
|
|
|
check_dirname(&dir);
|
2006-08-31 14:47:44 +04:00
|
|
|
if (rmdir(RSTRING_PTR(dir)) < 0)
|
2012-02-24 11:37:48 +04:00
|
|
|
rb_sys_fail_path(dir);
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2000-03-07 11:37:59 +03:00
|
|
|
return INT2FIX(0);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2009-06-09 10:11:10 +04:00
|
|
|
static VALUE
|
|
|
|
sys_warning_1(VALUE mesg)
|
* sprintf.c (rb_str_format): allow %c to print one character
string (e.g. ?x).
* lib/tempfile.rb (Tempfile::make_tmpname): put dot between
basename and pid. [ruby-talk:196272]
* parse.y (do_block): remove -> style block.
* parse.y (parser_yylex): remove tLAMBDA_ARG.
* eval.c (rb_call0): binding for the return event hook should have
consistent scope. [ruby-core:07928]
* eval.c (proc_invoke): return behavior should depend whether it
is surrounded by a lambda or a mere block.
* eval.c (formal_assign): handles post splat arguments.
* eval.c (rb_call0): ditto.
* st.c (strhash): use FNV-1a hash.
* parse.y (parser_yylex): removed experimental ';;' terminator.
* eval.c (rb_node_arity): should be aware of post splat arguments.
* eval.c (rb_proc_arity): ditto.
* parse.y (f_args): syntax rule enhanced to support arguments
after the splat.
* parse.y (block_param): ditto for block parameters.
* parse.y (f_post_arg): mandatory formal arguments after the splat
argument.
* parse.y (new_args_gen): generate nodes for mandatory formal
arguments after the splat argument.
* eval.c (rb_eval): dispatch mandatory formal arguments after the
splat argument.
* parse.y (args): allow more than one splat in the argument list.
* parse.y (method_call): allow aref [] to accept all kind of
method argument, including assocs, splat, and block argument.
* eval.c (SETUP_ARGS0): prepare block argument as well.
* lib/mathn.rb (Integer): remove Integer#gcd2. [ruby-core:07931]
* eval.c (error_line): print receivers true/false/nil specially.
* eval.c (rb_proc_yield): handles parameters in yield semantics.
* eval.c (nil_yield): gives LocalJumpError to denote no block
error.
* io.c (rb_io_getc): now takes one-character string.
* string.c (rb_str_hash): use FNV-1a hash from Fowler/Noll/Vo
hashing algorithm.
* string.c (rb_str_aref): str[0] now returns 1 character string,
instead of a fixnum. [Ruby2]
* parse.y (parser_yylex): ?c now returns 1 character string,
instead of a fixnum. [Ruby2]
* string.c (rb_str_aset): no longer support fixnum insertion.
* eval.c (umethod_bind): should not update original class.
[ruby-dev:28636]
* eval.c (ev_const_get): should support constant access from
within instance_eval(). [ruby-dev:28327]
* time.c (time_timeval): should round for usec floating
number. [ruby-core:07896]
* time.c (time_add): ditto.
* dir.c (sys_warning): should not call a vararg function
rb_sys_warning() indirectly. [ruby-core:07886]
* numeric.c (flo_divmod): the first element of Float#divmod should
be an integer. [ruby-dev:28589]
* test/ruby/test_float.rb: add tests for divmod, div, modulo and remainder.
* re.c (rb_reg_initialize): should not allow modifying literal
regexps. frozen check moved from rb_reg_initialize_m as well.
* re.c (rb_reg_initialize): should not modify untainted objects in
safe levels higher than 3.
* re.c (rb_memcmp): type change from char* to const void*.
* dir.c (dir_close): should not close untainted dir stream.
* dir.c (GetDIR): add tainted/frozen check for each dir operation.
* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_symbol_arg):
typo fixed. a patch from Florian Gross <florg at florg.net>.
* eval.c (EXEC_EVENT_HOOK): trace_func may remove itself from
event_hooks. no guarantee for arbitrary hook deletion.
[ruby-dev:28632]
* util.c (ruby_strtod): differ addition to minimize error.
[ruby-dev:28619]
* util.c (ruby_strtod): should not raise ERANGE when the input
string does not have any digits. [ruby-dev:28629]
* eval.c (proc_invoke): should restore old ruby_frame->block.
thanks to ts <decoux at moulon.inra.fr>. [ruby-core:07833]
also fix [ruby-dev:28614] as well.
* signal.c (trap): sig should be less then NSIG. Coverity found
this bug. a patch from Kevin Tew <tewk at tewk.com>.
[ruby-core:07823]
* math.c (math_log2): add new method inspired by
[ruby-talk:191237].
* math.c (math_log): add optional base argument to Math::log().
[ruby-talk:191308]
* ext/syck/emitter.c (syck_scan_scalar): avoid accessing
uninitialized array element. a patch from Pat Eyler
<rubypate at gmail.com>. [ruby-core:07809]
* array.c (rb_ary_fill): initialize local variables first. a
patch from Pat Eyler <rubypate at gmail.com>. [ruby-core:07810]
* ext/syck/yaml2byte.c (syck_yaml2byte_handler): need to free
type_tag. a patch from Pat Eyler <rubypate at gmail.com>.
[ruby-core:07808]
* ext/socket/socket.c (make_hostent_internal): accept ai_family
check from Sam Roberts <sroberts at uniserve.com>.
[ruby-core:07691]
* util.c (ruby_strtod): should not cut off 18 digits for no
reason. [ruby-core:07796]
* array.c (rb_ary_fill): internalize local variable "beg" to
pacify Coverity. [ruby-core:07770]
* pack.c (pack_unpack): now supports CRLF newlines. a patch from
<tommy at tmtm.org>. [ruby-dev:28601]
* applied code clean-up patch from Stefan Huehner
<stefan at huehner.org>. [ruby-core:07764]
* lib/jcode.rb (String::tr_s): should have translated non
squeezing character sequence (i.e. a character) as well. thanks
to Hiroshi Ichikawa <gimite at gimite.ddo.jp> [ruby-list:42090]
* ext/socket/socket.c: document update patch from Sam Roberts
<sroberts at uniserve.com>. [ruby-core:07701]
* lib/mathn.rb (Integer): need not to remove gcd2. a patch from
NARUSE, Yui <naruse at airemix.com>. [ruby-dev:28570]
* parse.y (arg): too much NEW_LIST()
* eval.c (SETUP_ARGS0): remove unnecessary access to nd_alen.
* eval.c (rb_eval): use ARGSCAT for NODE_OP_ASGN1.
[ruby-dev:28585]
* parse.y (arg): use NODE_ARGSCAT for placeholder.
* lib/getoptlong.rb (GetoptLong::get): RDoc update patch from
mathew <meta at pobox.com>. [ruby-core:07738]
* variable.c (rb_const_set): raise error when no target klass is
supplied. [ruby-dev:28582]
* prec.c (prec_prec_f): documentation patch from
<gerardo.santana at gmail.com>. [ruby-core:07689]
* bignum.c (rb_big_pow): second operand may be too big even if
it's a Fixnum. [ruby-talk:187984]
* README.EXT: update symbol description. [ruby-talk:188104]
* COPYING: explicitly note GPLv2. [ruby-talk:187922]
* parse.y: remove some obsolete syntax rules (unparenthesized
method calls in argument list).
* eval.c (rb_call0): insecure calling should be checked for non
NODE_SCOPE method invocations too.
* eval.c (rb_alias): should preserve the current safe level as
well as method definition.
* process.c (rb_f_sleep): remove RDoc description about SIGALRM
which is not valid on the current implementation. [ruby-dev:28464]
Thu Mar 23 21:40:47 2006 K.Kosako <sndgk393 AT ybb.ne.jp>
* eval.c (method_missing): should support argument splat in
super. a bug in combination of super, splat and
method_missing. [ruby-talk:185438]
* configure.in: Solaris SunPro compiler -rapth patch from
<kuwa at labs.fujitsu.com>. [ruby-dev:28443]
* configure.in: remove enable_rpath=no for Solaris.
[ruby-dev:28440]
* ext/win32ole/win32ole.c (ole_val2olevariantdata): change behavior
of converting OLE Variant object with VT_ARRAY|VT_UI1 and Ruby
String object.
* ruby.1: a clarification patch from David Lutterkort
<dlutter at redhat.com>. [ruby-core:7508]
* lib/rdoc/ri/ri_paths.rb (RI::Paths): adding paths from rubygems
directories. a patch from Eric Hodel <drbrain at segment7.net>.
[ruby-core:07423]
* eval.c (rb_clear_cache_by_class): clearing wrong cache.
* ext/extmk.rb: use :remove_destination to install extension libraries
to avoid SEGV. [ruby-dev:28417]
* eval.c (rb_thread_fd_writable): should not re-schedule output
from KILLED thread (must be error printing).
* array.c (rb_ary_flatten_bang): allow specifying recursion
level. [ruby-talk:182170]
* array.c (rb_ary_flatten): ditto.
* gc.c (add_heap): a heap_slots may overflow. a patch from Stefan
Weil <weil at mail.berlios.de>.
* eval.c (rb_call): use separate cache for fcall/vcall
invocation.
* eval.c (rb_eval): NODE_FCALL, NODE_VCALL can call local
functions.
* eval.c (rb_mod_local): a new method to specify newly added
visibility "local".
* eval.c (search_method): search for local methods which are
visible only from the current class.
* class.c (rb_class_local_methods): a method to list local methods.
* object.c (Init_Object): add BasicObject class as a top level
BlankSlate class.
* ruby.h (SYM2ID): should not cast to signed long.
[ruby-core:07414]
* class.c (rb_include_module): allow module duplication.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10235 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2006-06-10 01:20:17 +04:00
|
|
|
{
|
2010-08-09 01:53:02 +04:00
|
|
|
rb_sys_warning("%s:%s", strerror(errno), (const char *)mesg);
|
2009-06-09 10:11:10 +04:00
|
|
|
return Qnil;
|
* sprintf.c (rb_str_format): allow %c to print one character
string (e.g. ?x).
* lib/tempfile.rb (Tempfile::make_tmpname): put dot between
basename and pid. [ruby-talk:196272]
* parse.y (do_block): remove -> style block.
* parse.y (parser_yylex): remove tLAMBDA_ARG.
* eval.c (rb_call0): binding for the return event hook should have
consistent scope. [ruby-core:07928]
* eval.c (proc_invoke): return behavior should depend whether it
is surrounded by a lambda or a mere block.
* eval.c (formal_assign): handles post splat arguments.
* eval.c (rb_call0): ditto.
* st.c (strhash): use FNV-1a hash.
* parse.y (parser_yylex): removed experimental ';;' terminator.
* eval.c (rb_node_arity): should be aware of post splat arguments.
* eval.c (rb_proc_arity): ditto.
* parse.y (f_args): syntax rule enhanced to support arguments
after the splat.
* parse.y (block_param): ditto for block parameters.
* parse.y (f_post_arg): mandatory formal arguments after the splat
argument.
* parse.y (new_args_gen): generate nodes for mandatory formal
arguments after the splat argument.
* eval.c (rb_eval): dispatch mandatory formal arguments after the
splat argument.
* parse.y (args): allow more than one splat in the argument list.
* parse.y (method_call): allow aref [] to accept all kind of
method argument, including assocs, splat, and block argument.
* eval.c (SETUP_ARGS0): prepare block argument as well.
* lib/mathn.rb (Integer): remove Integer#gcd2. [ruby-core:07931]
* eval.c (error_line): print receivers true/false/nil specially.
* eval.c (rb_proc_yield): handles parameters in yield semantics.
* eval.c (nil_yield): gives LocalJumpError to denote no block
error.
* io.c (rb_io_getc): now takes one-character string.
* string.c (rb_str_hash): use FNV-1a hash from Fowler/Noll/Vo
hashing algorithm.
* string.c (rb_str_aref): str[0] now returns 1 character string,
instead of a fixnum. [Ruby2]
* parse.y (parser_yylex): ?c now returns 1 character string,
instead of a fixnum. [Ruby2]
* string.c (rb_str_aset): no longer support fixnum insertion.
* eval.c (umethod_bind): should not update original class.
[ruby-dev:28636]
* eval.c (ev_const_get): should support constant access from
within instance_eval(). [ruby-dev:28327]
* time.c (time_timeval): should round for usec floating
number. [ruby-core:07896]
* time.c (time_add): ditto.
* dir.c (sys_warning): should not call a vararg function
rb_sys_warning() indirectly. [ruby-core:07886]
* numeric.c (flo_divmod): the first element of Float#divmod should
be an integer. [ruby-dev:28589]
* test/ruby/test_float.rb: add tests for divmod, div, modulo and remainder.
* re.c (rb_reg_initialize): should not allow modifying literal
regexps. frozen check moved from rb_reg_initialize_m as well.
* re.c (rb_reg_initialize): should not modify untainted objects in
safe levels higher than 3.
* re.c (rb_memcmp): type change from char* to const void*.
* dir.c (dir_close): should not close untainted dir stream.
* dir.c (GetDIR): add tainted/frozen check for each dir operation.
* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_symbol_arg):
typo fixed. a patch from Florian Gross <florg at florg.net>.
* eval.c (EXEC_EVENT_HOOK): trace_func may remove itself from
event_hooks. no guarantee for arbitrary hook deletion.
[ruby-dev:28632]
* util.c (ruby_strtod): differ addition to minimize error.
[ruby-dev:28619]
* util.c (ruby_strtod): should not raise ERANGE when the input
string does not have any digits. [ruby-dev:28629]
* eval.c (proc_invoke): should restore old ruby_frame->block.
thanks to ts <decoux at moulon.inra.fr>. [ruby-core:07833]
also fix [ruby-dev:28614] as well.
* signal.c (trap): sig should be less then NSIG. Coverity found
this bug. a patch from Kevin Tew <tewk at tewk.com>.
[ruby-core:07823]
* math.c (math_log2): add new method inspired by
[ruby-talk:191237].
* math.c (math_log): add optional base argument to Math::log().
[ruby-talk:191308]
* ext/syck/emitter.c (syck_scan_scalar): avoid accessing
uninitialized array element. a patch from Pat Eyler
<rubypate at gmail.com>. [ruby-core:07809]
* array.c (rb_ary_fill): initialize local variables first. a
patch from Pat Eyler <rubypate at gmail.com>. [ruby-core:07810]
* ext/syck/yaml2byte.c (syck_yaml2byte_handler): need to free
type_tag. a patch from Pat Eyler <rubypate at gmail.com>.
[ruby-core:07808]
* ext/socket/socket.c (make_hostent_internal): accept ai_family
check from Sam Roberts <sroberts at uniserve.com>.
[ruby-core:07691]
* util.c (ruby_strtod): should not cut off 18 digits for no
reason. [ruby-core:07796]
* array.c (rb_ary_fill): internalize local variable "beg" to
pacify Coverity. [ruby-core:07770]
* pack.c (pack_unpack): now supports CRLF newlines. a patch from
<tommy at tmtm.org>. [ruby-dev:28601]
* applied code clean-up patch from Stefan Huehner
<stefan at huehner.org>. [ruby-core:07764]
* lib/jcode.rb (String::tr_s): should have translated non
squeezing character sequence (i.e. a character) as well. thanks
to Hiroshi Ichikawa <gimite at gimite.ddo.jp> [ruby-list:42090]
* ext/socket/socket.c: document update patch from Sam Roberts
<sroberts at uniserve.com>. [ruby-core:07701]
* lib/mathn.rb (Integer): need not to remove gcd2. a patch from
NARUSE, Yui <naruse at airemix.com>. [ruby-dev:28570]
* parse.y (arg): too much NEW_LIST()
* eval.c (SETUP_ARGS0): remove unnecessary access to nd_alen.
* eval.c (rb_eval): use ARGSCAT for NODE_OP_ASGN1.
[ruby-dev:28585]
* parse.y (arg): use NODE_ARGSCAT for placeholder.
* lib/getoptlong.rb (GetoptLong::get): RDoc update patch from
mathew <meta at pobox.com>. [ruby-core:07738]
* variable.c (rb_const_set): raise error when no target klass is
supplied. [ruby-dev:28582]
* prec.c (prec_prec_f): documentation patch from
<gerardo.santana at gmail.com>. [ruby-core:07689]
* bignum.c (rb_big_pow): second operand may be too big even if
it's a Fixnum. [ruby-talk:187984]
* README.EXT: update symbol description. [ruby-talk:188104]
* COPYING: explicitly note GPLv2. [ruby-talk:187922]
* parse.y: remove some obsolete syntax rules (unparenthesized
method calls in argument list).
* eval.c (rb_call0): insecure calling should be checked for non
NODE_SCOPE method invocations too.
* eval.c (rb_alias): should preserve the current safe level as
well as method definition.
* process.c (rb_f_sleep): remove RDoc description about SIGALRM
which is not valid on the current implementation. [ruby-dev:28464]
Thu Mar 23 21:40:47 2006 K.Kosako <sndgk393 AT ybb.ne.jp>
* eval.c (method_missing): should support argument splat in
super. a bug in combination of super, splat and
method_missing. [ruby-talk:185438]
* configure.in: Solaris SunPro compiler -rapth patch from
<kuwa at labs.fujitsu.com>. [ruby-dev:28443]
* configure.in: remove enable_rpath=no for Solaris.
[ruby-dev:28440]
* ext/win32ole/win32ole.c (ole_val2olevariantdata): change behavior
of converting OLE Variant object with VT_ARRAY|VT_UI1 and Ruby
String object.
* ruby.1: a clarification patch from David Lutterkort
<dlutter at redhat.com>. [ruby-core:7508]
* lib/rdoc/ri/ri_paths.rb (RI::Paths): adding paths from rubygems
directories. a patch from Eric Hodel <drbrain at segment7.net>.
[ruby-core:07423]
* eval.c (rb_clear_cache_by_class): clearing wrong cache.
* ext/extmk.rb: use :remove_destination to install extension libraries
to avoid SEGV. [ruby-dev:28417]
* eval.c (rb_thread_fd_writable): should not re-schedule output
from KILLED thread (must be error printing).
* array.c (rb_ary_flatten_bang): allow specifying recursion
level. [ruby-talk:182170]
* array.c (rb_ary_flatten): ditto.
* gc.c (add_heap): a heap_slots may overflow. a patch from Stefan
Weil <weil at mail.berlios.de>.
* eval.c (rb_call): use separate cache for fcall/vcall
invocation.
* eval.c (rb_eval): NODE_FCALL, NODE_VCALL can call local
functions.
* eval.c (rb_mod_local): a new method to specify newly added
visibility "local".
* eval.c (search_method): search for local methods which are
visible only from the current class.
* class.c (rb_class_local_methods): a method to list local methods.
* object.c (Init_Object): add BasicObject class as a top level
BlankSlate class.
* ruby.h (SYM2ID): should not cast to signed long.
[ruby-core:07414]
* class.c (rb_include_module): allow module duplication.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10235 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2006-06-10 01:20:17 +04:00
|
|
|
}
|
|
|
|
|
2009-06-09 10:11:10 +04:00
|
|
|
#define GLOB_VERBOSE (1U << (sizeof(int) * CHAR_BIT - 1))
|
2005-09-14 17:41:02 +04:00
|
|
|
#define sys_warning(val) \
|
2009-06-09 10:11:10 +04:00
|
|
|
(void)((flags & GLOB_VERBOSE) && rb_protect(sys_warning_1, (VALUE)(val), 0))
|
2006-10-30 17:23:46 +03:00
|
|
|
|
2010-12-08 14:38:29 +03:00
|
|
|
#define GLOB_ALLOC(type) ((type *)malloc(sizeof(type)))
|
|
|
|
#define GLOB_ALLOC_N(type, n) ((type *)malloc(sizeof(type) * (n)))
|
* array.c, bignum.c, cont.c, dir.c, dln.c, encoding.c, enumerator.c,
enumerator.c (enumerator_allocate), eval_jump.c, file.c, hash.c,
io.c, load.c, pack.c, proc.c, random.c, re.c, ruby.c, st.c,
string.c, thread.c, thread_pthread.c, time.c, util.c, variable.c,
vm.c, gc.c:
allocated memory objects by xmalloc (ruby_xmalloc) should be
freed by xfree (ruby_xfree).
* ext/curses/curses.c, ext/dbm/dbm.c, ext/digest/digest.c,
ext/gdbm/gdbm.c, ext/json/ext/parser/parser.c,
ext/json/ext/parser/unicode.c, ext/openssl/ossl_cipher.c,
ext/openssl/ossl_hmac.c, ext/openssl/ossl_pkey_ec.c,
ext/sdbm/init.c, ext/strscan/strscan.c, ext/zlib/zlib.c:
ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@17017 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-06-08 14:01:40 +04:00
|
|
|
#define GLOB_FREE(ptr) free(ptr)
|
2010-12-08 14:38:29 +03:00
|
|
|
#define GLOB_JUMP_TAG(status) (((status) == -1) ? rb_memerror() : rb_jump_tag(status))
|
2005-09-14 17:41:02 +04:00
|
|
|
|
2007-04-24 04:33:09 +04:00
|
|
|
/*
|
|
|
|
* ENOTDIR can be returned by stat(2) if a non-leaf element of the path
|
|
|
|
* is not a directory.
|
|
|
|
*/
|
|
|
|
#define to_be_ignored(e) ((e) == ENOENT || (e) == ENOTDIR)
|
|
|
|
|
2004-01-29 11:05:29 +03:00
|
|
|
/* System call with warning */
|
|
|
|
static int
|
2005-09-14 17:41:02 +04:00
|
|
|
do_stat(const char *path, struct stat *pst, int flags)
|
|
|
|
|
2004-01-29 11:05:29 +03:00
|
|
|
{
|
|
|
|
int ret = stat(path, pst);
|
2007-04-24 04:33:09 +04:00
|
|
|
if (ret < 0 && !to_be_ignored(errno))
|
2005-09-14 17:41:02 +04:00
|
|
|
sys_warning(path);
|
2004-02-07 17:22:33 +03:00
|
|
|
|
2004-01-29 11:05:29 +03:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2005-09-14 17:41:02 +04:00
|
|
|
do_lstat(const char *path, struct stat *pst, int flags)
|
2004-01-29 11:05:29 +03:00
|
|
|
{
|
|
|
|
int ret = lstat(path, pst);
|
2007-04-24 04:33:09 +04:00
|
|
|
if (ret < 0 && !to_be_ignored(errno))
|
2005-09-14 17:41:02 +04:00
|
|
|
sys_warning(path);
|
2004-02-07 17:22:33 +03:00
|
|
|
|
2004-01-29 11:05:29 +03:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static DIR *
|
2011-04-28 11:22:18 +04:00
|
|
|
do_opendir(const char *path, int flags, rb_encoding *enc)
|
2004-01-29 11:05:29 +03:00
|
|
|
{
|
2011-04-28 11:22:18 +04:00
|
|
|
DIR *dirp;
|
|
|
|
#ifdef _WIN32
|
|
|
|
volatile VALUE tmp;
|
|
|
|
if (enc != rb_usascii_encoding() &&
|
|
|
|
enc != rb_ascii8bit_encoding() &&
|
|
|
|
enc != rb_utf8_encoding()) {
|
|
|
|
tmp = rb_enc_str_new(path, strlen(path), enc);
|
|
|
|
tmp = rb_str_encode_ospath(tmp);
|
|
|
|
path = RSTRING_PTR(tmp);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
dirp = opendir(path);
|
2007-04-24 04:33:09 +04:00
|
|
|
if (dirp == NULL && !to_be_ignored(errno))
|
2005-09-14 17:41:02 +04:00
|
|
|
sys_warning(path);
|
2004-02-07 17:22:33 +03:00
|
|
|
|
2004-01-29 11:05:29 +03:00
|
|
|
return dirp;
|
|
|
|
}
|
|
|
|
|
1999-08-13 09:45:20 +04:00
|
|
|
/* Return nonzero if S has any special globbing chars in it. */
|
|
|
|
static int
|
2010-08-05 11:57:26 +04:00
|
|
|
has_magic(const char *p, const char *pend, int flags, rb_encoding *enc)
|
1999-08-13 09:45:20 +04:00
|
|
|
{
|
2004-04-09 12:06:01 +04:00
|
|
|
const int escape = !(flags & FNM_NOESCAPE);
|
2005-12-14 17:40:14 +03:00
|
|
|
const int nocase = flags & FNM_CASEFOLD;
|
2004-04-09 12:06:01 +04:00
|
|
|
|
1999-08-13 09:45:20 +04:00
|
|
|
register char c;
|
|
|
|
|
2010-08-05 11:57:26 +04:00
|
|
|
while (p < pend && (c = *p++) != 0) {
|
1999-08-13 09:45:20 +04:00
|
|
|
switch (c) {
|
|
|
|
case '*':
|
2004-04-09 12:06:01 +04:00
|
|
|
case '?':
|
|
|
|
case '[':
|
2004-01-29 11:05:29 +03:00
|
|
|
return 1;
|
1999-08-13 09:45:20 +04:00
|
|
|
|
2004-04-09 12:06:01 +04:00
|
|
|
case '\\':
|
|
|
|
if (escape && !(c = *p++))
|
|
|
|
return 0;
|
|
|
|
continue;
|
2005-12-14 17:40:14 +03:00
|
|
|
|
|
|
|
default:
|
|
|
|
if (!FNM_SYSCASE && ISALPHA(c) && nocase)
|
|
|
|
return 1;
|
2004-04-09 12:06:01 +04:00
|
|
|
}
|
|
|
|
|
2008-07-08 03:00:58 +04:00
|
|
|
p = Next(p-1, pend, enc);
|
2004-04-09 12:06:01 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Find separator in globbing pattern. */
|
|
|
|
static char *
|
2010-08-05 11:57:26 +04:00
|
|
|
find_dirsep(const char *p, const char *pend, int flags, rb_encoding *enc)
|
2004-04-09 12:06:01 +04:00
|
|
|
{
|
|
|
|
const int escape = !(flags & FNM_NOESCAPE);
|
|
|
|
|
|
|
|
register char c;
|
|
|
|
int open = 0;
|
|
|
|
|
2007-12-19 17:57:39 +03:00
|
|
|
while ((c = *p++) != 0) {
|
2004-04-09 12:06:01 +04:00
|
|
|
switch (c) {
|
|
|
|
case '[':
|
|
|
|
open = 1;
|
|
|
|
continue;
|
1999-08-13 09:45:20 +04:00
|
|
|
case ']':
|
2004-04-09 12:06:01 +04:00
|
|
|
open = 0;
|
|
|
|
continue;
|
|
|
|
|
|
|
|
case '/':
|
|
|
|
if (!open)
|
|
|
|
return (char *)p-1;
|
1999-08-13 09:45:20 +04:00
|
|
|
continue;
|
|
|
|
|
|
|
|
case '\\':
|
2004-01-29 11:05:29 +03:00
|
|
|
if (escape && !(c = *p++))
|
2004-04-09 12:06:01 +04:00
|
|
|
return (char *)p-1;
|
2004-01-02 19:21:26 +03:00
|
|
|
continue;
|
1999-08-13 09:45:20 +04:00
|
|
|
}
|
|
|
|
|
2008-07-08 03:00:58 +04:00
|
|
|
p = Next(p-1, pend, enc);
|
1999-08-13 09:45:20 +04:00
|
|
|
}
|
2004-01-02 19:21:26 +03:00
|
|
|
|
2004-04-09 12:06:01 +04:00
|
|
|
return (char *)p-1;
|
1999-08-13 09:45:20 +04:00
|
|
|
}
|
|
|
|
|
2007-12-31 09:43:32 +03:00
|
|
|
/* Remove escaping backslashes */
|
2012-12-01 10:05:33 +04:00
|
|
|
static char *
|
|
|
|
remove_backslashes(char *p, register const char *pend, rb_encoding *enc)
|
1999-08-13 09:45:20 +04:00
|
|
|
{
|
2004-01-02 19:21:26 +03:00
|
|
|
char *t = p;
|
|
|
|
char *s = p;
|
|
|
|
|
2004-01-29 11:05:29 +03:00
|
|
|
while (*p) {
|
2004-01-02 19:21:26 +03:00
|
|
|
if (*p == '\\') {
|
2004-01-29 11:05:29 +03:00
|
|
|
if (t != s)
|
2004-01-02 19:21:26 +03:00
|
|
|
memmove(t, s, p - s);
|
|
|
|
t += p - s;
|
|
|
|
s = ++p;
|
2004-01-29 11:05:29 +03:00
|
|
|
if (!*p) break;
|
2004-01-02 19:21:26 +03:00
|
|
|
}
|
2008-07-08 03:00:58 +04:00
|
|
|
Inc(p, pend, enc);
|
1999-08-13 09:45:20 +04:00
|
|
|
}
|
2004-01-02 19:21:26 +03:00
|
|
|
|
|
|
|
while (*p++);
|
|
|
|
|
2004-01-29 11:05:29 +03:00
|
|
|
if (t != s)
|
2004-01-02 19:21:26 +03:00
|
|
|
memmove(t, s, p - s); /* move '\0' too */
|
2012-12-01 10:05:33 +04:00
|
|
|
|
|
|
|
return p;
|
1999-08-13 09:45:20 +04:00
|
|
|
}
|
|
|
|
|
2004-01-29 11:05:29 +03:00
|
|
|
/* Globing pattern */
|
|
|
|
enum glob_pattern_type { PLAIN, MAGICAL, RECURSIVE, MATCH_ALL, MATCH_DIR };
|
|
|
|
|
|
|
|
struct glob_pattern {
|
|
|
|
char *str;
|
|
|
|
enum glob_pattern_type type;
|
|
|
|
struct glob_pattern *next;
|
|
|
|
};
|
|
|
|
|
2006-10-30 17:23:46 +03:00
|
|
|
static void glob_free_pattern(struct glob_pattern *list);
|
|
|
|
|
2004-01-29 11:05:29 +03:00
|
|
|
static struct glob_pattern *
|
2010-08-05 11:57:26 +04:00
|
|
|
glob_make_pattern(const char *p, const char *e, int flags, rb_encoding *enc)
|
2004-01-02 19:21:26 +03:00
|
|
|
{
|
2004-01-29 11:05:29 +03:00
|
|
|
struct glob_pattern *list, *tmp, **tail = &list;
|
2004-04-09 12:06:01 +04:00
|
|
|
int dirsep = 0; /* pattern is terminated with '/' */
|
2012-09-05 08:30:10 +04:00
|
|
|
int recursive = 0;
|
2004-01-29 11:05:29 +03:00
|
|
|
|
2010-08-05 11:57:26 +04:00
|
|
|
while (p < e && *p) {
|
2006-10-30 17:23:46 +03:00
|
|
|
tmp = GLOB_ALLOC(struct glob_pattern);
|
|
|
|
if (!tmp) goto error;
|
2004-01-29 11:05:29 +03:00
|
|
|
if (p[0] == '*' && p[1] == '*' && p[2] == '/') {
|
2004-04-09 12:06:01 +04:00
|
|
|
/* fold continuous RECURSIVEs (needed in glob_helper) */
|
2010-08-05 11:57:26 +04:00
|
|
|
do { p += 3; while (*p == '/') p++; } while (p[0] == '*' && p[1] == '*' && p[2] == '/');
|
2004-01-29 11:05:29 +03:00
|
|
|
tmp->type = RECURSIVE;
|
|
|
|
tmp->str = 0;
|
|
|
|
dirsep = 1;
|
2012-09-05 08:30:10 +04:00
|
|
|
recursive = 1;
|
2004-01-29 11:05:29 +03:00
|
|
|
}
|
|
|
|
else {
|
2010-08-05 11:57:26 +04:00
|
|
|
const char *m = find_dirsep(p, e, flags, enc);
|
|
|
|
int magic = has_magic(p, m, flags, enc);
|
|
|
|
char *buf;
|
|
|
|
|
2012-09-05 08:30:10 +04:00
|
|
|
if (!magic && !recursive && *m) {
|
2010-08-05 11:57:26 +04:00
|
|
|
const char *m2;
|
|
|
|
while (!has_magic(m+1, m2 = find_dirsep(m+1, e, flags, enc), flags, enc) &&
|
|
|
|
*m2) {
|
|
|
|
m = m2;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
buf = GLOB_ALLOC_N(char, m-p+1);
|
2006-10-30 17:23:46 +03:00
|
|
|
if (!buf) {
|
* array.c, bignum.c, cont.c, dir.c, dln.c, encoding.c, enumerator.c,
enumerator.c (enumerator_allocate), eval_jump.c, file.c, hash.c,
io.c, load.c, pack.c, proc.c, random.c, re.c, ruby.c, st.c,
string.c, thread.c, thread_pthread.c, time.c, util.c, variable.c,
vm.c, gc.c:
allocated memory objects by xmalloc (ruby_xmalloc) should be
freed by xfree (ruby_xfree).
* ext/curses/curses.c, ext/dbm/dbm.c, ext/digest/digest.c,
ext/gdbm/gdbm.c, ext/json/ext/parser/parser.c,
ext/json/ext/parser/unicode.c, ext/openssl/ossl_cipher.c,
ext/openssl/ossl_hmac.c, ext/openssl/ossl_pkey_ec.c,
ext/sdbm/init.c, ext/strscan/strscan.c, ext/zlib/zlib.c:
ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@17017 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-06-08 14:01:40 +04:00
|
|
|
GLOB_FREE(tmp);
|
2006-10-30 17:23:46 +03:00
|
|
|
goto error;
|
|
|
|
}
|
2004-01-29 11:05:29 +03:00
|
|
|
memcpy(buf, p, m-p);
|
|
|
|
buf[m-p] = '\0';
|
2010-08-05 11:57:26 +04:00
|
|
|
tmp->type = magic ? MAGICAL : PLAIN;
|
2004-01-29 11:05:29 +03:00
|
|
|
tmp->str = buf;
|
|
|
|
if (*m) {
|
|
|
|
dirsep = 1;
|
|
|
|
p = m + 1;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
dirsep = 0;
|
|
|
|
p = m;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
*tail = tmp;
|
|
|
|
tail = &tmp->next;
|
|
|
|
}
|
2004-01-02 19:21:26 +03:00
|
|
|
|
2006-10-30 17:23:46 +03:00
|
|
|
tmp = GLOB_ALLOC(struct glob_pattern);
|
|
|
|
if (!tmp) {
|
|
|
|
error:
|
|
|
|
*tail = 0;
|
|
|
|
glob_free_pattern(list);
|
|
|
|
return 0;
|
|
|
|
}
|
2004-01-29 11:05:29 +03:00
|
|
|
tmp->type = dirsep ? MATCH_DIR : MATCH_ALL;
|
|
|
|
tmp->str = 0;
|
|
|
|
*tail = tmp;
|
|
|
|
tmp->next = 0;
|
1999-08-13 09:45:20 +04:00
|
|
|
|
2004-01-29 11:05:29 +03:00
|
|
|
return list;
|
1999-08-13 09:45:20 +04:00
|
|
|
}
|
|
|
|
|
2004-01-29 11:05:29 +03:00
|
|
|
static void
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
glob_free_pattern(struct glob_pattern *list)
|
2001-02-14 08:52:06 +03:00
|
|
|
{
|
2004-01-29 11:05:29 +03:00
|
|
|
while (list) {
|
|
|
|
struct glob_pattern *tmp = list;
|
|
|
|
list = list->next;
|
|
|
|
if (tmp->str)
|
* array.c, bignum.c, cont.c, dir.c, dln.c, encoding.c, enumerator.c,
enumerator.c (enumerator_allocate), eval_jump.c, file.c, hash.c,
io.c, load.c, pack.c, proc.c, random.c, re.c, ruby.c, st.c,
string.c, thread.c, thread_pthread.c, time.c, util.c, variable.c,
vm.c, gc.c:
allocated memory objects by xmalloc (ruby_xmalloc) should be
freed by xfree (ruby_xfree).
* ext/curses/curses.c, ext/dbm/dbm.c, ext/digest/digest.c,
ext/gdbm/gdbm.c, ext/json/ext/parser/parser.c,
ext/json/ext/parser/unicode.c, ext/openssl/ossl_cipher.c,
ext/openssl/ossl_hmac.c, ext/openssl/ossl_pkey_ec.c,
ext/sdbm/init.c, ext/strscan/strscan.c, ext/zlib/zlib.c:
ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@17017 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-06-08 14:01:40 +04:00
|
|
|
GLOB_FREE(tmp->str);
|
|
|
|
GLOB_FREE(tmp);
|
2004-01-29 11:05:29 +03:00
|
|
|
}
|
2004-01-02 19:21:26 +03:00
|
|
|
}
|
2001-02-14 08:52:06 +03:00
|
|
|
|
2005-05-18 06:08:00 +04:00
|
|
|
static char *
|
2012-12-01 10:05:33 +04:00
|
|
|
join_path(const char *path, int dirsep, const char *name, size_t namlen)
|
2004-01-02 19:21:26 +03:00
|
|
|
{
|
2005-05-18 06:08:00 +04:00
|
|
|
long len = strlen(path);
|
2012-12-01 10:05:33 +04:00
|
|
|
char *buf = GLOB_ALLOC_N(char, len+namlen+(dirsep?1:0)+1);
|
2004-11-10 10:17:53 +03:00
|
|
|
|
2006-10-30 17:23:46 +03:00
|
|
|
if (!buf) return 0;
|
2005-05-18 06:08:00 +04:00
|
|
|
memcpy(buf, path, len);
|
2004-01-29 11:05:29 +03:00
|
|
|
if (dirsep) {
|
2009-01-25 03:08:06 +03:00
|
|
|
buf[len++] = '/';
|
2004-01-29 11:05:29 +03:00
|
|
|
}
|
2012-12-01 10:05:33 +04:00
|
|
|
memcpy(buf+len, name, namlen);
|
|
|
|
buf[len+namlen] = '\0';
|
2004-01-29 11:05:29 +03:00
|
|
|
return buf;
|
2001-02-14 08:52:06 +03:00
|
|
|
}
|
|
|
|
|
2012-09-05 05:44:20 +04:00
|
|
|
enum answer {UNKNOWN = -1, NO, YES};
|
2004-01-29 11:05:29 +03:00
|
|
|
|
1999-08-13 09:45:20 +04:00
|
|
|
#ifndef S_ISDIR
|
2010-12-08 14:38:29 +03:00
|
|
|
# define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
|
1999-08-13 09:45:20 +04:00
|
|
|
#endif
|
|
|
|
|
2004-01-02 19:21:26 +03:00
|
|
|
#ifndef S_ISLNK
|
|
|
|
# ifndef S_IFLNK
|
|
|
|
# define S_ISLNK(m) (0)
|
|
|
|
# else
|
2010-12-08 14:38:29 +03:00
|
|
|
# define S_ISLNK(m) (((m) & S_IFMT) == S_IFLNK)
|
2004-01-02 19:21:26 +03:00
|
|
|
# endif
|
|
|
|
#endif
|
|
|
|
|
2002-09-12 10:27:15 +04:00
|
|
|
struct glob_args {
|
2008-07-09 06:11:21 +04:00
|
|
|
void (*func)(const char *, VALUE, void *);
|
2008-07-08 06:44:12 +04:00
|
|
|
const char *path;
|
2005-09-16 17:46:05 +04:00
|
|
|
VALUE value;
|
2008-07-08 06:44:12 +04:00
|
|
|
rb_encoding *enc;
|
2002-09-12 10:27:15 +04:00
|
|
|
};
|
|
|
|
|
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
glob_func_caller(VALUE val)
|
2002-09-12 10:27:15 +04:00
|
|
|
{
|
2002-09-13 18:46:44 +04:00
|
|
|
struct glob_args *args = (struct glob_args *)val;
|
2004-11-10 10:17:53 +03:00
|
|
|
|
2008-07-08 06:44:12 +04:00
|
|
|
(*args->func)(args->path, args->value, args->enc);
|
2002-09-12 10:27:15 +04:00
|
|
|
return Qnil;
|
|
|
|
}
|
|
|
|
|
2010-12-08 14:38:29 +03:00
|
|
|
#define glob_call_func(func, path, arg, enc) (*(func))((path), (arg), (enc))
|
2002-09-12 10:27:15 +04:00
|
|
|
|
|
|
|
static int
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
glob_helper(
|
2008-07-08 06:44:12 +04:00
|
|
|
const char *path,
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
int dirsep, /* '/' should be placed before appending child entry's name to 'path'. */
|
|
|
|
enum answer exist, /* Does 'path' indicate an existing entry? */
|
|
|
|
enum answer isdir, /* Does 'path' indicate a directory or a symlink to a directory? */
|
|
|
|
struct glob_pattern **beg,
|
|
|
|
struct glob_pattern **end,
|
|
|
|
int flags,
|
2005-09-16 17:46:05 +04:00
|
|
|
ruby_glob_func *func,
|
2008-07-08 06:44:12 +04:00
|
|
|
VALUE arg,
|
|
|
|
rb_encoding *enc)
|
1999-08-13 09:45:20 +04:00
|
|
|
{
|
|
|
|
struct stat st;
|
2002-09-12 10:27:15 +04:00
|
|
|
int status = 0;
|
2004-01-29 11:05:29 +03:00
|
|
|
struct glob_pattern **cur, **new_beg, **new_end;
|
2004-02-07 17:22:33 +03:00
|
|
|
int plain = 0, magical = 0, recursive = 0, match_all = 0, match_dir = 0;
|
|
|
|
int escape = !(flags & FNM_NOESCAPE);
|
2004-01-29 11:05:29 +03:00
|
|
|
|
|
|
|
for (cur = beg; cur < end; ++cur) {
|
|
|
|
struct glob_pattern *p = *cur;
|
|
|
|
if (p->type == RECURSIVE) {
|
|
|
|
recursive = 1;
|
|
|
|
p = p->next;
|
2004-01-02 19:21:26 +03:00
|
|
|
}
|
2004-01-29 11:05:29 +03:00
|
|
|
switch (p->type) {
|
* compile.c, dir.c, eval.c, eval_jump.h, eval_method.h, numeric.c,
pack.c, parse.y, re.c, thread.c, vm.c, vm_dump.c, call_cfunc.ci,
thread_pthread.ci, thread_win32.ci: fixed indentation.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12431 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-06-05 08:25:10 +04:00
|
|
|
case PLAIN:
|
2004-02-07 17:22:33 +03:00
|
|
|
plain = 1;
|
2004-01-29 11:05:29 +03:00
|
|
|
break;
|
* compile.c, dir.c, eval.c, eval_jump.h, eval_method.h, numeric.c,
pack.c, parse.y, re.c, thread.c, vm.c, vm_dump.c, call_cfunc.ci,
thread_pthread.ci, thread_win32.ci: fixed indentation.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12431 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-06-05 08:25:10 +04:00
|
|
|
case MAGICAL:
|
2004-02-07 17:22:33 +03:00
|
|
|
magical = 1;
|
2004-01-29 11:05:29 +03:00
|
|
|
break;
|
* compile.c, dir.c, eval.c, eval_jump.h, eval_method.h, numeric.c,
pack.c, parse.y, re.c, thread.c, vm.c, vm_dump.c, call_cfunc.ci,
thread_pthread.ci, thread_win32.ci: fixed indentation.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12431 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-06-05 08:25:10 +04:00
|
|
|
case MATCH_ALL:
|
2004-01-29 11:05:29 +03:00
|
|
|
match_all = 1;
|
|
|
|
break;
|
* compile.c, dir.c, eval.c, eval_jump.h, eval_method.h, numeric.c,
pack.c, parse.y, re.c, thread.c, vm.c, vm_dump.c, call_cfunc.ci,
thread_pthread.ci, thread_win32.ci: fixed indentation.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12431 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-06-05 08:25:10 +04:00
|
|
|
case MATCH_DIR:
|
2004-01-29 11:05:29 +03:00
|
|
|
match_dir = 1;
|
|
|
|
break;
|
* compile.c, dir.c, eval.c, eval_jump.h, eval_method.h, numeric.c,
pack.c, parse.y, re.c, thread.c, vm.c, vm_dump.c, call_cfunc.ci,
thread_pthread.ci, thread_win32.ci: fixed indentation.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12431 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-06-05 08:25:10 +04:00
|
|
|
case RECURSIVE:
|
2005-06-28 17:08:32 +04:00
|
|
|
rb_bug("continuous RECURSIVEs");
|
2004-01-02 19:21:26 +03:00
|
|
|
}
|
|
|
|
}
|
1999-08-13 09:45:20 +04:00
|
|
|
|
2005-05-18 06:08:00 +04:00
|
|
|
if (*path) {
|
2004-02-08 04:07:09 +03:00
|
|
|
if (match_all && exist == UNKNOWN) {
|
2005-09-14 17:41:02 +04:00
|
|
|
if (do_lstat(path, &st, flags) == 0) {
|
2004-02-08 04:07:09 +03:00
|
|
|
exist = YES;
|
|
|
|
isdir = S_ISDIR(st.st_mode) ? YES : S_ISLNK(st.st_mode) ? UNKNOWN : NO;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
exist = NO;
|
|
|
|
isdir = NO;
|
|
|
|
}
|
2004-01-29 11:05:29 +03:00
|
|
|
}
|
2004-02-08 04:07:09 +03:00
|
|
|
if (match_dir && isdir == UNKNOWN) {
|
2005-09-14 17:41:02 +04:00
|
|
|
if (do_stat(path, &st, flags) == 0) {
|
2004-02-08 04:07:09 +03:00
|
|
|
exist = YES;
|
|
|
|
isdir = S_ISDIR(st.st_mode) ? YES : NO;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
exist = NO;
|
|
|
|
isdir = NO;
|
|
|
|
}
|
2001-02-19 12:15:27 +03:00
|
|
|
}
|
2004-02-08 04:07:09 +03:00
|
|
|
if (match_all && exist == YES) {
|
2008-07-08 06:44:12 +04:00
|
|
|
status = glob_call_func(func, path, arg, enc);
|
2004-02-08 04:07:09 +03:00
|
|
|
if (status) return status;
|
|
|
|
}
|
|
|
|
if (match_dir && isdir == YES) {
|
2012-12-01 10:05:33 +04:00
|
|
|
char *tmp = join_path(path, dirsep, "", 0);
|
2006-10-30 17:23:46 +03:00
|
|
|
if (!tmp) return -1;
|
2008-07-08 06:44:12 +04:00
|
|
|
status = glob_call_func(func, tmp, arg, enc);
|
* array.c, bignum.c, cont.c, dir.c, dln.c, encoding.c, enumerator.c,
enumerator.c (enumerator_allocate), eval_jump.c, file.c, hash.c,
io.c, load.c, pack.c, proc.c, random.c, re.c, ruby.c, st.c,
string.c, thread.c, thread_pthread.c, time.c, util.c, variable.c,
vm.c, gc.c:
allocated memory objects by xmalloc (ruby_xmalloc) should be
freed by xfree (ruby_xfree).
* ext/curses/curses.c, ext/dbm/dbm.c, ext/digest/digest.c,
ext/gdbm/gdbm.c, ext/json/ext/parser/parser.c,
ext/json/ext/parser/unicode.c, ext/openssl/ossl_cipher.c,
ext/openssl/ossl_hmac.c, ext/openssl/ossl_pkey_ec.c,
ext/sdbm/init.c, ext/strscan/strscan.c, ext/zlib/zlib.c:
ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@17017 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-06-08 14:01:40 +04:00
|
|
|
GLOB_FREE(tmp);
|
2004-02-08 04:07:09 +03:00
|
|
|
if (status) return status;
|
|
|
|
}
|
2004-01-02 19:21:26 +03:00
|
|
|
}
|
2004-01-29 11:05:29 +03:00
|
|
|
|
|
|
|
if (exist == NO || isdir == NO) return 0;
|
|
|
|
|
2004-02-07 17:22:33 +03:00
|
|
|
if (magical || recursive) {
|
2004-01-29 11:05:29 +03:00
|
|
|
struct dirent *dp;
|
2009-04-22 05:40:09 +04:00
|
|
|
DIR *dirp;
|
2009-08-19 20:10:06 +04:00
|
|
|
IF_HAVE_READDIR_R(DEFINE_STRUCT_DIRENT entry);
|
2011-04-28 11:22:18 +04:00
|
|
|
dirp = do_opendir(*path ? path : ".", flags, enc);
|
2004-01-02 19:21:26 +03:00
|
|
|
if (dirp == NULL) return 0;
|
2000-02-01 06:12:21 +03:00
|
|
|
|
2009-08-19 20:10:06 +04:00
|
|
|
while (READDIR(dirp, enc, &STRUCT_DIRENT(entry), dp)) {
|
2012-09-05 05:44:36 +04:00
|
|
|
char *buf;
|
2004-01-29 11:05:29 +03:00
|
|
|
enum answer new_isdir = UNKNOWN;
|
2006-10-30 17:23:46 +03:00
|
|
|
|
2012-09-05 05:44:36 +04:00
|
|
|
if (recursive && dp->d_name[0] == '.') {
|
|
|
|
/* RECURSIVE never match dot files unless FNM_DOTMATCH is set */
|
|
|
|
if (!(flags & FNM_DOTMATCH)) continue;
|
|
|
|
|
|
|
|
/* always skip current and parent directories not to recurse infinitely */
|
|
|
|
if (!dp->d_name[1]) continue;
|
|
|
|
if (dp->d_name[1] == '.' && !dp->d_name[2]) continue;
|
|
|
|
}
|
|
|
|
|
2012-12-01 10:05:33 +04:00
|
|
|
buf = join_path(path, dirsep, dp->d_name, NAMLEN(dp));
|
2006-10-30 17:23:46 +03:00
|
|
|
if (!buf) {
|
|
|
|
status = -1;
|
|
|
|
break;
|
|
|
|
}
|
2012-09-05 05:44:36 +04:00
|
|
|
if (recursive) {
|
2004-01-05 13:01:54 +03:00
|
|
|
#ifndef _WIN32
|
2005-09-14 17:41:02 +04:00
|
|
|
if (do_lstat(buf, &st, flags) == 0)
|
2004-01-29 11:05:29 +03:00
|
|
|
new_isdir = S_ISDIR(st.st_mode) ? YES : S_ISLNK(st.st_mode) ? UNKNOWN : NO;
|
|
|
|
else
|
|
|
|
new_isdir = NO;
|
|
|
|
#else
|
2004-01-29 14:59:55 +03:00
|
|
|
new_isdir = dp->d_isdir ? (!dp->d_isrep ? YES : UNKNOWN) : NO;
|
2004-01-05 13:01:54 +03:00
|
|
|
#endif
|
1999-08-13 09:45:20 +04:00
|
|
|
}
|
2004-01-29 11:05:29 +03:00
|
|
|
|
2006-10-30 17:23:46 +03:00
|
|
|
new_beg = new_end = GLOB_ALLOC_N(struct glob_pattern *, (end - beg) * 2);
|
|
|
|
if (!new_beg) {
|
2008-06-29 06:36:51 +04:00
|
|
|
GLOB_FREE(buf);
|
2006-10-30 17:23:46 +03:00
|
|
|
status = -1;
|
|
|
|
break;
|
|
|
|
}
|
2004-01-29 11:05:29 +03:00
|
|
|
|
|
|
|
for (cur = beg; cur < end; ++cur) {
|
|
|
|
struct glob_pattern *p = *cur;
|
|
|
|
if (p->type == RECURSIVE) {
|
|
|
|
if (new_isdir == YES) /* not symlink but real directory */
|
|
|
|
*new_end++ = p; /* append recursive pattern */
|
|
|
|
p = p->next; /* 0 times recursion */
|
|
|
|
}
|
|
|
|
if (p->type == PLAIN || p->type == MAGICAL) {
|
2008-07-08 06:44:12 +04:00
|
|
|
if (fnmatch(p->str, enc, dp->d_name, flags) == 0)
|
2004-01-29 11:05:29 +03:00
|
|
|
*new_end++ = p->next;
|
|
|
|
}
|
2004-01-02 19:21:26 +03:00
|
|
|
}
|
2004-01-29 11:05:29 +03:00
|
|
|
|
2008-07-08 06:44:12 +04:00
|
|
|
status = glob_helper(buf, 1, YES, new_isdir, new_beg, new_end,
|
|
|
|
flags, func, arg, enc);
|
* array.c, bignum.c, cont.c, dir.c, dln.c, encoding.c, enumerator.c,
enumerator.c (enumerator_allocate), eval_jump.c, file.c, hash.c,
io.c, load.c, pack.c, proc.c, random.c, re.c, ruby.c, st.c,
string.c, thread.c, thread_pthread.c, time.c, util.c, variable.c,
vm.c, gc.c:
allocated memory objects by xmalloc (ruby_xmalloc) should be
freed by xfree (ruby_xfree).
* ext/curses/curses.c, ext/dbm/dbm.c, ext/digest/digest.c,
ext/gdbm/gdbm.c, ext/json/ext/parser/parser.c,
ext/json/ext/parser/unicode.c, ext/openssl/ossl_cipher.c,
ext/openssl/ossl_hmac.c, ext/openssl/ossl_pkey_ec.c,
ext/sdbm/init.c, ext/strscan/strscan.c, ext/zlib/zlib.c:
ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@17017 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-06-08 14:01:40 +04:00
|
|
|
GLOB_FREE(buf);
|
|
|
|
GLOB_FREE(new_beg);
|
2004-01-02 19:21:26 +03:00
|
|
|
if (status) break;
|
|
|
|
}
|
2004-01-29 11:05:29 +03:00
|
|
|
|
|
|
|
closedir(dirp);
|
2004-01-02 19:21:26 +03:00
|
|
|
}
|
2004-02-07 17:22:33 +03:00
|
|
|
else if (plain) {
|
2004-01-29 11:05:29 +03:00
|
|
|
struct glob_pattern **copy_beg, **copy_end, **cur2;
|
|
|
|
|
2006-10-30 17:23:46 +03:00
|
|
|
copy_beg = copy_end = GLOB_ALLOC_N(struct glob_pattern *, end - beg);
|
|
|
|
if (!copy_beg) return -1;
|
2004-01-29 11:05:29 +03:00
|
|
|
for (cur = beg; cur < end; ++cur)
|
|
|
|
*copy_end++ = (*cur)->type == PLAIN ? *cur : 0;
|
|
|
|
|
|
|
|
for (cur = copy_beg; cur < copy_end; ++cur) {
|
|
|
|
if (*cur) {
|
2005-05-18 06:08:00 +04:00
|
|
|
char *buf;
|
2004-11-10 10:17:53 +03:00
|
|
|
char *name;
|
2009-01-25 03:08:06 +03:00
|
|
|
size_t len = strlen((*cur)->str) + 1;
|
|
|
|
name = GLOB_ALLOC_N(char, len);
|
2006-10-30 17:23:46 +03:00
|
|
|
if (!name) {
|
|
|
|
status = -1;
|
|
|
|
break;
|
|
|
|
}
|
2009-01-25 03:08:06 +03:00
|
|
|
memcpy(name, (*cur)->str, len);
|
2012-12-01 10:05:33 +04:00
|
|
|
if (escape)
|
|
|
|
len = remove_backslashes(name, name+len-1, enc) - name;
|
2004-01-29 11:05:29 +03:00
|
|
|
|
2006-10-30 17:23:46 +03:00
|
|
|
new_beg = new_end = GLOB_ALLOC_N(struct glob_pattern *, end - beg);
|
|
|
|
if (!new_beg) {
|
* array.c, bignum.c, cont.c, dir.c, dln.c, encoding.c, enumerator.c,
enumerator.c (enumerator_allocate), eval_jump.c, file.c, hash.c,
io.c, load.c, pack.c, proc.c, random.c, re.c, ruby.c, st.c,
string.c, thread.c, thread_pthread.c, time.c, util.c, variable.c,
vm.c, gc.c:
allocated memory objects by xmalloc (ruby_xmalloc) should be
freed by xfree (ruby_xfree).
* ext/curses/curses.c, ext/dbm/dbm.c, ext/digest/digest.c,
ext/gdbm/gdbm.c, ext/json/ext/parser/parser.c,
ext/json/ext/parser/unicode.c, ext/openssl/ossl_cipher.c,
ext/openssl/ossl_hmac.c, ext/openssl/ossl_pkey_ec.c,
ext/sdbm/init.c, ext/strscan/strscan.c, ext/zlib/zlib.c:
ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@17017 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-06-08 14:01:40 +04:00
|
|
|
GLOB_FREE(name);
|
2006-10-30 17:23:46 +03:00
|
|
|
status = -1;
|
|
|
|
break;
|
|
|
|
}
|
2004-01-29 11:05:29 +03:00
|
|
|
*new_end++ = (*cur)->next;
|
|
|
|
for (cur2 = cur + 1; cur2 < copy_end; ++cur2) {
|
2008-07-08 06:44:12 +04:00
|
|
|
if (*cur2 && fnmatch((*cur2)->str, enc, name, flags) == 0) {
|
2004-01-29 11:05:29 +03:00
|
|
|
*new_end++ = (*cur2)->next;
|
|
|
|
*cur2 = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-12-01 10:05:33 +04:00
|
|
|
buf = join_path(path, dirsep, name, len);
|
* array.c, bignum.c, cont.c, dir.c, dln.c, encoding.c, enumerator.c,
enumerator.c (enumerator_allocate), eval_jump.c, file.c, hash.c,
io.c, load.c, pack.c, proc.c, random.c, re.c, ruby.c, st.c,
string.c, thread.c, thread_pthread.c, time.c, util.c, variable.c,
vm.c, gc.c:
allocated memory objects by xmalloc (ruby_xmalloc) should be
freed by xfree (ruby_xfree).
* ext/curses/curses.c, ext/dbm/dbm.c, ext/digest/digest.c,
ext/gdbm/gdbm.c, ext/json/ext/parser/parser.c,
ext/json/ext/parser/unicode.c, ext/openssl/ossl_cipher.c,
ext/openssl/ossl_hmac.c, ext/openssl/ossl_pkey_ec.c,
ext/sdbm/init.c, ext/strscan/strscan.c, ext/zlib/zlib.c:
ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@17017 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-06-08 14:01:40 +04:00
|
|
|
GLOB_FREE(name);
|
2006-10-30 17:23:46 +03:00
|
|
|
if (!buf) {
|
* array.c, bignum.c, cont.c, dir.c, dln.c, encoding.c, enumerator.c,
enumerator.c (enumerator_allocate), eval_jump.c, file.c, hash.c,
io.c, load.c, pack.c, proc.c, random.c, re.c, ruby.c, st.c,
string.c, thread.c, thread_pthread.c, time.c, util.c, variable.c,
vm.c, gc.c:
allocated memory objects by xmalloc (ruby_xmalloc) should be
freed by xfree (ruby_xfree).
* ext/curses/curses.c, ext/dbm/dbm.c, ext/digest/digest.c,
ext/gdbm/gdbm.c, ext/json/ext/parser/parser.c,
ext/json/ext/parser/unicode.c, ext/openssl/ossl_cipher.c,
ext/openssl/ossl_hmac.c, ext/openssl/ossl_pkey_ec.c,
ext/sdbm/init.c, ext/strscan/strscan.c, ext/zlib/zlib.c:
ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@17017 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-06-08 14:01:40 +04:00
|
|
|
GLOB_FREE(new_beg);
|
2006-10-30 17:23:46 +03:00
|
|
|
status = -1;
|
|
|
|
break;
|
|
|
|
}
|
2008-07-08 06:44:12 +04:00
|
|
|
status = glob_helper(buf, 1, UNKNOWN, UNKNOWN, new_beg,
|
|
|
|
new_end, flags, func, arg, enc);
|
* array.c, bignum.c, cont.c, dir.c, dln.c, encoding.c, enumerator.c,
enumerator.c (enumerator_allocate), eval_jump.c, file.c, hash.c,
io.c, load.c, pack.c, proc.c, random.c, re.c, ruby.c, st.c,
string.c, thread.c, thread_pthread.c, time.c, util.c, variable.c,
vm.c, gc.c:
allocated memory objects by xmalloc (ruby_xmalloc) should be
freed by xfree (ruby_xfree).
* ext/curses/curses.c, ext/dbm/dbm.c, ext/digest/digest.c,
ext/gdbm/gdbm.c, ext/json/ext/parser/parser.c,
ext/json/ext/parser/unicode.c, ext/openssl/ossl_cipher.c,
ext/openssl/ossl_hmac.c, ext/openssl/ossl_pkey_ec.c,
ext/sdbm/init.c, ext/strscan/strscan.c, ext/zlib/zlib.c:
ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@17017 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-06-08 14:01:40 +04:00
|
|
|
GLOB_FREE(buf);
|
|
|
|
GLOB_FREE(new_beg);
|
2004-01-29 11:05:29 +03:00
|
|
|
if (status) break;
|
|
|
|
}
|
1999-08-13 09:45:20 +04:00
|
|
|
}
|
2004-01-02 19:21:26 +03:00
|
|
|
|
* array.c, bignum.c, cont.c, dir.c, dln.c, encoding.c, enumerator.c,
enumerator.c (enumerator_allocate), eval_jump.c, file.c, hash.c,
io.c, load.c, pack.c, proc.c, random.c, re.c, ruby.c, st.c,
string.c, thread.c, thread_pthread.c, time.c, util.c, variable.c,
vm.c, gc.c:
allocated memory objects by xmalloc (ruby_xmalloc) should be
freed by xfree (ruby_xfree).
* ext/curses/curses.c, ext/dbm/dbm.c, ext/digest/digest.c,
ext/gdbm/gdbm.c, ext/json/ext/parser/parser.c,
ext/json/ext/parser/unicode.c, ext/openssl/ossl_cipher.c,
ext/openssl/ossl_hmac.c, ext/openssl/ossl_pkey_ec.c,
ext/sdbm/init.c, ext/strscan/strscan.c, ext/zlib/zlib.c:
ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@17017 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-06-08 14:01:40 +04:00
|
|
|
GLOB_FREE(copy_beg);
|
1999-08-13 09:45:20 +04:00
|
|
|
}
|
2004-01-02 19:21:26 +03:00
|
|
|
|
2002-09-12 10:27:15 +04:00
|
|
|
return status;
|
1999-08-13 09:45:20 +04:00
|
|
|
}
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2004-04-12 05:45:27 +04:00
|
|
|
static int
|
2008-07-08 06:44:12 +04:00
|
|
|
ruby_glob0(const char *path, int flags, ruby_glob_func *func, VALUE arg, rb_encoding *enc)
|
2002-03-13 13:11:09 +03:00
|
|
|
{
|
2004-01-29 11:05:29 +03:00
|
|
|
struct glob_pattern *list;
|
* array.c: replace rb_protect_inspect() and rb_inspecting_p() by
rb_exec_recursive() in eval.c.
* eval.c (rb_exec_recursive): new function.
* array.c (rb_ary_join): use rb_exec_recursive().
* array.c (rb_ary_inspect, rb_ary_hash): ditto.
* file.c (rb_file_join): ditto.
* hash.c (rb_hash_inspect, rb_hash_to_s, rb_hash_hash): ditto.
* io.c (rb_io_puts): ditto.
* object.c (rb_obj_inspect): ditto
* struct.c (rb_struct_inspect): ditto.
* lib/set.rb (SortedSet::setup): a hack to shut up warning.
[ruby-talk:132866]
* lib/time.rb (Time::strptime): add new function. inspired by
[ruby-talk:132815].
* lib/parsedate.rb (ParseDate::strptime): ditto.
* regparse.c: move st_*_strend() functions from st.c. fixed some
potential memory leaks.
* exception error messages updated. [ruby-core:04497]
* ext/socket/socket.c (Init_socket): add bunch of Socket
constants. Patch from Sam Roberts <sroberts@uniserve.com>.
[ruby-core:04409]
* array.c (rb_ary_s_create): no need for negative argc check.
[ruby-core:04463]
* array.c (rb_ary_unshift_m): ditto.
* lib/xmlrpc/parser.rb (XMLRPC::FaultException): make it subclass
of StandardError class, not Exception class. [ruby-core:04429]
* parse.y (fcall_gen): lvar(arg) will be evaluated as
lvar.call(arg) when lvar is a defined local variable. [new]
* object.c (rb_class_initialize): call inherited method before
calling initializing block.
* eval.c (rb_thread_start_1): initialize newly pushed frame.
* lib/open3.rb (Open3::popen3): $? should not be EXIT_FAILURE.
fixed: [ruby-core:04444]
* eval.c (is_defined): NODE_IASGN is an assignment.
* ext/readline/readline.c (Readline.readline): use rl_outstream
and rl_instream. [ruby-dev:25699]
* ext/etc/etc.c (Init_etc): sGroup needs HAVE_ST_GR_PASSWD check
[ruby-dev:25675]
* misc/ruby-mode.el: [ruby-core:04415]
* lib/rdoc/generators/html_generator.rb: [ruby-core:04412]
* lib/rdoc/generators/ri_generator.rb: ditto.
* struct.c (make_struct): fixed: [ruby-core:04402]
* ext/curses/curses.c (window_color_set): [ruby-core:04393]
* ext/socket/socket.c (Init_socket): SO_REUSEPORT added.
[ruby-talk:130092]
* object.c: [ruby-doc:818]
* parse.y (open_args): fix too verbose warnings for the space
before argument parentheses. [ruby-dev:25492]
* parse.y (parser_yylex): ditto.
* parse.y (parser_yylex): the first expression in the parentheses
should not be a command. [ruby-dev:25492]
* lib/irb/context.rb (IRB::Context::initialize): [ruby-core:04330]
* object.c (Init_Object): remove Object#type. [ruby-core:04335]
* st.c (st_foreach): report success/failure by return value.
[ruby-Bugs-1396]
* parse.y: forgot to initialize parser struct. [ruby-dev:25492]
* parse.y (parser_yylex): no tLABEL on EXPR_BEG.
[ruby-talk:127711]
* document updates - [ruby-core:04296], [ruby-core:04301],
[ruby-core:04302], [ruby-core:04307]
* dir.c (rb_push_glob): should work for NUL delimited patterns.
* dir.c (rb_glob2): should aware of offset in the pattern.
* string.c (rb_str_new4): should propagate taintedness.
* env.h: rename member names in struct FRAME; last_func -> callee,
orig_func -> this_func, last_class -> this_class.
* struct.c (rb_struct_set): use original method name, not callee
name, to retrieve member slot. [ruby-core:04268]
* time.c (time_strftime): protect from format modification from GC
finalizers.
* object.c (Init_Object): remove rb_obj_id_obsolete()
* eval.c (rb_mod_define_method): incomplete subclass check.
[ruby-dev:25464]
* gc.c (rb_data_object_alloc): klass may be NULL.
[ruby-list:40498]
* bignum.c (rb_big_rand): should return positive random number.
[ruby-dev:25401]
* bignum.c (rb_big_rand): do not use rb_big_modulo to generate
random bignums. [ruby-dev:25396]
* variable.c (rb_autoload): [ruby-dev:25373]
* eval.c (svalue_to_avalue): [ruby-dev:25366]
* string.c (rb_str_justify): [ruby-dev:25367]
* io.c (rb_f_select): [ruby-dev:25312]
* ext/socket/socket.c (sock_s_getservbyport): [ruby-talk:124072]
* struct.c (make_struct): [ruby-dev:25249]
* dir.c (dir_open_dir): new function. [ruby-dev:25242]
* io.c (rb_f_open): add type check for return value from to_open.
* lib/pstore.rb (PStore#transaction): Use the empty content when a
file is not found. [ruby-dev:24561]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8068 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-03-04 09:47:45 +03:00
|
|
|
const char *root, *start;
|
2008-07-08 06:44:12 +04:00
|
|
|
char *buf;
|
2009-06-09 10:11:10 +04:00
|
|
|
size_t n;
|
2004-01-02 19:21:26 +03:00
|
|
|
int status;
|
|
|
|
|
2008-07-08 06:44:12 +04:00
|
|
|
start = root = path;
|
2005-12-14 17:40:14 +03:00
|
|
|
flags |= FNM_SYSCASE;
|
2004-01-02 19:21:26 +03:00
|
|
|
#if defined DOSISH
|
2012-01-25 06:32:06 +04:00
|
|
|
root = rb_enc_path_skip_prefix(root, root + strlen(root), enc);
|
2004-01-02 19:21:26 +03:00
|
|
|
#endif
|
|
|
|
|
2004-11-10 10:17:53 +03:00
|
|
|
if (root && *root == '/') root++;
|
2004-01-02 19:21:26 +03:00
|
|
|
|
2008-07-08 06:44:12 +04:00
|
|
|
n = root - start;
|
|
|
|
buf = GLOB_ALLOC_N(char, n + 1);
|
|
|
|
if (!buf) return -1;
|
|
|
|
MEMCPY(buf, start, char, n);
|
|
|
|
buf[n] = '\0';
|
2004-01-29 11:05:29 +03:00
|
|
|
|
2010-08-05 11:57:26 +04:00
|
|
|
list = glob_make_pattern(root, root + strlen(root), flags, enc);
|
2006-10-30 17:23:46 +03:00
|
|
|
if (!list) {
|
2008-07-08 06:44:12 +04:00
|
|
|
GLOB_FREE(buf);
|
2006-10-30 17:23:46 +03:00
|
|
|
return -1;
|
|
|
|
}
|
2008-07-08 06:44:12 +04:00
|
|
|
status = glob_helper(buf, 0, UNKNOWN, UNKNOWN, &list, &list + 1, flags, func, arg, enc);
|
2004-01-29 11:05:29 +03:00
|
|
|
glob_free_pattern(list);
|
2008-07-08 06:44:12 +04:00
|
|
|
GLOB_FREE(buf);
|
2004-01-29 11:05:29 +03:00
|
|
|
|
2004-04-12 05:45:27 +04:00
|
|
|
return status;
|
2002-03-13 13:11:09 +03:00
|
|
|
}
|
|
|
|
|
2005-09-14 17:41:02 +04:00
|
|
|
int
|
2005-09-16 17:46:05 +04:00
|
|
|
ruby_glob(const char *path, int flags, ruby_glob_func *func, VALUE arg)
|
2005-09-14 17:41:02 +04:00
|
|
|
{
|
2008-07-08 06:44:12 +04:00
|
|
|
return ruby_glob0(path, flags & ~GLOB_VERBOSE, func, arg,
|
|
|
|
rb_ascii8bit_encoding());
|
2005-09-14 17:41:02 +04:00
|
|
|
}
|
2004-11-10 10:17:53 +03:00
|
|
|
|
2005-09-14 17:41:02 +04:00
|
|
|
static int
|
2008-07-09 06:11:21 +04:00
|
|
|
rb_glob_caller(const char *path, VALUE a, void *enc)
|
2004-11-10 10:17:53 +03:00
|
|
|
{
|
2005-09-14 17:41:02 +04:00
|
|
|
int status;
|
|
|
|
struct glob_args *args = (struct glob_args *)a;
|
|
|
|
|
2005-09-16 17:46:05 +04:00
|
|
|
args->path = path;
|
2005-09-14 17:41:02 +04:00
|
|
|
rb_protect(glob_func_caller, a, &status);
|
|
|
|
return status;
|
2004-11-10 10:17:53 +03:00
|
|
|
}
|
|
|
|
|
2005-09-14 17:41:02 +04:00
|
|
|
static int
|
2008-07-08 06:44:12 +04:00
|
|
|
rb_glob2(const char *path, int flags,
|
2008-07-09 06:11:21 +04:00
|
|
|
void (*func)(const char *, VALUE, void *), VALUE arg,
|
2008-07-08 06:44:12 +04:00
|
|
|
rb_encoding* enc)
|
2000-11-20 04:24:28 +03:00
|
|
|
{
|
2005-09-14 17:41:02 +04:00
|
|
|
struct glob_args args;
|
2004-11-10 10:17:53 +03:00
|
|
|
|
|
|
|
args.func = func;
|
2005-09-16 17:46:05 +04:00
|
|
|
args.value = arg;
|
2008-07-08 06:44:12 +04:00
|
|
|
args.enc = enc;
|
2004-04-12 05:45:27 +04:00
|
|
|
|
2005-12-14 17:40:14 +03:00
|
|
|
if (flags & FNM_SYSCASE) {
|
|
|
|
rb_warning("Dir.glob() ignores File::FNM_CASEFOLD");
|
2005-09-14 17:41:02 +04:00
|
|
|
}
|
|
|
|
|
2008-07-08 06:44:12 +04:00
|
|
|
return ruby_glob0(path, flags | GLOB_VERBOSE, rb_glob_caller, (VALUE)&args,
|
|
|
|
enc);
|
2005-09-14 17:41:02 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2008-07-08 06:44:12 +04:00
|
|
|
rb_glob(const char *path, void (*func)(const char *, VALUE, void *), VALUE arg)
|
2005-09-14 17:41:02 +04:00
|
|
|
{
|
2008-07-08 06:44:12 +04:00
|
|
|
int status = rb_glob2(path, 0, func, arg, rb_ascii8bit_encoding());
|
2006-10-30 17:23:46 +03:00
|
|
|
if (status) GLOB_JUMP_TAG(status);
|
2000-11-20 04:24:28 +03:00
|
|
|
}
|
|
|
|
|
1999-08-13 09:45:20 +04:00
|
|
|
static void
|
2008-07-09 06:11:21 +04:00
|
|
|
push_pattern(const char *path, VALUE ary, void *enc)
|
1999-08-13 09:45:20 +04:00
|
|
|
{
|
2008-10-18 14:36:20 +04:00
|
|
|
rb_ary_push(ary, rb_external_str_new_with_enc(path, strlen(path), enc));
|
1999-08-13 09:45:20 +04:00
|
|
|
}
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2008-07-07 21:29:44 +04:00
|
|
|
static int
|
2008-07-08 06:44:12 +04:00
|
|
|
ruby_brace_expand(const char *str, int flags, ruby_glob_func *func, VALUE arg,
|
|
|
|
rb_encoding *enc)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2004-04-15 14:32:09 +04:00
|
|
|
const int escape = !(flags & FNM_NOESCAPE);
|
2005-05-18 06:08:00 +04:00
|
|
|
const char *p = str;
|
2008-07-08 03:00:58 +04:00
|
|
|
const char *pend = p + strlen(p);
|
* array.c: replace rb_protect_inspect() and rb_inspecting_p() by
rb_exec_recursive() in eval.c.
* eval.c (rb_exec_recursive): new function.
* array.c (rb_ary_join): use rb_exec_recursive().
* array.c (rb_ary_inspect, rb_ary_hash): ditto.
* file.c (rb_file_join): ditto.
* hash.c (rb_hash_inspect, rb_hash_to_s, rb_hash_hash): ditto.
* io.c (rb_io_puts): ditto.
* object.c (rb_obj_inspect): ditto
* struct.c (rb_struct_inspect): ditto.
* lib/set.rb (SortedSet::setup): a hack to shut up warning.
[ruby-talk:132866]
* lib/time.rb (Time::strptime): add new function. inspired by
[ruby-talk:132815].
* lib/parsedate.rb (ParseDate::strptime): ditto.
* regparse.c: move st_*_strend() functions from st.c. fixed some
potential memory leaks.
* exception error messages updated. [ruby-core:04497]
* ext/socket/socket.c (Init_socket): add bunch of Socket
constants. Patch from Sam Roberts <sroberts@uniserve.com>.
[ruby-core:04409]
* array.c (rb_ary_s_create): no need for negative argc check.
[ruby-core:04463]
* array.c (rb_ary_unshift_m): ditto.
* lib/xmlrpc/parser.rb (XMLRPC::FaultException): make it subclass
of StandardError class, not Exception class. [ruby-core:04429]
* parse.y (fcall_gen): lvar(arg) will be evaluated as
lvar.call(arg) when lvar is a defined local variable. [new]
* object.c (rb_class_initialize): call inherited method before
calling initializing block.
* eval.c (rb_thread_start_1): initialize newly pushed frame.
* lib/open3.rb (Open3::popen3): $? should not be EXIT_FAILURE.
fixed: [ruby-core:04444]
* eval.c (is_defined): NODE_IASGN is an assignment.
* ext/readline/readline.c (Readline.readline): use rl_outstream
and rl_instream. [ruby-dev:25699]
* ext/etc/etc.c (Init_etc): sGroup needs HAVE_ST_GR_PASSWD check
[ruby-dev:25675]
* misc/ruby-mode.el: [ruby-core:04415]
* lib/rdoc/generators/html_generator.rb: [ruby-core:04412]
* lib/rdoc/generators/ri_generator.rb: ditto.
* struct.c (make_struct): fixed: [ruby-core:04402]
* ext/curses/curses.c (window_color_set): [ruby-core:04393]
* ext/socket/socket.c (Init_socket): SO_REUSEPORT added.
[ruby-talk:130092]
* object.c: [ruby-doc:818]
* parse.y (open_args): fix too verbose warnings for the space
before argument parentheses. [ruby-dev:25492]
* parse.y (parser_yylex): ditto.
* parse.y (parser_yylex): the first expression in the parentheses
should not be a command. [ruby-dev:25492]
* lib/irb/context.rb (IRB::Context::initialize): [ruby-core:04330]
* object.c (Init_Object): remove Object#type. [ruby-core:04335]
* st.c (st_foreach): report success/failure by return value.
[ruby-Bugs-1396]
* parse.y: forgot to initialize parser struct. [ruby-dev:25492]
* parse.y (parser_yylex): no tLABEL on EXPR_BEG.
[ruby-talk:127711]
* document updates - [ruby-core:04296], [ruby-core:04301],
[ruby-core:04302], [ruby-core:04307]
* dir.c (rb_push_glob): should work for NUL delimited patterns.
* dir.c (rb_glob2): should aware of offset in the pattern.
* string.c (rb_str_new4): should propagate taintedness.
* env.h: rename member names in struct FRAME; last_func -> callee,
orig_func -> this_func, last_class -> this_class.
* struct.c (rb_struct_set): use original method name, not callee
name, to retrieve member slot. [ruby-core:04268]
* time.c (time_strftime): protect from format modification from GC
finalizers.
* object.c (Init_Object): remove rb_obj_id_obsolete()
* eval.c (rb_mod_define_method): incomplete subclass check.
[ruby-dev:25464]
* gc.c (rb_data_object_alloc): klass may be NULL.
[ruby-list:40498]
* bignum.c (rb_big_rand): should return positive random number.
[ruby-dev:25401]
* bignum.c (rb_big_rand): do not use rb_big_modulo to generate
random bignums. [ruby-dev:25396]
* variable.c (rb_autoload): [ruby-dev:25373]
* eval.c (svalue_to_avalue): [ruby-dev:25366]
* string.c (rb_str_justify): [ruby-dev:25367]
* io.c (rb_f_select): [ruby-dev:25312]
* ext/socket/socket.c (sock_s_getservbyport): [ruby-talk:124072]
* struct.c (make_struct): [ruby-dev:25249]
* dir.c (dir_open_dir): new function. [ruby-dev:25242]
* io.c (rb_f_open): add type check for return value from to_open.
* lib/pstore.rb (PStore#transaction): Use the empty content when a
file is not found. [ruby-dev:24561]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8068 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-03-04 09:47:45 +03:00
|
|
|
const char *s = p;
|
2004-04-15 14:32:09 +04:00
|
|
|
const char *lbrace = 0, *rbrace = 0;
|
|
|
|
int nest = 0, status = 0;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
|
|
|
while (*p) {
|
2004-04-15 14:32:09 +04:00
|
|
|
if (*p == '{' && nest++ == 0) {
|
1998-01-16 15:13:05 +03:00
|
|
|
lbrace = p;
|
|
|
|
}
|
2004-04-15 14:32:09 +04:00
|
|
|
if (*p == '}' && --nest <= 0) {
|
1998-01-16 15:13:05 +03:00
|
|
|
rbrace = p;
|
|
|
|
break;
|
|
|
|
}
|
2004-04-15 14:32:09 +04:00
|
|
|
if (*p == '\\' && escape) {
|
|
|
|
if (!*++p) break;
|
|
|
|
}
|
2008-07-08 03:00:58 +04:00
|
|
|
Inc(p, pend, enc);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2003-05-19 19:54:37 +04:00
|
|
|
if (lbrace && rbrace) {
|
* dir.c, dln.c, parse.y, re.c, ruby.c, sprintf.c, strftime.c,
string.c, util.c, variable.c: use strlcpy, memcpy and snprintf
instead of strcpy, strncpy and sprintf.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22984 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-03-17 04:29:17 +03:00
|
|
|
size_t len = strlen(s) + 1;
|
|
|
|
char *buf = GLOB_ALLOC_N(char, len);
|
* array.c: replace rb_protect_inspect() and rb_inspecting_p() by
rb_exec_recursive() in eval.c.
* eval.c (rb_exec_recursive): new function.
* array.c (rb_ary_join): use rb_exec_recursive().
* array.c (rb_ary_inspect, rb_ary_hash): ditto.
* file.c (rb_file_join): ditto.
* hash.c (rb_hash_inspect, rb_hash_to_s, rb_hash_hash): ditto.
* io.c (rb_io_puts): ditto.
* object.c (rb_obj_inspect): ditto
* struct.c (rb_struct_inspect): ditto.
* lib/set.rb (SortedSet::setup): a hack to shut up warning.
[ruby-talk:132866]
* lib/time.rb (Time::strptime): add new function. inspired by
[ruby-talk:132815].
* lib/parsedate.rb (ParseDate::strptime): ditto.
* regparse.c: move st_*_strend() functions from st.c. fixed some
potential memory leaks.
* exception error messages updated. [ruby-core:04497]
* ext/socket/socket.c (Init_socket): add bunch of Socket
constants. Patch from Sam Roberts <sroberts@uniserve.com>.
[ruby-core:04409]
* array.c (rb_ary_s_create): no need for negative argc check.
[ruby-core:04463]
* array.c (rb_ary_unshift_m): ditto.
* lib/xmlrpc/parser.rb (XMLRPC::FaultException): make it subclass
of StandardError class, not Exception class. [ruby-core:04429]
* parse.y (fcall_gen): lvar(arg) will be evaluated as
lvar.call(arg) when lvar is a defined local variable. [new]
* object.c (rb_class_initialize): call inherited method before
calling initializing block.
* eval.c (rb_thread_start_1): initialize newly pushed frame.
* lib/open3.rb (Open3::popen3): $? should not be EXIT_FAILURE.
fixed: [ruby-core:04444]
* eval.c (is_defined): NODE_IASGN is an assignment.
* ext/readline/readline.c (Readline.readline): use rl_outstream
and rl_instream. [ruby-dev:25699]
* ext/etc/etc.c (Init_etc): sGroup needs HAVE_ST_GR_PASSWD check
[ruby-dev:25675]
* misc/ruby-mode.el: [ruby-core:04415]
* lib/rdoc/generators/html_generator.rb: [ruby-core:04412]
* lib/rdoc/generators/ri_generator.rb: ditto.
* struct.c (make_struct): fixed: [ruby-core:04402]
* ext/curses/curses.c (window_color_set): [ruby-core:04393]
* ext/socket/socket.c (Init_socket): SO_REUSEPORT added.
[ruby-talk:130092]
* object.c: [ruby-doc:818]
* parse.y (open_args): fix too verbose warnings for the space
before argument parentheses. [ruby-dev:25492]
* parse.y (parser_yylex): ditto.
* parse.y (parser_yylex): the first expression in the parentheses
should not be a command. [ruby-dev:25492]
* lib/irb/context.rb (IRB::Context::initialize): [ruby-core:04330]
* object.c (Init_Object): remove Object#type. [ruby-core:04335]
* st.c (st_foreach): report success/failure by return value.
[ruby-Bugs-1396]
* parse.y: forgot to initialize parser struct. [ruby-dev:25492]
* parse.y (parser_yylex): no tLABEL on EXPR_BEG.
[ruby-talk:127711]
* document updates - [ruby-core:04296], [ruby-core:04301],
[ruby-core:04302], [ruby-core:04307]
* dir.c (rb_push_glob): should work for NUL delimited patterns.
* dir.c (rb_glob2): should aware of offset in the pattern.
* string.c (rb_str_new4): should propagate taintedness.
* env.h: rename member names in struct FRAME; last_func -> callee,
orig_func -> this_func, last_class -> this_class.
* struct.c (rb_struct_set): use original method name, not callee
name, to retrieve member slot. [ruby-core:04268]
* time.c (time_strftime): protect from format modification from GC
finalizers.
* object.c (Init_Object): remove rb_obj_id_obsolete()
* eval.c (rb_mod_define_method): incomplete subclass check.
[ruby-dev:25464]
* gc.c (rb_data_object_alloc): klass may be NULL.
[ruby-list:40498]
* bignum.c (rb_big_rand): should return positive random number.
[ruby-dev:25401]
* bignum.c (rb_big_rand): do not use rb_big_modulo to generate
random bignums. [ruby-dev:25396]
* variable.c (rb_autoload): [ruby-dev:25373]
* eval.c (svalue_to_avalue): [ruby-dev:25366]
* string.c (rb_str_justify): [ruby-dev:25367]
* io.c (rb_f_select): [ruby-dev:25312]
* ext/socket/socket.c (sock_s_getservbyport): [ruby-talk:124072]
* struct.c (make_struct): [ruby-dev:25249]
* dir.c (dir_open_dir): new function. [ruby-dev:25242]
* io.c (rb_f_open): add type check for return value from to_open.
* lib/pstore.rb (PStore#transaction): Use the empty content when a
file is not found. [ruby-dev:24561]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8068 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-03-04 09:47:45 +03:00
|
|
|
long shift;
|
2004-11-10 10:17:53 +03:00
|
|
|
|
2006-10-30 17:23:46 +03:00
|
|
|
if (!buf) return -1;
|
1998-01-16 15:13:05 +03:00
|
|
|
memcpy(buf, s, lbrace-s);
|
* array.c: replace rb_protect_inspect() and rb_inspecting_p() by
rb_exec_recursive() in eval.c.
* eval.c (rb_exec_recursive): new function.
* array.c (rb_ary_join): use rb_exec_recursive().
* array.c (rb_ary_inspect, rb_ary_hash): ditto.
* file.c (rb_file_join): ditto.
* hash.c (rb_hash_inspect, rb_hash_to_s, rb_hash_hash): ditto.
* io.c (rb_io_puts): ditto.
* object.c (rb_obj_inspect): ditto
* struct.c (rb_struct_inspect): ditto.
* lib/set.rb (SortedSet::setup): a hack to shut up warning.
[ruby-talk:132866]
* lib/time.rb (Time::strptime): add new function. inspired by
[ruby-talk:132815].
* lib/parsedate.rb (ParseDate::strptime): ditto.
* regparse.c: move st_*_strend() functions from st.c. fixed some
potential memory leaks.
* exception error messages updated. [ruby-core:04497]
* ext/socket/socket.c (Init_socket): add bunch of Socket
constants. Patch from Sam Roberts <sroberts@uniserve.com>.
[ruby-core:04409]
* array.c (rb_ary_s_create): no need for negative argc check.
[ruby-core:04463]
* array.c (rb_ary_unshift_m): ditto.
* lib/xmlrpc/parser.rb (XMLRPC::FaultException): make it subclass
of StandardError class, not Exception class. [ruby-core:04429]
* parse.y (fcall_gen): lvar(arg) will be evaluated as
lvar.call(arg) when lvar is a defined local variable. [new]
* object.c (rb_class_initialize): call inherited method before
calling initializing block.
* eval.c (rb_thread_start_1): initialize newly pushed frame.
* lib/open3.rb (Open3::popen3): $? should not be EXIT_FAILURE.
fixed: [ruby-core:04444]
* eval.c (is_defined): NODE_IASGN is an assignment.
* ext/readline/readline.c (Readline.readline): use rl_outstream
and rl_instream. [ruby-dev:25699]
* ext/etc/etc.c (Init_etc): sGroup needs HAVE_ST_GR_PASSWD check
[ruby-dev:25675]
* misc/ruby-mode.el: [ruby-core:04415]
* lib/rdoc/generators/html_generator.rb: [ruby-core:04412]
* lib/rdoc/generators/ri_generator.rb: ditto.
* struct.c (make_struct): fixed: [ruby-core:04402]
* ext/curses/curses.c (window_color_set): [ruby-core:04393]
* ext/socket/socket.c (Init_socket): SO_REUSEPORT added.
[ruby-talk:130092]
* object.c: [ruby-doc:818]
* parse.y (open_args): fix too verbose warnings for the space
before argument parentheses. [ruby-dev:25492]
* parse.y (parser_yylex): ditto.
* parse.y (parser_yylex): the first expression in the parentheses
should not be a command. [ruby-dev:25492]
* lib/irb/context.rb (IRB::Context::initialize): [ruby-core:04330]
* object.c (Init_Object): remove Object#type. [ruby-core:04335]
* st.c (st_foreach): report success/failure by return value.
[ruby-Bugs-1396]
* parse.y: forgot to initialize parser struct. [ruby-dev:25492]
* parse.y (parser_yylex): no tLABEL on EXPR_BEG.
[ruby-talk:127711]
* document updates - [ruby-core:04296], [ruby-core:04301],
[ruby-core:04302], [ruby-core:04307]
* dir.c (rb_push_glob): should work for NUL delimited patterns.
* dir.c (rb_glob2): should aware of offset in the pattern.
* string.c (rb_str_new4): should propagate taintedness.
* env.h: rename member names in struct FRAME; last_func -> callee,
orig_func -> this_func, last_class -> this_class.
* struct.c (rb_struct_set): use original method name, not callee
name, to retrieve member slot. [ruby-core:04268]
* time.c (time_strftime): protect from format modification from GC
finalizers.
* object.c (Init_Object): remove rb_obj_id_obsolete()
* eval.c (rb_mod_define_method): incomplete subclass check.
[ruby-dev:25464]
* gc.c (rb_data_object_alloc): klass may be NULL.
[ruby-list:40498]
* bignum.c (rb_big_rand): should return positive random number.
[ruby-dev:25401]
* bignum.c (rb_big_rand): do not use rb_big_modulo to generate
random bignums. [ruby-dev:25396]
* variable.c (rb_autoload): [ruby-dev:25373]
* eval.c (svalue_to_avalue): [ruby-dev:25366]
* string.c (rb_str_justify): [ruby-dev:25367]
* io.c (rb_f_select): [ruby-dev:25312]
* ext/socket/socket.c (sock_s_getservbyport): [ruby-talk:124072]
* struct.c (make_struct): [ruby-dev:25249]
* dir.c (dir_open_dir): new function. [ruby-dev:25242]
* io.c (rb_f_open): add type check for return value from to_open.
* lib/pstore.rb (PStore#transaction): Use the empty content when a
file is not found. [ruby-dev:24561]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8068 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-03-04 09:47:45 +03:00
|
|
|
shift = (lbrace-s);
|
1998-01-16 15:13:05 +03:00
|
|
|
p = lbrace;
|
2004-04-15 14:32:09 +04:00
|
|
|
while (p < rbrace) {
|
|
|
|
const char *t = ++p;
|
|
|
|
nest = 0;
|
|
|
|
while (p < rbrace && !(*p == ',' && nest == 0)) {
|
|
|
|
if (*p == '{') nest++;
|
|
|
|
if (*p == '}') nest--;
|
|
|
|
if (*p == '\\' && escape) {
|
|
|
|
if (++p == rbrace) break;
|
|
|
|
}
|
2008-07-08 03:00:58 +04:00
|
|
|
Inc(p, pend, enc);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
* array.c: replace rb_protect_inspect() and rb_inspecting_p() by
rb_exec_recursive() in eval.c.
* eval.c (rb_exec_recursive): new function.
* array.c (rb_ary_join): use rb_exec_recursive().
* array.c (rb_ary_inspect, rb_ary_hash): ditto.
* file.c (rb_file_join): ditto.
* hash.c (rb_hash_inspect, rb_hash_to_s, rb_hash_hash): ditto.
* io.c (rb_io_puts): ditto.
* object.c (rb_obj_inspect): ditto
* struct.c (rb_struct_inspect): ditto.
* lib/set.rb (SortedSet::setup): a hack to shut up warning.
[ruby-talk:132866]
* lib/time.rb (Time::strptime): add new function. inspired by
[ruby-talk:132815].
* lib/parsedate.rb (ParseDate::strptime): ditto.
* regparse.c: move st_*_strend() functions from st.c. fixed some
potential memory leaks.
* exception error messages updated. [ruby-core:04497]
* ext/socket/socket.c (Init_socket): add bunch of Socket
constants. Patch from Sam Roberts <sroberts@uniserve.com>.
[ruby-core:04409]
* array.c (rb_ary_s_create): no need for negative argc check.
[ruby-core:04463]
* array.c (rb_ary_unshift_m): ditto.
* lib/xmlrpc/parser.rb (XMLRPC::FaultException): make it subclass
of StandardError class, not Exception class. [ruby-core:04429]
* parse.y (fcall_gen): lvar(arg) will be evaluated as
lvar.call(arg) when lvar is a defined local variable. [new]
* object.c (rb_class_initialize): call inherited method before
calling initializing block.
* eval.c (rb_thread_start_1): initialize newly pushed frame.
* lib/open3.rb (Open3::popen3): $? should not be EXIT_FAILURE.
fixed: [ruby-core:04444]
* eval.c (is_defined): NODE_IASGN is an assignment.
* ext/readline/readline.c (Readline.readline): use rl_outstream
and rl_instream. [ruby-dev:25699]
* ext/etc/etc.c (Init_etc): sGroup needs HAVE_ST_GR_PASSWD check
[ruby-dev:25675]
* misc/ruby-mode.el: [ruby-core:04415]
* lib/rdoc/generators/html_generator.rb: [ruby-core:04412]
* lib/rdoc/generators/ri_generator.rb: ditto.
* struct.c (make_struct): fixed: [ruby-core:04402]
* ext/curses/curses.c (window_color_set): [ruby-core:04393]
* ext/socket/socket.c (Init_socket): SO_REUSEPORT added.
[ruby-talk:130092]
* object.c: [ruby-doc:818]
* parse.y (open_args): fix too verbose warnings for the space
before argument parentheses. [ruby-dev:25492]
* parse.y (parser_yylex): ditto.
* parse.y (parser_yylex): the first expression in the parentheses
should not be a command. [ruby-dev:25492]
* lib/irb/context.rb (IRB::Context::initialize): [ruby-core:04330]
* object.c (Init_Object): remove Object#type. [ruby-core:04335]
* st.c (st_foreach): report success/failure by return value.
[ruby-Bugs-1396]
* parse.y: forgot to initialize parser struct. [ruby-dev:25492]
* parse.y (parser_yylex): no tLABEL on EXPR_BEG.
[ruby-talk:127711]
* document updates - [ruby-core:04296], [ruby-core:04301],
[ruby-core:04302], [ruby-core:04307]
* dir.c (rb_push_glob): should work for NUL delimited patterns.
* dir.c (rb_glob2): should aware of offset in the pattern.
* string.c (rb_str_new4): should propagate taintedness.
* env.h: rename member names in struct FRAME; last_func -> callee,
orig_func -> this_func, last_class -> this_class.
* struct.c (rb_struct_set): use original method name, not callee
name, to retrieve member slot. [ruby-core:04268]
* time.c (time_strftime): protect from format modification from GC
finalizers.
* object.c (Init_Object): remove rb_obj_id_obsolete()
* eval.c (rb_mod_define_method): incomplete subclass check.
[ruby-dev:25464]
* gc.c (rb_data_object_alloc): klass may be NULL.
[ruby-list:40498]
* bignum.c (rb_big_rand): should return positive random number.
[ruby-dev:25401]
* bignum.c (rb_big_rand): do not use rb_big_modulo to generate
random bignums. [ruby-dev:25396]
* variable.c (rb_autoload): [ruby-dev:25373]
* eval.c (svalue_to_avalue): [ruby-dev:25366]
* string.c (rb_str_justify): [ruby-dev:25367]
* io.c (rb_f_select): [ruby-dev:25312]
* ext/socket/socket.c (sock_s_getservbyport): [ruby-talk:124072]
* struct.c (make_struct): [ruby-dev:25249]
* dir.c (dir_open_dir): new function. [ruby-dev:25242]
* io.c (rb_f_open): add type check for return value from to_open.
* lib/pstore.rb (PStore#transaction): Use the empty content when a
file is not found. [ruby-dev:24561]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8068 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-03-04 09:47:45 +03:00
|
|
|
memcpy(buf+shift, t, p-t);
|
* dir.c, dln.c, parse.y, re.c, ruby.c, sprintf.c, strftime.c,
string.c, util.c, variable.c: use strlcpy, memcpy and snprintf
instead of strcpy, strncpy and sprintf.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22984 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-03-17 04:29:17 +03:00
|
|
|
strlcpy(buf+shift+(p-t), rbrace+1, len-(shift+(p-t)));
|
2008-07-07 21:29:44 +04:00
|
|
|
status = ruby_brace_expand(buf, flags, func, arg, enc);
|
2004-04-12 05:45:27 +04:00
|
|
|
if (status) break;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
* array.c, bignum.c, cont.c, dir.c, dln.c, encoding.c, enumerator.c,
enumerator.c (enumerator_allocate), eval_jump.c, file.c, hash.c,
io.c, load.c, pack.c, proc.c, random.c, re.c, ruby.c, st.c,
string.c, thread.c, thread_pthread.c, time.c, util.c, variable.c,
vm.c, gc.c:
allocated memory objects by xmalloc (ruby_xmalloc) should be
freed by xfree (ruby_xfree).
* ext/curses/curses.c, ext/dbm/dbm.c, ext/digest/digest.c,
ext/gdbm/gdbm.c, ext/json/ext/parser/parser.c,
ext/json/ext/parser/unicode.c, ext/openssl/ossl_cipher.c,
ext/openssl/ossl_hmac.c, ext/openssl/ossl_pkey_ec.c,
ext/sdbm/init.c, ext/strscan/strscan.c, ext/zlib/zlib.c:
ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@17017 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-06-08 14:01:40 +04:00
|
|
|
GLOB_FREE(buf);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
2004-04-15 14:32:09 +04:00
|
|
|
else if (!lbrace && !rbrace) {
|
2008-07-08 06:44:12 +04:00
|
|
|
status = (*func)(s, arg, enc);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
2004-04-12 05:45:27 +04:00
|
|
|
|
|
|
|
return status;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2005-09-16 17:46:05 +04:00
|
|
|
struct brace_args {
|
|
|
|
ruby_glob_func *func;
|
|
|
|
VALUE value;
|
|
|
|
int flags;
|
|
|
|
};
|
|
|
|
|
|
|
|
static int
|
2008-07-09 06:11:21 +04:00
|
|
|
glob_brace(const char *path, VALUE val, void *enc)
|
2005-09-16 17:46:05 +04:00
|
|
|
{
|
|
|
|
struct brace_args *arg = (struct brace_args *)val;
|
|
|
|
|
2008-07-08 06:44:12 +04:00
|
|
|
return ruby_glob0(path, arg->flags, arg->func, arg->value, enc);
|
2005-09-16 17:46:05 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2008-07-08 06:44:12 +04:00
|
|
|
ruby_brace_glob0(const char *str, int flags, ruby_glob_func *func, VALUE arg,
|
|
|
|
rb_encoding* enc)
|
2005-09-16 17:46:05 +04:00
|
|
|
{
|
|
|
|
struct brace_args args;
|
|
|
|
|
|
|
|
args.func = func;
|
|
|
|
args.value = arg;
|
|
|
|
args.flags = flags;
|
2008-07-08 06:44:12 +04:00
|
|
|
return ruby_brace_expand(str, flags, glob_brace, (VALUE)&args, enc);
|
2005-09-16 17:46:05 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
ruby_brace_glob(const char *str, int flags, ruby_glob_func *func, VALUE arg)
|
|
|
|
{
|
2008-07-08 06:44:12 +04:00
|
|
|
return ruby_brace_glob0(str, flags & ~GLOB_VERBOSE, func, arg,
|
|
|
|
rb_ascii8bit_encoding());
|
2005-09-16 17:46:05 +04:00
|
|
|
}
|
|
|
|
|
* merge some patches from win32-uncode-test branch.
see #1685.
* file.c, include/ruby/intern.h (rb_str_encode_ospath): new function
to convert encoding for pathname.
* win32.c, include/ruby/win32.h (rb_w32_ulink, rb_w32_urename,
rb_w32_ustati64, rb_w32_uopen, rb_w32_uutime, rb_w32_uchdir,
rb_w32_umkdir, rb_w32_urmdir, rb_w32_uunlink): new functions to
accept UTF-8 path.
* win32/win32.c (rb_w32_opendir, link, rb_w32_stati64, rb_w32_utime,
rb_w32_unlink): use WCHAR path internally.
* file.c (rb_stat, eaccess, access_internal, rb_file_s_ftype,
chmod_internal, rb_file_chmod, rb_file_chown, utime_internal,
rb_file_s_link, unlink_internal, rb_file_s_rename): use UTF-8 version
functions on Win32.
* file.c (apply2files, rb_stat, rb_file_s_lstat, rb_file_symlink_p,
rb_file_readable_p, rb_file_writable_p, rb_file_executable_p,
check3rdbyte, rb_file_identical_p, rb_file_chmod, rb_file_chown,
rb_file_s_link, rb_file_s_symlink, rb_file_s_rename): call
rb_str_encode_ospath() before passing the path to system.
* io.c (rb_sysopen): ditto.
* dir.c (dir_chdir, dir_s_mkdir, dir_s_rmdir): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27570 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-04-30 21:56:23 +04:00
|
|
|
int
|
|
|
|
ruby_brace_glob_with_enc(const char *str, int flags, ruby_glob_func *func, VALUE arg, rb_encoding *enc)
|
|
|
|
{
|
|
|
|
return ruby_brace_glob0(str, flags & ~GLOB_VERBOSE, func, arg, enc);
|
|
|
|
}
|
|
|
|
|
2005-09-16 17:46:05 +04:00
|
|
|
static int
|
2008-07-07 21:29:44 +04:00
|
|
|
push_glob(VALUE ary, VALUE str, int flags)
|
2005-09-16 17:46:05 +04:00
|
|
|
{
|
|
|
|
struct glob_args args;
|
2008-07-09 06:11:21 +04:00
|
|
|
rb_encoding *enc = rb_enc_get(str);
|
2005-09-16 17:46:05 +04:00
|
|
|
|
2008-08-22 07:32:13 +04:00
|
|
|
if (enc == rb_usascii_encoding()) enc = rb_filesystem_encoding();
|
2005-09-16 17:46:05 +04:00
|
|
|
args.func = push_pattern;
|
|
|
|
args.value = ary;
|
2008-07-09 06:11:21 +04:00
|
|
|
args.enc = enc;
|
|
|
|
|
2010-04-09 15:08:06 +04:00
|
|
|
RB_GC_GUARD(str);
|
2010-04-09 15:32:52 +04:00
|
|
|
return ruby_brace_glob0(RSTRING_PTR(str), flags | GLOB_VERBOSE,
|
|
|
|
rb_glob_caller, (VALUE)&args, enc);
|
2005-09-16 17:46:05 +04:00
|
|
|
}
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_push_glob(VALUE str, int flags) /* '\0' is delimiter */
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2004-11-10 10:17:53 +03:00
|
|
|
long offset = 0;
|
2002-03-13 13:11:09 +03:00
|
|
|
VALUE ary;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2009-09-18 11:06:29 +04:00
|
|
|
GlobPathValue(str, TRUE);
|
2004-10-19 14:25:23 +04:00
|
|
|
ary = rb_ary_new();
|
2004-11-10 10:17:53 +03:00
|
|
|
|
2006-08-31 14:47:44 +04:00
|
|
|
while (offset < RSTRING_LEN(str)) {
|
2004-11-17 07:05:18 +03:00
|
|
|
char *p, *pend;
|
2008-07-08 06:44:12 +04:00
|
|
|
int status;
|
2008-07-07 21:29:44 +04:00
|
|
|
p = RSTRING_PTR(str) + offset;
|
2008-07-08 06:44:12 +04:00
|
|
|
status = push_glob(ary, rb_enc_str_new(p, strlen(p), rb_enc_get(str)),
|
|
|
|
flags);
|
2006-10-30 17:23:46 +03:00
|
|
|
if (status) GLOB_JUMP_TAG(status);
|
2006-08-31 14:47:44 +04:00
|
|
|
if (offset >= RSTRING_LEN(str)) break;
|
2004-11-17 07:05:18 +03:00
|
|
|
p += strlen(p) + 1;
|
2006-08-31 14:47:44 +04:00
|
|
|
pend = RSTRING_PTR(str) + RSTRING_LEN(str);
|
2004-11-17 07:05:18 +03:00
|
|
|
while (p < pend && !*p)
|
|
|
|
p++;
|
2006-08-31 14:47:44 +04:00
|
|
|
offset = p - RSTRING_PTR(str);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
2004-04-12 05:45:27 +04:00
|
|
|
|
2005-09-16 17:46:05 +04:00
|
|
|
return ary;
|
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
dir_globs(long argc, VALUE *argv, int flags)
|
|
|
|
{
|
|
|
|
VALUE ary = rb_ary_new();
|
|
|
|
long i;
|
|
|
|
|
|
|
|
for (i = 0; i < argc; ++i) {
|
|
|
|
int status;
|
|
|
|
VALUE str = argv[i];
|
2009-09-18 11:06:29 +04:00
|
|
|
GlobPathValue(str, TRUE);
|
2008-07-07 21:29:44 +04:00
|
|
|
status = push_glob(ary, str, flags);
|
2006-10-30 17:23:46 +03:00
|
|
|
if (status) GLOB_JUMP_TAG(status);
|
2004-10-19 14:25:23 +04:00
|
|
|
}
|
2005-09-16 17:46:05 +04:00
|
|
|
|
2002-03-13 13:11:09 +03:00
|
|
|
return ary;
|
|
|
|
}
|
|
|
|
|
2003-12-19 18:18:09 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-18 01:07:33 +04:00
|
|
|
* Dir[ array ] -> array
|
|
|
|
* Dir[ string [, string ...] ] -> array
|
2003-12-19 18:18:09 +03:00
|
|
|
*
|
|
|
|
* Equivalent to calling
|
* compile.c, dir.c, eval.c, eval_jump.h, eval_method.h, numeric.c,
pack.c, parse.y, re.c, thread.c, vm.c, vm_dump.c, call_cfunc.ci,
thread_pthread.ci, thread_win32.ci: fixed indentation.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12431 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-06-05 08:25:10 +04:00
|
|
|
* <code>Dir.glob(</code><i>array,</i><code>0)</code> and
|
2005-09-16 17:46:05 +04:00
|
|
|
* <code>Dir.glob([</code><i>string,...</i><code>],0)</code>.
|
2003-12-19 18:18:09 +03:00
|
|
|
*
|
|
|
|
*/
|
2002-03-13 13:11:09 +03:00
|
|
|
static VALUE
|
2005-09-16 17:46:05 +04:00
|
|
|
dir_s_aref(int argc, VALUE *argv, VALUE obj)
|
2002-03-13 13:11:09 +03:00
|
|
|
{
|
2005-09-16 17:46:05 +04:00
|
|
|
if (argc == 1) {
|
|
|
|
return rb_push_glob(argv[0], 0);
|
|
|
|
}
|
|
|
|
return dir_globs(argc, argv, 0);
|
2002-03-13 13:11:09 +03:00
|
|
|
}
|
|
|
|
|
2003-12-19 18:18:09 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-18 01:07:33 +04:00
|
|
|
* Dir.glob( pattern, [flags] ) -> array
|
|
|
|
* Dir.glob( pattern, [flags] ) {| filename | block } -> nil
|
2003-12-19 18:18:09 +03:00
|
|
|
*
|
2005-09-16 17:46:05 +04:00
|
|
|
* Returns the filenames found by expanding <i>pattern</i> which is
|
|
|
|
* an +Array+ of the patterns or the pattern +String+, either as an
|
|
|
|
* <i>array</i> or as parameters to the block. Note that this pattern
|
|
|
|
* is not a regexp (it's closer to a shell glob). See
|
|
|
|
* <code>File::fnmatch</code> for the meaning of the <i>flags</i>
|
|
|
|
* parameter. Note that case sensitivity depends on your system (so
|
2011-06-28 03:38:31 +04:00
|
|
|
* <code>File::FNM_CASEFOLD</code> is ignored), as does the order
|
|
|
|
* in which the results are returned.
|
2004-08-09 07:54:15 +04:00
|
|
|
*
|
|
|
|
* <code>*</code>:: Matches any file. Can be restricted by
|
|
|
|
* other values in the glob. <code>*</code>
|
|
|
|
* will match all files; <code>c*</code> will
|
|
|
|
* match all files beginning with
|
|
|
|
* <code>c</code>; <code>*c</code> will match
|
|
|
|
* all files ending with <code>c</code>; and
|
2009-06-09 10:13:16 +04:00
|
|
|
* <code>\*c\*</code> will match all files that
|
2004-08-09 07:54:15 +04:00
|
|
|
* have <code>c</code> in them (including at
|
|
|
|
* the beginning or end). Equivalent to
|
2010-06-05 01:22:47 +04:00
|
|
|
* <code>/ .* /x</code> in regexp. Note, this
|
|
|
|
* will not match Unix-like hidden files (dotfiles).
|
|
|
|
* In order to include those in the match results,
|
2012-11-03 08:47:49 +04:00
|
|
|
* you must use something like <code>"{*,.*}"</code>.
|
2004-08-09 07:54:15 +04:00
|
|
|
* <code>**</code>:: Matches directories recursively.
|
|
|
|
* <code>?</code>:: Matches any one character. Equivalent to
|
|
|
|
* <code>/.{1}/</code> in regexp.
|
|
|
|
* <code>[set]</code>:: Matches any one character in +set+.
|
|
|
|
* Behaves exactly like character sets in
|
|
|
|
* Regexp, including set negation
|
|
|
|
* (<code>[^a-z]</code>).
|
|
|
|
* <code>{p,q}</code>:: Matches either literal <code>p</code> or
|
|
|
|
* literal <code>q</code>. Matching literals
|
|
|
|
* may be more than one character in length.
|
|
|
|
* More than two literals may be specified.
|
|
|
|
* Equivalent to pattern alternation in
|
|
|
|
* regexp.
|
2012-11-03 08:47:49 +04:00
|
|
|
* <code> \\ </code>:: Escapes the next metacharacter.
|
|
|
|
* Note that this means you cannot use backslash
|
|
|
|
* in windows as part of a glob,
|
|
|
|
* i.e. <code>Dir["c:\\foo*"]</code> will not work,
|
|
|
|
* use <code>Dir["c:/foo*"]</code> instead.
|
2003-12-19 18:18:09 +03:00
|
|
|
*
|
|
|
|
* Dir["config.?"] #=> ["config.h"]
|
|
|
|
* Dir.glob("config.?") #=> ["config.h"]
|
|
|
|
* Dir.glob("*.[a-z][a-z]") #=> ["main.rb"]
|
|
|
|
* Dir.glob("*.[^r]*") #=> ["config.h"]
|
|
|
|
* Dir.glob("*.{rb,h}") #=> ["main.rb", "config.h"]
|
|
|
|
* Dir.glob("*") #=> ["config.h", "main.rb"]
|
|
|
|
* Dir.glob("*", File::FNM_DOTMATCH) #=> [".", "..", "config.h", "main.rb"]
|
|
|
|
*
|
2004-08-09 07:54:15 +04:00
|
|
|
* rbfiles = File.join("**", "*.rb")
|
|
|
|
* Dir.glob(rbfiles) #=> ["main.rb",
|
2008-03-09 04:04:46 +03:00
|
|
|
* # "lib/song.rb",
|
|
|
|
* # "lib/song/karaoke.rb"]
|
2004-08-09 07:54:15 +04:00
|
|
|
* libdirs = File.join("**", "lib")
|
|
|
|
* Dir.glob(libdirs) #=> ["lib"]
|
|
|
|
*
|
|
|
|
* librbfiles = File.join("**", "lib", "**", "*.rb")
|
|
|
|
* Dir.glob(librbfiles) #=> ["lib/song.rb",
|
2008-03-09 04:04:46 +03:00
|
|
|
* # "lib/song/karaoke.rb"]
|
2004-08-09 07:54:15 +04:00
|
|
|
*
|
|
|
|
* librbfiles = File.join("**", "lib", "*.rb")
|
|
|
|
* Dir.glob(librbfiles) #=> ["lib/song.rb"]
|
2003-12-19 18:18:09 +03:00
|
|
|
*/
|
2002-03-13 13:11:09 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
dir_s_glob(int argc, VALUE *argv, VALUE obj)
|
2002-03-13 13:11:09 +03:00
|
|
|
{
|
2005-09-16 17:46:05 +04:00
|
|
|
VALUE str, rflags, ary;
|
2002-03-13 13:11:09 +03:00
|
|
|
int flags;
|
|
|
|
|
|
|
|
if (rb_scan_args(argc, argv, "11", &str, &rflags) == 2)
|
|
|
|
flags = NUM2INT(rflags);
|
|
|
|
else
|
|
|
|
flags = 0;
|
|
|
|
|
2005-09-16 17:46:05 +04:00
|
|
|
ary = rb_check_array_type(str);
|
|
|
|
if (NIL_P(ary)) {
|
|
|
|
ary = rb_push_glob(str, flags);
|
|
|
|
}
|
|
|
|
else {
|
2006-09-18 10:33:03 +04:00
|
|
|
volatile VALUE v = ary;
|
|
|
|
ary = dir_globs(RARRAY_LEN(v), RARRAY_PTR(v), flags);
|
2005-09-16 17:46:05 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
if (rb_block_given_p()) {
|
|
|
|
rb_ary_each(ary);
|
|
|
|
return Qnil;
|
|
|
|
}
|
|
|
|
return ary;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
* array.c: replace rb_protect_inspect() and rb_inspecting_p() by
rb_exec_recursive() in eval.c.
* eval.c (rb_exec_recursive): new function.
* array.c (rb_ary_join): use rb_exec_recursive().
* array.c (rb_ary_inspect, rb_ary_hash): ditto.
* file.c (rb_file_join): ditto.
* hash.c (rb_hash_inspect, rb_hash_to_s, rb_hash_hash): ditto.
* io.c (rb_io_puts): ditto.
* object.c (rb_obj_inspect): ditto
* struct.c (rb_struct_inspect): ditto.
* lib/set.rb (SortedSet::setup): a hack to shut up warning.
[ruby-talk:132866]
* lib/time.rb (Time::strptime): add new function. inspired by
[ruby-talk:132815].
* lib/parsedate.rb (ParseDate::strptime): ditto.
* regparse.c: move st_*_strend() functions from st.c. fixed some
potential memory leaks.
* exception error messages updated. [ruby-core:04497]
* ext/socket/socket.c (Init_socket): add bunch of Socket
constants. Patch from Sam Roberts <sroberts@uniserve.com>.
[ruby-core:04409]
* array.c (rb_ary_s_create): no need for negative argc check.
[ruby-core:04463]
* array.c (rb_ary_unshift_m): ditto.
* lib/xmlrpc/parser.rb (XMLRPC::FaultException): make it subclass
of StandardError class, not Exception class. [ruby-core:04429]
* parse.y (fcall_gen): lvar(arg) will be evaluated as
lvar.call(arg) when lvar is a defined local variable. [new]
* object.c (rb_class_initialize): call inherited method before
calling initializing block.
* eval.c (rb_thread_start_1): initialize newly pushed frame.
* lib/open3.rb (Open3::popen3): $? should not be EXIT_FAILURE.
fixed: [ruby-core:04444]
* eval.c (is_defined): NODE_IASGN is an assignment.
* ext/readline/readline.c (Readline.readline): use rl_outstream
and rl_instream. [ruby-dev:25699]
* ext/etc/etc.c (Init_etc): sGroup needs HAVE_ST_GR_PASSWD check
[ruby-dev:25675]
* misc/ruby-mode.el: [ruby-core:04415]
* lib/rdoc/generators/html_generator.rb: [ruby-core:04412]
* lib/rdoc/generators/ri_generator.rb: ditto.
* struct.c (make_struct): fixed: [ruby-core:04402]
* ext/curses/curses.c (window_color_set): [ruby-core:04393]
* ext/socket/socket.c (Init_socket): SO_REUSEPORT added.
[ruby-talk:130092]
* object.c: [ruby-doc:818]
* parse.y (open_args): fix too verbose warnings for the space
before argument parentheses. [ruby-dev:25492]
* parse.y (parser_yylex): ditto.
* parse.y (parser_yylex): the first expression in the parentheses
should not be a command. [ruby-dev:25492]
* lib/irb/context.rb (IRB::Context::initialize): [ruby-core:04330]
* object.c (Init_Object): remove Object#type. [ruby-core:04335]
* st.c (st_foreach): report success/failure by return value.
[ruby-Bugs-1396]
* parse.y: forgot to initialize parser struct. [ruby-dev:25492]
* parse.y (parser_yylex): no tLABEL on EXPR_BEG.
[ruby-talk:127711]
* document updates - [ruby-core:04296], [ruby-core:04301],
[ruby-core:04302], [ruby-core:04307]
* dir.c (rb_push_glob): should work for NUL delimited patterns.
* dir.c (rb_glob2): should aware of offset in the pattern.
* string.c (rb_str_new4): should propagate taintedness.
* env.h: rename member names in struct FRAME; last_func -> callee,
orig_func -> this_func, last_class -> this_class.
* struct.c (rb_struct_set): use original method name, not callee
name, to retrieve member slot. [ruby-core:04268]
* time.c (time_strftime): protect from format modification from GC
finalizers.
* object.c (Init_Object): remove rb_obj_id_obsolete()
* eval.c (rb_mod_define_method): incomplete subclass check.
[ruby-dev:25464]
* gc.c (rb_data_object_alloc): klass may be NULL.
[ruby-list:40498]
* bignum.c (rb_big_rand): should return positive random number.
[ruby-dev:25401]
* bignum.c (rb_big_rand): do not use rb_big_modulo to generate
random bignums. [ruby-dev:25396]
* variable.c (rb_autoload): [ruby-dev:25373]
* eval.c (svalue_to_avalue): [ruby-dev:25366]
* string.c (rb_str_justify): [ruby-dev:25367]
* io.c (rb_f_select): [ruby-dev:25312]
* ext/socket/socket.c (sock_s_getservbyport): [ruby-talk:124072]
* struct.c (make_struct): [ruby-dev:25249]
* dir.c (dir_open_dir): new function. [ruby-dev:25242]
* io.c (rb_f_open): add type check for return value from to_open.
* lib/pstore.rb (PStore#transaction): Use the empty content when a
file is not found. [ruby-dev:24561]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8068 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-03-04 09:47:45 +03:00
|
|
|
static VALUE
|
2008-06-17 02:29:05 +04:00
|
|
|
dir_open_dir(int argc, VALUE *argv)
|
* array.c: replace rb_protect_inspect() and rb_inspecting_p() by
rb_exec_recursive() in eval.c.
* eval.c (rb_exec_recursive): new function.
* array.c (rb_ary_join): use rb_exec_recursive().
* array.c (rb_ary_inspect, rb_ary_hash): ditto.
* file.c (rb_file_join): ditto.
* hash.c (rb_hash_inspect, rb_hash_to_s, rb_hash_hash): ditto.
* io.c (rb_io_puts): ditto.
* object.c (rb_obj_inspect): ditto
* struct.c (rb_struct_inspect): ditto.
* lib/set.rb (SortedSet::setup): a hack to shut up warning.
[ruby-talk:132866]
* lib/time.rb (Time::strptime): add new function. inspired by
[ruby-talk:132815].
* lib/parsedate.rb (ParseDate::strptime): ditto.
* regparse.c: move st_*_strend() functions from st.c. fixed some
potential memory leaks.
* exception error messages updated. [ruby-core:04497]
* ext/socket/socket.c (Init_socket): add bunch of Socket
constants. Patch from Sam Roberts <sroberts@uniserve.com>.
[ruby-core:04409]
* array.c (rb_ary_s_create): no need for negative argc check.
[ruby-core:04463]
* array.c (rb_ary_unshift_m): ditto.
* lib/xmlrpc/parser.rb (XMLRPC::FaultException): make it subclass
of StandardError class, not Exception class. [ruby-core:04429]
* parse.y (fcall_gen): lvar(arg) will be evaluated as
lvar.call(arg) when lvar is a defined local variable. [new]
* object.c (rb_class_initialize): call inherited method before
calling initializing block.
* eval.c (rb_thread_start_1): initialize newly pushed frame.
* lib/open3.rb (Open3::popen3): $? should not be EXIT_FAILURE.
fixed: [ruby-core:04444]
* eval.c (is_defined): NODE_IASGN is an assignment.
* ext/readline/readline.c (Readline.readline): use rl_outstream
and rl_instream. [ruby-dev:25699]
* ext/etc/etc.c (Init_etc): sGroup needs HAVE_ST_GR_PASSWD check
[ruby-dev:25675]
* misc/ruby-mode.el: [ruby-core:04415]
* lib/rdoc/generators/html_generator.rb: [ruby-core:04412]
* lib/rdoc/generators/ri_generator.rb: ditto.
* struct.c (make_struct): fixed: [ruby-core:04402]
* ext/curses/curses.c (window_color_set): [ruby-core:04393]
* ext/socket/socket.c (Init_socket): SO_REUSEPORT added.
[ruby-talk:130092]
* object.c: [ruby-doc:818]
* parse.y (open_args): fix too verbose warnings for the space
before argument parentheses. [ruby-dev:25492]
* parse.y (parser_yylex): ditto.
* parse.y (parser_yylex): the first expression in the parentheses
should not be a command. [ruby-dev:25492]
* lib/irb/context.rb (IRB::Context::initialize): [ruby-core:04330]
* object.c (Init_Object): remove Object#type. [ruby-core:04335]
* st.c (st_foreach): report success/failure by return value.
[ruby-Bugs-1396]
* parse.y: forgot to initialize parser struct. [ruby-dev:25492]
* parse.y (parser_yylex): no tLABEL on EXPR_BEG.
[ruby-talk:127711]
* document updates - [ruby-core:04296], [ruby-core:04301],
[ruby-core:04302], [ruby-core:04307]
* dir.c (rb_push_glob): should work for NUL delimited patterns.
* dir.c (rb_glob2): should aware of offset in the pattern.
* string.c (rb_str_new4): should propagate taintedness.
* env.h: rename member names in struct FRAME; last_func -> callee,
orig_func -> this_func, last_class -> this_class.
* struct.c (rb_struct_set): use original method name, not callee
name, to retrieve member slot. [ruby-core:04268]
* time.c (time_strftime): protect from format modification from GC
finalizers.
* object.c (Init_Object): remove rb_obj_id_obsolete()
* eval.c (rb_mod_define_method): incomplete subclass check.
[ruby-dev:25464]
* gc.c (rb_data_object_alloc): klass may be NULL.
[ruby-list:40498]
* bignum.c (rb_big_rand): should return positive random number.
[ruby-dev:25401]
* bignum.c (rb_big_rand): do not use rb_big_modulo to generate
random bignums. [ruby-dev:25396]
* variable.c (rb_autoload): [ruby-dev:25373]
* eval.c (svalue_to_avalue): [ruby-dev:25366]
* string.c (rb_str_justify): [ruby-dev:25367]
* io.c (rb_f_select): [ruby-dev:25312]
* ext/socket/socket.c (sock_s_getservbyport): [ruby-talk:124072]
* struct.c (make_struct): [ruby-dev:25249]
* dir.c (dir_open_dir): new function. [ruby-dev:25242]
* io.c (rb_f_open): add type check for return value from to_open.
* lib/pstore.rb (PStore#transaction): Use the empty content when a
file is not found. [ruby-dev:24561]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8068 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-03-04 09:47:45 +03:00
|
|
|
{
|
2008-06-17 02:29:05 +04:00
|
|
|
VALUE dir = rb_funcall2(rb_cDir, rb_intern("open"), argc, argv);
|
* array.c: replace rb_protect_inspect() and rb_inspecting_p() by
rb_exec_recursive() in eval.c.
* eval.c (rb_exec_recursive): new function.
* array.c (rb_ary_join): use rb_exec_recursive().
* array.c (rb_ary_inspect, rb_ary_hash): ditto.
* file.c (rb_file_join): ditto.
* hash.c (rb_hash_inspect, rb_hash_to_s, rb_hash_hash): ditto.
* io.c (rb_io_puts): ditto.
* object.c (rb_obj_inspect): ditto
* struct.c (rb_struct_inspect): ditto.
* lib/set.rb (SortedSet::setup): a hack to shut up warning.
[ruby-talk:132866]
* lib/time.rb (Time::strptime): add new function. inspired by
[ruby-talk:132815].
* lib/parsedate.rb (ParseDate::strptime): ditto.
* regparse.c: move st_*_strend() functions from st.c. fixed some
potential memory leaks.
* exception error messages updated. [ruby-core:04497]
* ext/socket/socket.c (Init_socket): add bunch of Socket
constants. Patch from Sam Roberts <sroberts@uniserve.com>.
[ruby-core:04409]
* array.c (rb_ary_s_create): no need for negative argc check.
[ruby-core:04463]
* array.c (rb_ary_unshift_m): ditto.
* lib/xmlrpc/parser.rb (XMLRPC::FaultException): make it subclass
of StandardError class, not Exception class. [ruby-core:04429]
* parse.y (fcall_gen): lvar(arg) will be evaluated as
lvar.call(arg) when lvar is a defined local variable. [new]
* object.c (rb_class_initialize): call inherited method before
calling initializing block.
* eval.c (rb_thread_start_1): initialize newly pushed frame.
* lib/open3.rb (Open3::popen3): $? should not be EXIT_FAILURE.
fixed: [ruby-core:04444]
* eval.c (is_defined): NODE_IASGN is an assignment.
* ext/readline/readline.c (Readline.readline): use rl_outstream
and rl_instream. [ruby-dev:25699]
* ext/etc/etc.c (Init_etc): sGroup needs HAVE_ST_GR_PASSWD check
[ruby-dev:25675]
* misc/ruby-mode.el: [ruby-core:04415]
* lib/rdoc/generators/html_generator.rb: [ruby-core:04412]
* lib/rdoc/generators/ri_generator.rb: ditto.
* struct.c (make_struct): fixed: [ruby-core:04402]
* ext/curses/curses.c (window_color_set): [ruby-core:04393]
* ext/socket/socket.c (Init_socket): SO_REUSEPORT added.
[ruby-talk:130092]
* object.c: [ruby-doc:818]
* parse.y (open_args): fix too verbose warnings for the space
before argument parentheses. [ruby-dev:25492]
* parse.y (parser_yylex): ditto.
* parse.y (parser_yylex): the first expression in the parentheses
should not be a command. [ruby-dev:25492]
* lib/irb/context.rb (IRB::Context::initialize): [ruby-core:04330]
* object.c (Init_Object): remove Object#type. [ruby-core:04335]
* st.c (st_foreach): report success/failure by return value.
[ruby-Bugs-1396]
* parse.y: forgot to initialize parser struct. [ruby-dev:25492]
* parse.y (parser_yylex): no tLABEL on EXPR_BEG.
[ruby-talk:127711]
* document updates - [ruby-core:04296], [ruby-core:04301],
[ruby-core:04302], [ruby-core:04307]
* dir.c (rb_push_glob): should work for NUL delimited patterns.
* dir.c (rb_glob2): should aware of offset in the pattern.
* string.c (rb_str_new4): should propagate taintedness.
* env.h: rename member names in struct FRAME; last_func -> callee,
orig_func -> this_func, last_class -> this_class.
* struct.c (rb_struct_set): use original method name, not callee
name, to retrieve member slot. [ruby-core:04268]
* time.c (time_strftime): protect from format modification from GC
finalizers.
* object.c (Init_Object): remove rb_obj_id_obsolete()
* eval.c (rb_mod_define_method): incomplete subclass check.
[ruby-dev:25464]
* gc.c (rb_data_object_alloc): klass may be NULL.
[ruby-list:40498]
* bignum.c (rb_big_rand): should return positive random number.
[ruby-dev:25401]
* bignum.c (rb_big_rand): do not use rb_big_modulo to generate
random bignums. [ruby-dev:25396]
* variable.c (rb_autoload): [ruby-dev:25373]
* eval.c (svalue_to_avalue): [ruby-dev:25366]
* string.c (rb_str_justify): [ruby-dev:25367]
* io.c (rb_f_select): [ruby-dev:25312]
* ext/socket/socket.c (sock_s_getservbyport): [ruby-talk:124072]
* struct.c (make_struct): [ruby-dev:25249]
* dir.c (dir_open_dir): new function. [ruby-dev:25242]
* io.c (rb_f_open): add type check for return value from to_open.
* lib/pstore.rb (PStore#transaction): Use the empty content when a
file is not found. [ruby-dev:24561]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8068 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-03-04 09:47:45 +03:00
|
|
|
|
* bignum.c (big_rshift), compile.c (validate_label,
iseq_build_from_ary_exception), cont.c (cont_capture), dir.c
(dir_open_dir), gc.c (objspace_each_objects), io.c (pipe_open)
(rb_io_advise), parse.y (parser_compile_string)
(rb_parser_compile_file), proc.c (binding_free), process.c
(rb_proc_exec_n, rb_seteuid_core, proc_setegid, rb_setegid_core)
(p_uid_exchange, p_gid_exchange), regparse.c (strdup_with_null),
signal.c (sig_dfl), vm.c (rb_iseq_eval, rb_iseq_eval_main),
vm_insnhelper.c (vm_expandarray): suppress
unused-but-set-variable warnings.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33951 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-12-05 13:57:00 +04:00
|
|
|
rb_check_typeddata(dir, &dir_data_type);
|
* array.c: replace rb_protect_inspect() and rb_inspecting_p() by
rb_exec_recursive() in eval.c.
* eval.c (rb_exec_recursive): new function.
* array.c (rb_ary_join): use rb_exec_recursive().
* array.c (rb_ary_inspect, rb_ary_hash): ditto.
* file.c (rb_file_join): ditto.
* hash.c (rb_hash_inspect, rb_hash_to_s, rb_hash_hash): ditto.
* io.c (rb_io_puts): ditto.
* object.c (rb_obj_inspect): ditto
* struct.c (rb_struct_inspect): ditto.
* lib/set.rb (SortedSet::setup): a hack to shut up warning.
[ruby-talk:132866]
* lib/time.rb (Time::strptime): add new function. inspired by
[ruby-talk:132815].
* lib/parsedate.rb (ParseDate::strptime): ditto.
* regparse.c: move st_*_strend() functions from st.c. fixed some
potential memory leaks.
* exception error messages updated. [ruby-core:04497]
* ext/socket/socket.c (Init_socket): add bunch of Socket
constants. Patch from Sam Roberts <sroberts@uniserve.com>.
[ruby-core:04409]
* array.c (rb_ary_s_create): no need for negative argc check.
[ruby-core:04463]
* array.c (rb_ary_unshift_m): ditto.
* lib/xmlrpc/parser.rb (XMLRPC::FaultException): make it subclass
of StandardError class, not Exception class. [ruby-core:04429]
* parse.y (fcall_gen): lvar(arg) will be evaluated as
lvar.call(arg) when lvar is a defined local variable. [new]
* object.c (rb_class_initialize): call inherited method before
calling initializing block.
* eval.c (rb_thread_start_1): initialize newly pushed frame.
* lib/open3.rb (Open3::popen3): $? should not be EXIT_FAILURE.
fixed: [ruby-core:04444]
* eval.c (is_defined): NODE_IASGN is an assignment.
* ext/readline/readline.c (Readline.readline): use rl_outstream
and rl_instream. [ruby-dev:25699]
* ext/etc/etc.c (Init_etc): sGroup needs HAVE_ST_GR_PASSWD check
[ruby-dev:25675]
* misc/ruby-mode.el: [ruby-core:04415]
* lib/rdoc/generators/html_generator.rb: [ruby-core:04412]
* lib/rdoc/generators/ri_generator.rb: ditto.
* struct.c (make_struct): fixed: [ruby-core:04402]
* ext/curses/curses.c (window_color_set): [ruby-core:04393]
* ext/socket/socket.c (Init_socket): SO_REUSEPORT added.
[ruby-talk:130092]
* object.c: [ruby-doc:818]
* parse.y (open_args): fix too verbose warnings for the space
before argument parentheses. [ruby-dev:25492]
* parse.y (parser_yylex): ditto.
* parse.y (parser_yylex): the first expression in the parentheses
should not be a command. [ruby-dev:25492]
* lib/irb/context.rb (IRB::Context::initialize): [ruby-core:04330]
* object.c (Init_Object): remove Object#type. [ruby-core:04335]
* st.c (st_foreach): report success/failure by return value.
[ruby-Bugs-1396]
* parse.y: forgot to initialize parser struct. [ruby-dev:25492]
* parse.y (parser_yylex): no tLABEL on EXPR_BEG.
[ruby-talk:127711]
* document updates - [ruby-core:04296], [ruby-core:04301],
[ruby-core:04302], [ruby-core:04307]
* dir.c (rb_push_glob): should work for NUL delimited patterns.
* dir.c (rb_glob2): should aware of offset in the pattern.
* string.c (rb_str_new4): should propagate taintedness.
* env.h: rename member names in struct FRAME; last_func -> callee,
orig_func -> this_func, last_class -> this_class.
* struct.c (rb_struct_set): use original method name, not callee
name, to retrieve member slot. [ruby-core:04268]
* time.c (time_strftime): protect from format modification from GC
finalizers.
* object.c (Init_Object): remove rb_obj_id_obsolete()
* eval.c (rb_mod_define_method): incomplete subclass check.
[ruby-dev:25464]
* gc.c (rb_data_object_alloc): klass may be NULL.
[ruby-list:40498]
* bignum.c (rb_big_rand): should return positive random number.
[ruby-dev:25401]
* bignum.c (rb_big_rand): do not use rb_big_modulo to generate
random bignums. [ruby-dev:25396]
* variable.c (rb_autoload): [ruby-dev:25373]
* eval.c (svalue_to_avalue): [ruby-dev:25366]
* string.c (rb_str_justify): [ruby-dev:25367]
* io.c (rb_f_select): [ruby-dev:25312]
* ext/socket/socket.c (sock_s_getservbyport): [ruby-talk:124072]
* struct.c (make_struct): [ruby-dev:25249]
* dir.c (dir_open_dir): new function. [ruby-dev:25242]
* io.c (rb_f_open): add type check for return value from to_open.
* lib/pstore.rb (PStore#transaction): Use the empty content when a
file is not found. [ruby-dev:24561]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8068 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-03-04 09:47:45 +03:00
|
|
|
return dir;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2003-12-19 18:18:09 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-18 01:07:33 +04:00
|
|
|
* Dir.foreach( dirname ) {| filename | block } -> nil
|
|
|
|
* Dir.foreach( dirname ) -> an_enumerator
|
2003-12-19 18:18:09 +03:00
|
|
|
*
|
|
|
|
* Calls the block once for each entry in the named directory, passing
|
|
|
|
* the filename of each entry as a parameter to the block.
|
|
|
|
*
|
2010-05-13 09:49:55 +04:00
|
|
|
* If no block is given, an enumerator is returned instead.
|
|
|
|
*
|
2003-12-19 18:18:09 +03:00
|
|
|
* Dir.foreach("testdir") {|x| puts "Got #{x}" }
|
|
|
|
*
|
|
|
|
* <em>produces:</em>
|
|
|
|
*
|
|
|
|
* Got .
|
|
|
|
* Got ..
|
|
|
|
* Got config.h
|
|
|
|
* Got main.rb
|
|
|
|
*
|
|
|
|
*/
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
2008-06-17 02:29:05 +04:00
|
|
|
dir_foreach(int argc, VALUE *argv, VALUE io)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
|
|
|
VALUE dir;
|
|
|
|
|
2008-06-17 02:29:05 +04:00
|
|
|
RETURN_ENUMERATOR(io, argc, argv);
|
|
|
|
dir = dir_open_dir(argc, argv);
|
2000-06-12 11:48:31 +04:00
|
|
|
rb_ensure(dir_each, dir, dir_close, dir);
|
|
|
|
return Qnil;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2003-12-19 18:18:09 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-18 01:07:33 +04:00
|
|
|
* Dir.entries( dirname ) -> array
|
2003-12-19 18:18:09 +03:00
|
|
|
*
|
|
|
|
* Returns an array containing all of the filenames in the given
|
|
|
|
* directory. Will raise a <code>SystemCallError</code> if the named
|
|
|
|
* directory doesn't exist.
|
|
|
|
*
|
|
|
|
* Dir.entries("testdir") #=> [".", "..", "config.h", "main.rb"]
|
|
|
|
*
|
|
|
|
*/
|
1999-01-20 07:59:39 +03:00
|
|
|
static VALUE
|
2008-06-17 02:29:05 +04:00
|
|
|
dir_entries(int argc, VALUE *argv, VALUE io)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
1999-01-20 07:59:39 +03:00
|
|
|
VALUE dir;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2008-06-17 02:29:05 +04:00
|
|
|
dir = dir_open_dir(argc, argv);
|
1999-01-20 07:59:39 +03:00
|
|
|
return rb_ensure(rb_Array, dir, dir_close, dir);
|
|
|
|
}
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2012-11-04 05:19:11 +04:00
|
|
|
static int
|
|
|
|
fnmatch_brace(const char *pattern, VALUE val, void *enc)
|
|
|
|
{
|
|
|
|
struct brace_args *arg = (struct brace_args *)val;
|
|
|
|
VALUE path = arg->value;
|
|
|
|
|
|
|
|
return (fnmatch(pattern, enc, RSTRING_PTR(path), arg->flags) == 0);
|
|
|
|
}
|
|
|
|
|
2003-12-19 18:18:09 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-18 01:07:33 +04:00
|
|
|
* File.fnmatch( pattern, path, [flags] ) -> (true or false)
|
|
|
|
* File.fnmatch?( pattern, path, [flags] ) -> (true or false)
|
2003-12-19 18:18:09 +03:00
|
|
|
*
|
|
|
|
* Returns true if <i>path</i> matches against <i>pattern</i> The
|
|
|
|
* pattern is not a regular expression; instead it follows rules
|
|
|
|
* similar to shell filename globbing. It may contain the following
|
|
|
|
* metacharacters:
|
|
|
|
*
|
2004-08-09 07:54:15 +04:00
|
|
|
* <code>*</code>:: Matches any file. Can be restricted by
|
|
|
|
* other values in the glob. <code>*</code>
|
|
|
|
* will match all files; <code>c*</code> will
|
|
|
|
* match all files beginning with
|
|
|
|
* <code>c</code>; <code>*c</code> will match
|
|
|
|
* all files ending with <code>c</code>; and
|
2012-02-11 01:12:44 +04:00
|
|
|
* <code>\*c*</code> will match all files that
|
2004-08-09 07:54:15 +04:00
|
|
|
* have <code>c</code> in them (including at
|
|
|
|
* the beginning or end). Equivalent to
|
|
|
|
* <code>/ .* /x</code> in regexp.
|
|
|
|
* <code>**</code>:: Matches directories recursively or files
|
|
|
|
* expansively.
|
|
|
|
* <code>?</code>:: Matches any one character. Equivalent to
|
|
|
|
* <code>/.{1}/</code> in regexp.
|
|
|
|
* <code>[set]</code>:: Matches any one character in +set+.
|
|
|
|
* Behaves exactly like character sets in
|
|
|
|
* Regexp, including set negation
|
|
|
|
* (<code>[^a-z]</code>).
|
2011-09-10 08:43:12 +04:00
|
|
|
* <code> \ </code>:: Escapes the next metacharacter.
|
2004-08-09 07:54:15 +04:00
|
|
|
*
|
|
|
|
* <i>flags</i> is a bitwise OR of the <code>FNM_xxx</code>
|
|
|
|
* parameters. The same glob pattern and flags are used by
|
|
|
|
* <code>Dir::glob</code>.
|
2003-12-19 18:18:09 +03:00
|
|
|
*
|
2008-03-09 04:04:46 +03:00
|
|
|
* File.fnmatch('cat', 'cat') #=> true # match entire string
|
|
|
|
* File.fnmatch('cat', 'category') #=> false # only match partial string
|
|
|
|
* File.fnmatch('c{at,ub}s', 'cats') #=> false # { } isn't supported
|
2004-04-19 13:31:39 +04:00
|
|
|
*
|
2008-03-09 04:04:46 +03:00
|
|
|
* File.fnmatch('c?t', 'cat') #=> true # '?' match only 1 character
|
|
|
|
* File.fnmatch('c??t', 'cat') #=> false # ditto
|
|
|
|
* File.fnmatch('c*', 'cats') #=> true # '*' match 0 or more characters
|
|
|
|
* File.fnmatch('c*t', 'c/a/b/t') #=> true # ditto
|
|
|
|
* File.fnmatch('ca[a-z]', 'cat') #=> true # inclusive bracket expression
|
|
|
|
* File.fnmatch('ca[^t]', 'cat') #=> false # exclusive bracket expression ('^' or '!')
|
2004-04-19 13:31:39 +04:00
|
|
|
*
|
2008-03-09 04:04:46 +03:00
|
|
|
* File.fnmatch('cat', 'CAT') #=> false # case sensitive
|
|
|
|
* File.fnmatch('cat', 'CAT', File::FNM_CASEFOLD) #=> true # case insensitive
|
2004-06-12 09:18:23 +04:00
|
|
|
*
|
2008-03-09 04:04:46 +03:00
|
|
|
* File.fnmatch('?', '/', File::FNM_PATHNAME) #=> false # wildcard doesn't match '/' on FNM_PATHNAME
|
|
|
|
* File.fnmatch('*', '/', File::FNM_PATHNAME) #=> false # ditto
|
|
|
|
* File.fnmatch('[/]', '/', File::FNM_PATHNAME) #=> false # ditto
|
2004-04-19 13:31:39 +04:00
|
|
|
*
|
2008-03-09 04:04:46 +03:00
|
|
|
* File.fnmatch('\?', '?') #=> true # escaped wildcard becomes ordinary
|
|
|
|
* File.fnmatch('\a', 'a') #=> true # escaped ordinary remains ordinary
|
|
|
|
* File.fnmatch('\a', '\a', File::FNM_NOESCAPE) #=> true # FNM_NOESACPE makes '\' ordinary
|
|
|
|
* File.fnmatch('[\?]', '?') #=> true # can escape inside bracket expression
|
2003-12-19 18:18:09 +03:00
|
|
|
*
|
2008-03-09 04:04:46 +03:00
|
|
|
* File.fnmatch('*', '.profile') #=> false # wildcard doesn't match leading
|
|
|
|
* File.fnmatch('*', '.profile', File::FNM_DOTMATCH) #=> true # period by default.
|
2004-04-19 15:59:33 +04:00
|
|
|
* File.fnmatch('.*', '.profile') #=> true
|
2003-12-19 18:18:09 +03:00
|
|
|
*
|
2006-03-01 13:06:03 +03:00
|
|
|
* rbfiles = '**' '/' '*.rb' # you don't have to do like this. just write in single string.
|
2004-08-09 07:54:15 +04:00
|
|
|
* File.fnmatch(rbfiles, 'main.rb') #=> false
|
|
|
|
* File.fnmatch(rbfiles, './main.rb') #=> false
|
|
|
|
* File.fnmatch(rbfiles, 'lib/song.rb') #=> true
|
|
|
|
* File.fnmatch('**.rb', 'main.rb') #=> true
|
|
|
|
* File.fnmatch('**.rb', './main.rb') #=> false
|
|
|
|
* File.fnmatch('**.rb', 'lib/song.rb') #=> true
|
2004-04-19 13:31:39 +04:00
|
|
|
* File.fnmatch('*', 'dave/.profile') #=> true
|
2004-08-09 07:54:15 +04:00
|
|
|
*
|
2006-03-01 13:06:03 +03:00
|
|
|
* pattern = '*' '/' '*'
|
|
|
|
* File.fnmatch(pattern, 'dave/.profile', File::FNM_PATHNAME) #=> false
|
|
|
|
* File.fnmatch(pattern, 'dave/.profile', File::FNM_PATHNAME | File::FNM_DOTMATCH) #=> true
|
2004-03-12 18:00:39 +03:00
|
|
|
*
|
2006-03-01 13:06:03 +03:00
|
|
|
* pattern = '**' '/' 'foo'
|
|
|
|
* File.fnmatch(pattern, 'a/b/c/foo', File::FNM_PATHNAME) #=> true
|
|
|
|
* File.fnmatch(pattern, '/a/b/c/foo', File::FNM_PATHNAME) #=> true
|
|
|
|
* File.fnmatch(pattern, 'c:/a/b/c/foo', File::FNM_PATHNAME) #=> true
|
|
|
|
* File.fnmatch(pattern, 'a/.b/c/foo', File::FNM_PATHNAME) #=> false
|
|
|
|
* File.fnmatch(pattern, 'a/.b/c/foo', File::FNM_PATHNAME | File::FNM_DOTMATCH) #=> true
|
2003-12-19 18:18:09 +03:00
|
|
|
*/
|
2001-06-13 14:51:39 +04:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
file_s_fnmatch(int argc, VALUE *argv, VALUE obj)
|
2001-06-13 14:51:39 +04:00
|
|
|
{
|
|
|
|
VALUE pattern, path;
|
|
|
|
VALUE rflags;
|
|
|
|
int flags;
|
|
|
|
|
|
|
|
if (rb_scan_args(argc, argv, "21", &pattern, &path, &rflags) == 3)
|
|
|
|
flags = NUM2INT(rflags);
|
|
|
|
else
|
|
|
|
flags = 0;
|
|
|
|
|
|
|
|
StringValue(pattern);
|
2007-12-09 08:12:31 +03:00
|
|
|
FilePathStringValue(path);
|
2001-06-13 14:51:39 +04:00
|
|
|
|
2012-11-04 05:19:11 +04:00
|
|
|
if (flags & FNM_EXTGLOB) {
|
|
|
|
struct brace_args args;
|
|
|
|
|
|
|
|
args.value = path;
|
|
|
|
args.flags = flags;
|
|
|
|
if (ruby_brace_expand(RSTRING_PTR(pattern), flags, fnmatch_brace,
|
|
|
|
(VALUE)&args, rb_enc_get(pattern)) > 0)
|
|
|
|
return Qtrue;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
if (fnmatch(RSTRING_PTR(pattern), rb_enc_get(pattern), RSTRING_PTR(path),
|
|
|
|
flags) == 0)
|
|
|
|
return Qtrue;
|
|
|
|
}
|
|
|
|
RB_GC_GUARD(pattern);
|
2001-06-13 14:51:39 +04:00
|
|
|
|
|
|
|
return Qfalse;
|
|
|
|
}
|
|
|
|
|
2009-02-02 10:33:08 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-18 01:07:33 +04:00
|
|
|
* Dir.home() -> "/home/me"
|
|
|
|
* Dir.home("root") -> "/root"
|
2009-02-02 10:33:08 +03:00
|
|
|
*
|
|
|
|
* Returns the home directory of the current user or the named user
|
|
|
|
* if given.
|
|
|
|
*/
|
|
|
|
static VALUE
|
|
|
|
dir_s_home(int argc, VALUE *argv, VALUE obj)
|
|
|
|
{
|
|
|
|
VALUE user;
|
|
|
|
const char *u = 0;
|
|
|
|
|
|
|
|
rb_scan_args(argc, argv, "01", &user);
|
|
|
|
if (!NIL_P(user)) {
|
|
|
|
SafeStringValue(user);
|
|
|
|
u = StringValueCStr(user);
|
|
|
|
}
|
|
|
|
return rb_home_dir(u, rb_str_new(0, 0));
|
|
|
|
}
|
|
|
|
|
2012-06-17 17:23:56 +04:00
|
|
|
#if 0
|
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* Dir.exist?(file_name) -> true or false
|
|
|
|
* Dir.exists?(file_name) -> true or false
|
|
|
|
*
|
|
|
|
* Returns <code>true</code> if the named file is a directory,
|
|
|
|
* <code>false</code> otherwise.
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
VALUE
|
|
|
|
rb_file_directory_p()
|
|
|
|
{
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2003-12-19 18:18:09 +03:00
|
|
|
/*
|
|
|
|
* Objects of class <code>Dir</code> are directory streams representing
|
|
|
|
* directories in the underlying file system. They provide a variety of
|
|
|
|
* ways to list directories and their contents. See also
|
|
|
|
* <code>File</code>.
|
|
|
|
*
|
|
|
|
* The directory used in these examples contains the two regular files
|
|
|
|
* (<code>config.h</code> and <code>main.rb</code>), the parent
|
|
|
|
* directory (<code>..</code>), and the directory itself
|
|
|
|
* (<code>.</code>).
|
|
|
|
*/
|
1999-01-20 07:59:39 +03:00
|
|
|
void
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
Init_Dir(void)
|
1999-01-20 07:59:39 +03:00
|
|
|
{
|
|
|
|
rb_cDir = rb_define_class("Dir", rb_cObject);
|
|
|
|
|
|
|
|
rb_include_module(rb_cDir, rb_mEnumerable);
|
|
|
|
|
2002-12-20 11:33:17 +03:00
|
|
|
rb_define_alloc_func(rb_cDir, dir_s_alloc);
|
2008-06-17 02:29:05 +04:00
|
|
|
rb_define_singleton_method(rb_cDir, "open", dir_s_open, -1);
|
2008-06-17 19:05:50 +04:00
|
|
|
rb_define_singleton_method(rb_cDir, "foreach", dir_foreach, -1);
|
2008-06-17 02:29:05 +04:00
|
|
|
rb_define_singleton_method(rb_cDir, "entries", dir_entries, -1);
|
1999-01-20 07:59:39 +03:00
|
|
|
|
2008-06-17 02:29:05 +04:00
|
|
|
rb_define_method(rb_cDir,"initialize", dir_initialize, -1);
|
2001-09-19 10:54:11 +04:00
|
|
|
rb_define_method(rb_cDir,"path", dir_path, 0);
|
2009-09-04 03:07:13 +04:00
|
|
|
rb_define_method(rb_cDir,"to_path", dir_path, 0);
|
2004-01-10 16:46:21 +03:00
|
|
|
rb_define_method(rb_cDir,"inspect", dir_inspect, 0);
|
1999-01-20 07:59:39 +03:00
|
|
|
rb_define_method(rb_cDir,"read", dir_read, 0);
|
|
|
|
rb_define_method(rb_cDir,"each", dir_each, 0);
|
|
|
|
rb_define_method(rb_cDir,"rewind", dir_rewind, 0);
|
|
|
|
rb_define_method(rb_cDir,"tell", dir_tell, 0);
|
|
|
|
rb_define_method(rb_cDir,"seek", dir_seek, 1);
|
2000-06-12 11:48:31 +04:00
|
|
|
rb_define_method(rb_cDir,"pos", dir_tell, 0);
|
2002-01-21 10:44:06 +03:00
|
|
|
rb_define_method(rb_cDir,"pos=", dir_set_pos, 1);
|
1999-01-20 07:59:39 +03:00
|
|
|
rb_define_method(rb_cDir,"close", dir_close, 0);
|
|
|
|
|
|
|
|
rb_define_singleton_method(rb_cDir,"chdir", dir_s_chdir, -1);
|
|
|
|
rb_define_singleton_method(rb_cDir,"getwd", dir_s_getwd, 0);
|
|
|
|
rb_define_singleton_method(rb_cDir,"pwd", dir_s_getwd, 0);
|
|
|
|
rb_define_singleton_method(rb_cDir,"chroot", dir_s_chroot, 1);
|
|
|
|
rb_define_singleton_method(rb_cDir,"mkdir", dir_s_mkdir, -1);
|
|
|
|
rb_define_singleton_method(rb_cDir,"rmdir", dir_s_rmdir, 1);
|
|
|
|
rb_define_singleton_method(rb_cDir,"delete", dir_s_rmdir, 1);
|
|
|
|
rb_define_singleton_method(rb_cDir,"unlink", dir_s_rmdir, 1);
|
2009-02-02 10:33:08 +03:00
|
|
|
rb_define_singleton_method(rb_cDir,"home", dir_s_home, -1);
|
1999-01-20 07:59:39 +03:00
|
|
|
|
2002-03-13 13:11:09 +03:00
|
|
|
rb_define_singleton_method(rb_cDir,"glob", dir_s_glob, -1);
|
2005-09-16 17:46:05 +04:00
|
|
|
rb_define_singleton_method(rb_cDir,"[]", dir_s_aref, -1);
|
2012-06-17 17:23:56 +04:00
|
|
|
rb_define_singleton_method(rb_cDir,"exist?", rb_file_directory_p, 1);
|
|
|
|
rb_define_singleton_method(rb_cDir,"exists?", rb_file_directory_p, 1);
|
2001-06-13 14:51:39 +04:00
|
|
|
|
|
|
|
rb_define_singleton_method(rb_cFile,"fnmatch", file_s_fnmatch, -1);
|
|
|
|
rb_define_singleton_method(rb_cFile,"fnmatch?", file_s_fnmatch, -1);
|
|
|
|
|
|
|
|
rb_file_const("FNM_NOESCAPE", INT2FIX(FNM_NOESCAPE));
|
|
|
|
rb_file_const("FNM_PATHNAME", INT2FIX(FNM_PATHNAME));
|
2002-03-13 13:11:09 +03:00
|
|
|
rb_file_const("FNM_DOTMATCH", INT2FIX(FNM_DOTMATCH));
|
2001-06-13 14:51:39 +04:00
|
|
|
rb_file_const("FNM_CASEFOLD", INT2FIX(FNM_CASEFOLD));
|
2012-11-04 05:19:11 +04:00
|
|
|
rb_file_const("FNM_EXTGLOB", INT2FIX(FNM_EXTGLOB));
|
2005-12-14 17:40:14 +03:00
|
|
|
rb_file_const("FNM_SYSCASE", INT2FIX(FNM_SYSCASE));
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|