Revision: 76498
http://sourceforge.net/p/brlcad/code/76498
Author: starseeker
Date: 2020-07-25 16:40:42 +0000 (Sat, 25 Jul 2020)
Log Message:
-----------
Add binary flags for more fopen calls
Modified Paths:
--------------
brlcad/trunk/src/util/asc-plot3.c
brlcad/trunk/src/util/bombardier.c
brlcad/trunk/src/util/bw-pix.c
brlcad/trunk/src/util/bwcrop.c
brlcad/trunk/src/util/bwdiff.c
brlcad/trunk/src/util/pix-ppm.c
brlcad/trunk/src/util/pix3filter.c
brlcad/trunk/src/util/pixblend.c
brlcad/trunk/src/util/pixclump.c
brlcad/trunk/src/util/pixcolors.c
brlcad/trunk/src/util/pixcount.cpp
brlcad/trunk/src/util/pixcrop.c
brlcad/trunk/src/util/pixdiff.c
brlcad/trunk/src/util/pixinterp2x.c
brlcad/trunk/src/util/pixmerge.c
brlcad/trunk/src/util/pixmorph.c
brlcad/trunk/src/util/pixuntile.c
brlcad/trunk/src/util/plot3-dm.c
brlcad/trunk/src/util/plot3rot.c
Modified: brlcad/trunk/src/util/asc-plot3.c
===================================================================
--- brlcad/trunk/src/util/asc-plot3.c 2020-07-25 16:27:23 UTC (rev 76497)
+++ brlcad/trunk/src/util/asc-plot3.c 2020-07-25 16:40:42 UTC (rev 76498)
@@ -65,7 +65,7 @@
char *bp;
char buf[BUF_LEN];
char sarg[BUF_LEN];
- static char *fm[] = { "r", "w" };
+ static char *fm[] = { "rb", "wb" };
double darg[6] = {0.0};
static FILE *fp[2];
int i;
Modified: brlcad/trunk/src/util/bombardier.c
===================================================================
--- brlcad/trunk/src/util/bombardier.c 2020-07-25 16:27:23 UTC (rev 76497)
+++ brlcad/trunk/src/util/bombardier.c 2020-07-25 16:40:42 UTC (rev 76498)
@@ -163,7 +163,7 @@
return;
}
- fp = fopen(filename, "r");
+ fp = fopen(filename, "rb");
if (!fp) {
perror("unable to open file");
bu_log("ERROR: unable to open log file [%s]\n", filename);
Modified: brlcad/trunk/src/util/bw-pix.c
===================================================================
--- brlcad/trunk/src/util/bw-pix.c 2020-07-25 16:27:23 UTC (rev 76497)
+++ brlcad/trunk/src/util/bw-pix.c 2020-07-25 16:40:42 UTC (rev 76498)
@@ -47,8 +47,8 @@
if (BU_STR_EQUAL(name, "-")) {
*fp = stdin;
} else if (BU_STR_EQUAL(name, ".")) {
- *fp = fopen("/dev/null", "r");
- } else if ((*fp = fopen(name, "r")) == NULL) {
+ *fp = fopen("/dev/null", "rb");
+ } else if ((*fp = fopen(name, "rb")) == NULL) {
bu_exit(2, "bw3-pix: Can't open \"%s\"\n", name);
}
}
Modified: brlcad/trunk/src/util/bwcrop.c
===================================================================
--- brlcad/trunk/src/util/bwcrop.c 2020-07-25 16:27:23 UTC (rev 76497)
+++ brlcad/trunk/src/util/bwcrop.c 2020-07-25 16:40:42 UTC (rev 76498)
@@ -131,7 +131,7 @@
if ((ifp = fopen(argv[1], "rb")) == NULL) {
bu_exit(2, "bwcrop: can't open %s for reading\n", argv[1]);
}
- if ((ofp = fopen(argv[2], "w")) == NULL) {
+ if ((ofp = fopen(argv[2], "wb")) == NULL) {
bu_exit(3, "bwcrop: can't open %s for writing\n", argv[2]);
}
Modified: brlcad/trunk/src/util/bwdiff.c
===================================================================
--- brlcad/trunk/src/util/bwdiff.c 2020-07-25 16:27:23 UTC (rev 76497)
+++ brlcad/trunk/src/util/bwdiff.c 2020-07-25 16:40:42 UTC (rev 76498)
@@ -61,8 +61,8 @@
if (BU_STR_EQUAL(name, "-"))
*fp = stdin;
else if (BU_STR_EQUAL(name, "."))
- *fp = fopen("/dev/null", "r");
- else if ((*fp = fopen(name, "r")) == NULL)
+ *fp = fopen("/dev/null", "rb");
+ else if ((*fp = fopen(name, "rb")) == NULL)
bu_exit(2, "bwdiff: Can't open \"%s\"\n", name);
}
Modified: brlcad/trunk/src/util/pix-ppm.c
===================================================================
--- brlcad/trunk/src/util/pix-ppm.c 2020-07-25 16:27:23 UTC (rev 76497)
+++ brlcad/trunk/src/util/pix-ppm.c 2020-07-25 16:40:42 UTC (rev 76498)
@@ -77,7 +77,7 @@
autosize = 0;
break;
case 'o': {
- outfp = fopen(bu_optarg, "w+");
+ outfp = fopen(bu_optarg, "wb+");
if (outfp == (FILE *)NULL) {
bu_exit(1, "%s: cannot open \"%s\" for writing\n",
bu_getprogname(), bu_optarg);
}
Modified: brlcad/trunk/src/util/pix3filter.c
===================================================================
--- brlcad/trunk/src/util/pix3filter.c 2020-07-25 16:27:23 UTC (rev 76497)
+++ brlcad/trunk/src/util/pix3filter.c 2020-07-25 16:40:42 UTC (rev 76498)
@@ -133,7 +133,7 @@
}
if (bu_optind + 3 <= argc) {
- if ((oldfp = fopen(argv[bu_optind], "r")) == NULL) {
+ if ((oldfp = fopen(argv[bu_optind], "rb")) == NULL) {
fprintf(stderr,
"pix3filter: cannot open \"%s\" for reading\n",
argv[bu_optind]);
@@ -140,7 +140,7 @@
return 0;
}
- if ((curfp = fopen(argv[++bu_optind], "r")) == NULL) {
+ if ((curfp = fopen(argv[++bu_optind], "rb")) == NULL) {
fprintf(stderr,
"pix3filter: cannot open \"%s\" for reading\n",
argv[bu_optind]);
@@ -147,7 +147,7 @@
return 0;
}
- if ((newfp = fopen(argv[++bu_optind], "r")) == NULL) {
+ if ((newfp = fopen(argv[++bu_optind], "rb")) == NULL) {
fprintf(stderr,
"pix3filter: cannot open \"%s\" for reading\n",
argv[bu_optind]);
@@ -183,7 +183,7 @@
}
snprintf(working_name, strlen(file_name)+5, "%s.%d", file_name,
frameNumber-1);
- if ((oldfp = fopen(working_name, "r")) == NULL) {
+ if ((oldfp = fopen(working_name, "rb")) == NULL) {
if (frameNumber-1 != 0) {
fprintf(stderr,
"pix3filter: cannot open \"%s\" for reading.\n",
@@ -201,7 +201,7 @@
}
snprintf(working_name, strlen(file_name)+5, "%s.%d", file_name,
frameNumber+1);
- if ((newfp = fopen(working_name, "r")) == NULL) {
+ if ((newfp = fopen(working_name, "rb")) == NULL) {
fprintf(stderr,
"pix3filter: cannot open \"%s\" for reading.\n",
working_name);
Modified: brlcad/trunk/src/util/pixblend.c
===================================================================
--- brlcad/trunk/src/util/pixblend.c 2020-07-25 16:27:23 UTC (rev 76497)
+++ brlcad/trunk/src/util/pixblend.c 2020-07-25 16:40:42 UTC (rev 76498)
@@ -124,7 +124,7 @@
f1_name = argv[bu_optind++];
if (BU_STR_EQUAL(f1_name, "-"))
f1 = stdin;
- else if ((f1 = fopen(f1_name, "r")) == NULL) {
+ else if ((f1 = fopen(f1_name, "rb")) == NULL) {
perror(f1_name);
fprintf(stderr,
"pixblend: cannot open \"%s\" for reading\n",
@@ -135,7 +135,7 @@
f2_name = argv[bu_optind++];
if (BU_STR_EQUAL(f2_name, "-"))
f2 = stdin;
- else if ((f2 = fopen(f2_name, "r")) == NULL) {
+ else if ((f2 = fopen(f2_name, "rb")) == NULL) {
perror(f2_name);
fprintf(stderr,
"pixblend: cannot open \"%s\" for reading\n",
Modified: brlcad/trunk/src/util/pixclump.c
===================================================================
--- brlcad/trunk/src/util/pixclump.c 2020-07-25 16:27:23 UTC (rev 76497)
+++ brlcad/trunk/src/util/pixclump.c 2020-07-25 16:40:42 UTC (rev 76498)
@@ -112,7 +112,7 @@
unsigned char rgb[3];
struct bu_vls v = BU_VLS_INIT_ZERO;
- if ((fp = fopen(f_name, "r")) == NULL)
+ if ((fp = fopen(f_name, "rb")) == NULL)
bu_exit(1, "Cannot open color file '%s'\n", bu_optarg);
for (line_nm = 1; bu_vls_gets(&v, fp) != -1;
@@ -230,11 +230,11 @@
*/
if (infp == NULL) {
inf_name = argv[bu_optind];
- if ((infp = fopen(inf_name, "r")) == NULL)
+ if ((infp = fopen(inf_name, "rb")) == NULL)
bu_exit(1, "Cannot open input file '%s'\n", inf_name);
if (outfp == NULL) {
outf_name = argv[++bu_optind];
- if ((outfp = fopen(outf_name, "w")) == NULL)
+ if ((outfp = fopen(outf_name, "wb")) == NULL)
bu_exit(1, "Cannot open output file '%s'\n", outf_name);
}
}
Modified: brlcad/trunk/src/util/pixcolors.c
===================================================================
--- brlcad/trunk/src/util/pixcolors.c 2020-07-25 16:27:23 UTC (rev 76497)
+++ brlcad/trunk/src/util/pixcolors.c 2020-07-25 16:40:42 UTC (rev 76498)
@@ -147,7 +147,7 @@
usage();
if (bu_optind == ac-1) {
FILE *fd;
- if ((fd=fopen(av[bu_optind], "r")) == (FILE *)NULL) {
+ if ((fd=fopen(av[bu_optind], "rb")) == (FILE *)NULL) {
perror(av[bu_optind]);
bu_exit (1, NULL);
}
Modified: brlcad/trunk/src/util/pixcount.cpp
===================================================================
--- brlcad/trunk/src/util/pixcount.cpp 2020-07-25 16:27:23 UTC (rev 76497)
+++ brlcad/trunk/src/util/pixcount.cpp 2020-07-25 16:40:42 UTC (rev 76498)
@@ -208,11 +208,11 @@
*/
if (infp == NULL) {
inf_name = argv[bu_optind];
- if ((infp = fopen(inf_name, "r")) == NULL)
+ if ((infp = fopen(inf_name, "rb")) == NULL)
bu_exit(1, "Cannot open input file '%s'\n", inf_name);
if (outfp == NULL) {
outf_name = argv[++bu_optind];
- if ((outfp = fopen(outf_name, "w")) == NULL)
+ if ((outfp = fopen(outf_name, "wb")) == NULL)
bu_exit(1, "Cannot open output file '%s'\n", outf_name);
}
}
Modified: brlcad/trunk/src/util/pixcrop.c
===================================================================
--- brlcad/trunk/src/util/pixcrop.c 2020-07-25 16:27:23 UTC (rev 76497)
+++ brlcad/trunk/src/util/pixcrop.c 2020-07-25 16:40:42 UTC (rev 76498)
@@ -131,7 +131,7 @@
if ((ifp = fopen(argv[1], "rb")) == NULL) {
bu_exit(2, "bwcrop: can't open %s for reading\n", argv[1]);
}
- if ((ofp = fopen(argv[2], "w")) == NULL) {
+ if ((ofp = fopen(argv[2], "wb")) == NULL) {
bu_exit(3, "bwcrop: can't open %s for writing\n", argv[2]);
}
Modified: brlcad/trunk/src/util/pixdiff.c
===================================================================
--- brlcad/trunk/src/util/pixdiff.c 2020-07-25 16:27:23 UTC (rev 76497)
+++ brlcad/trunk/src/util/pixdiff.c 2020-07-25 16:40:42 UTC (rev 76498)
@@ -84,7 +84,7 @@
}
if (BU_STR_EQUAL(argv[2], "-"))
f2 = stdin;
- else if ((f2 = fopen(argv[2], "r")) == NULL) {
+ else if ((f2 = fopen(argv[2], "rb")) == NULL) {
perror(argv[2]);
return 1;
}
Modified: brlcad/trunk/src/util/pixinterp2x.c
===================================================================
--- brlcad/trunk/src/util/pixinterp2x.c 2020-07-25 16:27:23 UTC (rev 76497)
+++ brlcad/trunk/src/util/pixinterp2x.c 2020-07-25 16:40:42 UTC (rev 76498)
@@ -73,7 +73,7 @@
}
}
if (argv[bu_optind] != NULL) {
- if ((infp = fopen(argv[bu_optind], "r")) == NULL) {
+ if ((infp = fopen(argv[bu_optind], "rb")) == NULL) {
perror(argv[bu_optind]);
return 0;
}
Modified: brlcad/trunk/src/util/pixmerge.c
===================================================================
--- brlcad/trunk/src/util/pixmerge.c 2020-07-25 16:27:23 UTC (rev 76497)
+++ brlcad/trunk/src/util/pixmerge.c 2020-07-25 16:40:42 UTC (rev 76498)
@@ -140,7 +140,7 @@
f1_name = argv[bu_optind++];
if (BU_STR_EQUAL(f1_name, "-"))
f1 = stdin;
- else if ((f1 = fopen(f1_name, "r")) == NULL) {
+ else if ((f1 = fopen(f1_name, "rb")) == NULL) {
perror(f1_name);
fprintf(stderr,
"pixmerge: cannot open \"%s\" for reading\n",
@@ -152,7 +152,7 @@
f2_name = argv[bu_optind++];
if (BU_STR_EQUAL(f2_name, "-"))
f2 = stdin;
- else if ((f2 = fopen(f2_name, "r")) == NULL) {
+ else if ((f2 = fopen(f2_name, "rb")) == NULL) {
perror(f2_name);
fprintf(stderr,
"pixmerge: cannot open \"%s\" for reading\n",
Modified: brlcad/trunk/src/util/pixmorph.c
===================================================================
--- brlcad/trunk/src/util/pixmorph.c 2020-07-25 16:27:23 UTC (rev 76497)
+++ brlcad/trunk/src/util/pixmorph.c 2020-07-25 16:40:42 UTC (rev 76498)
@@ -427,17 +427,17 @@
return 1;
}
- picA = fopen(picAname, "r");
+ picA = fopen(picAname, "rb");
if (picA == NULL) {
fprintf(stderr, "pixmorph: cannot open %s\n", picAname);
return 1;
}
- picB = fopen(picBname, "r");
+ picB = fopen(picBname, "rb");
if (picB == NULL) {
fprintf(stderr, "pixmorph: cannot open %s\n", picBname);
return 1;
}
- linesfile = fopen(linesfilename, "r");
+ linesfile = fopen(linesfilename, "rb");
if (linesfile == NULL) {
fprintf(stderr, "pixmorph: cannot open %s\n", linesfilename);
return 1;
Modified: brlcad/trunk/src/util/pixuntile.c
===================================================================
--- brlcad/trunk/src/util/pixuntile.c 2020-07-25 16:27:23 UTC (rev 76497)
+++ brlcad/trunk/src/util/pixuntile.c 2020-07-25 16:40:42 UTC (rev 76498)
@@ -148,7 +148,7 @@
} else {
snprintf(name, sizeof(name), "%s.%d", base_name,
framenumber);
}
- if ((f[i] = fopen(name, "w")) == NULL) {
+ if ((f[i] = fopen(name, "wb")) == NULL) {
perror(name);
goto done;
}
Modified: brlcad/trunk/src/util/plot3-dm.c
===================================================================
--- brlcad/trunk/src/util/plot3-dm.c 2020-07-25 16:27:23 UTC (rev 76497)
+++ brlcad/trunk/src/util/plot3-dm.c 2020-07-25 16:40:42 UTC (rev 76498)
@@ -589,7 +589,7 @@
char *bnp;
file = argv[i];
- if ((fp = fopen(file, "r")) == NULL) {
+ if ((fp = fopen(file, "rb")) == NULL) {
bu_log("%s: can't open \"%s\"\n", argv[0], file);
continue;
}
Modified: brlcad/trunk/src/util/plot3rot.c
===================================================================
--- brlcad/trunk/src/util/plot3rot.c 2020-07-25 16:27:23 UTC (rev 76497)
+++ brlcad/trunk/src/util/plot3rot.c 2020-07-25 16:40:42 UTC (rev 76498)
@@ -342,7 +342,7 @@
fclose(fp);
if (BU_STR_EQUAL(argv[bu_optind], "-"))
fp = stdin;
- else if ((fp = fopen(argv[bu_optind], "r")) == NULL) {
+ else if ((fp = fopen(argv[bu_optind], "rb")) == NULL) {
bu_log("plot3rot: can't open \"%s\"\n", argv[bu_optind]);
continue;
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
