Attachment 140233 Details for Bug 106965 – Utils: use openFile instead of fopen for _WIN32 environment compatibility (UTF-16 file name)

[patch] Utils: use openFile instead of fopen for _WIN32 environment compatibility (UTF-16 file name)

0001-Utils-use-openFile-instead-of-fopen-for-_WIN32-env.patch (text/plain), 9.03 KB, created by Thibaut on 2018-06-19 17:13:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thibaut

Created: 2018-06-19 17:13:43 UTC

Size: 9.03 KB

patch

obsolete

>diff --git a/utils/HtmlOutputDev.cc b/utils/HtmlOutputDev.cc
>index 2c508ce0..6c82353c 100644
>--- a/utils/HtmlOutputDev.cc
>+++ b/utils/HtmlOutputDev.cc
>@@ -74,6 +74,7 @@
> #include "HtmlUtils.h"
> #include "Outline.h"
> #include "PDFDoc.h"
>+#include "goo/gfile.h"
> 
> #ifdef ENABLE_LIBPNG
> #include <png.h>
>@@ -836,10 +837,10 @@ int HtmlPage::dumpComplexHeaders(FILE * const file, FILE *& pageFile, int page)
>       tmp = new GooString(DocName);
>       if (!singleHtml){
>             tmp->append('-')->append(pgNum)->append(".html");
>-            pageFile = fopen(tmp->getCString(), "w");
>+            pageFile = openFile(tmp->getCString(), "w");
>       } else {
>             tmp->append("-html")->append(".html");
>-            pageFile = fopen(tmp->getCString(), "a");
>+            pageFile = openFile(tmp->getCString(), "a");
>       }
>       delete pgNum;
>       if (!pageFile) {
>@@ -1076,7 +1077,7 @@ void HtmlOutputDev::doFrame(int firstPage){
>   GooString* htmlEncoding;
>   fName->append(".html");
> 
>-  if (!(fContentsFrame = fopen(fName->getCString(), "w"))){
>+  if (!(fContentsFrame = openFile(fName->getCString(), "w"))){
>     error(errIO, -1, "Couldn't open html file '{0:t}'", fName);
>     delete fName;
>     return;
>@@ -1151,7 +1152,7 @@ HtmlOutputDev::HtmlOutputDev(Catalog *catalogA, char *fileName, char *title,
> 
>          doFrame(firstPage);
> 
>-         if (!(fContentsFrame = fopen(left->getCString(), "w")))
>+         if (!(fContentsFrame = openFile(left->getCString(), "w")))
>          {
>              error(errIO, -1, "Couldn't open html file '{0:t}'", left);
>              delete left;
>@@ -1174,7 +1175,7 @@ HtmlOutputDev::HtmlOutputDev(Catalog *catalogA, char *fileName, char *title,
>        GooString* right=new GooString(fileName);
>        right->append("s.html");
> 
>-       if (!(page=fopen(right->getCString(),"w"))){
>+       if (!(page=openFile(right->getCString(),"w"))){
>         error(errIO, -1, "Couldn't open html file '{0:t}'", right);
>         delete right;
> 		return;
>@@ -1193,7 +1194,7 @@ HtmlOutputDev::HtmlOutputDev(Catalog *catalogA, char *fileName, char *title,
>       GooString* right=new GooString(fileName);
>       if (!xml) right->append(".html");
>       if (xml) right->append(".xml");
>-      if (!(page=fopen(right->getCString(),"w"))){
>+      if (!(page=openFile(right->getCString(),"w"))){
> 	error(errIO, -1, "Couldn't open html file '{0:t}'", right);
> 	delete right;
> 	return;
>@@ -1258,7 +1259,7 @@ void HtmlOutputDev::startPage(int pageNum, GfxState *state, XRef *xref) {
>       write=gFalse;
>       GooString* fname=Dirname(Docname);
>       fname->append("image.log");
>-      if((tin=fopen(getFileNameFromPath(fname->getCString(),fname->getLength()),"w"))==NULL){
>+      if((tin=openFile(getFileNameFromPath(fname->getCString(),fname->getLength()),"w"))==NULL){
> 	printf("Error : can not open %s",fname);
> 	exit(1);
>       }
>@@ -1345,7 +1346,7 @@ void HtmlOutputDev::drawJpegImage(GfxState *state, Stream *str)
> 
>   // open the image file
>   GooString *fName=createImageFileName("jpg");
>-  if (!(f1 = fopen(fName->getCString(), "wb"))) {
>+  if (!(f1 = openFile(fName->getCString(), "wb"))) {
>     error(errIO, -1, "Couldn't open image file '{0:t}'", fName);
>     delete fName;
>     return;
>@@ -1379,7 +1380,7 @@ void HtmlOutputDev::drawPngImage(GfxState *state, Stream *str, int width, int he
> 
>   // open the image file
>   GooString *fName=createImageFileName("png");
>-  if (!(f1 = fopen(fName->getCString(), "wb"))) {
>+  if (!(f1 = openFile(fName->getCString(), "wb"))) {
>     error(errIO, -1, "Couldn't open image file '{0:t}'", fName);
>     delete fName;
>     return;
>@@ -1738,7 +1739,7 @@ GBool HtmlOutputDev::dumpDocOutline(PDFDoc* doc)
> 		{
> 			GooString *str = Docname->copy();
> 			str->append("-outline.html");
>-			output = fopen(str->getCString(), "w");
>+			output = openFile(str->getCString(), "w");
> 			delete str;
> 			if (output == nullptr)
> 				return gFalse;
>diff --git a/utils/ImageOutputDev.cc b/utils/ImageOutputDev.cc
>index 75650e5b..bc39b1b6 100644
>--- a/utils/ImageOutputDev.cc
>+++ b/utils/ImageOutputDev.cc
>@@ -53,6 +53,7 @@
> #include "Stream.h"
> #include "JBIG2Stream.h"
> #include "ImageOutputDev.h"
>+#include "goo/gfile.h"
> 
> ImageOutputDev::ImageOutputDev(char *fileRootA, GBool pageNamesA, GBool listImagesA) {
>   listImages = listImagesA;
>@@ -335,7 +336,7 @@ void ImageOutputDev::writeRawImage(Stream *str, const char *ext) {
>   // open the image file
>   setFilename(ext);
>   ++imgNum;
>-  if (!(f = fopen(fileName, "wb"))) {
>+  if (!(f = openFile(fileName, "wb"))) {
>     error(errIO, -1, "Couldn't open image file '{0:s}'", fileName);
>     return;
>   }
>@@ -368,7 +369,7 @@ void ImageOutputDev::writeImageFile(ImgWriter *writer, ImageFormat format, const
>   if (writer) {
>     setFilename(ext);
>     ++imgNum;
>-    if (!(f = fopen(fileName, "wb"))) {
>+    if (!(f = openFile(fileName, "wb"))) {
>       error(errIO, -1, "Couldn't open image file '{0:s}'", fileName);
>       return;
>     }
>@@ -543,7 +544,7 @@ void ImageOutputDev::writeImage(GfxState *state, Object *ref, Stream *str,
>       Stream *globalsStr = globals->getStream();
> 
>       setFilename("jb2g");
>-      if (!(f = fopen(fileName, "wb"))) {
>+      if (!(f = openFile(fileName, "wb"))) {
>         error(errIO, -1, "Couldn't open image file '{0:s}'", fileName);
>         return;
>       }
>@@ -562,7 +563,7 @@ void ImageOutputDev::writeImage(GfxState *state, Object *ref, Stream *str,
>     CCITTFaxStream *ccittStr = static_cast<CCITTFaxStream *>(str);
>     FILE *f;
>     setFilename("params");
>-    if (!(f = fopen(fileName, "wb"))) {
>+    if (!(f = openFile(fileName, "wb"))) {
>       error(errIO, -1, "Couldn't open image file '{0:s}'", fileName);
>       return;
>     }
>diff --git a/utils/pdfinfo.cc b/utils/pdfinfo.cc
>index 4542580b..60cb6a39 100644
>--- a/utils/pdfinfo.cc
>+++ b/utils/pdfinfo.cc
>@@ -726,9 +726,9 @@ int main(int argc, char *argv[]) {
>     long long filesize = 0;
> 
> #ifdef VMS
>-    f = fopen(fileName->getCString(), "rb", "ctx=stm");
>+    f = openFile(fileName->getCString(), "rb", "ctx=stm");
> #else
>-    f = fopen(fileName->getCString(), "rb");
>+    f = openFile(fileName->getCString(), "rb");
> #endif
>     if (f) {
>       Gfseek(f, 0, SEEK_END);
>diff --git a/utils/pdftocairo.cc b/utils/pdftocairo.cc
>index 05ceaa3b..91d0182d 100644
>--- a/utils/pdftocairo.cc
>+++ b/utils/pdftocairo.cc
>@@ -57,6 +57,7 @@
> #include "CairoOutputDev.h"
> #include "Win32Console.h"
> #include "numberofcharacters.h"
>+#include "goo/gfile.h"
> #ifdef USE_CMS
> #include <lcms2.h>
> #endif
>@@ -438,7 +439,7 @@ static void writePageImage(GooString *filename)
>   if (filename->cmp("fd://0") == 0)
>     file = stdout;
>   else
>-    file = fopen(filename->getCString(), "wb");
>+    file = openFile(filename->getCString(), "wb");
> 
>   if (!file) {
>     fprintf(stderr, "Error opening output file %s\n", filename->getCString());
>@@ -609,7 +610,7 @@ static void beginDocument(GooString *inputFileName, GooString *outputFileName, d
>         output_file = stdout;
>       else
>       {
>-        output_file = fopen(outputFileName->getCString(), "wb");
>+        output_file = openFile(outputFileName->getCString(), "wb");
>         if (!output_file) {
>           fprintf(stderr, "Error opening output file %s\n", outputFileName->getCString());
>           exit(2);
>@@ -1102,7 +1103,7 @@ int main(int argc, char *argv[]) {
> #ifdef USE_CMS
>   icc_data = nullptr;
>   if (icc.getCString()[0]) {
>-    FILE *file = fopen(icc.getCString(), "rb");
>+    FILE *file = openFile(icc.getCString(), "rb");
>     if (!file) {
>       fprintf(stderr, "Error: unable to open icc profile %s\n", icc.getCString());
>       exit(4);
>diff --git a/utils/pdftotext.cc b/utils/pdftotext.cc
>index 795cf386..595b34d0 100644
>--- a/utils/pdftotext.cc
>+++ b/utils/pdftotext.cc
>@@ -62,6 +62,7 @@
> #include <sstream>
> #include <iomanip>
> #include "Win32Console.h"
>+#include "goo/gfile.h"
> 
> static void printInfoString(FILE *f, Dict *infoDict, const char *key,
> 			    const char *text1, const char *text2, UnicodeMap *uMap);
>@@ -318,7 +319,7 @@ int main(int argc, char *argv[]) {
>     if (!textFileName->cmp("-")) {
>       f = stdout;
>     } else {
>-      if (!(f = fopen(textFileName->getCString(), "wb"))) {
>+      if (!(f = openFile(textFileName->getCString(), "wb"))) {
> 	error(errIO, -1, "Couldn't open text file '{0:t}'", textFileName);
> 	exitCode = 2;
> 	goto err3;
>@@ -404,7 +405,7 @@ int main(int argc, char *argv[]) {
>     if (!textFileName->cmp("-")) {
>       f = stdout;
>     } else {
>-      if (!(f = fopen(textFileName->getCString(), "ab"))) {
>+      if (!(f = openFile(textFileName->getCString(), "ab"))) {
> 	error(errIO, -1, "Couldn't open text file '{0:t}'", textFileName);
> 	exitCode = 2;
> 	goto err3;
>diff --git a/utils/pdfunite.cc b/utils/pdfunite.cc
>index 0bdfbdf6..1a9028f2 100644
>--- a/utils/pdfunite.cc
>+++ b/utils/pdfunite.cc
>@@ -21,6 +21,7 @@
> #include "config.h"
> #include <poppler-config.h>
> #include <vector>
>+#include "goo/gfile.h"
> 
> static GBool printVersion = gFalse;
> static GBool printHelp = gFalse;
>@@ -183,7 +184,7 @@ int main (int argc, char *argv[])
>     }
>   }
> 
>-  if (!(f = fopen(fileName, "wb"))) {
>+  if (!(f = openFile(fileName, "wb"))) {
>     error(errIO, -1, "Could not open file '{0:s}'", fileName);
>     return -1;
>   }

Actions: View | Splinter Review

Attachments on bug 106965: 140233

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.