Fossil SCM
Fixing the long opt broke final short option if expected argument is not present.
Commit
d8b23d71c9161c943c021630b0899672ef4b9f094ed0934226c0c0fa30956124
Parent
9ac38481ec39a94…
1 file changed
+1
+1
| --- src/main.c | ||
| +++ src/main.c | ||
| @@ -1047,10 +1047,11 @@ | ||
| 1047 | 1047 | zReturn = g.argv[i+hasArg]; |
| 1048 | 1048 | remove_from_argv(i, 1+hasArg); |
| 1049 | 1049 | break; |
| 1050 | 1050 | } |
| 1051 | 1051 | }else if( fossil_strcmp(z,zShort)==0 ){ |
| 1052 | + if( i+hasArg >= g.argc ) break; | |
| 1052 | 1053 | zReturn = g.argv[i+hasArg]; |
| 1053 | 1054 | remove_from_argv(i, 1+hasArg); |
| 1054 | 1055 | break; |
| 1055 | 1056 | } |
| 1056 | 1057 | } |
| 1057 | 1058 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -1047,10 +1047,11 @@ | |
| 1047 | zReturn = g.argv[i+hasArg]; |
| 1048 | remove_from_argv(i, 1+hasArg); |
| 1049 | break; |
| 1050 | } |
| 1051 | }else if( fossil_strcmp(z,zShort)==0 ){ |
| 1052 | zReturn = g.argv[i+hasArg]; |
| 1053 | remove_from_argv(i, 1+hasArg); |
| 1054 | break; |
| 1055 | } |
| 1056 | } |
| 1057 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -1047,10 +1047,11 @@ | |
| 1047 | zReturn = g.argv[i+hasArg]; |
| 1048 | remove_from_argv(i, 1+hasArg); |
| 1049 | break; |
| 1050 | } |
| 1051 | }else if( fossil_strcmp(z,zShort)==0 ){ |
| 1052 | if( i+hasArg >= g.argc ) break; |
| 1053 | zReturn = g.argv[i+hasArg]; |
| 1054 | remove_from_argv(i, 1+hasArg); |
| 1055 | break; |
| 1056 | } |
| 1057 | } |
| 1058 |