/*
- * "$Id$"
+ * IPP utilities for CUPS.
*
- * IPP utilities for CUPS.
+ * Copyright 2007-2014 by Apple Inc.
+ * Copyright 1997-2007 by Easy Software Products.
*
- * Copyright 2007-2013 by Apple Inc.
- * Copyright 1997-2007 by Easy Software Products.
+ * These coded instructions, statements, and computer programs are the
+ * 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
+ * missing or damaged, see the license at "http://www.cups.org/".
*
- * These coded instructions, statements, and computer programs are the
- * 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:
- *
- * cupsDoFileRequest() - Do an IPP request with a file.
- * cupsDoIORequest() - Do an IPP request with file descriptors.
- * cupsDoRequest() - Do an IPP request.
- * cupsGetResponse() - Get a response to an IPP request.
- * cupsLastError() - Return the last IPP status code.
- * cupsLastErrorString() - Return the last IPP status-message.
- * _cupsNextDelay() - Return the next retry delay value.
- * cupsReadResponseData() - Read additional data after the IPP response.
- * cupsSendRequest() - Send an IPP request.
- * cupsWriteRequestData() - Write additional data after an IPP request.
- * _cupsConnect() - Get the default server connection...
- * _cupsSetError() - Set the last IPP status code and status-message.
- * _cupsSetHTTPError() - Set the last error using the HTTP status.
+ * This file is subject to the Apple OS-Developed Software exception.
*/
/*
int infile; /* Input file */
- DEBUG_printf(("cupsDoFileRequest(http=%p, request=%p(%s), resource=\"%s\", "
- "filename=\"%s\")", http, request,
- request ? ippOpString(request->request.op.operation_id) : "?",
- resource, filename));
+ DEBUG_printf(("cupsDoFileRequest(http=%p, request=%p(%s), resource=\"%s\", filename=\"%s\")", (void *)http, (void *)request, request ? ippOpString(request->request.op.operation_id) : "?", resource, filename));
if (filename)
{
* If "outfile" is a valid file descriptor, @code cupsDoIORequest@ copies
* all of the data after the IPP response message to the file.
*
- * @since CUPS 1.3/OS X 10.5@
+ * @since CUPS 1.3/macOS 10.5@
*/
ipp_t * /* O - Response data */
size_t length = 0; /* Content-Length value */
http_status_t status; /* Status of HTTP request */
struct stat fileinfo; /* File information */
- int bytes; /* Number of bytes read/written */
+ ssize_t bytes; /* Number of bytes read/written */
char buffer[32768]; /* Output buffer */
- DEBUG_printf(("cupsDoIORequest(http=%p, request=%p(%s), resource=\"%s\", "
- "infile=%d, outfile=%d)", http, request,
- request ? ippOpString(request->request.op.operation_id) : "?",
- resource, infile, outfile));
+ DEBUG_printf(("cupsDoIORequest(http=%p, request=%p(%s), resource=\"%s\", infile=%d, outfile=%d)", (void *)http, (void *)request, request ? ippOpString(request->request.op.operation_id) : "?", resource, infile, outfile));
/*
* Range check input...
length = 0; /* Chunk when piping */
else
#endif /* !WIN32 */
- length = ippLength(request) + fileinfo.st_size;
+ length = ippLength(request) + (size_t)fileinfo.st_size;
}
else
length = ippLength(request);
#endif /* WIN32 */
lseek(infile, 0, SEEK_SET);
- while ((bytes = (int)read(infile, buffer, sizeof(buffer))) > 0)
+ while ((bytes = read(infile, buffer, sizeof(buffer))) > 0)
{
- if ((status = cupsWriteRequestData(http, buffer, bytes))
+ if ((status = cupsWriteRequestData(http, buffer, (size_t)bytes))
!= HTTP_STATUS_CONTINUE)
break;
}
* Get the server's response...
*/
- if (status != HTTP_STATUS_ERROR)
+ if (status <= HTTP_STATUS_CONTINUE || status == HTTP_STATUS_OK)
{
response = cupsGetResponse(http, resource);
status = httpGetStatus(http);
* Write trailing data to file...
*/
- while ((bytes = (int)httpRead2(http, buffer, sizeof(buffer))) > 0)
- if (write(outfile, buffer, bytes) < bytes)
+ while ((bytes = httpRead2(http, buffer, sizeof(buffer))) > 0)
+ if (write(outfile, buffer, (size_t)bytes) < bytes)
break;
}
ipp_t *request, /* I - IPP request */
const char *resource) /* I - HTTP resource for POST */
{
- DEBUG_printf(("cupsDoRequest(http=%p, request=%p(%s), resource=\"%s\")",
- http, request,
- request ? ippOpString(request->request.op.operation_id) : "?",
- resource));
+ DEBUG_printf(("cupsDoRequest(http=%p, request=%p(%s), resource=\"%s\")", (void *)http, (void *)request, request ? ippOpString(request->request.op.operation_id) : "?", resource));
return (cupsDoIORequest(http, request, resource, -1, -1));
}
* @link cupsReadResponseData@ after getting a successful response,
* otherwise call @link httpFlush@ to complete the response processing.
*
- * @since CUPS 1.4/OS X 10.6@
+ * @since CUPS 1.4/macOS 10.6@
*/
ipp_t * /* O - Response or @code NULL@ on HTTP error */
ipp_t *response = NULL; /* IPP response */
- DEBUG_printf(("cupsGetResponse(http=%p, resource=\"%s\")", http, resource));
+ DEBUG_printf(("cupsGetResponse(http=%p, resource=\"%s\")", (void *)http, resource));
+ DEBUG_printf(("1cupsGetResponse: http->state=%d", http ? http->state : HTTP_STATE_ERROR));
/*
* Connect to the default server as needed...
*/
if (!http)
- http = _cupsConnect();
+ {
+ _cups_globals_t *cg = _cupsGlobals();
+ /* Pointer to library globals */
+
+ if ((http = cg->http) == NULL)
+ {
+ _cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("No active connection."), 1);
+ DEBUG_puts("1cupsGetResponse: No active connection - returning NULL.");
+ return (NULL);
+ }
+ }
- if (!http || (http->state != HTTP_STATE_POST_RECV &&
- http->state != HTTP_STATE_POST_SEND))
+ if (http->state != HTTP_STATE_POST_RECV && http->state != HTTP_STATE_POST_SEND)
+ {
+ _cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("No request sent."), 1);
+ DEBUG_puts("1cupsGetResponse: Not in POST state - returning NULL.");
return (NULL);
+ }
/*
* Check for an unfinished chunked request...
* 'cupsLastErrorString()' - Return the last IPP status-message received on the
* current thread.
*
- * @since CUPS 1.2/OS X 10.5@
+ * @since CUPS 1.2/macOS 10.5@
*/
const char * /* O - status-message text from last request */
* files from @code CUPS_GET_PPD@ and @code CUPS_GET_DOCUMENT@ requests,
* respectively.
*
- * @since CUPS 1.4/OS X 10.6@
+ * @since CUPS 1.4/macOS 10.6@
*/
ssize_t /* O - Bytes read, 0 on EOF, -1 on error */
* Get the default connection as needed...
*/
- DEBUG_printf(("cupsReadResponseData(http=%p, buffer=%p, "
- "length=" CUPS_LLFMT ")", http, buffer, CUPS_LLCAST length));
+ DEBUG_printf(("cupsReadResponseData(http=%p, buffer=%p, length=" CUPS_LLFMT ")", (void *)http, (void *)buffer, CUPS_LLCAST length));
if (!http)
{
* Note: Unlike @link cupsDoFileRequest@, @link cupsDoIORequest@, and
* @link cupsDoRequest@, the request is NOT freed with @link ippDelete@.
*
- * @since CUPS 1.4/OS X 10.6@
+ * @since CUPS 1.4/macOS 10.6@
*/
http_status_t /* O - Initial HTTP status */
http_status_t expect; /* Expect: header to use */
- DEBUG_printf(("cupsSendRequest(http=%p, request=%p(%s), resource=\"%s\", "
- "length=" CUPS_LLFMT ")", http, request,
- request ? ippOpString(request->request.op.operation_id) : "?",
- resource, CUPS_LLCAST length));
+ DEBUG_printf(("cupsSendRequest(http=%p, request=%p(%s), resource=\"%s\", length=" CUPS_LLFMT ")", (void *)http, (void *)request, request ? ippOpString(request->request.op.operation_id) : "?", resource, CUPS_LLCAST length));
/*
* Range check input...
got_status = 0;
while ((state = ippWrite(http, request)) != IPP_STATE_DATA)
- if (state == IPP_STATE_ERROR)
- break;
- else if (httpCheck(http))
+ {
+ if (httpCheck(http))
{
got_status = 1;
if (status >= HTTP_STATUS_MULTIPLE_CHOICES)
break;
}
+ else if (state == IPP_STATE_ERROR)
+ break;
+ }
if (state == IPP_STATE_ERROR)
{
- DEBUG_puts("1cupsSendRequest: Unable to send IPP request.");
+ /*
+ * We weren't able to send the IPP request. But did we already get a HTTP
+ * error status?
+ */
+
+ if (!got_status || status < HTTP_STATUS_MULTIPLE_CHOICES)
+ {
+ /*
+ * No, something else went wrong.
+ */
- http->status = HTTP_STATUS_ERROR;
- http->state = HTTP_STATE_WAITING;
+ DEBUG_puts("1cupsSendRequest: Unable to send IPP request.");
- return (HTTP_STATUS_ERROR);
+ http->status = HTTP_STATUS_ERROR;
+ http->state = HTTP_STATE_WAITING;
+
+ return (HTTP_STATUS_ERROR);
+ }
}
/*
* This function is used after @link cupsSendRequest@ to provide a PPD and
* after @link cupsStartDocument@ to provide a document file.
*
- * @since CUPS 1.4/OS X 10.6@
+ * @since CUPS 1.4/macOS 10.6@
*/
http_status_t /* O - @code HTTP_STATUS_CONTINUE@ if OK or HTTP status on error */
* Get the default connection as needed...
*/
- DEBUG_printf(("cupsWriteRequestData(http=%p, buffer=%p, "
- "length=" CUPS_LLFMT ")", http, buffer, CUPS_LLCAST length));
+ DEBUG_printf(("cupsWriteRequestData(http=%p, buffer=%p, length=" CUPS_LLFMT ")", (void *)http, (void *)buffer, CUPS_LLCAST length));
if (!http)
{
if (length >= HTTP_MAX_BUFFER ||
http->wused < wused ||
- (wused > 0 && http->wused == length))
+ (wused > 0 && (size_t)http->wused == length))
{
/*
* We've written something to the server, so check for response data...
break;
}
}
-
-
-/*
- * End of "$Id$".
- */
projects / thirdparty / cups.git / blobdiff