diff options
author | ttate <ttate@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2002-04-03 11:59:01 +0000 |
---|---|---|
committer | ttate <ttate@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2002-04-03 11:59:01 +0000 |
commit | e0e05f712e1c111ef5085a03d27ebd5c87af629c (patch) | |
tree | 5d135f00ed93cc1fffa4675aeeccc56e2fa245e9 /ext/dl/test | |
parent | 8858ef6ee39295b1033ade68b7ed2485eb28e14d (diff) | |
download | ruby-e0e05f712e1c111ef5085a03d27ebd5c87af629c.tar.gz ruby-e0e05f712e1c111ef5085a03d27ebd5c87af629c.tar.xz ruby-e0e05f712e1c111ef5085a03d27ebd5c87af629c.zip |
Merge Nakada's patch and define StringValuePtr for ruby-1.6.
CV ----------------------------------------------------------------------
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@2330 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/dl/test')
-rw-r--r-- | ext/dl/test/test.c | 5 | ||||
-rw-r--r-- | ext/dl/test/test.rb | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/ext/dl/test/test.c b/ext/dl/test/test.c index c5ead7981..ed42b4d1a 100644 --- a/ext/dl/test/test.c +++ b/ext/dl/test/test.c @@ -221,7 +221,8 @@ test_data_add(struct test_data *list, const char *name) struct test_data *data; data = (struct test_data *)malloc(sizeof(struct test_data)); - strcpy(data->name, name); + memset(data->name, 0, 1024); + strncpy(data->name, name, 1024); data->next = list->next; list->next = data; }; @@ -236,7 +237,7 @@ test_data_print(struct test_data *list) }; }; -struct data * +struct test_data * test_data_aref(struct test_data *list, int i) { struct test_data *data; diff --git a/ext/dl/test/test.rb b/ext/dl/test/test.rb index de9a9cc53..91ae1f673 100644 --- a/ext/dl/test/test.rb +++ b/ext/dl/test/test.rb @@ -184,10 +184,12 @@ if( fp ) r,rs = sym_gets[" " * 256, 256, fp] debug r,rs assert("open,gets", :must, rs[0] == line) + ObjectSpace.define_finalizer(fp) {File.unlink("tmp.txt")} + fp = nil else assert("open,gets", :must, line == nil) + File.unlink("tmp.txt") end -File.unlink("tmp.txt") callback1 = h["test_callback1"] |