patches/binutils/2.39/binutils-filename-in-error-messages.patch

   1 --- binutils.orig/binutils/readelf.c    2021-07-19 12:39:14.206556025 +0100
   2 +++ binutils-2.37/binutils/readelf.c    2021-07-19 12:44:37.712728732 +0100
   3 @@ -21873,45 +21873,52 @@ process_file (char * file_name)
   4    struct stat statbuf;
   5    char armag[SARMAG];
   6    bool ret = true;
   7 +  char * name;
   8 +  char * saved_program_name;
   9 +
  10 +  /* Overload program_name to include file_name.  Doing this means
  11 +     that warning/error messages will positively identify the file
  12 +     concerned even when multiple instances of readelf are running.  */
  13 +  name = xmalloc (strlen (program_name) + strlen (file_name) + 3);
  14 +  sprintf (name, "%s: %s", program_name, file_name);
  15 +  saved_program_name = program_name;
  16 +  program_name = name;
  17
  18    if (stat (file_name, &statbuf) < 0)
  19      {
  20        if (errno == ENOENT)
  21 -       error (_("'%s': No such file\n"), file_name);
  22 +       error (_("No such file\n"));
  23        else
  24 -       error (_("Could not locate '%s'.  System error message: %s\n"),
  25 -              file_name, strerror (errno));
  26 -      return false;
  27 +       error (_("Could not locate file.  System error message: %s\n"),
  28 +              strerror (errno));
  29 +      goto done;
  30      }
  31
  32    if (! S_ISREG (statbuf.st_mode))
  33      {
  34 -      error (_("'%s' is not an ordinary file\n"), file_name);
  35 -      return false;
  36 +      error (_("Not an ordinary file\n"));
  37 +      goto done;
  38      }
  39
  40    filedata = calloc (1, sizeof * filedata);
  41    if (filedata == NULL)
  42      {
  43        error (_("Out of memory allocating file data structure\n"));
  44 -      return false;
  45 +      goto done;
  46      }
  47
  48    filedata->file_name = file_name;
  49    filedata->handle = fopen (file_name, "rb");
  50    if (filedata->handle == NULL)
  51      {
  52 -      error (_("Input file '%s' is not readable.\n"), file_name);
  53 -      free (filedata);
  54 -      return false;
  55 +      error (_("Not readable\n"));
  56 +      goto done;
  57      }
  58
  59    if (fread (armag, SARMAG, 1, filedata->handle) != 1)
  60      {
  61 -      error (_("%s: Failed to read file's magic number\n"), file_name);
  62 -      fclose (filedata->handle);
  63 -      free (filedata);
  64 -      return false;
  65 +      error (_("Failed to read file's magic number\n"));
  66 +      goto done;
  67      }
  68
  69    filedata->file_size = (bfd_size_type) statbuf.st_size;
  70 @@ -21919,33 +21926,39 @@ process_file (char * file_name)
  71
  72    if (memcmp (armag, ARMAG, SARMAG) == 0)
  73      {
  74 -      if (! process_archive (filedata, false))
  75 -       ret = false;
  76 +      if (process_archive (filedata, false))
  77 +       ret = true;
  78      }
  79    else if (memcmp (armag, ARMAGT, SARMAG) == 0)
  80      {
  81 -      if ( ! process_archive (filedata, true))
  82 -       ret = false;
  83 +      if (process_archive (filedata, true))
  84 +       ret = true;
  85      }
  86    else
  87      {
  88        if (do_archive_index && !check_all)
  89 -       error (_("File %s is not an archive so its index cannot be displayed.\n"),
  90 -              file_name);
  91 +       error (_("Not an archive so its index cannot be displayed.\n"));
  92
  93        rewind (filedata->handle);
  94        filedata->archive_file_size = filedata->archive_file_offset = 0;
  95
  96 -      if (! process_object (filedata))
  97 -       ret = false;
  98 +      if (process_object (filedata))
  99 +       ret = true;
 100      }
 101
 102 -  fclose (filedata->handle);
 103 -  free (filedata->section_headers);
 104 -  free (filedata->program_headers);
 105 -  free (filedata->string_table);
 106 -  free (filedata->dump.dump_sects);
 107 -  free (filedata);
 108 + done:
 109 +  if (filedata)
 110 +    {
 111 +      if (filedata->handle != NULL)
 112 +       fclose (filedata->handle);
 113 +      free (filedata->section_headers);
 114 +      free (filedata->program_headers);
 115 +      free (filedata->string_table);
 116 +      free (filedata->dump.dump_sects);
 117 +      free (filedata);
 118 +    }
 119 +  free (program_name);
 120 +  program_name = saved_program_name;
 121
 122    free (ba_cache.strtab);
 123    ba_cache.strtab = NULL;
 124 --- binutils.orig/binutils/readelf.c    2021-08-10 10:15:22.088016072 +0100
 125 +++ binutils-2.37/binutils/readelf.c    2021-08-10 10:15:55.567907891 +0100
 126 @@ -21884,7 +21884,7 @@ process_file (char * file_name)
 127    Filedata * filedata = NULL;
 128    struct stat statbuf;
 129    char armag[SARMAG];
 130 -  bool ret = true;
 131 +  bool ret = false;
 132    char * name;
 133    char * saved_program_name;
 134