Fossil SCM
Change the encoding on the ZIP archive generator so that it preserves UTF8 filenames.
Commit
3ff5ca0573fce22007ad190835e755f90b74238a
Parent
ee1ff73a9ef622d…
1 file changed
+2
-2
+2
-2
| --- src/zip.c | ||
| +++ src/zip.c | ||
| @@ -152,11 +152,11 @@ | ||
| 152 | 152 | } |
| 153 | 153 | nameLen = strlen(zName); |
| 154 | 154 | memset(zHdr, 0, sizeof(zHdr)); |
| 155 | 155 | put32(&zHdr[0], 0x04034b50); |
| 156 | 156 | put16(&zHdr[4], 0x000a); |
| 157 | - put16(&zHdr[6], 0); | |
| 157 | + put16(&zHdr[6], 0x0800); | |
| 158 | 158 | put16(&zHdr[8], iMethod); |
| 159 | 159 | put16(&zHdr[10], dosTime); |
| 160 | 160 | put16(&zHdr[12], dosDate); |
| 161 | 161 | put16(&zHdr[26], nameLen); |
| 162 | 162 | put16(&zHdr[28], 13); |
| @@ -217,11 +217,11 @@ | ||
| 217 | 217 | */ |
| 218 | 218 | memset(zBuf, 0, sizeof(zBuf)); |
| 219 | 219 | put32(&zBuf[0], 0x02014b50); |
| 220 | 220 | put16(&zBuf[4], 0x0317); |
| 221 | 221 | put16(&zBuf[6], 0x000a); |
| 222 | - put16(&zBuf[8], 0); | |
| 222 | + put16(&zBuf[8], 0x0800); | |
| 223 | 223 | put16(&zBuf[10], iMethod); |
| 224 | 224 | put16(&zBuf[12], dosTime); |
| 225 | 225 | put16(&zBuf[14], dosDate); |
| 226 | 226 | put32(&zBuf[16], iCRC); |
| 227 | 227 | put32(&zBuf[20], nByteCompr); |
| 228 | 228 |
| --- src/zip.c | |
| +++ src/zip.c | |
| @@ -152,11 +152,11 @@ | |
| 152 | } |
| 153 | nameLen = strlen(zName); |
| 154 | memset(zHdr, 0, sizeof(zHdr)); |
| 155 | put32(&zHdr[0], 0x04034b50); |
| 156 | put16(&zHdr[4], 0x000a); |
| 157 | put16(&zHdr[6], 0); |
| 158 | put16(&zHdr[8], iMethod); |
| 159 | put16(&zHdr[10], dosTime); |
| 160 | put16(&zHdr[12], dosDate); |
| 161 | put16(&zHdr[26], nameLen); |
| 162 | put16(&zHdr[28], 13); |
| @@ -217,11 +217,11 @@ | |
| 217 | */ |
| 218 | memset(zBuf, 0, sizeof(zBuf)); |
| 219 | put32(&zBuf[0], 0x02014b50); |
| 220 | put16(&zBuf[4], 0x0317); |
| 221 | put16(&zBuf[6], 0x000a); |
| 222 | put16(&zBuf[8], 0); |
| 223 | put16(&zBuf[10], iMethod); |
| 224 | put16(&zBuf[12], dosTime); |
| 225 | put16(&zBuf[14], dosDate); |
| 226 | put32(&zBuf[16], iCRC); |
| 227 | put32(&zBuf[20], nByteCompr); |
| 228 |
| --- src/zip.c | |
| +++ src/zip.c | |
| @@ -152,11 +152,11 @@ | |
| 152 | } |
| 153 | nameLen = strlen(zName); |
| 154 | memset(zHdr, 0, sizeof(zHdr)); |
| 155 | put32(&zHdr[0], 0x04034b50); |
| 156 | put16(&zHdr[4], 0x000a); |
| 157 | put16(&zHdr[6], 0x0800); |
| 158 | put16(&zHdr[8], iMethod); |
| 159 | put16(&zHdr[10], dosTime); |
| 160 | put16(&zHdr[12], dosDate); |
| 161 | put16(&zHdr[26], nameLen); |
| 162 | put16(&zHdr[28], 13); |
| @@ -217,11 +217,11 @@ | |
| 217 | */ |
| 218 | memset(zBuf, 0, sizeof(zBuf)); |
| 219 | put32(&zBuf[0], 0x02014b50); |
| 220 | put16(&zBuf[4], 0x0317); |
| 221 | put16(&zBuf[6], 0x000a); |
| 222 | put16(&zBuf[8], 0x0800); |
| 223 | put16(&zBuf[10], iMethod); |
| 224 | put16(&zBuf[12], dosTime); |
| 225 | put16(&zBuf[14], dosDate); |
| 226 | put32(&zBuf[16], iCRC); |
| 227 | put32(&zBuf[20], nByteCompr); |
| 228 |