archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-24 21:44:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
23208 commits 30 branches 1174 tags 513 MiB
Commit graph

1066 commits

Author SHA1 Message Date
akr
683eec7a5d * io.c (rb_io_binmode): clear newline flags in writeconv_pre_ecflags. 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19185 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
 2008-09-06 10:37:02 +00:00
akr
d4384f1230 * io.c (rb_io_extract_modeenc): raise an error for ASCII incompatible 
encoding without binmode.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19166 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
 2008-09-05 22:26:39 +00:00
akr
01acf18704 * include/ruby/io.h (rb_io_modestr_fmode): renamed from 
rb_io_mode_flags.
  (rb_io_modestr_oflags): renamed from rb_io_mode_modenum.
  (rb_io_oflags_fmode): renamed from rb_io_modenum_flags.
  (rb_io_mode_flags): defined as a macro.
  (rb_io_modenum_flags): ditto.

* io.c: follow the renaming with consistency.

* process.c (check_exec_redirect): call rb_io_modestr_oflags.

* ext/pty/depend: pty.o depends on io.h.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19153 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
 2008-09-05 11:30:35 +00:00
akr
0153a4ea07 * io.c (MODENUM_MAX): removed. 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19149 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
 2008-09-05 10:59:58 +00:00
nobu
6c2108e2ac * io.c (copy_stream_fallback_body): use read method unless readpartial 
is available.  [ruby-dev:36124]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19148 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
 2008-09-05 09:37:55 +00:00
akr
205d9ef125 * io.c (argf_mark): mark p->encs.ecopts. 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19143 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
 2008-09-04 16:22:57 +00:00
akr
dac421a9c9 * include/ruby/intern.h (rb_file_open_str): declared. 
* io.c (rb_file_open_str): defined.

* ext/zlib/zlib.c (gzfile_s_open): use rb_file_open_str instead of
  rb_file_open.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19137 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
 2008-09-04 14:43:45 +00:00
akr
b53f7a1cbf * io.c: variables renamed for consistency. 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
 2008-09-04 11:20:53 +00:00
akr
49e9f42703 * include/ruby/io.h (rb_io_enc_t): rename flags to ecflags. 
(rb_io_t): rename writeconv_pre_flags to writeconv_pre_ecflags.
  (MakeOpenFile): follow the renaming.

* io.c: follow the renaming.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19124 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
 2008-09-04 10:22:11 +00:00
nobu
83e28e5176 * io.c (struct sysopen_struct, rb_sysopen_internal, rb_sysopen): 
constified.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19118 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
 2008-09-04 04:01:13 +00:00
nobu
8f0f91e155 * io.c: expanded ARGF members macros. 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19117 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
 2008-09-04 03:33:27 +00:00
nobu
747d9b3925 * io.c (argf_next_argv, argf_set_encoding): copy struct wise. 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19115 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
 2008-09-04 01:33:47 +00:00
akr
31b054122c * io.c (rb_scan_open_args): follow rb_str_transcode change. 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19114 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
 2008-09-04 00:48:01 +00:00
akr
dead0a4c51 rdoc update. 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19111 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
 2008-09-03 19:05:24 +00:00
akr
58964e3249 * include/ruby/io.h (rb_io_t): new fields: encs.ecopts and 
writeconv_pre_ecopts.
  (MakeOpenFile): initialize them.

* include/ruby/encoding.h (rb_str_transcode): take ecopts argument.
  (rb_econv_flags): removed.
  (rb_econv_prepare_opts): declared.
  (rb_econv_open_opts): declared.

* io.c (make_writeconv): use rb_econv_open_opts.
  (make_readconv): ditto.
  (io_fwrite): follow rb_str_transcode change.
  (rb_io_extract_modeenc): use rb_econv_prepare_opts.
  (rb_file_open_generic): initialize encs.ecopts.
  (rb_file_open_internal): ditto.
  (rb_io_reopen): ditto.
  (argf_ecopts): defined.
  (argf_next_argv): set encs.ecopts.
  (io_encoding_set): use rb_econv_prepare_opts.
  (argf_set_encoding): set argf_ecopts.

* gc.c (gc_mark_children): mark encs.ecopts and writeconv_pre_ecopts
  in T_FILE.

* transcode.c (transcode_loop): take ecopts argument. use
  rb_econv_open_opts.
  (rb_econv_flags): removed.
  (rb_econv_prepare_opts): defined.
  (rb_econv_open_opts): defined.
  (str_transcode0): take ecopts.
  (str_transcode): use rb_econv_prepare_opts.
  (rb_str_transcode): take ecopts.
  (econv_init): accept hash argument.
  (econv_insert_output): follow rb_str_transcode change.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19109 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
 2008-09-03 18:18:10 +00:00
usa
71e00fd061 * io.c (make_writeconv): follow akr's previous commit. 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19104 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
 2008-09-03 15:27:12 +00:00
akr
56343375b8 * include/ruby/encoding.h (rb_econv_option_t): removed. Since 
rb_econv_option_t has only one field, int flags, rb_econv_option_t is
  replaced by int.

* include/ruby/io.h: follow the above change.

* io.c: ditto.

* transcode.c: ditto.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19103 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
 2008-09-03 15:11:46 +00:00
ko1
204929af9d * include/ruby/signal.h: removed. 
* common.mk, class.c, eval.c, eval_intern.h, file.c, gc.c, hash.c,
  io.c, process.c, signal.c: vm_core.h: ditto.
  Some unused external global variables are also removed.
  (rb_prohibit_interrupt, rb_trap_immediate, rb_trap_pending,
  rb_thread_critical)
* ext/openssl/ossl_ssl.c, ext/openssl/ossl_x509store.c,
  ext/readline/readline.c, ext/socket/depend,
  ext/socket/socket.c: ditto.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19080 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
 2008-09-03 08:00:05 +00:00
akr
a017cecf42 fix typos. 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18999 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
 2008-08-31 14:24:51 +00:00
ko1
ca6a8b1e2c * include/ruby/intern.h: rename RB_UBF_DFL to 
RUBY_UBF_IO and RUBY_UBF_PROCESS.
  Because there is no default (universal) unblocking function.
* ext/socket/socket.c, file.c, io.c, process.c, thread.c: ditto.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18985 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
 2008-08-31 07:44:24 +00:00
akr
a08b97c2f6 * include/ruby/io.h (rb_io_t): refcnt field removed. 
(MakeOpenFile): refcnt initialization removed.

* io.c (rb_io_fptr_finalize): don't check refcnt.
  (rb_io_close_read): don't use refcnt.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18885 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
 2008-08-27 17:19:19 +00:00
akr
d05d66e2ac * io.c (rb_io_initialize): don't accept IO object. [ruby-dev:35895] 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18883 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
 2008-08-27 15:09:47 +00:00
akr
db6ec3105e * include/ruby/encoding.h (rb_econv_result_t): enumeration constant: 
econv_incomplete_input. 

* io.c (finish_writeconv): check econv_incomplete_input.

* transcode.c (transcode_restartable0): return econv_incomplete_input
  for unexpected end of source buffer.
  (trans_sweep): check econv_incomplete_input.
  (rb_trans_conv): ditto.
  (rb_econv_convert0): ditto.
  (rb_econv_convert): ditto.
  (transcode_loop): ditto.
  (make_econv_exception): change message for econv_incomplete_input.
  (econv_result_to_symbol): return :incomplete_input for
  econv_incomplete_input.
  (ecerr_incomplete_input): new method.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18875 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
 2008-08-26 16:09:29 +00:00
akr
99a26ac164 * include/ruby/io.h (rb_io_t): rename crbuf to cbuf. 
* io.c: follow the renaming.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18874 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
 2008-08-26 15:06:28 +00:00
akr
3c66a5b25e * io.c (make_writeconv): copy invalid/undef flags. 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18859 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
 2008-08-25 18:08:08 +00:00
akr
75b2d7cbe8 * include/ruby/io.h (rb_io_t): new field: writeconv_pre_opts. 
* io.c (make_writeconv): initialize writeconv_pre_opts.
  (io_fwrite): use writeconv_pre_opts.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18856 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
 2008-08-25 17:45:30 +00:00
akr
08911df311 * io.c: test _WIN32 for CRLF platform. (cygwin defines O_BINARY.) 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18855 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
 2008-08-25 16:49:31 +00:00
akr
5c6d113a4b * io.c: force CRLF handling if RUBY_TEST_CRLF_ENVIRONMENT is defined. 
This is only for testing.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18854 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
 2008-08-25 16:30:43 +00:00
akr
6c1190d10f * io.c (io_fwrite): add TEXTMODE_NEWLINE_ENCODER to option for 
rb_str_transcode.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18851 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
 2008-08-25 15:37:04 +00:00
nobu
ce60bbc851 * include/ruby/intern.h (rb_io_ungetbyte): added prototype. 
* io.c (rb_io_gets): use rb_io_getline_1 for unget buffer.

* ruby.c (load_file): use rb_io_ungetbyte.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18832 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
 2008-08-25 08:36:46 +00:00
akr
329729da55 * io.c (rb_io_init_copy): copy encs. 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18822 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
 2008-08-24 10:40:37 +00:00
akr
98e34b223b rdoc updated. 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18821 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
 2008-08-24 10:32:59 +00:00
akr
7918141932 * io.c (rb_io_open): add an argument: vperm. 
(open_key_args): call rb_io_open with perm.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18820 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
 2008-08-24 10:18:32 +00:00
akr
6f8c2ea9c4 * io.c (sym_invalid): removed. 
(sym_undef): removed.
  (sym_ignore): removed.
  (sym_replace): removed.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18819 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
 2008-08-24 10:11:52 +00:00
akr
c22f52c06f * io.c (rb_io_reopen): initialize fptr->encs.opts. 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18818 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
 2008-08-24 10:07:46 +00:00
akr
071319fde1 * io.c (rb_io_s_pipe): accept optional hash. 
(rb_io_set_encoding): ditto.
  (rb_io_extract_modeenc): use rb_econv_opts to initialize
  ecopts.
  (rb_file_open_generic): ditto.
  (rb_file_open_internal): ditto.
  (io_encoding_set): new argument: opt.
  (argf_set_encoding): copy fptr->encs.opts to argf_ecopts.

* transcode.c (rb_econv_opts): accept Qnil for initialization.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18817 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
 2008-08-24 09:40:31 +00:00
akr
571b114708 * include/ruby/io.h (rb_io_enc_t): add opts field. 
(FMODE_INVALID_MASK): removed.
  (FMODE_INVALID_IGNORE): ditto.
  (FMODE_INVALID_REPLACE): ditto.
  (FMODE_UNDEF_MASK): ditto.
  (FMODE_UNDEF_IGNORE): ditto.
  (FMODE_UNDEF_REPLACE): ditto.
  (MakeOpenFile): initialize the opts field.

* io.c (make_writeconv): use the opts field.
  (io_fwrite): ditto.
  (make_readconv): ditto.
  (argf_ecopts): new macro.
  (rb_io_extract_modeenc): fill the opts field.
  (argf_next_argv): ditto.
  (rb_file_open_generic): initialize the opts field.
  (rb_file_open_internal): ditto.
  (io_encoding_set): ditto.
  (argf_set_encoding): ditto.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18816 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
 2008-08-24 09:13:55 +00:00
akr
6d019ccbd0 * io.c (struct argf): use struct rb_io_enc_t. 
(argf_enc): follow the struct argf change.
  (argf_enc2): ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18815 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
 2008-08-24 09:03:04 +00:00
akr
09c7eba7b1 * include/ruby/encoding.h (rb_str_transcode): make 3rd argument 
rb_econv_option_t*.

* transcode.c (transcode_loop): take rb_econv_option_t* as a argument.
  (str_transcode0): ditto.
  (str_transcode): make rb_econv_option_t and call str_transcode0 with
  it.
  (rb_str_transcode): take rb_econv_option_t*.

* io.c (io_fwrite): follow the rb_str_transcode change.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18814 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
 2008-08-24 08:39:09 +00:00
akr
d7bf454666 * include/ruby/io.h (rb_io_t): make enc and enc2 as struct 
rb_io_enc_t;

* io.c: follow the structure change.
  (convconfig_t): defined by rb_io_enc_t.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18813 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
 2008-08-24 07:49:13 +00:00
akr
f27b74142e * include/ruby/encoding.h (rb_econv_opts): declared. 
* transcode.c (rb_econv_opts): defined.

* io.c (rb_io_extract_modeenc): use rb_econv_opts.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18811 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
 2008-08-24 07:20:21 +00:00
akr
9b8adfed22 * include/ruby/encoding.h (rb_econv_option_t): defined. 
(rb_econv_open): 3rd arg changed.
  (rb_econv_open_exc): ditto.

* io.c (make_writeconv): use rb_econv_option_t.
  (make_readconv): ditto.
  (rb_econv_open): take rb_econv_option_t for options.
  (rb_econv_open_exc): ditto.
  (transcode_loop): use rb_econv_option_t.
  (econv_init): use rb_econv_option_t.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18810 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
 2008-08-24 07:12:44 +00:00
akr
c6d291b003 * include/ruby/encoding.h (rb_str_transcode): add ecflags argument. 
* transcode.c (econv_opts): extracted from str_transcode.
  (str_transcode_enc_args): extracted from str_transcode.
  (str_transcode0): extracted from str_transcode.
  (str_transcode): use econv_opts, str_transcode_enc_args,
  str_transcode0.
  (rb_str_transcode): call str_transcode0.
  (econv_primitive_insert_output): give the additional argument for
  rb_str_transcode.

* io.c (make_writeconv): use invalid/undef flags.
  (io_fwrite): ditto.
  (rb_scan_open_args): give the additional argument for
  rb_str_transcode.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18808 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
 2008-08-24 06:25:24 +00:00
akr
bc0efbc9cd * include/ruby/encoding.h (rb_econv_substr_append): renamed from 
rb_econv_string.
  (rb_econv_str_convert): declared.
  (rb_econv_substr_convert): declared.
  (rb_econv_str_append): declared.

* io.c (io_fwrite): use rb_econv_str_convert instead of
  rb_econv_string.

* transcode.c (rb_econv_substr_append): renamed from rb_econv_string.
  (rb_econv_str_append): new function.
  (rb_econv_substr_convert): ditto.
  (rb_econv_str_convert): ditto.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18806 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
 2008-08-24 03:22:43 +00:00
akr
8f9ed3c464 * include/ruby/encoding.h (rb_econv_open_exc): declared. 
* transcode.c (rb_eNoConverter): new exception.
  (rb_econv_open_exc): new function.
  (transcode_loop): use rb_econv_open_exc.

* io.c (make_writeconv): use rb_econv_open_exc.
  (make_readconv): ditto.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18803 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
 2008-08-24 02:42:37 +00:00
akr
cefcbd24f6 * io.c (rb_scan_open_args): use pop_last_hash. 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18792 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
 2008-08-23 09:30:06 +00:00
akr
2b78afebc7 * include/ruby/io.h (FMODE_INVALID_MASK): defined. 
(FMODE_INVALID_IGNORE): defined.
  (FMODE_INVALID_REPLACE): defined.
  (FMODE_UNDEF_MASK): defined.
  (FMODE_UNDEF_IGNORE): defined.
  (FMODE_UNDEF_REPLACE): defined.

* io.c (sym_invalid): defined.
  (sym_undef): defined.
  (sym_ignore): defined.
  (sym_replace): defined.
  (make_readconv): specify ECONV_INVALID_* and ECONV_UNDEF_* if
  FMODE_INVALID_* and FMODE_UNDEF_* is set.
  (rb_io_extract_modeenc): check {:invalid, :undef} => {:replace,
  :ignore} for FMODE_INVALID_* and FMODE_UNDEF_*.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18791 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
 2008-08-23 08:41:02 +00:00
akr
860c233103 * io.c (rb_io_extract_modeenc): check :textmode and :binmode in option 
hash.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18786 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
 2008-08-23 02:23:42 +00:00
akr
d2cb86c532 * io.c (check_pipe_command): extracted from rb_f_open and rb_io_open. 
(rb_f_open): use check_pipe_command.
  (rb_io_open): ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18784 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
 2008-08-23 01:45:49 +00:00
akr
341abd3f88 * io.c (read_all): fptr->enc2 is 0 if no conversion. 
(rb_io_getline_fast): ditto.
  (io_getc): ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18783 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
 2008-08-23 01:14:33 +00:00