Fix some compile issues, use our implementation of rresvport_af since it is

deprecated.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@13034 a1ca3aef-8c08-0410-bb20-df032aa958be

diff --git a/backend/lpd.c b/backend/lpd.c
index 0a1bd1e64b2452986ed47339ee1a5d7622bd43d8..d8ef9343b2bf36bd4adef5637acbc12b7c24abb8 100644 (file)
--- a/backend/lpd.c
+++ b/backend/lpd.c
@@ -3,7 +3,7 @@
  *
  * Line Printer Daemon backend for CUPS.
  *
- * Copyright 2007-2013 by Apple Inc.
+ * Copyright 2007-2016 by Apple Inc.
  * Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  * These coded instructions, statements, and computer programs are the
@@ -77,6 +77,7 @@ static int    abort_job = 0;          /* Non-zero if we get SIGTERM */
  * Local functions...
  */
 
+static int     cups_rresvport(int *port, int family);
 static int     lpd_command(int lpd_fd, char *format, ...);
 static int     lpd_queue(const char *hostname, http_addrlist_t *addrlist,
                          const char *printer, int print_fd, int snmp_fd,
@@ -85,9 +86,6 @@ static int    lpd_queue(const char *hostname, http_addrlist_t *addrlist,
                          int reserve, int manual_copies, int timeout,
                          int contimeout, const char *orighost);
 static ssize_t lpd_write(int lpd_fd, char *buffer, size_t length);
-#ifndef HAVE_RRESVPORT_AF
-static int     rresvport_af(int *port, int family);
-#endif /* !HAVE_RRESVPORT_AF */
 static void    sigterm_handler(int sig);
 
 
@@ -572,6 +570,84 @@ main(int  argc,                            /* I - Number of command-line arguments (6 or 7) */
 }
 
 
+/*
+ * 'cups_rresvport()' - A simple implementation of rresvport_af().
+ */
+
+static int                             /* O  - Socket or -1 on error */
+cups_rresvport(int *port,              /* IO - Port number to bind to */
+               int family)             /* I  - Address family */
+{
+  http_addr_t  addr;                   /* Socket address */
+  int          fd;                     /* Socket file descriptor */
+
+
+ /*
+  * Try to create an IPv4 socket...
+  */
+
+  if ((fd = socket(family, SOCK_STREAM, 0)) < 0)
+    return (-1);
+
+ /*
+  * Initialize the address buffer...
+  */
+
+  memset(&addr, 0, sizeof(addr));
+  addr.addr.sa_family = family;
+
+ /*
+  * Try to bind the socket to a reserved port...
+  */
+
+  while (*port > 511)
+  {
+   /*
+    * Set the port number...
+    */
+
+    _httpAddrSetPort(&addr, *port);
+
+   /*
+    * Try binding the port to the socket; return if all is OK...
+    */
+
+    if (!bind(fd, (struct sockaddr *)&addr, (socklen_t)httpAddrLength(&addr)))
+      return (fd);
+
+   /*
+    * Stop if we have any error other than "address already in use"...
+    */
+
+    if (errno != EADDRINUSE)
+    {
+      httpAddrClose(NULL, fd);
+
+      return (-1);
+    }
+
+   /*
+    * Try the next port...
+    */
+
+    (*port)--;
+  }
+
+ /*
+  * Wasn't able to bind to a reserved port, so close the socket and return
+  * -1...
+  */
+
+#ifdef WIN32
+  closesocket(fd);
+#else
+  close(fd);
+#endif /* WIN32 */
+
+  return (-1);
+}
+
+
 /*
  * 'lpd_command()' - Send an LPR command sequence and wait for a reply.
  */
@@ -753,7 +829,7 @@ lpd_queue(const char      *hostname,        /* I - Host to connect to */
        * priviledged lport between 721 and 731...
        */
 
-       if ((fd = rresvport_af(&lport, addr->addr.addr.sa_family)) < 0)
+       if ((fd = cups_rresvport(&lport, addr->addr.addr.sa_family)) < 0)
        {
          perror("DEBUG: Unable to reserve port");
          sleep(1);
@@ -1226,86 +1302,6 @@ lpd_write(int     lpd_fd,                /* I - LPD socket */
 }
 
 
-#ifndef HAVE_RRESVPORT_AF
-/*
- * 'rresvport_af()' - A simple implementation of rresvport_af().
- */
-
-static int                             /* O  - Socket or -1 on error */
-rresvport_af(int *port,                        /* IO - Port number to bind to */
-             int family)               /* I  - Address family */
-{
-  http_addr_t  addr;                   /* Socket address */
-  int          fd;                     /* Socket file descriptor */
-
-
- /*
-  * Try to create an IPv4 socket...
-  */
-
-  if ((fd = socket(family, SOCK_STREAM, 0)) < 0)
-    return (-1);
-
- /*
-  * Initialize the address buffer...
-  */
-
-  memset(&addr, 0, sizeof(addr));
-  addr.addr.sa_family = family;
-
- /*
-  * Try to bind the socket to a reserved port...
-  */
-
-  while (*port > 511)
-  {
-   /*
-    * Set the port number...
-    */
-
-    _httpAddrSetPort(&addr, *port);
-
-   /*
-    * Try binding the port to the socket; return if all is OK...
-    */
-
-    if (!bind(fd, (struct sockaddr *)&addr, httpAddrLength(&addr)))
-      return (fd);
-
-   /*
-    * Stop if we have any error other than "address already in use"...
-    */
-
-    if (errno != EADDRINUSE)
-    {
-      httpAddrClose(NULL, fd);
-
-      return (-1);
-    }
-
-   /*
-    * Try the next port...
-    */
-
-    (*port)--;
-  }
-
- /*
-  * Wasn't able to bind to a reserved port, so close the socket and return
-  * -1...
-  */
-
-#  ifdef WIN32
-  closesocket(fd);
-#  else
-  close(fd);
-#  endif /* WIN32 */
-
-  return (-1);
-}
-#endif /* !HAVE_RRESVPORT_AF */
-
-
 /*
  * 'sigterm_handler()' - Handle 'terminate' signals that stop the backend.
  */

diff --git a/filter/rasterbench.c b/filter/rasterbench.c
index 572a928a8936de33c8fd00bdb545738e4f384fa5..96eb3255f1721d571a8a8e3193d74bf2a0ed16f9 100644 (file)
--- a/filter/rasterbench.c
+++ b/filter/rasterbench.c
@@ -3,7 +3,7 @@
  *
  * Raster benchmark program for CUPS.
  *
- * Copyright 2007-2014 by Apple Inc.
+ * Copyright 2007-2016 by Apple Inc.
  * Copyright 1997-2006 by Easy Software Products.
  *
  * These coded instructions, statements, and computer programs are the
@@ -21,6 +21,7 @@
 
 #include <config.h>
 #include <cups/raster.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <sys/time.h>
 #include <signal.h>

diff --git a/filter/testraster.c b/filter/testraster.c
index 42f377c2f6d2b58e50bfaa3f5d50fc18d316d3b3..1382f0b7f9122071097997f0a53e1183f46bc22c 100644 (file)
--- a/filter/testraster.c
+++ b/filter/testraster.c
@@ -3,7 +3,7 @@
  *
  * Raster test program routines for CUPS.
  *
- * Copyright 2007-2015 by Apple Inc.
+ * Copyright 2007-2016 by Apple Inc.
  * Copyright 1997-2007 by Easy Software Products.
  *
  * These coded instructions, statements, and computer programs are the
@@ -20,6 +20,7 @@
  */
 
 #include <cups/raster-private.h>
+#include <cups/ppd.h>
 #include <math.h>