Skip to content

Commit

Permalink
* pack.c (pack_pack): wrong # comment treatment.
Browse files Browse the repository at this point in the history
* pack.c (pack_unpack): ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@2107 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information
matz committed Feb 21, 2002
1 parent 7f97e89 commit a08cea3
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 10 deletions.
12 changes: 6 additions & 6 deletions COPYING
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
6 changes: 6 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
Thu Feb 21 02:49:12 2002 Koji Arai <[email protected]>

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

* pack.c (pack_unpack): ditto.

Wed Feb 20 15:15:03 2002 Nobuyoshi Nakada <[email protected]>

* intern.h: prototypes; rb_io_addstr(), rb_io_printf(),
Expand Down
2 changes: 1 addition & 1 deletion eval.c
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
2 changes: 1 addition & 1 deletion lib/shell.rb
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ def debug=(val)
attr_reader :process_controller

def expand_path(path)
if /^\// =~ path
if /^[\/~]/ =~ path
File.expand_path(path)
else
File.expand_path(File.join(@cwd, path))
Expand Down
4 changes: 2 additions & 2 deletions pack.c
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@ pack_pack(ary, fmt)
while ((p < pend) && (*p != '\n')) {
p++;
}
break;
continue;
}
if (*p == '_' || *p == '!') {
char *natstr = "sSiIlL";
Expand Down Expand Up @@ -1086,7 +1086,7 @@ pack_unpack(str, fmt)
while ((p < pend) && (*p != '\n')) {
p++;
}
break;
continue;
}
star = 0;
if (*p == '_' || *p == '!') {
Expand Down

0 comments on commit a08cea3

Please sign in to comment.