patch 8.2.4340: Amiga: mch_can_exe() is not implemented

Problem:    Amiga: mch_can_exe() is not implemented.
Solution:   Implement mch_can_exe() for Amiga OS 4. (Ola Söder, closes #9731)

diff --git a/src/os_amiga.c b/src/os_amiga.c
index e9d6221414e8322dcda9e776a9770a2e0aa04ff1..c6d9c253fe4e191e581d16f74654114396ba1d05 100644 (file)
--- a/src/os_amiga.c
+++ b/src/os_amiga.c
@@ -891,8 +891,48 @@ mch_mkdir(char_u *name)
     int
 mch_can_exe(char_u *name, char_u **path, int use_path)
 {
-    // TODO
-    return -1;
+    int exe = -1;
+#ifdef __amigaos4__
+    // Load file sections using elf.library or hunk.library.
+    BPTR seg = LoadSeg(name);
+
+    if (seg && GetSegListInfoTags(seg, GSLI_Native, NULL, TAG_DONE) !=
+        GetSegListInfoTags(seg, GSLI_68KHUNK, NULL, TAG_DONE))
+    {
+        // Test if file permissions allow execution.
+        struct ExamineData *exd = ExamineObjectTags(EX_StringNameInput, name);
+
+        exe = (exd && !(exd->Protection & EXDF_NO_EXECUTE)) ? 1 : 0;
+        FreeDosObject(DOS_EXAMINEDATA, exd);
+    }
+    else
+    {
+        exe = 0;
+    }
+
+    UnLoadSeg(seg);
+
+    // Search for executable in path if applicable.
+    if (!exe && use_path)
+    {
+        // Save current working dir.
+        BPTR cwd = GetCurrentDir();
+        struct PathNode *head = DupCmdPathList(NULL);
+
+        // For each entry, recur to check for executable.
+        for(struct PathNode *tail = head; !exe && tail;
+            tail = (struct PathNode *) BADDR(tail->pn_Next))
+        {
+            SetCurrentDir(tail->pn_Lock);
+            exe = mch_can_exe(name, path, 0);
+        }
+
+        // Go back to where we were.
+        FreeCmdPathList(head);
+        SetCurrentDir(cwd);
+    }
+#endif
+    return exe;
 }
 
 /*

diff --git a/src/version.c b/src/version.c
index 6b6d3cc20131acba42b9e3dc522399f01d9efc97..42e6a4ca119690ce840b57973f743545aabdcaec 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -746,6 +746,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    4340,
 /**/
     4339,
 /**/