Changeset b249516 in rtems-tools for rtemstoolkit

Timestamp:

Mar 29, 2015, 7:06:00 AM (5 years ago)

Author:

Chris Johns <chrisj@…>

Branches:

4.10, 4.11, master

Children:

e98d5fa

Parents:

5032d71

Message:

rtemstoolkit: Add support to return the system path split as paths.

Seacch the path for the program name if not found and set it as
an absolute path. This allow the prefix to be found.

Location:

rtemstoolkit

Files:

• rld-path.cpp (modified) (1 diff)
• rld-path.h (modified) (1 diff)
• rld.cpp (modified) (2 diffs)

rtemstoolkit/rld-path.cpp

@@ -215 +215 @@
       }
     }
+
+    void
+    get_system_path (paths& paths)
+    {
+      const char* path = ::getenv ("PATH");
+      strings     ps;
+      rld::split (ps, path, RLD_PATHSTR_SEPARATOR);
+      if (ps.size ())
+      {
+        for (strings::iterator psi = ps.begin ();
+             psi != ps.end ();
+             ++psi)
+        {
+          if (check_directory (*psi))
+            paths.push_back (*psi);
+        }
+      }
+    }
   }
 }

rtemstoolkit/rld-path.h

@@ -145 +145 @@
     void unlink (const std::string& path, bool not_present_error = false);
 
+    /**
+     * Return the system path as a set of strings.
+     *
+     * @param paths The split path paths.
+     */
+    void get_system_path (paths& paths);
   }
 }

rtemstoolkit/rld.cpp

@@ -236 +236 @@
   set_progname (const std::string& progname_)
   {
-    progname = rld::path::path_abs (progname_);
+    if (rld::path::check_file (progname_))
+      progname = rld::path::path_abs (progname_);
+    else
+    {
+      rld::path::paths paths;
+      rld::path::get_system_path (paths);
+      for (rld::path::paths::const_iterator path = paths.begin ();
+           path != paths.end ();
+           ++path)
+      {
+        std::string pp;
+        rld::path::path_join (*path, progname_, pp);
+        if (rld::path::check_file (pp))
+        {
+          progname = rld::path::path_abs (pp);
+          break;
+        }
+      }
+    }
   }
 
@@ -263 +281 @@
     if (rld::path::basename (pp) == "bin")
       return rld::path::dirname (pp);
-    return "";
+    return pp;
   }