Fossil SCM
merged from trunk
Commit
d22c72bc9248b5e766b881e45e392b72af7cc2b9
Parent
2fb7d59beed17f9…
3 files changed
+1
-1
+5
-3
+1
-1
+1
-1
| --- src/foci.c | ||
| +++ src/foci.c | ||
| @@ -190,11 +190,11 @@ | ||
| 190 | 190 | if( idxNum ){ |
| 191 | 191 | int rid; |
| 192 | 192 | if( idxNum==1 ){ |
| 193 | 193 | rid = sqlite3_value_int(argv[0]); |
| 194 | 194 | }else{ |
| 195 | - rid = symbolic_name_to_rid(sqlite3_value_text(argv[0]), "ci"); | |
| 195 | + rid = symbolic_name_to_rid((const char*)sqlite3_value_text(argv[0]),"ci"); | |
| 196 | 196 | } |
| 197 | 197 | pCur->pMan = manifest_get(rid, CFTYPE_MANIFEST, 0); |
| 198 | 198 | if( pCur->pMan ){ |
| 199 | 199 | manifest_file_rewind(pCur->pMan); |
| 200 | 200 | pCur->pFile = manifest_file_next(pCur->pMan, 0); |
| 201 | 201 |
| --- src/foci.c | |
| +++ src/foci.c | |
| @@ -190,11 +190,11 @@ | |
| 190 | if( idxNum ){ |
| 191 | int rid; |
| 192 | if( idxNum==1 ){ |
| 193 | rid = sqlite3_value_int(argv[0]); |
| 194 | }else{ |
| 195 | rid = symbolic_name_to_rid(sqlite3_value_text(argv[0]), "ci"); |
| 196 | } |
| 197 | pCur->pMan = manifest_get(rid, CFTYPE_MANIFEST, 0); |
| 198 | if( pCur->pMan ){ |
| 199 | manifest_file_rewind(pCur->pMan); |
| 200 | pCur->pFile = manifest_file_next(pCur->pMan, 0); |
| 201 |
| --- src/foci.c | |
| +++ src/foci.c | |
| @@ -190,11 +190,11 @@ | |
| 190 | if( idxNum ){ |
| 191 | int rid; |
| 192 | if( idxNum==1 ){ |
| 193 | rid = sqlite3_value_int(argv[0]); |
| 194 | }else{ |
| 195 | rid = symbolic_name_to_rid((const char*)sqlite3_value_text(argv[0]),"ci"); |
| 196 | } |
| 197 | pCur->pMan = manifest_get(rid, CFTYPE_MANIFEST, 0); |
| 198 | if( pCur->pMan ){ |
| 199 | manifest_file_rewind(pCur->pMan); |
| 200 | pCur->pFile = manifest_file_next(pCur->pMan, 0); |
| 201 |
+5
-3
| --- src/main.c | ||
| +++ src/main.c | ||
| @@ -2141,16 +2141,18 @@ | ||
| 2141 | 2141 | */ |
| 2142 | 2142 | pFileGlob = glob_create(blob_str(&value)); |
| 2143 | 2143 | blob_reset(&value); |
| 2144 | 2144 | continue; |
| 2145 | 2145 | } |
| 2146 | - if( blob_eq(&key, "setenv:") && blob_token(&line, &value) | |
| 2147 | - && blob_token(&line, &value2) ){ | |
| 2146 | + if( blob_eq(&key, "setenv:") && blob_token(&line, &value) ){ | |
| 2148 | 2147 | /* setenv: NAME VALUE |
| 2148 | + ** setenv: NAME | |
| 2149 | 2149 | ** |
| 2150 | - ** Sets environment variable NAME to VALUE | |
| 2150 | + ** Sets environment variable NAME to VALUE. If VALUE is omitted, then | |
| 2151 | + ** the environment variable is unset. | |
| 2151 | 2152 | */ |
| 2153 | + blob_token(&line,&value2); | |
| 2152 | 2154 | fossil_setenv(blob_str(&value), blob_str(&value2)); |
| 2153 | 2155 | blob_reset(&value); |
| 2154 | 2156 | blob_reset(&value2); |
| 2155 | 2157 | continue; |
| 2156 | 2158 | } |
| 2157 | 2159 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -2141,16 +2141,18 @@ | |
| 2141 | */ |
| 2142 | pFileGlob = glob_create(blob_str(&value)); |
| 2143 | blob_reset(&value); |
| 2144 | continue; |
| 2145 | } |
| 2146 | if( blob_eq(&key, "setenv:") && blob_token(&line, &value) |
| 2147 | && blob_token(&line, &value2) ){ |
| 2148 | /* setenv: NAME VALUE |
| 2149 | ** |
| 2150 | ** Sets environment variable NAME to VALUE |
| 2151 | */ |
| 2152 | fossil_setenv(blob_str(&value), blob_str(&value2)); |
| 2153 | blob_reset(&value); |
| 2154 | blob_reset(&value2); |
| 2155 | continue; |
| 2156 | } |
| 2157 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -2141,16 +2141,18 @@ | |
| 2141 | */ |
| 2142 | pFileGlob = glob_create(blob_str(&value)); |
| 2143 | blob_reset(&value); |
| 2144 | continue; |
| 2145 | } |
| 2146 | if( blob_eq(&key, "setenv:") && blob_token(&line, &value) ){ |
| 2147 | /* setenv: NAME VALUE |
| 2148 | ** setenv: NAME |
| 2149 | ** |
| 2150 | ** Sets environment variable NAME to VALUE. If VALUE is omitted, then |
| 2151 | ** the environment variable is unset. |
| 2152 | */ |
| 2153 | blob_token(&line,&value2); |
| 2154 | fossil_setenv(blob_str(&value), blob_str(&value2)); |
| 2155 | blob_reset(&value); |
| 2156 | blob_reset(&value2); |
| 2157 | continue; |
| 2158 | } |
| 2159 |
+1
-1
| --- src/manifest.c | ||
| +++ src/manifest.c | ||
| @@ -1611,11 +1611,11 @@ | ||
| 1611 | 1611 | return parentid; |
| 1612 | 1612 | } |
| 1613 | 1613 | |
| 1614 | 1614 | /* |
| 1615 | 1615 | ** There exists a "parent" tag against checkin rid that has value zValue. |
| 1616 | -** If value is well-formed (meaning that is is a list of UUIDs), then use | |
| 1616 | +** If value is well-formed (meaning that it is a list of UUIDs), then use | |
| 1617 | 1617 | ** zValue to reparent check-in rid. |
| 1618 | 1618 | */ |
| 1619 | 1619 | void manifest_reparent_checkin(int rid, const char *zValue){ |
| 1620 | 1620 | int nParent; |
| 1621 | 1621 | char *zCopy = 0; |
| 1622 | 1622 |
| --- src/manifest.c | |
| +++ src/manifest.c | |
| @@ -1611,11 +1611,11 @@ | |
| 1611 | return parentid; |
| 1612 | } |
| 1613 | |
| 1614 | /* |
| 1615 | ** There exists a "parent" tag against checkin rid that has value zValue. |
| 1616 | ** If value is well-formed (meaning that is is a list of UUIDs), then use |
| 1617 | ** zValue to reparent check-in rid. |
| 1618 | */ |
| 1619 | void manifest_reparent_checkin(int rid, const char *zValue){ |
| 1620 | int nParent; |
| 1621 | char *zCopy = 0; |
| 1622 |
| --- src/manifest.c | |
| +++ src/manifest.c | |
| @@ -1611,11 +1611,11 @@ | |
| 1611 | return parentid; |
| 1612 | } |
| 1613 | |
| 1614 | /* |
| 1615 | ** There exists a "parent" tag against checkin rid that has value zValue. |
| 1616 | ** If value is well-formed (meaning that it is a list of UUIDs), then use |
| 1617 | ** zValue to reparent check-in rid. |
| 1618 | */ |
| 1619 | void manifest_reparent_checkin(int rid, const char *zValue){ |
| 1620 | int nParent; |
| 1621 | char *zCopy = 0; |
| 1622 |