diff options
Diffstat (limited to 'app-admin/analog/files/analog-6.0.18-c23.patch')
| -rw-r--r-- | app-admin/analog/files/analog-6.0.18-c23.patch | 512 |
1 files changed, 512 insertions, 0 deletions
diff --git a/app-admin/analog/files/analog-6.0.18-c23.patch b/app-admin/analog/files/analog-6.0.18-c23.patch new file mode 100644 index 000000000000..13c1de9104e9 --- /dev/null +++ b/app-admin/analog/files/analog-6.0.18-c23.patch @@ -0,0 +1,512 @@ +Bug: https://bugs.gentoo.org/881867 + +--- a/src/unzip/ioapi.c ++++ b/src/unzip/ioapi.c +@@ -65,10 +65,7 @@ + voidpf stream)); + + +-voidpf ZCALLBACK fopen_file_func (opaque, filename, mode) +- voidpf opaque; +- const char* filename; +- int mode; ++voidpf ZCALLBACK fopen_file_func (voidpf opaque, const char* filename, int mode) + { + FILE* file = NULL; + const char* mode_fopen = NULL; +@@ -87,11 +84,7 @@ + } + + +-uLong ZCALLBACK fread_file_func (opaque, stream, buf, size) +- voidpf opaque; +- voidpf stream; +- void* buf; +- uLong size; ++uLong ZCALLBACK fread_file_func (voidpf opaque, voidpf stream, void* buf, uLong size) + { + uLong ret; + ret = fread(buf, 1, (size_t)size, (FILE *)stream); +@@ -99,31 +92,21 @@ + } + + +-uLong ZCALLBACK fwrite_file_func (opaque, stream, buf, size) +- voidpf opaque; +- voidpf stream; +- const void* buf; +- uLong size; ++uLong ZCALLBACK fwrite_file_func (voidpf opaque, voidpf stream, const void* buf, uLong size) + { + uLong ret; + ret = fwrite(buf, 1, (size_t)size, (FILE *)stream); + return ret; + } + +-long ZCALLBACK ftell_file_func (opaque, stream) +- voidpf opaque; +- voidpf stream; ++long ZCALLBACK ftell_file_func (voidpf opaque, voidpf stream) + { + long ret; + ret = ftell((FILE *)stream); + return ret; + } + +-long ZCALLBACK fseek_file_func (opaque, stream, offset, origin) +- voidpf opaque; +- voidpf stream; +- uLong offset; +- int origin; ++long ZCALLBACK fseek_file_func (voidpf opaque, voidpf stream, uLong offset, int origin) + { + int fseek_origin=0; + long ret; +@@ -145,26 +128,21 @@ + return ret; + } + +-int ZCALLBACK fclose_file_func (opaque, stream) +- voidpf opaque; +- voidpf stream; ++int ZCALLBACK fclose_file_func (voidpf opaque, voidpf stream) + { + int ret; + ret = fclose((FILE *)stream); + return ret; + } + +-int ZCALLBACK ferror_file_func (opaque, stream) +- voidpf opaque; +- voidpf stream; ++int ZCALLBACK ferror_file_func (voidpf opaque, voidpf stream) + { + int ret; + ret = ferror((FILE *)stream); + return ret; + } + +-void fill_fopen_filefunc (pzlib_filefunc_def) +- zlib_filefunc_def* pzlib_filefunc_def; ++void fill_fopen_filefunc (zlib_filefunc_def* pzlib_filefunc_def) + { + pzlib_filefunc_def->zopen_file = fopen_file_func; + pzlib_filefunc_def->zread_file = fread_file_func; +--- a/src/unzip/unzip.c ++++ b/src/unzip/unzip.c +@@ -168,10 +168,7 @@ + voidpf filestream, + int *pi)); + +-local int unzlocal_getByte(pzlib_filefunc_def,filestream,pi) +- const zlib_filefunc_def* pzlib_filefunc_def; +- voidpf filestream; +- int *pi; ++local int unzlocal_getByte(const zlib_filefunc_def* pzlib_filefunc_def, voidpf filestream, int *pi) + { + unsigned char c; + int err = (int)ZREAD(*pzlib_filefunc_def,filestream,&c,1); +@@ -198,10 +195,7 @@ + voidpf filestream, + uLong *pX)); + +-local int unzlocal_getShort (pzlib_filefunc_def,filestream,pX) +- const zlib_filefunc_def* pzlib_filefunc_def; +- voidpf filestream; +- uLong *pX; ++local int unzlocal_getShort (const zlib_filefunc_def* pzlib_filefunc_def, voidpf filestream, uLong *pX) + { + uLong x ; + int i; +@@ -226,10 +220,7 @@ + voidpf filestream, + uLong *pX)); + +-local int unzlocal_getLong (pzlib_filefunc_def,filestream,pX) +- const zlib_filefunc_def* pzlib_filefunc_def; +- voidpf filestream; +- uLong *pX; ++local int unzlocal_getLong (const zlib_filefunc_def* pzlib_filefunc_def, voidpf filestream, uLong *pX) + { + uLong x ; + int i; +@@ -259,9 +250,7 @@ + + + /* My own strcmpi / strcasecmp */ +-local int strcmpcasenosensitive_internal (fileName1,fileName2) +- const char* fileName1; +- const char* fileName2; ++local int strcmpcasenosensitive_internal (const char* fileName1, const char* fileName2) + { + for (;;) + { +@@ -302,10 +291,7 @@ + (like 1 on Unix, 2 on Windows) + + */ +-extern int ZEXPORT unzStringFileNameCompare (fileName1,fileName2,iCaseSensitivity) +- const char* fileName1; +- const char* fileName2; +- int iCaseSensitivity; ++extern int ZEXPORT unzStringFileNameCompare (const char* fileName1, const char* fileName2, int iCaseSensitivity) + { + if (iCaseSensitivity==0) + iCaseSensitivity=CASESENSITIVITYDEFAULTVALUE; +@@ -328,9 +314,7 @@ + const zlib_filefunc_def* pzlib_filefunc_def, + voidpf filestream)); + +-local uLong unzlocal_SearchCentralDir(pzlib_filefunc_def,filestream) +- const zlib_filefunc_def* pzlib_filefunc_def; +- voidpf filestream; ++local uLong unzlocal_SearchCentralDir(const zlib_filefunc_def* pzlib_filefunc_def, voidpf filestream) + { + unsigned char* buf; + uLong uSizeFile; +@@ -394,9 +378,7 @@ + Else, the return value is a unzFile Handle, usable with other function + of this unzip package. + */ +-extern unzFile ZEXPORT unzOpen2 (path, pzlib_filefunc_def) +- const char *path; +- zlib_filefunc_def* pzlib_filefunc_def; ++extern unzFile ZEXPORT unzOpen2 (const char *path, zlib_filefunc_def* pzlib_filefunc_def) + { + unz_s us; + unz_s *s; +@@ -497,8 +479,7 @@ + } + + +-extern unzFile ZEXPORT unzOpen (path) +- const char *path; ++extern unzFile ZEXPORT unzOpen (const char *path) + { + return unzOpen2(path, NULL); + } +@@ -508,8 +489,7 @@ + If there is files inside the .Zip opened with unzipOpenCurrentFile (see later), + these files MUST be closed with unzipCloseCurrentFile before call unzipClose. + return UNZ_OK if there is no problem. */ +-extern int ZEXPORT unzClose (file) +- unzFile file; ++extern int ZEXPORT unzClose (unzFile file) + { + unz_s* s; + if (file==NULL) +@@ -529,9 +509,7 @@ + Write info about the ZipFile in the *pglobal_info structure. + No preparation of the structure is needed + return UNZ_OK if there is no problem. */ +-extern int ZEXPORT unzGetGlobalInfo (file,pglobal_info) +- unzFile file; +- unz_global_info *pglobal_info; ++extern int ZEXPORT unzGetGlobalInfo (unzFile file, unz_global_info *pglobal_info) + { + unz_s* s; + if (file==NULL) +@@ -545,9 +523,7 @@ + /* + Translate date/time from Dos format to tm_unz (readable more easilty) + */ +-local void unzlocal_DosDateToTmuDate (ulDosDate, ptm) +- uLong ulDosDate; +- tm_unz* ptm; ++local void unzlocal_DosDateToTmuDate (uLong ulDosDate, tm_unz* ptm) + { + uLong uDate; + uDate = (uLong)(ulDosDate>>16); +@@ -574,21 +550,12 @@ + char *szComment, + uLong commentBufferSize)); + +-local int unzlocal_GetCurrentFileInfoInternal (file, +- pfile_info, +- pfile_info_internal, +- szFileName, fileNameBufferSize, +- extraField, extraFieldBufferSize, +- szComment, commentBufferSize) +- unzFile file; +- unz_file_info *pfile_info; +- unz_file_info_internal *pfile_info_internal; +- char *szFileName; +- uLong fileNameBufferSize; +- void *extraField; +- uLong extraFieldBufferSize; +- char *szComment; +- uLong commentBufferSize; ++local int unzlocal_GetCurrentFileInfoInternal (unzFile file, ++ unz_file_info *pfile_info, ++ unz_file_info_internal *pfile_info_internal, ++ char *szFileName, uLong fileNameBufferSize, ++ void *extraField, uLong extraFieldBufferSize, ++ char *szComment, uLong commentBufferSize) + { + unz_s* s; + unz_file_info file_info; +@@ -608,10 +575,12 @@ + + /* we check the magic */ + if (err==UNZ_OK) ++ { + if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uMagic) != UNZ_OK) + err=UNZ_ERRNO; + else if (uMagic!=0x02014b50) + err=UNZ_BADZIPFILE; ++ } + + if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.version) != UNZ_OK) + err=UNZ_ERRNO; +@@ -688,10 +657,12 @@ + uSizeRead = extraFieldBufferSize; + + if (lSeek!=0) ++ { + if (ZSEEK(s->z_filefunc, s->filestream,lSeek,ZLIB_FILEFUNC_SEEK_CUR)==0) + lSeek=0; + else + err=UNZ_ERRNO; ++ } + if ((file_info.size_file_extra>0) && (extraFieldBufferSize>0)) + if (ZREAD(s->z_filefunc, s->filestream,extraField,uSizeRead)!=uSizeRead) + err=UNZ_ERRNO; +@@ -713,10 +684,12 @@ + uSizeRead = commentBufferSize; + + if (lSeek!=0) ++ { + if (ZSEEK(s->z_filefunc, s->filestream,lSeek,ZLIB_FILEFUNC_SEEK_CUR)==0) + lSeek=0; + else + err=UNZ_ERRNO; ++ } + if ((file_info.size_file_comment>0) && (commentBufferSize>0)) + if (ZREAD(s->z_filefunc, s->filestream,szComment,uSizeRead)!=uSizeRead) + err=UNZ_ERRNO; +@@ -741,19 +714,11 @@ + No preparation of the structure is needed + return UNZ_OK if there is no problem. + */ +-extern int ZEXPORT unzGetCurrentFileInfo (file, +- pfile_info, +- szFileName, fileNameBufferSize, +- extraField, extraFieldBufferSize, +- szComment, commentBufferSize) +- unzFile file; +- unz_file_info *pfile_info; +- char *szFileName; +- uLong fileNameBufferSize; +- void *extraField; +- uLong extraFieldBufferSize; +- char *szComment; +- uLong commentBufferSize; ++extern int ZEXPORT unzGetCurrentFileInfo (unzFile file, ++ unz_file_info *pfile_info, ++ char *szFileName, uLong fileNameBufferSize, ++ void *extraField, uLong extraFieldBufferSize, ++ char *szComment, uLong commentBufferSize) + { + return unzlocal_GetCurrentFileInfoInternal(file,pfile_info,NULL, + szFileName,fileNameBufferSize, +@@ -765,8 +730,7 @@ + Set the current file of the zipfile to the first file. + return UNZ_OK if there is no problem + */ +-extern int ZEXPORT unzGoToFirstFile (file) +- unzFile file; ++extern int ZEXPORT unzGoToFirstFile (unzFile file) + { + int err=UNZ_OK; + unz_s* s; +@@ -787,8 +751,7 @@ + return UNZ_OK if there is no problem + return UNZ_END_OF_LIST_OF_FILE if the actual file was the latest. + */ +-extern int ZEXPORT unzGoToNextFile (file) +- unzFile file; ++extern int ZEXPORT unzGoToNextFile (unzFile file) + { + unz_s* s; + int err; +@@ -820,10 +783,7 @@ + UNZ_OK if the file is found. It becomes the current file. + UNZ_END_OF_LIST_OF_FILE if the file is not found + */ +-extern int ZEXPORT unzLocateFile (file, szFileName, iCaseSensitivity) +- unzFile file; +- const char *szFileName; +- int iCaseSensitivity; ++extern int ZEXPORT unzLocateFile (unzFile file, const char *szFileName, int iCaseSensitivity) + { + unz_s* s; + int err; +@@ -899,9 +859,7 @@ + } unz_file_pos; + */ + +-extern int ZEXPORT unzGetFilePos(file, file_pos) +- unzFile file; +- unz_file_pos* file_pos; ++extern int ZEXPORT unzGetFilePos(unzFile file, unz_file_pos* file_pos) + { + unz_s* s; + +@@ -917,9 +875,7 @@ + return UNZ_OK; + } + +-extern int ZEXPORT unzGoToFilePos(file, file_pos) +- unzFile file; +- unz_file_pos* file_pos; ++extern int ZEXPORT unzGoToFilePos(unzFile file, unz_file_pos* file_pos) + { + unz_s* s; + int err; +@@ -953,13 +909,9 @@ + store in *piSizeVar the size of extra info in local header + (filename and size of extra field data) + */ +-local int unzlocal_CheckCurrentFileCoherencyHeader (s,piSizeVar, +- poffset_local_extrafield, +- psize_local_extrafield) +- unz_s* s; +- uInt* piSizeVar; +- uLong *poffset_local_extrafield; +- uInt *psize_local_extrafield; ++local int unzlocal_CheckCurrentFileCoherencyHeader (unz_s* s, uInt* piSizeVar, ++ uLong *poffset_local_extrafield, ++ uInt *psize_local_extrafield) + { + uLong uMagic,uData,uFlags; + uLong size_filename; +@@ -976,10 +928,12 @@ + + + if (err==UNZ_OK) ++ { + if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uMagic) != UNZ_OK) + err=UNZ_ERRNO; + else if (uMagic!=0x04034b50) + err=UNZ_BADZIPFILE; ++ } + + if (unzlocal_getShort(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) + err=UNZ_ERRNO; +@@ -1043,12 +997,7 @@ + Open for reading data the current file in the zipfile. + If there is no error and the file is opened, the return value is UNZ_OK. + */ +-extern int ZEXPORT unzOpenCurrentFile3 (file, method, level, raw, password) +- unzFile file; +- int* method; +- int* level; +- int raw; +- const char* password; ++extern int ZEXPORT unzOpenCurrentFile3 (unzFile file, int* method, int* level, int raw, const char* password) + { + int err=UNZ_OK; + uInt iSizeVar; +@@ -1185,24 +1134,17 @@ + return UNZ_OK; + } + +-extern int ZEXPORT unzOpenCurrentFile (file) +- unzFile file; ++extern int ZEXPORT unzOpenCurrentFile (unzFile file) + { + return unzOpenCurrentFile3(file, NULL, NULL, 0, NULL); + } + +-extern int ZEXPORT unzOpenCurrentFilePassword (file, password) +- unzFile file; +- const char* password; ++extern int ZEXPORT unzOpenCurrentFilePassword (unzFile file, const char* password) + { + return unzOpenCurrentFile3(file, NULL, NULL, 0, password); + } + +-extern int ZEXPORT unzOpenCurrentFile2 (file,method,level,raw) +- unzFile file; +- int* method; +- int* level; +- int raw; ++extern int ZEXPORT unzOpenCurrentFile2 (unzFile file, int* method, int* level, int raw) + { + return unzOpenCurrentFile3(file, method, level, raw, NULL); + } +@@ -1217,10 +1159,7 @@ + return <0 with error code if there is an error + (UNZ_ERRNO for IO error, or zLib error for uncompress error) + */ +-extern int ZEXPORT unzReadCurrentFile (file, buf, len) +- unzFile file; +- voidp buf; +- unsigned len; ++extern int ZEXPORT unzReadCurrentFile (unzFile file, voidp buf, unsigned len) + { + int err=UNZ_OK; + uInt iRead = 0; +@@ -1235,7 +1174,7 @@ + return UNZ_PARAMERROR; + + +- if ((pfile_in_zip_read_info->read_buffer == NULL)) ++ if (pfile_in_zip_read_info->read_buffer == NULL) + return UNZ_END_OF_LIST_OF_FILE; + if (len==0) + return 0; +@@ -1367,8 +1306,7 @@ + /* + Give the current position in uncompressed data + */ +-extern z_off_t ZEXPORT unztell (file) +- unzFile file; ++extern z_off_t ZEXPORT unztell (unzFile file) + { + unz_s* s; + file_in_zip_read_info_s* pfile_in_zip_read_info; +@@ -1387,8 +1325,7 @@ + /* + return 1 if the end of file was reached, 0 elsewhere + */ +-extern int ZEXPORT unzeof (file) +- unzFile file; ++extern int ZEXPORT unzeof (unzFile file) + { + unz_s* s; + file_in_zip_read_info_s* pfile_in_zip_read_info; +@@ -1420,10 +1357,7 @@ + the return value is the number of bytes copied in buf, or (if <0) + the error code + */ +-extern int ZEXPORT unzGetLocalExtrafield (file,buf,len) +- unzFile file; +- voidp buf; +- unsigned len; ++extern int ZEXPORT unzGetLocalExtrafield (unzFile file, voidp buf, unsigned len) + { + unz_s* s; + file_in_zip_read_info_s* pfile_in_zip_read_info; +@@ -1471,8 +1405,7 @@ + Close the file in zip opened with unzipOpenCurrentFile + Return UNZ_CRCERROR if all the file was read but the CRC is not good + */ +-extern int ZEXPORT unzCloseCurrentFile (file) +- unzFile file; ++extern int ZEXPORT unzCloseCurrentFile (unzFile file) + { + int err=UNZ_OK; + +@@ -1514,10 +1447,7 @@ + uSizeBuf is the size of the szComment buffer. + return the number of byte copied or an error code <0 + */ +-extern int ZEXPORT unzGetGlobalComment (file, szComment, uSizeBuf) +- unzFile file; +- char *szComment; +- uLong uSizeBuf; ++extern int ZEXPORT unzGetGlobalComment (unzFile file, char *szComment, uLong uSizeBuf) + { + int err=UNZ_OK; + unz_s* s; |