aboutsummaryrefslogtreecommitdiff
path: root/file/names.go
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2017-05-03 13:43:18 +0200
committerDimitri Sokolyuk <demon@dim13.org>2017-05-03 13:43:18 +0200
commit370b8645dc0e6c98b502264d1fb6c8bbda2b6ce4 (patch)
tree577dbf12de005865fb5b885fbbb3e95640b9b014 /file/names.go
parent88fd3fa8aa680df9026b80e284704d628b6efc76 (diff)
Split name/ext
Diffstat (limited to 'file/names.go')
-rw-r--r--file/names.go14
1 files changed, 9 insertions, 5 deletions
diff --git a/file/names.go b/file/names.go
index eb6bff8..0d749c5 100644
--- a/file/names.go
+++ b/file/names.go
@@ -11,12 +11,16 @@ import (
var ErrNames = errors.New("please use naming scheme of keyname.pub and keyname.sec")
+func splitNameExt(fname string) (string, string) {
+ fname = filepath.Base(fname)
+ ext := filepath.Ext(fname)
+ return fname[:len(ext)-1], ext
+}
+
func Names(pubFile, encFile string) error {
- pubFile = filepath.Base(pubFile)
- encFile = filepath.Base(encFile)
- pubExt := filepath.Ext(pubFile)
- encExt := filepath.Ext(encFile)
- if pubExt != ".pub" || encExt != ".sec" || pubFile[:len(pubExt)-1] != encFile[:len(encExt)-1] {
+ pubName, pubExt := splitNameExt(pubFile)
+ encName, encExt := splitNameExt(encFile)
+ if pubExt != ".pub" || encExt != ".sec" || pubName != encName {
return ErrNames
}
return nil