interpeter: allow full paths with o words and remaps

You can use the full path including having '~' expanded to the user path.

This should be useful with GUI code writing, we can search paths easier,
and just specify the path directly when calling the Oword.

Might also help new users to get a fully functioning cample config.
When switching from RIP to installed the paths usually get jumbled.
This means we could really use a link in USER/linuxcnc/ to all the sample code.

One remaining problem is if you give an incorrect path in MDI, it is not caught and
hangs milltask. I'm not sure of the MDI command process yet.

Author: c-morley

src/emc/rs274ngc/interp_o_word.cc

@@ -545,10 +545,10 @@ int Interp::control_back_to( block_pointer block, // pointer to block
     FILE *newFP;
     offset_map_iterator it;
     offset_pointer op;
+    logOword("Entered:%s %s", name,basename(block->o_name));
+    it = settings->offset_map.find(basename(block->o_name));
 
-    logOword("Entered:%s %s", name,block->o_name);
-
-    it = settings->offset_map.find(block->o_name);
+    // #1 already defined
     if (it != settings->offset_map.end()) {
 	op = &it->second;
 	if ((settings->filename[0] != 0) &
@@ -585,6 +585,8 @@ int Interp::control_back_to( block_pointer block, // pointer to block
 	settings->sequence_number = op->sequence_number;
 	return INTERP_OK;
     }
+
+    // #2 open the File
     newFP = find_ngc_file(settings, block->o_name, newFileName);
 
     if (newFP) {
@@ -607,8 +609,8 @@ int Interp::control_back_to( block_pointer block, // pointer to block
 	free(dirname);
     }
 
-    settings->skipping_o = block->o_name; // start skipping
-    settings->skipping_to_sub = block->o_name; // start skipping
+    settings->skipping_o = basename(block->o_name); // start skipping
+    settings->skipping_to_sub = basename(block->o_name); // start skipping
     settings->skipping_start = settings->sequence_number;
     return INTERP_OK;
 }

src/emc/rs274ngc/interp_remap.cc

@@ -451,8 +451,8 @@ int Interp::parse_remap(const char *inistring, int lineno)
 		r.remap_ngc = strstore(arg);
 		fclose(fp);
 	    } else {
-		Error("NGC file not found: ngc=%s - %d:REMAP = %s",
-		      arg, lineno,inistring);
+		Error("INTERP_REMAP: NGC file not found: ngc=%s\nREMAP INI Line:%d = %s\n",
+		      arg, lineno, inistring);
 		errored = true;
 	    }
 	    continue;
@@ -465,7 +465,7 @@ int Interp::parse_remap(const char *inistring, int lineno)
 		continue;
 	    }
 	    if (!PYUSABLE) {
-		Error("Python plugin required for python=, but not available: %d:REMAP = %s",
+		Error("iNTERP_REMAP: Python plugin required for python=, but not available:\nREMAP INI line:%d = %s\n",
 		      lineno,inistring);
 		errored = true;
 		continue;

src/emc/rs274ngc/rs274ngc_pre.cc

@@ -98,7 +98,7 @@ include an option for suppressing superfluous commands.
 #include "interp_internal.hh"	// interpreter private definitions
 #include "interp_queue.hh"
 #include "rs274ngc_interp.hh"
-
+#include <wordexp.h>
 #include "units.h"
 
 #include <unordered_set>
@@ -2651,55 +2651,96 @@ int Interp::on_abort(int reason, const char *message)
 
 // spun out from interp_o_word so we can use it to test ngc file accessibility during
 // config file parsing (REMAP... ngc=<basename>)
+// Will expand ~ to user's home path
+// searchs this sequence until it finds a match:
+// 1) checks if path is already the full path
+// 2) tries adding the INI defined program prefix to path
+// 3) tries adding the INI defined subroutine prefix to path
+// 4) tries adding the INI defined whizard prefix to path
 FILE *Interp::find_ngc_file(setup_pointer settings,const char *basename, char *foundhere )
 {
     FILE *newFP = NULL;
     char tmpFileName[PATH_MAX+1];
     char newFileName[PATH_MAX+1];
     char foundPlace[PATH_MAX+1];
     int  dct;
+    wordexp_t exp_result;
+
+    // #1 check if this is the full path already
 
-    // look for a new file
-    snprintf(tmpFileName, sizeof(tmpFileName), "%s.ngc", basename);
+    // expand user path
+    wordexp(basename, &exp_result, 0);
+    // add .ngc to expanded path
+    snprintf(tmpFileName, sizeof(tmpFileName), "%s.ngc", exp_result.we_wordv[0]);
 
-    // find subroutine by search: program_prefix, subroutines, wizard_root
-    // use first file found
+    // copy to newFileName - in case this is the one...
+    size_t chk = snprintf(newFileName, sizeof(newFileName), "%s", tmpFileName);
 
-    // first look in the program_prefix place
-    size_t chk = snprintf(newFileName, sizeof(newFileName), "%s/%s", settings->program_prefix, tmpFileName);
+    // found a file we can open?
     if (chk < sizeof(newFileName)){
         newFP = fopen(newFileName, "r");
     }
 
-    // then look in the subroutines place
+    // #2 then look in the program_prefix place
     if (!newFP) {
-	for (dct = 0; dct < MAX_SUB_DIRS; dct++) {
-	    if (!settings->subroutines[dct])
-		continue;
-	    chk = snprintf(newFileName, sizeof(newFileName), "%s/%s", settings->subroutines[dct], tmpFileName);
-        if (chk <  sizeof(newFileName)){
+
+        // expand '~' into user path
+        wordexp(settings->program_prefix, &exp_result, 0);
+        chk = snprintf(newFileName, sizeof(newFileName), "%s/%s", exp_result.we_wordv[0], tmpFileName);
+
+         // found a file we can open?
+        if (chk < sizeof(newFileName)){
             newFP = fopen(newFileName, "r");
-            if (newFP) {
-            // logOword("fopen: |%s|", newFileName);
-            break; // use first occurrence in dir search
+        }
+    }
+    
+    // #3 then look in the list of subroutines prefixes
+    if (!newFP) {
+        for (dct = 0; dct < MAX_SUB_DIRS; dct++) {
+            if (!settings->subroutines[dct])
+            continue;
+
+            // expand '~' into user path
+            wordexp(settings->subroutines[dct], &exp_result, 0);
+            chk = snprintf(newFileName, sizeof(newFileName), "%s/%s", exp_result.we_wordv[0], tmpFileName);
+
+            // found a file we can open?
+            if (chk <  sizeof(newFileName)){
+                newFP = fopen(newFileName, "r");
+                if (newFP) {
+                // logOword("fopen: |%s|", newFileName);
+                break; // use first occurrence in dir search
+                }
             }
-	    }
-	}
+         }
     }
-    // if not found, search the wizard tree
+
+    // #4 if still not found, search the wizard tree
+    // Wiz directory already expands the '~' to user path
     if (!newFP) {
-	int ret;
-	ret = findFile(settings->wizard_root, tmpFileName, foundPlace);
-
-	if (INTERP_OK == ret) {
-	    // create the long name
-	    chk = snprintf(newFileName, sizeof(newFileName), "%s/%s",
-		    foundPlace, tmpFileName);
-	    if (chk < sizeof(newFileName)) newFP = fopen(newFileName, "r");
-	}
+        int ret;
+
+        // walks the directory hierarchy ? 
+        ret = findFile(settings->wizard_root, tmpFileName, foundPlace);
+
+        if (INTERP_OK == ret) {
+            // create the long name
+            chk = snprintf(newFileName, sizeof(newFileName), "%s/%s",
+            foundPlace, tmpFileName);
+
+            // found a file we can open?
+            if (chk < sizeof(newFileName)){
+            newFP = fopen(newFileName, "r");
+            }
+        }
     }
+
+    // pass what we found
     if (foundhere && (newFP != NULL)) 
-	strcpy(foundhere, newFileName);
+        strcpy(foundhere, newFileName);
+
+    // Not sure this is needed but the internet told me
+    wordfree(&exp_result);
     return newFP;
 }