root
/
rubyzip
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean up use of file_name in Zip::File::initialize.

This commit is contained in:
Robert Haines 2018-04-03 23:45:04 +01:00
parent 05af1231f4
commit 7cd263e6a0
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/zip/file.rb
View File

@ -69,18 +69,18 @@ module Zip
@name = file_name @name = file_name
@comment = '' @comment = ''
@create = create ? true : false # allow any truthy value to mean true @create = create ? true : false # allow any truthy value to mean true
if !buffer && ::File.size?(file_name) if !buffer && ::File.size?(@name)
@create = false @create = false
@file_permissions = ::File.stat(file_name).mode @file_permissions = ::File.stat(@name).mode
::File.open(name, 'rb') do |f| ::File.open(@name, 'rb') do |f|
read_from_stream(f) read_from_stream(f)
end end
elsif @create elsif @create
@entry_set = EntrySet.new @entry_set = EntrySet.new
elsif ::File.zero?(file_name) elsif ::File.zero?(@name)
raise Error, "File #{file_name} has zero size. Did you mean to pass the create flag?" raise Error, "File #{@name} has zero size. Did you mean to pass the create flag?"
else else
raise Error, "File #{file_name} not found" raise Error, "File #{@name} not found"
end end
@stored_entries = @entry_set.dup @stored_entries = @entry_set.dup
@stored_comment = @comment @stored_comment = @comment