* pack.c (pack_pack): wrong # comment treatment.

* pack.c (pack_unpack): ditto.


git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@2107 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

5 files changed, 16 insertions, 10 deletions

diff --git a/COPYING b/COPYING
index 776b14246..42c877563 100644
--- a/COPYING
+++ b/COPYING
@@ -17,22 +17,22 @@ You can redistribute it and/or modify it under either the terms of the GPL
        b) use the modified software only within your corporation or
           organization.
 
-       c) rename any non-standard executables so the names do not conflict
-	  with standard executables, which must also be provided.
+       c) rename any non-standard binaries so the names do not conflict
+	  with standard binaries, which must also be provided.
 
        d) make other distribution arrangements with the author.
 
-  3. You may distribute the software in object code or executable
-     form, provided that you do at least ONE of the following:
+  3. You may distribute the software in object code or binary form,
+     provided that you do at least ONE of the following:
 
-       a) distribute the executables and library files of the software,
+       a) distribute the binaries and library files of the software,
 	  together with instructions (in the manual page or equivalent)
 	  on where to get the original distribution.
 
        b) accompany the distribution with the machine-readable source of
 	  the software.
 
-       c) give non-standard executables non-standard names, with
+       c) give non-standard binaries non-standard names, with
           instructions on where to get the original software distribution.
 
        d) make other distribution arrangements with the author.
diff --git a/ChangeLog b/ChangeLog
index f5d6434db..8ad515649 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Feb 21 02:49:12 2002  Koji Arai  <jca02266@nifty.ne.jp>
+
+	* pack.c (pack_pack): wrong # comment treatment.
+
+	* pack.c (pack_unpack): ditto.
+
 Wed Feb 20 15:15:03 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
 	* intern.h: prototypes; rb_io_addstr(), rb_io_printf(),
diff --git a/eval.c b/eval.c
index 68db0ed33..fef1c8680 100644
--- a/eval.c
+++ b/eval.c
@@ -3314,7 +3314,7 @@ rb_eval(self, n)
 	    else {
 		if (rb_special_const_p(result)) {
 		    rb_raise(rb_eTypeError, "no virtual class for %s",
-			     rb_class2name(CLASS_OF(klass)));
+			     rb_class2name(CLASS_OF(result)));
 		}
 		if (rb_safe_level() >= 4 && !OBJ_TAINTED(result))
 		    rb_raise(rb_eSecurityError, "Insecure: can't extend object");
diff --git a/lib/shell.rb b/lib/shell.rb
index 6b44cc3e6..d641657cb 100644
--- a/lib/shell.rb
+++ b/lib/shell.rb
@@ -116,7 +116,7 @@ class Shell
   attr_reader :process_controller
 
   def expand_path(path)
-    if /^\// =~ path
+    if /^[\/~]/ =~ path
       File.expand_path(path)
     else
       File.expand_path(File.join(@cwd, path))
diff --git a/pack.c b/pack.c
index 77ad3653b..33870d28f 100644
--- a/pack.c
+++ b/pack.c
@@ -367,7 +367,7 @@ pack_pack(ary, fmt)
 	    while ((p < pend) && (*p != '\n')) {
 		p++;
 	    }
-	    break;
+	    continue;
 	}
         if (*p == '_' || *p == '!') {
 	    char *natstr = "sSiIlL";
@@ -1086,7 +1086,7 @@ pack_unpack(str, fmt)
 	    while ((p < pend) && (*p != '\n')) {
 		p++;
 	    }
-	    break;
+	    continue;
 	}
 	star = 0;
 	if (*p == '_' || *p == '!') {