Fossil SCM

fix [a395f43b33e8e48d4c72d158530bdd88c2eebb5d]

ron 2010-01-24 07:07 trunk
Commit afe70a464686a3085141c03a1aee3eceb598ddd8
Parent fbcefb6e4ebd5b8…
3 files changed +1 -1 +3 -3 +1 -1
~ src/manifest.c ~ src/wiki.c ~ src/wikiformat.c
M src/manifest.c
+1 -1
--- src/manifest.c
+++ src/manifest.c
@@ -386,11 +386,11 @@
386386
 if( p->zWikiTitle!=0 ) goto manifest_syntax_error;
387387
 if( blob_token(&line, &a1)==0 ) goto manifest_syntax_error;
388388
 if( blob_token(&line, &a2)!=0 ) goto manifest_syntax_error;
389389
 p->zWikiTitle = blob_terminate(&a1);
390390
 defossilize(p->zWikiTitle);
391
- if( !wiki_name_is_wellformed(p->zWikiTitle) ){
391
+ if( !wiki_name_is_wellformed((const unsigned char *)p->zWikiTitle) ){
392392
 goto manifest_syntax_error;
393393
 }
394394
 break;
395395
 }
396396
397397
--- src/manifest.c
+++ src/manifest.c
@@ -386,11 +386,11 @@
386 if( p->zWikiTitle!=0 ) goto manifest_syntax_error;
387 if( blob_token(&line, &a1)==0 ) goto manifest_syntax_error;
388 if( blob_token(&line, &a2)!=0 ) goto manifest_syntax_error;
389 p->zWikiTitle = blob_terminate(&a1);
390 defossilize(p->zWikiTitle);
391 if( !wiki_name_is_wellformed(p->zWikiTitle) ){
392 goto manifest_syntax_error;
393 }
394 break;
395 }
396
397
--- src/manifest.c
+++ src/manifest.c
@@ -386,11 +386,11 @@
386 if( p->zWikiTitle!=0 ) goto manifest_syntax_error;
387 if( blob_token(&line, &a1)==0 ) goto manifest_syntax_error;
388 if( blob_token(&line, &a2)!=0 ) goto manifest_syntax_error;
389 p->zWikiTitle = blob_terminate(&a1);
390 defossilize(p->zWikiTitle);
391 if( !wiki_name_is_wellformed((const unsigned char *)p->zWikiTitle) ){
392 goto manifest_syntax_error;
393 }
394 break;
395 }
396
397
M src/wiki.c
+3 -3
--- src/wiki.c
+++ src/wiki.c
@@ -35,11 +35,11 @@
3535
 ** Well-formed wiki page names do not begin or end with whitespace,
3636
 ** and do not contain tabs or other control characters and do not
3737
 ** contain more than a single space character in a row. Well-formed
3838
 ** names must be between 3 and 100 chracters in length, inclusive.
3939
 */
40
-int wiki_name_is_wellformed(const char *z){
40
+int wiki_name_is_wellformed(const unsigned char *z){
4141
 int i;
4242
 if( z[0]<=0x20 ){
4343
 return 0;
4444
 }
4545
 for(i=1; z[i]; i++){
@@ -67,11 +67,11 @@
6767
 /*
6868
 ** Check a wiki name. If it is not well-formed, then issue an error
6969
 ** and return true. If it is well-formed, return false.
7070
 */
7171
 static int check_name(const char *z){
72
- if( !wiki_name_is_wellformed(z) ){
72
+ if( !wiki_name_is_wellformed((const unsigned char *)z) ){
7373
 style_header("Wiki Page Name Error");
7474
 @ The wiki name "<b>%h(z)</b>" is not well-formed. Rules for
7575
 @ wiki page names:
7676
 well_formed_wiki_name_rules();
7777
 style_footer();
@@ -345,11 +345,11 @@
345345
 if( !g.okNewWiki ){
346346
 login_needed();
347347
 return;
348348
 }
349349
 zName = PD("name","");
350
- if( zName[0] && wiki_name_is_wellformed(zName) ){
350
+ if( zName[0] && wiki_name_is_wellformed((const unsigned char *)zName) ){
351351
 cgi_redirectf("wikiedit?name=%T", zName);
352352
 }
353353
 style_header("Create A New Wiki Page");
354354
 @ <p>Rules for wiki page names:
355355
 well_formed_wiki_name_rules();
356356
--- src/wiki.c
+++ src/wiki.c
@@ -35,11 +35,11 @@
35 ** Well-formed wiki page names do not begin or end with whitespace,
36 ** and do not contain tabs or other control characters and do not
37 ** contain more than a single space character in a row. Well-formed
38 ** names must be between 3 and 100 chracters in length, inclusive.
39 */
40 int wiki_name_is_wellformed(const char *z){
41 int i;
42 if( z[0]<=0x20 ){
43 return 0;
44 }
45 for(i=1; z[i]; i++){
@@ -67,11 +67,11 @@
67 /*
68 ** Check a wiki name. If it is not well-formed, then issue an error
69 ** and return true. If it is well-formed, return false.
70 */
71 static int check_name(const char *z){
72 if( !wiki_name_is_wellformed(z) ){
73 style_header("Wiki Page Name Error");
74 @ The wiki name "<b>%h(z)</b>" is not well-formed. Rules for
75 @ wiki page names:
76 well_formed_wiki_name_rules();
77 style_footer();
@@ -345,11 +345,11 @@
345 if( !g.okNewWiki ){
346 login_needed();
347 return;
348 }
349 zName = PD("name","");
350 if( zName[0] && wiki_name_is_wellformed(zName) ){
351 cgi_redirectf("wikiedit?name=%T", zName);
352 }
353 style_header("Create A New Wiki Page");
354 @ <p>Rules for wiki page names:
355 well_formed_wiki_name_rules();
356
--- src/wiki.c
+++ src/wiki.c
@@ -35,11 +35,11 @@
35 ** Well-formed wiki page names do not begin or end with whitespace,
36 ** and do not contain tabs or other control characters and do not
37 ** contain more than a single space character in a row. Well-formed
38 ** names must be between 3 and 100 chracters in length, inclusive.
39 */
40 int wiki_name_is_wellformed(const unsigned char *z){
41 int i;
42 if( z[0]<=0x20 ){
43 return 0;
44 }
45 for(i=1; z[i]; i++){
@@ -67,11 +67,11 @@
67 /*
68 ** Check a wiki name. If it is not well-formed, then issue an error
69 ** and return true. If it is well-formed, return false.
70 */
71 static int check_name(const char *z){
72 if( !wiki_name_is_wellformed((const unsigned char *)z) ){
73 style_header("Wiki Page Name Error");
74 @ The wiki name "<b>%h(z)</b>" is not well-formed. Rules for
75 @ wiki page names:
76 well_formed_wiki_name_rules();
77 style_footer();
@@ -345,11 +345,11 @@
345 if( !g.okNewWiki ){
346 login_needed();
347 return;
348 }
349 zName = PD("name","");
350 if( zName[0] && wiki_name_is_wellformed((const unsigned char *)zName) ){
351 cgi_redirectf("wikiedit?name=%T", zName);
352 }
353 style_header("Create A New Wiki Page");
354 @ <p>Rules for wiki page names:
355 well_formed_wiki_name_rules();
356
M src/wikiformat.c
+1 -1
--- src/wikiformat.c
+++ src/wikiformat.c
@@ -1015,11 +1015,11 @@
10151015
 }
10161016
 }
10171017
 }else if( g.okHistory ){
10181018
 blob_appendf(p->pOut, "<a href=\"%s/info/%s\">", g.zBaseURL, zTarget);
10191019
 }
1020
- }else if( wiki_name_is_wellformed(zTarget) ){
1020
+ }else if( wiki_name_is_wellformed((const unsigned char *)zTarget) ){
10211021
 blob_appendf(p->pOut, "<a href=\"%s/wiki?name=%T\">", g.zBaseURL, zTarget);
10221022
 }else{
10231023
 blob_appendf(p->pOut, "[bad-link: %h]", zTarget);
10241024
 zTerm = "";
10251025
 }
10261026
--- src/wikiformat.c
+++ src/wikiformat.c
@@ -1015,11 +1015,11 @@
1015 }
1016 }
1017 }else if( g.okHistory ){
1018 blob_appendf(p->pOut, "<a href=\"%s/info/%s\">", g.zBaseURL, zTarget);
1019 }
1020 }else if( wiki_name_is_wellformed(zTarget) ){
1021 blob_appendf(p->pOut, "<a href=\"%s/wiki?name=%T\">", g.zBaseURL, zTarget);
1022 }else{
1023 blob_appendf(p->pOut, "[bad-link: %h]", zTarget);
1024 zTerm = "";
1025 }
1026
--- src/wikiformat.c
+++ src/wikiformat.c
@@ -1015,11 +1015,11 @@
1015 }
1016 }
1017 }else if( g.okHistory ){
1018 blob_appendf(p->pOut, "<a href=\"%s/info/%s\">", g.zBaseURL, zTarget);
1019 }
1020 }else if( wiki_name_is_wellformed((const unsigned char *)zTarget) ){
1021 blob_appendf(p->pOut, "<a href=\"%s/wiki?name=%T\">", g.zBaseURL, zTarget);
1022 }else{
1023 blob_appendf(p->pOut, "[bad-link: %h]", zTarget);
1024 zTerm = "";
1025 }
1026

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button