From 1bc467d5fdd1849c221242e33f151718cde1932c Mon Sep 17 00:00:00 2001
From: Nick Clifton <nickc@redhat.com>
Date: Tue, 16 Jul 2024 10:22:34 +0100
Subject: [PATCH] A few tweaks for builtby

---
 annocheck/annocheck.c | 624 +++++++++++++++++++++---------------------
 annocheck/built-by.c  | 140 +++++-----
 2 files changed, 389 insertions(+), 375 deletions(-)

diff --git a/annocheck/annocheck.c b/annocheck/annocheck.c
index f6db807..21d0f07 100644
--- a/annocheck/annocheck.c
+++ b/annocheck/annocheck.c
@@ -2199,6 +2199,7 @@ usage (void)
   einfo (INFO, "Tools have their own options:");
   einfo (INFO, "   --enable-<tool>    [Turn on <tool>][By default the hardened tool is enabled]");
   einfo (INFO, "   --disable-<tool>   [Turn off <tool>]");
+  einfo (INFO, "   --<tool>           [Turn on <tool>, disable all other tools]");
   einfo (INFO, "   --<tool>-help      [Display help message for <tool> & exit]");
   einfo (INFO, "   --help-<tool>      [Display help message for <tool> & exit]");
   einfo (INFO, "   --<tool>-<option>  [Pass <option> to <tool>]");
@@ -2253,398 +2254,405 @@ add_file (const char * filename)
   files[num_files ++] = filename;
 }
 
-/* Handle command line options.  Returns to caller if there is
-   something to do.  */
-
 static bool
-process_command_line (uint argc, const char * argv[])
+process_tool_arg (const char * arg, uint argc, const char ** argv, uint * next)
 {
-  uint a = 1;
-
-  progname = component_names[0];
-
-  if (argc > 0 && argv == NULL)
-    return false;
+  bool used = false;
+  checker * tool;
 
-  while (a < argc)
+  for (tool = first_checker; tool != NULL; tool = NEXT_TOOL_CHECKER (tool))
     {
-      const char *  arg = argv[a];
-      bool          used = false;
-      checker *     tool;
-      const char *  orig_arg = arg;
-
-      ++ a;
-
-      for (tool = first_checker; tool != NULL; tool = NEXT_TOOL_CHECKER (tool))
+      if (strncasecmp (arg, tool->name, strlen (tool->name)) == 0)
 	{
-	  if (arg[0] == '-' && arg[1] == '-' && strncasecmp (arg + 2, tool->name, strlen (tool->name)) == 0)
-	    {
-	      arg += 2 + strlen (tool->name);
-	      if (arg[0] == '-')
-		++arg;
+	  arg += strlen (tool->name);
 
-	      if (*arg == 0)
+	  if (*arg == 0)
+	    {
+	      /* Treat --<TOOL> as --enable-<TOOL> plus --disable-<ALL-OTHER-TOOLS>.  */
+	      if (tool->process_arg)
 		{
-		  /* Treat --<TOOL> as --enable-<TOOL> plus --disable-<ALL-OTHER-TOOLS>.  */
-		  if (tool->process_arg)
-		    {
-		      checker * dtool;
+		  checker * dtool;
 
-		      push_component (tool);
-		      (void) tool->process_arg ("enable", NULL, 0, NULL);
-		      /* FIXME: Check return value ?  */
-		      pop_component ();
+		  push_component (tool);
+		  (void) tool->process_arg ("enable", NULL, 0, NULL);
+		  /* FIXME: Check return value ?  */
+		  pop_component ();
 
-		      for (dtool = first_checker; dtool != NULL; dtool = NEXT_TOOL_CHECKER (dtool))
-			{
-			  if (dtool == tool)
-			    continue;
-			  if (dtool->process_arg)
-			    {
-			      push_component (tool);
-			      (void) dtool->process_arg ("disable", NULL, 0, NULL);
-			      pop_component ();
-			    }
-			}
-
-		      used = true;
-		    }
-		}
-	      else
-		{
-		  if (streq (arg, "help"))
+		  for (dtool = first_checker; dtool != NULL; dtool = NEXT_TOOL_CHECKER (dtool))
 		    {
-		      if (tool->usage)
+		      if (dtool == tool)
+			continue;
+
+		      if (dtool->process_arg)
 			{
 			  push_component (tool);
-			  tool->usage ();
+			  (void) dtool->process_arg ("disable", NULL, 0, NULL);
 			  pop_component ();
 			}
-		      else
-			einfo (INFO, "Tool %s does not have any specific options", tool->name);
-
-		      exit (EXIT_SUCCESS);
 		    }
 
-		  if (tool->process_arg != NULL)
-		    {
-		      push_component (tool);
-		      if (tool->process_arg (arg, argv, argc, & a))
-			used = true;
-		      pop_component ();
-		    }
+		  return true;
+		}
+
+	      return false;
+	    }
+
+	  if (arg[0] == '-')
+	    ++arg;
+	      
+	  if (streq (arg, "help"))
+	    {
+	      if (tool->usage)
+		{
+		  push_component (tool);
+		  tool->usage ();
+		  pop_component ();
 		}
+	      else
+		einfo (INFO, "Tool %s does not have any specific options", tool->name);
 
-	      if (! used)
-		goto unknown_arg;
+	      exit (EXIT_SUCCESS);
 	    }
-	  else if (tool->process_arg != NULL)
+
+	  if (tool->process_arg != NULL)
 	    {
 	      push_component (tool);
-	      if (tool->process_arg (arg, argv, argc, & a))
+	      if (tool->process_arg (arg, argv, argc, next))
 		used = true;
 	      pop_component ();
 	    }
+
+	  return used;
 	}
+    }
+
+  /* The argument does not start with any known tool's name, so try passing
+     it in its entirety to each tool in turn.  */
+  for (tool = first_checker; tool != NULL; tool = NEXT_TOOL_CHECKER (tool))
+    if (tool->process_arg != NULL)
+      {
+	push_component (tool);
+	if (tool->process_arg (arg, argv, argc, next))
+	  /* We do not stop the scan here.  Multiple tools might recognise the same option.  */
+	  used = true;
+	pop_component ();
+      }
 
-      if (used)
+  return used;
+}
+  
+/* Handle command line options.
+   Returns TRUE to caller if there is something to do.  */
+
+static bool
+process_command_line (uint argc, const char * argv[])
+{
+  uint a = 1;
+
+  progname = component_names[0];
+
+  if (argc > 0 && argv == NULL)
+    return false;
+
+  while (a < argc)
+    {
+      const char *  parameter;
+      const char *  arg = argv[a];
+      bool          used = false;
+      checker *     tool;
+      const char *  orig_arg = arg;
+
+      ++ a;
+
+      if (arg[0] != '-')
 	{
-	  save_arg (arg);
+	  add_file (arg);
 	  continue;
 	}
 
-      if (arg[0] == '-')
-        {
-	  const char *  parameter;
+      arg += (arg[1] == '-' ? 2 : 1);
+
+      if (process_tool_arg (arg, argc, argv, & a))
+	{
+	  save_arg (arg);
+	  continue;
+	}
 
-	  arg += (arg[1] == '-' ? 2 : 1);
-	  switch (*arg)
+      /* The arg is not specific to any tool.  So check the generic options.  */
+      switch (*arg)
+	{
+	case 'h': /* --help */
+	  if (const_strneq (arg, "help-"))
 	    {
-	    case 'h': /* --help */
-	      if (const_strneq (arg, "help-"))
+	      for (tool = first_checker; tool != NULL; tool = NEXT_TOOL_CHECKER (tool))
 		{
-		  for (tool = first_checker; tool != NULL; tool = NEXT_TOOL_CHECKER (tool))
+		  if (tool->usage
+		      && strncasecmp (arg + strlen ("help-"), tool->name, strlen (tool->name)) == 0)
 		    {
-		      if (tool->usage
-			  && strncasecmp (arg + strlen ("help-"), tool->name, strlen (tool->name)) == 0)
-			{
-			  push_component (tool);
-			  tool->usage ();
-			  pop_component ();
-			  exit (EXIT_SUCCESS);
-			}
+		      push_component (tool);
+		      tool->usage ();
+		      pop_component ();
+		      exit (EXIT_SUCCESS);
 		    }
 		}
-	      else if (streq (arg, "h") || streq (arg, "help"))
-		{
-		  print_version (0);
-		  usage ();
-		  exit (EXIT_SUCCESS);
-		}
-	      else
-		goto unknown_arg;
-	      break;  /* Pacify covscan.  */
-
-	    case 'i':
-	      if (streq (arg, "i") || streq (arg, "ignore-unknown"))
-		ignore_unknown = do_ignore;
-	      else if (streq (arg, "ignore-links"))
-		ignore_links = do_ignore;
-	      else
-		goto unknown_arg;
-	      break;
+	    }
+	  else if (streq (arg, "h") || streq (arg, "help"))
+	    {
+	      print_version (0);
+	      usage ();
+	      exit (EXIT_SUCCESS);
+	    }
+	  else
+	    goto unknown_arg;
+	  break;  /* Pacify covscan.  */
+
+	case 'i':
+	  if (streq (arg, "i") || streq (arg, "ignore-unknown"))
+	    ignore_unknown = do_ignore;
+	  else if (streq (arg, "ignore-links"))
+	    ignore_links = do_ignore;
+	  else
+	    goto unknown_arg;
+	  break;
 
-	    case 'r':
-	      if (streq (arg, "r") || streq (arg, "report-unknown"))
-		ignore_unknown = do_not_ignore;
-	      else
-		goto unknown_arg;
-	      break;
+	case 'r':
+	  if (streq (arg, "r") || streq (arg, "report-unknown"))
+	    ignore_unknown = do_not_ignore;
+	  else
+	    goto unknown_arg;
+	  break;
 
-	    case 'f':
-	      if (streq (arg, "f") || streq (arg, "follow-links"))
-		ignore_links = do_not_ignore;
-	      else
-		goto unknown_arg;
-	      break;
+	case 'f':
+	  if (streq (arg, "f") || streq (arg, "follow-links"))
+	    ignore_links = do_not_ignore;
+	  else
+	    goto unknown_arg;
+	  break;
 	      
-	    case 'I':
-	      if (streq (arg, "I"))
-		ignore_links = do_ignore;
-	      else
-		goto unknown_arg;
-	      break;
+	case 'I':
+	  if (streq (arg, "I"))
+	    ignore_links = do_ignore;
+	  else
+	    goto unknown_arg;
+	  break;
 	      
-	    case 'q': /* --quiet */
-	      if (streq (arg, "q") || streq (arg, "quiet"))
-		{
-		  save_arg (orig_arg);
-		  verbosity = -1UL;
-		}
-	      else
-		goto unknown_arg;
-	      break;
+	case 'q': /* --quiet */
+	  if (streq (arg, "q") || streq (arg, "quiet"))
+	    {
+	      save_arg (orig_arg);
+	      verbosity = -1UL;
+	    }
+	  else
+	    goto unknown_arg;
+	  break;
 
-	    case 'd': /* --debug-rpm, --debug-file, --debug-dir  */
-	      parameter = strchr (arg, '=');
-	      if (parameter == NULL)
-		parameter = argv[a++];
-	      else
-		parameter ++;
+	case 'd': /* --debug-rpm, --debug-file, --debug-dir  */
+	  parameter = strchr (arg, '=');
+	  if (parameter == NULL)
+	    parameter = argv[a++];
+	  else
+	    parameter ++;
 
-	      typedef enum option
-		{
-		  Debug_rpm,
-		  Debug_dir,
-		  Debug_file
-		} option;
-	      enum option updating;
+	  typedef enum option
+	    {
+	      Debug_rpm,
+	      Debug_dir,
+	      Debug_file
+	    } option;
+	  enum option updating;
 	      
-	      if (const_strneq (arg, "dwarf-dir") /* Old name for --debug-dir.  */
-		  || const_strneq (arg, "debug-dir")
-		  || const_strneq (arg, "debugdir"))
-		{
-		  updating = Debug_dir;
-		}
-	      else if (const_strneq (arg, "debug-rpm") || const_strneq (arg, "debugrpm"))
-		{
-		  updating = Debug_rpm;
-		}
-	      else if (const_strneq (arg, "debug-file") || const_strneq (arg, "debugfile"))
-		{
-		  updating = Debug_file;
-		}
-	      else
-		goto unknown_arg;
-
-	      if (parameter == NULL)
-		goto arg_missing_argument;
+	  if (const_strneq (arg, "dwarf-dir") /* Old name for --debug-dir.  */
+	      || const_strneq (arg, "debug-dir")
+	      || const_strneq (arg, "debugdir"))
+	    updating = Debug_dir;
+	  else if (const_strneq (arg, "debug-rpm") || const_strneq (arg, "debugrpm"))
+	    updating = Debug_rpm;
+	  else if (const_strneq (arg, "debug-file") || const_strneq (arg, "debugfile"))
+	    updating = Debug_file;
+	  else
+	    goto unknown_arg;
 
-	      if (parameter[0] != '/')
-		{
-		  /* Convert a relative path to an absolute one so that if/when
-		     we recurse into a directory, the path will remain valid.
-		     Also handle ~ expansion.  */
-		  const char * cwd;
+	  if (parameter == NULL)
+	    goto arg_missing_argument;
 
-		  if (parameter[0] == '~' && parameter[1] == '/')
-		    {
-		      cwd = concat (getenv ("HOME"), NULL);
-		      parameter += 2;
-		    }
-		  else
-		    cwd = getcwd (NULL, 0);
-
-		  parameter = concat (cwd, "/", parameter, NULL);
+	  if (parameter[0] != '/')
+	    {
+	      /* Convert a relative path to an absolute one so that if/when
+		 we recurse into a directory, the path will remain valid.
+		 Also handle ~ expansion.  */
+	      const char * cwd;
 
-		  free ((void *) cwd);
+	      if (parameter[0] == '~' && parameter[1] == '/')
+		{
+		  cwd = concat (getenv ("HOME"), NULL);
+		  parameter += 2;
 		}
 	      else
-		parameter = strdup (parameter);
+		cwd = getcwd (NULL, 0);
 
-	      const char * tmp;
+	      parameter = concat (cwd, "/", parameter, NULL);
 
-	      switch (updating)
-		{
-		case Debug_rpm:
-		  if (debug_rpm != NULL)
-		    {
-		      einfo (WARN, "overriding previous --debug-rpm option (%s) with %s",
-			     debug_rpm, parameter);
-		      free ((void *) debug_rpm);
-		    }
-		  debug_rpm = parameter;
-		  tmp = concat ("--debug-rpm=", parameter, NULL);
-		  break;
+	      free ((void *) cwd);
+	    }
+	  else
+	    parameter = strdup (parameter);
 
-		case Debug_dir:
-		  if (debug_dir != NULL)
-		    {
-		      einfo (WARN, "overriding previous --debug-dir option (%s) with %s",
-			     debug_dir, parameter);
-		      free ((void *) debug_dir);
-		    }
-		  debug_dir = parameter;
-		  tmp = concat ("--debug-dir=", parameter, NULL);
-		  break;
-
-		case Debug_file:
-		  set_debug_file (parameter);
-		  tmp = concat ("--debug-file=", parameter, NULL);
-		  break;
-		}
+	  const char * tmp;
 
-	      save_arg (tmp);
-	      free ((void *) tmp);
-	      
-	      if (debug_dir != NULL && debug_rpm != NULL)
+	  switch (updating)
+	    {
+	    case Debug_rpm:
+	      if (debug_rpm != NULL)
 		{
-		  static bool warned = false;
-		  if (! warned)
-		    einfo (WARN, "Behaviour is undefined when both --debug-rpm and --debug-dir are specified");
-		  warned = true;
+		  einfo (WARN, "overriding previous --debug-rpm option (%s) with %s",
+			 debug_rpm, parameter);
+		  free ((void *) debug_rpm);
 		}
+	      debug_rpm = parameter;
+	      tmp = concat ("--debug-rpm=", parameter, NULL);
 	      break;
 
-	    case 'p':
-	      if (streq (arg, "p") || const_strneq (arg, "prefix"))
+	    case Debug_dir:
+	      if (debug_dir != NULL)
 		{
-		  save_arg (orig_arg);
-		  parameter = strchr (arg, '=');
-		  if (parameter == NULL)
-		    parameter = argv[a++];
-		  else
-		    parameter ++;
-
-		  if (parameter == NULL)
-		    goto arg_missing_argument;
-
-		  /* Prefix arguments accumulate.  */
-		  prefix = concat (prefix, parameter, NULL);
+		  einfo (WARN, "overriding previous --debug-dir option (%s) with %s",
+			 debug_dir, parameter);
+		  free ((void *) debug_dir);
 		}
-	      else
-		goto unknown_arg;
+	      debug_dir = parameter;
+	      tmp = concat ("--debug-dir=", parameter, NULL);
 	      break;
 
-	    case 'l':
-	      if (streq (arg, "l") || const_strneq (arg, "level"))
-		{
-		  parameter = strchr (arg, '=');
-		  if (parameter == NULL)
-		    parameter = argv[a++];
-		  else
-		    parameter ++;	      
+	    case Debug_file:
+	      set_debug_file (parameter);
+	      tmp = concat ("--debug-file=", parameter, NULL);
+	      break;
+	    }
 
-		  if (parameter == NULL)
-		    goto arg_missing_argument;
+	  save_arg (tmp);
+	  free ((void *) tmp);
+	      
+	  if (debug_dir != NULL && debug_rpm != NULL)
+	    {
+	      static bool warned = false;
+	      if (! warned)
+		einfo (WARN, "Behaviour is undefined when both --debug-rpm and --debug-dir are specified");
+	      warned = true;
+	    }
+	  break;
 
-		  level = strtoul (parameter, NULL, 0);
-		  if (level < 1)
-		    {
-		      einfo (WARN, "improper --level option: %s", parameter);
-		      level = 1;
-		    }
-		}
+	case 'p':
+	  if (streq (arg, "p") || const_strneq (arg, "prefix"))
+	    {
+	      save_arg (orig_arg);
+	      parameter = strchr (arg, '=');
+	      if (parameter == NULL)
+		parameter = argv[a++];
 	      else
-		goto unknown_arg;
-	      break;
+		parameter ++;
 
-	    case 't':
-	      if (streq (arg, "t") || const_strneq (arg, "tmpdir"))
-		{
-		  parameter = strchr (arg, '=');
-		  if (parameter == NULL)
-		    parameter = argv[a++];
-		  else
-		    parameter ++;	      
+	      if (parameter == NULL)
+		goto arg_missing_argument;
 
-		  if (parameter == NULL)
-		    goto arg_missing_argument;
+	      /* Prefix arguments accumulate.  */
+	      prefix = concat (prefix, parameter, NULL);
+	    }
+	  else
+	    goto unknown_arg;
+	  break;
 
-		  tmpdir = strdup (parameter);
-		  assert (tmpdir[0] == '/');
-		}
+	case 'l':
+	  if (streq (arg, "l") || const_strneq (arg, "level"))
+	    {
+	      parameter = strchr (arg, '=');
+	      if (parameter == NULL)
+		parameter = argv[a++];
 	      else
-		goto unknown_arg;
-	      break;
-	      
-	    case 'v':
-	      if (streq (arg, "v") || streq (arg, "verbose"))
-		{
-		  save_arg (orig_arg);
-		  verbosity ++;
-		}
-	      else if (streq (arg, "version"))
+		parameter ++;	      
+
+	      if (parameter == NULL)
+		goto arg_missing_argument;
+
+	      level = strtoul (parameter, NULL, 0);
+	      if (level < 1)
 		{
-		  print_version (-1);
-		  exit (EXIT_SUCCESS);
+		  einfo (WARN, "improper --level option: %s", parameter);
+		  level = 1;
 		}
+	    }
+	  else
+	    goto unknown_arg;
+	  break;
+
+	case 't':
+	  if (streq (arg, "t") || const_strneq (arg, "tmpdir"))
+	    {
+	      parameter = strchr (arg, '=');
+	      if (parameter == NULL)
+		parameter = argv[a++];
 	      else
-		goto unknown_arg;
-	      break;
+		parameter ++;	      
 
-	    case 'V':
+	      if (parameter == NULL)
+		goto arg_missing_argument;
+
+	      tmpdir = strdup (parameter);
+	      assert (tmpdir[0] == '/');
+	    }
+	  else
+	    goto unknown_arg;
+	  break;
+	      
+	case 'v':
+	  if (streq (arg, "v") || streq (arg, "verbose"))
+	    {
+	      save_arg (orig_arg);
+	      verbosity ++;
+	    }
+	  else if (streq (arg, "version"))
+	    {
 	      print_version (-1);
 	      exit (EXIT_SUCCESS);
+	    }
+	  else
+	    goto unknown_arg;
+	  break;
+
+	case 'V':
+	  print_version (-1);
+	  exit (EXIT_SUCCESS);
 	      
-	    case 'u':
+	case 'u':
 #if HAVE_LIBDEBUGINFOD
-	      if (streq (arg, "u") || streq (arg, "use-debuginfod"))
-		{
-		  use_debuginfod = true;
-		}
-	      else
-		goto unknown_arg;
+	  if (streq (arg, "u") || streq (arg, "use-debuginfod"))
+	    use_debuginfod = true;
+	  else
+	    goto unknown_arg;
 #else
-	      einfo (WARN, "debuginfod is not supported by this build of annocheck");
+	  einfo (WARN, "debuginfod is not supported by this build of annocheck");
 #endif
-	      break;
+	  break;
 
-	    case 'n':
+	case 'n':
 #if HAVE_LIBDEBUGINFOD
-	      if (streq (arg, "n") || streq (arg, "no-use-debuginfod"))
-		{
-		  use_debuginfod = false;
-		}
-	      else
-		goto unknown_arg;
+	  if (streq (arg, "n") || streq (arg, "no-use-debuginfod"))
+	    use_debuginfod = false;
+	  else
+	    goto unknown_arg;
 #else
-	      /* Do not warn, just silently accept.  */
+	  /* Do not warn, just silently accept.  */
 #endif
-	      break;
+	  break;
 
-	    default:
-	    unknown_arg:
-	      einfo (WARN, "Unrecognised command line option: %s", orig_arg);
-	      return false;
+	default:
+	unknown_arg:
+	  einfo (WARN, "Unrecognised command line option: %s", orig_arg);
+	  return false;
 
-	    arg_missing_argument:
-	      einfo (ERROR, "Command line option '%s' needs an argument", orig_arg);
-	      return false;
-	    }
+	arg_missing_argument:
+	  einfo (ERROR, "Command line option '%s' needs an argument", orig_arg);
+	  return false;
 	}
-      else
-	add_file (arg);
     }
 
   if (num_files == 0)
diff --git a/annocheck/built-by.c b/annocheck/built-by.c
index 9df8a60..5ce2f97 100644
--- a/annocheck/built-by.c
+++ b/annocheck/built-by.c
@@ -107,13 +107,23 @@ add_lang (const char * lang, const char * version)
 static bool
 on_strlist (strlist * list, const char * name, unsigned int namelen)
 {
-  while (list != NULL)
-    {
-      /* FIXME: Regexps would be better.  */
-      if (strncmp (list->name, name, namelen) == 0)
-	return true;
-      list = list->next;
-    }
+  if (namelen)
+    while (list != NULL)
+      {
+	/* FIXME: Regexps would be better.  */
+	if (strncmp (list->name, name, namelen) == 0)
+	  return true;
+	list = list->next;
+      }
+  else
+    while (list != NULL)
+      {
+	/* FIXME: Regexps would be better.  */
+	if (streq (list->name, name))
+	  return true;
+	list = list->next;
+      }
+    
   return false;
 }
 
@@ -131,10 +141,10 @@ lang_found (const char * filename,
   if (! is_new && !all)
     return;
 
-  if (notlang_list != NULL && on_strlist (notlang_list, lang, strlen (lang)))
+  if (notlang_list != NULL && on_strlist (notlang_list, lang, 0))
     return;
 
-  if (istool_list != NULL && ! on_strlist (islang_list, lang, strlen (lang)))
+  if (islang_list != NULL && ! on_strlist (islang_list, lang, 0))
     return;
 
   einfo (PARTIAL, "%s: %s was written in %s ", builtby_name, filename, lang);
@@ -625,7 +635,13 @@ parse_dw_at_producer (annocheck_data * data, Dwarf_Attribute * attr)
 
   if (string == NULL)
     {
-      einfo (ERROR, "%s: DWARF DW_AT_producer attribute does not have a string value", data->filename);
+      uint form = dwarf_whatform (attr);
+
+      if (form == DW_FORM_GNU_strp_alt)
+	einfo (VERBOSE, "%s: warn: DW_FORM_GNU_strp_alt found in DW_AT_producer, but this form is not yet handled by libelf",
+	       data->filename);
+      else
+	einfo (VERBOSE, "%s: warn: DWARF DW_AT_producer attribute does not have a string value", data->filename);
       return;
     }
 
@@ -669,11 +685,13 @@ builtby_finish (annocheck_data * data)
 	einfo (VERBOSE, "%s: builder not found on tool list", data->filename);
       else if (nottool_list)
 	einfo (VERBOSE, "%s: builder was on the nottool list", data->filename);
-      else
+      else if (build_info)
 	einfo (INFO, "%s: could not determine builder", data->filename);
     }
   else
     {
+      /* FIXME: Free is/not tool/lang lists.  */
+
       struct entry * entry;
       struct entry * next = NULL;
 
@@ -700,8 +718,6 @@ add_to_strlist (strlist ** list, const char * name)
 static bool
 builtby_process_arg (const char * arg, const char ** argv, const uint argc, uint * next)
 {
-  const char * parameter;
-
   if (arg[0] == '-')
     ++ arg;
   if (arg[0] == '-')
@@ -725,58 +741,6 @@ builtby_process_arg (const char * arg, const char ** argv, const uint argc, uint
       return true;
     }
 
-  if (const_strneq (arg, "tool="))
-    {
-      if ((parameter = strchr (arg, '=')) == NULL)
-	{
-	  add_to_strlist (& istool_list, argv[* next]);
-	  * next = * next + 1;
-	}
-      else
-	add_to_strlist (& istool_list, parameter + 1);
-      
-      return true;
-    }
-
-  if (const_strneq (arg, "nottool="))
-    {
-      if ((parameter = strchr (arg, '=')) == NULL)
-	{
-	  add_to_strlist (& nottool_list, argv[* next]);
-	  * next = * next + 1;
-	}
-      else
-	add_to_strlist (& nottool_list, parameter + 1);
-
-      return true;
-    }
-
-  if (const_strneq (arg, "lang="))
-    {
-      if ((parameter = strchr (arg, '=')) == NULL)
-	{
-	  add_to_strlist (& islang_list, argv[* next]);
-	  * next = * next + 1;
-	}
-      else
-	add_to_strlist (& islang_list, parameter + 1);
-      
-      return true;
-    }
-
-  if (const_strneq (arg, "notlang="))
-    {
-      if ((parameter = strchr (arg, '=')) == NULL)
-	{
-	  add_to_strlist (& notlang_list, argv[* next]);
-	  * next = * next + 1;
-	}
-      else
-	add_to_strlist (& notlang_list, parameter + 1);
-
-      return true;
-    }
-
   if (streq (arg, "version-info"))
     {
       version_info = true;
@@ -804,13 +768,55 @@ builtby_process_arg (const char * arg, const char ** argv, const uint argc, uint
       build_info = true;
       return true;
     }
-  if (streq (arg, "no-tool-info"))
+  if (streq (arg, "no-tool-info") || streq (arg, "no-builder-info"))
     {
       build_info = false;
       return true;
     }
 
-  return false;
+  const char * parameter = strchr (arg, '=');
+  uint         new_next  = 0; 
+
+  if (next != NULL)
+    new_next = * next;
+
+  if (parameter)
+    {
+      parameter += 1;
+    }
+  else if (argv == NULL || next == NULL)
+    {
+      /* FIXME: This should not happen.  */
+      parameter = "<error>";
+    }
+  else
+    {
+      parameter = argv[* next];
+      new_next++;
+    }
+  
+  if (const_strneq (arg, "tool="))
+    {
+      add_to_strlist (& istool_list, parameter);
+    }
+  else if (const_strneq (arg, "nottool="))
+    {
+      add_to_strlist (& nottool_list, parameter);
+    }
+  else if (const_strneq (arg, "lang="))
+    {
+      add_to_strlist (& islang_list, parameter);
+    }
+  else if (const_strneq (arg, "notlang="))
+    {
+      add_to_strlist (& notlang_list, parameter);
+    }
+  else
+    return false;
+
+  if (next)
+    * next = new_next;
+  return true;
 }
 
 static void
-- 
2.43.5