]> 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 d2a9b346238089e85aa00f815f10fb7d15cfaf59..4aedcb216bc7cc3528e02841d7d21f3ed4532fab 100644 (file)
@@ -1,10 +1,10 @@
 /*
- * "$Id: dest.c 7460 2008-04-16 02:19:54Z 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 2007-2008 by Apple Inc.
+ *   Copyright 2007-2009 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
  *                           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.
- *   appleGetLocations()   - Get the location history array.
+ *   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.
  */
 
 /*
@@ -48,6 +54,7 @@
 
 #include "debug.h"
 #include "globals.h"
+#include "pwgmedia.h"
 #include <stdlib.h>
 #include <ctype.h>
 #include <sys/stat.h>
@@ -60,6 +67,7 @@
 #  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")
  */
 
 #ifdef __APPLE__
+static CFArrayRef appleCopyLocations(void);
 static CFStringRef appleCopyNetwork(void);
-static char    *appleGetDefault(char *name, int namesize);
-static CFArrayRef appleGetLocations(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);
+                                 size_t namesize, const char **instance);
 static int     cups_get_dests(const char *filename, const char *match_name,
-                              const char *match_inst, int num_dests,
-                              cups_dest_t **dests);
+                              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);
 
 
 /*
@@ -113,78 +129,47 @@ cupsAddDest(const char  *name,            /* I  - Destination name */
 {
   int          i;                      /* Looping var */
   cups_dest_t  *dest;                  /* Destination pointer */
-  cups_dest_t  *parent;                /* Parent destination */
-  cups_option_t        *option;                /* Current option */
+  cups_dest_t  *parent = NULL;         /* Parent destination */
+  cups_option_t        *doption,               /* Current destination option */
+               *poption;               /* Current parent option */
 
 
   if (!name || !dests)
     return (0);
 
-  if (cupsGetDest(name, instance, num_dests, *dests))
-    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);
-
-  *dests = dest;
-
- /*
-  * Find where to insert the destination...
-  */
-
-  for (i = num_dests; i > 0; i --, dest ++)
-    if (strcasecmp(name, dest->name) < 0)
-      break;
-    else if (!instance && dest->instance)
-      break;
-    else if (!strcasecmp(name, dest->name) &&
-             instance  && dest->instance &&
-             strcasecmp(instance, dest->instance) < 0)
-      break;
-
-  if (i > 0)
-    memmove(dest + 1, dest, i * sizeof(cups_dest_t));
+  if (!cupsGetDest(name, instance, num_dests, *dests))
+  {
+    if (instance &&
+        (parent = cupsGetDest(name, NULL, num_dests, *dests)) == NULL)
+      return (num_dests);
 
- /*
-  * Initialize the destination...
-  */
+    dest = cups_add_dest(name, instance, &num_dests, dests);
 
-  dest->name        = _cupsStrAlloc(name);
-  dest->is_default  = 0;
-  dest->num_options = 0;
-  dest->options     = (cups_option_t *)0;
+    if (instance && parent && parent->num_options > 0)
+    {
+     /*
+      * Copy options from parent...
+      */
 
-  if (!instance)
-    dest->instance = NULL;
-  else
-  {
-   /*
-    * Copy options from the primary instance...
-    */
+      dest->options = calloc(sizeof(cups_option_t), parent->num_options);
 
-    dest->instance = _cupsStrAlloc(instance);
+      if (dest->options)
+      {
+        dest->num_options = parent->num_options;
 
-    if ((parent = cupsGetDest(name, NULL, num_dests + 1, *dests)) != NULL)
-    {
-      for (i = parent->num_options, option = parent->options;
-           i > 0;
-          i --, option ++)
-       dest->num_options = cupsAddOption(option->name, option->value,
-                                         dest->num_options,
-                                         &(dest->options));
+       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);
 }
 
 
@@ -228,7 +213,8 @@ cupsGetDest(const char  *name,              /* I - Destination name or @code NULL@ for the d
             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)
@@ -255,21 +241,10 @@ cupsGetDest(const char  *name,            /* I - Destination name or @code NULL@ for the d
     * 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 && !dests->instance) ||
-            (instance != NULL && dests->instance != NULL &&
-            !strcasecmp(instance, dests->instance)))
-         return (dests);
-      }
+    match = cups_find_dest(name, instance, num_dests, dests, -1, &diff);
 
-      num_dests --;
-      dests ++;
-    }
+    if (!diff)
+      return (dests + match);
   }
 
   return (NULL);
@@ -282,7 +257,10 @@ cupsGetDest(const char  *name,             /* I - Destination name or @code NULL@ for the d
  * 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.
+ * 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.
@@ -301,12 +279,15 @@ cupsGetDests(cups_dest_t **dests) /* O - Destinations */
  * 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.
+ * 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@
+ * @since CUPS 1.1.21/Mac OS X 10.4@
  */
 
 int                                    /* O - Number of destinations */
@@ -320,7 +301,8 @@ cupsGetDests2(http_t      *http,    /* I - Connection to server or @code CUPS_HTTP_
   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();        /* Pointer to library globals */
@@ -331,7 +313,10 @@ cupsGetDests2(http_t      *http,   /* I - Connection to server or @code CUPS_HTTP_
   */
 
   if (!dests)
+  {
+    _cupsSetError(IPP_INTERNAL_ERROR, _("Bad NULL dests pointer"), 1);
     return (0);
+  }
 
  /*
   * Initialize destination array...
@@ -345,7 +330,13 @@ cupsGetDests2(http_t      *http,   /* I - Connection to server or @code CUPS_HTTP_
   */
 
   num_dests = cups_get_sdests(http, CUPS_GET_PRINTERS, NULL, num_dests, dests);
-  num_dests = cups_get_sdests(http, CUPS_GET_CLASSES, 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...
@@ -371,22 +362,20 @@ cupsGetDests2(http_t      *http,  /* I - Connection to server or @code CUPS_HTTP_
   * Grab the default destination...
   */
 
-#ifdef __APPLE__
-  if ((defprinter = appleGetDefault(name, sizeof(name))) == NULL)
-#endif /* __APPLE__ */
-  defprinter = cupsGetDefault2(http);
+  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...
     */
 
-#ifdef __APPLE__
-    if (name != defprinter)
-#endif /* __APPLE__ */
-    strlcpy(name, defprinter, sizeof(name));
-
     if ((instance = strchr(name, '/')) != NULL)
       *instance++ = '\0';
 
@@ -398,21 +387,15 @@ cupsGetDests2(http_t      *http,  /* I - Connection to server or @code CUPS_HTTP_
       dest->is_default = 1;
   }
   else
-  {
-   /*
-    * This initialization of "instance" is unnecessary, but avoids a
-    * compiler warning...
-    */
-
     instance = NULL;
-  }
 
  /*
   * Load the /etc/cups/lpoptions and ~/.cups/lpoptions files...
   */
 
   snprintf(filename, sizeof(filename), "%s/lpoptions", cg->cups_serverroot);
-  num_dests = cups_get_dests(filename, NULL, NULL, num_dests, dests);
+  num_dests = cups_get_dests(filename, NULL, NULL, user_default != NULL,
+                             num_dests, dests);
 
   if ((home = getenv("HOME")) != NULL)
   {
@@ -420,7 +403,8 @@ cupsGetDests2(http_t      *http,    /* I - Connection to server or @code CUPS_HTTP_
     if (access(filename, 0))
       snprintf(filename, sizeof(filename), "%s/.lpoptions", home);
 
-    num_dests = cups_get_dests(filename, NULL, NULL, num_dests, dests);
+    num_dests = cups_get_dests(filename, NULL, NULL, user_default != NULL,
+                               num_dests, dests);
   }
 
  /*
@@ -469,6 +453,9 @@ cupsGetDests2(http_t      *http,    /* I - Connection to server or @code CUPS_HTTP_
   * Return the number of destinations...
   */
 
+  if (num_dests > 0)
+    _cupsSetError(IPP_OK, NULL, 0);
+
   return (num_dests);
 }
 
@@ -491,7 +478,7 @@ cupsGetDests2(http_t      *http,    /* I - Connection to server or @code CUPS_HTTP_
  * The returned destination must be freed using @link cupsFreeDests@ with a
  * "num_dests" value of 1.
  *
- * @since CUPS 1.4@
+ * @since CUPS 1.4/Mac OS X 10.6@
  */
 
 cups_dest_t *                          /* O - Destination or @code NULL@ */
@@ -503,6 +490,7 @@ cupsGetNamedDest(http_t     *http,  /* I - Connection to server or @code CUPS_HTT
   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 */
@@ -514,9 +502,8 @@ cupsGetNamedDest(http_t     *http,  /* I - Connection to server or @code CUPS_HTT
 
   if (!name)
   {
-    if ((name = getenv("LPDEST")) == NULL)
-      if ((name = getenv("PRINTER")) != NULL && !strcmp(name, "lp"))
-        name = NULL;
+    set_as_default = 1;
+    name           = _cupsUserDefault(defname, sizeof(defname));
 
     if (!name && home)
     {
@@ -561,17 +548,31 @@ cupsGetNamedDest(http_t     *http,        /* I - Connection to server or @code CUPS_HTT
   */
 
   if (!cups_get_sdests(http, op, name, 0, &dest))
-    return (NULL);
+  {
+    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, &dest);
+  cups_get_dests(filename, name, instance, 1, 1, &dest);
 
   if (home)
   {
@@ -580,7 +581,7 @@ cupsGetNamedDest(http_t     *http,  /* I - Connection to server or @code CUPS_HTT
     if (access(filename, 0))
       snprintf(filename, sizeof(filename), "%s/.lpoptions", home);
 
-    cups_get_dests(filename, name, instance, 1, &dest);
+    cups_get_dests(filename, name, instance, 1, 1, &dest);
   }
 
  /*
@@ -599,7 +600,7 @@ cupsGetNamedDest(http_t     *http,  /* I - Connection to server or @code CUPS_HTT
  * @link cupsSetDests@ or @link cupsSetDests2@ functions to save the new
  * options for the user.
  *
- * @since CUPS 1.3@
+ * @since CUPS 1.3/Mac OS X 10.5@
  */
 
 int                                    /* O  - New number of destinations */
@@ -645,7 +646,7 @@ cupsRemoveDest(const char  *name,   /* I  - Destination name */
 /*
  * 'cupsSetDefaultDest()' - Set the default destination.
  *
- * @since CUPS 1.3@
+ * @since CUPS 1.3/Mac OS X 10.5@
  */
 
 void
@@ -700,7 +701,7 @@ cupsSetDests(int         num_dests, /* I - Number of destinations */
  * This function saves the destinations to /etc/cups/lpoptions when run
  * 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 */
@@ -737,7 +738,12 @@ cupsSetDests2(http_t      *http,   /* I - Connection to server or @code CUPS_HTTP_
   */
 
   num_temps = cups_get_sdests(http, CUPS_GET_PRINTERS, NULL, 0, &temps);
-  num_temps = cups_get_sdests(http, CUPS_GET_CLASSES, NULL, num_temps, &temps);
+
+  if (cupsLastError() >= IPP_REDIRECTION_OTHER_SITE)
+  {
+    cupsFreeDests(num_temps, temps);
+    return (-1);
+  }
 
  /*
   * Figure out which file to write to...
@@ -752,7 +758,7 @@ cupsSetDests2(http_t      *http,    /* I - Connection to server or @code CUPS_HTTP_
     * Merge in server defaults...
     */
 
-    num_temps = cups_get_dests(filename, NULL, NULL, num_temps, &temps);
+    num_temps = cups_get_dests(filename, NULL, NULL, 0, num_temps, &temps);
 
    /*
     * Point to user defaults...
@@ -928,58 +934,34 @@ cupsSetDests2(http_t      *http,  /* I - Connection to server or @code CUPS_HTTP_
 }
 
 
-#ifdef __APPLE__
 /*
- * 'appleCopyNetwork()' - Get the network ID for the current location.
+ * '_cupsUserDefault()' - Get the user default printer from environment
+ *                        variables and location information.
  */
 
-static CFStringRef                     /* O - Network ID */
-appleCopyNetwork(void)
+char *                                 /* O - Default printer or NULL */
+_cupsUserDefault(char   *name,         /* I - Name buffer */
+                 size_t namesize)      /* I - Size of name buffer */
 {
-  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);
+  const char   *env;                   /* LPDEST or PRINTER env variable */
+#ifdef __APPLE__
+  CFStringRef  network;                /* Network location */
+  CFArrayRef   locations;              /* Location array */
+  CFStringRef  locprinter;             /* Current printer */
+#endif /* __APPLE__ */
 
-        CFRelease(ip_dict);
-      }
 
-      CFRelease(key);
-    }
+  if ((env = getenv("LPDEST")) == NULL)
+    if ((env = getenv("PRINTER")) != NULL && !strcmp(env, "lp"))
+      env = NULL;
 
-    CFRelease(dynamicStore);
+  if (env)
+  {
+    strlcpy(name, env, namesize);
+    return (name);
   }
 
-  return (network);
-}
-
-
-/*
- * 'appleGetDefault()' - Get the default printer for this location.
- */
-
-static char *                          /* O - Name or NULL if no default */
-appleGetDefault(char *name,            /* I - Name buffer */
-                int  namesize)         /* I - Size of name buffer */
-{
-  CFStringRef          network;        /* Network location */
-  CFArrayRef           locations;      /* Location array */
-  CFStringRef          locprinter;     /* Current printer */
-
-
+#ifdef __APPLE__
  /*
   * Use location-based defaults if "use last printer" is selected in the
   * system preferences...
@@ -987,7 +969,8 @@ appleGetDefault(char *name,         /* I - Name buffer */
 
   if (!appleUseLastPrinter())
   {
-    DEBUG_puts("appleGetDefault: Not using last printer as default...");
+    DEBUG_puts("1_cupsUserDefault: Not using last printer as default...");
+    name[0] = '\0';
     return (NULL);
   }
 
@@ -997,33 +980,35 @@ appleGetDefault(char *name,               /* I - Name buffer */
 
   if ((network = appleCopyNetwork()) == NULL)
   {
-    DEBUG_puts("appleGetDefault: Unable to get current network...");
+    DEBUG_puts("1_cupsUserDefault: Unable to get current network...");
+    name[0] = '\0';
     return (NULL);
   }
 
-#ifdef DEBUG
+#  ifdef DEBUG
   CFStringGetCString(network, name, namesize, kCFStringEncodingUTF8);
-  DEBUG_printf(("appleGetDefault: network=\"%s\"\n", name));
-#endif /* DEBUG */
+  DEBUG_printf(("2_cupsUserDefault: network=\"%s\"", name));
+#  endif /* DEBUG */
 
  /*
   * Lookup the network in the preferences...
   */
 
-  if ((locations = appleGetLocations()) == NULL)
+  if ((locations = appleCopyLocations()) == NULL)
   {
    /*
     * Missing or bad location array, so no location-based default...
     */
 
-    DEBUG_puts("appleGetDefault: Missing or bad location history array...");
+    DEBUG_puts("1_cupsUserDefault: Missing or bad location history array...");
 
     CFRelease(network);
 
+    name[0] = '\0';
     return (NULL);
   }
   
-  DEBUG_printf(("appleGetDefault: Got location, %d entries...\n",
+  DEBUG_printf(("2_cupsUserDefault: Got location, %d entries...",
                 (int)CFArrayGetCount(locations)));
 
   if ((locprinter = appleGetPrinter(locations, network, NULL)) != NULL)
@@ -1032,19 +1017,30 @@ appleGetDefault(char *name,             /* I - Name buffer */
     name[0] = '\0';
 
   CFRelease(network);
+  CFRelease(locations);
 
-  DEBUG_printf(("appleGetDefault: Returning \"%s\"...\n", name));
+  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__
 /*
- * 'appleGetLocations()' - Get the location history array.
+ * 'appleCopyLocations()' - Copy the location history array.
  */
 
 static CFArrayRef                      /* O - Location array or NULL */
-appleGetLocations(void)
+appleCopyLocations(void)
 {
   CFArrayRef   locations;              /* Location array */
 
@@ -1067,6 +1063,73 @@ appleGetLocations(void)
 }
 
 
+/*
+ * '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.
  */
@@ -1128,7 +1191,7 @@ appleSetDefault(const char *name) /* I - Default printer/class name */
 
   if ((network = appleCopyNetwork()) == NULL)
   {
-    DEBUG_puts("appleSetDefault: Unable to get current network...");
+    DEBUG_puts("1appleSetDefault: Unable to get current network...");
     return;
   }
 
@@ -1143,7 +1206,7 @@ appleSetDefault(const char *name) /* I - Default printer/class name */
   * Lookup the network in the preferences...
   */
 
-  if ((locations = appleGetLocations()) != NULL)
+  if ((locations = appleCopyLocations()) != NULL)
     locprinter = appleGetPrinter(locations, network, &locindex);
   else
   {
@@ -1197,6 +1260,7 @@ appleSetDefault(const char *name) /* I - Default printer/class name */
       CFPreferencesSetAppValue(kLocationHistoryArrayKey, newlocations,
                                kPMPrintingPreferences);
       CFPreferencesAppSynchronize(kPMPrintingPreferences);
+      notify_post("com.apple.printerPrefsChange");
     }
 
     if (newlocations)
@@ -1206,6 +1270,9 @@ appleSetDefault(const char *name) /* I - Default printer/class name */
       CFRelease(newlocation);
   }
 
+  if (locations)
+    CFRelease(locations);
+
   CFRelease(network);
   CFRelease(newprinter);
 }
@@ -1235,6 +1302,200 @@ appleUseLastPrinter(void)
 #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)
+  {
+   /*
+    * Start search on either side of previous...
+    */
+
+    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.
  */
@@ -1289,11 +1550,13 @@ cups_get_default(const char *filename,  /* I - File to read */
  */
 
 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         num_dests,  /* I - Number of destinations */
-               cups_dest_t **dests)    /* IO - 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 */
@@ -1303,13 +1566,12 @@ cups_get_dests(const char  *filename,   /* I - File to read from */
                *name,                  /* Name of destination/option */
                *instance;              /* Instance of destination */
   int          linenum;                /* Current line number */
-  const char   *printer;               /* PRINTER or LPDEST */
 
 
-  DEBUG_printf(("cups_get_dests(filename=\"%s\", match_name=\"%s\", "
-                "match_inst=\"%s\", num_dests=%d, dests=%p)\n", filename,
-               match_name ? match_name : "(null)",
-               match_inst ? match_inst : "(null)", num_dests, dests));
+  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...
@@ -1318,18 +1580,6 @@ cups_get_dests(const char  *filename,    /* I - File to read from */
   if ((fp = cupsFileOpen(filename, "r")) == NULL)
     return (num_dests);
 
- /*
-  * Check environment variables...
-  */
-
-  if ((printer = getenv("LPDEST")) == NULL)
-    if ((printer = getenv("PRINTER")) != NULL)
-      if (strcmp(printer, "lp") == 0)
-        printer = NULL;
-
-  DEBUG_printf(("cups_get_dests: printer=\"%s\"\n",
-                printer ? printer : "(null)"));
-
  /*
   * Read each printer; each line looks like:
   *
@@ -1345,12 +1595,12 @@ cups_get_dests(const char  *filename,   /* I - File to read from */
     * See what type of line it is...
     */
 
-    DEBUG_printf(("cups_get_dests: linenum=%d line=\"%s\" lineptr=\"%s\"\n",
-                  linenum, line, lineptr ? lineptr : "(null)"));
+    DEBUG_printf(("9cups_get_dests: linenum=%d line=\"%s\" lineptr=\"%s\"",
+                  linenum, line, lineptr));
 
     if ((strcasecmp(line, "dest") && strcasecmp(line, "default")) || !lineptr)
     {
-      DEBUG_puts("cups_get_dests: Not a dest or default line...");
+      DEBUG_puts("9cups_get_dests: Not a dest or default line...");
       continue;
     }
 
@@ -1385,7 +1635,7 @@ cups_get_dests(const char  *filename,     /* I - File to read from */
     if (*lineptr)
       *lineptr++ = '\0';
 
-    DEBUG_printf(("cups_get_dests: name=\"%s\", instance=\"%s\"\n", name,
+    DEBUG_printf(("9cups_get_dests: name=\"%s\", instance=\"%s\"", name,
                   instance));
 
    /*
@@ -1405,7 +1655,7 @@ cups_get_dests(const char  *filename,     /* I - File to read from */
     }
     else if (cupsGetDest(name, NULL, num_dests, *dests) == NULL)
     {
-      DEBUG_puts("cups_get_dests: Not found!");
+      DEBUG_puts("9cups_get_dests: Not found!");
       continue;
     }
     else
@@ -1422,7 +1672,7 @@ cups_get_dests(const char  *filename,     /* I - File to read from */
        * Out of memory!
        */
 
-        DEBUG_puts("cups_get_dests: Out of memory!");
+        DEBUG_puts("9cups_get_dests: Out of memory!");
         break;
       }
     }
@@ -1445,9 +1695,9 @@ cups_get_dests(const char  *filename,     /* I - File to read from */
     * Set this as default if needed...
     */
 
-    if (!printer && !strcasecmp(line, "default"))
+    if (!user_default_set && !strcasecmp(line, "default"))
     {
-      DEBUG_puts("cups_get_dests: Setting as default...");
+      DEBUG_puts("9cups_get_dests: Setting as default...");
 
       for (i = 0; i < num_dests; i ++)
         (*dests)[i].is_default = 0;
@@ -1477,33 +1727,38 @@ cups_get_sdests(http_t      *http,      /* I - Connection to server or CUPS_HTTP_DEFA
                 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 */
-               *location,              /* printer-location attribute */
-               *make_model,            /* printer-make-and-model attribute */
-               *printer_name;          /* printer-name attribute */
-  char         uri[1024],              /* printer-uri value */
-               job_sheets[1024],       /* job-sheets-default attribute */
-               auth_info_req[1024],    /* auth-info-required attribute */
-               reasons[1024];          /* printer-state-reasons attribute */
+  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",
@@ -1514,17 +1769,26 @@ cups_get_sdests(http_t      *http,      /* I - Connection to server or CUPS_HTTP_DEFA
                  "printer-state-change-time",
                  "printer-state-reasons",
                  "printer-type",
-                 "printer-defaults"
+                 "printer-uri-supported"
                };
 
 
+#ifdef __APPLE__
+ /*
+  * Get the default paper size...
+  */
+
+  appleGetPaperSize(media_default, sizeof(media_default));
+#endif /* __APPLE__ */
+
  /*
-  * Build a CUPS_GET_PRINTERS or CUPS_GET_CLASSES request, which require
-  * the following attributes:
+  * 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);
@@ -1566,90 +1830,76 @@ cups_get_sdests(http_t      *http,      /* I - Connection to server or CUPS_HTTP_DEFA
       * Pull the needed attributes from this printer...
       */
 
-      accepting    = 0;
-      change_time  = 0;
-      info         = NULL;
-      location     = NULL;
-      make_model   = NULL;
       printer_name = NULL;
       num_options  = 0;
       options      = NULL;
-      shared       = 1;
-      state        = IPP_PRINTER_IDLE;
-      type         = CUPS_PRINTER_LOCAL;
-
-      auth_info_req[0] = '\0';
-      job_sheets[0]    = '\0';
-      reasons[0]       = '\0';
 
-      while (attr != NULL && attr->group_tag == IPP_TAG_PRINTER)
+      for (; attr && attr->group_tag == IPP_TAG_PRINTER; attr = attr->next)
       {
-        if (!strcmp(attr->name, "auth-info-required") &&
-           attr->value_tag == IPP_TAG_KEYWORD)
-        {
-         strlcpy(auth_info_req, attr->values[0].string.text,
-                 sizeof(auth_info_req));
+       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;
 
-         for (i = 1, ptr = auth_info_req + strlen(auth_info_req);
-              i < attr->num_values;
-              i ++)
-         {
-           snprintf(ptr, sizeof(auth_info_req) - (ptr - auth_info_req), ",%s",
-                    attr->values[i].string.text);
-           ptr += strlen(ptr);
-         }
-        }
-        else if (!strcmp(attr->name, "job-sheets-default") &&
-                (attr->value_tag == IPP_TAG_KEYWORD ||
-                 attr->value_tag == IPP_TAG_NAME))
+        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-location") &&
-                attr->value_tag == IPP_TAG_TEXT)
-         location = attr->values[0].string.text;
-        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)
          printer_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)
-       {
-         strlcpy(reasons, attr->values[0].string.text, sizeof(reasons));
-         for (i = 1, ptr = reasons + strlen(reasons);
-              i < attr->num_values;
-              i ++)
-         {
-           snprintf(ptr, sizeof(reasons) - (ptr - reasons), ",%s",
-                    attr->values[i].string.text);
-           ptr += strlen(ptr);
-         }
-       }
-       else if (!strcmp(attr->name, "printer-type") &&
-                attr->value_tag == IPP_TAG_ENUM)
-          type = attr->values[0].integer;
         else if (strncmp(attr->name, "notify-", 7) &&
                 (attr->value_tag == IPP_TAG_BOOLEAN ||
                  attr->value_tag == IPP_TAG_ENUM ||
@@ -1657,75 +1907,22 @@ cups_get_sdests(http_t      *http,      /* I - Connection to server or CUPS_HTTP_DEFA
                  attr->value_tag == IPP_TAG_KEYWORD ||
                  attr->value_tag == IPP_TAG_NAME ||
                  attr->value_tag == IPP_TAG_RANGE) &&
-                strstr(attr->name, "-default"))
+                (ptr = strstr(attr->name, "-default")) != NULL)
        {
-         char  *valptr;                /* Pointer into attribute value */
-
-
         /*
          * Add a default option...
          */
 
           strlcpy(optname, attr->name, sizeof(optname));
-         if ((ptr = strstr(optname, "-default")) != NULL)
-           *ptr = '\0';
-
-          value[0] = '\0';
-         for (i = 0, ptr = value; i < attr->num_values; i ++)
-         {
-           if (ptr >= (value + sizeof(value) - 1))
-             break;
-
-            if (i)
-             *ptr++ = ',';
-
-            switch (attr->value_tag)
-           {
-             case IPP_TAG_INTEGER :
-             case IPP_TAG_ENUM :
-                 snprintf(ptr, sizeof(value) - (ptr - value), "%d",
-                          attr->values[i].integer);
-                 break;
-
-             case IPP_TAG_BOOLEAN :
-                 if (attr->values[i].boolean)
-                   strlcpy(ptr, "true", sizeof(value) - (ptr - value));
-                 else
-                   strlcpy(ptr, "false", sizeof(value) - (ptr - value));
-                 break;
-
-             case IPP_TAG_RANGE :
-                 if (attr->values[i].range.lower ==
-                         attr->values[i].range.upper)
-                   snprintf(ptr, sizeof(value) - (ptr - value), "%d",
-                            attr->values[i].range.lower);
-                 else
-                   snprintf(ptr, sizeof(value) - (ptr - value), "%d-%d",
-                            attr->values[i].range.lower,
-                            attr->values[i].range.upper);
-                 break;
-
-             default :
-                 for (valptr = attr->values[i].string.text;
-                      *valptr && ptr < (value + sizeof(value) - 2);)
-                 {
-                   if (strchr(" \t\n\\\'\"", *valptr))
-                     *ptr++ = '\\';
-
-                   *ptr++ = *valptr++;
-                 }
-
-                 *ptr = '\0';
-                 break;
-           }
-
-           ptr += strlen(ptr);
-          }
-
-         num_options = cupsAddOption(optname, value, num_options, &options);
+         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);
        }
-
-        attr = attr->next;
       }
 
      /*
@@ -1742,76 +1939,13 @@ cups_get_sdests(http_t      *http,      /* I - Connection to server or CUPS_HTTP_DEFA
           continue;
       }
 
-      num_dests = cupsAddDest(printer_name, NULL, num_dests, dests);
-
-      if ((dest = cupsGetDest(printer_name, NULL, num_dests, *dests)) != NULL)
+      if ((dest = cups_add_dest(printer_name, NULL, &num_dests, dests)) != NULL)
       {
         dest->num_options = num_options;
        dest->options     = options;
-
-        num_options = 0;
-       options     = NULL;
-
-        if (auth_info_req[0])
-          dest->num_options = cupsAddOption("auth-info-required", auth_info_req,
-                                           dest->num_options,
-                                           &(dest->options));
-
-        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(value, "%d", accepting);
-       dest->num_options = cupsAddOption("printer-is-accepting-jobs", value,
-                                         dest->num_options,
-                                         &(dest->options));
-
-        sprintf(value, "%d", shared);
-       dest->num_options = cupsAddOption("printer-is-shared", value,
-                                         dest->num_options,
-                                         &(dest->options));
-
-        if (location)
-          dest->num_options = cupsAddOption("printer-location",
-                                           location, dest->num_options,
-                                           &(dest->options));
-
-        if (make_model)
-          dest->num_options = cupsAddOption("printer-make-and-model",
-                                           make_model, dest->num_options,
-                                           &(dest->options));
-
-        sprintf(value, "%d", state);
-       dest->num_options = cupsAddOption("printer-state", value,
-                                         dest->num_options,
-                                         &(dest->options));
-
-        if (change_time)
-       {
-         sprintf(value, "%d", change_time);
-         dest->num_options = cupsAddOption("printer-state-change-time", value,
-                                           dest->num_options,
-                                           &(dest->options));
-        }
-
-        if (reasons[0])
-          dest->num_options = cupsAddOption("printer-state-reasons", reasons,
-                                           dest->num_options,
-                                           &(dest->options));
-
-        sprintf(value, "%d", type);
-       dest->num_options = cupsAddOption("printer-type", value,
-                                         dest->num_options,
-                                         &(dest->options));
       }
-
-      cupsFreeOptions(num_options, options);
+      else
+        cupsFreeOptions(num_options, options);
 
       if (attr == NULL)
        break;
@@ -1829,5 +1963,95 @@ cups_get_sdests(http_t      *http,       /* I - Connection to server or CUPS_HTTP_DEFA
 
 
 /*
- * End of "$Id: dest.c 7460 2008-04-16 02:19:54Z 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 $".
  */