Merged revisions 89701 via svnmerge from
authorKevin P. Fleming <kpfleming@digium.com>
Tue, 27 Nov 2007 19:47:19 +0000 (19:47 +0000)
committerKevin P. Fleming <kpfleming@digium.com>
Tue, 27 Nov 2007 19:47:19 +0000 (19:47 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r89701 | kpfleming | 2007-11-27 13:36:55 -0600 (Tue, 27 Nov 2007) | 2 lines

generate a warning when an application option that requires an argument is ignored due to lack of an argument

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89704 65c4cc65-6c06-0410-ace0-fbb531ad65f3

main/app.c

index 4fda65c..13250f0 100644 (file)
@@ -1624,8 +1624,11 @@ int ast_app_parse_options(const struct ast_app_option *options, struct ast_flags
                } else if (argloc) {
                        args[argloc - 1] = NULL;
                }
-               if (!argloc || !ast_strlen_zero(args[argloc - 1]))
-                       ast_set_flag(flags, options[curarg].flag);
+               if (argloc && ast_strlen_zero(args[argloc - 1])) {
+                       ast_log(LOG_WARNING, "Argument supplied for option '%c' was empty, option ignored.\n", curarg);
+                       continue;
+               }
+               ast_set_flag(flags, options[curarg].flag);
        }
 
        return res;