diff mbox

ldconfig: trace origin paths with -v

Message ID xnftf6h3fd.fsf@greed.delorie.com
State New
Headers show

Commit Message

DJ Delorie Feb. 19, 2020, 5:50 p.m. UTC
From 74548bffe27d8c37c78b25164b740dd591f681a9 Mon Sep 17 00:00:00 2001
From: DJ Delorie <dj@redhat.com>
Date: Wed, 19 Feb 2020 12:31:38 -0500
Subject: ldconfig: trace origin paths with -v

With this patch, -v turns on a "from" trace for each directory
searched, that tells you WHY that directory is being searched -
is it a builtin, from the command line, or from some config file?

Comments

Carlos O'Donell Feb. 19, 2020, 6 p.m. UTC | #1
On 2/19/20 12:50 PM, DJ Delorie wrote:
> From 74548bffe27d8c37c78b25164b740dd591f681a9 Mon Sep 17 00:00:00 2001
> From: DJ Delorie <dj@redhat.com>
> Date: Wed, 19 Feb 2020 12:31:38 -0500
> Subject: ldconfig: trace origin paths with -v
> 
> With this patch, -v turns on a "from" trace for each directory
> searched, that tells you WHY that directory is being searched -
> is it a builtin, from the command line, or from some config file?

LGTM. It adds quite a bit more useful information to ldconfig -v for
developers and helps diagnose weird conf files issues! Thanks!

Reviewed-by: Carlos O'Donell <carlos@redhat.com>
 
> diff --git a/elf/ldconfig.c b/elf/ldconfig.c
> index 681ed78496..19ed04cf4d 100644
> --- a/elf/ldconfig.c
> +++ b/elf/ldconfig.c
> @@ -79,6 +79,8 @@ struct dir_entry
>    int flag;
>    ino64_t ino;
>    dev_t dev;
> +  const char *from_file;
> +  int from_line;

OK, file and line.

>    struct dir_entry *next;
>  };
>  
> @@ -344,7 +346,12 @@ add_single_dir (struct dir_entry *entry, int verbose)
>        if (ptr->ino == entry->ino && ptr->dev == entry->dev)
>  	{
>  	  if (opt_verbose && verbose)
> -	    error (0, 0, _("Path `%s' given more than once"), entry->path);
> +	    {
> +	      error (0, 0, _("Path `%s' given more than once"), entry->path);
> +	      fprintf (stderr, "(from %s:%d and %s:%d)\n",
> +		       entry->from_file, entry->from_line,
> +		       ptr->from_file, ptr->from_line);
> +	    }

OK, add the file:lineno for the original and conflict and print to stderr.

>  	  /* Use the newer information.  */
>  	  ptr->flag = entry->flag;
>  	  free (entry->path);
> @@ -363,12 +370,15 @@ add_single_dir (struct dir_entry *entry, int verbose)
>  
>  /* Add one directory to the list of directories to process.  */
>  static void
> -add_dir (const char *line)
> +add_dir_1 (const char *line, const char *from_file, int from_line)
>  {
>    unsigned int i;
>    struct dir_entry *entry = xmalloc (sizeof (struct dir_entry));
>    entry->next = NULL;
>  
> +  entry->from_file = strdup (from_file);
> +  entry->from_line = from_line;

OK.

> +
>    /* Search for an '=' sign.  */
>    entry->path = xstrdup (line);
>    char *equal_sign = strchr (entry->path, '=');
> @@ -428,6 +438,11 @@ add_dir (const char *line)
>      free (path);
>  }
>  
> +static void
> +add_dir (const char *line)
> +{
> +  add_dir_1 (line, "<builtin>", 0);

OK.

> +}
>  
>  static int
>  chroot_stat (const char *real_path, const char *path, struct stat64 *st)
> @@ -672,9 +687,10 @@ search_dir (const struct dir_entry *entry)
>    if (opt_verbose)
>      {
>        if (hwcap != 0)
> -	printf ("%s: (hwcap: %#.16" PRIx64 ")\n", entry->path, hwcap);
> +	printf ("%s: (hwcap: %#.16" PRIx64 ")", entry->path, hwcap);

OK.

>        else
> -	printf ("%s:\n", entry->path);
> +	printf ("%s:", entry->path);
> +      printf (" (from %s:%d)\n", entry->from_file, entry->from_line);

OK, move \n to here and print file:lineno.

>      }
>  
>    char *dir_name;
> @@ -815,6 +831,8 @@ search_dir (const struct dir_entry *entry)
>  	  struct dir_entry *new_entry;
>  
>  	  new_entry = xmalloc (sizeof (struct dir_entry));
> +	  new_entry->from_file = entry->from_file;
> +	  new_entry->from_line = entry->from_line;

OK.

>  	  new_entry->path = xstrdup (file_name);
>  	  new_entry->flag = entry->flag;
>  	  new_entry->next = NULL;
> @@ -1175,7 +1193,7 @@ Warning: ignoring configuration file that cannot be opened: %s"),
>  	    }
>  	}
>        else
> -	add_dir (cp);
> +	add_dir_1 (cp, filename, lineno);

OK.

>      }
>    while (!feof_unlocked (file));
>  
> @@ -1283,7 +1301,7 @@ main (int argc, char **argv)
>  		 _("relative path `%s' used to build cache"),
>  		 argv[i]);
>  	else
> -	  add_dir (argv[i]);
> +	  add_dir_1 (argv[i], "<cmdline>", 0);

OK.

>      }
>  
>    /* The last entry in hwcap_extra is reserved for the "tls" pseudo-hwcap which
>
Joseph Myers Feb. 19, 2020, 6:09 p.m. UTC | #2
On Wed, 19 Feb 2020, DJ Delorie wrote:

> @@ -344,7 +346,12 @@ add_single_dir (struct dir_entry *entry, int verbose)
>        if (ptr->ino == entry->ino && ptr->dev == entry->dev)
>  	{
>  	  if (opt_verbose && verbose)
> -	    error (0, 0, _("Path `%s' given more than once"), entry->path);
> +	    {
> +	      error (0, 0, _("Path `%s' given more than once"), entry->path);
> +	      fprintf (stderr, "(from %s:%d and %s:%d)\n",
> +		       entry->from_file, entry->from_line,
> +		       ptr->from_file, ptr->from_line);

This looks like it's a message, for human readers rather than for 
automated parsing, giving extra information about the previous message.  
That previous message is marked up with _() for translation, and as this 
new message includes English words, it should be marked up for translation 
as well.
diff mbox

Patch

diff --git a/elf/ldconfig.c b/elf/ldconfig.c
index 681ed78496..19ed04cf4d 100644
--- a/elf/ldconfig.c
+++ b/elf/ldconfig.c
@@ -79,6 +79,8 @@  struct dir_entry
   int flag;
   ino64_t ino;
   dev_t dev;
+  const char *from_file;
+  int from_line;
   struct dir_entry *next;
 };
 
@@ -344,7 +346,12 @@  add_single_dir (struct dir_entry *entry, int verbose)
       if (ptr->ino == entry->ino && ptr->dev == entry->dev)
 	{
 	  if (opt_verbose && verbose)
-	    error (0, 0, _("Path `%s' given more than once"), entry->path);
+	    {
+	      error (0, 0, _("Path `%s' given more than once"), entry->path);
+	      fprintf (stderr, "(from %s:%d and %s:%d)\n",
+		       entry->from_file, entry->from_line,
+		       ptr->from_file, ptr->from_line);
+	    }
 	  /* Use the newer information.  */
 	  ptr->flag = entry->flag;
 	  free (entry->path);
@@ -363,12 +370,15 @@  add_single_dir (struct dir_entry *entry, int verbose)
 
 /* Add one directory to the list of directories to process.  */
 static void
-add_dir (const char *line)
+add_dir_1 (const char *line, const char *from_file, int from_line)
 {
   unsigned int i;
   struct dir_entry *entry = xmalloc (sizeof (struct dir_entry));
   entry->next = NULL;
 
+  entry->from_file = strdup (from_file);
+  entry->from_line = from_line;
+
   /* Search for an '=' sign.  */
   entry->path = xstrdup (line);
   char *equal_sign = strchr (entry->path, '=');
@@ -428,6 +438,11 @@  add_dir (const char *line)
     free (path);
 }
 
+static void
+add_dir (const char *line)
+{
+  add_dir_1 (line, "<builtin>", 0);
+}
 
 static int
 chroot_stat (const char *real_path, const char *path, struct stat64 *st)
@@ -672,9 +687,10 @@  search_dir (const struct dir_entry *entry)
   if (opt_verbose)
     {
       if (hwcap != 0)
-	printf ("%s: (hwcap: %#.16" PRIx64 ")\n", entry->path, hwcap);
+	printf ("%s: (hwcap: %#.16" PRIx64 ")", entry->path, hwcap);
       else
-	printf ("%s:\n", entry->path);
+	printf ("%s:", entry->path);
+      printf (" (from %s:%d)\n", entry->from_file, entry->from_line);
     }
 
   char *dir_name;
@@ -815,6 +831,8 @@  search_dir (const struct dir_entry *entry)
 	  struct dir_entry *new_entry;
 
 	  new_entry = xmalloc (sizeof (struct dir_entry));
+	  new_entry->from_file = entry->from_file;
+	  new_entry->from_line = entry->from_line;
 	  new_entry->path = xstrdup (file_name);
 	  new_entry->flag = entry->flag;
 	  new_entry->next = NULL;
@@ -1175,7 +1193,7 @@  Warning: ignoring configuration file that cannot be opened: %s"),
 	    }
 	}
       else
-	add_dir (cp);
+	add_dir_1 (cp, filename, lineno);
     }
   while (!feof_unlocked (file));
 
@@ -1283,7 +1301,7 @@  main (int argc, char **argv)
 		 _("relative path `%s' used to build cache"),
 		 argv[i]);
 	else
-	  add_dir (argv[i]);
+	  add_dir_1 (argv[i], "<cmdline>", 0);
     }
 
   /* The last entry in hwcap_extra is reserved for the "tls" pseudo-hwcap which