Fossil SCM
Set binary translation mode on windows for import and export. Ticket [feeb8a91eb838f743ae9]
Commit
b408ece7f603de55b73e6a9711384cbb1c715e11
Parent
115f3ea60ed2e57…
3 files changed
+1
+1
+10
+1
| --- src/export.c | ||
| +++ src/export.c | ||
| @@ -105,10 +105,11 @@ | ||
| 105 | 105 | db_find_and_open_repository(1); |
| 106 | 106 | |
| 107 | 107 | /* Step 1: Generate "blob" records for every artifact that is part |
| 108 | 108 | ** of a check-in |
| 109 | 109 | */ |
| 110 | + fossil_binary_mode(stdout); | |
| 110 | 111 | db_prepare(&q, "SELECT DISTINCT fid FROM mlink WHERE fid>0"); |
| 111 | 112 | while( db_step(&q)==SQLITE_ROW ){ |
| 112 | 113 | int rid = db_column_int(&q, 0); |
| 113 | 114 | Blob content; |
| 114 | 115 | content_get(rid, &content); |
| 115 | 116 |
| --- src/export.c | |
| +++ src/export.c | |
| @@ -105,10 +105,11 @@ | |
| 105 | db_find_and_open_repository(1); |
| 106 | |
| 107 | /* Step 1: Generate "blob" records for every artifact that is part |
| 108 | ** of a check-in |
| 109 | */ |
| 110 | db_prepare(&q, "SELECT DISTINCT fid FROM mlink WHERE fid>0"); |
| 111 | while( db_step(&q)==SQLITE_ROW ){ |
| 112 | int rid = db_column_int(&q, 0); |
| 113 | Blob content; |
| 114 | content_get(rid, &content); |
| 115 |
| --- src/export.c | |
| +++ src/export.c | |
| @@ -105,10 +105,11 @@ | |
| 105 | db_find_and_open_repository(1); |
| 106 | |
| 107 | /* Step 1: Generate "blob" records for every artifact that is part |
| 108 | ** of a check-in |
| 109 | */ |
| 110 | fossil_binary_mode(stdout); |
| 111 | db_prepare(&q, "SELECT DISTINCT fid FROM mlink WHERE fid>0"); |
| 112 | while( db_step(&q)==SQLITE_ROW ){ |
| 113 | int rid = db_column_int(&q, 0); |
| 114 | Blob content; |
| 115 | content_get(rid, &content); |
| 116 |
+1
| --- src/import.c | ||
| +++ src/import.c | ||
| @@ -593,10 +593,11 @@ | ||
| 593 | 593 | } |
| 594 | 594 | if( g.argc==4 ){ |
| 595 | 595 | pIn = fopen(g.argv[3], "rb"); |
| 596 | 596 | }else{ |
| 597 | 597 | pIn = stdin; |
| 598 | + fossil_binary_mode(pIn); | |
| 598 | 599 | } |
| 599 | 600 | if( forceFlag ) unlink(g.argv[2]); |
| 600 | 601 | db_create_repository(g.argv[2]); |
| 601 | 602 | db_open_repository(g.argv[2]); |
| 602 | 603 | db_open_config(0); |
| 603 | 604 |
| --- src/import.c | |
| +++ src/import.c | |
| @@ -593,10 +593,11 @@ | |
| 593 | } |
| 594 | if( g.argc==4 ){ |
| 595 | pIn = fopen(g.argv[3], "rb"); |
| 596 | }else{ |
| 597 | pIn = stdin; |
| 598 | } |
| 599 | if( forceFlag ) unlink(g.argv[2]); |
| 600 | db_create_repository(g.argv[2]); |
| 601 | db_open_repository(g.argv[2]); |
| 602 | db_open_config(0); |
| 603 |
| --- src/import.c | |
| +++ src/import.c | |
| @@ -593,10 +593,11 @@ | |
| 593 | } |
| 594 | if( g.argc==4 ){ |
| 595 | pIn = fopen(g.argv[3], "rb"); |
| 596 | }else{ |
| 597 | pIn = stdin; |
| 598 | fossil_binary_mode(pIn); |
| 599 | } |
| 600 | if( forceFlag ) unlink(g.argv[2]); |
| 601 | db_create_repository(g.argv[2]); |
| 602 | db_open_repository(g.argv[2]); |
| 603 | db_open_config(0); |
| 604 |
+10
| --- src/main.c | ||
| +++ src/main.c | ||
| @@ -407,10 +407,20 @@ | ||
| 407 | 407 | */ |
| 408 | 408 | rc = system(zOrigCmd); |
| 409 | 409 | #endif |
| 410 | 410 | return rc; |
| 411 | 411 | } |
| 412 | + | |
| 413 | +/* | |
| 414 | +** Turn off any NL to CRNL translation on the stream given as an | |
| 415 | +** argument. This is a no-op on unix but is necessary on windows. | |
| 416 | +*/ | |
| 417 | +void fossil_binary_mode(FILE *p){ | |
| 418 | +#if defined(_WIN32) | |
| 419 | + _setmode(_fileno(p), _O_BINARY); | |
| 420 | +#endif | |
| 421 | +} | |
| 412 | 422 | |
| 413 | 423 | |
| 414 | 424 | |
| 415 | 425 | /* |
| 416 | 426 | ** Return a name for an SQLite error code |
| 417 | 427 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -407,10 +407,20 @@ | |
| 407 | */ |
| 408 | rc = system(zOrigCmd); |
| 409 | #endif |
| 410 | return rc; |
| 411 | } |
| 412 | |
| 413 | |
| 414 | |
| 415 | /* |
| 416 | ** Return a name for an SQLite error code |
| 417 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -407,10 +407,20 @@ | |
| 407 | */ |
| 408 | rc = system(zOrigCmd); |
| 409 | #endif |
| 410 | return rc; |
| 411 | } |
| 412 | |
| 413 | /* |
| 414 | ** Turn off any NL to CRNL translation on the stream given as an |
| 415 | ** argument. This is a no-op on unix but is necessary on windows. |
| 416 | */ |
| 417 | void fossil_binary_mode(FILE *p){ |
| 418 | #if defined(_WIN32) |
| 419 | _setmode(_fileno(p), _O_BINARY); |
| 420 | #endif |
| 421 | } |
| 422 | |
| 423 | |
| 424 | |
| 425 | /* |
| 426 | ** Return a name for an SQLite error code |
| 427 |