address PR CR

- Use fmt verb %q for file name error messages
- wrap a few errors previously missed in lock.go

lock/lock.go

@@ -82,10 +82,10 @@ func lockPortable(name string) (io.Closer, error) {
  }
  f, err := os.OpenFile(name, os.O_RDWR|os.O_CREATE|os.O_TRUNC|os.O_EXCL, 0666)
  if err != nil {
- return nil, fmt.Errorf("failed to create lock file %s %v", name, err)
+ return nil, fmt.Errorf("failed to create lock file %q: %w", name, err)
  }
  if err := json.NewEncoder(f).Encode(&pidLockMeta{OwnerPID: os.Getpid()}); err != nil {
- return nil, fmt.Errorf("cannot write owner pid: %v", err)
+ return nil, fmt.Errorf("cannot write owner pid: %w", err)
  }
  return &unlocker{
  f: f,

lock/lock_plan9.go

@@ -34,7 +34,7 @@ func lockPlan9(name string) (io.Closer, error) {
 
  f, err := os.OpenFile(name, os.O_RDWR|os.O_CREATE, os.ModeExclusive|0644)
  if err != nil {
- return nil, fmt.Errorf("Lock Create of %s failed: %w", name, err)
+ return nil, fmt.Errorf("Lock Create of %q failed: %w", name, err)
  }
 
  return &unlocker{f: f, abs: name}, nil

lock/lock_unix.go

@@ -39,7 +39,7 @@ func lockFcntl(name string) (io.Closer, error) {
 
  f, err := os.Create(name)
  if err != nil {
- return nil, fmt.Errorf("Lock Create of %s failed: %w", name, err)
+ return nil, fmt.Errorf("Lock Create of %q failed: %w", name, err)
  }
 
  err = unix.FcntlFlock(f.Fd(), unix.F_SETLK, &unix.Flock_t{
@@ -52,7 +52,7 @@ func lockFcntl(name string) (io.Closer, error) {
 
  if err != nil {
  f.Close()
- return nil, fmt.Errorf("Lock FcntlFlock of %s failed: %w", name, err)
+ return nil, fmt.Errorf("Lock FcntlFlock of %q failed: %w", name, err)
  }
  return &unlocker{f: f, abs: name}, nil
 }

lock/lock_windows.go

@@ -54,12 +54,12 @@ func (u *winUnlocker) close() {
 func lockWindows(name string) (io.Closer, error) {
  fi, err := os.Stat(name)
  if err == nil && fi.Size() > 0 {
- return nil, fmt.Errorf("can't lock file %s: has non-zero size", name)
+ return nil, fmt.Errorf("can't lock file %q: has non-zero size", name)
  }
 
  handle, err := winCreateEphemeral(name)
  if err != nil {
- return nil, fmt.Errorf("creation of lock %s failed: %w", name, err)
+ return nil, fmt.Errorf("creation of lock %q failed: %w", name, err)
  }
 
  return &winUnlocker{h: handle, abs: name}, nil