suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix bug in untar when unpacking a tar file with top-level files

Browse Source
This commit is contained in:
Robby Findler 2013-04-03 09:55:28 -05:00
parent 77a1b55c32
commit cce76eba00
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
collects/file/untar.rkt
View File

@ -108,7 +108,7 @@
[(file)
(log-untar-info "file: ~a" filename)
(define-values (base name dir?) (split-path filename))
(make-directory* base)
(when (path? base) (make-directory* base))
(call-with-output-file*
filename
#:exists 'truncate
@ -125,7 +125,7 @@
[(link)
(log-untar-info "link: ~a" filename)
(define-values (base name dir?) (split-path filename))
(make-directory* base)
(when (path? base) (make-directory* base))
(when (file-exists? filename) (delete-file filename))
(make-file-or-directory-link link-target filename)
delays]

20
collects/tests/file/unpackers.rkt
View File

@ -1,5 +1,5 @@
#lang racket/base
(require file/untar file/untgz file/unzip racket/file racket/system
(require file/untar file/untgz file/unzip racket/file racket/system racket/set
tests/eli-tester)
(provide tests)
@ -96,7 +96,23 @@
(untgz (path-replace-suffix a.tar #".tar.gz") #:dest "sub")
(test (diff "ex1" (build-path "sub" "ex1") #t))
(delete-directory/files "sub")
(file-or-directory-permissions* more-dir "rwx"))
(file-or-directory-permissions* more-dir "rwx")
;; make sure top-level file extraction works
(untgz (open-input-bytes
;; bytes gotten from 'tar' and 'gzip' command-line tools
(bytes-append
#"\37\213\b\b\3774\\Q\0\3robby.1.tar\0\3631Lf\2405000031Q"
#"\0\321\346f\246`\332\300\b\302\207\1\5C#C#s\3c#cS\3\5\3CC33C"
#"\6\5\3\232\273\f\bJ\213K\22\213\200N)\312OJ\252\304\243\16\250"
#",-\r\217<\324\37pz\210\200\214\324\234\202\324\"\275\242\354\22"
#"\332\331AR\374\233\233\2\343\337\330\330\310|4\376G\301(\30\5"
#"\243\200\226\0\0\342 \234\3\0\b\0\0")))
(test (file-exists? "L1c"))
(test (file-exists? "helper.rkt"))
(delete-file "L1c")
(delete-file "helper.rkt"))
(define (unzip-tests*)
(make-directory* "ex1")