Commit dff8d0f7 authored by Stefan Kost's avatar Stefan Kost

various: handle return values of write calls

parent 4ea1866f
......@@ -1615,7 +1615,8 @@ xmlNanoHTTPFetch(const char *URL, const char *filename, char **contentType) {
char *buf = NULL;
int fd;
int len;
int ret = 0;
if (filename == NULL) return(-1);
ctxt = xmlNanoHTTPOpen(URL, contentType);
if (ctxt == NULL) return(-1);
......@@ -1636,12 +1637,14 @@ xmlNanoHTTPFetch(const char *URL, const char *filename, char **contentType) {
xmlNanoHTTPFetchContent( ctxt, &buf, &len );
if ( len > 0 ) {
write(fd, buf, len);
if (write(fd, buf, len) == -1) {
ret = -1;
}
}
xmlNanoHTTPClose(ctxt);
close(fd);
return(0);
return(ret);
}
#ifdef LIBXML_OUTPUT_ENABLED
......@@ -1660,7 +1663,8 @@ xmlNanoHTTPSave(void *ctxt, const char *filename) {
char *buf = NULL;
int fd;
int len;
int ret = 0;
if ((ctxt == NULL) || (filename == NULL)) return(-1);
if (!strcmp(filename, "-"))
......@@ -1675,12 +1679,14 @@ xmlNanoHTTPSave(void *ctxt, const char *filename) {
xmlNanoHTTPFetchContent( ctxt, &buf, &len );
if ( len > 0 ) {
write(fd, buf, len);
if (write(fd, buf, len) == -1) {
ret = -1;
}
}
xmlNanoHTTPClose(ctxt);
close(fd);
return(0);
return(ret);
}
#endif /* LIBXML_OUTPUT_ENABLED */
......
......@@ -104,8 +104,10 @@ test_c14n(const char* xml_filename, int with_comments, int mode,
with_comments, &result);
if(ret >= 0) {
if(result != NULL) {
write(1, result, ret);
xmlFree(result);
if (write(STDOUT_FILENO, result, ret) == -1) {
fprintf(stderr, "Can't write data\n");
}
xmlFree(result);
}
} else {
fprintf(stderr,"Error: failed to canonicalize XML file \"%s\" (ret=%d)\n", xml_filename, ret);
......
......@@ -2550,7 +2550,9 @@ static void parseAndPrintFile(char *filename, xmlParserCtxtPtr rectxt) {
size = xmlC14NDocDumpMemory(doc, NULL, XML_C14N_1_0, NULL, 1, &result);
if (size >= 0) {
write(1, result, size);
if (write(1, result, size) == -1) {
fprintf(stderr, "Can't write data\n");
}
xmlFree(result);
} else {
fprintf(stderr, "Failed to canonicalize\n");
......@@ -2562,7 +2564,9 @@ static void parseAndPrintFile(char *filename, xmlParserCtxtPtr rectxt) {
size = xmlC14NDocDumpMemory(doc, NULL, XML_C14N_1_1, NULL, 1, &result);
if (size >= 0) {
write(1, result, size);
if (write(1, result, size) == -1) {
fprintf(stderr, "Can't write data\n");
}
xmlFree(result);
} else {
fprintf(stderr, "Failed to canonicalize\n");
......@@ -2575,7 +2579,9 @@ static void parseAndPrintFile(char *filename, xmlParserCtxtPtr rectxt) {
size = xmlC14NDocDumpMemory(doc, NULL, XML_C14N_EXCLUSIVE_1_0, NULL, 1, &result);
if (size >= 0) {
write(1, result, size);
if (write(1, result, size) == -1) {
fprintf(stderr, "Can't write data\n");
}
xmlFree(result);
} else {
fprintf(stderr, "Failed to canonicalize\n");
......@@ -2604,7 +2610,9 @@ static void parseAndPrintFile(char *filename, xmlParserCtxtPtr rectxt) {
fprintf(stderr, "Failed to save\n");
progresult = XMLLINT_ERR_OUT;
} else {
write(1, result, len);
if (write(1, result, len) == -1) {
fprintf(stderr, "Can't write data\n");
}
xmlFree(result);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment