Fossil SCM
Added --verbose|-v as alias for --full|-f option to /json/stat, per ML discussion. Removed a stray 's' character, probably a result of a mis-pressed Ctrl-S.
Commit
e07e1f662e06384749aa56eb593f34f158227e4d
Parent
5741754ed28f881…
1 file changed
+3
-2
+3
-2
| --- src/json.c | ||
| +++ src/json.c | ||
| @@ -550,11 +550,11 @@ | ||
| 550 | 550 | /* |
| 551 | 551 | ** An extended form of find_option() which tries to look up a combo |
| 552 | 552 | ** GET/POST/CLI argument. |
| 553 | 553 | ** |
| 554 | 554 | ** zKey must be the GET/POST parameter key. zCLILong must be the "long |
| 555 | -s** form" CLI flag (NULL means to use zKey). zCLIShort may be NULL or | |
| 555 | +** form" CLI flag (NULL means to use zKey). zCLIShort may be NULL or | |
| 556 | 556 | ** the "short form" CLI flag (if NULL, no short form is used). |
| 557 | 557 | ** |
| 558 | 558 | ** If argPos is >=0 and no other match is found, |
| 559 | 559 | ** json_command_arg(argPos) is also checked. |
| 560 | 560 | ** |
| @@ -2025,11 +2025,12 @@ | ||
| 2025 | 2025 | if( !g.perm.Read ){ |
| 2026 | 2026 | json_set_err(FSL_JSON_E_DENIED, |
| 2027 | 2027 | "Requires 'o' permissions."); |
| 2028 | 2028 | return NULL; |
| 2029 | 2029 | } |
| 2030 | - full = json_find_option_bool("full",NULL,"f",0); | |
| 2030 | + full = json_find_option_bool("full",NULL,"f", | |
| 2031 | + json_find_option_bool("verbose",NULL,"v",0)); | |
| 2031 | 2032 | #define SETBUF(O,K) cson_object_set(O, K, cson_value_new_string(zBuf, strlen(zBuf))); |
| 2032 | 2033 | |
| 2033 | 2034 | jv = cson_value_new_object(); |
| 2034 | 2035 | jo = cson_value_get_object(jv); |
| 2035 | 2036 | |
| 2036 | 2037 |
| --- src/json.c | |
| +++ src/json.c | |
| @@ -550,11 +550,11 @@ | |
| 550 | /* |
| 551 | ** An extended form of find_option() which tries to look up a combo |
| 552 | ** GET/POST/CLI argument. |
| 553 | ** |
| 554 | ** zKey must be the GET/POST parameter key. zCLILong must be the "long |
| 555 | s** form" CLI flag (NULL means to use zKey). zCLIShort may be NULL or |
| 556 | ** the "short form" CLI flag (if NULL, no short form is used). |
| 557 | ** |
| 558 | ** If argPos is >=0 and no other match is found, |
| 559 | ** json_command_arg(argPos) is also checked. |
| 560 | ** |
| @@ -2025,11 +2025,12 @@ | |
| 2025 | if( !g.perm.Read ){ |
| 2026 | json_set_err(FSL_JSON_E_DENIED, |
| 2027 | "Requires 'o' permissions."); |
| 2028 | return NULL; |
| 2029 | } |
| 2030 | full = json_find_option_bool("full",NULL,"f",0); |
| 2031 | #define SETBUF(O,K) cson_object_set(O, K, cson_value_new_string(zBuf, strlen(zBuf))); |
| 2032 | |
| 2033 | jv = cson_value_new_object(); |
| 2034 | jo = cson_value_get_object(jv); |
| 2035 | |
| 2036 |
| --- src/json.c | |
| +++ src/json.c | |
| @@ -550,11 +550,11 @@ | |
| 550 | /* |
| 551 | ** An extended form of find_option() which tries to look up a combo |
| 552 | ** GET/POST/CLI argument. |
| 553 | ** |
| 554 | ** zKey must be the GET/POST parameter key. zCLILong must be the "long |
| 555 | ** form" CLI flag (NULL means to use zKey). zCLIShort may be NULL or |
| 556 | ** the "short form" CLI flag (if NULL, no short form is used). |
| 557 | ** |
| 558 | ** If argPos is >=0 and no other match is found, |
| 559 | ** json_command_arg(argPos) is also checked. |
| 560 | ** |
| @@ -2025,11 +2025,12 @@ | |
| 2025 | if( !g.perm.Read ){ |
| 2026 | json_set_err(FSL_JSON_E_DENIED, |
| 2027 | "Requires 'o' permissions."); |
| 2028 | return NULL; |
| 2029 | } |
| 2030 | full = json_find_option_bool("full",NULL,"f", |
| 2031 | json_find_option_bool("verbose",NULL,"v",0)); |
| 2032 | #define SETBUF(O,K) cson_object_set(O, K, cson_value_new_string(zBuf, strlen(zBuf))); |
| 2033 | |
| 2034 | jv = cson_value_new_object(); |
| 2035 | jo = cson_value_get_object(jv); |
| 2036 | |
| 2037 |