mirror of
				https://github.com/ruby/ruby.git
				synced 2022-11-09 12:17:21 -05:00 
			
		
		
		
	 70bbad3cfd
			
		
	
	
		70bbad3cfd
		
	
	
	
	
		
			
			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
		
			
				
	
	
		
			420 lines
		
	
	
	
		
			7.2 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			420 lines
		
	
	
	
		
			7.2 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| /************************************************
 | |
| 
 | |
|   etc.c -
 | |
| 
 | |
|   $Author$
 | |
|   $Date$
 | |
|   created at: Tue Mar 22 18:39:19 JST 1994
 | |
| 
 | |
| ************************************************/
 | |
| 
 | |
| #include "ruby.h"
 | |
| 
 | |
| #include <sys/types.h>
 | |
| #ifdef HAVE_UNISTD_H
 | |
| #include <unistd.h>
 | |
| #endif
 | |
| 
 | |
| #ifdef HAVE_GETPWENT
 | |
| #include <pwd.h>
 | |
| #endif
 | |
| 
 | |
| #ifdef HAVE_GETGRENT
 | |
| #include <grp.h>
 | |
| #endif
 | |
| 
 | |
| static VALUE sPasswd, sGroup;
 | |
| 
 | |
| #ifndef _WIN32
 | |
| char *getenv();
 | |
| #endif
 | |
| char *getlogin();
 | |
| 
 | |
| static VALUE
 | |
| etc_getlogin(obj)
 | |
|     VALUE obj;
 | |
| {
 | |
|     char *login;
 | |
| 
 | |
|     rb_secure(4);
 | |
| #ifdef HAVE_GETLOGIN
 | |
|     login = getlogin();
 | |
|     if (!login) login = getenv("USER");
 | |
| #else
 | |
|     login = getenv("USER");
 | |
| #endif
 | |
| 
 | |
|     if (login)
 | |
| 	return rb_tainted_str_new2(login);
 | |
|     return Qnil;
 | |
| }
 | |
| 
 | |
| #if defined(HAVE_GETPWENT) || defined(HAVE_GETGRENT)
 | |
| static VALUE
 | |
| safe_setup_str(str)
 | |
|     const char *str;
 | |
| {
 | |
|     if (str == 0) str = "";
 | |
|     return rb_tainted_str_new2(str);
 | |
| }
 | |
| #endif
 | |
| 
 | |
| #ifdef HAVE_GETPWENT
 | |
| static VALUE
 | |
| setup_passwd(pwd)
 | |
|     struct passwd *pwd;
 | |
| {
 | |
|     if (pwd == 0) rb_sys_fail("/etc/passwd");
 | |
|     return rb_struct_new(sPasswd,
 | |
| 			 safe_setup_str(pwd->pw_name),
 | |
| #ifdef HAVE_ST_PW_PASSWD
 | |
| 			 safe_setup_str(pwd->pw_passwd),
 | |
| #endif
 | |
| 			 INT2FIX(pwd->pw_uid),
 | |
| 			 INT2FIX(pwd->pw_gid),
 | |
| #ifdef HAVE_ST_PW_GECOS
 | |
| 			 safe_setup_str(pwd->pw_gecos),
 | |
| #endif
 | |
| 			 safe_setup_str(pwd->pw_dir),
 | |
| 			 safe_setup_str(pwd->pw_shell),
 | |
| #ifdef HAVE_ST_PW_CHANGE
 | |
| 			 INT2FIX(pwd->pw_change),
 | |
| #endif
 | |
| #ifdef HAVE_ST_PW_QUOTA
 | |
| 			 INT2FIX(pwd->pw_quota),
 | |
| #endif
 | |
| #ifdef HAVE_ST_PW_AGE
 | |
| 			 INT2FIX(pwd->pw_age),
 | |
| #endif
 | |
| #ifdef HAVE_ST_PW_CLASS
 | |
| 			 safe_setup_str(pwd->pw_class),
 | |
| #endif
 | |
| #ifdef HAVE_ST_PW_COMMENT
 | |
| 			 safe_setup_str(pwd->pw_comment),
 | |
| #endif
 | |
| #ifdef HAVE_ST_PW_EXPIRE
 | |
| 			 INT2FIX(pwd->pw_expire),
 | |
| #endif
 | |
| 			 0		/*dummy*/
 | |
| 	);
 | |
| }
 | |
| #endif
 | |
| 
 | |
| static VALUE
 | |
| etc_getpwuid(argc, argv, obj)
 | |
|     int argc;
 | |
|     VALUE *argv;
 | |
|     VALUE obj;
 | |
| {
 | |
| #if defined(HAVE_GETPWENT)
 | |
|     VALUE id;
 | |
|     int uid;
 | |
|     struct passwd *pwd;
 | |
| 
 | |
|     rb_secure(4);
 | |
|     if (rb_scan_args(argc, argv, "01", &id) == 1) {
 | |
| 	uid = NUM2INT(id);
 | |
|     }
 | |
|     else {
 | |
| 	uid = getuid();
 | |
|     }
 | |
|     pwd = getpwuid(uid);
 | |
|     if (pwd == 0) rb_raise(rb_eArgError, "can't find user for %d", uid);
 | |
|     return setup_passwd(pwd);
 | |
| #else 
 | |
|     return Qnil;
 | |
| #endif
 | |
| }
 | |
| 
 | |
| static VALUE
 | |
| etc_getpwnam(obj, nam)
 | |
|     VALUE obj, nam;
 | |
| {
 | |
| #ifdef HAVE_GETPWENT
 | |
|     struct passwd *pwd;
 | |
| 
 | |
|     SafeStringValue(nam);
 | |
|     pwd = getpwnam(RSTRING(nam)->ptr);
 | |
|     if (pwd == 0) rb_raise(rb_eArgError, "can't find user for %s", RSTRING(nam)->ptr);
 | |
|     return setup_passwd(pwd);
 | |
| #else 
 | |
|     return Qnil;
 | |
| #endif
 | |
| }
 | |
| 
 | |
| #ifdef HAVE_GETPWENT
 | |
| static int passwd_blocking = 0;
 | |
| static VALUE
 | |
| passwd_ensure()
 | |
| {
 | |
|     passwd_blocking = Qfalse;
 | |
|     return Qnil;
 | |
| }
 | |
| 
 | |
| static VALUE
 | |
| passwd_iterate()
 | |
| {
 | |
|     struct passwd *pw;
 | |
| 
 | |
|     setpwent();
 | |
|     while (pw = getpwent()) {
 | |
| 	rb_yield(setup_passwd(pw));
 | |
|     }
 | |
|     endpwent();
 | |
|     return Qnil;
 | |
| }
 | |
| #endif
 | |
| 
 | |
| static VALUE
 | |
| etc_passwd(obj)
 | |
|     VALUE obj;
 | |
| {
 | |
| #ifdef HAVE_GETPWENT
 | |
|     struct passwd *pw;
 | |
| 
 | |
|     rb_secure(4);
 | |
|     if (rb_block_given_p()) {
 | |
| 	if (passwd_blocking) {
 | |
| 	    rb_raise(rb_eRuntimeError, "parallel passwd iteration");
 | |
| 	}
 | |
| 	passwd_blocking = Qtrue;
 | |
| 	rb_ensure(passwd_iterate, 0, passwd_ensure, 0);
 | |
|     }
 | |
|     if (pw = getpwent()) {
 | |
| 	return setup_passwd(pw);
 | |
|     }
 | |
| #endif
 | |
|     return Qnil;
 | |
| }
 | |
| 
 | |
| static VALUE
 | |
| etc_setpwent(obj)
 | |
|     VALUE obj;
 | |
| {
 | |
| #ifdef HAVE_GETPWENT
 | |
|     setpwent();
 | |
| #endif
 | |
|     return Qnil;
 | |
| }
 | |
| 
 | |
| static VALUE
 | |
| etc_endpwent(obj)
 | |
|     VALUE obj;
 | |
| {
 | |
| #ifdef HAVE_GETPWENT
 | |
|     endpwent();
 | |
| #endif
 | |
|     return Qnil;
 | |
| }
 | |
| 
 | |
| static VALUE
 | |
| etc_getpwent(obj)
 | |
|     VALUE obj;
 | |
| {
 | |
| #ifdef HAVE_GETPWENT
 | |
|     struct passwd *pw;
 | |
| 
 | |
|     if (pw = getpwent()) {
 | |
| 	return setup_passwd(pw);
 | |
|     }
 | |
| #endif
 | |
|     return Qnil;
 | |
| }
 | |
| 
 | |
| #ifdef HAVE_GETGRENT
 | |
| static VALUE
 | |
| setup_group(grp)
 | |
|     struct group *grp;
 | |
| {
 | |
|     VALUE mem;
 | |
|     char **tbl;
 | |
| 
 | |
|     mem = rb_ary_new();
 | |
|     tbl = grp->gr_mem;
 | |
|     while (*tbl) {
 | |
| 	rb_ary_push(mem, safe_setup_str(*tbl));
 | |
| 	tbl++;
 | |
|     }
 | |
|     return rb_struct_new(sGroup,
 | |
| 			 safe_setup_str(grp->gr_name),
 | |
| #ifdef HAVE_ST_GR_PASSWD
 | |
| 			 safe_setup_str(grp->gr_passwd),
 | |
| #endif
 | |
| 			 INT2FIX(grp->gr_gid),
 | |
| 			 mem);
 | |
| }
 | |
| #endif
 | |
| 
 | |
| static VALUE
 | |
| etc_getgrgid(obj, id)
 | |
|     VALUE obj, id;
 | |
| {
 | |
| #ifdef HAVE_GETGRENT
 | |
|     int gid;
 | |
|     struct group *grp;
 | |
| 
 | |
|     rb_secure(4);
 | |
|     gid = NUM2INT(id);
 | |
|     grp = getgrgid(gid);
 | |
|     if (grp == 0) rb_raise(rb_eArgError, "can't find group for %d", gid);
 | |
|     return setup_group(grp);
 | |
| #else
 | |
|     return Qnil;
 | |
| #endif
 | |
| }
 | |
| 
 | |
| static VALUE
 | |
| etc_getgrnam(obj, nam)
 | |
|     VALUE obj, nam;
 | |
| {
 | |
| #ifdef HAVE_GETGRENT
 | |
|     struct group *grp;
 | |
| 
 | |
|     rb_secure(4);
 | |
|     SafeStringValue(nam);
 | |
|     grp = getgrnam(RSTRING(nam)->ptr);
 | |
|     if (grp == 0) rb_raise(rb_eArgError, "can't find group for %s", RSTRING(nam)->ptr);
 | |
|     return setup_group(grp);
 | |
| #else
 | |
|     return Qnil;
 | |
| #endif
 | |
| }
 | |
| 
 | |
| #ifdef HAVE_GETGRENT
 | |
| static int group_blocking = 0;
 | |
| static VALUE
 | |
| group_ensure()
 | |
| {
 | |
|     group_blocking = Qfalse;
 | |
|     return Qnil;
 | |
| }
 | |
| 
 | |
| static VALUE
 | |
| group_iterate()
 | |
| {
 | |
|     struct group *pw;
 | |
| 
 | |
|     setgrent();
 | |
|     while (pw = getgrent()) {
 | |
| 	rb_yield(setup_group(pw));
 | |
|     }
 | |
|     endgrent();
 | |
|     return Qnil;
 | |
| }
 | |
| #endif
 | |
| 
 | |
| static VALUE
 | |
| etc_group(obj)
 | |
|     VALUE obj;
 | |
| {
 | |
| #ifdef HAVE_GETGRENT
 | |
|     struct group *grp;
 | |
| 
 | |
|     rb_secure(4);
 | |
|     if (rb_block_given_p()) {
 | |
| 	if (group_blocking) {
 | |
| 	    rb_raise(rb_eRuntimeError, "parallel group iteration");
 | |
| 	}
 | |
| 	group_blocking = Qtrue;
 | |
| 	rb_ensure(group_iterate, 0, group_ensure, 0);
 | |
|     }
 | |
|     if (grp = getgrent()) {
 | |
| 	return setup_group(grp);
 | |
|     }
 | |
| #endif
 | |
|     return Qnil;
 | |
| }
 | |
| 
 | |
| static VALUE
 | |
| etc_setgrent(obj)
 | |
|     VALUE obj;
 | |
| {
 | |
| #ifdef HAVE_GETGRENT
 | |
|     setgrent();
 | |
| #endif
 | |
|     return Qnil;
 | |
| }
 | |
| 
 | |
| static VALUE
 | |
| etc_endgrent(obj)
 | |
|     VALUE obj;
 | |
| {
 | |
| #ifdef HAVE_GETGRENT
 | |
|     endgrent();
 | |
| #endif
 | |
|     return Qnil;
 | |
| }
 | |
| 
 | |
| static VALUE
 | |
| etc_getgrent(obj)
 | |
|     VALUE obj;
 | |
| {
 | |
| #ifdef HAVE_GETGRENT
 | |
|     struct group *gr;
 | |
| 
 | |
|     if (gr = getgrent()) {
 | |
| 	return setup_group(gr);
 | |
|     }
 | |
| #endif
 | |
|     return Qnil;
 | |
| }
 | |
| 
 | |
| static VALUE mEtc;
 | |
| 
 | |
| void
 | |
| Init_etc()
 | |
| {
 | |
|     mEtc = rb_define_module("Etc");
 | |
| 
 | |
|     rb_define_module_function(mEtc, "getlogin", etc_getlogin, 0);
 | |
| 
 | |
|     rb_define_module_function(mEtc, "getpwuid", etc_getpwuid, -1);
 | |
|     rb_define_module_function(mEtc, "getpwnam", etc_getpwnam, 1);
 | |
|     rb_define_module_function(mEtc, "setpwent", etc_setpwent, 0);
 | |
|     rb_define_module_function(mEtc, "endpwent", etc_endpwent, 0);
 | |
|     rb_define_module_function(mEtc, "getpwent", etc_getpwent, 0);
 | |
|     rb_define_module_function(mEtc, "passwd", etc_passwd, 0);
 | |
| 
 | |
|     rb_define_module_function(mEtc, "getgrgid", etc_getgrgid, 1);
 | |
|     rb_define_module_function(mEtc, "getgrnam", etc_getgrnam, 1);
 | |
|     rb_define_module_function(mEtc, "group", etc_group, 0);
 | |
|     rb_define_module_function(mEtc, "setgrent", etc_setgrent, 0);
 | |
|     rb_define_module_function(mEtc, "endgrent", etc_endgrent, 0);
 | |
|     rb_define_module_function(mEtc, "getgrent", etc_getgrent, 0);
 | |
| 
 | |
|     sPasswd =  rb_struct_define("Passwd",
 | |
| 				"name", "passwd", "uid", "gid",
 | |
| #ifdef HAVE_ST_PW_GECOS
 | |
| 				"gecos",
 | |
| #endif
 | |
| 				"dir", "shell",
 | |
| #ifdef HAVE_ST_PW_CHANGE
 | |
| 				"change",
 | |
| #endif
 | |
| #ifdef HAVE_ST_PW_QUOTA
 | |
| 				"quota",
 | |
| #endif
 | |
| #ifdef HAVE_ST_PW_AGE
 | |
| 				"age",
 | |
| #endif
 | |
| #ifdef HAVE_ST_PW_CLASS
 | |
| 				"uclass",
 | |
| #endif
 | |
| #ifdef HAVE_ST_PW_COMMENT
 | |
| 				"comment",
 | |
| #endif
 | |
| #ifdef HAVE_ST_PW_EXPIRE
 | |
| 				"expire",
 | |
| #endif
 | |
| 				NULL);
 | |
|     rb_global_variable(&sPasswd);
 | |
| 
 | |
| #ifdef HAVE_GETGRENT
 | |
|     sGroup = rb_struct_define("Group", "name",
 | |
| #ifdef HAVE_ST_GR_PASSWD
 | |
| 			      "passwd",
 | |
| #endif
 | |
| 			      "gid", "mem", NULL);
 | |
|     rb_global_variable(&sGroup);
 | |
| #endif
 | |
| }
 |