summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog10
-rw-r--r--lib/ftools.rb9
-rw-r--r--version.h4
3 files changed, 18 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index cbed08f1684..1cf2b870736 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Sat Aug 5 16:43:43 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
+
+ * djgpp/*: convert DOS line endings to UNIX style.
+
+ * djgpp/config.status: rename to config.sed for SFN.
+
+ * lib/ftools.rb (compare, safe_unlink, chmod): avoid warnings.
+
+ * lib/ftools.rb (move): typo. not `tpath', but `to'.
+
Wed Aug 2 18:27:47 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
* eval.c (rb_thread_wait_fd): prohibit thread context switch
diff --git a/lib/ftools.rb b/lib/ftools.rb
index 39d6ca94624..369a6177d22 100644
--- a/lib/ftools.rb
+++ b/lib/ftools.rb
@@ -81,7 +81,7 @@ class << File
syscopy from, to and unlink from
utime(from_stat.atime, from_stat.mtime, to)
begin
- chown(fstat.uid, fstat.gid, tpath)
+ chown(fstat.uid, fstat.gid, to)
rescue
end
end
@@ -110,7 +110,8 @@ class << File
begin
while fr == tr
- if fr = from.read(fsize)
+ fr = from.read(fsize)
+ if fr
tr = to.read(fr.size)
else
ret = to.read(fsize)
@@ -136,7 +137,7 @@ class << File
begin
$stderr.print files.join(" "), "\n" if verbose
chmod 0777, *files
- unlink *files
+ unlink(*files)
rescue
# STDERR.print "warning: Couldn't unlink #{files.join ' '}\n"
end
@@ -163,11 +164,13 @@ class << File
alias o_chmod chmod
+ vsave, $VERBOSE = $VERBOSE, false
def chmod(mode, *files)
verbose = if files[-1].is_a? String then false else files.pop end
$stderr.printf "chmod %04o %s\n", mode, files.join(" ") if verbose
o_chmod mode, *files
end
+ $VERBOSE = vsave
def install(from, to, mode = nil, verbose = false)
to = catname(from, to)
diff --git a/version.h b/version.h
index 356f641c021..51344c2a247 100644
--- a/version.h
+++ b/version.h
@@ -1,4 +1,4 @@
#define RUBY_VERSION "1.5.5"
-#define RUBY_RELEASE_DATE "2000-08-02"
+#define RUBY_RELEASE_DATE "2000-08-05"
#define RUBY_VERSION_CODE 155
-#define RUBY_RELEASE_CODE 20000802
+#define RUBY_RELEASE_CODE 20000805