aboutsummaryrefslogtreecommitdiff
path: root/file
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2017-05-03 14:42:06 +0200
committerDimitri Sokolyuk <demon@dim13.org>2017-05-03 14:42:06 +0200
commit1b4ed34a5ab493f14494304904da5a553cc4980b (patch)
tree2d852d70654e32208e54b8a658daa418cff7c9a9 /file
parenta60a43fadb0ebc1a5c87fc36a77c6b8d671fba95 (diff)
Split path
Diffstat (limited to 'file')
-rw-r--r--file/names.go7
-rw-r--r--file/names_test.go1
2 files changed, 5 insertions, 3 deletions
diff --git a/file/names.go b/file/names.go
index 2e90e7b..5b2287c 100644
--- a/file/names.go
+++ b/file/names.go
@@ -18,11 +18,12 @@ const (
)
func splitNameExt(fname string) (string, string) {
- ext := filepath.Ext(fname)
+ _, file := path.Split(fname)
+ ext := filepath.Ext(file)
if len(ext) == 0 {
- return fname, ""
+ return file, ""
}
- return fname[:len(fname)-len(ext)], ext
+ return file[:len(file)-len(ext)], ext
}
func Names(pubFile, encFile string) error {
diff --git a/file/names_test.go b/file/names_test.go
index f4d474b..38e374d 100644
--- a/file/names_test.go
+++ b/file/names_test.go
@@ -52,6 +52,7 @@ func TestSplit(t *testing.T) {
{".pub", "", ".pub"},
{".testkey.pub", ".testkey", ".pub"},
{"", "", ""},
+ {"path/key.pub", "key", ".pub"},
}
for _, tc := range testCases {
t.Run(tc.fname, func(t *testing.T) {