]> git.ipfire.org Git - thirdparty/cups.git/blobdiff - backend/lpd.c
Merge changes from CUPS 1.5svn-r9567
[thirdparty/cups.git] / backend / lpd.c
index 0e91a5388a94329c6ba6e6c8ec55dbb7faa15c24..702c0fb9dfdbdc38f1fe42bd53602c2b32a8d3bc 100644 (file)
@@ -1,9 +1,9 @@
 /*
  * "$Id: lpd.c 7740 2008-07-14 23:58:05Z mike $"
  *
- *   Line Printer Daemon backend for the Common UNIX Printing System (CUPS).
+ *   Line Printer Daemon backend for CUPS.
  *
- *   Copyright 2007-2009 by Apple Inc.
+ *   Copyright 2007-2011 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -34,6 +34,7 @@
 #include <stdarg.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <stdio.h>
 
 #ifdef WIN32
 #  include <winsock.h>
@@ -87,11 +88,12 @@ static int  abort_job = 0;          /* Non-zero if we get SIGTERM */
  */
 
 static int     lpd_command(int lpd_fd, int timeout, char *format, ...);
-static int     lpd_queue(const char *hostname, int port, const char *printer,
-                         int print_fd, int mode, const char *user,
-                         const char *title, int copies, int banner,
-                         int format, int order, int reserve,
-                         int manual_copies, int timeout, int contimeout);
+static int     lpd_queue(const char *hostname, http_addrlist_t *addrlist,
+                         const char *printer, int print_fd, int snmp_fd,
+                         int mode, const char *user, const char *title,
+                         int copies, int banner, int format, int order,
+                         int reserve, int manual_copies, int timeout,
+                         int contimeout);
 static void    lpd_timeout(int sig);
 static int     lpd_write(int lpd_fd, char *buffer, int length);
 #ifndef HAVE_RRESVPORT_AF
@@ -124,6 +126,9 @@ main(int  argc,                             /* I - Number of command-line arguments (6 or 7) */
                *filename,              /* File to print */
                title[256];             /* Title string */
   int          port;                   /* Port number */
+  char         portname[256];          /* Port name (string) */
+  http_addrlist_t *addrlist;           /* List of addresses for printer */
+  int          snmp_fd;                /* SNMP socket */
   int          fd;                     /* Print file */
   int          status;                 /* Status of LPD job */
   int          mode;                   /* Print mode */
@@ -181,7 +186,7 @@ main(int  argc,                             /* I - Number of command-line arguments (6 or 7) */
   else if (argc < 6 || argc > 7)
   {
     _cupsLangPrintf(stderr,
-                    _("Usage: %s job-id user title copies options [file]\n"),
+                    _("Usage: %s job-id user title copies options [file]"),
                     argv[0]);
     return (CUPS_BACKEND_FAILED);
   }
@@ -190,8 +195,14 @@ main(int  argc,                            /* I - Number of command-line arguments (6 or 7) */
   * Extract the hostname and printer name from the URI...
   */
 
-  if ((device_uri = cupsBackendDeviceURI(argv)) == NULL)
-    return (CUPS_BACKEND_FAILED);
+  while ((device_uri = cupsBackendDeviceURI(argv)) == NULL)
+  {
+    _cupsLangPrintFilter(stderr, "INFO", _("Unable to locate printer."));
+    sleep(10);
+
+    if (getenv("CLASS") != NULL)
+      return (CUPS_BACKEND_FAILED);
+  }
 
   httpSeparateURI(HTTP_URI_CODING_ALL, device_uri, scheme, sizeof(scheme),
                   username, sizeof(username), hostname, sizeof(hostname), &port,
@@ -224,36 +235,15 @@ main(int  argc,                           /* I - Number of command-line arguments (6 or 7) */
 
 #ifdef __APPLE__
  /*
-  * We want to pass utf-8 characters, not re-map them (3071945)
+  * We want to pass UTF-8 characters by default, not re-map them (3071945)
   */
 
   sanitize_title = 0;
-
+#else
  /*
-  * Get the default timeout from a system preference...
+  * Otherwise we want to re-map UTF-8 to "safe" characters by default...
   */
 
-  {
-    CFPropertyListRef  pvalue;         /* Preference value */
-    SInt32             toval;          /* Timeout value */
-
-
-    pvalue = CFPreferencesCopyValue(CFSTR("timeout"),
-                                    CFSTR("com.apple.print.backends"),
-                                   kCFPreferencesAnyUser,
-                                   kCFPreferencesCurrentHost);
-    if (pvalue)
-    {
-      if (CFGetTypeID(pvalue) == CFNumberGetTypeID())
-      {
-       CFNumberGetValue(pvalue, kCFNumberSInt32Type, &toval);
-       contimeout = (int)toval;
-      }
-
-      CFRelease(pvalue);
-    }
-  }
-#else
   sanitize_title = 1;
 #endif /* __APPLE__ */
 
@@ -323,8 +313,9 @@ main(int  argc,                             /* I - Number of command-line arguments (6 or 7) */
         if (strchr("cdfglnoprtv", value[0]))
          format = value[0];
        else
-         _cupsLangPrintf(stderr, _("ERROR: Unknown format character \"%c\"\n"),
-                         value[0]);
+         _cupsLangPrintFilter(stderr, "ERROR",
+                              _("Unknown format character: \"%c\"."),
+                              value[0]);
       }
       else if (!strcasecmp(name, "mode") && value[0])
       {
@@ -337,8 +328,8 @@ main(int  argc,                             /* I - Number of command-line arguments (6 or 7) */
        else if (!strcasecmp(value, "stream"))
          mode = MODE_STREAM;
        else
-         _cupsLangPrintf(stderr, _("ERROR: Unknown print mode \"%s\"\n"),
-                         value);
+         _cupsLangPrintFilter(stderr, "ERROR",
+                              _("Unknown print mode: \"%s\"."), value);
       }
       else if (!strcasecmp(name, "order") && value[0])
       {
@@ -351,8 +342,8 @@ main(int  argc,                             /* I - Number of command-line arguments (6 or 7) */
        else if (!strcasecmp(value, "data,control"))
          order = ORDER_DATA_CONTROL;
        else
-         _cupsLangPrintf(stderr, _("ERROR: Unknown file order \"%s\"\n"),
-                         value);
+         _cupsLangPrintFilter(stderr, "ERROR",
+                              _("Unknown file order: \"%s\"."), value);
       }
       else if (!strcasecmp(name, "reserve"))
       {
@@ -411,6 +402,38 @@ main(int  argc,                            /* I - Number of command-line arguments (6 or 7) */
   if (mode == MODE_STREAM)
     order = ORDER_CONTROL_DATA;
 
+ /*
+  * Find the printer...
+  */
+
+  snprintf(portname, sizeof(portname), "%d", port);
+
+  fputs("STATE: +connecting-to-device\n", stderr);
+  fprintf(stderr, "DEBUG: Looking up \"%s\"...\n", hostname);
+
+  while ((addrlist = httpAddrGetList(hostname, AF_UNSPEC, portname)) == NULL)
+  {
+    _cupsLangPrintFilter(stderr, "INFO",
+                        _("Unable to locate printer \"%s\"."), hostname);
+    sleep(10);
+
+    if (getenv("CLASS") != NULL)
+    {
+      fputs("STATE: -connecting-to-device\n", stderr);
+      exit(CUPS_BACKEND_FAILED);
+    }
+  }
+
+  snmp_fd = _cupsSNMPOpen(addrlist->addr.addr.sa_family);
+
+ /*
+  * Wait for data from the filter...
+  */
+
+  if (argc == 6)
+    if (!backendWaitLoop(snmp_fd, &(addrlist->addr), backendNetworkSideCB))
+      return (CUPS_BACKEND_OK);
+
  /*
   * If we have 7 arguments, print the file named on the command-line.
   * Otherwise, copy stdin to a temporary file and print the temporary
@@ -423,36 +446,16 @@ main(int  argc,                           /* I - Number of command-line arguments (6 or 7) */
     * Copy stdin to a temporary file...
     */
 
-    http_addrlist_t    *addrlist;      /* Address list */
-    int                        snmp_fd;        /* SNMP socket */
-
-
-    fputs("STATE: +connecting-to-device\n", stderr);
-    fprintf(stderr, "DEBUG: Looking up \"%s\"...\n", hostname);
-
-    if ((addrlist = httpAddrGetList(hostname, AF_UNSPEC, "1")) == NULL)
-    {
-      _cupsLangPrintf(stderr, _("ERROR: Unable to locate printer \'%s\'\n"),
-                     hostname);
-      return (CUPS_BACKEND_STOP);
-    }
-
-    snmp_fd = _cupsSNMPOpen(addrlist->addr.addr.sa_family);
-
     if ((fd = cupsTempFd(tmpfilename, sizeof(tmpfilename))) < 0)
     {
-      _cupsLangPrintError(_("ERROR: Unable to create temporary file"));
+      perror("DEBUG: Unable to create temporary file");
       return (CUPS_BACKEND_FAILED);
     }
 
-    _cupsLangPuts(stderr, _("INFO: Copying print data...\n"));
-
-    backendRunLoop(-1, fd, snmp_fd, &(addrlist->addr), 0, backendNetworkSideCB);
+    _cupsLangPrintFilter(stderr, "INFO", _("Copying print data."));
 
-    if (snmp_fd >= 0)
-      _cupsSNMPClose(snmp_fd);
-
-    httpAddrFreeList(addrlist);
+    backendRunLoop(-1, fd, snmp_fd, &(addrlist->addr), 0, 0, 
+                  backendNetworkSideCB);
   }
   else if (argc == 6)
   {
@@ -470,8 +473,7 @@ main(int  argc,                             /* I - Number of command-line arguments (6 or 7) */
 
     if (fd == -1)
     {
-      _cupsLangPrintf(stderr, _("ERROR: Unable to open print file %s: %s\n"),
-                      filename, strerror(errno));
+      _cupsLangPrintError("ERROR", _("Unable to open print file"));
       return (CUPS_BACKEND_FAILED);
     }
   }
@@ -513,18 +515,16 @@ main(int  argc,                           /* I - Number of command-line arguments (6 or 7) */
       copies        = atoi(argv[4]);
     }
 
-    status = lpd_queue(hostname, port, resource + 1, fd, mode,
-                       username, title, copies,
-                      banner, format, order, reserve, manual_copies,
-                      timeout, contimeout);
+    status = lpd_queue(hostname, addrlist, resource + 1, fd, snmp_fd, mode,
+                       username, title, copies, banner, format, order, reserve,
+                      manual_copies, timeout, contimeout);
 
     if (!status)
       fprintf(stderr, "PAGE: 1 %d\n", atoi(argv[4]));
   }
   else
-    status = lpd_queue(hostname, port, resource + 1, fd, mode,
-                       username, title, 1,
-                      banner, format, order, reserve, 1,
+    status = lpd_queue(hostname, addrlist, resource + 1, fd, snmp_fd, mode,
+                       username, title, 1, banner, format, order, reserve, 1,
                       timeout, contimeout);
 
  /*
@@ -537,6 +537,9 @@ main(int  argc,                             /* I - Number of command-line arguments (6 or 7) */
   if (fd)
     close(fd);
 
+  if (snmp_fd >= 0)
+    _cupsSNMPClose(snmp_fd);
+
  /*
   * Return the queue status...
   */
@@ -562,7 +565,7 @@ lpd_command(int  fd,                /* I - Socket connection to LPD host */
 
 
  /*
-  * Don't try to send commands if the job has been cancelled...
+  * Don't try to send commands if the job has been canceled...
   */
 
   if (abort_job)
@@ -586,7 +589,7 @@ lpd_command(int  fd,                /* I - Socket connection to LPD host */
 
   if (lpd_write(fd, buf, bytes) < bytes)
   {
-    _cupsLangPrintError(_("ERROR: Unable to send LPD command"));
+    perror("DEBUG: Unable to send LPD command");
     return (-1);
   }
 
@@ -600,9 +603,9 @@ lpd_command(int  fd,                /* I - Socket connection to LPD host */
 
   if (recv(fd, &status, 1, 0) < 1)
   {
-    _cupsLangPrintf(stderr,
-                   _("WARNING: Remote host did not respond with command "
-                     "status byte after %d seconds\n"), timeout);
+    _cupsLangPrintFilter(stderr, "WARNING",
+                        _("Printer did not respond after %d seconds."),
+                        timeout);
     status = errno;
   }
 
@@ -619,21 +622,22 @@ lpd_command(int  fd,              /* I - Socket connection to LPD host */
  */
 
 static int                             /* O - Zero on success, non-zero on failure */
-lpd_queue(const char *hostname,                /* I - Host to connect to */
-          int        port,             /* I - Port to connect on */
-          const char *printer,         /* I - Printer/queue name */
-         int        print_fd,          /* I - File to print */
-         int        mode,              /* I - Print mode */
-          const char *user,            /* I - Requesting user */
-         const char *title,            /* I - Job title */
-         int        copies,            /* I - Number of copies */
-         int        banner,            /* I - Print LPD banner? */
-          int        format,           /* I - Format specifier */
-          int        order,            /* I - Order of data/control files */
-         int        reserve,           /* I - Reserve ports? */
-         int        manual_copies,     /* I - Do copies by hand... */
-         int        timeout,           /* I - Timeout... */
-         int        contimeout)        /* I - Connection timeout */
+lpd_queue(const char      *hostname,   /* I - Host to connect to */
+          http_addrlist_t *addrlist,   /* I - List of host addresses */
+          const char      *printer,    /* I - Printer/queue name */
+         int             print_fd,     /* I - File to print */
+         int             snmp_fd,      /* I - SNMP socket */
+         int             mode,         /* I - Print mode */
+          const char      *user,       /* I - Requesting user */
+         const char      *title,       /* I - Job title */
+         int             copies,       /* I - Number of copies */
+         int             banner,       /* I - Print LPD banner? */
+          int             format,      /* I - Format specifier */
+          int             order,       /* I - Order of data/control files */
+         int             reserve,      /* I - Reserve ports? */
+         int             manual_copies,/* I - Do copies by hand... */
+         int             timeout,      /* I - Timeout... */
+         int             contimeout)   /* I - Connection timeout */
 {
   char                 localhost[255]; /* Local host name */
   int                  error;          /* Error number */
@@ -643,13 +647,10 @@ lpd_queue(const char *hostname,           /* I - Host to connect to */
   char                 control[10240], /* LPD control 'file' */
                        *cptr;          /* Pointer into control file string */
   char                 status;         /* Status byte from command */
-  char                 portname[255];  /* Port name */
   int                  delay;          /* Delay for retries... */
   char                 addrname[256];  /* Address name */
-  http_addrlist_t      *addrlist,      /* Address list */
-                       *addr;          /* Socket address */
-  int                  snmp_fd,        /* SNMP socket */
-                       have_supplies;  /* Printer supports supply levels? */
+  http_addrlist_t      *addr;          /* Socket address */
+  int                  have_supplies;  /* Printer supports supply levels? */
   int                  copy;           /* Copies written */
   time_t               start_time;     /* Time of first connect */
   size_t               nbytes;         /* Number of bytes written */
@@ -676,22 +677,6 @@ lpd_queue(const char *hostname,            /* I - Host to connect to */
   signal(SIGALRM, lpd_timeout);
 #endif /* HAVE_SIGSET */
 
- /*
-  * Find the printer...
-  */
-
-  sprintf(portname, "%d", port);
-
-  fputs("STATE: +connecting-to-device\n", stderr);
-  fprintf(stderr, "DEBUG: Looking up \"%s\"...\n", hostname);
-
-  if ((addrlist = httpAddrGetList(hostname, AF_UNSPEC, portname)) == NULL)
-  {
-    _cupsLangPrintf(stderr, _("ERROR: Unable to locate printer \'%s\'\n"),
-                    hostname);
-    return (CUPS_BACKEND_STOP);
-  }
-
  /*
   * Remember when we started trying to connect to the printer...
   */
@@ -709,23 +694,19 @@ lpd_queue(const char *hostname,           /* I - Host to connect to */
     */
 
     fprintf(stderr, "DEBUG: Connecting to %s:%d for printer %s\n", hostname,
-            port, printer);
-    _cupsLangPuts(stderr, _("INFO: Connecting to printer...\n"));
+            _httpAddrPort(&(addrlist->addr)), printer);
+    _cupsLangPrintFilter(stderr, "INFO", _("Connecting to printer."));
 
     for (lport = reserve == RESERVE_RFC1179 ? 732 : 1024, addr = addrlist,
              delay = 5;;
          addr = addr->next)
     {
      /*
-      * Stop if this job has been cancelled...
+      * Stop if this job has been canceled...
       */
 
       if (abort_job)
-      {
-        httpAddrFreeList(addrlist);
-
         return (CUPS_BACKEND_FAILED);
-      }
 
      /*
       * Choose the next priviledged port...
@@ -753,7 +734,7 @@ lpd_queue(const char *hostname,             /* I - Host to connect to */
 
        if ((fd = socket(addr->addr.addr.sa_family, SOCK_STREAM, 0)) < 0)
        {
-          _cupsLangPrintError(_("ERROR: Unable to create socket"));
+         perror("DEBUG: Unable to create socket");
          sleep(1);
 
           continue;
@@ -770,7 +751,7 @@ lpd_queue(const char *hostname,             /* I - Host to connect to */
 
        if ((fd = rresvport_af(&lport, addr->addr.addr.sa_family)) < 0)
        {
-         _cupsLangPrintError(_("ERROR: Unable to reserve port"));
+         perror("DEBUG: Unable to reserve port");
          sleep(1);
 
          continue;
@@ -783,8 +764,6 @@ lpd_queue(const char *hostname,             /* I - Host to connect to */
 
       if (abort_job)
       {
-        httpAddrFreeList(addrlist);
-
        close(fd);
 
        return (CUPS_BACKEND_FAILED);
@@ -795,7 +774,6 @@ lpd_queue(const char *hostname,             /* I - Host to connect to */
 
       error = errno;
       close(fd);
-      fd = -1;
 
       if (addr->next)
         continue;
@@ -809,11 +787,9 @@ lpd_queue(const char *hostname,            /* I - Host to connect to */
        * available printer in the class.
        */
 
-        _cupsLangPuts(stderr,
-                     _("INFO: Unable to contact printer, queuing on next "
-                       "printer in class...\n"));
-
-        httpAddrFreeList(addrlist);
+        _cupsLangPrintFilter(stderr, "INFO",
+                            _("Unable to contact printer, queuing on next "
+                              "printer in class."));
 
        /*
         * Sleep 5 seconds to keep the job from requeuing too rapidly...
@@ -824,18 +800,40 @@ lpd_queue(const char *hostname,           /* I - Host to connect to */
         return (CUPS_BACKEND_FAILED);
       }
 
+      fprintf(stderr, "DEBUG: Connection error: %s\n", strerror(error));
+
       if (error == ECONNREFUSED || error == EHOSTDOWN ||
           error == EHOSTUNREACH)
       {
         if (contimeout && (time(NULL) - start_time) > contimeout)
        {
-         _cupsLangPuts(stderr, _("ERROR: Printer not responding\n"));
+         _cupsLangPrintFilter(stderr, "ERROR",
+                              _("The printer is not responding."));
          return (CUPS_BACKEND_FAILED);
        }
 
-       _cupsLangPrintf(stderr,
-                       _("WARNING: Network host \'%s\' is busy; will retry in "
-                         "%d seconds...\n"), hostname, delay);
+       switch (error)
+       {
+         case EHOSTDOWN :
+             _cupsLangPrintFilter(stderr, "WARNING",
+                                  _("Network printer \"%s\" may not exist or "
+                                    "is unavailable at this time."),
+                                  hostname);
+             break;
+
+         case EHOSTUNREACH :
+             _cupsLangPrintFilter(stderr, "WARNING",
+                                  _("Network printer \"%s\" is unreachable at "
+                                    "this time."), hostname);
+             break;
+
+         case ECONNREFUSED :
+         default :
+             _cupsLangPrintFilter(stderr, "WARNING",
+                                  _("Network printer \"%s\" is busy."),
+                                  hostname);
+             break;
+        }
 
        sleep(delay);
 
@@ -852,16 +850,15 @@ lpd_queue(const char *hostname,           /* I - Host to connect to */
       }
       else
       {
-        fprintf(stderr, "DEBUG: Connection error: %s\n", strerror(errno));
-       _cupsLangPuts(stderr,
-                     _("ERROR: Unable to connect to printer; will retry in 30 "
-                       "seconds...\n"));
+       _cupsLangPrintFilter(stderr, "ERROR",
+                            _("Network printer \"%s\" is not responding."),
+                            hostname);
        sleep(30);
       }
     }
 
     fputs("STATE: -connecting-to-device\n", stderr);
-    _cupsLangPuts(stderr, _("INFO: Connected to printer...\n"));
+    _cupsLangPrintFilter(stderr, "INFO", _("Connected to printer."));
 
 #ifdef AF_INET6
     if (addr->addr.addr.sa_family == AF_INET6)
@@ -879,8 +876,9 @@ lpd_queue(const char *hostname,             /* I - Host to connect to */
     * See if the printer supports SNMP...
     */
 
-    if ((snmp_fd = _cupsSNMPOpen(addr->addr.addr.sa_family)) >= 0)
-      have_supplies = !backendSNMPSupplies(snmp_fd, &(addr->addr), NULL, NULL);
+    if (snmp_fd >= 0)
+      have_supplies = !backendSNMPSupplies(snmp_fd, &(addrlist->addr), NULL,
+                                           NULL);
     else
       have_supplies = 0;
 
@@ -888,7 +886,7 @@ lpd_queue(const char *hostname,             /* I - Host to connect to */
     * Check for side-channel requests...
     */
 
-    backendCheckSideChannel(snmp_fd, &(addr->addr));
+    backendCheckSideChannel(snmp_fd, &(addrlist->addr));
 
    /*
     * Next, open the print file and figure out its size...
@@ -902,10 +900,9 @@ lpd_queue(const char *hostname,            /* I - Host to connect to */
 
       if (fstat(print_fd, &filestats))
       {
-       httpAddrFreeList(addrlist);
        close(fd);
 
-       _cupsLangPrintError(_("ERROR: unable to stat print file"));
+       perror("DEBUG: unable to stat print file");
        return (CUPS_BACKEND_FAILED);
       }
 
@@ -933,7 +930,6 @@ lpd_queue(const char *hostname,             /* I - Host to connect to */
     if (lpd_command(fd, timeout, "\002%s\n",
                     printer))          /* Receive print job(s) */
     {
-      httpAddrFreeList(addrlist);
       close(fd);
       return (CUPS_BACKEND_FAILED);
     }
@@ -986,19 +982,19 @@ lpd_queue(const char *hostname,           /* I - Host to connect to */
       if (lpd_command(fd, timeout, "\002%d cfA%03.3d%.15s\n", strlen(control),
                       (int)getpid() % 1000, localhost))
       {
-        httpAddrFreeList(addrlist);
        close(fd);
 
         return (CUPS_BACKEND_FAILED);
       }
 
-      _cupsLangPrintf(stderr, _("INFO: Sending control file (%u bytes)\n"),
-                     (unsigned)strlen(control));
+      fprintf(stderr, "DEBUG: Sending control file (%u bytes)\n",
+             (unsigned)strlen(control));
 
       if (lpd_write(fd, control, strlen(control) + 1) < (strlen(control) + 1))
       {
        status = errno;
-       _cupsLangPrintError(_("ERROR: Unable to write control file"));
+       perror("DEBUG: Unable to write control file");
+
       }
       else
       {
@@ -1006,9 +1002,9 @@ lpd_queue(const char *hostname,           /* I - Host to connect to */
 
         if (read(fd, &status, 1) < 1)
        {
-         _cupsLangPrintf(stderr,
-                         _("WARNING: Remote host did not respond with control "
-                           "status byte after %d seconds\n"), timeout);
+         _cupsLangPrintFilter(stderr, "WARNING",
+                              _("Printer did not respond after %d seconds."),
+                              timeout);
          status = errno;
        }
 
@@ -1016,11 +1012,12 @@ lpd_queue(const char *hostname,         /* I - Host to connect to */
       }
 
       if (status != 0)
-       _cupsLangPrintf(stderr,
-                       _("ERROR: Remote host did not accept control file "
-                         "(%d)\n"), status);
+       _cupsLangPrintFilter(stderr, "ERROR",
+                            _("Remote host did not accept control file (%d)."),
+                            status);
       else
-       _cupsLangPuts(stderr, _("INFO: Control file sent successfully\n"));
+       _cupsLangPrintFilter(stderr, "INFO",
+                            _("Control file sent successfully."));
     }
     else
       status = 0;
@@ -1041,19 +1038,13 @@ lpd_queue(const char *hostname,         /* I - Host to connect to */
                       CUPS_LLCAST filestats.st_size, (int)getpid() % 1000,
                      localhost))
       {
-        httpAddrFreeList(addrlist);
        close(fd);
 
         return (CUPS_BACKEND_FAILED);
       }
 
-      _cupsLangPrintf(stderr,
-#ifdef HAVE_LONG_LONG
-                     _("INFO: Sending data file (%lld bytes)\n"),
-#else
-                     _("INFO: Sending data file (%ld bytes)\n"),
-#endif /* HAVE_LONG_LONG */
-                     CUPS_LLCAST filestats.st_size);
+      fprintf(stderr, "DEBUG: Sending data file (" CUPS_LLFMT " bytes)\n",
+             CUPS_LLCAST filestats.st_size);
 
       tbytes = 0;
       for (copy = 0; copy < manual_copies; copy ++)
@@ -1062,13 +1053,13 @@ lpd_queue(const char *hostname,         /* I - Host to connect to */
 
        while ((nbytes = read(print_fd, buffer, sizeof(buffer))) > 0)
        {
-         _cupsLangPrintf(stderr,
-                         _("INFO: Spooling LPR job, %.0f%% complete...\n"),
-                         100.0 * tbytes / filestats.st_size);
+         _cupsLangPrintFilter(stderr, "INFO",
+                              _("Spooling job, %.0f%% complete."),
+                              100.0 * tbytes / filestats.st_size);
 
          if (lpd_write(fd, buffer, nbytes) < nbytes)
          {
-            _cupsLangPrintError(_("ERROR: Unable to send print file to printer"));
+           perror("DEBUG: Unable to send print file to printer");
             break;
          }
          else
@@ -1082,7 +1073,7 @@ lpd_queue(const char *hostname,           /* I - Host to connect to */
          status = errno;
        else if (lpd_write(fd, "", 1) < 1)
        {
-          _cupsLangPrintError(_("ERROR: Unable to send trailing nul to printer"));
+         perror("DEBUG: Unable to send trailing nul to printer");
          status = errno;
        }
        else
@@ -1098,9 +1089,9 @@ lpd_queue(const char *hostname,           /* I - Host to connect to */
 
           if (recv(fd, &status, 1, 0) < 1)
          {
-           _cupsLangPrintf(stderr,
-                           _("WARNING: Remote host did not respond with data "
-                             "status byte after %d seconds\n"), timeout);
+           _cupsLangPrintFilter(stderr, "WARNING",
+                                _("Printer did not respond after %d seconds."),
+                                timeout);
            status = 0;
           }
 
@@ -1111,11 +1102,12 @@ lpd_queue(const char *hostname,         /* I - Host to connect to */
         status = 0;
 
       if (status != 0)
-       _cupsLangPrintf(stderr,
-                       _("ERROR: Remote host did not accept data file (%d)\n"),
-                       status);
+       _cupsLangPrintFilter(stderr, "ERROR",
+                            _("Remote host did not accept data file (%d)."),
+                            status);
       else
-       _cupsLangPuts(stderr, _("INFO: Data file sent successfully\n"));
+       _cupsLangPrintFilter(stderr, "INFO",
+                            _("Data file sent successfully."));
     }
 
     if (status == 0 && order == ORDER_DATA_CONTROL)
@@ -1133,19 +1125,18 @@ lpd_queue(const char *hostname,         /* I - Host to connect to */
       if (lpd_command(fd, timeout, "\002%d cfA%03.3d%.15s\n", strlen(control),
                       (int)getpid() % 1000, localhost))
       {
-        httpAddrFreeList(addrlist);
        close(fd);
 
         return (CUPS_BACKEND_FAILED);
       }
 
-      _cupsLangPrintf(stderr, _("INFO: Sending control file (%lu bytes)\n"),
-                     (unsigned long)strlen(control));
+      fprintf(stderr, "DEBUG: Sending control file (%lu bytes)\n",
+             (unsigned long)strlen(control));
 
       if (lpd_write(fd, control, strlen(control) + 1) < (strlen(control) + 1))
       {
        status = errno;
-       _cupsLangPrintError(_("ERROR: Unable to write control file"));
+       perror("DEBUG: Unable to write control file");
       }
       else
       {
@@ -1153,9 +1144,9 @@ lpd_queue(const char *hostname,           /* I - Host to connect to */
 
         if (read(fd, &status, 1) < 1)
        {
-         _cupsLangPrintf(stderr,
-                         _("WARNING: Remote host did not respond with control "
-                           "status byte after %d seconds\n"), timeout);
+         _cupsLangPrintFilter(stderr, "WARNING",
+                              _("Printer did not respond after %d seconds."),
+                              timeout);
          status = errno;
        }
 
@@ -1163,11 +1154,12 @@ lpd_queue(const char *hostname,         /* I - Host to connect to */
       }
 
       if (status != 0)
-       _cupsLangPrintf(stderr,
-                       _("ERROR: Remote host did not accept control file "
-                         "(%d)\n"), status);
+       _cupsLangPrintFilter(stderr, "ERROR",
+                            _("Remote host did not accept control file (%d)."),
+                            status);
       else
-       _cupsLangPuts(stderr, _("INFO: Control file sent successfully\n"));
+       _cupsLangPrintFilter(stderr, "INFO",
+                            _("Control file sent successfully."));
     }
 
    /*
@@ -1184,11 +1176,7 @@ lpd_queue(const char *hostname,          /* I - Host to connect to */
     close(fd);
 
     if (status == 0)
-    {
-      httpAddrFreeList(addrlist);
-
       return (CUPS_BACKEND_OK);
-    }
 
    /*
     * Waiting for a retry...
@@ -1197,10 +1185,8 @@ lpd_queue(const char *hostname,          /* I - Host to connect to */
     sleep(30);
   }
 
-  httpAddrFreeList(addrlist);
-
  /*
-  * If we get here, then the job has been cancelled...
+  * If we get here, then the job has been canceled...
   */
 
   return (CUPS_BACKEND_FAILED);