diff options
| author | jlovell <jlovell@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2006-01-29 16:52:03 +0000 |
|---|---|---|
| committer | jlovell <jlovell@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2006-01-29 16:52:03 +0000 |
| commit | a4d045870e17abe8840b77615c0d59f4b332ee31 (patch) | |
| tree | 156a1bf6d89ea7d14d78d947a205f7317f4e0a9d /berkeley | |
| parent | 09ec001812911f8890dad0f164ab9098e22208cf (diff) | |
Load cups into easysw/current.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@39 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'berkeley')
| -rw-r--r-- | berkeley/lpc.c | 9 | ||||
| -rw-r--r-- | berkeley/lpq.c | 12 | ||||
| -rw-r--r-- | berkeley/lprm.c | 8 |
3 files changed, 15 insertions, 14 deletions
diff --git a/berkeley/lpc.c b/berkeley/lpc.c index 5edbeafb7..271d60477 100644 --- a/berkeley/lpc.c +++ b/berkeley/lpc.c @@ -1,5 +1,5 @@ /* - * "$Id: lpc.c 4948 2006-01-19 03:23:41Z mike $" + * "$Id: lpc.c 5023 2006-01-29 14:39:44Z mike $" * * "lpc" command for the Common UNIX Printing System (CUPS). * @@ -444,8 +444,9 @@ show_status(http_t *http, /* I - HTTP connection to server */ "attributes-natural-language", NULL, language->language); - httpAssembleURIf(printer_uri, sizeof(printer_uri), "ipp", NULL, - "localhost", 631, "/printers/%s", printer); + httpAssembleURIf(HTTP_URI_CODING_ALL, printer_uri, sizeof(printer_uri), + "ipp", NULL, "localhost", 631, "/printers/%s", + printer); ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri", NULL, printer_uri); @@ -517,5 +518,5 @@ show_status(http_t *http, /* I - HTTP connection to server */ /* - * End of "$Id: lpc.c 4948 2006-01-19 03:23:41Z mike $". + * End of "$Id: lpc.c 5023 2006-01-29 14:39:44Z mike $". */ diff --git a/berkeley/lpq.c b/berkeley/lpq.c index 6fd1dfc91..d1d06db1d 100644 --- a/berkeley/lpq.c +++ b/berkeley/lpq.c @@ -1,5 +1,5 @@ /* - * "$Id: lpq.c 4948 2006-01-19 03:23:41Z mike $" + * "$Id: lpq.c 5023 2006-01-29 14:39:44Z mike $" * * "lpq" command for the Common UNIX Printing System (CUPS). * @@ -368,8 +368,8 @@ show_jobs(const char *command, /* I - Command name */ } else { - httpAssembleURIf(resource, sizeof(resource), "ipp", NULL, "localhost", 0, - "/printers/%s", dest); + httpAssembleURIf(HTTP_URI_CODING_ALL, resource, sizeof(resource), "ipp", + NULL, "localhost", 0, "/printers/%s", dest); ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri", NULL, resource); @@ -592,8 +592,8 @@ show_printer(const char *command, /* I - Command name */ request = ippNewRequest(IPP_GET_PRINTER_ATTRIBUTES); - httpAssembleURIf(uri, sizeof(uri), "ipp", NULL, "localhost", 0, - "/printers/%s", dest); + httpAssembleURIf(HTTP_URI_CODING_ALL, uri, sizeof(uri), "ipp", NULL, + "localhost", 0, "/printers/%s", dest); ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri", NULL, uri); @@ -651,5 +651,5 @@ usage(void) /* - * End of "$Id: lpq.c 4948 2006-01-19 03:23:41Z mike $". + * End of "$Id: lpq.c 5023 2006-01-29 14:39:44Z mike $". */ diff --git a/berkeley/lprm.c b/berkeley/lprm.c index 8497ff532..67479b5a3 100644 --- a/berkeley/lprm.c +++ b/berkeley/lprm.c @@ -1,5 +1,5 @@ /* - * "$Id: lprm.c 4948 2006-01-19 03:23:41Z mike $" + * "$Id: lprm.c 5023 2006-01-29 14:39:44Z mike $" * * "lprm" command for the Common UNIX Printing System (CUPS). * @@ -223,8 +223,8 @@ main(int argc, /* I - Number of command-line arguments */ if (dest) { - httpAssembleURIf(uri, sizeof(uri), "ipp", NULL, "localhost", 0, - "/printers/%s", dest); + httpAssembleURIf(HTTP_URI_CODING_ALL, uri, sizeof(uri), "ipp", NULL, + "localhost", 0, "/printers/%s", dest); ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri", NULL, uri); ippAddInteger(request, IPP_TAG_OPERATION, IPP_TAG_INTEGER, "job-id", @@ -283,5 +283,5 @@ main(int argc, /* I - Number of command-line arguments */ /* - * End of "$Id: lprm.c 4948 2006-01-19 03:23:41Z mike $". + * End of "$Id: lprm.c 5023 2006-01-29 14:39:44Z mike $". */ |