Merge remote-tracking branch 'refs/remotes/origin/master'
authorMark Wooding <mdw@distorted.org.uk>
Mon, 2 May 2016 12:24:53 +0000 (13:24 +0100)
committerMark Wooding <mdw@distorted.org.uk>
Tue, 3 May 2016 08:50:34 +0000 (09:50 +0100)
commite3c481ba08bda2536aa76f9e3a6be2146e2b135d
treecd5b85dc7266773ad0fbdebe304bed34e5204126
parent19fa7c534e7b262df4a4d8d500d288a9dbed1887
parented1b4ef8dff60ba943f553d5faeb049df9b621b7
Merge remote-tracking branch 'refs/remotes/origin/master'

* refs/remotes/origin/master:
  locking.c, locking.1: Make the protocol safe if the lockfile is (re)moved.
  locking.c: Refactor the main locking flow.
  locking.c: Use shell convention to report child killed by a signal.
  locking.c: Rename exit status variable to `rc'.
  locking.c: Compress vertically.  Remove pointless `$Id' comment.