diff options
| author | Stephen Weinberg <stephen@q5comm.com> | 2010-02-05 02:39:33 -0800 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2010-02-05 02:39:33 -0800 |
| commit | bc43cc3db0091fa697c65d0239c70abf099945e3 (patch) | |
| tree | 3c3f836f48faa7a06f56f69f3c86a2db9193db74 /src/pkg/path/path.go | |
| parent | 0e47c75f605c5b695e2af4d2a13a12d522887483 (diff) | |
| download | go-bc43cc3db0091fa697c65d0239c70abf099945e3.tar.xz | |
path: make Join variadic
R=rsc, r
CC=golang-dev
https://golang.org/cl/198049
Diffstat (limited to 'src/pkg/path/path.go')
| -rw-r--r-- | src/pkg/path/path.go | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/pkg/path/path.go b/src/pkg/path/path.go index e03f2ecf60..c45f77be55 100644 --- a/src/pkg/path/path.go +++ b/src/pkg/path/path.go @@ -115,13 +115,15 @@ func Split(path string) (dir, file string) { return "", path } -// Join joins dir and file into a single path, adding a separating -// slash if necessary. If dir is empty, it returns file. -func Join(dir, file string) string { - if dir == "" { - return file +// Join joins any number of path elemets into a single path, adding a +// separating slash if necessary. All empty strings are ignored. +func Join(elem ...string) string { + for i, e := range elem { + if e != "" { + return Clean(strings.Join(elem[i:], "/")) + } } - return Clean(dir + "/" + file) + return "" } // Ext returns the file name extension used by path. |
