Changeset 1082:2c61ff42853a for alias.c

Timestamp:

1999-06-14 11:11:15 (9 years ago)

Author:

Thomas Roessler <roessler@…>

Branch:

HEAD

Message:

Completion fixes from Gero Treuner <gero@…>.

Files:

• alias.c (modified) (3 diffs)

alias.c

@@ -320 +320 @@
  *
  * given a partial alias, this routine attempts to fill in the alias
- * from the alias list as much as possible
+ * from the alias list as much as possible. if given empty search string
+ * or found nothing, present all aliases
  */
 int mutt_alias_complete (char *s, size_t buflen)
@@ -329 +330 @@
   int i;
 
-  memset (bestname, 0, sizeof (bestname));
-
 #define min(a,b)        ((a<b)?a:b)
 
-  while (a)
-  {
-    if (a->name && strstr (a->name, s) == a->name)
-    {
-      if (!bestname[0]) /* init */
-        strfcpy (bestname, a->name, min (mutt_strlen (a->name) + 1, sizeof (bestname)));
-      else
+  if (s[0] != 0) /* avoid empty string as strstr argument */
+  {
+    memset (bestname, 0, sizeof (bestname));
+
+    while (a)
+    {
+      if (a->name && strstr (a->name, s) == a->name)
       {
-        for (i = 0 ; a->name[i] && a->name[i] == bestname[i] ; i++)
-          ;
-        bestname[i] = 0;
+        if (!bestname[0]) /* init */
+          strfcpy (bestname, a->name,
+                   min (mutt_strlen (a->name) + 1, sizeof (bestname)));
+        else
+        {
+          for (i = 0 ; a->name[i] && a->name[i] == bestname[i] ; i++)
+            ;
+          bestname[i] = 0;
+        }
       }
-    }
-    a = a->next;
-  }
-
-  if ((bestname[0] == 0) || /* if we didn't find anything */
-      (s[0] == 0))          /* or we weren't given anything */
-  {
-    mutt_alias_menu (s, buflen, Aliases);
-    return 0;
-  }
-  else
-  {
-    if (mutt_strcmp (bestname, s) == 0) /* add anything to the completion? */
-    {
+      a = a->next;
+    }
+
+    if (bestname[0] != 0)
+    {
+      if (mutt_strcmp (bestname, s) != 0)
+      {
+        /* we are adding something to the completion */
+        strfcpy (s, bestname, mutt_strlen (bestname) + 1);
+        return 1;
+      }
+
       /* build alias list and show it */
       a = Aliases;
@@ -377 +380 @@
         a = a->next;
       }
-
-      s[0] = 0; /* reset string before passing to alias_menu */
-      mutt_alias_menu (s, buflen, a_list);
-
-      /* free the alias list */
-      while (a_list)
-      {
-        a_cur = a_list;
-        a_list = a_list->next;
-        safe_free ((void **) &a_cur);
-      }
-
-      return 0;
-    }
-    else /* we are adding something to the completion */
-      strfcpy (s, bestname, mutt_strlen (bestname) + 1);
-  }
-
-  return 1;
+    }
+  }
+
+  bestname[0] = 0;
+  mutt_alias_menu (bestname, sizeof(bestname), a_list ? a_list : Aliases);
+  if (bestname[0] != 0)
+    strfcpy (s, bestname, buflen);
+
+  /* free the alias list */
+  while (a_list)
+  {
+    a_cur = a_list;
+    a_list = a_list->next;
+    safe_free ((void **) &a_cur);
+  }
+
+  return 0;
 }