Revision: 76499 http://sourceforge.net/p/brlcad/code/76499 Author: starseeker Date: 2020-07-25 17:40:03 +0000 (Sat, 25 Jul 2020) Log Message: ----------- Put stdin and stdout in binary mode up front for utilities. This won't matter on most platforms, but should help on Windows unless we've got an implicit assumption of O_TEXT mode sneaking in there somewhere.
Modified Paths: -------------- brlcad/trunk/src/util/alias-pix.c brlcad/trunk/src/util/asc-plot3.c brlcad/trunk/src/util/bw-a.c brlcad/trunk/src/util/bw-ps.c brlcad/trunk/src/util/bwdiff.c brlcad/trunk/src/util/bwhist.c brlcad/trunk/src/util/bwrot.c brlcad/trunk/src/util/bwscale.c brlcad/trunk/src/util/bwshrink.c brlcad/trunk/src/util/bwstat.c brlcad/trunk/src/util/decimate.c brlcad/trunk/src/util/double-asc.c brlcad/trunk/src/util/gencolor.c brlcad/trunk/src/util/halftone.c brlcad/trunk/src/util/mac-pix.c brlcad/trunk/src/util/pix-alias.c brlcad/trunk/src/util/pix-ppm.c brlcad/trunk/src/util/pix-ps.c brlcad/trunk/src/util/pix-sun.c brlcad/trunk/src/util/pixbgstrip.c brlcad/trunk/src/util/pixblend.c brlcad/trunk/src/util/pixborder.c brlcad/trunk/src/util/pixclump.c brlcad/trunk/src/util/pixcolors.c brlcad/trunk/src/util/pixcount.cpp brlcad/trunk/src/util/pixdiff.c brlcad/trunk/src/util/pixelswap.c brlcad/trunk/src/util/pixembed.c brlcad/trunk/src/util/pixfilter.c brlcad/trunk/src/util/pixhalve.c brlcad/trunk/src/util/pixhist.c brlcad/trunk/src/util/pixhist3d-plot3.c brlcad/trunk/src/util/pixhist3d.c brlcad/trunk/src/util/pixinterp2x.c brlcad/trunk/src/util/pixmerge.c brlcad/trunk/src/util/pixrot.c brlcad/trunk/src/util/pixsaturate.c brlcad/trunk/src/util/pixscale.c brlcad/trunk/src/util/pixshrink.c brlcad/trunk/src/util/pixstat.c brlcad/trunk/src/util/pixtile.c brlcad/trunk/src/util/pixuntile.c brlcad/trunk/src/util/plot3-asc.c brlcad/trunk/src/util/plot3-plot3.c brlcad/trunk/src/util/plot3-ps.c brlcad/trunk/src/util/plot3color.c brlcad/trunk/src/util/plot3getframe.c brlcad/trunk/src/util/plot3line2.c brlcad/trunk/src/util/plot3rot.c brlcad/trunk/src/util/plot3stat.c brlcad/trunk/src/util/png-bw.c brlcad/trunk/src/util/sun-pix.c brlcad/trunk/src/util/wavelet.c Modified: brlcad/trunk/src/util/alias-pix.c =================================================================== --- brlcad/trunk/src/util/alias-pix.c 2020-07-25 16:40:42 UTC (rev 76498) +++ brlcad/trunk/src/util/alias-pix.c 2020-07-25 17:40:03 UTC (rev 76499) @@ -69,6 +69,9 @@ if (ac > 2 || isatty(fileno(stdin))) usage(); + setmode(fileno(stdin), O_BINARY); + setmode(fileno(stdout), O_BINARY); + if (ac > 1) { p = av[1]; if (*p == '-' && *(p+1) == 'v') verbose = 1; Modified: brlcad/trunk/src/util/asc-plot3.c =================================================================== --- brlcad/trunk/src/util/asc-plot3.c 2020-07-25 16:40:42 UTC (rev 76498) +++ brlcad/trunk/src/util/asc-plot3.c 2020-07-25 17:40:03 UTC (rev 76499) @@ -83,6 +83,10 @@ if (argc > 3) { printusage(); } + + setmode(fileno(stdin), O_BINARY); + setmode(fileno(stdout), O_BINARY); + fp[0] = stdin; fp[1] = stdout; for (i = 0; (i < 2) && (--argc > 0); ++i) { Modified: brlcad/trunk/src/util/bw-a.c =================================================================== --- brlcad/trunk/src/util/bw-a.c 2020-07-25 16:40:42 UTC (rev 76498) +++ brlcad/trunk/src/util/bw-a.c 2020-07-25 17:40:03 UTC (rev 76499) @@ -118,6 +118,9 @@ bu_setprogname(argv[0]); + setmode(fileno(stdin), O_BINARY); + setmode(fileno(stdout), O_BINARY); + if (!get_args(argc, argv)) { (void) fputs(usage, stderr); bu_exit (1, NULL); Modified: brlcad/trunk/src/util/bw-ps.c =================================================================== --- brlcad/trunk/src/util/bw-ps.c 2020-07-25 16:40:42 UTC (rev 76498) +++ brlcad/trunk/src/util/bw-ps.c 2020-07-25 17:40:03 UTC (rev 76499) @@ -182,18 +182,23 @@ int main(int argc, char **argv) { - FILE *ofp = stdout; size_t num = 0; size_t scans_per_patch, bytes_per_patch; size_t y; + FILE *ofp = NULL; bu_setprogname(argv[0]); + setmode(fileno(stdin), O_BINARY); + setmode(fileno(stdout), O_BINARY); + if (!get_args(argc, argv)) { (void)fputs(usage, stderr); bu_exit (1, NULL); } + ofp = stdout; + if (encapsulated) { xpoints = width; ypoints = height; Modified: brlcad/trunk/src/util/bwdiff.c =================================================================== --- brlcad/trunk/src/util/bwdiff.c 2020-07-25 16:40:42 UTC (rev 76498) +++ brlcad/trunk/src/util/bwdiff.c 2020-07-25 17:40:03 UTC (rev 76499) @@ -58,12 +58,13 @@ open_file(FILE **fp, char *name) { /* check for special names */ - if (BU_STR_EQUAL(name, "-")) + if (BU_STR_EQUAL(name, "-")) { *fp = stdin; - else if (BU_STR_EQUAL(name, ".")) + } else if (BU_STR_EQUAL(name, ".")) { *fp = fopen("/dev/null", "rb"); - else if ((*fp = fopen(name, "rb")) == NULL) + } else if ((*fp = fopen(name, "rb")) == NULL) { bu_exit(2, "bwdiff: Can't open \"%s\"\n", name); + } } @@ -75,6 +76,8 @@ size_t ret; bu_setprogname(argv[0]); + setmode(fileno(stdin), O_BINARY); + setmode(fileno(stdout), O_BINARY); while (argc > 3) { if (BU_STR_EQUAL(argv[1], "-m")) { Modified: brlcad/trunk/src/util/bwhist.c =================================================================== --- brlcad/trunk/src/util/bwhist.c 2020-07-25 16:40:42 UTC (rev 76498) +++ brlcad/trunk/src/util/bwhist.c 2020-07-25 17:40:03 UTC (rev 76499) @@ -58,6 +58,8 @@ FILE *fp; bu_setprogname(argv[0]); + setmode(fileno(stdin), O_BINARY); + setmode(fileno(stdout), O_BINARY); if (BU_STR_EQUAL(argv[1], "-h") || BU_STR_EQUAL(argv[1], "-?")) bu_exit(1, "%s", Usage); @@ -76,9 +78,9 @@ } argv++; argc--; - } else + } else { fp = stdin; - + } /* check usage */ if (argc > 1 || isatty(fileno(fp))) bu_exit(1, "%s", Usage); Modified: brlcad/trunk/src/util/bwrot.c =================================================================== --- brlcad/trunk/src/util/bwrot.c 2020-07-25 16:40:42 UTC (rev 76498) +++ brlcad/trunk/src/util/bwrot.c 2020-07-25 17:40:03 UTC (rev 76499) @@ -304,9 +304,12 @@ double angle = 0.0; ssize_t io; + bu_setprogname(argv[0]); + + setmode(fileno(stdin), O_BINARY); + setmode(fileno(stdout), O_BINARY); ifp = stdin; ofp = stdout; - bu_setprogname(argv[0]); if (!get_args(argc, argv, &ifp, &ofp, &angle)) { bu_exit(1, "%s", usage); Modified: brlcad/trunk/src/util/bwscale.c =================================================================== --- brlcad/trunk/src/util/bwscale.c 2020-07-25 16:40:42 UTC (rev 76498) +++ brlcad/trunk/src/util/bwscale.c 2020-07-25 17:40:03 UTC (rev 76499) @@ -396,6 +396,9 @@ bu_setprogname(argv[0]); + setmode(fileno(stdin), O_BINARY); + setmode(fileno(stdout), O_BINARY); + if (!get_args(argc, argv) || isatty(fileno(stdout))) bu_exit(1, "%s", usage); Modified: brlcad/trunk/src/util/bwshrink.c =================================================================== --- brlcad/trunk/src/util/bwshrink.c 2020-07-25 16:40:42 UTC (rev 76498) +++ brlcad/trunk/src/util/bwshrink.c 2020-07-25 17:40:03 UTC (rev 76499) @@ -186,6 +186,8 @@ usage(); /* process stdin */ + setmode(fileno(stdin), O_BINARY); + setmode(fileno(stdout), O_BINARY); /* get buffer for image */ size = width * height; Modified: brlcad/trunk/src/util/bwstat.c =================================================================== --- brlcad/trunk/src/util/bwstat.c 2020-07-25 16:40:42 UTC (rev 76498) +++ brlcad/trunk/src/util/bwstat.c 2020-07-25 17:40:03 UTC (rev 76499) @@ -83,6 +83,9 @@ bu_setprogname(argv[0]); + setmode(fileno(stdin), O_BINARY); + setmode(fileno(stdout), O_BINARY); + if (BU_STR_EQUAL(argv[1], "-h") || BU_STR_EQUAL(argv[1], "-?")) bu_exit(1, "%s", Usage); Modified: brlcad/trunk/src/util/decimate.c =================================================================== --- brlcad/trunk/src/util/decimate.c 2020-07-25 16:40:42 UTC (rev 76498) +++ brlcad/trunk/src/util/decimate.c 2020-07-25 17:40:03 UTC (rev 76499) @@ -71,6 +71,9 @@ bu_setprogname(argv[0]); + setmode(fileno(stdin), O_BINARY); + setmode(fileno(stdout), O_BINARY); + if (argc < 4) { bu_exit (1, "%s", usage); } Modified: brlcad/trunk/src/util/double-asc.c =================================================================== --- brlcad/trunk/src/util/double-asc.c 2020-07-25 16:40:42 UTC (rev 76498) +++ brlcad/trunk/src/util/double-asc.c 2020-07-25 17:40:03 UTC (rev 76499) @@ -163,6 +163,9 @@ bu_setprogname(argv[0]); + setmode(fileno(stdin), O_BINARY); + setmode(fileno(stdout), O_BINARY); + bu_log("DEPRECATION WARNING: This command is scheduled for removal. Please contact the developers if you use this command.\n\n"); bu_snooze(BU_SEC2USEC(1)); Modified: brlcad/trunk/src/util/gencolor.c =================================================================== --- brlcad/trunk/src/util/gencolor.c 2020-07-25 16:40:42 UTC (rev 76498) +++ brlcad/trunk/src/util/gencolor.c 2020-07-25 17:40:03 UTC (rev 76499) @@ -122,6 +122,9 @@ bu_setprogname(argv[0]); + setmode(fileno(stdin), O_BINARY); + setmode(fileno(stdout), O_BINARY); + get_args(argc, argv); argc = argc - bu_optind + 1; argv = argv + bu_optind - 1; Modified: brlcad/trunk/src/util/halftone.c =================================================================== --- brlcad/trunk/src/util/halftone.c 2020-07-25 16:40:42 UTC (rev 76498) +++ brlcad/trunk/src/util/halftone.c 2020-07-25 17:40:03 UTC (rev 76499) @@ -922,22 +922,26 @@ size_t ret; bu_setprogname(argv[0]); -/* - * parameter processing. - */ + + setmode(fileno(stdin), O_BINARY); + setmode(fileno(stdout), O_BINARY); + + /* + * parameter processing. + */ setup(argc, argv); -/* - * Get a tone map. Map is the result. 1.0 is slope, 0.0 is - * the Y intercept (y=mx+b). 0 is the address of a function to - * do a x to y mapping, 0 means use the default function. - */ + /* + * Get a tone map. Map is the result. 1.0 is slope, 0.0 is + * the Y intercept (y=mx+b). 0 is the address of a function to + * do a x to y mapping, 0 means use the default function. + */ (void) tonescale(Map, 1.0, 0.0, 0); -/* - * Currently the halftone file is scaled from 0 to 255 on output to - * ease display via bw-fb. In the future there might be flag to - * set Scale to 1 to get a unscaled output. - */ + /* + * Currently the halftone file is scaled from 0 to 255 on output to + * ease display via bw-fb. In the future there might be flag to + * set Scale to 1 to get a unscaled output. + */ Scale = 255/Levels; if (Debug) { @@ -951,33 +955,33 @@ Line = (unsigned char *) bu_malloc(width, "Line"); Out = (unsigned char *) bu_malloc(width, "Out"); -/* - * should be a test here to make sure we got the memory requested. - */ + /* + * should be a test here to make sure we got the memory requested. + */ -/* - * Currently only the Floyd-Steinberg method uses the surpent flag - * so we make things easy with in the 'y' loop by resetting surpent - * for all other methods to "No Surpent". - */ + /* + * Currently only the Floyd-Steinberg method uses the surpent flag + * so we make things easy with in the 'y' loop by resetting surpent + * for all other methods to "No Surpent". + */ if (Method != M_FLOYD) Surpent = 0; for (y=0; y<height; y++) { int NextX; -/* - * A few of the methods benefit by knowing when a new line is - * started. - */ + /* + * A few of the methods benefit by knowing when a new line is + * started. + */ NewFlag = 1; (void) sharpen(Line, 1, width, stdin, Map); -/* - * Only M_FLOYD will have Surpent != 0. - */ + /* + * Only M_FLOYD will have Surpent != 0. + */ if (Surpent && y % 2) { for (x=width-1; x>=0; x--) { pixel = Line[x]; Out[x] = Scale*tone_floyd(pixel, x, y, x-1, - y+1, NewFlag); + y+1, NewFlag); NewFlag = 0; } } else { @@ -987,19 +991,19 @@ switch (Method) { case M_FOLLY: Out[x] = Scale*tone_folly(pixel, x, y, - NextX, y+1, NewFlag); + NextX, y+1, NewFlag); break; case M_FLOYD: Out[x] = Scale*tone_floyd(pixel, x, y, - NextX, y+1, NewFlag); + NextX, y+1, NewFlag); break; case M_THRESH: Out[x]=Scale*tone_simple(pixel, x, y, - NextX, y+1, NewFlag); + NextX, y+1, NewFlag); break; case M_CLASSIC: Out[x]=Scale*tone_classic(pixel, x, y, - NextX, y+1, NewFlag); + NextX, y+1, NewFlag); break; } NewFlag=0; Modified: brlcad/trunk/src/util/mac-pix.c =================================================================== --- brlcad/trunk/src/util/mac-pix.c 2020-07-25 16:40:42 UTC (rev 76498) +++ brlcad/trunk/src/util/mac-pix.c 2020-07-25 17:40:03 UTC (rev 76499) @@ -229,6 +229,9 @@ bu_setprogname(argv[0]); + setmode(fileno(stdin), O_BINARY); + setmode(fileno(stdout), O_BINARY); + if (!get_args(argc, argv) || isatty(fileno(stdout))) { (void)fputs(usage, stderr); bu_exit (1, NULL); Modified: brlcad/trunk/src/util/pix-alias.c =================================================================== --- brlcad/trunk/src/util/pix-alias.c 2020-07-25 16:40:42 UTC (rev 76498) +++ brlcad/trunk/src/util/pix-alias.c 2020-07-25 17:40:03 UTC (rev 76499) @@ -148,6 +148,9 @@ progname = *av; if (isatty(fileno(stdin))) usage(); + setmode(fileno(stdin), O_BINARY); + setmode(fileno(stdout), O_BINARY); + /* Get # of options & turn all the option flags off */ optlen = strlen(options); Modified: brlcad/trunk/src/util/pix-ppm.c =================================================================== --- brlcad/trunk/src/util/pix-ppm.c 2020-07-25 16:40:42 UTC (rev 76498) +++ brlcad/trunk/src/util/pix-ppm.c 2020-07-25 17:40:03 UTC (rev 76499) @@ -168,6 +168,9 @@ bu_setprogname(argv[0]); + setmode(fileno(stdin), O_BINARY); + setmode(fileno(stdout), O_BINARY); + /* important to store these before calling get_args(). they're * also not necessarily constants so have to set here instead of * with the declaration. Modified: brlcad/trunk/src/util/pix-ps.c =================================================================== --- brlcad/trunk/src/util/pix-ps.c 2020-07-25 16:40:42 UTC (rev 76498) +++ brlcad/trunk/src/util/pix-ps.c 2020-07-25 17:40:03 UTC (rev 76499) @@ -217,6 +217,9 @@ bu_setprogname(argv[0]); + setmode(fileno(stdin), O_BINARY); + setmode(fileno(stdout), O_BINARY); + if (argc == 1 && isatty(fileno(stdin)) && isatty(fileno(stdout)) ) printusage(); if (!get_args(argc, argv)) Modified: brlcad/trunk/src/util/pix-sun.c =================================================================== --- brlcad/trunk/src/util/pix-sun.c 2020-07-25 16:40:42 UTC (rev 76498) +++ brlcad/trunk/src/util/pix-sun.c 2020-07-25 17:40:03 UTC (rev 76499) @@ -323,6 +323,9 @@ progname = *av; if (isatty(fileno(stdin))) usage(); + setmode(fileno(stdin), O_BINARY); + setmode(fileno(stdout), O_BINARY); + /* Get # of options & turn all the option flags off */ optlen = strlen(options); Modified: brlcad/trunk/src/util/pixbgstrip.c =================================================================== --- brlcad/trunk/src/util/pixbgstrip.c 2020-07-25 16:40:42 UTC (rev 76498) +++ brlcad/trunk/src/util/pixbgstrip.c 2020-07-25 17:40:03 UTC (rev 76499) @@ -134,6 +134,9 @@ bu_exit (1, NULL); } + setmode(fileno(stdin), O_BINARY); + setmode(fileno(stdout), O_BINARY); + /* autosize input? */ if (fileinput && autosize) { size_t w, h; Modified: brlcad/trunk/src/util/pixblend.c =================================================================== --- brlcad/trunk/src/util/pixblend.c 2020-07-25 16:40:42 UTC (rev 76498) +++ brlcad/trunk/src/util/pixblend.c 2020-07-25 17:40:03 UTC (rev 76499) @@ -170,6 +170,9 @@ bu_exit (1, NULL); } + setmode(fileno(stdin), O_BINARY); + setmode(fileno(stdout), O_BINARY); + if (!iflg && !rflg) { /* Default action: interpolate by 50% */ iflg = 1; Modified: brlcad/trunk/src/util/pixborder.c =================================================================== --- brlcad/trunk/src/util/pixborder.c 2020-07-25 16:40:42 UTC (rev 76498) +++ brlcad/trunk/src/util/pixborder.c 2020-07-25 17:40:03 UTC (rev 76499) @@ -483,6 +483,9 @@ bu_setprogname(argv[0]); + setmode(fileno(stdin), O_BINARY); + setmode(fileno(stdout), O_BINARY); + VSETALL(border_rgb, 1); rgb_to_hsv(border_rgb, border_hsv); VSETALL(exterior_rgb, 1); Modified: brlcad/trunk/src/util/pixclump.c =================================================================== --- brlcad/trunk/src/util/pixclump.c 2020-07-25 16:40:42 UTC (rev 76498) +++ brlcad/trunk/src/util/pixclump.c 2020-07-25 17:40:03 UTC (rev 76499) @@ -177,6 +177,9 @@ bu_setprogname(argv[0]); + setmode(fileno(stdin), O_BINARY); + setmode(fileno(stdout), O_BINARY); + /* * Initialize the color table */ Modified: brlcad/trunk/src/util/pixcolors.c =================================================================== --- brlcad/trunk/src/util/pixcolors.c 2020-07-25 16:40:42 UTC (rev 76498) +++ brlcad/trunk/src/util/pixcolors.c 2020-07-25 17:40:03 UTC (rev 76499) @@ -128,6 +128,9 @@ progname = *av; + setmode(fileno(stdin), O_BINARY); + setmode(fileno(stdout), O_BINARY); + /* Get # of options & turn all the option flags off */ Modified: brlcad/trunk/src/util/pixcount.cpp =================================================================== --- brlcad/trunk/src/util/pixcount.cpp 2020-07-25 16:40:42 UTC (rev 76498) +++ brlcad/trunk/src/util/pixcount.cpp 2020-07-25 17:40:03 UTC (rev 76499) @@ -176,6 +176,9 @@ bu_setprogname(argv[0]); + setmode(fileno(stdin), O_BINARY); + setmode(fileno(stdout), O_BINARY); + /* * Process the command line */ Modified: brlcad/trunk/src/util/pixdiff.c =================================================================== --- brlcad/trunk/src/util/pixdiff.c 2020-07-25 16:40:42 UTC (rev 76498) +++ brlcad/trunk/src/util/pixdiff.c 2020-07-25 17:40:03 UTC (rev 76499) @@ -72,6 +72,9 @@ bu_setprogname(argv[0]); + setmode(fileno(stdin), O_BINARY); + setmode(fileno(stdout), O_BINARY); + if (argc != 3 || isatty(fileno(stdout))) { bu_exit(1, "Usage: pixdiff f1.pix f2.pix >file.pix\n"); } Modified: brlcad/trunk/src/util/pixelswap.c =================================================================== --- brlcad/trunk/src/util/pixelswap.c 2020-07-25 16:40:42 UTC (rev 76498) +++ brlcad/trunk/src/util/pixelswap.c 2020-07-25 17:40:03 UTC (rev 76499) @@ -99,7 +99,10 @@ bu_setprogname(av[0]); - i=parse_args(ac, av); + setmode(fileno(stdin), O_BINARY); + setmode(fileno(stdout), O_BINARY); + + i=parse_args(ac, av); /* if ac == 1, there is only 1 argument; i.e., run-with-no-arguments */ if (ac == 1) usage(""); Modified: brlcad/trunk/src/util/pixembed.c =================================================================== --- brlcad/trunk/src/util/pixembed.c 2020-07-25 16:40:42 UTC (rev 76498) +++ brlcad/trunk/src/util/pixembed.c 2020-07-25 17:40:03 UTC (rev 76499) @@ -127,6 +127,9 @@ bu_setprogname(argv[0]); + setmode(fileno(stdin), O_BINARY); + setmode(fileno(stdout), O_BINARY); + if (!get_args(argc, argv) || isatty(fileno(stdout))) { (void)fputs(usage, stderr); bu_exit (1, NULL); Modified: brlcad/trunk/src/util/pixfilter.c =================================================================== --- brlcad/trunk/src/util/pixfilter.c 2020-07-25 16:40:42 UTC (rev 76498) +++ brlcad/trunk/src/util/pixfilter.c 2020-07-25 17:40:03 UTC (rev 76499) @@ -150,6 +150,9 @@ bu_setprogname(argv[0]); + setmode(fileno(stdin), O_BINARY); + setmode(fileno(stdout), O_BINARY); + /* Select Default Filter (low pass) */ select_filter("low"); Modified: brlcad/trunk/src/util/pixhalve.c =================================================================== --- brlcad/trunk/src/util/pixhalve.c 2020-07-25 16:40:42 UTC (rev 76498) +++ brlcad/trunk/src/util/pixhalve.c 2020-07-25 17:40:03 UTC (rev 76499) @@ -321,6 +321,9 @@ bu_setprogname(argv[0]); + setmode(fileno(stdin), O_BINARY); + setmode(fileno(stdout), O_BINARY); + if (!get_args(argc, argv)) { (void)fputs(usage, stderr); bu_exit (1, NULL); Modified: brlcad/trunk/src/util/pixhist.c =================================================================== --- brlcad/trunk/src/util/pixhist.c 2020-07-25 16:40:42 UTC (rev 76498) +++ brlcad/trunk/src/util/pixhist.c 2020-07-25 17:40:03 UTC (rev 76499) @@ -61,6 +61,9 @@ bu_setprogname(argv[0]); + setmode(fileno(stdin), O_BINARY); + setmode(fileno(stdout), O_BINARY); + /* check for verbose flag */ if (argc > 1 && BU_STR_EQUAL(argv[1], "-v")) { verbose++; Modified: brlcad/trunk/src/util/pixhist3d-plot3.c =================================================================== --- brlcad/trunk/src/util/pixhist3d-plot3.c 2020-07-25 16:40:42 UTC (rev 76498) +++ brlcad/trunk/src/util/pixhist3d-plot3.c 2020-07-25 17:40:03 UTC (rev 76499) @@ -58,6 +58,9 @@ bu_setprogname(argv[0]); + setmode(fileno(stdin), O_BINARY); + setmode(fileno(stdout), O_BINARY); + if (argc > 1) { if ((fp = fopen(argv[1], "rb")) == NULL) { fprintf(stderr, "%s", Usage); Modified: brlcad/trunk/src/util/pixhist3d.c =================================================================== --- brlcad/trunk/src/util/pixhist3d.c 2020-07-25 16:40:42 UTC (rev 76498) +++ brlcad/trunk/src/util/pixhist3d.c 2020-07-25 17:40:03 UTC (rev 76499) @@ -70,6 +70,9 @@ bu_setprogname(argv[0]); + setmode(fileno(stdin), O_BINARY); + setmode(fileno(stdout), O_BINARY); + if (argc > 1) { if ( BU_STR_EQUAL(argv[1],"-h") || BU_STR_EQUAL(argv[1],"-?")) bu_exit(2, "%s", Usage); Modified: brlcad/trunk/src/util/pixinterp2x.c =================================================================== --- brlcad/trunk/src/util/pixinterp2x.c 2020-07-25 16:40:42 UTC (rev 76498) +++ brlcad/trunk/src/util/pixinterp2x.c 2020-07-25 17:40:03 UTC (rev 76499) @@ -97,6 +97,9 @@ bu_setprogname(argv[0]); + setmode(fileno(stdin), O_BINARY); + setmode(fileno(stdout), O_BINARY); + infp = stdin; if (!get_args(argc, argv)) { (void)fputs(usage, stderr); Modified: brlcad/trunk/src/util/pixmerge.c =================================================================== --- brlcad/trunk/src/util/pixmerge.c 2020-07-25 16:40:42 UTC (rev 76498) +++ brlcad/trunk/src/util/pixmerge.c 2020-07-25 17:40:03 UTC (rev 76499) @@ -175,6 +175,9 @@ bu_setprogname(argv[0]); + setmode(fileno(stdin), O_BINARY); + setmode(fileno(stdout), O_BINARY); + if (!get_args(argc, argv) || isatty(fileno(stdout))) { (void)fputs(usage, stderr); bu_exit (1, NULL); Modified: brlcad/trunk/src/util/pixrot.c =================================================================== --- brlcad/trunk/src/util/pixrot.c 2020-07-25 16:40:42 UTC (rev 76498) +++ brlcad/trunk/src/util/pixrot.c 2020-07-25 17:40:03 UTC (rev 76499) @@ -148,6 +148,9 @@ bu_setprogname(argv[0]); + setmode(fileno(stdin), O_BINARY); + setmode(fileno(stdout), O_BINARY); + if (!get_args(argc, argv) || isatty(fileno(stdout))) { bu_exit(1, "%s", usage); } Modified: brlcad/trunk/src/util/pixsaturate.c =================================================================== --- brlcad/trunk/src/util/pixsaturate.c 2020-07-25 16:40:42 UTC (rev 76498) +++ brlcad/trunk/src/util/pixsaturate.c 2020-07-25 17:40:03 UTC (rev 76499) @@ -67,6 +67,9 @@ bu_setprogname(argv[0]); + setmode(fileno(stdin), O_BINARY); + setmode(fileno(stdout), O_BINARY); + if (argc != 2) printusage (); if ( BU_STR_EQUAL(argv[1], "-h") || BU_STR_EQUAL(argv[1], "-?") ) Modified: brlcad/trunk/src/util/pixscale.c =================================================================== --- brlcad/trunk/src/util/pixscale.c 2020-07-25 16:40:42 UTC (rev 76498) +++ brlcad/trunk/src/util/pixscale.c 2020-07-25 17:40:03 UTC (rev 76499) @@ -420,6 +420,9 @@ bu_setprogname(argv[0]); + setmode(fileno(stdin), O_BINARY); + setmode(fileno(stdout), O_BINARY); + if (argc == 1 && isatty(fileno(stdin)) && isatty(fileno(stdout))) bu_exit(1, "%s", usage); if (!get_args(argc, argv) || isatty(fileno(stdout))) Modified: brlcad/trunk/src/util/pixshrink.c =================================================================== --- brlcad/trunk/src/util/pixshrink.c 2020-07-25 16:40:42 UTC (rev 76498) +++ brlcad/trunk/src/util/pixshrink.c 2020-07-25 17:40:03 UTC (rev 76499) @@ -245,6 +245,9 @@ bu_setprogname(av[0]); + setmode(fileno(stdin), O_BINARY); + setmode(fileno(stdout), O_BINARY); + (void)parse_args(ac, av); if (isatty(fileno(stdin))) usage(); Modified: brlcad/trunk/src/util/pixstat.c =================================================================== --- brlcad/trunk/src/util/pixstat.c 2020-07-25 16:40:42 UTC (rev 76498) +++ brlcad/trunk/src/util/pixstat.c 2020-07-25 17:40:03 UTC (rev 76499) @@ -87,6 +87,9 @@ bu_setprogname(argv[0]); + setmode(fileno(stdin), O_BINARY); + setmode(fileno(stdout), O_BINARY); + /* check for verbose flag */ if (argc > 1 && BU_STR_EQUAL(argv[1], "-v")) { verbose++; Modified: brlcad/trunk/src/util/pixtile.c =================================================================== --- brlcad/trunk/src/util/pixtile.c 2020-07-25 16:40:42 UTC (rev 76498) +++ brlcad/trunk/src/util/pixtile.c 2020-07-25 17:40:03 UTC (rev 76499) @@ -119,6 +119,9 @@ bu_setprogname(argv[0]); + setmode(fileno(stdin), O_BINARY); + setmode(fileno(stdout), O_BINARY); + if (!get_args(argc, argv)) { (void)fputs(usage, stderr); bu_exit (1, NULL); Modified: brlcad/trunk/src/util/pixuntile.c =================================================================== --- brlcad/trunk/src/util/pixuntile.c 2020-07-25 16:40:42 UTC (rev 76498) +++ brlcad/trunk/src/util/pixuntile.c 2020-07-25 17:40:03 UTC (rev 76499) @@ -112,6 +112,9 @@ bu_setprogname(argv[0]); + setmode(fileno(stdin), O_BINARY); + setmode(fileno(stdout), O_BINARY); + if (!get_args(argc, argv)) { (void)fputs(usage, stderr); bu_exit (1, NULL); Modified: brlcad/trunk/src/util/plot3-asc.c =================================================================== --- brlcad/trunk/src/util/plot3-asc.c 2020-07-25 16:40:42 UTC (rev 76498) +++ brlcad/trunk/src/util/plot3-asc.c 2020-07-25 17:40:03 UTC (rev 76499) @@ -132,6 +132,9 @@ bu_setprogname(argv[0]); + setmode(fileno(stdin), O_BINARY); + setmode(fileno(stdout), O_BINARY); + while (argc > 1) { if (BU_STR_EQUAL(argv[1], "-v")) { verbose++; Modified: brlcad/trunk/src/util/plot3-plot3.c =================================================================== --- brlcad/trunk/src/util/plot3-plot3.c 2020-07-25 16:40:42 UTC (rev 76498) +++ brlcad/trunk/src/util/plot3-plot3.c 2020-07-25 17:40:03 UTC (rev 76499) @@ -147,6 +147,9 @@ bu_setprogname(argv[0]); + setmode(fileno(stdin), O_BINARY); + setmode(fileno(stdout), O_BINARY); + while (argc > 1) { if (BU_STR_EQUAL(argv[1], "-v")) { verbose++; Modified: brlcad/trunk/src/util/plot3-ps.c =================================================================== --- brlcad/trunk/src/util/plot3-ps.c 2020-07-25 16:40:42 UTC (rev 76498) +++ brlcad/trunk/src/util/plot3-ps.c 2020-07-25 17:40:03 UTC (rev 76499) @@ -424,6 +424,9 @@ bu_setprogname(argv[0]); + setmode(fileno(stdin), O_BINARY); + setmode(fileno(stdout), O_BINARY); + if (!get_args(argc, argv)) { (void)fputs(usage, stderr); bu_exit (1, NULL); Modified: brlcad/trunk/src/util/plot3color.c =================================================================== --- brlcad/trunk/src/util/plot3color.c 2020-07-25 16:40:42 UTC (rev 76498) +++ brlcad/trunk/src/util/plot3color.c 2020-07-25 17:40:03 UTC (rev 76499) @@ -44,6 +44,9 @@ bu_setprogname(argv[0]); + setmode(fileno(stdin), O_BINARY); + setmode(fileno(stdout), O_BINARY); + if (argc != 4 || isatty(fileno(stdout))) { bu_exit(1, "%s", usage); } Modified: brlcad/trunk/src/util/plot3getframe.c =================================================================== --- brlcad/trunk/src/util/plot3getframe.c 2020-07-25 16:40:42 UTC (rev 76498) +++ brlcad/trunk/src/util/plot3getframe.c 2020-07-25 17:40:03 UTC (rev 76499) @@ -124,6 +124,9 @@ bu_setprogname(argv[0]); + setmode(fileno(stdin), O_BINARY); + setmode(fileno(stdout), O_BINARY); + while (argc > 1) { if (BU_STR_EQUAL(argv[1], "-v")) { verbose++; Modified: brlcad/trunk/src/util/plot3line2.c =================================================================== --- brlcad/trunk/src/util/plot3line2.c 2020-07-25 16:40:42 UTC (rev 76498) +++ brlcad/trunk/src/util/plot3line2.c 2020-07-25 17:40:03 UTC (rev 76499) @@ -49,6 +49,9 @@ bu_setprogname(argv[0]); + setmode(fileno(stdin), O_BINARY); + setmode(fileno(stdout), O_BINARY); + if (argc < 5 || isatty(fileno(stdout))) { bu_exit(1, "%s", usage); } Modified: brlcad/trunk/src/util/plot3rot.c =================================================================== --- brlcad/trunk/src/util/plot3rot.c 2020-07-25 16:40:42 UTC (rev 76498) +++ brlcad/trunk/src/util/plot3rot.c 2020-07-25 17:40:03 UTC (rev 76499) @@ -325,6 +325,9 @@ bu_setprogname(argv[0]); + setmode(fileno(stdin), O_BINARY); + setmode(fileno(stdout), O_BINARY); + if (!get_args(argc, argv)) { fputs("Usage: plot3rot [options] [file1 ... fileN] > file.plot3\n", stderr); Modified: brlcad/trunk/src/util/plot3stat.c =================================================================== --- brlcad/trunk/src/util/plot3stat.c 2020-07-25 16:40:42 UTC (rev 76498) +++ brlcad/trunk/src/util/plot3stat.c 2020-07-25 17:40:03 UTC (rev 76499) @@ -147,6 +147,9 @@ bu_setprogname(argv[0]); + setmode(fileno(stdin), O_BINARY); + setmode(fileno(stdout), O_BINARY); + while (argc > 1) { if (BU_STR_EQUAL(argv[1], "-v")) { verbose++; Modified: brlcad/trunk/src/util/png-bw.c =================================================================== --- brlcad/trunk/src/util/png-bw.c 2020-07-25 16:40:42 UTC (rev 76498) +++ brlcad/trunk/src/util/png-bw.c 2020-07-25 17:40:03 UTC (rev 76499) @@ -76,6 +76,9 @@ bu_setprogname(argv[0]); + setmode(fileno(stdin), O_BINARY); + setmode(fileno(stdout), O_BINARY); + while (argc > 1 && argv[1][0] == '-') { if (BU_STR_EQUAL(argv[1], "-v")) verbose = 1; Modified: brlcad/trunk/src/util/sun-pix.c =================================================================== --- brlcad/trunk/src/util/sun-pix.c 2020-07-25 16:40:42 UTC (rev 76498) +++ brlcad/trunk/src/util/sun-pix.c 2020-07-25 17:40:03 UTC (rev 76499) @@ -268,6 +268,9 @@ bu_setprogname(argv[0]); + setmode(fileno(stdin), O_BINARY); + setmode(fileno(stdout), O_BINARY); + fp = stdin; if (!get_args(argc, argv) || (isatty(fileno(stdout)) && (hflag == 0))) { (void)fputs(usage, stderr); Modified: brlcad/trunk/src/util/wavelet.c =================================================================== --- brlcad/trunk/src/util/wavelet.c 2020-07-25 16:40:42 UTC (rev 76498) +++ brlcad/trunk/src/util/wavelet.c 2020-07-25 17:40:03 UTC (rev 76499) @@ -173,6 +173,9 @@ size_t sample_size; /* size of data type x #values/sample */ size_t scanline_size; /* # bytes in a scanline */ + setmode(fileno(stdin), O_BINARY); + setmode(fileno(stdout), O_BINARY); + sample_size = value_size * channels; scanline_size = sample_size * width; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. _______________________________________________ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits