Fossil SCM
Merge updates from trunk.
Commit
715dcd52fe9e07ed186d5a5933bc5aac373b1a22
Parent
54e00d7a0aa3063…
3 files changed
+13
-13
+13
-13
+1
-1
+13
-13
| --- src/th_main.c | ||
| +++ src/th_main.c | ||
| @@ -28,11 +28,11 @@ | ||
| 28 | 28 | ** interpreter creation and initialization process. |
| 29 | 29 | */ |
| 30 | 30 | #define TH_INIT_NONE ((u32)0x00000000) /* No flags. */ |
| 31 | 31 | #define TH_INIT_NEED_CONFIG ((u32)0x00000001) /* Open configuration first? */ |
| 32 | 32 | #define TH_INIT_FORCE_TCL ((u32)0x00000002) /* Force Tcl to be enabled? */ |
| 33 | -#define TH_INIT_FORCE_RESET ((u32)0x00000004) /* Force TH commands re-added? */ | |
| 33 | +#define TH_INIT_FORCE_RESET ((u32)0x00000004) /* Force TH1 commands re-added? */ | |
| 34 | 34 | #define TH_INIT_FORCE_SETUP ((u32)0x00000008) /* Force eval of setup script? */ |
| 35 | 35 | #define TH_INIT_DEFAULT (TH_INIT_NONE) /* Default flags. */ |
| 36 | 36 | #define TH_INIT_HOOK (TH_INIT_NEED_CONFIG | TH_INIT_FORCE_SETUP) |
| 37 | 37 | #endif |
| 38 | 38 | |
| @@ -111,11 +111,11 @@ | ||
| 111 | 111 | fossil_print("\n------------------- END TRACE LOG -------------------\n"); |
| 112 | 112 | } |
| 113 | 113 | } |
| 114 | 114 | |
| 115 | 115 | /* |
| 116 | -** TH command: httpize STRING | |
| 116 | +** TH1 command: httpize STRING | |
| 117 | 117 | ** |
| 118 | 118 | ** Escape all characters of STRING which have special meaning in URI |
| 119 | 119 | ** components. Return a new string result. |
| 120 | 120 | */ |
| 121 | 121 | static int httpizeCmd( |
| @@ -139,11 +139,11 @@ | ||
| 139 | 139 | ** True if output is enabled. False if disabled. |
| 140 | 140 | */ |
| 141 | 141 | static int enableOutput = 1; |
| 142 | 142 | |
| 143 | 143 | /* |
| 144 | -** TH command: enable_output BOOLEAN | |
| 144 | +** TH1 command: enable_output BOOLEAN | |
| 145 | 145 | ** |
| 146 | 146 | ** Enable or disable the puts and hputs commands. |
| 147 | 147 | */ |
| 148 | 148 | static int enableOutputCmd( |
| 149 | 149 | Th_Interp *interp, |
| @@ -214,12 +214,12 @@ | ||
| 214 | 214 | sendText(forceCgi || g.cgiOutput ? "</p>" : "\n", -1, 0); |
| 215 | 215 | enableOutput = savedEnable; |
| 216 | 216 | } |
| 217 | 217 | |
| 218 | 218 | /* |
| 219 | -** TH command: puts STRING | |
| 220 | -** TH command: html STRING | |
| 219 | +** TH1 command: puts STRING | |
| 220 | +** TH1 command: html STRING | |
| 221 | 221 | ** |
| 222 | 222 | ** Output STRING escaped for HTML (html) or unchanged (puts). |
| 223 | 223 | */ |
| 224 | 224 | static int putsCmd( |
| 225 | 225 | Th_Interp *interp, |
| @@ -234,11 +234,11 @@ | ||
| 234 | 234 | sendText((char*)argv[1], argl[1], *(unsigned int*)pConvert); |
| 235 | 235 | return TH_OK; |
| 236 | 236 | } |
| 237 | 237 | |
| 238 | 238 | /* |
| 239 | -** TH command: wiki STRING | |
| 239 | +** TH1 command: wiki STRING | |
| 240 | 240 | ** |
| 241 | 241 | ** Render the input string as wiki. |
| 242 | 242 | */ |
| 243 | 243 | static int wikiCmd( |
| 244 | 244 | Th_Interp *interp, |
| @@ -259,11 +259,11 @@ | ||
| 259 | 259 | } |
| 260 | 260 | return TH_OK; |
| 261 | 261 | } |
| 262 | 262 | |
| 263 | 263 | /* |
| 264 | -** TH command: htmlize STRING | |
| 264 | +** TH1 command: htmlize STRING | |
| 265 | 265 | ** |
| 266 | 266 | ** Escape all characters of STRING which have special meaning in HTML. |
| 267 | 267 | ** Return a new string result. |
| 268 | 268 | */ |
| 269 | 269 | static int htmlizeCmd( |
| @@ -282,11 +282,11 @@ | ||
| 282 | 282 | free(zOut); |
| 283 | 283 | return TH_OK; |
| 284 | 284 | } |
| 285 | 285 | |
| 286 | 286 | /* |
| 287 | -** TH command: date | |
| 287 | +** TH1 command: date | |
| 288 | 288 | ** |
| 289 | 289 | ** Return a string which is the current time and date. If the |
| 290 | 290 | ** -local option is used, the date appears using localtime instead |
| 291 | 291 | ** of UTC. |
| 292 | 292 | */ |
| @@ -307,11 +307,11 @@ | ||
| 307 | 307 | free(zOut); |
| 308 | 308 | return TH_OK; |
| 309 | 309 | } |
| 310 | 310 | |
| 311 | 311 | /* |
| 312 | -** TH command: hascap STRING... | |
| 312 | +** TH1 command: hascap STRING... | |
| 313 | 313 | ** |
| 314 | 314 | ** Return true if the user has all of the capabilities listed in STRING. |
| 315 | 315 | */ |
| 316 | 316 | static int hascapCmd( |
| 317 | 317 | Th_Interp *interp, |
| @@ -333,11 +333,11 @@ | ||
| 333 | 333 | Th_SetResultInt(interp, rc); |
| 334 | 334 | return TH_OK; |
| 335 | 335 | } |
| 336 | 336 | |
| 337 | 337 | /* |
| 338 | -** TH command: hasfeature STRING | |
| 338 | +** TH1 command: hasfeature STRING | |
| 339 | 339 | ** |
| 340 | 340 | ** Return true if the fossil binary has the given compile-time feature |
| 341 | 341 | ** enabled. The set of features includes: |
| 342 | 342 | ** |
| 343 | 343 | ** "ssl" = FOSSIL_ENABLE_SSL |
| @@ -411,11 +411,11 @@ | ||
| 411 | 411 | return TH_OK; |
| 412 | 412 | } |
| 413 | 413 | |
| 414 | 414 | |
| 415 | 415 | /* |
| 416 | -** TH command: tclReady | |
| 416 | +** TH1 command: tclReady | |
| 417 | 417 | ** |
| 418 | 418 | ** Return true if the fossil binary has the Tcl integration feature |
| 419 | 419 | ** enabled and it is currently available for use by TH1 scripts. |
| 420 | 420 | ** |
| 421 | 421 | */ |
| @@ -442,11 +442,11 @@ | ||
| 442 | 442 | return TH_OK; |
| 443 | 443 | } |
| 444 | 444 | |
| 445 | 445 | |
| 446 | 446 | /* |
| 447 | -** TH command: anycap STRING | |
| 447 | +** TH1 command: anycap STRING | |
| 448 | 448 | ** |
| 449 | 449 | ** Return true if the user has any one of the capabilities listed in STRING. |
| 450 | 450 | */ |
| 451 | 451 | static int anycapCmd( |
| 452 | 452 | Th_Interp *interp, |
| @@ -877,11 +877,11 @@ | ||
| 877 | 877 | re_free(pRe); |
| 878 | 878 | return rc; |
| 879 | 879 | } |
| 880 | 880 | |
| 881 | 881 | /* |
| 882 | -** TH command: http ?-asynchronous? ?--? url ?payload? | |
| 882 | +** TH1 command: http ?-asynchronous? ?--? url ?payload? | |
| 883 | 883 | ** |
| 884 | 884 | ** Perform an HTTP or HTTPS request for the specified URL. If a |
| 885 | 885 | ** payload is present, it will be interpreted as text/plain and |
| 886 | 886 | ** the POST method will be used; otherwise, the GET method will |
| 887 | 887 | ** be used. Upon success, if the -asynchronous option is used, an |
| 888 | 888 |
| --- src/th_main.c | |
| +++ src/th_main.c | |
| @@ -28,11 +28,11 @@ | |
| 28 | ** interpreter creation and initialization process. |
| 29 | */ |
| 30 | #define TH_INIT_NONE ((u32)0x00000000) /* No flags. */ |
| 31 | #define TH_INIT_NEED_CONFIG ((u32)0x00000001) /* Open configuration first? */ |
| 32 | #define TH_INIT_FORCE_TCL ((u32)0x00000002) /* Force Tcl to be enabled? */ |
| 33 | #define TH_INIT_FORCE_RESET ((u32)0x00000004) /* Force TH commands re-added? */ |
| 34 | #define TH_INIT_FORCE_SETUP ((u32)0x00000008) /* Force eval of setup script? */ |
| 35 | #define TH_INIT_DEFAULT (TH_INIT_NONE) /* Default flags. */ |
| 36 | #define TH_INIT_HOOK (TH_INIT_NEED_CONFIG | TH_INIT_FORCE_SETUP) |
| 37 | #endif |
| 38 | |
| @@ -111,11 +111,11 @@ | |
| 111 | fossil_print("\n------------------- END TRACE LOG -------------------\n"); |
| 112 | } |
| 113 | } |
| 114 | |
| 115 | /* |
| 116 | ** TH command: httpize STRING |
| 117 | ** |
| 118 | ** Escape all characters of STRING which have special meaning in URI |
| 119 | ** components. Return a new string result. |
| 120 | */ |
| 121 | static int httpizeCmd( |
| @@ -139,11 +139,11 @@ | |
| 139 | ** True if output is enabled. False if disabled. |
| 140 | */ |
| 141 | static int enableOutput = 1; |
| 142 | |
| 143 | /* |
| 144 | ** TH command: enable_output BOOLEAN |
| 145 | ** |
| 146 | ** Enable or disable the puts and hputs commands. |
| 147 | */ |
| 148 | static int enableOutputCmd( |
| 149 | Th_Interp *interp, |
| @@ -214,12 +214,12 @@ | |
| 214 | sendText(forceCgi || g.cgiOutput ? "</p>" : "\n", -1, 0); |
| 215 | enableOutput = savedEnable; |
| 216 | } |
| 217 | |
| 218 | /* |
| 219 | ** TH command: puts STRING |
| 220 | ** TH command: html STRING |
| 221 | ** |
| 222 | ** Output STRING escaped for HTML (html) or unchanged (puts). |
| 223 | */ |
| 224 | static int putsCmd( |
| 225 | Th_Interp *interp, |
| @@ -234,11 +234,11 @@ | |
| 234 | sendText((char*)argv[1], argl[1], *(unsigned int*)pConvert); |
| 235 | return TH_OK; |
| 236 | } |
| 237 | |
| 238 | /* |
| 239 | ** TH command: wiki STRING |
| 240 | ** |
| 241 | ** Render the input string as wiki. |
| 242 | */ |
| 243 | static int wikiCmd( |
| 244 | Th_Interp *interp, |
| @@ -259,11 +259,11 @@ | |
| 259 | } |
| 260 | return TH_OK; |
| 261 | } |
| 262 | |
| 263 | /* |
| 264 | ** TH command: htmlize STRING |
| 265 | ** |
| 266 | ** Escape all characters of STRING which have special meaning in HTML. |
| 267 | ** Return a new string result. |
| 268 | */ |
| 269 | static int htmlizeCmd( |
| @@ -282,11 +282,11 @@ | |
| 282 | free(zOut); |
| 283 | return TH_OK; |
| 284 | } |
| 285 | |
| 286 | /* |
| 287 | ** TH command: date |
| 288 | ** |
| 289 | ** Return a string which is the current time and date. If the |
| 290 | ** -local option is used, the date appears using localtime instead |
| 291 | ** of UTC. |
| 292 | */ |
| @@ -307,11 +307,11 @@ | |
| 307 | free(zOut); |
| 308 | return TH_OK; |
| 309 | } |
| 310 | |
| 311 | /* |
| 312 | ** TH command: hascap STRING... |
| 313 | ** |
| 314 | ** Return true if the user has all of the capabilities listed in STRING. |
| 315 | */ |
| 316 | static int hascapCmd( |
| 317 | Th_Interp *interp, |
| @@ -333,11 +333,11 @@ | |
| 333 | Th_SetResultInt(interp, rc); |
| 334 | return TH_OK; |
| 335 | } |
| 336 | |
| 337 | /* |
| 338 | ** TH command: hasfeature STRING |
| 339 | ** |
| 340 | ** Return true if the fossil binary has the given compile-time feature |
| 341 | ** enabled. The set of features includes: |
| 342 | ** |
| 343 | ** "ssl" = FOSSIL_ENABLE_SSL |
| @@ -411,11 +411,11 @@ | |
| 411 | return TH_OK; |
| 412 | } |
| 413 | |
| 414 | |
| 415 | /* |
| 416 | ** TH command: tclReady |
| 417 | ** |
| 418 | ** Return true if the fossil binary has the Tcl integration feature |
| 419 | ** enabled and it is currently available for use by TH1 scripts. |
| 420 | ** |
| 421 | */ |
| @@ -442,11 +442,11 @@ | |
| 442 | return TH_OK; |
| 443 | } |
| 444 | |
| 445 | |
| 446 | /* |
| 447 | ** TH command: anycap STRING |
| 448 | ** |
| 449 | ** Return true if the user has any one of the capabilities listed in STRING. |
| 450 | */ |
| 451 | static int anycapCmd( |
| 452 | Th_Interp *interp, |
| @@ -877,11 +877,11 @@ | |
| 877 | re_free(pRe); |
| 878 | return rc; |
| 879 | } |
| 880 | |
| 881 | /* |
| 882 | ** TH command: http ?-asynchronous? ?--? url ?payload? |
| 883 | ** |
| 884 | ** Perform an HTTP or HTTPS request for the specified URL. If a |
| 885 | ** payload is present, it will be interpreted as text/plain and |
| 886 | ** the POST method will be used; otherwise, the GET method will |
| 887 | ** be used. Upon success, if the -asynchronous option is used, an |
| 888 |
| --- src/th_main.c | |
| +++ src/th_main.c | |
| @@ -28,11 +28,11 @@ | |
| 28 | ** interpreter creation and initialization process. |
| 29 | */ |
| 30 | #define TH_INIT_NONE ((u32)0x00000000) /* No flags. */ |
| 31 | #define TH_INIT_NEED_CONFIG ((u32)0x00000001) /* Open configuration first? */ |
| 32 | #define TH_INIT_FORCE_TCL ((u32)0x00000002) /* Force Tcl to be enabled? */ |
| 33 | #define TH_INIT_FORCE_RESET ((u32)0x00000004) /* Force TH1 commands re-added? */ |
| 34 | #define TH_INIT_FORCE_SETUP ((u32)0x00000008) /* Force eval of setup script? */ |
| 35 | #define TH_INIT_DEFAULT (TH_INIT_NONE) /* Default flags. */ |
| 36 | #define TH_INIT_HOOK (TH_INIT_NEED_CONFIG | TH_INIT_FORCE_SETUP) |
| 37 | #endif |
| 38 | |
| @@ -111,11 +111,11 @@ | |
| 111 | fossil_print("\n------------------- END TRACE LOG -------------------\n"); |
| 112 | } |
| 113 | } |
| 114 | |
| 115 | /* |
| 116 | ** TH1 command: httpize STRING |
| 117 | ** |
| 118 | ** Escape all characters of STRING which have special meaning in URI |
| 119 | ** components. Return a new string result. |
| 120 | */ |
| 121 | static int httpizeCmd( |
| @@ -139,11 +139,11 @@ | |
| 139 | ** True if output is enabled. False if disabled. |
| 140 | */ |
| 141 | static int enableOutput = 1; |
| 142 | |
| 143 | /* |
| 144 | ** TH1 command: enable_output BOOLEAN |
| 145 | ** |
| 146 | ** Enable or disable the puts and hputs commands. |
| 147 | */ |
| 148 | static int enableOutputCmd( |
| 149 | Th_Interp *interp, |
| @@ -214,12 +214,12 @@ | |
| 214 | sendText(forceCgi || g.cgiOutput ? "</p>" : "\n", -1, 0); |
| 215 | enableOutput = savedEnable; |
| 216 | } |
| 217 | |
| 218 | /* |
| 219 | ** TH1 command: puts STRING |
| 220 | ** TH1 command: html STRING |
| 221 | ** |
| 222 | ** Output STRING escaped for HTML (html) or unchanged (puts). |
| 223 | */ |
| 224 | static int putsCmd( |
| 225 | Th_Interp *interp, |
| @@ -234,11 +234,11 @@ | |
| 234 | sendText((char*)argv[1], argl[1], *(unsigned int*)pConvert); |
| 235 | return TH_OK; |
| 236 | } |
| 237 | |
| 238 | /* |
| 239 | ** TH1 command: wiki STRING |
| 240 | ** |
| 241 | ** Render the input string as wiki. |
| 242 | */ |
| 243 | static int wikiCmd( |
| 244 | Th_Interp *interp, |
| @@ -259,11 +259,11 @@ | |
| 259 | } |
| 260 | return TH_OK; |
| 261 | } |
| 262 | |
| 263 | /* |
| 264 | ** TH1 command: htmlize STRING |
| 265 | ** |
| 266 | ** Escape all characters of STRING which have special meaning in HTML. |
| 267 | ** Return a new string result. |
| 268 | */ |
| 269 | static int htmlizeCmd( |
| @@ -282,11 +282,11 @@ | |
| 282 | free(zOut); |
| 283 | return TH_OK; |
| 284 | } |
| 285 | |
| 286 | /* |
| 287 | ** TH1 command: date |
| 288 | ** |
| 289 | ** Return a string which is the current time and date. If the |
| 290 | ** -local option is used, the date appears using localtime instead |
| 291 | ** of UTC. |
| 292 | */ |
| @@ -307,11 +307,11 @@ | |
| 307 | free(zOut); |
| 308 | return TH_OK; |
| 309 | } |
| 310 | |
| 311 | /* |
| 312 | ** TH1 command: hascap STRING... |
| 313 | ** |
| 314 | ** Return true if the user has all of the capabilities listed in STRING. |
| 315 | */ |
| 316 | static int hascapCmd( |
| 317 | Th_Interp *interp, |
| @@ -333,11 +333,11 @@ | |
| 333 | Th_SetResultInt(interp, rc); |
| 334 | return TH_OK; |
| 335 | } |
| 336 | |
| 337 | /* |
| 338 | ** TH1 command: hasfeature STRING |
| 339 | ** |
| 340 | ** Return true if the fossil binary has the given compile-time feature |
| 341 | ** enabled. The set of features includes: |
| 342 | ** |
| 343 | ** "ssl" = FOSSIL_ENABLE_SSL |
| @@ -411,11 +411,11 @@ | |
| 411 | return TH_OK; |
| 412 | } |
| 413 | |
| 414 | |
| 415 | /* |
| 416 | ** TH1 command: tclReady |
| 417 | ** |
| 418 | ** Return true if the fossil binary has the Tcl integration feature |
| 419 | ** enabled and it is currently available for use by TH1 scripts. |
| 420 | ** |
| 421 | */ |
| @@ -442,11 +442,11 @@ | |
| 442 | return TH_OK; |
| 443 | } |
| 444 | |
| 445 | |
| 446 | /* |
| 447 | ** TH1 command: anycap STRING |
| 448 | ** |
| 449 | ** Return true if the user has any one of the capabilities listed in STRING. |
| 450 | */ |
| 451 | static int anycapCmd( |
| 452 | Th_Interp *interp, |
| @@ -877,11 +877,11 @@ | |
| 877 | re_free(pRe); |
| 878 | return rc; |
| 879 | } |
| 880 | |
| 881 | /* |
| 882 | ** TH1 command: http ?-asynchronous? ?--? url ?payload? |
| 883 | ** |
| 884 | ** Perform an HTTP or HTTPS request for the specified URL. If a |
| 885 | ** payload is present, it will be interpreted as text/plain and |
| 886 | ** the POST method will be used; otherwise, the GET method will |
| 887 | ** be used. Upon success, if the -asynchronous option is used, an |
| 888 |
+13
-13
| --- src/th_main.c | ||
| +++ src/th_main.c | ||
| @@ -28,11 +28,11 @@ | ||
| 28 | 28 | ** interpreter creation and initialization process. |
| 29 | 29 | */ |
| 30 | 30 | #define TH_INIT_NONE ((u32)0x00000000) /* No flags. */ |
| 31 | 31 | #define TH_INIT_NEED_CONFIG ((u32)0x00000001) /* Open configuration first? */ |
| 32 | 32 | #define TH_INIT_FORCE_TCL ((u32)0x00000002) /* Force Tcl to be enabled? */ |
| 33 | -#define TH_INIT_FORCE_RESET ((u32)0x00000004) /* Force TH commands re-added? */ | |
| 33 | +#define TH_INIT_FORCE_RESET ((u32)0x00000004) /* Force TH1 commands re-added? */ | |
| 34 | 34 | #define TH_INIT_FORCE_SETUP ((u32)0x00000008) /* Force eval of setup script? */ |
| 35 | 35 | #define TH_INIT_DEFAULT (TH_INIT_NONE) /* Default flags. */ |
| 36 | 36 | #define TH_INIT_HOOK (TH_INIT_NEED_CONFIG | TH_INIT_FORCE_SETUP) |
| 37 | 37 | #endif |
| 38 | 38 | |
| @@ -111,11 +111,11 @@ | ||
| 111 | 111 | fossil_print("\n------------------- END TRACE LOG -------------------\n"); |
| 112 | 112 | } |
| 113 | 113 | } |
| 114 | 114 | |
| 115 | 115 | /* |
| 116 | -** TH command: httpize STRING | |
| 116 | +** TH1 command: httpize STRING | |
| 117 | 117 | ** |
| 118 | 118 | ** Escape all characters of STRING which have special meaning in URI |
| 119 | 119 | ** components. Return a new string result. |
| 120 | 120 | */ |
| 121 | 121 | static int httpizeCmd( |
| @@ -139,11 +139,11 @@ | ||
| 139 | 139 | ** True if output is enabled. False if disabled. |
| 140 | 140 | */ |
| 141 | 141 | static int enableOutput = 1; |
| 142 | 142 | |
| 143 | 143 | /* |
| 144 | -** TH command: enable_output BOOLEAN | |
| 144 | +** TH1 command: enable_output BOOLEAN | |
| 145 | 145 | ** |
| 146 | 146 | ** Enable or disable the puts and hputs commands. |
| 147 | 147 | */ |
| 148 | 148 | static int enableOutputCmd( |
| 149 | 149 | Th_Interp *interp, |
| @@ -214,12 +214,12 @@ | ||
| 214 | 214 | sendText(forceCgi || g.cgiOutput ? "</p>" : "\n", -1, 0); |
| 215 | 215 | enableOutput = savedEnable; |
| 216 | 216 | } |
| 217 | 217 | |
| 218 | 218 | /* |
| 219 | -** TH command: puts STRING | |
| 220 | -** TH command: html STRING | |
| 219 | +** TH1 command: puts STRING | |
| 220 | +** TH1 command: html STRING | |
| 221 | 221 | ** |
| 222 | 222 | ** Output STRING escaped for HTML (html) or unchanged (puts). |
| 223 | 223 | */ |
| 224 | 224 | static int putsCmd( |
| 225 | 225 | Th_Interp *interp, |
| @@ -234,11 +234,11 @@ | ||
| 234 | 234 | sendText((char*)argv[1], argl[1], *(unsigned int*)pConvert); |
| 235 | 235 | return TH_OK; |
| 236 | 236 | } |
| 237 | 237 | |
| 238 | 238 | /* |
| 239 | -** TH command: wiki STRING | |
| 239 | +** TH1 command: wiki STRING | |
| 240 | 240 | ** |
| 241 | 241 | ** Render the input string as wiki. |
| 242 | 242 | */ |
| 243 | 243 | static int wikiCmd( |
| 244 | 244 | Th_Interp *interp, |
| @@ -259,11 +259,11 @@ | ||
| 259 | 259 | } |
| 260 | 260 | return TH_OK; |
| 261 | 261 | } |
| 262 | 262 | |
| 263 | 263 | /* |
| 264 | -** TH command: htmlize STRING | |
| 264 | +** TH1 command: htmlize STRING | |
| 265 | 265 | ** |
| 266 | 266 | ** Escape all characters of STRING which have special meaning in HTML. |
| 267 | 267 | ** Return a new string result. |
| 268 | 268 | */ |
| 269 | 269 | static int htmlizeCmd( |
| @@ -282,11 +282,11 @@ | ||
| 282 | 282 | free(zOut); |
| 283 | 283 | return TH_OK; |
| 284 | 284 | } |
| 285 | 285 | |
| 286 | 286 | /* |
| 287 | -** TH command: date | |
| 287 | +** TH1 command: date | |
| 288 | 288 | ** |
| 289 | 289 | ** Return a string which is the current time and date. If the |
| 290 | 290 | ** -local option is used, the date appears using localtime instead |
| 291 | 291 | ** of UTC. |
| 292 | 292 | */ |
| @@ -307,11 +307,11 @@ | ||
| 307 | 307 | free(zOut); |
| 308 | 308 | return TH_OK; |
| 309 | 309 | } |
| 310 | 310 | |
| 311 | 311 | /* |
| 312 | -** TH command: hascap STRING... | |
| 312 | +** TH1 command: hascap STRING... | |
| 313 | 313 | ** |
| 314 | 314 | ** Return true if the user has all of the capabilities listed in STRING. |
| 315 | 315 | */ |
| 316 | 316 | static int hascapCmd( |
| 317 | 317 | Th_Interp *interp, |
| @@ -333,11 +333,11 @@ | ||
| 333 | 333 | Th_SetResultInt(interp, rc); |
| 334 | 334 | return TH_OK; |
| 335 | 335 | } |
| 336 | 336 | |
| 337 | 337 | /* |
| 338 | -** TH command: hasfeature STRING | |
| 338 | +** TH1 command: hasfeature STRING | |
| 339 | 339 | ** |
| 340 | 340 | ** Return true if the fossil binary has the given compile-time feature |
| 341 | 341 | ** enabled. The set of features includes: |
| 342 | 342 | ** |
| 343 | 343 | ** "ssl" = FOSSIL_ENABLE_SSL |
| @@ -411,11 +411,11 @@ | ||
| 411 | 411 | return TH_OK; |
| 412 | 412 | } |
| 413 | 413 | |
| 414 | 414 | |
| 415 | 415 | /* |
| 416 | -** TH command: tclReady | |
| 416 | +** TH1 command: tclReady | |
| 417 | 417 | ** |
| 418 | 418 | ** Return true if the fossil binary has the Tcl integration feature |
| 419 | 419 | ** enabled and it is currently available for use by TH1 scripts. |
| 420 | 420 | ** |
| 421 | 421 | */ |
| @@ -442,11 +442,11 @@ | ||
| 442 | 442 | return TH_OK; |
| 443 | 443 | } |
| 444 | 444 | |
| 445 | 445 | |
| 446 | 446 | /* |
| 447 | -** TH command: anycap STRING | |
| 447 | +** TH1 command: anycap STRING | |
| 448 | 448 | ** |
| 449 | 449 | ** Return true if the user has any one of the capabilities listed in STRING. |
| 450 | 450 | */ |
| 451 | 451 | static int anycapCmd( |
| 452 | 452 | Th_Interp *interp, |
| @@ -877,11 +877,11 @@ | ||
| 877 | 877 | re_free(pRe); |
| 878 | 878 | return rc; |
| 879 | 879 | } |
| 880 | 880 | |
| 881 | 881 | /* |
| 882 | -** TH command: http ?-asynchronous? ?--? url ?payload? | |
| 882 | +** TH1 command: http ?-asynchronous? ?--? url ?payload? | |
| 883 | 883 | ** |
| 884 | 884 | ** Perform an HTTP or HTTPS request for the specified URL. If a |
| 885 | 885 | ** payload is present, it will be interpreted as text/plain and |
| 886 | 886 | ** the POST method will be used; otherwise, the GET method will |
| 887 | 887 | ** be used. Upon success, if the -asynchronous option is used, an |
| 888 | 888 |
| --- src/th_main.c | |
| +++ src/th_main.c | |
| @@ -28,11 +28,11 @@ | |
| 28 | ** interpreter creation and initialization process. |
| 29 | */ |
| 30 | #define TH_INIT_NONE ((u32)0x00000000) /* No flags. */ |
| 31 | #define TH_INIT_NEED_CONFIG ((u32)0x00000001) /* Open configuration first? */ |
| 32 | #define TH_INIT_FORCE_TCL ((u32)0x00000002) /* Force Tcl to be enabled? */ |
| 33 | #define TH_INIT_FORCE_RESET ((u32)0x00000004) /* Force TH commands re-added? */ |
| 34 | #define TH_INIT_FORCE_SETUP ((u32)0x00000008) /* Force eval of setup script? */ |
| 35 | #define TH_INIT_DEFAULT (TH_INIT_NONE) /* Default flags. */ |
| 36 | #define TH_INIT_HOOK (TH_INIT_NEED_CONFIG | TH_INIT_FORCE_SETUP) |
| 37 | #endif |
| 38 | |
| @@ -111,11 +111,11 @@ | |
| 111 | fossil_print("\n------------------- END TRACE LOG -------------------\n"); |
| 112 | } |
| 113 | } |
| 114 | |
| 115 | /* |
| 116 | ** TH command: httpize STRING |
| 117 | ** |
| 118 | ** Escape all characters of STRING which have special meaning in URI |
| 119 | ** components. Return a new string result. |
| 120 | */ |
| 121 | static int httpizeCmd( |
| @@ -139,11 +139,11 @@ | |
| 139 | ** True if output is enabled. False if disabled. |
| 140 | */ |
| 141 | static int enableOutput = 1; |
| 142 | |
| 143 | /* |
| 144 | ** TH command: enable_output BOOLEAN |
| 145 | ** |
| 146 | ** Enable or disable the puts and hputs commands. |
| 147 | */ |
| 148 | static int enableOutputCmd( |
| 149 | Th_Interp *interp, |
| @@ -214,12 +214,12 @@ | |
| 214 | sendText(forceCgi || g.cgiOutput ? "</p>" : "\n", -1, 0); |
| 215 | enableOutput = savedEnable; |
| 216 | } |
| 217 | |
| 218 | /* |
| 219 | ** TH command: puts STRING |
| 220 | ** TH command: html STRING |
| 221 | ** |
| 222 | ** Output STRING escaped for HTML (html) or unchanged (puts). |
| 223 | */ |
| 224 | static int putsCmd( |
| 225 | Th_Interp *interp, |
| @@ -234,11 +234,11 @@ | |
| 234 | sendText((char*)argv[1], argl[1], *(unsigned int*)pConvert); |
| 235 | return TH_OK; |
| 236 | } |
| 237 | |
| 238 | /* |
| 239 | ** TH command: wiki STRING |
| 240 | ** |
| 241 | ** Render the input string as wiki. |
| 242 | */ |
| 243 | static int wikiCmd( |
| 244 | Th_Interp *interp, |
| @@ -259,11 +259,11 @@ | |
| 259 | } |
| 260 | return TH_OK; |
| 261 | } |
| 262 | |
| 263 | /* |
| 264 | ** TH command: htmlize STRING |
| 265 | ** |
| 266 | ** Escape all characters of STRING which have special meaning in HTML. |
| 267 | ** Return a new string result. |
| 268 | */ |
| 269 | static int htmlizeCmd( |
| @@ -282,11 +282,11 @@ | |
| 282 | free(zOut); |
| 283 | return TH_OK; |
| 284 | } |
| 285 | |
| 286 | /* |
| 287 | ** TH command: date |
| 288 | ** |
| 289 | ** Return a string which is the current time and date. If the |
| 290 | ** -local option is used, the date appears using localtime instead |
| 291 | ** of UTC. |
| 292 | */ |
| @@ -307,11 +307,11 @@ | |
| 307 | free(zOut); |
| 308 | return TH_OK; |
| 309 | } |
| 310 | |
| 311 | /* |
| 312 | ** TH command: hascap STRING... |
| 313 | ** |
| 314 | ** Return true if the user has all of the capabilities listed in STRING. |
| 315 | */ |
| 316 | static int hascapCmd( |
| 317 | Th_Interp *interp, |
| @@ -333,11 +333,11 @@ | |
| 333 | Th_SetResultInt(interp, rc); |
| 334 | return TH_OK; |
| 335 | } |
| 336 | |
| 337 | /* |
| 338 | ** TH command: hasfeature STRING |
| 339 | ** |
| 340 | ** Return true if the fossil binary has the given compile-time feature |
| 341 | ** enabled. The set of features includes: |
| 342 | ** |
| 343 | ** "ssl" = FOSSIL_ENABLE_SSL |
| @@ -411,11 +411,11 @@ | |
| 411 | return TH_OK; |
| 412 | } |
| 413 | |
| 414 | |
| 415 | /* |
| 416 | ** TH command: tclReady |
| 417 | ** |
| 418 | ** Return true if the fossil binary has the Tcl integration feature |
| 419 | ** enabled and it is currently available for use by TH1 scripts. |
| 420 | ** |
| 421 | */ |
| @@ -442,11 +442,11 @@ | |
| 442 | return TH_OK; |
| 443 | } |
| 444 | |
| 445 | |
| 446 | /* |
| 447 | ** TH command: anycap STRING |
| 448 | ** |
| 449 | ** Return true if the user has any one of the capabilities listed in STRING. |
| 450 | */ |
| 451 | static int anycapCmd( |
| 452 | Th_Interp *interp, |
| @@ -877,11 +877,11 @@ | |
| 877 | re_free(pRe); |
| 878 | return rc; |
| 879 | } |
| 880 | |
| 881 | /* |
| 882 | ** TH command: http ?-asynchronous? ?--? url ?payload? |
| 883 | ** |
| 884 | ** Perform an HTTP or HTTPS request for the specified URL. If a |
| 885 | ** payload is present, it will be interpreted as text/plain and |
| 886 | ** the POST method will be used; otherwise, the GET method will |
| 887 | ** be used. Upon success, if the -asynchronous option is used, an |
| 888 |
| --- src/th_main.c | |
| +++ src/th_main.c | |
| @@ -28,11 +28,11 @@ | |
| 28 | ** interpreter creation and initialization process. |
| 29 | */ |
| 30 | #define TH_INIT_NONE ((u32)0x00000000) /* No flags. */ |
| 31 | #define TH_INIT_NEED_CONFIG ((u32)0x00000001) /* Open configuration first? */ |
| 32 | #define TH_INIT_FORCE_TCL ((u32)0x00000002) /* Force Tcl to be enabled? */ |
| 33 | #define TH_INIT_FORCE_RESET ((u32)0x00000004) /* Force TH1 commands re-added? */ |
| 34 | #define TH_INIT_FORCE_SETUP ((u32)0x00000008) /* Force eval of setup script? */ |
| 35 | #define TH_INIT_DEFAULT (TH_INIT_NONE) /* Default flags. */ |
| 36 | #define TH_INIT_HOOK (TH_INIT_NEED_CONFIG | TH_INIT_FORCE_SETUP) |
| 37 | #endif |
| 38 | |
| @@ -111,11 +111,11 @@ | |
| 111 | fossil_print("\n------------------- END TRACE LOG -------------------\n"); |
| 112 | } |
| 113 | } |
| 114 | |
| 115 | /* |
| 116 | ** TH1 command: httpize STRING |
| 117 | ** |
| 118 | ** Escape all characters of STRING which have special meaning in URI |
| 119 | ** components. Return a new string result. |
| 120 | */ |
| 121 | static int httpizeCmd( |
| @@ -139,11 +139,11 @@ | |
| 139 | ** True if output is enabled. False if disabled. |
| 140 | */ |
| 141 | static int enableOutput = 1; |
| 142 | |
| 143 | /* |
| 144 | ** TH1 command: enable_output BOOLEAN |
| 145 | ** |
| 146 | ** Enable or disable the puts and hputs commands. |
| 147 | */ |
| 148 | static int enableOutputCmd( |
| 149 | Th_Interp *interp, |
| @@ -214,12 +214,12 @@ | |
| 214 | sendText(forceCgi || g.cgiOutput ? "</p>" : "\n", -1, 0); |
| 215 | enableOutput = savedEnable; |
| 216 | } |
| 217 | |
| 218 | /* |
| 219 | ** TH1 command: puts STRING |
| 220 | ** TH1 command: html STRING |
| 221 | ** |
| 222 | ** Output STRING escaped for HTML (html) or unchanged (puts). |
| 223 | */ |
| 224 | static int putsCmd( |
| 225 | Th_Interp *interp, |
| @@ -234,11 +234,11 @@ | |
| 234 | sendText((char*)argv[1], argl[1], *(unsigned int*)pConvert); |
| 235 | return TH_OK; |
| 236 | } |
| 237 | |
| 238 | /* |
| 239 | ** TH1 command: wiki STRING |
| 240 | ** |
| 241 | ** Render the input string as wiki. |
| 242 | */ |
| 243 | static int wikiCmd( |
| 244 | Th_Interp *interp, |
| @@ -259,11 +259,11 @@ | |
| 259 | } |
| 260 | return TH_OK; |
| 261 | } |
| 262 | |
| 263 | /* |
| 264 | ** TH1 command: htmlize STRING |
| 265 | ** |
| 266 | ** Escape all characters of STRING which have special meaning in HTML. |
| 267 | ** Return a new string result. |
| 268 | */ |
| 269 | static int htmlizeCmd( |
| @@ -282,11 +282,11 @@ | |
| 282 | free(zOut); |
| 283 | return TH_OK; |
| 284 | } |
| 285 | |
| 286 | /* |
| 287 | ** TH1 command: date |
| 288 | ** |
| 289 | ** Return a string which is the current time and date. If the |
| 290 | ** -local option is used, the date appears using localtime instead |
| 291 | ** of UTC. |
| 292 | */ |
| @@ -307,11 +307,11 @@ | |
| 307 | free(zOut); |
| 308 | return TH_OK; |
| 309 | } |
| 310 | |
| 311 | /* |
| 312 | ** TH1 command: hascap STRING... |
| 313 | ** |
| 314 | ** Return true if the user has all of the capabilities listed in STRING. |
| 315 | */ |
| 316 | static int hascapCmd( |
| 317 | Th_Interp *interp, |
| @@ -333,11 +333,11 @@ | |
| 333 | Th_SetResultInt(interp, rc); |
| 334 | return TH_OK; |
| 335 | } |
| 336 | |
| 337 | /* |
| 338 | ** TH1 command: hasfeature STRING |
| 339 | ** |
| 340 | ** Return true if the fossil binary has the given compile-time feature |
| 341 | ** enabled. The set of features includes: |
| 342 | ** |
| 343 | ** "ssl" = FOSSIL_ENABLE_SSL |
| @@ -411,11 +411,11 @@ | |
| 411 | return TH_OK; |
| 412 | } |
| 413 | |
| 414 | |
| 415 | /* |
| 416 | ** TH1 command: tclReady |
| 417 | ** |
| 418 | ** Return true if the fossil binary has the Tcl integration feature |
| 419 | ** enabled and it is currently available for use by TH1 scripts. |
| 420 | ** |
| 421 | */ |
| @@ -442,11 +442,11 @@ | |
| 442 | return TH_OK; |
| 443 | } |
| 444 | |
| 445 | |
| 446 | /* |
| 447 | ** TH1 command: anycap STRING |
| 448 | ** |
| 449 | ** Return true if the user has any one of the capabilities listed in STRING. |
| 450 | */ |
| 451 | static int anycapCmd( |
| 452 | Th_Interp *interp, |
| @@ -877,11 +877,11 @@ | |
| 877 | re_free(pRe); |
| 878 | return rc; |
| 879 | } |
| 880 | |
| 881 | /* |
| 882 | ** TH1 command: http ?-asynchronous? ?--? url ?payload? |
| 883 | ** |
| 884 | ** Perform an HTTP or HTTPS request for the specified URL. If a |
| 885 | ** payload is present, it will be interpreted as text/plain and |
| 886 | ** the POST method will be used; otherwise, the GET method will |
| 887 | ** be used. Upon success, if the -asynchronous option is used, an |
| 888 |
+1
-1
| --- src/tkt.c | ||
| +++ src/tkt.c | ||
| @@ -474,11 +474,11 @@ | ||
| 474 | 474 | |
| 475 | 475 | style_footer(); |
| 476 | 476 | } |
| 477 | 477 | |
| 478 | 478 | /* |
| 479 | -** TH command: append_field FIELD STRING | |
| 479 | +** TH1 command: append_field FIELD STRING | |
| 480 | 480 | ** |
| 481 | 481 | ** FIELD is the name of a database column to which we might want |
| 482 | 482 | ** to append text. STRING is the text to be appended to that |
| 483 | 483 | ** column. The append does not actually occur until the |
| 484 | 484 | ** submit_ticket command is run. |
| 485 | 485 |
| --- src/tkt.c | |
| +++ src/tkt.c | |
| @@ -474,11 +474,11 @@ | |
| 474 | |
| 475 | style_footer(); |
| 476 | } |
| 477 | |
| 478 | /* |
| 479 | ** TH command: append_field FIELD STRING |
| 480 | ** |
| 481 | ** FIELD is the name of a database column to which we might want |
| 482 | ** to append text. STRING is the text to be appended to that |
| 483 | ** column. The append does not actually occur until the |
| 484 | ** submit_ticket command is run. |
| 485 |
| --- src/tkt.c | |
| +++ src/tkt.c | |
| @@ -474,11 +474,11 @@ | |
| 474 | |
| 475 | style_footer(); |
| 476 | } |
| 477 | |
| 478 | /* |
| 479 | ** TH1 command: append_field FIELD STRING |
| 480 | ** |
| 481 | ** FIELD is the name of a database column to which we might want |
| 482 | ** to append text. STRING is the text to be appended to that |
| 483 | ** column. The append does not actually occur until the |
| 484 | ** submit_ticket command is run. |
| 485 |