mirror of the now-defunct rocklinux.org
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

39 lines
1.5 KiB

  1. # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
  2. #
  3. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
  4. # Please add additional copyright information _after_ the line containing
  5. # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
  6. # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
  7. #
  8. # ROCK Linux: rock-src/package/base/sed/no-in-place-wo-file.patch
  9. # ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
  10. #
  11. # This patch file is dual-licensed. It is available under the license the
  12. # patched project is licensed under, as long as it is an OpenSource license
  13. # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  14. # of the GNU General Public License as published by the Free Software
  15. # Foundation; either version 2 of the License, or (at your option) any later
  16. # version.
  17. #
  18. # --- ROCK-COPYRIGHT-NOTE-END ---
  19. --- sed-4.1/sed/execute.c 2004-03-13 10:30:39.000000000 +0100
  20. +++ sed-4.1-jsaw/sed/execute.c 2004-06-24 13:35:57.497606648 +0200
  21. @@ -654,7 +654,7 @@
  22. input->read_fn = read_file_line;
  23. - if (in_place_extension)
  24. + if (in_place_extension && !(name[0] == '-' && name[1] == '\0'))
  25. {
  26. int output_fd;
  27. char *tmpdir = ck_strdup(name), *p;
  28. @@ -701,7 +701,7 @@
  29. if (input->fp != stdin) /* stdin can be reused on tty and tape devices */
  30. ck_fclose(input->fp);
  31. - if (in_place_extension && output_file.fp != NULL)
  32. + if (in_place_extension && output_file.fp != NULL && output_file.fp != stdout)
  33. {
  34. ck_fclose (output_file.fp);
  35. if (strcmp(in_place_extension, "*") != 0)