summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVito Caputo <vcaputo@pengaru.com>2021-04-28 18:52:25 -0700
committerVito Caputo <vcaputo@pengaru.com>2021-04-28 18:54:24 -0700
commit553ff18522bce3151b8290143c7966744c302804 (patch)
tree7866148e5237a9fc0de19a571bcc77a693ee9724
parent06445cb33c1dbcb94ad06e7df0281a2778408160 (diff)
specsfile: firm up error checking
specsfile write failures were completely undetected outside of fopen errors
-rw-r--r--src/rmd_specsfile.c60
1 files changed, 42 insertions, 18 deletions
diff --git a/src/rmd_specsfile.c b/src/rmd_specsfile.c
index 37d5771..c0d340a 100644
--- a/src/rmd_specsfile.c
+++ b/src/rmd_specsfile.c
@@ -41,24 +41,48 @@ int rmdWriteSpecsFile(ProgData *pdata)
if (!fp)
return 1;
- fprintf(fp, "recordMyDesktop = %s\n", VERSION);
- fprintf(fp, "Width = %hu\n", pdata->brwin.rrect.width);
- fprintf(fp, "Height = %hu\n", pdata->brwin.rrect.height);
- fprintf(fp, "Filename = %s\n", pdata->args.filename);
- fprintf(fp, "FPS = %f\n", pdata->args.fps);
- fprintf(fp, "NoSound = %d\n", pdata->args.nosound);
- fprintf(fp, "Frequency = %d\n", pdata->args.frequency);
- fprintf(fp, "Channels = %d\n", pdata->args.channels);
- fprintf(fp, "BufferSize = %lu\n", (unsigned long)pdata->args.buffsize);
- fprintf(fp, "SoundFrameSize = %d\n", pdata->sound_framesize);
- fprintf(fp, "PeriodSize = %lu\n", (unsigned long)pdata->periodsize);
- fprintf(fp, "UsedJack = %d\n", pdata->args.use_jack);
- fprintf(fp, "v_bitrate = %d\n", pdata->args.v_bitrate);
- fprintf(fp, "v_quality = %d\n", pdata->args.v_quality);
- fprintf(fp, "s_quality = %d\n", pdata->args.s_quality);
- fprintf(fp, "ZeroCompression = %d\n", pdata->args.zerocompression);
-
- fclose(fp);
+ if (fprintf(fp, "recordMyDesktop = %s\n"
+ "Width = %hu\n"
+ "Height = %hu\n"
+ "Filename = %s\n"
+ "FPS = %f\n"
+ "NoSound = %d\n"
+ "Frequency = %d\n"
+ "Channels = %d\n"
+ "BufferSize = %lu\n"
+ "SoundFrameSize = %d\n"
+ "PeriodSize = %lu\n"
+ "UsedJack = %d\n"
+ "v_bitrate = %d\n"
+ "v_quality = %d\n"
+ "s_quality = %d\n"
+ "ZeroCompression = %d\n",
+ VERSION,
+ pdata->brwin.rrect.width,
+ pdata->brwin.rrect.height,
+ pdata->args.filename,
+ pdata->args.fps,
+ pdata->args.nosound,
+ pdata->args.frequency,
+ pdata->args.channels,
+ (unsigned long)pdata->args.buffsize,
+ pdata->sound_framesize,
+ (unsigned long)pdata->periodsize,
+ pdata->args.use_jack,
+ pdata->args.v_bitrate,
+ pdata->args.v_quality,
+ pdata->args.s_quality,
+ pdata->args.zerocompression) < 0) {
+
+ fprintf(stderr, "Error writing specsfile!!!\n");
+ (void) fclose(fp);
+ return 1;
+ }
+
+ if (fclose(fp) != 0) {
+ fprintf(stderr, "Error closing specsfile!!!\n");
+ return 1;
+ }
return 0;
}
© All Rights Reserved