summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-04-23 05:07:38 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-04-23 05:07:38 +0000
commit5460a23fc77cfe973bd5b383145287a534f3b6eb (patch)
tree58bec8de7a5e3ad796994b81e2b42fe197827198
parent46bafdd84d6236d80645d87e000e0ab18bf497c7 (diff)
* doc/etc.rd, doc/etc.rd.ja: moved from ext/etc.
* ext/etc.c (Init_etc): fixed rdoc. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@27454 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--doc/etc.rd (renamed from ext/etc/etc.txt)29
-rw-r--r--doc/etc.rd.ja (renamed from ext/etc/etc.txt.ja)25
-rw-r--r--ext/etc/etc.c4
-rw-r--r--version.h6
5 files changed, 41 insertions, 29 deletions
diff --git a/ChangeLog b/ChangeLog
index fb8c05c6a2..1beeb0f8be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Apr 23 14:07:36 2010 Nobuyoshi Nakada <[email protected]>
+
+ * doc/etc.rd, doc/etc.rd.ja: moved from ext/etc.
+
+ * ext/etc.c (Init_etc): fixed rdoc.
+
Tue Apr 20 00:43:03 2010 Nobuyoshi Nakada <[email protected]>
* file.c (rb_file_s_extname): skip last directory separators.
diff --git a/ext/etc/etc.txt b/doc/etc.rd
index 534790172c..b69f9884ad 100644
--- a/ext/etc/etc.txt
+++ b/doc/etc.rd
@@ -1,18 +1,19 @@
-.\" etc.txt - -*- Indented-Text -*- created at: Fri Jul 14 00:47:15 JST 1995
+# etc.rd - -*- mode: rd; coding: us-ascii -*- created at: Fri Jul 14 00:47:15 JST 1995
+=begin
-** Etc(Module)
+= Etc(Module)
-The module to retrieve information under /etc directory. Available
-only on UNIX platforms. All operations defined in this module are
-module functions, so that you can include Etc module into your class.
+The module to retrieve information from running OS. All operations
+defined in this module are module functions, so that you can include
+Etc module into your class.
-Module Function:
+== Module Function
- getlogin
+--- getlogin
returns login name of the user. It this fails, try getpwuid().
- getpwnam(name)
+--- getpwnam(name)
searches in /etc/passwd file (or equivalent database), and
returns password entry for the user. The return value is an
@@ -37,13 +38,13 @@ Module Function:
See getpwnam(3) for detail.
- getpwuid([uid])
+--- getpwuid([uid])
returns passwd entry for the specified user id. If uid is
ommitted, use the value from getuid(). See getpwuid(3) for
detail.
- getgrgid(gid)
+--- getgrgid(gid)
searches in /etc/group file (or equivalent database), and
returns group entry for the group id. The return value is an
@@ -58,15 +59,17 @@ Module Function:
See getgrgid(3) for detail.
- getgrnam(name)
+--- getgrnam(name)
returns the group entry for the specified name. The return
value is the group structure. See getgrnam(3) for detail.
- group
+--- group
iterates over all group entries.
- passwd
+--- passwd
iterates over all passwd entries.
+
+=end
diff --git a/ext/etc/etc.txt.ja b/doc/etc.rd.ja
index 2dddcfb036..39a1efbff1 100644
--- a/ext/etc/etc.txt.ja
+++ b/doc/etc.rd.ja
@@ -1,18 +1,19 @@
-.\" etc.txt.ja - -*- Indented-Text -*- created at: Fri Jul 14 00:47:15 JST 1995
+# etc.rd.ja - -*- mode: rd; coding: euc-jp; -*- created at: Fri Jul 14 00:47:15 JST 1995
+=begin
-** Etc(�⥸�塼��)
+= Etc(�⥸�塼��)
-/etc�ǥ��쥯�ȥ�ʲ��ξ�������뤿��Υ⥸�塼�롥���饹�˥��󥯥롼��
+�¹Ԥ��Ƥ���OS����ξ�������뤿��Υ⥸�塼�롥���饹�˥��󥯥롼��
���ƻȤ����Ȥ�Ǥ��롥
-Module Function:
+== Module Function
- getlogin
+--- getlogin
��ʬ��login̾���֤������줬���Ԥ�������getpwuid()���Ѥ����
�ɤ���
- getpwnam(name)
+--- getpwnam(name)
/etc/passwd�ե�����(���뤤��DBM�ե������NIS�ǡ����١���)��
������name��̾�������passwd����ȥ���֤�������ͤ�passwd��¤
@@ -37,13 +38,13 @@ Module Function:
�ܺ٤�getpwnam(3)�򻲾ȤΤ��ȡ�
- getpwuid([uid])
+--- getpwuid([uid])
uid��桼��ID�Ȥ���passwd����ȥ���֤�������ͤ�getpwnam()��
Ʊ�ͤǤ��롥�������ά�������ˤ�getuid()���ͤ��Ѥ��롥�ܺ٤�
getpwuid(3)�򻲾ȤΤ��ȡ�
- getgrgid(gid)
+--- getgrgid(gid)
/etc/group�ե�����(���뤤�ϡ�getpwnam����)�򸡺�����gid�򥰥롼
��ID�Ȥ��륰�롼�ץ���ȥ���֤�������ͤ�group��¤�Τǰʲ���
@@ -58,15 +59,17 @@ Module Function:
�ܺ٤�getgrgid(3)�򻲾ȤΤ��ȡ�
- getgrnam(name)
+--- getgrnam(name)
name�Ȥ���̾���Υ��롼�ץ���ȥ���֤�������ͤ�getgrgid()��Ʊ
�ͤǤ��롥�ܺ٤�getgrnam(3)�򻲾ȡ�
- group
+--- group
���ƤΥ��롼�ץ���ȥ���˥����������뤿��Υ��ƥ졼����
- passwd
+--- passwd
���Ƥ�passwd����ȥ���˥����������뤿��Υ��ƥ졼����
+
+=end
diff --git a/ext/etc/etc.c b/ext/etc/etc.c
index fe72fa2a8c..32eddef5b2 100644
--- a/ext/etc/etc.c
+++ b/ext/etc/etc.c
@@ -500,8 +500,8 @@ etc_getgrent(obj)
static VALUE mEtc;
-/* The etc module provides access to information from the /etc/passwd and
- * /etc/group files on Linux and Unix systems.
+/*
+ * The etc module provides access to information from the running OS.
*
* Documented by mathew <[email protected]>.
*/
diff --git a/version.h b/version.h
index 6b1ac6f3c3..6c6a8692a5 100644
--- a/version.h
+++ b/version.h
@@ -1,7 +1,7 @@
#define RUBY_VERSION "1.8.8"
-#define RUBY_RELEASE_DATE "2010-04-20"
+#define RUBY_RELEASE_DATE "2010-04-23"
#define RUBY_VERSION_CODE 188
-#define RUBY_RELEASE_CODE 20100420
+#define RUBY_RELEASE_CODE 20100423
#define RUBY_PATCHLEVEL -1
#define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
#define RUBY_VERSION_TEENY 8
#define RUBY_RELEASE_YEAR 2010
#define RUBY_RELEASE_MONTH 4
-#define RUBY_RELEASE_DAY 20
+#define RUBY_RELEASE_DAY 23
#ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[];