Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
37b9bd36
Commit
37b9bd36
authored
Jan 22, 2019
by
Di Xu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
rename temp variable filepath to fpath
parent
27e5971c
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
8 deletions
+8
-8
cp.go
pkg/kubectl/cmd/cp/cp.go
+8
-8
No files found.
pkg/kubectl/cmd/cp/cp.go
View file @
37b9bd36
...
@@ -338,19 +338,19 @@ func makeTar(srcPath, destPath string, writer io.Writer) error {
...
@@ -338,19 +338,19 @@ func makeTar(srcPath, destPath string, writer io.Writer) error {
}
}
func
recursiveTar
(
srcBase
,
srcFile
,
destBase
,
destFile
string
,
tw
*
tar
.
Writer
)
error
{
func
recursiveTar
(
srcBase
,
srcFile
,
destBase
,
destFile
string
,
tw
*
tar
.
Writer
)
error
{
f
ile
path
:=
path
.
Join
(
srcBase
,
srcFile
)
fpath
:=
path
.
Join
(
srcBase
,
srcFile
)
stat
,
err
:=
os
.
Lstat
(
f
ile
path
)
stat
,
err
:=
os
.
Lstat
(
fpath
)
if
err
!=
nil
{
if
err
!=
nil
{
return
err
return
err
}
}
if
stat
.
IsDir
()
{
if
stat
.
IsDir
()
{
files
,
err
:=
ioutil
.
ReadDir
(
f
ile
path
)
files
,
err
:=
ioutil
.
ReadDir
(
fpath
)
if
err
!=
nil
{
if
err
!=
nil
{
return
err
return
err
}
}
if
len
(
files
)
==
0
{
if
len
(
files
)
==
0
{
//case empty directory
//case empty directory
hdr
,
_
:=
tar
.
FileInfoHeader
(
stat
,
f
ile
path
)
hdr
,
_
:=
tar
.
FileInfoHeader
(
stat
,
fpath
)
hdr
.
Name
=
destFile
hdr
.
Name
=
destFile
if
err
:=
tw
.
WriteHeader
(
hdr
);
err
!=
nil
{
if
err
:=
tw
.
WriteHeader
(
hdr
);
err
!=
nil
{
return
err
return
err
...
@@ -364,8 +364,8 @@ func recursiveTar(srcBase, srcFile, destBase, destFile string, tw *tar.Writer) e
...
@@ -364,8 +364,8 @@ func recursiveTar(srcBase, srcFile, destBase, destFile string, tw *tar.Writer) e
return
nil
return
nil
}
else
if
stat
.
Mode
()
&
os
.
ModeSymlink
!=
0
{
}
else
if
stat
.
Mode
()
&
os
.
ModeSymlink
!=
0
{
//case soft link
//case soft link
hdr
,
_
:=
tar
.
FileInfoHeader
(
stat
,
f
ile
path
)
hdr
,
_
:=
tar
.
FileInfoHeader
(
stat
,
fpath
)
target
,
err
:=
os
.
Readlink
(
f
ile
path
)
target
,
err
:=
os
.
Readlink
(
fpath
)
if
err
!=
nil
{
if
err
!=
nil
{
return
err
return
err
}
}
...
@@ -377,7 +377,7 @@ func recursiveTar(srcBase, srcFile, destBase, destFile string, tw *tar.Writer) e
...
@@ -377,7 +377,7 @@ func recursiveTar(srcBase, srcFile, destBase, destFile string, tw *tar.Writer) e
}
}
}
else
{
}
else
{
//case regular file or other file type like pipe
//case regular file or other file type like pipe
hdr
,
err
:=
tar
.
FileInfoHeader
(
stat
,
f
ile
path
)
hdr
,
err
:=
tar
.
FileInfoHeader
(
stat
,
fpath
)
if
err
!=
nil
{
if
err
!=
nil
{
return
err
return
err
}
}
...
@@ -387,7 +387,7 @@ func recursiveTar(srcBase, srcFile, destBase, destFile string, tw *tar.Writer) e
...
@@ -387,7 +387,7 @@ func recursiveTar(srcBase, srcFile, destBase, destFile string, tw *tar.Writer) e
return
err
return
err
}
}
f
,
err
:=
os
.
Open
(
f
ile
path
)
f
,
err
:=
os
.
Open
(
fpath
)
if
err
!=
nil
{
if
err
!=
nil
{
return
err
return
err
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment