logo

live-bootstrap

Mirror of <https://github.com/fosslinux/live-bootstrap>

uniq-fopen.patch (2141B)

    

  1. SPDX-FileCopyrightText: 2005 Paul Eggert <eggert@cs.ucla.edu>
  2. SPDX-FileCopyrightText: 2023 Emily Trau <emily@downunderctf.com>
  4. SPDX-License-Identifier: GPL-2.0-or-later
  6. uniq: don't assume fopen cannot return stdin or stdout.
  7. Backport of https://git.savannah.gnu.org/cgit/coreutils.git/commit/?id=786ebb2ceca72f69aa2de701671fb41f53cb1489
  9. --- coreutils-5.0/src/uniq.c
  10. +++ coreutils-5.0/src/uniq.c
  11. @@ -30,6 +30,7 @@
  12.  #include "error.h"
  13.  #include "hard-locale.h"
  14.  #include "posixver.h"
  15. +#include "stdio-safer.h"
  16.  #include "xmemcoll.h"
  17.  #include "xstrtol.h"
  18.  #include "memcasecmp.h"
  19. @@ -267,20 +268,26 @@ check_file (const char *infile, const char *outfile)
  20.    FILE *ostream;
  21.    struct linebuffer lb1, lb2;
  22.    struct linebuffer *thisline, *prevline;
  23. +  bool is_stdin = STREQ (infile, "-");
  24. +  bool is_stdout = STREQ (outfile, "-");
  25.  
  26. -  if (STREQ (infile, "-"))
  27. +  if (is_stdin)
  28.      istream = stdin;
  29.    else
  30. -    istream = fopen (infile, "r");
  31. -  if (istream == NULL)
  32. -    error (EXIT_FAILURE, errno, "%s", infile);
  33. +    {
  34. +      istream = fopen_safer (infile, "r");
  35. +      if (! istream)
  36. +        error (EXIT_FAILURE, errno, "%s", infile);
  37. +    }
  38.  
  39. -  if (STREQ (outfile, "-"))
  40. +  if (is_stdout)
  41.      ostream = stdout;
  42.    else
  43. -    ostream = fopen (outfile, "w");
  44. -  if (ostream == NULL)
  45. -    error (EXIT_FAILURE, errno, "%s", outfile);
  46. +    {
  47. +      ostream = fopen_safer (outfile, "w");
  48. +      if (! ostream)
  49. +        error (EXIT_FAILURE, errno, "%s", outfile);
  50. +    }
  51.  
  52.    thisline = &lb1;
  53.    prevline = &lb2;
  54. @@ -377,12 +384,12 @@ check_file (const char *infile, const char *outfile)
  55.      }
  56.  
  57.   closefiles:
  58. -  if (ferror (istream) || fclose (istream) == EOF)
  59. +  if (!is_stdin && (ferror (istream) || fclose (istream) != 0))
  60.      error (EXIT_FAILURE, errno, _("error reading %s"), infile);
  61.  
  62.    /* Close ostream only if it's not stdout -- the latter is closed
  63.       via the atexit-invoked close_stdout.  */
  64. -  if (ostream != stdout && (ferror (ostream) || fclose (ostream) == EOF))
  65. +  if (!is_stdout && (ferror (ostream) || fclose (ostream) != 0))
  66.      error (EXIT_FAILURE, errno, _("error writing %s"), outfile);
  67.  
  68.    free (lb1.buffer);