From f0a9e5f85d8912989457eb007ff0c96cbfa6bb68 Mon Sep 17 00:00:00 2001
From: gryf <gryf73@gmail.com>
Date: Sun, 30 Jun 2019 15:51:41 +0200
Subject: [PATCH] Fixes for ulha rmdir and copyin commands

---
 extfslib.py | 26 +++++++++++++-------------
 ulha        | 10 ++++++----
 2 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/extfslib.py b/extfslib.py
index bad33a6..13e9503 100644
--- a/extfslib.py
+++ b/extfslib.py
@@ -23,18 +23,18 @@ from subprocess import check_output, CalledProcessError
 
 class Archive(object):
     """Archive handle. Provides interface to MC's extfs subsystem"""
-    LINE_PAT = re.compile("^(?P<size>)\s"
-                          "(?P<perms>)\s"
-                          "(?P<uid>)\s"
-                          "(?P<gid>)\s"
-                          "(?P<date>)\s+"
-                          "(?P<time>)\s"
-                          "(?P<fpath>)")
-    ARCHIVER = "archiver_name"
-    CMDS = {"list": "l",
-            "read": "r",
-            "write": "w",
-            "delete": "d"}
+    LINE_PAT = re.compile(b"^(?P<size>)\s"
+                          b"(?P<perms>)\s"
+                          b"(?P<uid>)\s"
+                          b"(?P<gid>)\s"
+                          b"(?P<date>)\s+"
+                          b"(?P<time>)\s"
+                          b"(?P<fpath>)")
+    ARCHIVER = b"archiver_name"
+    CMDS = {"list": b"l",
+            "read": b"r",
+            "write": b"w",
+            "delete": b"d"}
     ITEM = (b"%(perms)s   1 %(uid)-8s %(gid)-8s %(size)8s %(datetime)s "
             b"%(display_name)s\n")
 
@@ -53,7 +53,7 @@ class Archive(object):
         leading space. This is workaround to this bug, which replaces leading
         space with tilda."""
         if name.startswith(b" "):
-            new_name = "".join(["~", name[1:]])
+            new_name = b"".join([b"~", name[1:]])
             return new_name
         return name
 
diff --git a/ulha b/ulha
index 343d2dd..6c2de8d 100755
--- a/ulha
+++ b/ulha
@@ -106,8 +106,9 @@ class ULha(Archive):
     def rmdir(self, dst):
         """Remove empty directory"""
         dst = self._get_real_name(dst)
-        if not dst.endswith(os.path.sep):
-            dst += os.path.sep
+
+        if not dst.endswith(bytes(os.path.sep, 'utf-8')):
+            dst += bytes(os.path.sep, 'utf-8')
 
         if self._call_command('delete', dst=dst) is None:
             return 1
@@ -148,12 +149,13 @@ class ULha(Archive):
         os.chdir(tmpdir)
         if src:
             os.makedirs(os.path.dirname(dst))
-            os.link(src, dst)
+            shutil.copy2(src, dst)
         else:
             os.makedirs(dst)
 
         try:
-            result = check_call([self.ARCHIVER, self.CMDS["write"],
+            result = check_call([self.ARCHIVER.decode('utf-8'),
+                                 self.CMDS["write"].decode('utf-8'),
                                  arch_abspath, dst])
         except CalledProcessError:
             return 1