From d31f58738887f88c11454f6e07360eb6e5ca75da Mon Sep 17 00:00:00 2001
From: Conrad Meyer <cem@FreeBSD.org>
Date: Tue, 6 Nov 2018 23:34:13 -0800
Subject: [PATCH 1/2] redsnapper: Remove unneeded "thread" rubygem dependency

My motivation is that it is not included in FreeBSD ports.
---
 lib/redsnapper.rb | 49 +++++++++++++++++++++++++++++------------------
 1 file changed, 30 insertions(+), 19 deletions(-)

diff --git a/lib/redsnapper.rb b/lib/redsnapper.rb
index 839946a..d8d6838 100644
--- a/lib/redsnapper.rb
+++ b/lib/redsnapper.rb
@@ -1,4 +1,4 @@
-require 'thread/pool'
+require 'thread'
 require 'open3'
 require 'set'
 require 'date'
@@ -32,7 +32,31 @@ def <=>(other)
   def initialize(archive, options = {})
     @archive = archive
     @options = options
-    @thread_pool = Thread.pool(options[:thread_pool_size] || THREAD_POOL_DEFAULT_SIZE)
+    @tpsize = options[:thread_pool_size] || THREAD_POOL_DEFAULT_SIZE
+    @work_qs = (0...@tpsize).map do
+      Queue.new
+    end
+    @thread_pool = (0...@tpsize).map do |i|
+      Thread.new do
+        chunk = @work_qs[i].pop()
+
+        # The following gross hack works around this gross bug in BSD tar that tarsnap inherits:
+        # https://github.com/Tarsnap/tarsnap/issues/329
+        chunk.map! { |file| file.gsub(/([#{Regexp.escape(GLOB_CHARS)}])/) { |m| "\\#{m}" } }
+        command = [ TARSNAP, '-xvf', @archive, *(@options[:tarsnap_options] + chunk) ]
+        Open3.popen3(*command) do |_, _, err|
+          while line = err.gets
+            next if line.end_with?(NOT_OLDER_ERROR)
+            if line == EXIT_ERROR
+              @error = true
+              next
+            end
+            @@output_mutex.synchronize { warn line.chomp }
+          end
+        end
+      end
+    end
+
     @error = false
   end
 
@@ -82,7 +106,7 @@ def files_to_extract
   end
 
   def file_groups
-    groups = (1..@thread_pool.max).map { Group.new }
+    groups = (1..@tpsize).map { Group.new }
     files_to_extract.sort { |a, b| b.last[:size] <=> a.last[:size] }.each do |name, props|
 
       # If the previous batch of files had an entry with the same size and date,
@@ -98,24 +122,11 @@ def file_groups
   end
 
   def run
-    file_groups.each do |chunk|
-      @thread_pool.process do
-        chunk.map! { |file| file.gsub(/([#{Regexp.escape(GLOB_CHARS)}])/) { |m| "\\#{m}" } }
-        command = [ TARSNAP, '-xvf', @archive, *(@options[:tarsnap_options] + chunk) ]
-        Open3.popen3(*command) do |_, _, err|
-          while line = err.gets
-            next if line.end_with?(NOT_OLDER_ERROR)
-            if line == EXIT_ERROR
-              @error = true
-              next
-            end
-            @@output_mutex.synchronize { warn line.chomp }
-          end
-        end
-      end
+    file_groups.each_with_index do |chunk, idx|
+      @work_qs[idx].push chunk
     end
 
-    @thread_pool.shutdown
+    @thread_pool.map(&:join)
     @@output_mutex.synchronize { warn EXIT_ERROR } if @error
   end
 end

From aaa4db383caa0238653f5ceaf5666e88452c9263 Mon Sep 17 00:00:00 2001
From: Conrad Meyer <cem@FreeBSD.org>
Date: Tue, 6 Nov 2018 23:41:56 -0800
Subject: [PATCH 2/2] Ignore "Already exists" errors with "-k" flag

Also depends on #5.
---
 lib/redsnapper.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/redsnapper.rb b/lib/redsnapper.rb
index d8d6838..8142a53 100644
--- a/lib/redsnapper.rb
+++ b/lib/redsnapper.rb
@@ -9,6 +9,7 @@ class RedSnapper
 
   EXIT_ERROR = "tarsnap: Error exit delayed from previous errors.\n"
   NOT_OLDER_ERROR = "File on disk is not older; skipping.\n"
+  ALREADY_EXISTS = ": Already exists\n"  # -k
 
   GLOB_CHARS = '*?[]{}'
 
@@ -46,7 +47,7 @@ def initialize(archive, options = {})
         command = [ TARSNAP, '-xvf', @archive, *(@options[:tarsnap_options] + chunk) ]
         Open3.popen3(*command) do |_, _, err|
           while line = err.gets
-            next if line.end_with?(NOT_OLDER_ERROR)
+            next if line.end_with?(NOT_OLDER_ERROR) or line.end_with?(ALREADY_EXISTS)
             if line == EXIT_ERROR
               @error = true
               next