Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Coding style and consistency improvements. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
824bfe849bcce6e0e769b6a54ff9f402 |
User & Date: | mistachkin 2016-10-04 23:29:53 |
Context
2016-10-04
| ||
23:32 | The final newline must be retained for all test results. check-in: b045d077 user: mistachkin tags: trunk | |
23:29 | Coding style and consistency improvements. check-in: 824bfe84 user: mistachkin tags: trunk | |
23:27 | Do not use the Tcl global variable name 'dir'. check-in: 64b812bd user: mistachkin tags: trunk | |
Changes
Changes to src/blob.c.
849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 |
** Return the number of bytes written. */ int blob_write_to_file(Blob *pBlob, const char *zFilename){ FILE *out; int nWrote; if( zFilename[0]==0 || (zFilename[0]=='-' && zFilename[1]==0) ){ nWrote = blob_size(pBlob); #if defined(_WIN32) if( fossil_utf8_to_console(blob_buffer(pBlob), nWrote, 0) >= 0 ){ return nWrote; } fflush(stdout); _setmode(_fileno(stdout), _O_BINARY); #endif fwrite(blob_buffer(pBlob), 1, nWrote, stdout); #if defined(_WIN32) fflush(stdout); _setmode(_fileno(stdout), _O_TEXT); #endif }else{ file_mkfolder(zFilename, 1, 0); out = fossil_fopen(zFilename, "wb"); |
| | | < | |
849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 |
** Return the number of bytes written. */ int blob_write_to_file(Blob *pBlob, const char *zFilename){ FILE *out; int nWrote; if( zFilename[0]==0 || (zFilename[0]=='-' && zFilename[1]==0) ){ blob_is_init(pBlob); #if defined(_WIN32) nWrote = fossil_utf8_to_console(blob_buffer(pBlob), blob_size(pBlob), 0); if( nWrote>=0 ) return nWrote; fflush(stdout); _setmode(_fileno(stdout), _O_BINARY); #endif nWrote = fwrite(blob_buffer(pBlob), 1, blob_size(pBlob), stdout); #if defined(_WIN32) fflush(stdout); _setmode(_fileno(stdout), _O_TEXT); #endif }else{ file_mkfolder(zFilename, 1, 0); out = fossil_fopen(zFilename, "wb"); |
Changes to src/utf8.c.
315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 |
#ifdef _WIN32
int nChar, written = 0;
wchar_t *zUnicode; /* Unicode version of zUtf8 */
DWORD dummy;
Blob blob;
static int istty[2] = { -1, -1 };
if( istty[toStdErr] == -1 ){
istty[toStdErr] = _isatty(toStdErr + 1) != 0;
}
if( !istty[toStdErr] ){
/* stdout/stderr is not a console. */
return -1;
}
|
| |
315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 |
#ifdef _WIN32
int nChar, written = 0;
wchar_t *zUnicode; /* Unicode version of zUtf8 */
DWORD dummy;
Blob blob;
static int istty[2] = { -1, -1 };
if( istty[toStdErr]==-1 ){
istty[toStdErr] = _isatty(toStdErr + 1) != 0;
}
if( !istty[toStdErr] ){
/* stdout/stderr is not a console. */
return -1;
}
|