Revert "mfs.Mkdir returns the final Directory it creates"
This reverts commit dfd98f27b25868c770cb1d50c3a3a82e5f53453d. License: MIT Signed-off-by: Stephen Whitmore <noffle@ipfs.io>
Stephen Whitmore committed
Apr 12, 2016 at 13:30 UTC
7e88f83f7458c794b8a8b7cf7405ab2055136963
3 files changed
+13
-13
core/commands/files/files.go
+1
-1
@@ -650,7 +650,7 @@ Examples:
650
flush = true
651
}
652
653
- _, err = mfs.Mkdir(n.FilesRoot, dirtomake, dashp, flush)
653
+ err = mfs.Mkdir(n.FilesRoot, dirtomake, dashp, flush)
654
if err != nil {
655
res.SetError(err, cmds.ErrNormal)
656
return
core/coreunix/add.go
+2
-2
@@ -349,7 +349,7 @@ func (adder *Adder) addNode(node *dag.Node, path string) error {
349
350
dir := gopath.Dir(path)
351
if dir != "." {
352
- if _, err := mfs.Mkdir(adder.mr, dir, true, false); err != nil {
352
+ if err := mfs.Mkdir(adder.mr, dir, true, false); err != nil {
353
return err
354
}
355
}
@@ -420,7 +420,7 @@ func (adder *Adder) addFile(file files.File) error {
420
func (adder *Adder) addDir(dir files.File) error {
421
log.Infof("adding directory: %s", dir.FileName())
422
423
- _, err := mfs.Mkdir(adder.mr, dir.FileName(), true, false)
423
+ err := mfs.Mkdir(adder.mr, dir.FileName(), true, false)
424
if err != nil {
425
return err
426
}
mfs/ops.go
+10
-10
@@ -100,9 +100,9 @@ func PutNode(r *Root, path string, nd *dag.Node) error {
100
101
// Mkdir creates a directory at 'path' under the directory 'd', creating
102
// intermediary directories as needed if 'mkparents' is set to true
103
-func Mkdir(r *Root, pth string, mkparents bool, flush bool) (*Directory, error) {
103
+func Mkdir(r *Root, pth string, mkparents bool, flush bool) error {
104
if pth == "" {
105
- return nil, fmt.Errorf("no path given to Mkdir")
105
+ return fmt.Errorf("no path given to Mkdir")
106
}
107
parts := path.SplitList(pth)
108
if parts[0] == "" {
@@ -117,9 +117,9 @@ func Mkdir(r *Root, pth string, mkparents bool, flush bool) (*Directory, error)
117
if len(parts) == 0 {
118
// this will only happen on 'mkdir /'
119
if mkparents {
120
- return nil, nil
120
+ return nil
121
}
122
- return nil, fmt.Errorf("cannot create directory '/': Already exists")
122
+ return fmt.Errorf("cannot create directory '/': Already exists")
123
}
124
125
cur := r.GetValue().(*Directory)
@@ -128,16 +128,16 @@ func Mkdir(r *Root, pth string, mkparents bool, flush bool) (*Directory, error)
128
if err == os.ErrNotExist && mkparents {
129
mkd, err := cur.Mkdir(d)
130
if err != nil {
131
- return nil, err
131
+ return err
132
}
133
fsn = mkd
134
} else if err != nil {
135
- return nil, err
135
+ return err
136
}
137
138
next, ok := fsn.(*Directory)
139
if !ok {
140
- return nil, fmt.Errorf("%s was not a directory", path.Join(parts[:i]))
140
+ return fmt.Errorf("%s was not a directory", path.Join(parts[:i]))
141
}
142
cur = next
143
}
@@ -145,18 +145,18 @@ func Mkdir(r *Root, pth string, mkparents bool, flush bool) (*Directory, error)
145
final, err := cur.Mkdir(parts[len(parts)-1])
146
if err != nil {
147
if !mkparents || err != os.ErrExist || final == nil {
148
- return nil, err
148
+ return err
149
}
150
}
151
152
if flush {
153
err := final.Flush()
154
if err != nil {
155
- return nil, err
155
+ return err
156
}
157
}
158
159
- return final, nil
159
+ return nil
160
}
161
162
func Lookup(r *Root, path string) (FSNode, error) {