sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

testing/ostest: More improvements to getopt() testing/ostest

Browse Source 
Fix optind range checking.  optind may index through argc (to the NULL argv entry) on the last option since optind is required to always point to the next command line argument.

Add two more test cases were the final thing on the command line is an invalid long option.

Fix a check that used an older, obsoleted hard-coded value that was not updated.

This should have no impact other than to the getopt() test cases of the OS test.

Tested on the simulator using a modified NSH configuration.
This commit is contained in:
Gregory Nutt 2021-04-04 09:53:45 -06:00 committed by Xiang Xiao
parent 02ef45980b
commit 6a679043e6
1 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
testing/ostest/getopt.c
View File

@ -192,7 +192,11 @@ static int getopt_short_test(int noptions, int argc, FAR char **argv,
(ret = getopt(argc, argv, optstring)) != ERROR && ndx < noptions;
ndx++)
{
if (optind < 1 || optind >= argc)
/* optind may index through argc (to the NULL argv entry) since it is
* required to always point to the next command line argument.
*/
if (optind < 1 || optind > argc)
{
printf("ERROR: optind=%d\n", optind);
}
@ -250,7 +254,11 @@ static int getopt_long_test(int noptions, int argc, FAR char **argv,
longindex)) != ERROR;
ndx++)
{
if (optind < 1 || optind >= argc)
/* optind may index through argc (to the NULL argv entry) since it is
* required to always point to the next command line argument.
*/
if (optind < 1 || optind > argc)
{
printf("ERROR: optind=%d\n", optind);
}
@ -315,7 +323,11 @@ static int getopt_longonly_test(int noptions, int argc, FAR char **argv,
longindex)) != ERROR;
ndx++)
{
if (optind < 1 || optind > 7)
/* optind may index through argc (to the NULL argv entry) since it is
* required to always point to the next command line argument.
*/
if (optind < 1 || optind > argc)
{
printf("ERROR: optind=%d\n", optind);
}
@ -413,6 +425,9 @@ int getopt_test(void)
getopt_short_test(5, 9, argv, g_optstring, results);
argv[8] = NULL;
getopt_short_test(5, 8, argv, g_optstring, results);
printf("getopt(): Missing optional argument\n");
argv[0] = NULL;
@ -490,6 +505,10 @@ int getopt_test(void)
getopt_long_test(5, 9, argv, g_optstring, long_options, NULL,
results);
argv[8] = NULL;
getopt_long_test(5, 8, argv, g_optstring, long_options, NULL,
results);
printf("getopt_long(): Mixed long and short options\n");
argv[0] = NULL;