--- libjpeg-turbo-1.5.0/jpegtran.c.fsync 2016-06-07 20:33:40.000000000 +0300 +++ libjpeg-turbo-1.5.0/jpegtran.c 2016-08-19 15:52:07.141190575 +0300 @@ -29,6 +29,8 @@ #endif #endif +#include +#include /* * Argument-parsing code. @@ -43,7 +45,8 @@ static const char *progname; /* progr static char *outfilename; /* for -outfile switch */ static JCOPY_OPTION copyoption; /* -copy switch */ static jpeg_transform_info transformoption; /* image transformation options */ - +static int do_fsync; +static int do_temp; LOCAL(void) usage (void) @@ -86,6 +89,8 @@ usage (void) fprintf(stderr, " -restart N Set restart interval in rows, or in blocks with B\n"); fprintf(stderr, " -maxmemory N Maximum memory to use (in kbytes)\n"); fprintf(stderr, " -outfile name Specify name for output file\n"); + fprintf(stderr, " -fsync fsync output file prior to closing\n"); + fprintf(stderr, " -temp write output to temp file and replace original input\n"); fprintf(stderr, " -verbose or -debug Emit debug output\n"); fprintf(stderr, " -version Print version information and exit\n"); fprintf(stderr, "Switches for wizards:\n"); @@ -267,6 +272,14 @@ parse_switches (j_compress_ptr cinfo, in usage(); outfilename = argv[argn]; /* save it away for later use */ + } else if (keymatch(arg, "fsync", 2)) { + /* Set fsync flag */ + do_fsync = 1; + + } else if (keymatch(arg, "temp", 2)) { + /* Set temp flag */ + do_temp = 1; + } else if (keymatch(arg, "perfect", 2)) { /* Fail if there is any partial edge MCUs that the transform can't * handle. */ @@ -381,10 +394,13 @@ main (int argc, char **argv) jvirt_barray_ptr *src_coef_arrays; jvirt_barray_ptr *dst_coef_arrays; int file_index; + int inputfile_index; /* We assume all-in-memory processing and can therefore use only a * single file pointer for sequential input and output operation. */ FILE *fp; + int ioerror = 0; + char outtemp[4096]; /* On Mac, fetch a command line. */ #ifdef USE_CCOMMAND @@ -444,7 +460,13 @@ main (int argc, char **argv) fprintf(stderr, "%s: can't open %s for reading\n", progname, argv[file_index]); exit(EXIT_FAILURE); } + inputfile_index = file_index; } else { + if (do_temp) { + fprintf(stderr, "%s: temp mode can not be used when reading " + "from stdin\n", progname); + exit(EXIT_FAILURE); + } /* default input file is stdin */ fp = read_stdin(); } @@ -503,13 +525,40 @@ main (int argc, char **argv) /* Open the output file. */ if (outfilename != NULL) { - if ((fp = fopen(outfilename, WRITE_BINARY)) == NULL) { + if (do_temp) { + fprintf(stderr, "%s: outfile parameter incompatible with temp mode\n", progname); + exit(EXIT_FAILURE); + } else if ((fp = fopen(outfilename, WRITE_BINARY)) == NULL) { fprintf(stderr, "%s: can't open %s for writing\n", progname, outfilename); exit(EXIT_FAILURE); } } else { - /* default output file is stdout */ - fp = write_stdout(); + if (do_temp) { + int fd; + int snret; + + snret = snprintf(outtemp, sizeof(outtemp), "%s.tmp.XXXXXX", argv[inputfile_index]); + if (snret < 0 || snret >= sizeof(outtemp)) { + fprintf(stderr, "%s: snprintf buffer overflow\n", progname); + exit(EXIT_FAILURE); + } + fd = mkstemp(outtemp); + if (fd == -1) { + fprintf(stderr, "%s: can't open temporary file: %s\n", + progname, strerror(errno)); + exit(EXIT_FAILURE); + } + fp = fdopen(fd, WRITE_BINARY); + outfilename = outtemp; + if (fp == NULL) { + fprintf(stderr, "%s: can't fdopen temporary file: %s\n", + progname, strerror(errno)); + exit(EXIT_FAILURE); + } + } else { + /* default output file is stdout */ + fp = write_stdout(); + } } /* Adjust default compression parameters by re-parsing the options */ @@ -537,9 +586,32 @@ main (int argc, char **argv) (void) jpeg_finish_decompress(&srcinfo); jpeg_destroy_decompress(&srcinfo); - /* Close output file, if we opened it */ - if (fp != stdout) - fclose(fp); + if (fflush(fp) == EOF) { + fprintf(stderr, "%s: failed to write to %s: %s\n", + progname, outfilename, strerror(errno)); + ioerror = 1; + } + if (do_fsync && (fsync(fileno(fp)) == -1)) { + if (errno != EINVAL) { + fprintf(stderr, "%s: failed to fsync %s: %s\n", + progname, outfilename, strerror(errno)); + ioerror = 1; + } + } + if (fp != stdout) { + if (fclose(fp) == EOF) { + fprintf(stderr, "%s: failed to close %s: %s\n", + progname, outfilename, strerror(errno)); + ioerror = 1; + } + if (do_temp) { + if (rename(outtemp, argv[inputfile_index]) == -1) { + fprintf(stderr, "%s: failed to rename %s to %s: %s\n", + progname, outtemp, argv[inputfile_index], strerror(errno)); + ioerror = 1; + } + } + } #ifdef PROGRESS_REPORT end_progress_monitor((j_common_ptr) &dstinfo); --- libjpeg-turbo-1.5.0/cjpeg.c.fsync 2016-06-07 20:33:39.000000000 +0300 +++ libjpeg-turbo-1.5.0/cjpeg.c 2016-08-19 15:50:36.641788157 +0300 @@ -41,6 +41,8 @@ #endif #endif +#include +#include /* Create the add-on message string table. */ @@ -79,7 +81,7 @@ static const char * const cdjpeg_message */ static boolean is_targa; /* records user -targa switch */ - +static boolean do_fsync; LOCAL(cjpeg_source_ptr) select_file_type (j_compress_ptr cinfo, FILE *infile) @@ -193,6 +195,7 @@ usage (void) #if JPEG_LIB_VERSION >= 80 || defined(MEM_SRCDST_SUPPORTED) fprintf(stderr, " -memdst Compress to memory instead of file (useful for benchmarking)\n"); #endif + fprintf(stderr, " -fsync fsync output file prior to closing\n"); fprintf(stderr, " -verbose or -debug Emit debug output\n"); fprintf(stderr, " -version Print version information and exit\n"); fprintf(stderr, "Switches for wizards:\n"); @@ -336,6 +339,10 @@ parse_switches (j_compress_ptr cinfo, in usage(); outfilename = argv[argn]; /* save it away for later use */ + } else if (keymatch(arg, "fsync", 2)) { + /* Set fsync flag */ + do_fsync = 1; + } else if (keymatch(arg, "progressive", 1)) { /* Select simple progressive mode. */ #ifdef C_PROGRESSIVE_SUPPORTED @@ -500,6 +507,7 @@ main (int argc, char **argv) unsigned char *outbuffer = NULL; unsigned long outsize = 0; JDIMENSION num_scanlines; + int ioerror = 0; /* On Mac, fetch a command line. */ #ifdef USE_CCOMMAND @@ -625,8 +633,25 @@ main (int argc, char **argv) /* Close files, if we opened them */ if (input_file != stdin) fclose(input_file); + + if (fflush(output_file) == EOF) { + fprintf(stderr, "%s: failed to write to %s: %s\n", + progname, outfilename, strerror(errno)); + ioerror = 1; + } + if (do_fsync && (fsync(fileno(output_file)) == -1)) { + if (errno != EINVAL) { + fprintf(stderr, "%s: failed to fsync %s: %s\n", + progname, outfilename, strerror(errno)); + ioerror = 1; + } + } if (output_file != stdout && output_file != NULL) - fclose(output_file); + if (fclose(output_file) == EOF) { + fprintf(stderr, "%s: failed to close %s: %s\n", + progname, outfilename, strerror(errno)); + ioerror = 1; + } #ifdef PROGRESS_REPORT end_progress_monitor((j_common_ptr) &cinfo); @@ -639,6 +664,6 @@ main (int argc, char **argv) } /* All done. */ - exit(jerr.num_warnings ? EXIT_WARNING : EXIT_SUCCESS); + exit((jerr.num_warnings || ioerror) ? EXIT_WARNING : EXIT_SUCCESS); return 0; /* suppress no-return-value warnings */ } --- libjpeg-turbo-1.5.0/djpeg.c.fsync 2016-06-07 20:33:39.000000000 +0300 +++ libjpeg-turbo-1.5.0/djpeg.c 2016-08-19 15:50:19.038709883 +0300 @@ -45,6 +45,8 @@ #endif #endif +#include +#include /* Create the add-on message string table. */ @@ -55,6 +57,7 @@ static const char * const cdjpeg_message NULL }; +static boolean do_fsync; /* * This list defines the known output image formats @@ -158,6 +161,7 @@ usage (void) fprintf(stderr, " -dither fs Use F-S dithering (default)\n"); fprintf(stderr, " -dither none Don't use dithering in quantization\n"); fprintf(stderr, " -dither ordered Use ordered dither (medium speed, quality)\n"); + fprintf(stderr, " -fsync fsync output file prior to closing\n"); #ifdef QUANT_2PASS_SUPPORTED fprintf(stderr, " -map FILE Map to colors used in named image file\n"); #endif @@ -364,6 +368,10 @@ parse_switches (j_decompress_ptr cinfo, exit(EXIT_FAILURE); #endif + } else if (keymatch(arg, "fsync", 2)) { + /* Set fsync flag */ + do_fsync = 1; + } else if (keymatch(arg, "pnm", 1) || keymatch(arg, "ppm", 1)) { /* PPM/PGM output format. */ requested_fmt = FMT_PPM; @@ -503,6 +511,7 @@ main (int argc, char **argv) unsigned char *inbuffer = NULL; unsigned long insize = 0; JDIMENSION num_scanlines; + int ioerror = 0; /* On Mac, fetch a command line. */ #ifdef USE_CCOMMAND @@ -765,8 +774,24 @@ main (int argc, char **argv) /* Close files, if we opened them */ if (input_file != stdin) fclose(input_file); + if (fflush(output_file) == EOF) { + fprintf(stderr, "%s: failed to write to %s: %s\n", + progname, outfilename, strerror(errno)); + ioerror = 1; + } + if (do_fsync && (fsync(fileno(output_file)) == -1)) { + if (errno != EINVAL) { + fprintf(stderr, "%s: failed to fsync %s: %s\n", + progname, outfilename, strerror(errno)); + ioerror = 1; + } + } if (output_file != stdout) - fclose(output_file); + if (fclose(output_file) == EOF) { + fprintf(stderr, "%s: failed to close %s: %s\n", + progname, outfilename, strerror(errno)); + ioerror = 1; + } #ifdef PROGRESS_REPORT end_progress_monitor((j_common_ptr) &cinfo); @@ -776,6 +801,6 @@ main (int argc, char **argv) free(inbuffer); /* All done. */ - exit(jerr.num_warnings ? EXIT_WARNING : EXIT_SUCCESS); + exit((jerr.num_warnings || ioerror) ? EXIT_WARNING : EXIT_SUCCESS); return 0; /* suppress no-return-value warnings */ }