From ce5ef459c665ba0d19316d7dec19b898c8920ec5 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 11 May 2020 00:26:56 +0100
Subject: [PATCH] nailing-cargo: Break out same_file

No functional change.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 nailing-cargo | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/nailing-cargo b/nailing-cargo
index 4a8daf9..737c274 100755
--- a/nailing-cargo
+++ b/nailing-cargo
@@ -142,6 +142,11 @@ sub getcfg ($$) {
 
 sub unlink_or_enoent ($) { unlink $_[0] or $!==ENOENT; }
 
+sub same_file ($$) {
+  my ($x,$y) = @_;
+  "@$x[0..5]" eq "@$y[0..5]";
+}
+
 sub takelock () {
   for (;;) {
     open LOCK, ">", $lockfile or die "$self: open/create $lockfile: $!\n";
@@ -152,7 +157,7 @@ sub takelock () {
       next if $! == ENOENT;
       die "$self: stat $lockfile: $!\n";
     }
-    last if "@fstat[0..5]" eq "@stat[0..5]";
+    last if same_file(\@fstat,\@stat);
   }
 }
 sub unlock () {
-- 
2.30.2