summaryrefslogtreecommitdiffstats
path: root/win32
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-09-14 13:41:02 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-09-14 13:41:02 +0000
commit31ce26f49046bab6cb57847db778ab517bf1bdc8 (patch)
tree04ca83292d08d7c0652e624debf8de00d3bda7ac /win32
parentd6c1600059282e6c6b4357950cdd4e7bebbe0753 (diff)
downloadruby-31ce26f49046bab6cb57847db778ab517bf1bdc8.tar.gz
ruby-31ce26f49046bab6cb57847db778ab517bf1bdc8.tar.xz
ruby-31ce26f49046bab6cb57847db778ab517bf1bdc8.zip
* dir.c (ruby_glob): glob function not using ruby exception system.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@9158 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32')
-rw-r--r--win32/win32.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/win32/win32.c b/win32/win32.c
index f0b73a108..cc128613d 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -1027,7 +1027,7 @@ typedef struct _NtCmdLineElement {
#define NTMALLOC 0x2 // string in element was malloc'ed
#define NTSTRING 0x4 // element contains a quoted string
-static void
+static int
insert(const char *path, VALUE vinfo)
{
NtCmdLineElement *tmpcurr;
@@ -1041,6 +1041,8 @@ insert(const char *path, VALUE vinfo)
strcpy(tmpcurr->str, path);
**tail = tmpcurr;
*tail = &tmpcurr->next;
+
+ return 0;
}
#ifdef HAVE_SYS_PARAM_H
@@ -1065,7 +1067,7 @@ cmdglob(NtCmdLineElement *patt, NtCmdLineElement **tail)
for (p = buf; *p; p = CharNext(p))
if (*p == '\\')
*p = '/';
- rb_globi(buf, insert, (VALUE)&tail);
+ ruby_globi(buf, 0, insert, (VALUE)&tail);
if (buf != buffer)
free(buf);