X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=src%2Fdirwatch.go;h=1dab640ba6b8f3a1bcf14184024b5257f736ecbf;hb=be389bd7f3d36d371007c86341059b042233d455;hp=6637535369144abce1eb03f8147026f378409154;hpb=726c119e6b2340994ada9fbd0e252acd31fb78b5;p=nncp.git

diff --git a/src/dirwatch.go b/src/dirwatch.go
index 6637535..1dab640 100644
--- a/src/dirwatch.go
+++ b/src/dirwatch.go
@@ -1,8 +1,9 @@
+//go:build !nofsnotify
 // +build !nofsnotify
 
 /*
 NNCP -- Node to Node copy, utilities for store-and-forward data exchange
-Copyright (C) 2016-2021 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2016-2022 Sergey Matveev <stargrave@stargrave.org>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -21,7 +22,6 @@ package nncp
 
 import (
 	"fmt"
-	"os"
 	"time"
 
 	"github.com/fsnotify/fsnotify"
@@ -38,21 +38,14 @@ func (ctx *Ctx) NewDirWatcher(dir string, d time.Duration) (*DirWatcher, error)
 	if err != nil {
 		return nil, err
 	}
+	err = ensureDir(dir)
+	if err != nil {
+		return nil, err
+	}
 	err = w.Add(dir)
 	if err != nil {
-		if !os.IsNotExist(err) {
-			w.Close()
-			return nil, err
-		}
-		if err = os.MkdirAll(dir, os.FileMode(0777)); err != nil {
-			w.Close()
-			return nil, err
-		}
-		err = w.Add(dir)
-		if err != nil {
-			w.Close()
-			return nil, err
-		}
+		w.Close()
+		return nil, err
 	}
 	dw := DirWatcher{
 		w:      w,