X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=remote%2Fsync%2Ffiles.go;h=a11b77e8107d8265ed33dac5acfeaf8aa89a4e6e;hb=ca3a64ec7f80ee21f167fd2b1b3de03349c65028;hp=edf81bd2cc795a2630f4b775eca25786ad838c61;hpb=2804606f9f8dc5078c38580bac363b47eb638620;p=safcm%2Fsafcm.git

diff --git a/remote/sync/files.go b/remote/sync/files.go
index edf81bd..a11b77e 100644
--- a/remote/sync/files.go
+++ b/remote/sync/files.go
@@ -456,6 +456,14 @@ reopen:
 		unix.Unlinkat(parentFd, tmpBase, 0)
 		return err
 	}
+	// To guarantee durability fsync must be called on a parent directory
+	// after adding, renaming or removing files therein.
+	//
+	// Calling sync on the files itself is not enough according to POSIX;
+	// man 2 fsync: "Calling fsync() does not necessarily ensure that the
+	// entry in the directory containing the file has also reached disk.
+	// For that an explicit fsync() on a file descriptor for the directory
+	// is also needed."
 	err = unix.Fsync(parentFd)
 	if err != nil {
 		return err
@@ -540,9 +548,12 @@ func OpenParentDirectoryNoSymlinks(path string) (int, string, error) {
 		}
 		dir = ".."
 		parts = []string{filepath.Base(wd)}
-	} else if parts[0] != "." {
+	} else {
 		// Relative path: start at the current directory
 		dir = "."
+		if parts[0] == "." {
+			parts = parts[1:]
+		}
 	}
 
 	dirFd, err := unix.Openat(unix.AT_FDCWD, dir, openReadonlyFlags, 0)
@@ -695,24 +706,3 @@ retry:
 
 	return os.NewFile(uintptr(fd), ""), tmpBase, nil
 }
-
-// SyncPath syncs path, which should be a directory. To guarantee durability
-// it must be called on a parent directory after adding, renaming or removing
-// files therein.
-//
-// Calling sync on the files itself is not enough according to POSIX; man 2
-// fsync: "Calling fsync() does not necessarily ensure that the entry in the
-// directory containing the file has also reached disk. For that an explicit
-// fsync() on a file descriptor for the directory is also needed."
-func SyncPath(path string) error {
-	x, err := os.Open(path)
-	if err != nil {
-		return err
-	}
-	err = x.Sync()
-	closeErr := x.Close()
-	if err != nil {
-		return err
-	}
-	return closeErr
-}