Differences From Artifact [0c04b50c2f]:
- File src/db.c — part of check-in [e25f55dd4d] at 2012-08-21 11:05:27 on branch trunk — Fix error messages associated with the "scrub" command. (user: drh size: 71230) [more...]
To Artifact [c2fdbae144]:
- File src/db.c — part of check-in [be06861f3c] at 2012-09-02 19:39:43 on branch ticket-c8c0b78c84 — <pre>Minor additional fixes related to [c8c0b78c84]: - Use _wsystem() in stead of system() on Windows - Use g.argv[0] in stead of fossil_nameofexe() where only printing is involved - Use fossil_nameofexe() where fossil_system() is involved - Move the determination of the full windows path to fossil_nameofexec, so g.argv[0] can always be the unmodified argv[0] - g.argv[0] and fossil_nameofexec() are in utf-8, so we cannot use fprintf directly. Exception: when printing malloc errors.</pre> (user: jan.nijtmans size: 71268)
| ︙ | ︙ | |||
90 91 92 93 94 95 96 |
}
else if( g.cgiOutput ){
g.cgiOutput = 0;
cgi_printf("<h1>Database Error</h1>\n"
"<pre>%h</pre><p>%s</p>", z, zRebuildMsg);
cgi_reply();
}else{
| | > > | 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 |
}
else if( g.cgiOutput ){
g.cgiOutput = 0;
cgi_printf("<h1>Database Error</h1>\n"
"<pre>%h</pre><p>%s</p>", z, zRebuildMsg);
cgi_reply();
}else{
char *zOut = mprintf("%s: %s\n\n%s", g.argv[0], z, zRebuildMsg);
fossil_puts(zOut, 1);
free(zOut);
}
free(z);
db_force_rollback();
fossil_exit(rc);
}
/*
|
| ︙ | ︙ |