[brlcad-commits] SF.net SVN: brlcad:[65306] brlcad/trunk/src/libbu/opt.c

[starseeker]

Revision: 65306
          http://sourceforge.net/p/brlcad/code/65306
Author:   starseeker
Date:     2015-06-15 18:55:12 +0000 (Mon, 15 Jun 2015)
Log Message:
-----------
May be getting a longer argv - just make sure we have at least one argc to work 
on.

Modified Paths:
--------------
    brlcad/trunk/src/libbu/opt.c

Modified: brlcad/trunk/src/libbu/opt.c
===================================================================
--- brlcad/trunk/src/libbu/opt.c        2015-06-15 18:01:48 UTC (rev 65305)
+++ brlcad/trunk/src/libbu/opt.c        2015-06-15 18:55:12 UTC (rev 65306)
@@ -463,7 +463,7 @@
     char *endptr = NULL;
     int *int_set = (int *)set_var;
 
-    if (!argv || !argv[0] || strlen(argv[0]) == 0 || argc != 1 ) {
+    if (!argv || !argv[0] || strlen(argv[0]) == 0 || argc < 1 ) {
        if (msg) bu_vls_printf(msg, "bu_opt_int requires arg, but arg not found 
- aborting\n");
        return -1;
     }
@@ -501,7 +501,7 @@
     char *endptr = NULL;
     long *long_set = (long *)set_var;
 
-    if (!argv || !argv[0] || strlen(argv[0]) == 0 || argc != 1 ) {
+    if (!argv || !argv[0] || strlen(argv[0]) == 0 || argc < 1 ) {
        if (msg) bu_vls_printf(msg, "bu_opt_long requires arg, but arg not 
found - aborting\n");
        return -1;
     }
@@ -530,7 +530,7 @@
     fastf_t *f_set = (fastf_t *)set_var;
     char *endptr = NULL;
 
-    if (!argv || !argv[0] || strlen(argv[0]) == 0 || argc != 1 ) {
+    if (!argv || !argv[0] || strlen(argv[0]) == 0 || argc < 1 ) {
        if (msg) bu_vls_printf(msg, "bu_opt_fastf_t requires arg, but arg not 
found - aborting\n");
        return -1;
     }
@@ -563,7 +563,7 @@
 {
     const char **s_set = (const char **)set_var;
 
-    if (!argv || !argv[0] || strlen(argv[0]) == 0 || argc != 1 ) {
+    if (!argv || !argv[0] || strlen(argv[0]) == 0 || argc < 1 ) {
        if (msg) bu_vls_printf(msg, "bu_opt_str requires arg, but arg not found 
- aborting\n");
        return -1;
     }
@@ -577,7 +577,7 @@
 {
     struct bu_vls *s_set = (struct bu_vls *)set_var;
 
-    if (!argv || !argv[0] || strlen(argv[0]) == 0 || argc != 1 ) {
+    if (!argv || !argv[0] || strlen(argv[0]) == 0 || argc < 1 ) {
        if (msg) bu_vls_printf(msg, "bu_opt_vls requires arg, but arg not found 
- aborting\n");
        return -1;
     }
@@ -598,7 +598,7 @@
     int *b_set = (int *)set_var;
     int bool_val;
 
-    if (!argv || !argv[0] || strlen(argv[0]) == 0 || argc != 1 ) {
+    if (!argv || !argv[0] || strlen(argv[0]) == 0 || argc < 1 ) {
        if (msg) bu_vls_printf(msg, "bu_opt_bool requires arg, but arg not 
found - aborting\n");
        return -1;
     }

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