]> git.ipfire.org Git - thirdparty/cups.git/blobdiff - cups/dest.c
Merge changes from CUPS 1.4svn-r8628.
[thirdparty/cups.git] / cups / dest.c
index 96db76308ede02993b52a888a4bff1923a89c9bf..4aedcb216bc7cc3528e02841d7d21f3ed4532fab 100644 (file)
 /*
- * "$Id: dest.c 4979 2006-01-25 17:47:43Z mike $"
+ * "$Id: dest.c 7946 2008-09-16 23:27:54Z mike $"
  *
  *   User-defined destination (and option) support for the Common UNIX
  *   Printing System (CUPS).
  *
- *   Copyright 1997-2006 by Easy Software Products.
+ *   Copyright 2007-2009 by Apple Inc.
+ *   Copyright 1997-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  *
  * Contents:
  *
- *   cupsAddDest()     - Add a destination to the list of destinations.
- *   cupsFreeDests()   - Free the memory used by the list of destinations.
- *   cupsGetDest()     - Get the named destination from the list.
- *   cupsGetDests()    - Get the list of destinations from the default server.
- *   cupsGetDests2()   - Get the list of destinations from the specified server.
- *   cupsSetDests()    - Set the list of destinations for the default server.
- *   cupsSetDests2()   - Set the list of destinations for the specified server.
- *   cups_get_dests()  - Get destinations from a file.
- *   cups_get_sdests() - Get destinations from a server.
+ *   cupsAddDest()         - Add a destination to the list of destinations.
+ *   cupsFreeDests()       - Free the memory used by the list of destinations.
+ *   cupsGetDest()         - Get the named destination from the list.
+ *   cupsGetDests()        - Get the list of destinations from the default
+ *                           server.
+ *   cupsGetDests2()       - Get the list of destinations from the specified
+ *                           server.
+ *   cupsGetNamedDest()    - Get options for the named destination.
+ *   cupsRemoveDest()      - Remove a destination from the destination list.
+ *   cupsSetDefaultDest()  - Set the default destination.
+ *   cupsSetDests()        - Save the list of destinations for the default
+ *                           server.
+ *   cupsSetDests2()       - Save the list of destinations for the specified
+ *                           server.
+ *   appleCopyLocations()  - Copy the location history array.
+ *   appleCopyNetwork()    - Get the network ID for the current location.
+ *   appleGetDefault()     - Get the default printer for this location.
+ *   appleGetPaperSize()   - Get the default paper size.
+ *   appleGetPrinter()     - Get a printer from the history array.
+ *   appleSetDefault()     - Set the default printer for this location.
+ *   appleUseLastPrinter() - Get the default printer preference value.
+ *   cups_add_dest()       - Add a destination to the array.
+ *   cups_compare_dests()  - Compare two destinations.
+ *   cups_find_dest()      - Find a destination using a binary search.
+ *   cups_get_default()    - Get the default destination from an lpoptions file.
+ *   cups_get_dests()      - Get destinations from a file.
+ *   cups_get_sdests()     - Get destinations from a server.
+ *   cups_make_string()    - Make a comma-separated string of values from an IPP
+ *                           attribute.
  */
 
 /*
  * Include necessary headers...
  */
 
+#include "debug.h"
 #include "globals.h"
+#include "pwgmedia.h"
 #include <stdlib.h>
 #include <ctype.h>
+#include <sys/stat.h>
 
 #ifdef HAVE_NOTIFY_H
 #  include <notify.h>
 #endif /* HAVE_NOTIFY_H */
 
+#ifdef __APPLE__
+#  include <sys/cdefs.h>
+#  include <CoreFoundation/CoreFoundation.h>
+#  include <SystemConfiguration/SystemConfiguration.h>
+#  define kDefaultPaperIDKey CFSTR("DefaultPaperID")
+#  define kLocationHistoryArrayKey CFSTR("kLocationHistoryArrayKeyTMP")
+#  define kLocationNetworkKey CFSTR("kLocationNetworkKey")
+#  define kLocationPrinterIDKey CFSTR("kLocationPrinterIDKey")
+#  define kPMPrintingPreferences CFSTR("com.apple.print.PrintingPrefs")
+#  define kUseLastPrinterAsCurrentPrinterKey CFSTR("UseLastPrinterAsCurrentPrinter")
+#endif /* __APPLE__ */
+
 
 /*
  * Local functions...
  */
 
-static int     cups_get_dests(const char *filename, int num_dests,
-                              cups_dest_t **dests);
-static int     cups_get_sdests(http_t *http, ipp_op_t op, int num_dests,
-                               cups_dest_t **dests);
+#ifdef __APPLE__
+static CFArrayRef appleCopyLocations(void);
+static CFStringRef appleCopyNetwork(void);
+static char    *appleGetPaperSize(char *name, int namesize);
+static CFStringRef appleGetPrinter(CFArrayRef locations, CFStringRef network,
+                                  CFIndex *locindex);
+static void    appleSetDefault(const char *name);
+static int     appleUseLastPrinter(void);
+#endif /* __APPLE__ */
+static cups_dest_t *cups_add_dest(const char *name, const char *instance,
+                                 int *num_dests, cups_dest_t **dests);
+static int     cups_compare_dests(cups_dest_t *a, cups_dest_t *b);
+static int     cups_find_dest(const char *name, const char *instance,
+                              int num_dests, cups_dest_t *dests, int prev,
+                              int *rdiff);
+static char    *cups_get_default(const char *filename, char *namebuf,
+                                 size_t namesize, const char **instance);
+static int     cups_get_dests(const char *filename, const char *match_name,
+                              const char *match_inst, int user_default_set,
+                              int num_dests, cups_dest_t **dests);
+static int     cups_get_sdests(http_t *http, ipp_op_t op, const char *name,
+                               int num_dests, cups_dest_t **dests);
+static char    *cups_make_string(ipp_attribute_t *attr, char *buffer,
+                                 size_t bufsize);
 
 
 /*
  * 'cupsAddDest()' - Add a destination to the list of destinations.
  *
- * Use the cupsSaveDests() function to save the updated list of destinations
- * to the user's lpoptions file.
+ * This function cannot be used to add a new class or printer queue,
+ * it only adds a new container of saved options for the named
+ * destination or instance.
+ *
+ * If the named destination already exists, the destination list is
+ * returned unchanged.  Adding a new instance of a destination creates
+ * a copy of that destination's options.
+ *
+ * Use the @link cupsSaveDests@ function to save the updated list of
+ * destinations to the user's lpoptions file.
  */
 
 int                                    /* O  - New number of destinations */
-cupsAddDest(const char  *name,         /* I  - Name of destination */
-            const char *instance,      /* I  - Instance of destination or NULL for none/primary */
+cupsAddDest(const char  *name,         /* I  - Destination name */
+            const char *instance,      /* I  - Instance name or @code NULL@ for none/primary */
             int         num_dests,     /* I  - Number of destinations */
             cups_dest_t **dests)       /* IO - Destinations */
 {
   int          i;                      /* Looping var */
   cups_dest_t  *dest;                  /* Destination pointer */
+  cups_dest_t  *parent = NULL;         /* Parent destination */
+  cups_option_t        *doption,               /* Current destination option */
+               *poption;               /* Current parent option */
 
 
-  if (name == NULL || dests == NULL)
+  if (!name || !dests)
     return (0);
 
-  if ((dest = cupsGetDest(name, instance, num_dests, *dests)) != NULL)
-    return (num_dests);
-
- /*
-  * Add new destination...
-  */
-
-  if (num_dests == 0)
-    dest = malloc(sizeof(cups_dest_t));
-  else
-    dest = realloc(*dests, sizeof(cups_dest_t) * (num_dests + 1));
-
-  if (dest == NULL)
-    return (num_dests);
+  if (!cupsGetDest(name, instance, num_dests, *dests))
+  {
+    if (instance &&
+        (parent = cupsGetDest(name, NULL, num_dests, *dests)) == NULL)
+      return (num_dests);
 
-  *dests = dest;
+    dest = cups_add_dest(name, instance, &num_dests, dests);
 
-  for (i = num_dests; i > 0; i --, dest ++)
-    if (strcasecmp(name, dest->name) < 0)
-      break;
-    else if (strcasecmp(name, dest->name) == 0 &&
-             instance != NULL && dest->instance != NULL &&
-             strcasecmp(instance, dest->instance) < 0)
-      break;
+    if (instance && parent && parent->num_options > 0)
+    {
+     /*
+      * Copy options from parent...
+      */
 
-  if (i > 0)
-    memmove(dest + 1, dest, i * sizeof(cups_dest_t));
+      dest->options = calloc(sizeof(cups_option_t), parent->num_options);
 
-  dest->name        = strdup(name);
-  dest->is_default  = 0;
-  dest->num_options = 0;
-  dest->options     = (cups_option_t *)0;
+      if (dest->options)
+      {
+        dest->num_options = parent->num_options;
 
-  if (instance == NULL)
-    dest->instance = NULL;
-  else
-    dest->instance = strdup(instance);
+       for (i = dest->num_options, doption = dest->options,
+                poption = parent->options;
+            i > 0;
+            i --, doption ++, poption ++)
+       {
+         doption->name  = _cupsStrRetain(poption->name);
+         doption->value = _cupsStrRetain(poption->value);
+       }
+      }
+    }
+  }
 
-  return (num_dests + 1);
+  return (num_dests);
 }
 
 
@@ -139,10 +190,8 @@ cupsFreeDests(int         num_dests,       /* I - Number of destinations */
 
   for (i = num_dests, dest = dests; i > 0; i --, dest ++)
   {
-    free(dest->name);
-
-    if (dest->instance)
-      free(dest->instance);
+    _cupsStrFree(dest->name);
+    _cupsStrFree(dest->instance);
 
     cupsFreeOptions(dest->num_options, dest->options);
   }
@@ -154,23 +203,24 @@ cupsFreeDests(int         num_dests,      /* I - Number of destinations */
 /*
  * 'cupsGetDest()' - Get the named destination from the list.
  *
- * Use the cupsGetDests() or cupsGetDests2() functions to get a
+ * Use the @link cupsGetDests@ or @link cupsGetDests2@ functions to get a
  * list of supported destinations for the current user.
  */
 
-cups_dest_t *                          /* O - Destination pointer or NULL */
-cupsGetDest(const char  *name,         /* I - Name of destination */
-            const char *instance,      /* I - Instance of destination */
+cups_dest_t *                          /* O - Destination pointer or @code NULL@ */
+cupsGetDest(const char  *name,         /* I - Destination name or @code NULL@ for the default destination */
+            const char *instance,      /* I - Instance name or @code NULL@ */
             int         num_dests,     /* I - Number of destinations */
             cups_dest_t *dests)                /* I - Destinations */
 {
-  int  comp;                           /* Result of comparison */
+  int  diff,                           /* Result of comparison */
+       match;                          /* Matching index */
 
 
-  if (num_dests == 0 || dests == NULL)
+  if (num_dests <= 0 || !dests)
     return (NULL);
 
-  if (name == NULL)
+  if (!name)
   {
    /*
     * NULL name for default printer.
@@ -191,21 +241,10 @@ cupsGetDest(const char  *name,            /* I - Name of destination */
     * Lookup name and optionally the instance...
     */
 
-    while (num_dests > 0)
-    {
-      if ((comp = strcasecmp(name, dests->name)) < 0)
-       return (NULL);
-      else if (comp == 0)
-      {
-       if ((instance == NULL && dests->instance == NULL) ||
-            (instance != NULL && dests->instance != NULL &&
-            strcasecmp(instance, dests->instance) == 0))
-         return (dests);
-      }
+    match = cups_find_dest(name, instance, num_dests, dests, -1, &diff);
 
-      num_dests --;
-      dests ++;
-    }
+    if (!diff)
+      return (dests + match);
   }
 
   return (NULL);
@@ -214,59 +253,70 @@ cupsGetDest(const char  *name,            /* I - Name of destination */
 
 /*
  * 'cupsGetDests()' - Get the list of destinations from the default server.
+ *
+ * Starting with CUPS 1.2, the returned list of destinations include the
+ * printer-info, printer-is-accepting-jobs, printer-is-shared,
+ * printer-make-and-model, printer-state, printer-state-change-time,
+ * printer-state-reasons, and printer-type attributes as options.  CUPS 1.4
+ * adds the marker-change-time, marker-colors, marker-high-levels,
+ * marker-levels, marker-low-levels, marker-message, marker-names,
+ * marker-types, and printer-commands attributes as well.
+ *
+ * Use the @link cupsFreeDests@ function to free the destination list and
+ * the @link cupsGetDest@ function to find a particular destination.
  */
 
 int                                    /* O - Number of destinations */
 cupsGetDests(cups_dest_t **dests)      /* O - Destinations */
 {
-  int          num_dests;              /* Number of destinations */
-  http_t       *http;                  /* HTTP connection */
-
-
- /*
-  * Connect to the CUPS server and get the destination list and options...
-  */
-
-  http = httpConnectEncrypt(cupsServer(), ippPort(), cupsEncryption());
-
-  num_dests = cupsGetDests2(http, dests);
-
-  if (http)
-    httpClose(http);
-
-  return (num_dests);
+  return (cupsGetDests2(CUPS_HTTP_DEFAULT, dests));
 }
 
 
 /*
  * 'cupsGetDests2()' - Get the list of destinations from the specified server.
  *
- * @since CUPS 1.1.21@
+ * Starting with CUPS 1.2, the returned list of destinations include the
+ * printer-info, printer-is-accepting-jobs, printer-is-shared,
+ * printer-make-and-model, printer-state, printer-state-change-time,
+ * printer-state-reasons, and printer-type attributes as options.  CUPS 1.4
+ * adds the marker-change-time, marker-colors, marker-high-levels,
+ * marker-levels, marker-low-levels, marker-message, marker-names,
+ * marker-types, and printer-commands attributes as well.
+ *
+ * Use the @link cupsFreeDests@ function to free the destination list and
+ * the @link cupsGetDest@ function to find a particular destination.
+ *
+ * @since CUPS 1.1.21/Mac OS X 10.4@
  */
 
 int                                    /* O - Number of destinations */
-cupsGetDests2(http_t      *http,       /* I - HTTP connection */
+cupsGetDests2(http_t      *http,       /* I - Connection to server or @code CUPS_HTTP_DEFAULT@ */
               cups_dest_t **dests)     /* O - Destinations */
 {
   int          i;                      /* Looping var */
   int          num_dests;              /* Number of destinations */
   cups_dest_t  *dest;                  /* Destination pointer */
   const char   *home;                  /* HOME environment variable */
-  char         filename[1024];         /* Local ~/.lpoptions file */
+  char         filename[1024];         /* Local ~/.cups/lpoptions file */
   const char   *defprinter;            /* Default printer */
   char         name[1024],             /* Copy of printer name */
-               *instance;              /* Pointer to instance name */
+               *instance,              /* Pointer to instance name */
+               *user_default;          /* User default printer */
   int          num_reals;              /* Number of real queues */
   cups_dest_t  *reals;                 /* Real queues */
-  _cups_globals_t *cg = _cupsGlobals();        /* Global data */
+  _cups_globals_t *cg = _cupsGlobals();        /* Pointer to library globals */
 
 
  /*
   * Range check the input...
   */
 
-  if (!http || !dests)
+  if (!dests)
+  {
+    _cupsSetError(IPP_INTERNAL_ERROR, _("Bad NULL dests pointer"), 1);
     return (0);
+  }
 
  /*
   * Initialize destination array...
@@ -279,8 +329,14 @@ cupsGetDests2(http_t      *http,   /* I - HTTP connection */
   * Grab the printers and classes...
   */
 
-  num_dests = cups_get_sdests(http, CUPS_GET_PRINTERS, num_dests, dests);
-  num_dests = cups_get_sdests(http, CUPS_GET_CLASSES, num_dests, dests);
+  num_dests = cups_get_sdests(http, CUPS_GET_PRINTERS, NULL, num_dests, dests);
+
+  if (cupsLastError() >= IPP_REDIRECTION_OTHER_SITE)
+  {
+    cupsFreeDests(num_dests, *dests);
+    *dests = (cups_dest_t *)0;
+    return (0);
+  }
 
  /*
   * Make a copy of the "real" queues for a later sanity check...
@@ -306,14 +362,20 @@ cupsGetDests2(http_t      *http,  /* I - HTTP connection */
   * Grab the default destination...
   */
 
-  if ((defprinter = cupsGetDefault2(http)) != NULL)
+  if ((user_default = _cupsUserDefault(name, sizeof(name))) != NULL)
+    defprinter = name;
+  else if ((defprinter = cupsGetDefault2(http)) != NULL)
+  {
+    strlcpy(name, defprinter, sizeof(name));
+    defprinter = name;
+  }
+
+  if (defprinter)
   {
    /*
-    * Grab printer and instance name...
+    * Separate printer and instance name...
     */
 
-    strlcpy(name, defprinter, sizeof(name));
-
     if ((instance = strchr(name, '/')) != NULL)
       *instance++ = '\0';
 
@@ -325,31 +387,29 @@ cupsGetDests2(http_t      *http,  /* I - HTTP connection */
       dest->is_default = 1;
   }
   else
-  {
-   /*
-    * This initialization of "instance" is unnecessary, but avoids a
-    * compiler warning...
-    */
-
     instance = NULL;
-  }
 
  /*
-  * Load the /etc/cups/lpoptions and ~/.lpoptions files...
+  * Load the /etc/cups/lpoptions and ~/.cups/lpoptions files...
   */
 
   snprintf(filename, sizeof(filename), "%s/lpoptions", cg->cups_serverroot);
-  num_dests = cups_get_dests(filename, num_dests, dests);
+  num_dests = cups_get_dests(filename, NULL, NULL, user_default != NULL,
+                             num_dests, dests);
 
   if ((home = getenv("HOME")) != NULL)
   {
-    snprintf(filename, sizeof(filename), "%s/.lpoptions", home);
-    num_dests = cups_get_dests(filename, num_dests, dests);
+    snprintf(filename, sizeof(filename), "%s/.cups/lpoptions", home);
+    if (access(filename, 0))
+      snprintf(filename, sizeof(filename), "%s/.lpoptions", home);
+
+    num_dests = cups_get_dests(filename, NULL, NULL, user_default != NULL,
+                               num_dests, dests);
   }
 
  /*
   * Validate the current default destination - this prevents old
-  * Default lines in /etc/cups/lpoptions and ~/.lpoptions from
+  * Default lines in /etc/cups/lpoptions and ~/.cups/lpoptions from
   * pointing to a non-existent printer or class...
   */
 
@@ -393,34 +453,245 @@ cupsGetDests2(http_t      *http, /* I - HTTP connection */
   * Return the number of destinations...
   */
 
+  if (num_dests > 0)
+    _cupsSetError(IPP_OK, NULL, 0);
+
   return (num_dests);
 }
 
 
 /*
- * 'cupsSetDests()' - Save the list of destinations for the default server.
+ * 'cupsGetNamedDest()' - Get options for the named destination.
  *
- * This function saves the destinations to /etc/cups/lpoptions when run
- * as root and ~/.lpoptions when run as a normal user.
+ * This function is optimized for retrieving a single destination and should
+ * be used instead of @link cupsGetDests@ and @link cupsGetDest@ when you either
+ * know the name of the destination or want to print to the default destination.
+ * If @code NULL@ is returned, the destination does not exist or there is no
+ * default destination.
+ *
+ * If "http" is @code CUPS_HTTP_DEFAULT@, the connection to the default print
+ * server will be used.
+ *
+ * If "name" is @code NULL@, the default printer for the current user will be
+ * returned.
+ *
+ * The returned destination must be freed using @link cupsFreeDests@ with a
+ * "num_dests" value of 1.
+ *
+ * @since CUPS 1.4/Mac OS X 10.6@
+ */
+
+cups_dest_t *                          /* O - Destination or @code NULL@ */
+cupsGetNamedDest(http_t     *http,     /* I - Connection to server or @code CUPS_HTTP_DEFAULT@ */
+                 const char *name,     /* I - Destination name or @code NULL@ for the default destination */
+                 const char *instance) /* I - Instance name or @code NULL@ */
+{
+  cups_dest_t  *dest;                  /* Destination */
+  char         filename[1024],         /* Path to lpoptions */
+               defname[256];           /* Default printer name */
+  const char   *home = getenv("HOME"); /* Home directory */
+  int          set_as_default = 0;     /* Set returned destination as default */
+  ipp_op_t     op = IPP_GET_PRINTER_ATTRIBUTES;
+                                       /* IPP operation to get server ops */
+  _cups_globals_t *cg = _cupsGlobals();        /* Pointer to library globals */
+
+
+ /*
+  * If "name" is NULL, find the default destination...
+  */
+
+  if (!name)
+  {
+    set_as_default = 1;
+    name           = _cupsUserDefault(defname, sizeof(defname));
+
+    if (!name && home)
+    {
+     /*
+      * No default in the environment, try the user's lpoptions files...
+      */
+
+      snprintf(filename, sizeof(filename), "%s/.cups/lpoptions", home);
+
+      if ((name = cups_get_default(filename, defname, sizeof(defname),
+                                  &instance)) == NULL)
+      {
+       snprintf(filename, sizeof(filename), "%s/.lpoptions", home);
+       name = cups_get_default(filename, defname, sizeof(defname),
+                               &instance);
+      }
+    }
+
+    if (!name)
+    {
+     /*
+      * Still not there?  Try the system lpoptions file...
+      */
+
+      snprintf(filename, sizeof(filename), "%s/lpoptions",
+              cg->cups_serverroot);
+      name = cups_get_default(filename, defname, sizeof(defname), &instance);
+    }
+
+    if (!name)
+    {
+     /*
+      * No locally-set default destination, ask the server...
+      */
+
+      op = CUPS_GET_DEFAULT;
+    }
+  }
+
+ /*
+  * Get the printer's attributes...
+  */
+
+  if (!cups_get_sdests(http, op, name, 0, &dest))
+  {
+    if (op == CUPS_GET_DEFAULT)
+      return (NULL);
+
+   /*
+    * The default printer from environment variables or from a
+    * configuration file does not exist.  Find out the real default.
+    */
+
+    if (!cups_get_sdests(http, CUPS_GET_DEFAULT, name, 0, &dest))
+      return (NULL);
+  }
+
+  if (instance)
+    dest->instance = _cupsStrAlloc(instance);
+
+  if (set_as_default)
+    dest->is_default = 1;
+
+ /*
+  * Then add local options...
+  */
+
+  snprintf(filename, sizeof(filename), "%s/lpoptions", cg->cups_serverroot);
+  cups_get_dests(filename, name, instance, 1, 1, &dest);
+
+  if (home)
+  {
+    snprintf(filename, sizeof(filename), "%s/.cups/lpoptions", home);
+
+    if (access(filename, 0))
+      snprintf(filename, sizeof(filename), "%s/.lpoptions", home);
+
+    cups_get_dests(filename, name, instance, 1, 1, &dest);
+  }
+
+ /*
+  * Return the result...
+  */
+
+  return (dest);
+}
+
+
+/*
+ * 'cupsRemoveDest()' - Remove a destination from the destination list.
+ *
+ * Removing a destination/instance does not delete the class or printer
+ * queue, merely the lpoptions for that destination/instance.  Use the
+ * @link cupsSetDests@ or @link cupsSetDests2@ functions to save the new
+ * options for the user.
+ *
+ * @since CUPS 1.3/Mac OS X 10.5@
+ */
+
+int                                    /* O  - New number of destinations */
+cupsRemoveDest(const char  *name,      /* I  - Destination name */
+               const char  *instance,  /* I  - Instance name or @code NULL@ */
+              int         num_dests,   /* I  - Number of destinations */
+              cups_dest_t **dests)     /* IO - Destinations */
+{
+  int          i;                      /* Index into destinations */
+  cups_dest_t  *dest;                  /* Pointer to destination */
+
+
+ /*
+  * Find the destination...
+  */
+
+  if ((dest = cupsGetDest(name, instance, num_dests, *dests)) == NULL)
+    return (num_dests);
+
+ /*
+  * Free memory...
+  */
+
+  _cupsStrFree(dest->name);
+  _cupsStrFree(dest->instance);
+  cupsFreeOptions(dest->num_options, dest->options);
+
+ /*
+  * Remove the destination from the array...
+  */
+
+  num_dests --;
+
+  i = dest - *dests;
+
+  if (i < num_dests)
+    memmove(dest, dest + 1, (num_dests - i) * sizeof(cups_dest_t));
+
+  return (num_dests);
+}
+
+
+/*
+ * 'cupsSetDefaultDest()' - Set the default destination.
+ *
+ * @since CUPS 1.3/Mac OS X 10.5@
  */
 
 void
-cupsSetDests(int         num_dests,    /* I - Number of destinations */
-             cups_dest_t *dests)       /* I - Destinations */
+cupsSetDefaultDest(
+    const char  *name,                 /* I - Destination name */
+    const char  *instance,             /* I - Instance name or @code NULL@ */
+    int         num_dests,             /* I - Number of destinations */
+    cups_dest_t *dests)                        /* I - Destinations */
 {
-  http_t       *http;                  /* HTTP connection */
+  int          i;                      /* Looping var */
+  cups_dest_t  *dest;                  /* Current destination */
+
 
+ /*
+  * Range check input...
+  */
+
+  if (!name || num_dests <= 0 || !dests)
+    return;
 
  /*
-  * Connect to the CUPS server and save the destination list and options...
+  * Loop through the array and set the "is_default" flag for the matching
+  * destination...
   */
 
-  http = httpConnectEncrypt(cupsServer(), ippPort(), cupsEncryption());
+  for (i = num_dests, dest = dests; i > 0; i --, dest ++)
+    dest->is_default = !strcasecmp(name, dest->name) &&
+                       ((!instance && !dest->instance) ||
+                       (instance && dest->instance &&
+                        !strcasecmp(instance, dest->instance)));
+}
 
-  cupsSetDests2(http, num_dests, dests);
 
-  if (http)
-    httpClose(http);
+/*
+ * 'cupsSetDests()' - Save the list of destinations for the default server.
+ *
+ * This function saves the destinations to /etc/cups/lpoptions when run
+ * as root and ~/.cups/lpoptions when run as a normal user.
+ */
+
+void
+cupsSetDests(int         num_dests,    /* I - Number of destinations */
+             cups_dest_t *dests)       /* I - Destinations */
+{
+  cupsSetDests2(CUPS_HTTP_DEFAULT, num_dests, dests);
 }
 
 
@@ -428,13 +699,13 @@ cupsSetDests(int         num_dests,       /* I - Number of destinations */
  * 'cupsSetDests2()' - Save the list of destinations for the specified server.
  *
  * This function saves the destinations to /etc/cups/lpoptions when run
- * as root and ~/.lpoptions when run as a normal user.
+ * as root and ~/.cups/lpoptions when run as a normal user.
  *
- * @since CUPS 1.1.21@
+ * @since CUPS 1.1.21/Mac OS X 10.4@
  */
 
 int                                    /* O - 0 on success, -1 on error */
-cupsSetDests2(http_t      *http,       /* I - HTTP connection */
+cupsSetDests2(http_t      *http,       /* I - Connection to server or @code CUPS_HTTP_DEFAULT@ */
               int         num_dests,   /* I - Number of destinations */
               cups_dest_t *dests)      /* I - Destinations */
 {
@@ -442,29 +713,37 @@ cupsSetDests2(http_t      *http,  /* I - HTTP connection */
   int          wrote;                  /* Wrote definition? */
   cups_dest_t  *dest;                  /* Current destination */
   cups_option_t        *option;                /* Current option */
+  _ipp_option_t        *match;                 /* Matching attribute for option */
   FILE         *fp;                    /* File pointer */
+#ifndef WIN32
   const char   *home;                  /* HOME environment variable */
+#endif /* WIN32 */
   char         filename[1024];         /* lpoptions file */
   int          num_temps;              /* Number of temporary destinations */
   cups_dest_t  *temps,                 /* Temporary destinations */
                *temp;                  /* Current temporary dest */
   const char   *val;                   /* Value of temporary option */
-  _cups_globals_t *cg = _cupsGlobals();        /* Global data */
+  _cups_globals_t *cg = _cupsGlobals();        /* Pointer to library globals */
 
 
  /*
   * Range check the input...
   */
 
-  if (!http || !num_dests || !dests)
+  if (!num_dests || !dests)
     return (-1);
 
  /*
   * Get the server destinations...
   */
 
-  num_temps = cups_get_sdests(http, CUPS_GET_PRINTERS, 0, &temps);
-  num_temps = cups_get_sdests(http, CUPS_GET_CLASSES, num_temps, &temps);
+  num_temps = cups_get_sdests(http, CUPS_GET_PRINTERS, NULL, 0, &temps);
+
+  if (cupsLastError() >= IPP_REDIRECTION_OTHER_SITE)
+  {
+    cupsFreeDests(num_temps, temps);
+    return (-1);
+  }
 
  /*
   * Figure out which file to write to...
@@ -479,14 +758,31 @@ cupsSetDests2(http_t      *http,  /* I - HTTP connection */
     * Merge in server defaults...
     */
 
-    num_temps = cups_get_dests(filename, num_temps, &temps);
+    num_temps = cups_get_dests(filename, NULL, NULL, 0, num_temps, &temps);
 
    /*
     * Point to user defaults...
     */
 
     if ((home = getenv("HOME")) != NULL)
+    {
+     /*
+      * Remove the old ~/.lpoptions file...
+      */
+
       snprintf(filename, sizeof(filename), "%s/.lpoptions", home);
+      unlink(filename);
+
+     /*
+      * Create ~/.cups subdirectory...
+      */
+
+      snprintf(filename, sizeof(filename), "%s/.cups", home);
+      if (access(filename, 0))
+        mkdir(filename, 0700);
+
+      snprintf(filename, sizeof(filename), "%s/.cups/lpoptions", home);
+    }
   }
 #endif /* !WIN32 */
 
@@ -500,6 +796,16 @@ cupsSetDests2(http_t      *http,   /* I - HTTP connection */
     return (-1);
   }
 
+#ifndef WIN32
+ /*
+  * Set the permissions to 0644 when saving to the /etc/cups/lpoptions
+  * file...
+  */
+
+  if (!getuid())
+    fchmod(fileno(fp), 0644);
+#endif /* !WIN32 */
+
  /*
   * Write each printer; each line looks like:
   *
@@ -526,17 +832,24 @@ cupsSetDests2(http_t      *http,  /* I - HTTP connection */
 
       for (j = dest->num_options, option = dest->options; j > 0; j --, option ++)
       {
+       /*
+        * See if this option is a printer attribute; if so, skip it...
+       */
+
+        if ((match = _ippFindOption(option->name)) != NULL &&
+           match->group_tag == IPP_TAG_PRINTER)
+         continue;
+
        /*
        * See if the server/global options match these; if so, don't
        * write 'em.
        */
 
-        if (temp && (val = cupsGetOption(option->name, temp->num_options,
-                                        temp->options)) != NULL)
-       {
-         if (strcasecmp(val, option->value) == 0)
-           continue;
-       }
+        if (temp &&
+           (val = cupsGetOption(option->name, temp->num_options,
+                                temp->options)) != NULL &&
+            !strcasecmp(val, option->value))
+         continue;
 
        /*
         * Options don't match, write to the file...
@@ -552,10 +865,35 @@ cupsSetDests2(http_t      *http,  /* I - HTTP connection */
         
         if (option->value[0])
        {
-         if (strchr(option->value, ' ') != NULL)
-           fprintf(fp, " %s=\"%s\"", option->name, option->value);
-          else
+         if (strchr(option->value, ' ') ||
+             strchr(option->value, '\\') ||
+             strchr(option->value, '\"') ||
+             strchr(option->value, '\''))
+         {
+          /*
+           * Quote the value...
+           */
+
+           fprintf(fp, " %s=\"", option->name);
+
+           for (val = option->value; *val; val ++)
+           {
+             if (strchr("\"\'\\", *val))
+               putc('\\', fp);
+
+              putc(*val, fp);
+           }
+
+           putc('\"', fp);
+          }
+         else
+         {
+          /*
+           * Store the literal value...
+           */
+
            fprintf(fp, " %s=%s", option->name, option->value);
+          }
        }
        else
          fprintf(fp, " %s", option->name);
@@ -573,6 +911,16 @@ cupsSetDests2(http_t      *http,   /* I - HTTP connection */
 
   fclose(fp);
 
+#ifdef __APPLE__
+ /*
+  * Set the default printer for this location - this allows command-line
+  * and GUI applications to share the same default destination...
+  */
+
+  if ((dest = cupsGetDest(NULL, NULL, num_dests, dests)) != NULL)
+    appleSetDefault(dest->name);
+#endif /* __APPLE__ */
+
 #ifdef HAVE_NOTIFY_POST
  /*
   * Send a notification so that MacOS X applications can know about the
@@ -587,69 +935,674 @@ cupsSetDests2(http_t      *http, /* I - HTTP connection */
 
 
 /*
- * 'cups_get_dests()' - Get destinations from a file.
+ * '_cupsUserDefault()' - Get the user default printer from environment
+ *                        variables and location information.
  */
 
-static int                             /* O - Number of destinations */
-cups_get_dests(const char  *filename,  /* I - File to read from */
-               int         num_dests,  /* I - Number of destinations */
-               cups_dest_t **dests)    /* IO - Destinations */
+char *                                 /* O - Default printer or NULL */
+_cupsUserDefault(char   *name,         /* I - Name buffer */
+                 size_t namesize)      /* I - Size of name buffer */
 {
-  int          i;                      /* Looping var */
-  cups_dest_t  *dest;                  /* Current destination */
-  FILE         *fp;                    /* File pointer */
-  char         line[8192],             /* Line from file */
-               *lineptr,               /* Pointer into line */
-               *name,                  /* Name of destination/option */
-               *instance;              /* Instance of destination */
-  const char   *printer;               /* PRINTER or LPDEST */
+  const char   *env;                   /* LPDEST or PRINTER env variable */
+#ifdef __APPLE__
+  CFStringRef  network;                /* Network location */
+  CFArrayRef   locations;              /* Location array */
+  CFStringRef  locprinter;             /* Current printer */
+#endif /* __APPLE__ */
 
 
- /*
-  * Check environment variables...
-  */
+  if ((env = getenv("LPDEST")) == NULL)
+    if ((env = getenv("PRINTER")) != NULL && !strcmp(env, "lp"))
+      env = NULL;
 
-  if ((printer = getenv("LPDEST")) == NULL)
-    if ((printer = getenv("PRINTER")) != NULL)
-      if (strcmp(printer, "lp") == 0)
-        printer = NULL;
+  if (env)
+  {
+    strlcpy(name, env, namesize);
+    return (name);
+  }
 
+#ifdef __APPLE__
  /*
-  * Try to open the file...
+  * Use location-based defaults if "use last printer" is selected in the
+  * system preferences...
   */
 
-  if ((fp = fopen(filename, "r")) == NULL)
-    return (num_dests);
+  if (!appleUseLastPrinter())
+  {
+    DEBUG_puts("1_cupsUserDefault: Not using last printer as default...");
+    name[0] = '\0';
+    return (NULL);
+  }
 
  /*
-  * Read each printer; each line looks like:
-  *
-  *    Dest name[/instance] options
-  *    Default name[/instance] options
+  * Get the current location...
   */
 
-  while (fgets(line, sizeof(line), fp) != NULL)
+  if ((network = appleCopyNetwork()) == NULL)
+  {
+    DEBUG_puts("1_cupsUserDefault: Unable to get current network...");
+    name[0] = '\0';
+    return (NULL);
+  }
+
+#  ifdef DEBUG
+  CFStringGetCString(network, name, namesize, kCFStringEncodingUTF8);
+  DEBUG_printf(("2_cupsUserDefault: network=\"%s\"", name));
+#  endif /* DEBUG */
+
+ /*
+  * Lookup the network in the preferences...
+  */
+
+  if ((locations = appleCopyLocations()) == NULL)
   {
    /*
-    * See what type of line it is...
+    * Missing or bad location array, so no location-based default...
+    */
+
+    DEBUG_puts("1_cupsUserDefault: Missing or bad location history array...");
+
+    CFRelease(network);
+
+    name[0] = '\0';
+    return (NULL);
+  }
+  
+  DEBUG_printf(("2_cupsUserDefault: Got location, %d entries...",
+                (int)CFArrayGetCount(locations)));
+
+  if ((locprinter = appleGetPrinter(locations, network, NULL)) != NULL)
+    CFStringGetCString(locprinter, name, namesize, kCFStringEncodingUTF8);
+  else
+    name[0] = '\0';
+
+  CFRelease(network);
+  CFRelease(locations);
+
+  DEBUG_printf(("1_cupsUserDefault: Returning \"%s\"...", name));
+
+  return (*name ? name : NULL);
+
+#else
+ /*
+  * No location-based defaults on this platform...
+  */
+
+  name[0] = '\0';
+  return (NULL);
+#endif /* __APPLE__ */
+}
+
+
+#ifdef __APPLE__
+/*
+ * 'appleCopyLocations()' - Copy the location history array.
+ */
+
+static CFArrayRef                      /* O - Location array or NULL */
+appleCopyLocations(void)
+{
+  CFArrayRef   locations;              /* Location array */
+
+
+ /*
+  * Look up the location array in the preferences...
+  */
+
+  if ((locations = CFPreferencesCopyAppValue(kLocationHistoryArrayKey,
+                                             kPMPrintingPreferences)) == NULL)
+    return (NULL);
+
+  if (CFGetTypeID(locations) != CFArrayGetTypeID())
+  {
+    CFRelease(locations);
+    return (NULL);
+  }
+
+  return (locations);
+}
+
+
+/*
+ * 'appleCopyNetwork()' - Get the network ID for the current location.
+ */
+
+static CFStringRef                     /* O - Network ID */
+appleCopyNetwork(void)
+{
+  SCDynamicStoreRef    dynamicStore;   /* System configuration data */
+  CFStringRef          key;            /* Current network configuration key */
+  CFDictionaryRef      ip_dict;        /* Network configuration data */
+  CFStringRef          network = NULL; /* Current network ID */
+  
+
+  if ((dynamicStore = SCDynamicStoreCreate(NULL, CFSTR("Printing"), NULL,
+                                           NULL)) != NULL)
+  {
+    if ((key = SCDynamicStoreKeyCreateNetworkGlobalEntity(
+                   NULL, kSCDynamicStoreDomainState, kSCEntNetIPv4)) != NULL)
+    {
+      if ((ip_dict = SCDynamicStoreCopyValue(dynamicStore, key)) != NULL)
+      {
+       if ((network = CFDictionaryGetValue(ip_dict,
+                                           kSCPropNetIPv4Router)) != NULL)
+          CFRetain(network);
+
+        CFRelease(ip_dict);
+      }
+
+      CFRelease(key);
+    }
+
+    CFRelease(dynamicStore);
+  }
+
+  return (network);
+}
+
+
+/*
+ * 'appleGetPaperSize()' - Get the default paper size.
+ */
+
+static char *                          /* O - Default paper size */
+appleGetPaperSize(char *name,          /* I - Paper size name buffer */
+                  int  namesize)       /* I - Size of buffer */
+{
+  CFStringRef          defaultPaperID; /* Default paper ID */
+  _cups_pwg_media_t    *pwgmedia;      /* PWG media size */
+
+
+  defaultPaperID = CFPreferencesCopyAppValue(kDefaultPaperIDKey,
+                                             kPMPrintingPreferences);
+  if (!defaultPaperID ||
+      CFGetTypeID(defaultPaperID) != CFStringGetTypeID() ||
+      !CFStringGetCString(defaultPaperID, name, namesize,
+                         kCFStringEncodingUTF8))
+    name[0] = '\0';
+  else if ((pwgmedia = _cupsPWGMediaByLegacy(name)) != NULL)
+    strlcpy(name, pwgmedia->pwg, namesize);
+
+  if (defaultPaperID)
+    CFRelease(defaultPaperID);
+
+  return (name);
+}
+
+
+/*
+ * 'appleGetPrinter()' - Get a printer from the history array.
+ */
+
+static CFStringRef                     /* O - Printer name or NULL */
+appleGetPrinter(CFArrayRef  locations, /* I - Location array */
+                CFStringRef network,   /* I - Network name */
+               CFIndex     *locindex)  /* O - Index in array */
+{
+  CFIndex              i,              /* Looping var */
+                       count;          /* Number of locations */
+  CFDictionaryRef      location;       /* Current location */
+  CFStringRef          locnetwork,     /* Current network */
+                       locprinter;     /* Current printer */
+
+
+  for (i = 0, count = CFArrayGetCount(locations); i < count; i ++)
+    if ((location = CFArrayGetValueAtIndex(locations, i)) != NULL &&
+        CFGetTypeID(location) == CFDictionaryGetTypeID())
+    {
+      if ((locnetwork = CFDictionaryGetValue(location,
+                                             kLocationNetworkKey)) != NULL &&
+          CFGetTypeID(locnetwork) == CFStringGetTypeID() &&
+         CFStringCompare(network, locnetwork, 0) == kCFCompareEqualTo &&
+         (locprinter = CFDictionaryGetValue(location,
+                                            kLocationPrinterIDKey)) != NULL &&
+         CFGetTypeID(locprinter) == CFStringGetTypeID())
+      {
+        if (locindex)
+         *locindex = i;
+
+       return (locprinter);
+      }
+    }
+
+  return (NULL);
+}
+
+
+/*
+ * 'appleSetDefault()' - Set the default printer for this location.
+ */
+
+static void
+appleSetDefault(const char *name)      /* I - Default printer/class name */
+{
+  CFStringRef          network;        /* Current network */
+  CFArrayRef           locations;      /* Old locations array */
+  CFIndex              locindex;       /* Index in locations array */
+  CFStringRef          locprinter;     /* Current printer */
+  CFMutableArrayRef    newlocations;   /* New locations array */
+  CFMutableDictionaryRef newlocation;  /* New location */
+  CFStringRef          newprinter;     /* New printer */
+
+
+ /*
+  * Get the current location...
+  */
+
+  if ((network = appleCopyNetwork()) == NULL)
+  {
+    DEBUG_puts("1appleSetDefault: Unable to get current network...");
+    return;
+  }
+
+  if ((newprinter = CFStringCreateWithCString(kCFAllocatorDefault, name,
+                                              kCFStringEncodingUTF8)) == NULL)
+  {
+    CFRelease(network);
+    return;
+  }
+
+ /*
+  * Lookup the network in the preferences...
+  */
+
+  if ((locations = appleCopyLocations()) != NULL)
+    locprinter = appleGetPrinter(locations, network, &locindex);
+  else
+  {
+    locprinter = NULL;
+    locindex   = -1;
+  }
+
+  if (!locprinter ||
+      CFStringCompare(locprinter, newprinter, 0) != kCFCompareEqualTo)
+  {
+   /*
+    * Need to change the locations array...
     */
 
-    if (strncasecmp(line, "dest", 4) == 0 && isspace(line[4] & 255))
-      lineptr = line + 4;
-    else if (strncasecmp(line, "default", 7) == 0 && isspace(line[7] & 255))
-      lineptr = line + 7;
+    if (locations)
+    {
+      newlocations = CFArrayCreateMutableCopy(kCFAllocatorDefault, 0,
+                                              locations);
+
+      if (locprinter)
+        CFArrayRemoveValueAtIndex(newlocations, locindex);
+    }
     else
-      continue;
+      newlocations = CFArrayCreateMutable(kCFAllocatorDefault, 0, NULL);
+
+    newlocation = CFDictionaryCreateMutable(kCFAllocatorDefault, 0,
+                                           &kCFTypeDictionaryKeyCallBacks,
+                                           &kCFTypeDictionaryValueCallBacks);
+
+    if (newlocation && newlocations)
+    {
+     /*
+      * Put the new location at the front of the array...
+      */
+
+      CFDictionaryAddValue(newlocation, kLocationNetworkKey, network);
+      CFDictionaryAddValue(newlocation, kLocationPrinterIDKey, newprinter);
+      CFArrayInsertValueAtIndex(newlocations, 0, newlocation);
+
+     /*
+      * Limit the number of locations to 10...
+      */
+
+      while (CFArrayGetCount(newlocations) > 10)
+        CFArrayRemoveValueAtIndex(newlocations, 10);
+
+     /*
+      * Push the changes out...
+      */
+
+      CFPreferencesSetAppValue(kLocationHistoryArrayKey, newlocations,
+                               kPMPrintingPreferences);
+      CFPreferencesAppSynchronize(kPMPrintingPreferences);
+      notify_post("com.apple.printerPrefsChange");
+    }
+
+    if (newlocations)
+      CFRelease(newlocations);
+
+    if (newlocation)
+      CFRelease(newlocation);
+  }
+
+  if (locations)
+    CFRelease(locations);
+
+  CFRelease(network);
+  CFRelease(newprinter);
+}
+
+
+/*
+ * 'appleUseLastPrinter()' - Get the default printer preference value.
+ */
+
+static int                             /* O - 1 to use last printer, 0 otherwise */
+appleUseLastPrinter(void)
+{
+  CFPropertyListRef    uselast;        /* Use last printer preference value */
+
+
+  if ((uselast = CFPreferencesCopyAppValue(kUseLastPrinterAsCurrentPrinterKey,
+                                           kPMPrintingPreferences)) != NULL)
+  {
+    CFRelease(uselast);
+
+    if (uselast == kCFBooleanFalse)
+      return (0);
+  }
+
+  return (1);
+}
+#endif /* __APPLE__ */
+
+
+/*
+ * 'cups_add_dest()' - Add a destination to the array.
+ *
+ * Unlike cupsAddDest(), this function does not check for duplicates.
+ */
+
+static cups_dest_t *                   /* O  - New destination */
+cups_add_dest(const char  *name,       /* I  - Name of destination */
+              const char  *instance,   /* I  - Instance or NULL */
+              int         *num_dests,  /* IO - Number of destinations */
+             cups_dest_t **dests)      /* IO - Destinations */
+{
+  int          insert,                 /* Insertion point */
+               diff;                   /* Result of comparison */
+  cups_dest_t  *dest;                  /* Destination pointer */
+
+
+ /*
+  * Add new destination...
+  */
+
+  if (*num_dests == 0)
+    dest = malloc(sizeof(cups_dest_t));
+  else
+    dest = realloc(*dests, sizeof(cups_dest_t) * (*num_dests + 1));
+
+  if (!dest)
+    return (NULL);
+
+  *dests = dest;
+
+ /*
+  * Find where to insert the destination...
+  */
+
+  if (*num_dests == 0)
+    insert = 0;
+  else
+  {
+    insert = cups_find_dest(name, instance, *num_dests, *dests, *num_dests - 1,
+                            &diff);
+
+    if (diff > 0)
+      insert ++;
+  }
+
+ /*
+  * Move the array elements as needed...
+  */
+
+  if (insert < *num_dests)
+    memmove(*dests + insert + 1, *dests + insert,
+            (*num_dests - insert) * sizeof(cups_dest_t));
+
+  (*num_dests) ++;
+
+ /*
+  * Initialize the destination...
+  */
+
+  dest              = *dests + insert;
+  dest->name        = _cupsStrAlloc(name);
+  dest->instance    = _cupsStrAlloc(instance);
+  dest->is_default  = 0;
+  dest->num_options = 0;
+  dest->options     = (cups_option_t *)0;
+
+  return (dest);
+}
 
+
+/*
+ * 'cups_compare_dests()' - Compare two destinations.
+ */
+
+static int                             /* O - Result of comparison */
+cups_compare_dests(cups_dest_t *a,     /* I - First destination */
+                   cups_dest_t *b)     /* I - Second destination */
+{
+  int  diff;                           /* Difference */
+
+
+  if ((diff = strcasecmp(a->name, b->name)) != 0)
+    return (diff);
+  else if (a->instance && b->instance)
+    return (strcasecmp(a->instance, b->instance));
+  else
+    return ((a->instance && !b->instance) - (!a->instance && b->instance));
+}
+
+
+/*
+ * 'cups_find_dest()' - Find a destination using a binary search.
+ */
+
+static int                             /* O - Index of match */
+cups_find_dest(const char  *name,      /* I - Destination name */
+               const char  *instance,  /* I - Instance or NULL */
+               int         num_dests,  /* I - Number of destinations */
+              cups_dest_t *dests,      /* I - Destinations */
+              int         prev,        /* I - Previous index */
+              int         *rdiff)      /* O - Difference of match */
+{
+  int          left,                   /* Low mark for binary search */
+               right,                  /* High mark for binary search */
+               current,                /* Current index */
+               diff;                   /* Result of comparison */
+  cups_dest_t  key;                    /* Search key */
+
+
+  key.name     = (char *)name;
+  key.instance = (char *)instance;
+
+  if (prev >= 0)
+  {
    /*
-    * Skip leading whitespace...
+    * Start search on either side of previous...
     */
 
-    while (isspace(*lineptr & 255))
-      lineptr ++;
+    if ((diff = cups_compare_dests(&key, dests + prev)) == 0 ||
+        (diff < 0 && prev == 0) ||
+       (diff > 0 && prev == (num_dests - 1)))
+    {
+      *rdiff = diff;
+      return (prev);
+    }
+    else if (diff < 0)
+    {
+     /*
+      * Start with previous on right side...
+      */
+
+      left  = 0;
+      right = prev;
+    }
+    else
+    {
+     /*
+      * Start wih previous on left side...
+      */
+
+      left  = prev;
+      right = num_dests - 1;
+    }
+  }
+  else
+  {
+   /*
+    * Start search in the middle...
+    */
+
+    left  = 0;
+    right = num_dests - 1;
+  }
+
+  do
+  {
+    current = (left + right) / 2;
+    diff    = cups_compare_dests(&key, dests + current);
+
+    if (diff == 0)
+      break;
+    else if (diff < 0)
+      right = current;
+    else
+      left = current;
+  }
+  while ((right - left) > 1);
+
+  if (diff != 0)
+  {
+   /*
+    * Check the last 1 or 2 elements...
+    */
+
+    if ((diff = cups_compare_dests(&key, dests + left)) <= 0)
+      current = left;
+    else
+    {
+      diff    = cups_compare_dests(&key, dests + right);
+      current = right;
+    }
+  }
+
+ /*
+  * Return the closest destination and the difference...
+  */
+
+  *rdiff = diff;
+
+  return (current);
+}
+
+
+/*
+ * 'cups_get_default()' - Get the default destination from an lpoptions file.
+ */
+
+static char *                          /* O - Default destination or NULL */
+cups_get_default(const char *filename, /* I - File to read */
+                 char       *namebuf,  /* I - Name buffer */
+                size_t     namesize,   /* I - Size of name buffer */
+                const char **instance) /* I - Instance */
+{
+  cups_file_t  *fp;                    /* lpoptions file */
+  char         line[8192],             /* Line from file */
+               *value,                 /* Value for line */
+               *nameptr;               /* Pointer into name */
+  int          linenum;                /* Current line */  
+
+
+  *namebuf = '\0';
+
+  if ((fp = cupsFileOpen(filename, "r")) != NULL)
+  {
+    linenum  = 0;
+
+    while (cupsFileGetConf(fp, line, sizeof(line), &value, &linenum))
+    {
+      if (!strcasecmp(line, "default") && value)
+      {
+        strlcpy(namebuf, value, namesize);
+
+       if ((nameptr = strchr(namebuf, ' ')) != NULL)
+         *nameptr = '\0';
+       if ((nameptr = strchr(namebuf, '\t')) != NULL)
+         *nameptr = '\0';
+
+       if ((nameptr = strchr(namebuf, '/')) != NULL)
+         *nameptr++ = '\0';
+
+        *instance = nameptr;
+       break;
+      }
+    }
+
+    cupsFileClose(fp);
+  }
+
+  return (*namebuf ? namebuf : NULL);
+}
+
 
-    if (!*lineptr)
+/*
+ * 'cups_get_dests()' - Get destinations from a file.
+ */
+
+static int                             /* O - Number of destinations */
+cups_get_dests(
+    const char  *filename,             /* I - File to read from */
+    const char  *match_name,           /* I - Destination name we want */
+    const char  *match_inst,           /* I - Instance name we want */
+    int         user_default_set,      /* I - User default printer set? */
+    int         num_dests,             /* I - Number of destinations */
+    cups_dest_t **dests)               /* IO - Destinations */
+{
+  int          i;                      /* Looping var */
+  cups_dest_t  *dest;                  /* Current destination */
+  cups_file_t  *fp;                    /* File pointer */
+  char         line[8192],             /* Line from file */
+               *lineptr,               /* Pointer into line */
+               *name,                  /* Name of destination/option */
+               *instance;              /* Instance of destination */
+  int          linenum;                /* Current line number */
+
+
+  DEBUG_printf(("7cups_get_dests(filename=\"%s\", match_name=\"%s\", "
+                "match_inst=\"%s\", user_default_set=%d, num_dests=%d, "
+               "dests=%p)", filename, match_name, match_inst,
+               user_default_set, num_dests, dests));
+
+ /*
+  * Try to open the file...
+  */
+
+  if ((fp = cupsFileOpen(filename, "r")) == NULL)
+    return (num_dests);
+
+ /*
+  * Read each printer; each line looks like:
+  *
+  *    Dest name[/instance] options
+  *    Default name[/instance] options
+  */
+
+  linenum = 0;
+
+  while (cupsFileGetConf(fp, line, sizeof(line), &lineptr, &linenum))
+  {
+   /*
+    * See what type of line it is...
+    */
+
+    DEBUG_printf(("9cups_get_dests: linenum=%d line=\"%s\" lineptr=\"%s\"",
+                  linenum, line, lineptr));
+
+    if ((strcasecmp(line, "dest") && strcasecmp(line, "default")) || !lineptr)
+    {
+      DEBUG_puts("9cups_get_dests: Not a dest or default line...");
       continue;
+    }
 
     name = lineptr;
 
@@ -660,9 +1613,6 @@ cups_get_dests(const char  *filename,      /* I - File to read from */
     while (!isspace(*lineptr & 255) && *lineptr && *lineptr != '/')
       lineptr ++;
 
-    if (!*lineptr)
-      continue;
-
     if (*lineptr == '/')
     {
      /*
@@ -682,30 +1632,49 @@ cups_get_dests(const char  *filename,    /* I - File to read from */
     else
       instance = NULL;
 
-    *lineptr++ = '\0';
+    if (*lineptr)
+      *lineptr++ = '\0';
+
+    DEBUG_printf(("9cups_get_dests: name=\"%s\", instance=\"%s\"", name,
+                  instance));
 
    /*
     * See if the primary instance of the destination exists; if not,
     * ignore this entry and move on...
     */
 
-    if (cupsGetDest(name, NULL, num_dests, *dests) == NULL)
-      continue;
-
-   /*
-    * Add the destination...
-    */
-
-    num_dests = cupsAddDest(name, instance, num_dests, dests);
+    if (match_name)
+    {
+      if (strcasecmp(name, match_name) ||
+          (!instance && match_inst) ||
+         (instance && !match_inst) ||
+         (instance && strcasecmp(instance, match_inst)))
+       continue;
 
-    if ((dest = cupsGetDest(name, instance, num_dests, *dests)) == NULL)
+      dest = *dests;
+    }
+    else if (cupsGetDest(name, NULL, num_dests, *dests) == NULL)
+    {
+      DEBUG_puts("9cups_get_dests: Not found!");
+      continue;
+    }
+    else
     {
      /*
-      * Out of memory!
+      * Add the destination...
       */
 
-      fclose(fp);
-      return (num_dests);
+      num_dests = cupsAddDest(name, instance, num_dests, dests);
+
+      if ((dest = cupsGetDest(name, instance, num_dests, *dests)) == NULL)
+      {
+       /*
+       * Out of memory!
+       */
+
+        DEBUG_puts("9cups_get_dests: Out of memory!");
+        break;
+      }
     }
 
    /*
@@ -715,12 +1684,21 @@ cups_get_dests(const char  *filename,    /* I - File to read from */
     dest->num_options = cupsParseOptions(lineptr, dest->num_options,
                                          &(dest->options));
 
+   /*
+    * If we found what we were looking for, stop now...
+    */
+
+    if (match_name)
+      break;
+
    /*
     * Set this as default if needed...
     */
 
-    if (strncasecmp(line, "default", 7) == 0 && printer == NULL)
+    if (!user_default_set && !strcasecmp(line, "default"))
     {
+      DEBUG_puts("9cups_get_dests: Setting as default...");
+
       for (i = 0; i < num_dests; i ++)
         (*dests)[i].is_default = 0;
 
@@ -732,7 +1710,7 @@ cups_get_dests(const char  *filename,      /* I - File to read from */
   * Close the file and return...
   */
 
-  fclose(fp);      
+  cupsFileClose(fp);      
 
   return (num_dests);
 }
@@ -743,50 +1721,74 @@ cups_get_dests(const char  *filename,    /* I - File to read from */
  */
 
 static int                             /* O - Number of destinations */
-cups_get_sdests(http_t      *http,     /* I - HTTP connection */
-                ipp_op_t    op,                /* I - get-printers or get-classes */
+cups_get_sdests(http_t      *http,     /* I - Connection to server or CUPS_HTTP_DEFAULT */
+                ipp_op_t    op,                /* I - IPP operation */
+               const char  *name,      /* I - Name of destination */
                 int         num_dests, /* I - Number of destinations */
                 cups_dest_t **dests)   /* IO - Destinations */
 {
-  int          i;                      /* Looping var */
   cups_dest_t  *dest;                  /* Current destination */
   ipp_t                *request,               /* IPP Request */
                *response;              /* IPP Response */
   ipp_attribute_t *attr;               /* Current attribute */
-  int          accepting,              /* printer-is-accepting-jobs attribute */
-               shared,                 /* printer-is-shared attribute */
-               state,                  /* printer-state attribute */
-               change_time,            /* printer-state-change-time attribute */
-               type;                   /* printer-type attribute */
-  const char   *info,                  /* printer-info attribute */
-               *make_model,            /* printer-make-and-model attribute */
-               *name;                  /* printer-name attribute */
-  char         job_sheets[1024],       /* job-sheets option */
-               reasons[1024],          /* printer-state-reasons attribute */
-               *rptr,                  /* Pointer into reasons string */
-               temp[255];              /* Temporary string for numbers */
+  const char   *printer_name;          /* printer-name attribute */
+  char         uri[1024];              /* printer-uri value */
+  int          num_options;            /* Number of options */
+  cups_option_t        *options;               /* Options */
+#ifdef __APPLE__
+  char         media_default[41];      /* Default paper size */
+#endif /* __APPLE__ */
+  char         optname[1024],          /* Option name */
+               value[2048],            /* Option value */
+               *ptr;                   /* Pointer into name/value */
   static const char * const pattrs[] = /* Attributes we're interested in */
                {
+                 "auth-info-required",
+                 "device-uri",
                  "job-sheets-default",
+                 "marker-change-time",
+                 "marker-colors",
+                 "marker-high-levels",
+                 "marker-levels",
+                 "marker-low-levels",
+                 "marker-message",
+                 "marker-names",
+                 "marker-types",
+#ifdef __APPLE__
+                 "media-supported",
+#endif /* __APPLE__ */
+                 "printer-commands",
+                 "printer-defaults",
                  "printer-info",
                  "printer-is-accepting-jobs",
                  "printer-is-shared",
+                 "printer-location",
                  "printer-make-and-model",
                  "printer-name",
                  "printer-state",
                  "printer-state-change-time",
                  "printer-state-reasons",
-                 "printer-type"
+                 "printer-type",
+                 "printer-uri-supported"
                };
 
 
+#ifdef __APPLE__
  /*
-  * Build a CUPS_GET_PRINTERS or CUPS_GET_CLASSES request, which require
-  * the following attributes:
+  * Get the default paper size...
+  */
+
+  appleGetPaperSize(media_default, sizeof(media_default));
+#endif /* __APPLE__ */
+
+ /*
+  * Build a CUPS_GET_PRINTERS or IPP_GET_PRINTER_ATTRIBUTES request, which
+  * require the following attributes:
   *
   *    attributes-charset
   *    attributes-natural-language
   *    requesting-user-name
+  *    printer-uri [for IPP_GET_PRINTER_ATTRIBUTES]
   */
 
   request = ippNewRequest(op);
@@ -798,6 +1800,14 @@ cups_get_sdests(http_t      *http,        /* I - HTTP connection */
   ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME,
                "requesting-user-name", NULL, cupsUser());
 
+  if (name)
+  {
+    httpAssembleURIf(HTTP_URI_CODING_ALL, uri, sizeof(uri), "ipp", NULL,
+                     "localhost", ippPort(), "/printers/%s", name);
+    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri", NULL,
+                 uri);
+  }
+
  /*
   * Do the request and get back a response...
   */
@@ -817,139 +1827,125 @@ cups_get_sdests(http_t      *http,     /* I - HTTP connection */
         break;
 
      /*
-      * Pull the needed attributes from this job...
+      * Pull the needed attributes from this printer...
       */
 
-      accepting   = 0;
-      change_time = 0;
-      info        = NULL;
-      make_model  = NULL;
-      name        = NULL;
-      shared      = 1;
-      state       = IPP_PRINTER_IDLE;
-      type        = CUPS_PRINTER_LOCAL;
-
-      strcpy(job_sheets, "");
-      strcpy(reasons, "");
+      printer_name = NULL;
+      num_options  = 0;
+      options      = NULL;
 
-      while (attr != NULL && attr->group_tag == IPP_TAG_PRINTER)
+      for (; attr && attr->group_tag == IPP_TAG_PRINTER; attr = attr->next)
       {
-        if (!strcmp(attr->name, "job-sheets-default") &&
-           (attr->value_tag == IPP_TAG_KEYWORD ||
-            attr->value_tag == IPP_TAG_NAME))
+       if (attr->value_tag != IPP_TAG_INTEGER &&
+           attr->value_tag != IPP_TAG_ENUM &&
+           attr->value_tag != IPP_TAG_BOOLEAN &&
+           attr->value_tag != IPP_TAG_TEXT &&
+           attr->value_tag != IPP_TAG_TEXTLANG &&
+           attr->value_tag != IPP_TAG_NAME &&
+           attr->value_tag != IPP_TAG_NAMELANG &&
+           attr->value_tag != IPP_TAG_KEYWORD &&
+           attr->value_tag != IPP_TAG_RANGE &&
+           attr->value_tag != IPP_TAG_URI)
+          continue;
+
+        if (!strcmp(attr->name, "auth-info-required") ||
+           !strcmp(attr->name, "device-uri") ||
+           !strcmp(attr->name, "marker-change-time") ||
+           !strcmp(attr->name, "marker-colors") ||
+           !strcmp(attr->name, "marker-high-levels") ||
+           !strcmp(attr->name, "marker-levels") ||
+           !strcmp(attr->name, "marker-low-levels") ||
+           !strcmp(attr->name, "marker-message") ||
+           !strcmp(attr->name, "marker-names") ||
+           !strcmp(attr->name, "marker-types") ||
+           !strcmp(attr->name, "printer-commands") ||
+           !strcmp(attr->name, "printer-info") ||
+           !strcmp(attr->name, "printer-is-shared") ||
+           !strcmp(attr->name, "printer-make-and-model") ||
+           !strcmp(attr->name, "printer-state") ||
+           !strcmp(attr->name, "printer-state-change-time") ||
+           !strcmp(attr->name, "printer-type") ||
+            !strcmp(attr->name, "printer-is-accepting-jobs") ||
+            !strcmp(attr->name, "printer-location") ||
+            !strcmp(attr->name, "printer-state-reasons") ||
+           !strcmp(attr->name, "printer-uri-supported"))
         {
-         if (attr->num_values == 2)
-           snprintf(job_sheets, sizeof(job_sheets), "%s,%s",
-                    attr->values[0].string.text, attr->values[1].string.text);
-         else
-           strlcpy(job_sheets, attr->values[0].string.text,
-                   sizeof(job_sheets));
-        }
-        else if (!strcmp(attr->name, "printer-info") &&
-                attr->value_tag == IPP_TAG_TEXT)
-         info = attr->values[0].string.text;
-       else if (!strcmp(attr->name, "printer-is-accepting-jobs") &&
-                attr->value_tag == IPP_TAG_BOOLEAN)
-          accepting = attr->values[0].boolean;
-       else if (!strcmp(attr->name, "printer-is-shared") &&
-                attr->value_tag == IPP_TAG_BOOLEAN)
-          shared = attr->values[0].boolean;
-        else if (!strcmp(attr->name, "printer-make-and-model") &&
-                attr->value_tag == IPP_TAG_TEXT)
-         make_model = attr->values[0].string.text;
+        /*
+         * Add a printer description attribute...
+         */
+
+          num_options = cupsAddOption(attr->name,
+                                     cups_make_string(attr, value,
+                                                      sizeof(value)),
+                                     num_options, &options);
+       }
+#ifdef __APPLE__
+       else if (!strcmp(attr->name, "media-supported"))
+       {
+        /*
+         * See if we can set a default media size...
+         */
+
+          int  i;                      /* Looping var */
+
+         for (i = 0; i < attr->num_values; i ++)
+           if (!strcasecmp(media_default, attr->values[i].string.text))
+           {
+             num_options = cupsAddOption("media", media_default, num_options,
+                                         &options);
+              break;
+           }
+       }
+#endif /* __APPLE__ */
         else if (!strcmp(attr->name, "printer-name") &&
                 attr->value_tag == IPP_TAG_NAME)
-         name = attr->values[0].string.text;
-       else if (!strcmp(attr->name, "printer-state") &&
-                attr->value_tag == IPP_TAG_ENUM)
-          state = attr->values[0].integer;
-       else if (!strcmp(attr->name, "printer-state-change-time") &&
-                attr->value_tag == IPP_TAG_INTEGER)
-          change_time = attr->values[0].integer;
-        else if (!strcmp(attr->name, "printer-state-reasons") &&
-                attr->value_tag == IPP_TAG_KEYWORD)
+         printer_name = attr->values[0].string.text;
+        else if (strncmp(attr->name, "notify-", 7) &&
+                (attr->value_tag == IPP_TAG_BOOLEAN ||
+                 attr->value_tag == IPP_TAG_ENUM ||
+                 attr->value_tag == IPP_TAG_INTEGER ||
+                 attr->value_tag == IPP_TAG_KEYWORD ||
+                 attr->value_tag == IPP_TAG_NAME ||
+                 attr->value_tag == IPP_TAG_RANGE) &&
+                (ptr = strstr(attr->name, "-default")) != NULL)
        {
-         strlcpy(reasons, attr->values[0].string.text, sizeof(reasons));
-         for (i = 1, rptr = reasons + strlen(reasons);
-              i < attr->num_values;
-              i ++)
-         {
-           snprintf(rptr, sizeof(reasons) - (rptr - reasons), ",%s",
-                    attr->values[i].string.text);
-           rptr += strlen(rptr);
-         }
+        /*
+         * Add a default option...
+         */
+
+          strlcpy(optname, attr->name, sizeof(optname));
+         optname[ptr - attr->name] = '\0';
+
+         if (strcasecmp(optname, "media") ||
+             !cupsGetOption("media", num_options, options))
+           num_options = cupsAddOption(optname,
+                                       cups_make_string(attr, value,
+                                                        sizeof(value)),
+                                       num_options, &options);
        }
-       else if (!strcmp(attr->name, "printer-type") &&
-                attr->value_tag == IPP_TAG_ENUM)
-          type = attr->values[0].integer;
-
-        attr = attr->next;
       }
 
      /*
       * See if we have everything needed...
       */
 
-      if (!name)
+      if (!printer_name)
       {
+        cupsFreeOptions(num_options, options);
+
         if (attr == NULL)
          break;
        else
           continue;
       }
 
-      num_dests = cupsAddDest(name, NULL, num_dests, dests);
-
-      if ((dest = cupsGetDest(name, NULL, num_dests, *dests)) != NULL)
+      if ((dest = cups_add_dest(printer_name, NULL, &num_dests, dests)) != NULL)
       {
-        if (job_sheets[0])
-          dest->num_options = cupsAddOption("job-sheets", job_sheets,
-                                           dest->num_options,
-                                           &(dest->options));
-
-        if (info)
-          dest->num_options = cupsAddOption("printer-info", info,
-                                           dest->num_options,
-                                           &(dest->options));
-
-        sprintf(temp, "%d", accepting);
-       dest->num_options = cupsAddOption("printer-is-accepting-jobs", temp,
-                                         dest->num_options,
-                                         &(dest->options));
-
-        sprintf(temp, "%d", shared);
-       dest->num_options = cupsAddOption("printer-is-shared", temp,
-                                         dest->num_options,
-                                         &(dest->options));
-
-        if (make_model)
-          dest->num_options = cupsAddOption("printer-make-and-model",
-                                           make_model, dest->num_options,
-                                           &(dest->options));
-
-        sprintf(temp, "%d", state);
-       dest->num_options = cupsAddOption("printer-state", temp,
-                                         dest->num_options,
-                                         &(dest->options));
-
-        if (change_time)
-       {
-         sprintf(temp, "%d", change_time);
-         dest->num_options = cupsAddOption("printer-state-change-time", temp,
-                                           dest->num_options,
-                                           &(dest->options));
-        }
-
-        if (reasons[0])
-          dest->num_options = cupsAddOption("printer-state-reasons", reasons,
-                                           dest->num_options,
-                                           &(dest->options));
-
-        sprintf(temp, "%d", type);
-       dest->num_options = cupsAddOption("printer-type", temp,
-                                         dest->num_options,
-                                         &(dest->options));
+        dest->num_options = num_options;
+       dest->options     = options;
       }
+      else
+        cupsFreeOptions(num_options, options);
 
       if (attr == NULL)
        break;
@@ -967,5 +1963,95 @@ cups_get_sdests(http_t      *http,        /* I - HTTP connection */
 
 
 /*
- * End of "$Id: dest.c 4979 2006-01-25 17:47:43Z mike $".
+ * 'cups_make_string()' - Make a comma-separated string of values from an IPP
+ *                        attribute.
+ */
+
+static char *                          /* O - New string */
+cups_make_string(
+    ipp_attribute_t *attr,             /* I - Attribute to convert */
+    char            *buffer,           /* I - Buffer */
+    size_t          bufsize)           /* I - Size of buffer */
+{
+  int          i;                      /* Looping var */
+  char         *ptr,                   /* Pointer into buffer */
+               *end,                   /* Pointer to end of buffer */
+               *valptr;                /* Pointer into string attribute */
+
+
+ /*
+  * Return quickly if we have a single string value...
+  */
+
+  if (attr->num_values == 1 &&
+      attr->value_tag != IPP_TAG_INTEGER &&
+      attr->value_tag != IPP_TAG_ENUM &&
+      attr->value_tag != IPP_TAG_BOOLEAN &&
+      attr->value_tag != IPP_TAG_RANGE)
+    return (attr->values[0].string.text);
+
+ /*
+  * Copy the values to the string, separating with commas and escaping strings
+  * as needed...
+  */
+
+  end = buffer + bufsize - 1;
+
+  for (i = 0, ptr = buffer; i < attr->num_values && ptr < end; i ++)
+  {
+    if (i)
+      *ptr++ = ',';
+
+    switch (attr->value_tag)
+    {
+      case IPP_TAG_INTEGER :
+      case IPP_TAG_ENUM :
+         snprintf(ptr, end - ptr + 1, "%d", attr->values[i].integer);
+         break;
+
+      case IPP_TAG_BOOLEAN :
+         if (attr->values[i].boolean)
+           strlcpy(ptr, "true", end - ptr + 1);
+         else
+           strlcpy(ptr, "false", end - ptr + 1);
+         break;
+
+      case IPP_TAG_RANGE :
+         if (attr->values[i].range.lower == attr->values[i].range.upper)
+           snprintf(ptr, end - ptr + 1, "%d", attr->values[i].range.lower);
+         else
+           snprintf(ptr, end - ptr + 1, "%d-%d", attr->values[i].range.lower,
+                    attr->values[i].range.upper);
+         break;
+
+      default :
+         for (valptr = attr->values[i].string.text;
+              *valptr && ptr < end;)
+         {
+           if (strchr(" \t\n\\\'\"", *valptr))
+           {
+             if (ptr >= (end - 1))
+               break;
+
+             *ptr++ = '\\';
+           }
+
+           *ptr++ = *valptr++;
+         }
+
+         *ptr = '\0';
+         break;
+    }
+
+    ptr += strlen(ptr);
+  }
+
+  *ptr = '\0';
+
+  return (buffer);
+}
+
+
+/*
+ * End of "$Id: dest.c 7946 2008-09-16 23:27:54Z mike $".
  */