Serial back end has inverted SIGTERM block

[michaelrsweet]

Version: 1.4-current
CUPS.org User: bmason

According to the comments in serial.c:

/*

• Now that we are "connected" to the port, ignore SIGTERM so that we
• can finish out any page data the driver sends (e.g. to eject the
• current page... Only ignore SIGTERM if we are printing data from
• stdin (otherwise you can't cancel raw jobs...)
  */

However, the code after that comment is:

if (print_fd != 0)
{

ifdef HAVE_SIGSET /* Use System V signals over POSIX to avoid bugs */

sigset(SIGTERM, SIG_IGN);

elif defined(HAVE_SIGACTION)

memset(&action, 0, sizeof(action));

sigemptyset(&action.sa_mask);
action.sa_handler = SIG_IGN;
sigaction(SIGTERM, &action, NULL);

else

signal(SIGTERM, SIG_IGN);

endif /* HAVE_SIGSET */

}

which would seem to operate the opposite of the comments. The result is that you can't stop raw print jobs sent to serial printers.

[michaelrsweet]

CUPS.org User: bmason

Added proposed patch that makes serial.c match runloop.c

[michaelrsweet]

CUPS.org User: bmason

This also seems to be similar to STR #1046.

[michaelrsweet]

CUPS.org User: bmason

Nuts! Fat-fingered the filename in the first patch. Sorry.

[michaelrsweet]

CUPS.org User: mike

Fixed in Subversion repository.

[michaelrsweet]

"str3469.patch":

Index: serial.c

--- serial.c (revision 9268)
+++ serial.c (working copy)
@@ -503,7 +503,7 @@

• stdin (otherwise you can't cancel raw jobs...)
  */
• if (print_fd != 0)
• if (!print_fd)
  {
  #ifdef HAVE_SIGSET /* Use System V signals over POSIX to avoid bugs */
  sigset(SIGTERM, SIG_IGN);

[michaelrsweet]

"str3649.patch":

Index: serial.c

--- serial.c (revision 9268)
+++ serial.c (working copy)
@@ -503,7 +503,7 @@

• stdin (otherwise you can't cancel raw jobs...)
  */
• if (print_fd != 0)
• if (!print_fd)
  {
  #ifdef HAVE_SIGSET /* Use System V signals over POSIX to avoid bugs */
  sigset(SIGTERM, SIG_IGN);