core: updating widget lookup to match name exactly if using symlinked widget

2 files changed, 27 insertions, 20 deletions

diff --git a/ChangeLog b/ChangeLog
index e13b7b8..64386a5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@ Secure Core Utilities
 Copyright (C) 2015, 2017, 2018, 2019 David M. Syzdek <david@syzdek.net>.
 
 0.3
+  - core: forcing symlink command to match widget name exactly (syzdek)
   - core: fixing portability issues to musl libc (syzdek)
   - core: updating autoconf checks (syzdek)
   - core: accepting tabs, '\n', '\r',  and form feed as ASCII (syzdek)
diff --git a/src/securecoreutils.c b/src/securecoreutils.c
index 27f379e..8daf031 100644
--- a/src/securecoreutils.c
+++ b/src/securecoreutils.c
@@ -524,18 +524,21 @@ const scu_widget * scu_widget_lookup(const char * wname, int exact)
       // compares widget name
       if (strcmp(widget->name, wname) == 0)
          return(widget);
-      for(z = 0; ( (widget->name[z] != '\0') &&
-                   (wname[z] != '\0') &&
-                   (widget->name[z] == wname[z]) ); z++)
+      if (!(exact))
       {
-         if (z > prefix_uniq)
-         {
-            matched_widget = widget;
-            prefix_uniq    = z;
-         }
-         else if (z == prefix_uniq)
+         for(z = 0; ( (widget->name[z] != '\0') &&
+                      (wname[z] != '\0') &&
+                      (widget->name[z] == wname[z]) ); z++)
          {
-            prefix_common = z;
+            if (z > prefix_uniq)
+            {
+               matched_widget = widget;
+               prefix_uniq    = z;
+            }
+            else if (z == prefix_uniq)
+            {
+               prefix_common = z;
+            };
          };
       };
 
@@ -546,18 +549,21 @@ const scu_widget * scu_widget_lookup(const char * wname, int exact)
       {
          if (strcmp(widget->alias[y], wname) == 0)
             return(widget);
-         for(z = 0; ( (widget->alias[y][z] != '\0') &&
-                      (wname[z] != '\0') &&
-                      (widget->alias[y][z] == wname[z]) ); z++)
+         if (!(exact))
          {
-            if (z > prefix_uniq)
+            for(z = 0; ( (widget->alias[y][z] != '\0') &&
+                         (wname[z] != '\0') &&
+                         (widget->alias[y][z] == wname[z]) ); z++)
             {
-               matched_widget = widget;
-               prefix_uniq    = z;
-            }
-            else if (z == prefix_uniq)
-            {
-               prefix_common = z;
+               if (z > prefix_uniq)
+               {
+                  matched_widget = widget;
+                  prefix_uniq    = z;
+               }
+               else if (z == prefix_uniq)
+               {
+                  prefix_common = z;
+               };
             };
          };
       };