Revision: 77364
http://sourceforge.net/p/brlcad/code/77364
Author: brlcad
Date: 2020-10-08 04:12:17 +0000 (Thu, 08 Oct 2020)
Log Message:
-----------
non-trivial to skip differing amounts in an interlaced stream, so just don't
allow it. also make sure usage statements prints the right name of the binary.
Modified Paths:
--------------
brlcad/trunk/bench/pixcmp.c
Modified: brlcad/trunk/bench/pixcmp.c
===================================================================
--- brlcad/trunk/bench/pixcmp.c 2020-10-08 03:58:11 UTC (rev 77363)
+++ brlcad/trunk/bench/pixcmp.c 2020-10-08 04:12:17 UTC (rev 77364)
@@ -137,6 +137,8 @@
int
main(int argc, char *argv[])
{
+ const char *argv0 = argv[0];
+
FILE *f1 = NULL;
FILE *f2 = NULL;
struct stat sf1 = {0};
@@ -183,7 +185,7 @@
break;
case '?':
case 'h':
- usage(argv[0]);
+ usage(argv0);
return 0;
default:
exit(OPTS_ERROR);
@@ -195,17 +197,17 @@
/* validate what is left over */
if (argc < 1 || argc > 4) {
bu_log("ERROR: incorrect number of arguments provided\n\n");
- usage(argv[0]);
+ usage(argv0);
exit(OPTS_ERROR);
}
if ((argc > 0 && !argv[0]) || (argc > 1 && !argv[1])) {
bu_log("ERROR: bad filename\n\n");
- usage(argv[0]);
+ usage(argv0);
exit(OPTS_ERROR);
}
if ((argc > 2 && !argv[2]) || (argc > 3 && !argv[3])) {
bu_log("ERROR: bad skip value\n\n");
- usage(argv[0]);
+ usage(argv0);
exit(OPTS_ERROR);
}
@@ -241,6 +243,12 @@
exit(FILE_ERROR);
}
+ if (f1_skip != f2_skip && f1 == stdin && f2 == stdin) {
+ bu_log("ERROR: Cannot skip the same input stream by different
amounts\n\n");
+ usage(argv0);
+ exit(OPTS_ERROR);
+ }
+
fstat(fileno(f1), &sf1);
fstat(fileno(f2), &sf2);
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
