Fossil SCM
Do not set the directory permission bit on empty files when creating a ZIP archive.
Commit
3d5cf48bf2828ecd8f2e04d7ca02a86c77cfa4c1
Parent
c2e42166ef4504c…
1 file changed
+2
-2
+2
-2
| --- src/zip.c | ||
| +++ src/zip.c | ||
| @@ -142,18 +142,18 @@ | ||
| 142 | 142 | char zOutBuf[100000]; |
| 143 | 143 | |
| 144 | 144 | /* Fill in as much of the header as we know. |
| 145 | 145 | */ |
| 146 | 146 | nBlob = pFile ? blob_size(pFile) : 0; |
| 147 | - if( nBlob>0 ){ | |
| 147 | + if( pFile ){ /* This is a file, possibly empty... */ | |
| 148 | 148 | iMethod = 8; |
| 149 | 149 | switch( mPerm ){ |
| 150 | 150 | case PERM_LNK: iMode = 0120755; break; |
| 151 | 151 | case PERM_EXE: iMode = 0100755; break; |
| 152 | 152 | default: iMode = 0100644; break; |
| 153 | 153 | } |
| 154 | - }else{ | |
| 154 | + }else{ /* This is a directory, no blob... */ | |
| 155 | 155 | iMethod = 0; |
| 156 | 156 | iMode = 040755; |
| 157 | 157 | } |
| 158 | 158 | nameLen = strlen(zName); |
| 159 | 159 | memset(zHdr, 0, sizeof(zHdr)); |
| 160 | 160 |
| --- src/zip.c | |
| +++ src/zip.c | |
| @@ -142,18 +142,18 @@ | |
| 142 | char zOutBuf[100000]; |
| 143 | |
| 144 | /* Fill in as much of the header as we know. |
| 145 | */ |
| 146 | nBlob = pFile ? blob_size(pFile) : 0; |
| 147 | if( nBlob>0 ){ |
| 148 | iMethod = 8; |
| 149 | switch( mPerm ){ |
| 150 | case PERM_LNK: iMode = 0120755; break; |
| 151 | case PERM_EXE: iMode = 0100755; break; |
| 152 | default: iMode = 0100644; break; |
| 153 | } |
| 154 | }else{ |
| 155 | iMethod = 0; |
| 156 | iMode = 040755; |
| 157 | } |
| 158 | nameLen = strlen(zName); |
| 159 | memset(zHdr, 0, sizeof(zHdr)); |
| 160 |
| --- src/zip.c | |
| +++ src/zip.c | |
| @@ -142,18 +142,18 @@ | |
| 142 | char zOutBuf[100000]; |
| 143 | |
| 144 | /* Fill in as much of the header as we know. |
| 145 | */ |
| 146 | nBlob = pFile ? blob_size(pFile) : 0; |
| 147 | if( pFile ){ /* This is a file, possibly empty... */ |
| 148 | iMethod = 8; |
| 149 | switch( mPerm ){ |
| 150 | case PERM_LNK: iMode = 0120755; break; |
| 151 | case PERM_EXE: iMode = 0100755; break; |
| 152 | default: iMode = 0100644; break; |
| 153 | } |
| 154 | }else{ /* This is a directory, no blob... */ |
| 155 | iMethod = 0; |
| 156 | iMode = 040755; |
| 157 | } |
| 158 | nameLen = strlen(zName); |
| 159 | memset(zHdr, 0, sizeof(zHdr)); |
| 160 |