Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Changes In Branch warningFix Excluding Merge-Ins
This is equivalent to a diff from 49b0ff1592 to d1983dd24c
|
2014-10-21
| ||
| 03:05 | Fix compiler warning and clarify use of local variables. ... (check-in: e7518b44eb user: mistachkin tags: trunk) | |
| 03:00 | Merge updates from trunk. ... (Closed-Leaf check-in: d1983dd24c user: mistachkin tags: warningFix) | |
| 02:52 | Add the codecheck1 program to the build tools. This program validates the format strings on printf-style internal interfaces, verifying that the correct number of arguments follow and that SQL is protected from injection attacks. ... (check-in: 49b0ff1592 user: drh tags: trunk) | |
| 02:09 | Include main.mk in the makefile integration for the codecheck1 tool. Also fix dependency issue with the MinGW makefiles. ... (Closed-Leaf check-in: 5ea84522ec user: mistachkin tags: compile-time-print-checking) | |
|
2014-10-20
| ||
| 16:31 | Reverse the output order for the "fossil stash list" command so that the most resent stashes are near the bottom, rather than scrolling off the top of the screen. ... (check-in: cf9eac3929 user: drh tags: trunk) | |
|
2014-10-16
| ||
| 02:16 | Merge updates from trunk. ... (check-in: 1b6dfe8178 user: mistachkin tags: warningFix) | |
Changes to src/shun.c.
| ︙ | ︙ | |||
41 42 43 44 45 46 47 |
void shun_page(void){
Stmt q;
int cnt = 0;
const char *zUuid = P("uuid");
const char *zShun = P("shun");
const char *zAccept = P("accept");
const char *zRcvid = P("rcvid");
| | < | 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 |
void shun_page(void){
Stmt q;
int cnt = 0;
const char *zUuid = P("uuid");
const char *zShun = P("shun");
const char *zAccept = P("accept");
const char *zRcvid = P("rcvid");
int nRcvid = 0;
int numRows = 3;
char *zCanonical = 0;
login_check_credentials();
if( !g.perm.Admin ){
login_needed();
}
|
| ︙ | ︙ | |||
77 78 79 80 81 82 83 |
j++;
}
i++;
}
zCanonical[j+1] = zCanonical[j] = 0;
p = zCanonical;
while( *p ){
| | | 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 |
j++;
}
i++;
}
zCanonical[j+1] = zCanonical[j] = 0;
p = zCanonical;
while( *p ){
int nUuid = strlen(p);
if( nUuid!=UUID_SIZE || !validate16(p, nUuid) ){
@ <p class="generalError">Error: Bad artifact IDs.</p>
fossil_free(zCanonical);
zCanonical = 0;
break;
}else{
canonical16(p, UUID_SIZE);
|
| ︙ | ︙ | |||
150 151 152 153 154 155 156 |
}
@ have been shunned. They will no longer be pushed.
@ They will be removed from the repository the next time the repository
@ is rebuilt using the <b>fossil rebuild</b> command-line</p>
}
if( zRcvid ){
nRcvid = atoi(zRcvid);
| | > | 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 |
}
@ have been shunned. They will no longer be pushed.
@ They will be removed from the repository the next time the repository
@ is rebuilt using the <b>fossil rebuild</b> command-line</p>
}
if( zRcvid ){
nRcvid = atoi(zRcvid);
numRows = db_int(0, "SELECT min(count(), 10) FROM blob WHERE rcvid=%d",
nRcvid);
}
@ <p>A shunned artifact will not be pushed nor accepted in a pull and the
@ artifact content will be purged from the repository the next time the
@ repository is rebuilt. A list of shunned artifacts can be seen at the
@ bottom of this page.</p>
@
@ <a name="addshun"></a>
|
| ︙ | ︙ | |||
181 182 183 184 185 186 187 |
@ <blockquote>
@ <form method="post" action="%s(g.zTop)/%s(g.zPath)"><div>
login_insert_csrf_secret();
@ <textarea class="fullsize-text" cols="50" rows="%d(numRows)" name="uuid">
if( zShun ){
if( strlen(zShun) ){
@ %h(zShun)
| | | 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 |
@ <blockquote>
@ <form method="post" action="%s(g.zTop)/%s(g.zPath)"><div>
login_insert_csrf_secret();
@ <textarea class="fullsize-text" cols="50" rows="%d(numRows)" name="uuid">
if( zShun ){
if( strlen(zShun) ){
@ %h(zShun)
}else if( nRcvid ){
db_prepare(&q, "SELECT uuid FROM blob WHERE rcvid=%d", nRcvid);
while( db_step(&q)==SQLITE_ROW ){
@ %s(db_column_text(&q, 0))
}
db_finalize(&q);
}
}
|
| ︙ | ︙ | |||
208 209 210 211 212 213 214 |
@ <blockquote>
@ <form method="post" action="%s(g.zTop)/%s(g.zPath)"><div>
login_insert_csrf_secret();
@ <textarea class="fullsize-text" cols="50" rows="%d(numRows)" name="uuid">
if( zAccept ){
if( strlen(zAccept) ){
@ %h(zAccept)
| | | 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 |
@ <blockquote>
@ <form method="post" action="%s(g.zTop)/%s(g.zPath)"><div>
login_insert_csrf_secret();
@ <textarea class="fullsize-text" cols="50" rows="%d(numRows)" name="uuid">
if( zAccept ){
if( strlen(zAccept) ){
@ %h(zAccept)
}else if( nRcvid ){
db_prepare(&q, "SELECT uuid FROM blob WHERE rcvid=%d", nRcvid);
while( db_step(&q)==SQLITE_ROW ){
@ %s(db_column_text(&q, 0))
}
db_finalize(&q);
}
}
|
| ︙ | ︙ |