X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=cmd%2Fsafcm%2Ffixperms.go;h=c9a18a80e0ac3683f0aa7af047a312bae4ad87d2;hb=refs%2Fheads%2Fmaster;hp=47e4fb96484db645402ad9cbdb60676e04a041bc;hpb=b3947ca010d5e49ae519722393dd4d2d2a3c19f7;p=safcm%2Fsafcm.git diff --git a/cmd/safcm/fixperms.go b/cmd/safcm/fixperms.go index 47e4fb9..c9a18a8 100644 --- a/cmd/safcm/fixperms.go +++ b/cmd/safcm/fixperms.go @@ -1,19 +1,7 @@ // "fixperms" sub-command: apply proper permissions in files/ directories -// Copyright (C) 2021 Simon Ruderich -// -// 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 -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// SPDX-License-Identifier: GPL-3.0-or-later +// Copyright (C) 2021-2024 Simon Ruderich package main @@ -23,9 +11,9 @@ import ( "log" "os" "path/filepath" - "syscall" "ruderich.org/simon/safcm/cmd/safcm/config" + "ruderich.org/simon/safcm/remote/sync" ) func MainFixperms() error { @@ -101,8 +89,7 @@ func fixpermsWalkDirFunc(path string, d fs.DirEntry, err error) error { // chmodNoFollow works like os.Chmod but doesn't follow symlinks. func chmodNoFollow(path string, mode fs.FileMode) error { - x, err := os.OpenFile(path, - os.O_RDONLY|syscall.O_NOFOLLOW|syscall.O_NONBLOCK, 0) + x, err := sync.OpenFileNoSymlinks(path) if err != nil { return err }