Menu
▾
▴
opengtoolkit-cvs — OpenG Toolkit CVS commits mailing list
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(42) |
Nov
(368) |
Dec
(248) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(2) |
Feb
(207) |
Mar
(180) |
Apr
(9) |
May
(39) |
Jun
(9) |
Jul
(22) |
Aug
(56) |
Sep
(82) |
Oct
(113) |
Nov
(236) |
Dec
(219) |
| 2005 |
Jan
(119) |
Feb
(81) |
Mar
(53) |
Apr
(177) |
May
(2) |
Jun
(67) |
Jul
(17) |
Aug
(5) |
Sep
(53) |
Oct
(17) |
Nov
(122) |
Dec
(77) |
| 2006 |
Jan
(293) |
Feb
(16) |
Mar
(32) |
Apr
(14) |
May
(29) |
Jun
(6) |
Jul
|
Aug
|
Sep
(18) |
Oct
(28) |
Nov
|
Dec
(2) |
| 2007 |
Jan
(8) |
Feb
(19) |
Mar
(4) |
Apr
(7) |
May
|
Jun
|
Jul
|
Aug
|
Sep
(37) |
Oct
(1) |
Nov
(8) |
Dec
(25) |
| 2008 |
Jan
(1) |
Feb
(13) |
Mar
(17) |
Apr
(3) |
May
(2) |
Jun
(2) |
Jul
|
Aug
|
Sep
|
Oct
(10) |
Nov
(19) |
Dec
(16) |
| 2009 |
Jan
(6) |
Feb
(9) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Rolf K. <lab...@us...> - 2008-03-31 20:12:13
|
Update of /cvsroot/opengtoolkit/lvzip/tests In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv21938/tests Modified Files: lvzip-test add to empty archive.vi Log Message: Fixed problem on opening existing empty directory for append archive mode. Index: lvzip-test add to empty archive.vi =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/tests/lvzip-test add to empty archive.vi,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Binary files /tmp/cvs5sSwSp and /tmp/cvs5hlJVg differ |
|
From: Rolf K. <lab...@us...> - 2008-03-31 20:12:05
|
Update of /cvsroot/opengtoolkit/lvzip In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv21938 Modified Files: Change-Log.txt Log Message: Fixed problem on opening existing empty directory for append archive mode. Index: Change-Log.txt =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/Change-Log.txt,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Change-Log.txt 12 Dec 2007 16:13:37 -0000 1.8 --- Change-Log.txt 31 Mar 2008 20:12:08 -0000 1.9 *************** *** 56,57 **** --- 56,60 ---- created vxWorks .out shared libraries for LabVIEW RT 8.2 and 8.5. + 2008-03-31 rk + changed zipOpen2() to properly open an empty archive that contains no files at all + |
|
From: Rolf K. <lab...@us...> - 2008-03-31 20:06:52
|
Update of /cvsroot/opengtoolkit/lvzip/tests In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv19800 Modified Files: lvzip-test add to empty archive.vi Log Message: Removed debug breakpoints Index: lvzip-test add to empty archive.vi =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/tests/lvzip-test add to empty archive.vi,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvsUocMJS and /tmp/cvsaxWC4q differ |
|
From: Rolf K. <lab...@us...> - 2008-03-31 20:02:16
|
Update of /cvsroot/opengtoolkit/lvzip/c_source In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv18124 Modified Files: zlibvc.dsp Log Message: Cahnged compile settings to create DEBUG symbols database for debug builds Index: zlibvc.dsp =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/zlibvc.dsp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** zlibvc.dsp 27 Feb 2008 20:00:21 -0000 1.13 --- zlibvc.dsp 31 Mar 2008 20:02:20 -0000 1.14 *************** *** 78,82 **** # PROP Target_Dir "" # ADD BASE CPP /nologo /MDd /W3 /Od /D "WIN32" /D "_DEBUG" /D "NO_vsnprintf" /FD /c ! # ADD CPP /nologo /MDd /W3 /Od /D "WIN32" /D "_DEBUG" /D "NO_vsnprintf" /FD /c # SUBTRACT CPP /YX /Yc /Yu # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 --- 78,82 ---- # PROP Target_Dir "" # ADD BASE CPP /nologo /MDd /W3 /Od /D "WIN32" /D "_DEBUG" /D "NO_vsnprintf" /FD /c ! # ADD CPP /nologo /MDd /W3 /Gm- /Gi- /ZI /Od /D "WIN32" /D "_DEBUG" /D "NO_vsnprintf" /FR /FD /c # SUBTRACT CPP /YX /Yc /Yu # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 *************** *** 89,93 **** LINK32=link.exe # ADD BASE LINK32 /nologo /subsystem:windows /dll /debug /machine:I386 ! # ADD LINK32 user32.lib kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /nodefaultlib:"msvcrt" /out:"zlibvc___Win32_DLL_Debug\lvzlib.dll" !ELSEIF "$(CFG)" == "zlibvc - Win32 DLL ASM Release" --- 89,94 ---- LINK32=link.exe # ADD BASE LINK32 /nologo /subsystem:windows /dll /debug /machine:I386 ! # ADD LINK32 user32.lib kernel32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"msvcrt" /out:"zlibvc___Win32_DLL_Debug\lvzlib.dll" ! # SUBTRACT LINK32 /incremental:no !ELSEIF "$(CFG)" == "zlibvc - Win32 DLL ASM Release" *************** *** 136,140 **** # ADD BASE CPP /nologo /MDd /W3 /Od /D "WIN32" /D "_DEBUG" /D "NO_vsnprintf" /FD /c # SUBTRACT BASE CPP /YX /Yc /Yu ! # ADD CPP /nologo /MDd /W3 /ZI /Od /D "WIN32" /D "_DEBUG" /D "NO_vsnprintf" /D "ASMV" /D "ASMINF" /FD /c # SUBTRACT CPP /YX /Yc /Yu # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 --- 137,141 ---- # ADD BASE CPP /nologo /MDd /W3 /Od /D "WIN32" /D "_DEBUG" /D "NO_vsnprintf" /FD /c # SUBTRACT BASE CPP /YX /Yc /Yu ! # ADD CPP /nologo /MDd /W3 /Gi- /ZI /Od /D "WIN32" /D "_DEBUG" /D "NO_vsnprintf" /D "ASMV" /D "ASMINF" /FD /c # SUBTRACT CPP /YX /Yc /Yu # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 *************** *** 147,151 **** LINK32=link.exe # ADD BASE LINK32 /nologo /subsystem:windows /dll /debug /machine:I386 ! # ADD LINK32 user32.lib kernel32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"zlibvc___Win32_DLL_ASM_Debug\lvzlib.dll" # SUBTRACT LINK32 /incremental:no --- 148,152 ---- LINK32=link.exe # ADD BASE LINK32 /nologo /subsystem:windows /dll /debug /machine:I386 ! # ADD LINK32 user32.lib kernel32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"msvcrt" /out:"zlibvc___Win32_DLL_ASM_Debug\lvzlib.dll" # SUBTRACT LINK32 /incremental:no *************** *** 206,210 **** LINK32=link.exe # ADD BASE LINK32 user32.lib /nologo /subsystem:windows /dll /pdb:none /machine:I386 /out:"zlibvc___Win32_DLL_ASM_Release\lvzlib.dll" ! # ADD LINK32 /nologo /subsystem:windows /dll /pdb:none /machine:I386 /out:"zlibvc___Win32_static_ASM_Release\lvzlib.dll" !ELSEIF "$(CFG)" == "zlibvc - Win32 static Release" --- 207,211 ---- LINK32=link.exe # ADD BASE LINK32 user32.lib /nologo /subsystem:windows /dll /pdb:none /machine:I386 /out:"zlibvc___Win32_DLL_ASM_Release\lvzlib.dll" ! # ADD LINK32 user32.lib /nologo /subsystem:windows /dll /pdb:none /machine:I386 /nodefaultlib:"msvcrt" /out:"zlibvc___Win32_static_ASM_Release\lvzlib.dll" !ELSEIF "$(CFG)" == "zlibvc - Win32 static Release" *************** *** 508,512 **** "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! ml /nologo /c /Cx /coff /Zi /Fo"$(IntDir)\$(InputName).obj" "$(InputPath)" # End Custom Build --- 509,513 ---- "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! ml /nologo /c /Cx /coff /Fo"$(IntDir)\$(InputName).obj" "$(InputPath)" # End Custom Build *************** *** 519,525 **** InputName=gvmat32 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! ml /nologo /c /Cx /coff /Zi /Fo"$(IntDir)\$(InputName).obj" "$(InputPath)" # End Custom Build --- 520,531 ---- InputName=gvmat32 + BuildCmds= \ + ml /nologo /c /Cx /coff /Zi /Fl$(IntDir)\$(InputName).lst /Fo"$(IntDir)\$(InputName).obj" "$(InputPath)" + "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) + "$(IntDir)\$(InputName).lst" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + $(BuildCmds) # End Custom Build *************** *** 602,606 **** "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! ml /nologo /c /Cx /coff /Zi /Fo"$(IntDir)\$(InputName).obj" "$(InputPath)" # End Custom Build --- 608,612 ---- "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! ml /nologo /c /Cx /coff /Fo"$(IntDir)\$(InputName).obj" "$(InputPath)" # End Custom Build *************** *** 613,619 **** InputName=inffas32 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! ml /nologo /c /Cx /coff /Zi /Fo"$(IntDir)\$(InputName).obj" "$(InputPath)" # End Custom Build --- 619,630 ---- InputName=inffas32 + BuildCmds= \ + ml /nologo /c /Cx /coff /Zi /Fl$(IntDir)\$(InputName).lst /Fo"$(IntDir)\$(InputName).obj" "$(InputPath)" + "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) + "$(IntDir)\$(InputName).lst" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + $(BuildCmds) # End Custom Build |
|
From: Rolf K. <lab...@us...> - 2008-03-31 19:54:26
|
Update of /cvsroot/opengtoolkit/lvzip/c_source In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv14808 Modified Files: deflate.h lvutil.c Log Message: Cosmetic changes Index: deflate.h =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/deflate.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** deflate.h 6 Dec 2007 18:56:17 -0000 1.5 --- deflate.h 31 Mar 2008 19:54:32 -0000 1.6 *************** *** 297,300 **** --- 297,301 ---- #ifndef DEBUG /* Inline versions of _tr_tally for speed: */ + #if defined(GEN_TREES_H) || !defined(STDC) extern uch _length_code[]; Index: lvutil.c =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/lvutil.c,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** lvutil.c 18 Mar 2008 21:57:57 -0000 1.9 --- lvutil.c 31 Mar 2008 19:54:32 -0000 1.10 *************** *** 1069,1072 **** --- 1069,1074 ---- extern long ZEXPORT InitializeFileFuncs (zlib_filefunc_def* pzlib_filefunc_def, LStrHandle *memory) { + DoDebugger(); + if (pzlib_filefunc_def) { |
|
From: Rolf K. <lab...@us...> - 2008-03-31 19:53:41
|
Update of /cvsroot/opengtoolkit/lvzip/source In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv14377/source Modified Files: lvzlib.dll Log Message: Fixed problem on opening existing empty directory for append archive mode. Index: lvzlib.dll =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/source/lvzlib.dll,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 Binary files /tmp/cvs79FqeF and /tmp/cvs7CJHS3 differ |
|
From: Rolf K. <lab...@us...> - 2008-03-31 19:53:41
|
Update of /cvsroot/opengtoolkit/lvzip/c_source In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv14377/c_source Modified Files: zip.c Log Message: Fixed problem on opening existing empty directory for append archive mode. Index: zip.c =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/zip.c,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** zip.c 27 Feb 2008 20:48:55 -0000 1.12 --- zip.c 31 Mar 2008 19:53:40 -0000 1.13 *************** *** 348,353 **** unsigned char c; int err; ! ! *pi = 0; err = (int)ZREAD(*pzlib_filefunc_def,filestream,&c,1); if (err==1) --- 348,353 ---- unsigned char c; int err; ! ! *pi = 0; err = (int)ZREAD(*pzlib_filefunc_def,filestream,&c,1); if (err==1) *************** *** 552,556 **** uLong size_central_dir; /* size of the central directory */ uLong offset_central_dir; /* offset of start of central directory */ ! uLong central_pos,uL; uLong number_disk; /* number of the current dist, used for --- 552,556 ---- uLong size_central_dir; /* size of the central directory */ uLong offset_central_dir; /* offset of start of central directory */ ! uLong central_pos; uLong number_disk; /* number of the current dist, used for *************** *** 563,616 **** (same than number_entry on nospan) */ uLong size_comment; central_pos = ziplocal_SearchCentralDir(&ziinit.z_filefunc,ziinit.filestream); - if (central_pos==0) - err=ZIP_ERRNO; ! if (ZSEEK(ziinit.z_filefunc, ziinit.filestream, ! central_pos,ZLIB_FILEFUNC_SEEK_SET)!=0) ! err=ZIP_ERRNO; ! /* the signature, already checked */ ! if (ziplocal_getLong(&ziinit.z_filefunc, ziinit.filestream,&uL)!=ZIP_OK) ! err=ZIP_ERRNO; /* number of this disk */ ! if (ziplocal_getShort(&ziinit.z_filefunc, ziinit.filestream,&number_disk)!=ZIP_OK) ! err=ZIP_ERRNO; /* number of the disk with the start of the central directory */ ! if (ziplocal_getShort(&ziinit.z_filefunc, ziinit.filestream,&number_disk_with_CD)!=ZIP_OK) ! err=ZIP_ERRNO; /* total number of entries in the central dir on this disk */ ! if (ziplocal_getShort(&ziinit.z_filefunc, ziinit.filestream,&number_entry)!=ZIP_OK) ! err=ZIP_ERRNO; /* total number of entries in the central dir */ ! if (ziplocal_getShort(&ziinit.z_filefunc, ziinit.filestream,&number_entry_CD)!=ZIP_OK) ! err=ZIP_ERRNO; if ((number_entry_CD!=number_entry) || (number_disk_with_CD!=0) || (number_disk!=0)) ! err=ZIP_BADZIPFILE; /* size of the central directory */ ! if (ziplocal_getLong(&ziinit.z_filefunc, ziinit.filestream,&size_central_dir)!=ZIP_OK) ! err=ZIP_ERRNO; /* offset of start of central directory with respect to the starting disk number */ ! if (ziplocal_getLong(&ziinit.z_filefunc, ziinit.filestream,&offset_central_dir)!=ZIP_OK) ! err=ZIP_ERRNO; /* zipfile global comment length */ ! if (ziplocal_getShort(&ziinit.z_filefunc, ziinit.filestream,&size_comment)!=ZIP_OK) ! err=ZIP_ERRNO; ! if ((central_pos<offset_central_dir+size_central_dir) && ! (err==ZIP_OK)) ! err=ZIP_BADZIPFILE; if (err!=ZIP_OK) --- 563,615 ---- (same than number_entry on nospan) */ uLong size_comment; + char sig[4]; central_pos = ziplocal_SearchCentralDir(&ziinit.z_filefunc,ziinit.filestream); ! err = ZSEEK(ziinit.z_filefunc, ziinit.filestream, central_pos,ZLIB_FILEFUNC_SEEK_SET); ! if (err==ZIP_OK) ! err = ziplocal_getLong(&ziinit.z_filefunc, ziinit.filestream, (uLong*)sig); ! ! if (err==ZIP_OK) ! if (((*(sig))!=0x50) || ((*(sig+1))!=0x4b) || ((*(sig+2))!=0x05) || ((*(sig+3))!=0x06)) ! err = ZIP_ERRNO; /* number of this disk */ ! if (err==ZIP_OK) ! err = ziplocal_getShort(&ziinit.z_filefunc, ziinit.filestream,&number_disk); /* number of the disk with the start of the central directory */ ! if (err==ZIP_OK) ! err = ziplocal_getShort(&ziinit.z_filefunc, ziinit.filestream,&number_disk_with_CD); /* total number of entries in the central dir on this disk */ ! if (err==ZIP_OK) ! err = ziplocal_getShort(&ziinit.z_filefunc, ziinit.filestream,&number_entry); /* total number of entries in the central dir */ ! if (err==ZIP_OK) ! err = ziplocal_getShort(&ziinit.z_filefunc, ziinit.filestream,&number_entry_CD); if ((number_entry_CD!=number_entry) || (number_disk_with_CD!=0) || (number_disk!=0)) ! err = ZIP_BADZIPFILE; /* size of the central directory */ ! if (err==ZIP_OK) ! err = ziplocal_getLong(&ziinit.z_filefunc, ziinit.filestream,&size_central_dir); /* offset of start of central directory with respect to the starting disk number */ ! if (err==ZIP_OK) ! err = ziplocal_getLong(&ziinit.z_filefunc, ziinit.filestream,&offset_central_dir); /* zipfile global comment length */ ! if (err==ZIP_OK) ! err = ziplocal_getShort(&ziinit.z_filefunc, ziinit.filestream,&size_comment); ! if ((err==ZIP_OK) && (central_pos<offset_central_dir+size_central_dir)) ! err = ZIP_BADZIPFILE; if (err!=ZIP_OK) |
|
From: Rolf K. <lab...@us...> - 2008-03-31 19:53:41
|
Update of /cvsroot/opengtoolkit/lvzip/tests In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv14377/tests Added Files: lvzip-test add to empty archive.vi Log Message: Fixed problem on opening existing empty directory for append archive mode. --- NEW FILE: lvzip-test add to empty archive.vi --- (This appears to be a binary file; contents omitted.) |
|
From: Rolf K. <lab...@us...> - 2008-03-18 21:57:56
|
Update of /cvsroot/opengtoolkit/lvzip/c_source In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv6712 Modified Files: lvutil.c lvzip.cws Log Message: Fixed a MacOS compilation bug in the source Index: lvzip.cws =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/lvzip.cws,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** lvzip.cws 27 Feb 2008 20:48:55 -0000 1.6 --- lvzip.cws 18 Mar 2008 21:57:57 -0000 1.7 *************** *** 9,16 **** Project 0001 = "lvzip.prj" Drag Bar Left = 316 ! Window Top = 48 ! Window Left = 141 ! Window Bottom = 787 ! Window Right = 1529 Maximized = False Maximized Children = False --- 9,16 ---- Project 0001 = "lvzip.prj" Drag Bar Left = 316 ! Window Top = 198 ! Window Left = 1347 ! Window Bottom = 937 ! Window Right = 2735 Maximized = False Maximized Children = False *************** *** 26,30 **** Break At First Statement = False Sort Type = "File Name" ! Number of Opened Files = 4 Window Confinement Region Enabled = True MainColumnWidth = 297 --- 26,30 ---- Break At First Statement = False Sort Type = "File Name" ! Number of Opened Files = 0 Window Confinement Region Enabled = True MainColumnWidth = 297 *************** *** 50,54 **** Window Top = 25 Window Left = 6 - Window Z-Order = 2 Source Window State = "1,0,0,0,0,0,0,0,0,80,0,0,0,0,0,25,0,0,0,0,349,676,1,0," --- 50,53 ---- *************** *** 60,64 **** Window Top = 29 Window Left = 15 - Window Z-Order = 1 Source Window State = "1,0,0,0,0,0,0,0,0,99,0,0,0,0,0,46,17,0,38,0,633,827,1,0," --- 59,62 ---- *************** *** 66,75 **** Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/lvutil.c" File Type = "CSource" ! Disk Date = 3286985840 In Projects = "1," Window Top = 25 Window Left = 6 ! Window Z-Order = 3 ! Source Window State = "1,475,475,475,12,19,12,0,0,106,0,0,0,0,0,51,410,0,475,13,691,881,1,0," [File 0004] --- 64,72 ---- Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/lvutil.c" File Type = "CSource" ! Disk Date = 3287029305 In Projects = "1," Window Top = 25 Window Left = 6 ! Source Window State = "1,45,45,45,0,4,0,0,0,106,0,0,0,0,0,51,117,0,141,26,691,881,1,0," [File 0004] *************** *** 78,84 **** Disk Date = 3286989125 In Projects = "1," ! Window Top = 23 ! Window Left = 275 ! Window Z-Order = 4 Source Window State = "1,212,212,212,16,23,16,0,3,99,0,0,0,0,0,40,207,0,212,23,545,823,1,0," --- 75,80 ---- Disk Date = 3286989125 In Projects = "1," ! Window Top = 27 ! Window Left = 8 Source Window State = "1,212,212,212,16,23,16,0,3,99,0,0,0,0,0,40,207,0,212,23,545,823,1,0," Index: lvutil.c =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/lvutil.c,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** lvutil.c 28 Feb 2008 07:47:54 -0000 1.8 --- lvutil.c 18 Mar 2008 21:57:57 -0000 1.9 *************** *** 140,151 **** /* MacOSX seems to return sometimes bdNamErr for longer filenames, so we try to catch that too. */ ! Str255 temp[0] = 0; DEBUGPRINTF(("MakeFileSpec: trying with subpaths")); ! if (!vRefNum) { HParamBlockRec hpb; hpb.volumeParam.ioVRefNum = vRefNum; hpb.volumeParam.ioNamePtr = (StringPtr)temp; --- 140,152 ---- /* MacOSX seems to return sometimes bdNamErr for longer filenames, so we try to catch that too. */ ! Str255 temp; DEBUGPRINTF(("MakeFileSpec: trying with subpaths")); ! if (!vRefNum) { HParamBlockRec hpb; + temp[0] = 0; hpb.volumeParam.ioVRefNum = vRefNum; hpb.volumeParam.ioNamePtr = (StringPtr)temp; |
|
From: Rolf K. <lab...@us...> - 2008-02-28 20:39:11
|
Update of /cvsroot/opengtoolkit/lvzip/tests In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv25155 Modified Files: lvzip-test-lg bin files.vi lvzip-test-sm text files.vi Log Message: Index: lvzip-test-lg bin files.vi =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/tests/lvzip-test-lg bin files.vi,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 Binary files /tmp/cvseUqUPR and /tmp/cvs6KwofZ differ Index: lvzip-test-sm text files.vi =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/tests/lvzip-test-sm text files.vi,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 Binary files /tmp/cvs0t2Q1T and /tmp/cvsX9Vuv1 differ |
|
From: Rolf K. <lab...@us...> - 2008-02-28 07:47:51
|
Update of /cvsroot/opengtoolkit/lvzip/c_source In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv7170 Modified Files: lvutil.c Log Message: Fixed a MacOS compilation bug in the source Index: lvutil.c =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/lvutil.c,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** lvutil.c 27 Feb 2008 20:48:21 -0000 1.7 --- lvutil.c 28 Feb 2008 07:47:54 -0000 1.8 *************** *** 20,27 **** #define MacIsInvisible(cpb) ((cpb).hFileInfo.ioFlFndrInfo.fdFlags & kIsInvisible) #define MacIsInvFolder(cpb) ((cpb).dirInfo.ioDrUsrWds.frFlags & kIsInvisible) ! #define MacIsDir(cpb) ((cpb).dirInfo.ioFlAttrib & ioDirMask) #define MacIsStationery(cpb) ((cpb).hFileInfo.ioFlFndrInfo.fdFlags & kIsStationery) #define MacIsAlias(cpb) ((cpb).hFileInfo.ioFlFndrInfo.fdFlags & kIsAlias) ! #define kFileChanged (1L<<7) static MgErr MakeMacSpec(Path path, FSSpec *fss); --- 20,27 ---- #define MacIsInvisible(cpb) ((cpb).hFileInfo.ioFlFndrInfo.fdFlags & kIsInvisible) [...2220 lines suppressed...] #if MacOSX ! if (!err) ! err = ConvertToPosixPath(lstr->str, NULL, &pathLen); #endif ! if (!err) ! { ! if (str && (*len > pathLen)) ! { #if MacOSX ! err = ConvertToPosixPath(lstr->str, str, len); #else ! StrNCpy(str, lstr->str, *len); #endif ! } ! } ! DSDisposePtr((UPtr)lstr); ! *len = pathLen + 1; ! } ! return err; } |
|
From: Rolf K. <lab...@us...> - 2008-02-27 20:59:36
|
Update of /cvsroot/opengtoolkit/lvzip/source/macbin.llb In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv19929/macbin.llb Modified Files: MACBIN Resource File Info Core.vi Log Message: Updated VI files Index: MACBIN Resource File Info Core.vi =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/source/macbin.llb/MACBIN Resource File Info Core.vi,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 Binary files /tmp/cvsRbQonM and /tmp/cvsrBR1RC differ |
|
From: Rolf K. <lab...@us...> - 2008-02-27 20:59:35
|
Update of /cvsroot/opengtoolkit/lvzip/source/lvzip.llb In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv19929/lvzip.llb Modified Files: ZLIB CRC32.vi ZLIB Compress Directory.vi ZLIB Get Current File Info.vi ZLIB Open Unzip Archive.vi ZLIB Path to Path String.vi ZLIB VI Tree.vi Removed Files: ZLIB Get Stream CRC32.vi Log Message: Updated VI files Index: ZLIB CRC32.vi =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/source/lvzip.llb/ZLIB CRC32.vi,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 Binary files /tmp/cvsfOW0ON and /tmp/cvsrc85gE differ Index: ZLIB Open Unzip Archive.vi =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/source/lvzip.llb/ZLIB Open Unzip Archive.vi,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 Binary files /tmp/cvsRKVEpS and /tmp/cvsTm1RZI differ --- ZLIB Get Stream CRC32.vi DELETED --- Index: ZLIB Get Current File Info.vi =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/source/lvzip.llb/ZLIB Get Current File Info.vi,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 Binary files /tmp/cvsDa79lU and /tmp/cvszJK9ZK differ Index: ZLIB Path to Path String.vi =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/source/lvzip.llb/ZLIB Path to Path String.vi,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Binary files /tmp/cvsO0LoWW and /tmp/cvscUoZDN differ Index: ZLIB Compress Directory.vi =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/source/lvzip.llb/ZLIB Compress Directory.vi,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 Binary files /tmp/cvsxi8CD1 and /tmp/cvsU40ytS differ Index: ZLIB VI Tree.vi =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/source/lvzip.llb/ZLIB VI Tree.vi,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 Binary files /tmp/cvsEcWXT3 and /tmp/cvs703POU differ |
|
From: Rolf K. <lab...@us...> - 2008-02-27 20:58:23
|
Update of /cvsroot/opengtoolkit/lvzip/source In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv19500 Modified Files: lvzlib.dll Log Message: Index: lvzlib.dll =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/source/lvzlib.dll,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 Binary files /tmp/cvszxOkDu and /tmp/cvs9siBvZ differ |
|
From: Rolf K. <lab...@us...> - 2008-02-27 20:58:23
|
Update of /cvsroot/opengtoolkit/lvzip/source/vxWorks LV8.2 In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv19500/vxWorks LV8.2 Modified Files: lvzlib.out Log Message: Index: lvzlib.out =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/source/vxWorks LV8.2/lvzlib.out,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvsdY7uOB and /tmp/cvsL4JfJa differ |
|
From: Rolf K. <lab...@us...> - 2008-02-27 20:58:22
|
Update of /cvsroot/opengtoolkit/lvzip/source/vxWorks LV8.5 In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv19500/vxWorks LV8.5 Modified Files: lvzlib.out Log Message: Index: lvzlib.out =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/source/vxWorks LV8.5/lvzlib.out,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvsWXmbLB and /tmp/cvsCvuyFa differ |
|
From: Rolf K. <lab...@us...> - 2008-02-27 20:48:58
|
Update of /cvsroot/opengtoolkit/lvzip/c_source In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv15588 Modified Files: lvutil.h lvzip.cws unzip.c zip.c Log Message: Modifications to better support compilation with LabWindows CVI Index: unzip.c =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/unzip.c,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** unzip.c 10 Dec 2007 13:47:36 -0000 1.10 --- unzip.c 27 Feb 2008 20:48:55 -0000 1.11 *************** *** 39,42 **** --- 39,43 ---- #include <stdlib.h> #include <string.h> + #define ZLIB_INTERNAL #include "zlib.h" #include "unzip.h" *************** *** 323,327 **** */ ! extern int ZEXPORT unzStringFileNameCompare (fileName1,fileName2,iCaseSensitivity) const char* fileName1; const char* fileName2; --- 324,328 ---- */ ! ZEXTERN int ZEXPORT unzStringFileNameCompare (fileName1,fileName2,iCaseSensitivity) const char* fileName1; const char* fileName2; *************** *** 411,415 **** of this unzip package. */ ! extern unzFile ZEXPORT unzOpen2 (path, pzlib_filefunc_def) const char *path; zlib_filefunc_def* pzlib_filefunc_def; --- 412,416 ---- of this unzip package. */ ! ZEXTERN unzFile ZEXPORT unzOpen2 (path, pzlib_filefunc_def) const char *path; zlib_filefunc_def* pzlib_filefunc_def; *************** *** 511,515 **** ! extern unzFile ZEXPORT unzOpen (path) const char *path; { --- 512,516 ---- ! ZEXTERN unzFile ZEXPORT unzOpen (path) const char *path; { *************** *** 522,526 **** 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; { --- 523,527 ---- these files MUST be closed with unzipCloseCurrentFile before call unzipClose. return UNZ_OK if there is no problem. */ ! ZEXTERN int ZEXPORT unzClose (file) unzFile file; { *************** *** 543,547 **** 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; --- 544,548 ---- No preparation of the structure is needed return UNZ_OK if there is no problem. */ ! ZEXTERN int ZEXPORT unzGetGlobalInfo (file,pglobal_info) unzFile file; unz_global_info *pglobal_info; *************** *** 744,748 **** return UNZ_OK if there is no problem. */ ! extern int ZEXPORT unzGetCurrentFileInfo (file, pfile_info, szFileName, fileNameBufferSize, --- 745,749 ---- return UNZ_OK if there is no problem. */ ! ZEXTERN int ZEXPORT unzGetCurrentFileInfo (file, pfile_info, szFileName, fileNameBufferSize, *************** *** 768,772 **** return UNZ_OK if there is no problem */ ! extern int ZEXPORT unzGoToFirstFile (file) unzFile file; { --- 769,773 ---- return UNZ_OK if there is no problem */ ! ZEXTERN int ZEXPORT unzGoToFirstFile (file) unzFile file; { *************** *** 790,794 **** return UNZ_END_OF_LIST_OF_FILE if the actual file was the latest. */ ! extern int ZEXPORT unzGoToNextFile (file) unzFile file; { --- 791,795 ---- return UNZ_END_OF_LIST_OF_FILE if the actual file was the latest. */ ! ZEXTERN int ZEXPORT unzGoToNextFile (file) unzFile file; { *************** *** 824,828 **** UNZ_END_OF_LIST_OF_FILE if the file is not found */ ! extern int ZEXPORT unzLocateFile (file, szFileName, iCaseSensitivity) unzFile file; const char *szFileName; --- 825,829 ---- UNZ_END_OF_LIST_OF_FILE if the file is not found */ ! ZEXTERN int ZEXPORT unzLocateFile (file, szFileName, iCaseSensitivity) unzFile file; const char *szFileName; *************** *** 903,907 **** */ ! extern int ZEXPORT unzGetFilePos(file, file_pos) unzFile file; unz_file_pos* file_pos; --- 904,908 ---- */ ! ZEXTERN int ZEXPORT unzGetFilePos(file, file_pos) unzFile file; unz_file_pos* file_pos; *************** *** 921,925 **** } ! extern int ZEXPORT unzGoToFilePos(file, file_pos) unzFile file; unz_file_pos* file_pos; --- 922,926 ---- } ! ZEXTERN int ZEXPORT unzGoToFilePos(file, file_pos) unzFile file; unz_file_pos* file_pos; *************** *** 1047,1051 **** 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; --- 1048,1052 ---- If there is no error and the file is opened, the return value is UNZ_OK. */ ! ZEXTERN int ZEXPORT unzOpenCurrentFile3 (file, method, level, raw, password) unzFile file; int* method; *************** *** 1192,1196 **** } ! extern int ZEXPORT unzOpenCurrentFile (file) unzFile file; { --- 1193,1197 ---- } ! ZEXTERN int ZEXPORT unzOpenCurrentFile (file) unzFile file; { *************** *** 1198,1202 **** } ! extern int ZEXPORT unzOpenCurrentFilePassword (file, password) unzFile file; const char* password; --- 1199,1203 ---- } ! ZEXTERN int ZEXPORT unzOpenCurrentFilePassword (file, password) unzFile file; const char* password; *************** *** 1205,1209 **** } ! extern int ZEXPORT unzOpenCurrentFile2 (file,method,level,raw) unzFile file; int* method; --- 1206,1210 ---- } ! ZEXTERN int ZEXPORT unzOpenCurrentFile2 (file,method,level,raw) unzFile file; int* method; *************** *** 1224,1228 **** (UNZ_ERRNO for IO error, or zLib error for uncompress error) */ ! extern int ZEXPORT unzReadCurrentFile (file, buf, len) unzFile file; voidp buf; --- 1225,1229 ---- (UNZ_ERRNO for IO error, or zLib error for uncompress error) */ ! ZEXTERN int ZEXPORT unzReadCurrentFile (file, buf, len) unzFile file; voidp buf; *************** *** 1385,1389 **** Give the current position in uncompressed data */ ! extern z_off_t ZEXPORT unztell (file) unzFile file; { --- 1386,1390 ---- Give the current position in uncompressed data */ ! ZEXTERN z_off_t ZEXPORT unztell (file) unzFile file; { *************** *** 1405,1409 **** return 1 if the end of file was reached, 0 elsewhere */ ! extern int ZEXPORT unzeof (file) unzFile file; { --- 1406,1410 ---- return 1 if the end of file was reached, 0 elsewhere */ ! ZEXTERN int ZEXPORT unzeof (file) unzFile file; { *************** *** 1438,1442 **** the error code */ ! extern int ZEXPORT unzGetLocalExtrafield (file,buf,len) unzFile file; voidp buf; --- 1439,1443 ---- the error code */ ! ZEXTERN int ZEXPORT unzGetLocalExtrafield (file,buf,len) unzFile file; voidp buf; *************** *** 1489,1493 **** Return UNZ_CRCERROR if all the file was read but the CRC is not good */ ! extern int ZEXPORT unzCloseCurrentFile (file) unzFile file; { --- 1490,1494 ---- Return UNZ_CRCERROR if all the file was read but the CRC is not good */ ! ZEXTERN int ZEXPORT unzCloseCurrentFile (file) unzFile file; { *************** *** 1532,1536 **** return the number of byte copied or an error code <0 */ ! extern int ZEXPORT unzGetGlobalComment (file, szComment, uSizeBuf) unzFile file; char *szComment; --- 1533,1537 ---- return the number of byte copied or an error code <0 */ ! ZEXTERN int ZEXPORT unzGetGlobalComment (file, szComment, uSizeBuf) unzFile file; char *szComment; *************** *** 1563,1567 **** /* Additions by RX '2004 */ ! extern uLong ZEXPORT unzGetOffset (file) unzFile file; { --- 1564,1568 ---- /* Additions by RX '2004 */ ! ZEXTERN uLong ZEXPORT unzGetOffset (file) unzFile file; { *************** *** 1579,1583 **** } ! extern int ZEXPORT unzSetOffset (file, pos) unzFile file; uLong pos; --- 1580,1584 ---- } ! ZEXTERN int ZEXPORT unzSetOffset (file, pos) unzFile file; uLong pos; Index: lvzip.cws =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/lvzip.cws,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** lvzip.cws 27 Feb 2008 20:00:21 -0000 1.5 --- lvzip.cws 27 Feb 2008 20:48:55 -0000 1.6 *************** *** 9,16 **** Project 0001 = "lvzip.prj" Drag Bar Left = 316 ! Window Top = 51 ! Window Left = 65 ! Window Bottom = 790 ! Window Right = 1453 Maximized = False Maximized Children = False --- 9,16 ---- Project 0001 = "lvzip.prj" Drag Bar Left = 316 ! Window Top = 48 ! Window Left = 141 ! Window Bottom = 787 ! Window Right = 1529 Maximized = False Maximized Children = False *************** *** 26,30 **** Break At First Statement = False Sort Type = "File Name" ! Number of Opened Files = 1 Window Confinement Region Enabled = True MainColumnWidth = 297 --- 26,30 ---- Break At First Statement = False Sort Type = "File Name" ! Number of Opened Files = 4 Window Confinement Region Enabled = True MainColumnWidth = 297 *************** *** 44,57 **** [File 0001] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/inftrees.c" File Type = "CSource" Disk Date = 3219509183 In Projects = "1," ! Window Top = 26 ! Window Left = 6 Window Z-Order = 1 ! Source Window State = "1,0,0,0,0,0,0,0,0,118,0,0,0,0,0,42,17,0,38,0,570,975,1,0," ! [File 0002] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/adler32.c" File Type = "CSource" --- 44,87 ---- [File 0001] + Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/lvutil.h" + File Type = "Include" + Disk Date = 3286988591 + In Projects = "1," + Window Top = 25 + Window Left = 6 + Window Z-Order = 2 + Source Window State = "1,0,0,0,0,0,0,0,0,80,0,0,0,0,0,25,0,0,0,0,349,676,1,0," + + [File 0002] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/inftrees.c" File Type = "CSource" Disk Date = 3219509183 In Projects = "1," ! Window Top = 29 ! Window Left = 15 Window Z-Order = 1 ! Source Window State = "1,0,0,0,0,0,0,0,0,99,0,0,0,0,0,46,17,0,38,0,633,827,1,0," ! [File 0003] ! Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/lvutil.c" ! File Type = "CSource" ! Disk Date = 3286985840 ! In Projects = "1," ! Window Top = 25 ! Window Left = 6 ! Window Z-Order = 3 ! Source Window State = "1,475,475,475,12,19,12,0,0,106,0,0,0,0,0,51,410,0,475,13,691,881,1,0," ! ! [File 0004] ! Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/zconf.h" ! File Type = "Include" ! Disk Date = 3286989125 ! In Projects = "1," ! Window Top = 23 ! Window Left = 275 ! Window Z-Order = 4 ! Source Window State = "1,212,212,212,16,23,16,0,3,99,0,0,0,0,0,40,207,0,212,23,545,823,1,0," ! ! [File 0005] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/adler32.c" File Type = "CSource" *************** *** 62,66 **** Source Window State = "1,7,8,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,0,284,676,1,0," ! [File 0003] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/compress.c" File Type = "CSource" --- 92,96 ---- Source Window State = "1,7,8,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,0,284,676,1,0," ! [File 0006] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/compress.c" File Type = "CSource" *************** *** 71,75 **** Source Window State = "1,7,8,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,0,282,838,1,0," ! [File 0004] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/crc32.c" File Type = "CSource" --- 101,105 ---- Source Window State = "1,7,8,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,0,282,838,1,0," ! [File 0007] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/crc32.c" File Type = "CSource" *************** *** 80,84 **** Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,15,0,27,60,283,794,1,0," ! [File 0005] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/crc32.h" File Type = "Include" --- 110,114 ---- Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,15,0,27,60,283,794,1,0," ! [File 0008] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/crc32.h" File Type = "Include" *************** *** 87,91 **** Source Window State = "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0," ! [File 0006] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/crypt.h" File Type = "Include" --- 117,121 ---- Source Window State = "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0," ! [File 0009] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/crypt.h" File Type = "Include" *************** *** 96,100 **** Source Window State = "1,88,88,88,34,35,34,0,0,0,0,0,0,0,0,0,77,0,86,21,517,1234,1,0," ! [File 0007] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/deflate.c" File Type = "CSource" --- 126,130 ---- Source Window State = "1,88,88,88,34,35,34,0,0,0,0,0,0,0,0,0,77,0,86,21,517,1234,1,0," ! [File 0010] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/deflate.c" File Type = "CSource" *************** *** 103,118 **** Window Top = 23 Window Left = 208 ! Source Window State = "1,98,99,98,0,0,0,0,0,0,0,0,0,0,0,0,27,0,91,22,847,917,1,0," ! [File 0008] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/deflate.h" File Type = "Include" Disk Date = 3279812177 In Projects = "1," ! Window Top = 32 ! Window Left = 320 ! Source Window State = "1,298,298,298,0,11,11,0,0,0,0,0,0,0,0,0,270,0,298,0,530,1049,1,0," ! [File 0009] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/infback.c" File Type = "CSource" --- 133,148 ---- Window Top = 23 Window Left = 208 ! Source Window State = "1,98,99,98,0,0,0,0,0,0,0,0,0,0,0,0,27,0,91,22,785,917,1,0," ! [File 0011] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/deflate.h" File Type = "Include" Disk Date = 3279812177 In Projects = "1," ! Window Top = 23 ! Window Left = 259 ! Source Window State = "1,298,298,298,0,11,11,0,0,0,0,0,0,0,0,0,3,0,19,0,530,1049,1,0," ! [File 0012] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/infback.c" File Type = "CSource" *************** *** 123,127 **** Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,284,676,1,0," ! [File 0010] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/inffast.c" File Type = "CSource" --- 153,157 ---- Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,284,676,1,0," ! [File 0013] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/inffast.c" File Type = "CSource" *************** *** 132,143 **** Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,381,852,1,0," ! [File 0011] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/inffast.h" File Type = "Include" Disk Date = 3185304770 In Projects = "1," ! Source Window State = "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0," ! [File 0012] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/inffixed.h" File Type = "Include" --- 162,175 ---- Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,381,852,1,0," ! [File 0014] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/inffast.h" File Type = "Include" Disk Date = 3185304770 In Projects = "1," ! Window Top = 25 ! Window Left = 6 ! Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,349,676,1,0," ! [File 0015] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/inffixed.h" File Type = "Include" *************** *** 146,150 **** Source Window State = "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0," ! [File 0013] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/inflate.c" File Type = "CSource" --- 178,182 ---- Source Window State = "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0," ! [File 0016] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/inflate.c" File Type = "CSource" *************** *** 155,159 **** Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,284,676,1,0," ! [File 0014] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/inflate.h" File Type = "Include" --- 187,191 ---- Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,284,676,1,0," ! [File 0017] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/inflate.h" File Type = "Include" *************** *** 164,168 **** Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,388,779,1,0," ! [File 0015] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/inftrees.h" File Type = "Include" --- 196,200 ---- Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,388,779,1,0," ! [File 0018] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/inftrees.h" File Type = "Include" *************** *** 173,177 **** Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,21,0,0,0,499,1052,1,0," ! [File 0016] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/ioapi.c" File Type = "CSource" --- 205,209 ---- Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,21,0,0,0,499,1052,1,0," ! [File 0019] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/ioapi.c" File Type = "CSource" *************** *** 182,186 **** Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,284,676,1,0," ! [File 0017] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/ioapi.h" File Type = "Include" --- 214,218 ---- Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,284,676,1,0," ! [File 0020] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/ioapi.h" File Type = "Include" *************** *** 189,193 **** Source Window State = "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0," ! [File 0018] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/iomem.c" File Type = "CSource" --- 221,225 ---- Source Window State = "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0," ! [File 0021] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/iomem.c" File Type = "CSource" *************** *** 198,202 **** Source Window State = "1,105,105,105,12,96,12,0,0,0,0,0,0,0,0,0,92,0,105,92,491,939,1,0," ! [File 0019] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/iomem.h" File Type = "Include" --- 230,234 ---- Source Window State = "1,105,105,105,12,96,12,0,0,0,0,0,0,0,0,0,92,0,105,92,491,939,1,0," ! [File 0022] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/iomem.h" File Type = "Include" *************** *** 207,211 **** Source Window State = "1,9,10,9,0,0,0,0,0,0,0,0,0,0,0,0,0,0,9,0,327,888,1,0," ! [File 0020] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/iowin32.c" File Type = "CSource" --- 239,243 ---- Source Window State = "1,9,10,9,0,0,0,0,0,0,0,0,0,0,0,0,0,0,9,0,327,888,1,0," ! [File 0023] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/iowin32.c" File Type = "CSource" *************** *** 216,220 **** Source Window State = "1,70,71,70,0,0,0,0,0,0,0,60,0,0,0,0,60,0,70,0,528,1016,1,0," ! [File 0021] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/iowin32.h" File Type = "Include" --- 248,252 ---- Source Window State = "1,70,71,70,0,0,0,0,0,0,0,60,0,0,0,0,60,0,70,0,528,1016,1,0," ! [File 0024] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/iowin32.h" File Type = "Include" *************** *** 223,227 **** Source Window State = "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0," ! [File 0022] Path = "/c/Work/OpenG/opengtoolkit/cintools/labview.lib" File Type = "Library" --- 255,259 ---- Source Window State = "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0," ! [File 0025] Path = "/c/Work/OpenG/opengtoolkit/cintools/labview.lib" File Type = "Library" *************** *** 229,251 **** In Projects = "1," ! [File 0023] ! Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/lvutil.c" ! File Type = "CSource" ! Disk Date = 3286985840 ! In Projects = "1," ! Window Top = 25 ! Window Left = 6 ! Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,426,0,476,19,691,883,1,0," ! ! [File 0024] ! Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/lvutil.h" ! File Type = "Include" ! Disk Date = 3280141347 ! In Projects = "1," ! Window Top = 30 ! Window Left = 5 ! Source Window State = "1,26,32,26,0,0,0,0,0,0,0,0,0,0,0,0,160,0,175,32,371,941,1,0," ! ! [File 0025] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/mztools.c" File Type = "CSource" --- 261,265 ---- In Projects = "1," ! [File 0026] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/mztools.c" File Type = "CSource" *************** *** 256,260 **** Source Window State = "1,12,12,12,10,15,10,0,0,0,0,0,0,0,0,0,0,0,16,19,522,1074,1,0," ! [File 0026] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/mztools.h" File Type = "Include" --- 270,274 ---- Source Window State = "1,12,12,12,10,15,10,0,0,0,0,0,0,0,0,0,0,0,16,19,522,1074,1,0," ! [File 0027] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/mztools.h" File Type = "Include" *************** *** 265,269 **** Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,0,0,0,471,939,1,0," ! [File 0027] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/trees.c" File Type = "CSource" --- 279,283 ---- Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,0,0,0,471,939,1,0," ! [File 0028] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/trees.c" File Type = "CSource" *************** *** 274,278 **** Source Window State = "1,33,33,33,11,22,11,0,0,0,0,0,0,0,0,0,15,0,50,41,536,717,1,0," ! [File 0028] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/trees.h" File Type = "Include" --- 288,292 ---- Source Window State = "1,33,33,33,11,22,11,0,0,0,0,0,0,0,0,0,15,0,50,41,536,717,1,0," ! [File 0029] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/trees.h" File Type = "Include" *************** *** 283,287 **** Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,540,666,1,0," ! [File 0029] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/uncompr.c" File Type = "CSource" --- 297,301 ---- Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,540,666,1,0," ! [File 0030] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/uncompr.c" File Type = "CSource" *************** *** 292,299 **** Source Window State = "1,7,8,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,0,284,676,1,0," ! [File 0030] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/unzip.c" File Type = "CSource" ! Disk Date = 3286985704 In Projects = "1," Window Top = 25 --- 306,313 ---- Source Window State = "1,7,8,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,0,284,676,1,0," ! [File 0031] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/unzip.c" File Type = "CSource" ! Disk Date = 3286989094 In Projects = "1," Window Top = 25 *************** *** 301,305 **** Source Window State = "1,1538,1539,1538,0,0,0,0,0,0,0,0,0,0,0,0,1527,0,1538,0,568,1163,1,0," ! [File 0031] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/unzip.h" File Type = "Include" --- 315,319 ---- Source Window State = "1,1538,1539,1538,0,0,0,0,0,0,0,0,0,0,0,0,1527,0,1538,0,568,1163,1,0," ! [File 0032] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/unzip.h" File Type = "Include" *************** *** 310,326 **** Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,129,0,0,0,316,825,1,0," - [File 0032] - Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/zconf.h" - File Type = "Include" - Disk Date = 3286985433 - In Projects = "1," - Window Top = 27 - Window Left = 24 - Source Window State = "1,211,212,211,0,0,0,0,0,0,0,0,0,0,0,0,195,0,211,0,545,823,1,0," - [File 0033] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/zip.c" File Type = "CSource" ! Disk Date = 3286985713 In Projects = "1," Window Top = 48 --- 324,331 ---- Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,129,0,0,0,316,825,1,0," [File 0033] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/zip.c" File Type = "CSource" ! Disk Date = 3286989034 In Projects = "1," Window Top = 48 Index: lvutil.h =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/lvutil.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** lvutil.h 10 Dec 2007 14:24:54 -0000 1.4 --- lvutil.h 27 Feb 2008 20:48:55 -0000 1.5 *************** *** 8,11 **** --- 8,14 ---- #define _lvUtil_H + #define ZLIB_INTERNAL + #include "zlib.h" + #ifdef __cplusplus extern "C" { *************** *** 263,274 **** /* Our exported functions */ ! extern void ZEXPORT DLLVersion OF((uChar* Version)); ! extern MgErr ZEXPORT LVPath_ToText OF((Path path, CStr str, int32 *len)); ! extern MgErr ZEXPORT LVPath_HasResourceFork OF((Path path, int32 *hasResFork)); ! extern MgErr ZEXPORT LVPath_EncodeMacbinary OF((Path srcFileName, Path dstFileName)); ! extern MgErr ZEXPORT LVPath_DecodeMacbinary OF((Path srcFileName, Path dstFileName)); ! extern MgErr ZEXPORT LVPath_UtilFileInfo OF((Path path, uInt8 write, uInt8 *isDirectory, --- 266,277 ---- /* Our exported functions */ ! ZEXTERN void ZEXPORT DLLVersion OF((uChar* Version)); ! ZEXTERN MgErr ZEXPORT LVPath_ToText OF((Path path, CStr str, int32 *len)); ! ZEXTERN MgErr ZEXPORT LVPath_HasResourceFork OF((Path path, int32 *hasResFork)); ! ZEXTERN MgErr ZEXPORT LVPath_EncodeMacbinary OF((Path srcFileName, Path dstFileName)); ! ZEXTERN MgErr ZEXPORT LVPath_DecodeMacbinary OF((Path srcFileName, Path dstFileName)); ! ZEXTERN MgErr ZEXPORT LVPath_UtilFileInfo OF((Path path, uInt8 write, uInt8 *isDirectory, *************** *** 276,280 **** LStrHandle comment)); ! extern MgErr ZEXPORT LVPath_OpenFile OF((LVRefNum *refnum, Path path, uInt8 rsrc, --- 279,283 ---- LStrHandle comment)); ! ZEXTERN MgErr ZEXPORT LVPath_OpenFile OF((LVRefNum *refnum, Path path, uInt8 rsrc, *************** *** 282,286 **** uInt32 denyMode)); ! extern long ZEXPORT InitializeFileFuncs OF((zlib_filefunc_def* pzlib_filefunc_def, LStrHandle *memory)); #ifdef __cplusplus --- 285,289 ---- uInt32 denyMode)); ! ZEXTERN long ZEXPORT InitializeFileFuncs OF((zlib_filefunc_def* pzlib_filefunc_def, LStrHandle *memory)); #ifdef __cplusplus Index: zip.c =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/zip.c,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** zip.c 6 Dec 2007 18:56:17 -0000 1.11 --- zip.c 27 Feb 2008 20:48:55 -0000 1.12 *************** *** 15,18 **** --- 15,19 ---- #include <string.h> #include <time.h> + #define ZLIB_INTERNAL #include "zlib.h" #include "zip.h" *************** *** 686,690 **** } ! extern zipFile ZEXPORT zipOpen (pathname, append) const char *pathname; int append; --- 687,691 ---- } ! ZEXTERN zipFile ZEXPORT zipOpen (pathname, append) const char *pathname; int append; *************** *** 693,697 **** } ! extern int ZEXPORT zipOpenNewFileInZip3 (file, filename, zipfi, extrafield_local, size_extrafield_local, extrafield_global, size_extrafield_global, --- 694,698 ---- } ! ZEXTERN int ZEXPORT zipOpenNewFileInZip3 (file, filename, zipfi, extrafield_local, size_extrafield_local, extrafield_global, size_extrafield_global, *************** *** 902,906 **** } ! extern int ZEXPORT zipOpenNewFileInZip2(file, filename, zipfi, extrafield_local, size_extrafield_local, extrafield_global, size_extrafield_global, --- 903,907 ---- } ! ZEXTERN int ZEXPORT zipOpenNewFileInZip2(file, filename, zipfi, extrafield_local, size_extrafield_local, extrafield_global, size_extrafield_global, *************** *** 926,930 **** } ! extern int ZEXPORT zipOpenNewFileInZip (file, filename, zipfi, extrafield_local, size_extrafield_local, extrafield_global, size_extrafield_global, --- 927,931 ---- } ! ZEXTERN int ZEXPORT zipOpenNewFileInZip (file, filename, zipfi, extrafield_local, size_extrafield_local, extrafield_global, size_extrafield_global, *************** *** 970,974 **** } ! extern int ZEXPORT zipWriteInFileInZip (file, buf, len) zipFile file; const void* buf; --- 971,975 ---- } ! ZEXTERN int ZEXPORT zipWriteInFileInZip (file, buf, len) zipFile file; const void* buf; *************** *** 1035,1039 **** } ! extern int ZEXPORT zipCloseFileInZipRaw (file, uncompressed_size, crc32) zipFile file; uLong uncompressed_size; --- 1036,1040 ---- } ! ZEXTERN int ZEXPORT zipCloseFileInZipRaw (file, uncompressed_size, crc32) zipFile file; uLong uncompressed_size; *************** *** 1131,1135 **** } ! extern int ZEXPORT zipCloseFileInZip (file) zipFile file; { --- 1132,1136 ---- } ! ZEXTERN int ZEXPORT zipCloseFileInZip (file) zipFile file; { *************** *** 1137,1141 **** } ! extern int ZEXPORT zipClose2 (file, global_comment, output) zipFile file; const char* global_comment; --- 1138,1142 ---- } ! ZEXTERN int ZEXPORT zipClose2 (file, global_comment, output) zipFile file; const char* global_comment; *************** *** 1226,1230 **** } ! extern int ZEXPORT zipClose (file, global_comment) zipFile file; const char* global_comment; --- 1227,1231 ---- } ! ZEXTERN int ZEXPORT zipClose (file, global_comment) zipFile file; const char* global_comment; |
|
From: Rolf K. <lab...@us...> - 2008-02-27 20:48:18
|
Update of /cvsroot/opengtoolkit/lvzip/c_source In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv15572 Modified Files: lvutil.c Log Message: Made some changes that hopefully will get the Mac OS X long path problem simpler to handle Index: lvutil.c =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/lvutil.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** lvutil.c 17 Dec 2007 13:41:22 -0000 1.6 --- lvutil.c 27 Feb 2008 20:48:21 -0000 1.7 *************** *** 8,11 **** --- 8,12 ---- #include <stdio.h> #include <string.h> + #define ZLIB_INTERNAL #include "zlib.h" #include "ioapi.h" *************** *** 39,42 **** --- 40,96 ---- #if Mac + static OSErr FSpLocationFromFullPath(CStr fullPath, + int32 fullPathLength, + FSSpec *spec) + { + AliasHandle alias; + OSErr err; + Boolean wasChanged; + Str32 nullString; + + if (fullPathLength < 255) { + StringPtr myString = (StringPtr)DSNewPtr(fullPathLength + 1); + + MoveBlock(fullPath, myString + 1, fullPathLength); + myString[0] = (uInt8)fullPathLength; + + err = FSMakeFSSpec(0, 0L, myString, spec); + if (err) + { + DEBUGPRINTF(("FSMakeFSSpec: err = %d", err)); + if (fnfErr == err) + { + /* fileNotFound is expected and normal. */ + err = mgNoErr; + } + } + DSDisposePtr(myStringPtr); + } + else { + /* Create a minimal alias from the full pathname */ + nullString[0] = 0; /* null string to indicate no zone or server name */ + err = NewAliasMinimalFromFullPath(fullPathLength, fullPath, nullString, nullString, &alias); + if (err == noErr) + { + /* Let the Alias Manager resolve the alias. */ + err = ResolveAlias(NULL, alias, spec, &wasChanged); + if (err) + { + DEBUGPRINTF(("ResolveAlias: err = %d", err)); + } + /* work around Alias Mgr sloppy volume matching bug */ + if (spec->vRefNum == 0) + { + /* invalidate wrong FSSpec */ + spec->parID = 0; + spec->name[0] = 0; + err = nsvErr; + } + DisposeHandle((Handle)alias); /* Free up memory used */ + } + } + return (err); + } + static MgErr MakeMacSpec(Path path, FSSpec *fss) { *************** *** 46,62 **** DEBUGPRINTF(("FPathToText1: path = %z", path)); err = FPathToText(path, (LStrPtr)&pathLen); ! if (err) ! { ! DEBUGPRINTF(("FPathToText2: err = %ld", err)); ! } ! else { - OSErr ret; LStrPtr lstr; - Str255 name; - if (pathLen > 255) - return mgArgErr; - lstr = (LStrPtr)DSNewPClr(sizeof(int32) + pathLen + 1); if (!lstr) --- 100,107 ---- DEBUGPRINTF(("FPathToText1: path = %z", path)); err = FPathToText(path, (LStrPtr)&pathLen); ! if (!err) { LStrPtr lstr; lstr = (LStrPtr)DSNewPClr(sizeof(int32) + pathLen + 1); if (!lstr) *************** *** 66,81 **** err = FPathToText(path, lstr); lstr->str[lstr->cnt] = 0; ! if (err) ! { ! DEBUGPRINTF(("FPathToText3: err = %ld", err)); ! } ! else { ! CToPStr(lstr->str, name); ! ret = MakeFileSpec(0, 0, name, fss); ! err = OSErrToLVErr(ret); if (err) ! DEBUGPRINTF(("MakeFileSpec: ret = %d, err = %ld, len = %ld, len2 = %d, path = %s", ! ret, err, lstr->cnt, (int16)name[0], lstr->str)); } DSDisposePtr(lstr); --- 111,120 ---- err = FPathToText(path, lstr); lstr->str[lstr->cnt] = 0; ! if (!err) { ! err = OSErrToLVErr(FSpLocationFromFullPath(lstr->str, lstr->cnt, fss)); if (err) ! DEBUGPRINTF(("FSpLocationFromFullPath: err = %ld, len = %ld, path = %s", ! err, lstr->cnt, lstr->str)); } DSDisposePtr(lstr); *************** *** 99,103 **** /* MacOSX seems to return sometimes bdNamErr for longer filenames, so we try to catch that too. */ ! Str255 temp; DEBUGPRINTF(("MakeFileSpec: trying with subpaths")); --- 138,142 ---- /* MacOSX seems to return sometimes bdNamErr for longer filenames, so we try to catch that too. */ ! Str255 temp = NULL; DEBUGPRINTF(("MakeFileSpec: trying with subpaths")); *************** *** 108,114 **** hpb.volumeParam.ioVRefNum = vRefNum; if (path == NULL ) { - hpb.volumeParam.ioNamePtr = NULL; hpb.volumeParam.ioVolIndex = 0; /* use ioVRefNum only */ } --- 147,153 ---- hpb.volumeParam.ioVRefNum = vRefNum; + hpb.volumeParam.ioNamePtr = (StringPtr)temp; if (path == NULL ) { hpb.volumeParam.ioVolIndex = 0; /* use ioVRefNum only */ } *************** *** 116,120 **** { PStrCpy(temp, path); ! hpb.volumeParam.ioNamePtr = (StringPtr)temp; hpb.volumeParam.ioVolIndex = -1; /* use ioNamePtr/ioVRefNum combination */ } --- 155,159 ---- { PStrCpy(temp, path); ! hpb.volumeParam.ioNamePtr = temp; hpb.volumeParam.ioVolIndex = -1; /* use ioNamePtr/ioVRefNum combination */ } *************** *** 133,137 **** /* remove the last elt(s) of the path and see if we have success */ ! PStrCpy(temp, path); p = (uChar*)&temp[PStrLen(path)]; --- 172,177 ---- /* remove the last elt(s) of the path and see if we have success */ ! if (path) ! PStrCpy(temp, path); p = (uChar*)&temp[PStrLen(path)]; *************** *** 147,151 **** } if (p <= temp) ! return err; PStrLen(temp) = PStrLen(path) - i; err = FSMakeFSSpec(vRefNum, dirID, temp, &fst); --- 187,191 ---- } if (p <= temp) ! return bdNamErr; PStrLen(temp) = PStrLen(path) - i; err = FSMakeFSSpec(vRefNum, dirID, temp, &fst); *************** *** 162,168 **** memset(&cpb, 0, sizeof(CInfoPBRec)); cpb.hFileInfo.ioNamePtr = fst.name; ! cpb.hFileInfo.ioVRefNum = vRefNum; cpb.hFileInfo.ioDirID = fst.parID; ! cpb.dirInfo.ioFDirIndex = 0; /* use ioNamePtr and ioDirID */ err = OSErrToLVErr(PBGetCatInfoSync(&cpb)); if (err) --- 202,208 ---- memset(&cpb, 0, sizeof(CInfoPBRec)); cpb.hFileInfo.ioNamePtr = fst.name; ! cpb.hFileInfo.ioVRefNum = fst.vRefNum; cpb.hFileInfo.ioDirID = fst.parID; ! cpb.hFileInfo.ioFDirIndex = 0; /* use ioNamePtr and ioDirID */ err = OSErrToLVErr(PBGetCatInfoSync(&cpb)); if (err) *************** *** 170,174 **** else { ! err = MakeFileSpec(vRefNum, cpb.dirInfo.ioDrDirID, p, fss); if (err) DEBUGPRINTF(("MakeFileSpec: err = %ld, path = %p", err, p)); --- 210,214 ---- else { ! err = MakeFileSpec(fst.vRefNum, cpb.dirInfo.ioDrDirID, p, fss); if (err) DEBUGPRINTF(("MakeFileSpec: err = %ld, path = %p", err, p)); |
|
From: Rolf K. <lab...@us...> - 2008-02-27 20:00:19
|
Update of /cvsroot/opengtoolkit/lvzip/c_source In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv29110 Modified Files: Makefile Makefile.vxworks lvzip.cws lvzip.prj zlibvc.def zlibvc.dsp Log Message: Removed references to gzio.c as that code is not used at all Index: lvzip.prj =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/lvzip.prj,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** lvzip.prj 25 Jan 2008 09:53:22 -0000 1.3 --- lvzip.prj 27 Feb 2008 20:00:21 -0000 1.4 *************** *** 6,10 **** IVI Standard Root Dir = "/C/Program Files/IVI" VXIplug&play Framework Dir = "/C/VXIPNP/winnt" ! Number of Files = 38 Target Type = "Dynamic Link Library" Flags = 2064 --- 6,10 ---- IVI Standard Root Dir = "/C/Program Files/IVI" VXIplug&play Framework Dir = "/C/VXIPNP/winnt" ! Number of Files = 37 Target Type = "Dynamic Link Library" Flags = 2064 *************** *** 96,111 **** Path Is Rel = True Path Rel To = "Project" - Path Rel Path = "gzio.c" - Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/gzio.c" - Exclude = False - Compile Into Object File = False - Project Flags = 0 - Folder = "Source Files" - - [File 0009] - File Type = "CSource" - Res Id = 9 - Path Is Rel = True - Path Rel To = "Project" Path Rel Path = "infback.c" Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/infback.c" --- 96,99 ---- *************** *** 115,121 **** Folder = "Source Files" ! [File 0010] File Type = "CSource" ! Res Id = 10 Path Is Rel = True Path Rel To = "Project" --- 103,109 ---- Folder = "Source Files" ! [File 0009] File Type = "CSource" ! Res Id = 9 Path Is Rel = True Path Rel To = "Project" *************** *** 127,133 **** Folder = "Source Files" ! [File 0011] File Type = "Include" ! Res Id = 11 Path Is Rel = True Path Rel To = "Project" --- 115,121 ---- Folder = "Source Files" ! [File 0010] File Type = "Include" ! Res Id = 10 Path Is Rel = True Path Rel To = "Project" *************** *** 138,144 **** Folder = "Headers" ! [File 0012] File Type = "Include" ! Res Id = 12 Path Is Rel = True Path Rel To = "Project" --- 126,132 ---- Folder = "Headers" ! [File 0011] File Type = "Include" ! Res Id = 11 Path Is Rel = True Path Rel To = "Project" *************** *** 149,155 **** Folder = "Headers" ! [File 0013] File Type = "CSource" ! Res Id = 13 Path Is Rel = True Path Rel To = "Project" --- 137,143 ---- Folder = "Headers" ! [File 0012] File Type = "CSource" ! Res Id = 12 Path Is Rel = True Path Rel To = "Project" *************** *** 161,167 **** Folder = "Source Files" ! [File 0014] File Type = "Include" ! Res Id = 14 Path Is Rel = True Path Rel To = "Project" --- 149,155 ---- Folder = "Source Files" ! [File 0013] File Type = "Include" ! Res Id = 13 Path Is Rel = True Path Rel To = "Project" *************** *** 172,178 **** Folder = "Headers" ! [File 0015] File Type = "CSource" ! Res Id = 15 Path Is Rel = True Path Rel To = "Project" --- 160,166 ---- Folder = "Headers" ! [File 0014] File Type = "CSource" ! Res Id = 14 Path Is Rel = True Path Rel To = "Project" *************** *** 184,190 **** Folder = "Source Files" ! [File 0016] File Type = "Include" ! Res Id = 16 Path Is Rel = True Path Rel To = "Project" --- 172,178 ---- Folder = "Source Files" ! [File 0015] File Type = "Include" ! Res Id = 15 Path Is Rel = True Path Rel To = "Project" *************** *** 195,201 **** Folder = "Headers" ! [File 0017] File Type = "CSource" ! Res Id = 17 Path Is Rel = True Path Rel To = "Project" --- 183,189 ---- Folder = "Headers" ! [File 0016] File Type = "CSource" ! Res Id = 16 Path Is Rel = True Path Rel To = "Project" *************** *** 207,213 **** Folder = "Source Files" ! [File 0018] File Type = "Include" ! Res Id = 18 Path Is Rel = True Path Rel To = "Project" --- 195,201 ---- Folder = "Source Files" ! [File 0017] File Type = "Include" ! Res Id = 17 Path Is Rel = True Path Rel To = "Project" *************** *** 218,224 **** Folder = "Headers" ! [File 0019] File Type = "CSource" ! Res Id = 19 Path Is Rel = True Path Rel To = "Project" --- 206,212 ---- Folder = "Headers" ! [File 0018] File Type = "CSource" ! Res Id = 18 Path Is Rel = True Path Rel To = "Project" *************** *** 230,236 **** Folder = "Source Files" ! [File 0020] File Type = "Include" ! Res Id = 20 Path Is Rel = True Path Rel To = "Project" --- 218,224 ---- Folder = "Source Files" ! [File 0019] File Type = "Include" ! Res Id = 19 Path Is Rel = True Path Rel To = "Project" *************** *** 241,247 **** Folder = "Headers" ! [File 0021] File Type = "CSource" ! Res Id = 21 Path Is Rel = True Path Rel To = "Project" --- 229,235 ---- Folder = "Headers" ! [File 0020] File Type = "CSource" ! Res Id = 20 Path Is Rel = True Path Rel To = "Project" *************** *** 253,259 **** Folder = "Source Files" ! [File 0022] File Type = "Include" ! Res Id = 22 Path Is Rel = True Path Rel To = "Project" --- 241,247 ---- Folder = "Source Files" ! [File 0021] File Type = "Include" ! Res Id = 21 Path Is Rel = True Path Rel To = "Project" *************** *** 264,270 **** Folder = "Headers" ! [File 0023] File Type = "Library" ! Res Id = 23 Path Is Rel = True Path Rel To = "Project" --- 252,258 ---- Folder = "Headers" ! [File 0022] File Type = "Library" ! Res Id = 22 Path Is Rel = True Path Rel To = "Project" *************** *** 275,281 **** Folder = "Not In A Folder" ! [File 0024] File Type = "CSource" ! Res Id = 24 Path Is Rel = True Path Rel To = "Project" --- 263,269 ---- Folder = "Not In A Folder" ! [File 0023] File Type = "CSource" ! Res Id = 23 Path Is Rel = True Path Rel To = "Project" *************** *** 287,293 **** Folder = "Source Files" ! [File 0025] File Type = "Include" ! Res Id = 25 Path Is Rel = True Path Rel To = "Project" --- 275,281 ---- Folder = "Source Files" ! [File 0024] File Type = "Include" ! Res Id = 24 Path Is Rel = True Path Rel To = "Project" *************** *** 298,304 **** Folder = "Headers" ! [File 0026] File Type = "CSource" ! Res Id = 26 Path Is Rel = True Path Rel To = "Project" --- 286,292 ---- Folder = "Headers" ! [File 0025] File Type = "CSource" ! Res Id = 25 Path Is Rel = True Path Rel To = "Project" *************** *** 310,316 **** Folder = "Source Files" ! [File 0027] File Type = "Include" ! Res Id = 27 Path Is Rel = True Path Rel To = "Project" --- 298,304 ---- Folder = "Source Files" ! [File 0026] File Type = "Include" ! Res Id = 26 Path Is Rel = True Path Rel To = "Project" *************** *** 321,327 **** Folder = "Headers" ! [File 0028] File Type = "CSource" ! Res Id = 28 Path Is Rel = True Path Rel To = "Project" --- 309,315 ---- Folder = "Headers" ! [File 0027] File Type = "CSource" ! Res Id = 27 Path Is Rel = True Path Rel To = "Project" *************** *** 333,339 **** Folder = "Source Files" ! [File 0029] File Type = "Include" ! Res Id = 29 Path Is Rel = True Path Rel To = "Project" --- 321,327 ---- Folder = "Source Files" ! [File 0028] File Type = "Include" ! Res Id = 28 Path Is Rel = True Path Rel To = "Project" *************** *** 344,350 **** Folder = "Headers" ! [File 0030] File Type = "CSource" ! Res Id = 30 Path Is Rel = True Path Rel To = "Project" --- 332,338 ---- Folder = "Headers" ! [File 0029] File Type = "CSource" ! Res Id = 29 Path Is Rel = True Path Rel To = "Project" *************** *** 356,362 **** Folder = "Source Files" ! [File 0031] File Type = "CSource" ! Res Id = 31 Path Is Rel = True Path Rel To = "Project" --- 344,350 ---- Folder = "Source Files" ! [File 0030] File Type = "CSource" ! Res Id = 30 Path Is Rel = True Path Rel To = "Project" *************** *** 368,374 **** Folder = "Source Files" ! [File 0032] File Type = "Include" ! Res Id = 32 Path Is Rel = True Path Rel To = "Project" --- 356,362 ---- Folder = "Source Files" ! [File 0031] File Type = "Include" ! Res Id = 31 Path Is Rel = True Path Rel To = "Project" *************** *** 379,385 **** Folder = "Headers" ! [File 0033] File Type = "Include" ! Res Id = 33 Path Is Rel = True Path Rel To = "Project" --- 367,373 ---- Folder = "Headers" ! [File 0032] File Type = "Include" ! Res Id = 32 Path Is Rel = True Path Rel To = "Project" *************** *** 390,396 **** Folder = "Headers" ! [File 0034] File Type = "CSource" ! Res Id = 34 Path Is Rel = True Path Rel To = "Project" --- 378,384 ---- Folder = "Headers" ! [File 0033] File Type = "CSource" ! Res Id = 33 Path Is Rel = True Path Rel To = "Project" *************** *** 402,408 **** Folder = "Source Files" ! [File 0035] File Type = "Include" ! Res Id = 35 Path Is Rel = True Path Rel To = "Project" --- 390,396 ---- Folder = "Source Files" ! [File 0034] File Type = "Include" ! Res Id = 34 Path Is Rel = True Path Rel To = "Project" *************** *** 413,419 **** Folder = "Headers" ! [File 0036] File Type = "Include" ! Res Id = 36 Path Is Rel = True Path Rel To = "Project" --- 401,407 ---- Folder = "Headers" ! [File 0035] File Type = "Include" ! Res Id = 35 Path Is Rel = True Path Rel To = "Project" *************** *** 424,430 **** Folder = "Headers" ! [File 0037] File Type = "CSource" ! Res Id = 37 Path Is Rel = True Path Rel To = "Project" --- 412,418 ---- Folder = "Headers" ! [File 0036] File Type = "CSource" ! Res Id = 36 Path Is Rel = True Path Rel To = "Project" *************** *** 436,442 **** Folder = "Source Files" ! [File 0038] File Type = "Include" ! Res Id = 38 Path Is Rel = True Path Rel To = "Project" --- 424,430 ---- Folder = "Source Files" ! [File 0037] File Type = "Include" ! Res Id = 37 Path Is Rel = True Path Rel To = "Project" *************** *** 470,484 **** [Compiler Defines] ! Compiler Defines = "/DWIN32_LEAN_AND_MEAN /DNO_vsnprintf /DNO_DUMMY_DECL" [Create Executable] Executable File_Debug Is Rel = True Executable File_Debug Rel To = "Project" ! Executable File_Debug Rel Path = "lvzip.dll" ! Executable File_Debug = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/lvzip.dll" Executable File_Release Is Rel = True Executable File_Release Rel To = "Project" ! Executable File_Release Rel Path = "lvzip.dll" ! Executable File_Release = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/lvzip.dll" Icon File Is Rel = False Icon File = "" --- 458,472 ---- [Compiler Defines] ! Compiler Defines = "/DWIN32_LEAN_AND_MEAN /DNO_vsnprintf /DNO_DUMMY_DECL /DZLIB_DLL" [Create Executable] Executable File_Debug Is Rel = True Executable File_Debug Rel To = "Project" ! Executable File_Debug Rel Path = "cvibuild.deb/lvzip.dll" ! Executable File_Debug = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/cvibuild.deb/lvzip.dll" Executable File_Release Is Rel = True Executable File_Release Rel To = "Project" ! Executable File_Release Rel Path = "cvibuild.rel/lvzip.dll" ! Executable File_Release = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/cvibuild.rel/lvzip.dll" Icon File Is Rel = False Icon File = "" *************** *** 494,498 **** Product Version = "1.0" Special Build = "" ! DLL Exports = "Include File And Marked Symbols" Export File1 = "lvutil.h" Export File2 = "mztools.h" --- 482,486 ---- Product Version = "1.0" Special Build = "" ! DLL Exports = "Symbols Marked As Export" Export File1 = "lvutil.h" Export File2 = "mztools.h" Index: Makefile.vxworks =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/Makefile.vxworks,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile.vxworks 12 Dec 2007 16:13:07 -0000 1.2 --- Makefile.vxworks 27 Feb 2008 20:00:21 -0000 1.3 *************** *** 19,26 **** # directory. Make will automatically locate the source file and # compile it. ! OBJECTS := $(OBJ_DIR)/adler32.o $(OBJ_DIR)/compress.o $(OBJ_DIR)/crc32.o $(OBJ_DIR)/gzio.o $(OBJ_DIR)/uncompr.o \ ! $(OBJ_DIR)/deflate.o $(OBJ_DIR)/trees.o $(OBJ_DIR)/zutil.o $(OBJ_DIR)/inflate.o $(OBJ_DIR)/infback.o \ ! $(OBJ_DIR)/inftrees.o $(OBJ_DIR)/inffast.o $(OBJ_DIR)/ioapi.o $(OBJ_DIR)/iomem.o $(OBJ_DIR)/lvutil.o \ ! $(OBJ_DIR)/zip.o $(OBJ_DIR)/unzip.o # This is the name of the output shared library. --- 19,26 ---- # directory. Make will automatically locate the source file and # compile it. ! OBJECTS := $(OBJ_DIR)/adler32.o $(OBJ_DIR)/compress.o $(OBJ_DIR)/crc32.o $(OBJ_DIR)/uncompr.o $(OBJ_DIR)/deflate.o \ ! $(OBJ_DIR)/trees.o $(OBJ_DIR)/zutil.o $(OBJ_DIR)/inflate.o $(OBJ_DIR)/infback.o $(OBJ_DIR)/inftrees.o \ ! $(OBJ_DIR)/inffast.o $(OBJ_DIR)/ioapi.o $(OBJ_DIR)/iomem.o $(OBJ_DIR)/lvutil.o $(OBJ_DIR)/zip.o \ ! $(OBJ_DIR)/unzip.o # This is the name of the output shared library. Index: lvzip.cws =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/lvzip.cws,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** lvzip.cws 25 Jan 2008 09:53:22 -0000 1.4 --- lvzip.cws 27 Feb 2008 20:00:21 -0000 1.5 *************** *** 9,16 **** Project 0001 = "lvzip.prj" Drag Bar Left = 316 ! Window Top = 487 ! Window Left = 15 ! Window Bottom = 1473 ! Window Right = 1551 Maximized = False Maximized Children = False --- 9,16 ---- Project 0001 = "lvzip.prj" Drag Bar Left = 316 ! Window Top = 51 ! Window Left = 65 ! Window Bottom = 790 ! Window Right = 1453 Maximized = False Maximized Children = False *************** *** 26,30 **** Break At First Statement = False Sort Type = "File Name" ! Number of Opened Files = 2 Window Confinement Region Enabled = True MainColumnWidth = 297 --- 26,30 ---- Break At First Statement = False Sort Type = "File Name" ! Number of Opened Files = 1 Window Confinement Region Enabled = True MainColumnWidth = 297 *************** *** 44,54 **** [File 0001] ! Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/lvutil.c" File Type = "CSource" ! Disk Date = 3280743663 In Projects = "1," ! Window Top = 25 Window Left = 6 ! Source Window State = "1,0,0,0,0,0,0,0,0,80,0,0,0,0,0,25,0,0,0,0,349,676,1,0," [File 0002] --- 44,55 ---- [File 0001] ! Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/inftrees.c" File Type = "CSource" ! Disk Date = 3219509183 In Projects = "1," ! Window Top = 26 Window Left = 6 ! Window Z-Order = 1 ! Source Window State = "1,0,0,0,0,0,0,0,0,118,0,0,0,0,0,42,17,0,38,0,570,975,1,0," [File 0002] *************** *** 114,126 **** [File 0009] - Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/gzio.c" - File Type = "CSource" - Disk Date = 3219509182 - In Projects = "1," - Window Top = 39 - Window Left = 30 - Source Window State = "1,11,12,11,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,0,399,871,1,0," - - [File 0010] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/infback.c" File Type = "CSource" --- 115,118 ---- *************** *** 131,135 **** Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,284,676,1,0," ! [File 0011] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/inffast.c" File Type = "CSource" --- 123,127 ---- Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,284,676,1,0," ! [File 0010] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/inffast.c" File Type = "CSource" *************** *** 140,144 **** Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,381,852,1,0," ! [File 0012] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/inffast.h" File Type = "Include" --- 132,136 ---- Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,381,852,1,0," ! [File 0011] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/inffast.h" File Type = "Include" *************** *** 147,151 **** Source Window State = "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0," ! [File 0013] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/inffixed.h" File Type = "Include" --- 139,143 ---- Source Window State = "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0," ! [File 0012] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/inffixed.h" File Type = "Include" *************** *** 154,158 **** Source Window State = "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0," ! [File 0014] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/inflate.c" File Type = "CSource" --- 146,150 ---- Source Window State = "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0," ! [File 0013] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/inflate.c" File Type = "CSource" *************** *** 163,167 **** Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,284,676,1,0," ! [File 0015] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/inflate.h" File Type = "Include" --- 155,159 ---- Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,284,676,1,0," ! [File 0014] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/inflate.h" File Type = "Include" *************** *** 172,185 **** Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,388,779,1,0," ! [File 0016] ! Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/inftrees.c" ! File Type = "CSource" ! Disk Date = 3219509183 ! In Projects = "1," ! Window Top = 23 ! Window Left = 176 ! Source Window State = "1,0,0,0,0,0,0,0,0,118,0,0,0,0,0,42,121,0,142,24,570,975,1,0," ! ! [File 0017] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/inftrees.h" File Type = "Include" --- 164,168 ---- Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,388,779,1,0," ! [File 0015] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/inftrees.h" File Type = "Include" *************** *** 190,194 **** Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,21,0,0,0,499,1052,1,0," ! [File 0018] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/ioapi.c" File Type = "CSource" --- 173,177 ---- Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,21,0,0,0,499,1052,1,0," ! [File 0016] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/ioapi.c" File Type = "CSource" *************** *** 199,203 **** Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,284,676,1,0," ! [File 0019] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/ioapi.h" File Type = "Include" --- 182,186 ---- Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,284,676,1,0," ! [File 0017] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/ioapi.h" File Type = "Include" *************** *** 206,210 **** Source Window State = "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0," ! [File 0020] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/iomem.c" File Type = "CSource" --- 189,193 ---- Source Window State = "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0," ! [File 0018] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/iomem.c" File Type = "CSource" *************** *** 215,219 **** Source Window State = "1,105,105,105,12,96,12,0,0,0,0,0,0,0,0,0,92,0,105,92,491,939,1,0," ! [File 0021] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/iomem.h" File Type = "Include" --- 198,202 ---- Source Window State = "1,105,105,105,12,96,12,0,0,0,0,0,0,0,0,0,92,0,105,92,491,939,1,0," ! [File 0019] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/iomem.h" File Type = "Include" *************** *** 224,228 **** Source Window State = "1,9,10,9,0,0,0,0,0,0,0,0,0,0,0,0,0,0,9,0,327,888,1,0," ! [File 0022] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/iowin32.c" File Type = "CSource" --- 207,211 ---- Source Window State = "1,9,10,9,0,0,0,0,0,0,0,0,0,0,0,0,0,0,9,0,327,888,1,0," ! [File 0020] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/iowin32.c" File Type = "CSource" *************** *** 233,237 **** Source Window State = "1,70,71,70,0,0,0,0,0,0,0,60,0,0,0,0,60,0,70,0,528,1016,1,0," ! [File 0023] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/iowin32.h" File Type = "Include" --- 216,220 ---- Source Window State = "1,70,71,70,0,0,0,0,0,0,0,60,0,0,0,0,60,0,70,0,528,1016,1,0," ! [File 0021] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/iowin32.h" File Type = "Include" *************** *** 240,244 **** Source Window State = "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0," ! [File 0024] Path = "/c/Work/OpenG/opengtoolkit/cintools/labview.lib" File Type = "Library" --- 223,227 ---- Source Window State = "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0," ! [File 0022] Path = "/c/Work/OpenG/opengtoolkit/cintools/labview.lib" File Type = "Library" *************** *** 246,260 **** In Projects = "1," ! [File 0025] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/lvutil.h" File Type = "Include" Disk Date = 3280141347 In Projects = "1," ! Window Top = 48 ! Window Left = 18 ! Window Z-Order = 1 ! Source Window State = "1,26,32,26,0,0,0,0,0,114,0,0,0,0,0,26,251,0,264,20,371,941,1,0," ! [File 0026] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/mztools.c" File Type = "CSource" --- 229,251 ---- In Projects = "1," ! [File 0023] ! Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/lvutil.c" ! File Type = "CSource" ! Disk Date = 3286985840 ! In Projects = "1," ! Window Top = 25 ! Window Left = 6 ! Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,426,0,476,19,691,883,1,0," ! ! [File 0024] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/lvutil.h" File Type = "Include" Disk Date = 3280141347 In Projects = "1," ! Window Top = 30 ! Window Left = 5 ! Source Window State = "1,26,32,26,0,0,0,0,0,0,0,0,0,0,0,0,160,0,175,32,371,941,1,0," ! [File 0025] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/mztools.c" File Type = "CSource" *************** *** 265,269 **** Source Window State = "1,12,12,12,10,15,10,0,0,0,0,0,0,0,0,0,0,0,16,19,522,1074,1,0," ! [File 0027] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/mztools.h" File Type = "Include" --- 256,260 ---- Source Window State = "1,12,12,12,10,15,10,0,0,0,0,0,0,0,0,0,0,0,16,19,522,1074,1,0," ! [File 0026] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/mztools.h" File Type = "Include" *************** *** 274,278 **** Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,0,0,0,471,939,1,0," ! [File 0028] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/trees.c" File Type = "CSource" --- 265,269 ---- Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,0,0,0,471,939,1,0," ! [File 0027] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/trees.c" File Type = "CSource" *************** *** 283,287 **** Source Window State = "1,33,33,33,11,22,11,0,0,0,0,0,0,0,0,0,15,0,50,41,536,717,1,0," ! [File 0029] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/trees.h" File Type = "Include" --- 274,278 ---- Source Window State = "1,33,33,33,11,22,11,0,0,0,0,0,0,0,0,0,15,0,50,41,536,717,1,0," ! [File 0028] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/trees.h" File Type = "Include" *************** *** 292,296 **** Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,540,666,1,0," ! [File 0030] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/uncompr.c" File Type = "CSource" --- 283,287 ---- Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,540,666,1,0," ! [File 0029] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/uncompr.c" File Type = "CSource" *************** *** 301,308 **** Source Window State = "1,7,8,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,0,284,676,1,0," ! [File 0031] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/unzip.c" File Type = "CSource" ! Disk Date = 3280139072 In Projects = "1," Window Top = 25 --- 292,299 ---- Source Window State = "1,7,8,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,0,284,676,1,0," ! [File 0030] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/unzip.c" File Type = "CSource" ! Disk Date = 3286985704 In Projects = "1," Window Top = 25 *************** *** 310,314 **** Source Window State = "1,1538,1539,1538,0,0,0,0,0,0,0,0,0,0,0,0,1527,0,1538,0,568,1163,1,0," ! [File 0032] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/unzip.h" File Type = "Include" --- 301,305 ---- Source Window State = "1,1538,1539,1538,0,0,0,0,0,0,0,0,0,0,0,0,1527,0,1538,0,568,1163,1,0," ! [File 0031] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/unzip.h" File Type = "Include" *************** *** 319,341 **** Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,129,0,0,0,316,825,1,0," ! [File 0033] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/zconf.h" File Type = "Include" ! Disk Date = 3279812177 In Projects = "1," ! Window Top = 50 ! Window Left = 26 ! Source Window State = "1,90,127,127,6,9,9,0,0,99,0,0,0,0,0,40,0,0,0,13,545,823,1,0," ! [File 0034] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/zip.c" File Type = "CSource" ! Disk Date = 3279788354 In Projects = "1," Window Top = 48 Window Left = 18 ! Source Window State = "1,196,196,196,4,18,4,0,0,124,0,0,0,0,0,27,180,0,193,0,378,1028,1,0," ! [File 0035] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/zip.h" File Type = "Include" --- 310,332 ---- Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,129,0,0,0,316,825,1,0," ! [File 0032] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/zconf.h" File Type = "Include" ! Disk Date = 3286985433 In Projects = "1," ! Window Top = 27 ! Window Left = 24 ! Source Window State = "1,211,212,211,0,0,0,0,0,0,0,0,0,0,0,0,195,0,211,0,545,823,1,0," ! [File 0033] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/zip.c" File Type = "CSource" ! Disk Date = 3286985713 In Projects = "1," Window Top = 48 Window Left = 18 ! Source Window State = "1,196,196,196,4,18,4,0,0,0,0,0,0,0,0,0,180,0,202,12,378,1028,1,0," ! [File 0034] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/zip.h" File Type = "Include" *************** *** 344,358 **** Source Window State = "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0," ! [File 0036] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/zlib.h" File Type = "Include" Disk Date = 3219509183 In Projects = "1," ! Window Top = 26 ! Window Left = 154 ! Window Z-Order = 2 ! Source Window State = "1,1332,1350,1350,11,17,17,0,0,138,0,0,0,0,0,38,228,0,237,11,526,1136,1,0," ! [File 0037] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/zutil.c" File Type = "CSource" --- 335,348 ---- Source Window State = "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0," ! [File 0035] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/zlib.h" File Type = "Include" Disk Date = 3219509183 In Projects = "1," ! Window Top = 43 ! Window Left = 31 ! Source Window State = "1,234,235,235,108,109,109,0,0,0,0,0,0,0,0,0,189,0,194,7,526,1136,1,0," ! [File 0036] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/zutil.c" File Type = "CSource" *************** *** 363,374 **** Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,284,676,1,0," ! [File 0038] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/zutil.h" File Type = "Include" Disk Date = 3219509183 In Projects = "1," ! Window Top = 25 ! Window Left = 6 ! Source Window State = "1,0,0,0,0,0,0,0,0,123,0,0,0,0,0,41,0,0,10,10,568,1016,1,0," [Build Options 0001] --- 353,364 ---- Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,284,676,1,0," ! [File 0037] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/zutil.h" File Type = "Include" Disk Date = 3219509183 In Projects = "1," ! Window Top = 30 ! Window Left = 11 ! Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,18,39,640,1016,1,0," [Build Options 0001] Index: Makefile =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/Makefile,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Makefile 6 Dec 2007 22:40:21 -0000 1.10 --- Makefile 27 Feb 2008 20:00:21 -0000 1.11 *************** *** 46,50 **** man3dir = ${mandir}/man3 ! OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \ zutil.o inflate.o infback.o inftrees.o inffast.o \ ioapi.o iomem.o lvutil.o zip.o unzip.o --- 46,50 ---- man3dir = ${mandir}/man3 ! OBJS = adler32.o compress.o crc32.o uncompr.o deflate.o trees.o \ zutil.o inflate.o infback.o inftrees.o inffast.o \ ioapi.o iomem.o lvutil.o zip.o unzip.o *************** *** 55,70 **** TEST_OBJS = example.o minigzip.o ! all: example$(EXE) minigzip$(EXE) ! ! check: test ! test: all ! @LD_LIBRARY_PATH=.:$(LD_LIBRARY_PATH) ; export LD_LIBRARY_PATH; \ ! echo hello world | ./minigzip | ./minigzip -d || \ ! echo ' *** minigzip test FAILED ***' ; \ ! if ./example; then \ ! echo ' *** zlib test OK ***'; \ ! else \ ! echo ' *** zlib test FAILED ***'; \ ! fi lvzlib.a: $(OBJS) $(OBJA) --- 55,59 ---- TEST_OBJS = example.o minigzip.o ! all: $(SHAREDLIB) lvzlib.a: $(OBJS) $(OBJA) *************** *** 81,90 **** $(LDSHARED) -o $@ $(OBJS) $(OBJA) - example$(EXE): example.o $(LIBS) - $(CC) $(CFLAGS) -o $@ example.o $(LIBS) - - minigzip$(EXE): minigzip.o $(LIBS) - $(CC) $(CFLAGS) -o $@ minigzip.o $(LIBS) - install: $(LIBS) -@if [ ! -d $(exec_prefix) ]; then mkdir -p $(exec_prefix); fi --- 70,73 ---- *************** *** 183,216 **** deflate.o: /usr/include/asm-generic/errno.h deflate.o: /usr/include/asm-generic/errno-base.h - example.o: /usr/include/stdio.h /usr/include/features.h - example.o: /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h - example.o: /usr/include/gnu/stubs.h /usr/include/gnu/stubs-32.h - example.o: /usr/include/bits/types.h /usr/include/bits/typesizes.h - example.o: /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h - example.o: /usr/include/bits/wchar.h /usr/include/gconv.h - example.o: /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h - example.o: zlib.h zconf.h /usr/include/string.h /usr/include/stdlib.h - example.o: /usr/include/sys/types.h /usr/include/time.h /usr/include/endian.h - example.o: /usr/include/bits/endian.h /usr/include/sys/select.h - example.o: /usr/include/bits/select.h /usr/include/bits/sigset.h - example.o: /usr/include/bits/time.h /usr/include/sys/sysmacros.h - example.o: /usr/include/bits/pthreadtypes.h /usr/include/alloca.h - gzio.o: /usr/include/stdio.h /usr/include/features.h /usr/include/sys/cdefs.h - gzio.o: /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h - gzio.o: /usr/include/gnu/stubs-32.h /usr/include/bits/types.h - gzio.o: /usr/include/bits/typesizes.h /usr/include/libio.h - gzio.o: /usr/include/_G_config.h /usr/include/wchar.h - gzio.o: /usr/include/bits/wchar.h /usr/include/gconv.h - gzio.o: /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h zutil.h - gzio.o: zlib.h zconf.h /usr/include/string.h /usr/include/stdlib.h - gzio.o: /usr/include/sys/types.h /usr/include/time.h /usr/include/endian.h - gzio.o: /usr/include/bits/endian.h /usr/include/sys/select.h - gzio.o: /usr/include/bits/select.h /usr/include/bits/sigset.h - gzio.o: /usr/include/bits/time.h /usr/include/sys/sysmacros.h - gzio.o: /usr/include/bits/pthreadtypes.h /usr/include/alloca.h - gzio.o: /usr/include/errno.h /usr/include/bits/errno.h - gzio.o: /usr/include/linux/errno.h /usr/include/asm/errno.h - gzio.o: /usr/include/asm-i386/errno.h /usr/include/asm-generic/errno.h - gzio.o: /usr/include/asm-generic/errno-base.h infback.o: zutil.h zlib.h zconf.h /usr/include/string.h infback.o: /usr/include/features.h /usr/include/sys/cdefs.h --- 166,169 ---- *************** *** 327,381 **** lvutil.o: /usr/include/alloca.h /usr/include/sys/stat.h lvutil.o: /usr/include/bits/stat.h /usr/include/utime.h - minigzip.o: /usr/include/stdio.h /usr/include/features.h - minigzip.o: /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h - minigzip.o: /usr/include/gnu/stubs.h /usr/include/gnu/stubs-32.h - minigzip.o: /usr/include/bits/types.h /usr/include/bits/typesizes.h - minigzip.o: /usr/include/libio.h /usr/include/_G_config.h - minigzip.o: /usr/include/wchar.h /usr/include/bits/wchar.h - minigzip.o: /usr/include/gconv.h /usr/include/bits/stdio_lim.h - minigzip.o: /usr/include/bits/sys_errlist.h zlib.h zconf.h - minigzip.o: /usr/include/string.h /usr/include/stdlib.h - minigzip.o: /usr/include/sys/types.h /usr/include/time.h - minigzip.o: /usr/include/endian.h /usr/include/bits/endian.h - minigzip.o: /usr/include/sys/select.h /usr/include/bits/select.h - minigzip.o: /usr/include/bits/sigset.h /usr/include/bits/time.h - minigzip.o: /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h - minigzip.o: /usr/include/alloca.h - miniunz.o: /usr/include/stdio.h /usr/include/features.h - miniunz.o: /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h - miniunz.o: /usr/include/gnu/stubs.h /usr/include/gnu/stubs-32.h - miniunz.o: /usr/include/bits/types.h /usr/include/bits/typesizes.h - miniunz.o: /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h - miniunz.o: /usr/include/bits/wchar.h /usr/include/gconv.h - miniunz.o: /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h - miniunz.o: /usr/include/stdlib.h /usr/include/sys/types.h /usr/include/time.h - miniunz.o: /usr/include/endian.h /usr/include/bits/endian.h - miniunz.o: /usr/include/sys/select.h /usr/include/bits/select.h - miniunz.o: /usr/include/bits/sigset.h /usr/include/bits/time.h - miniunz.o: /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h - miniunz.o: /usr/include/alloca.h /usr/include/string.h /usr/include/errno.h - miniunz.o: /usr/include/bits/errno.h /usr/include/linux/errno.h - miniunz.o: /usr/include/asm/errno.h /usr/include/asm-i386/errno.h - miniunz.o: /usr/include/asm-generic/errno.h - miniunz.o: /usr/include/asm-generic/errno-base.h /usr/include/fcntl.h - miniunz.o: /usr/include/bits/fcntl.h unzip.h zlib.h zconf.h ioapi.h - minizip.o: /usr/include/stdio.h /usr/include/features.h - minizip.o: /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h - minizip.o: /usr/include/gnu/stubs.h /usr/include/gnu/stubs-32.h - minizip.o: /usr/include/bits/types.h /usr/include/bits/typesizes.h - minizip.o: /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h - minizip.o: /usr/include/bits/wchar.h /usr/include/gconv.h - minizip.o: /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h - minizip.o: /usr/include/stdlib.h /usr/include/sys/types.h /usr/include/time.h - minizip.o: /usr/include/endian.h /usr/include/bits/endian.h - minizip.o: /usr/include/sys/select.h /usr/include/bits/select.h - minizip.o: /usr/include/bits/sigset.h /usr/include/bits/time.h - minizip.o: /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h - minizip.o: /usr/include/alloca.h /usr/include/string.h /usr/include/errno.h - minizip.o: /usr/include/bits/errno.h /usr/include/linux/errno.h - minizip.o: /usr/include/asm/errno.h /usr/include/asm-i386/errno.h - minizip.o: /usr/include/asm-generic/errno.h - minizip.o: /usr/include/asm-generic/errno-base.h /usr/include/fcntl.h - minizip.o: /usr/include/bits/fcntl.h zip.h zlib.h zconf.h ioapi.h mztools.o: /usr/include/stdio.h /usr/include/features.h mztools.o: /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h --- 280,283 ---- Index: zlibvc.def =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/zlibvc.def,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** zlibvc.def 17 Sep 2007 05:07:16 -0000 1.16 --- zlibvc.def 27 Feb 2008 20:00:21 -0000 1.17 *************** *** 10,106 **** EXPORTS ! adler32 @1 ! compress @2 ! crc32 @3 ! deflate @4 ! deflateCopy @5 ! deflateEnd @6 ! deflateInit2_ @7 ! deflateInit_ @8 ! deflateParams @9 ! deflateReset @10 ! deflateSetDictionary @11 ! gzclose @12 ! gzdopen @13 ! gzerror @14 ! gzflush @15 ! gzopen @16 ! gzread @17 ! gzwrite @18 ! inflate @19 ! inflateEnd @20 ! inflateInit2_ @21 ! inflateInit_ @22 ! inflateReset @23 ! inflateSetDictionary @24 ! inflateSync @25 ! uncompress @26 ! zlibVersion @27 ! gzprintf @28 ! gzputc @29 ! gzgetc @30 ! gzseek @31 ! gzrewind @32 ! gztell @33 ! gzeof @34 ! gzsetparams @35 ! zError @36 ! inflateSyncPoint @37 ! get_crc_table @38 ! compress2 @39 ! gzputs @40 ! gzgets @41 ! inflateCopy @42 ! inflateBackInit_ @43 ! inflateBack @44 ! inflateBackEnd @45 ! compressBound @46 ! deflateBound @47 ! gzclearerr @48 ! gzungetc @49 ! zlibCompileFlags @50 ! deflatePrime @51 ! ! unzOpen @61 ! unzClose @62 ! unzGetGlobalInfo @63 ! unzGetCurrentFileInfo @64 ! unzGoToFirstFile @65 ! unzGoToNextFile @66 ! unzOpenCurrentFile @67 ! unzReadCurrentFile @68 ! unzOpenCurrentFile3 @69 ! unztell @70 ! unzeof @71 ! unzCloseCurrentFile @72 ! unzGetGlobalComment @73 ! unzStringFileNameCompare @74 ! unzLocateFile @75 ! unzGetLocalExtrafield @76 ! unzOpen2 @77 ! unzOpenCurrentFile2 @78 ! unzOpenCurrentFilePassword @79 ! zipOpen @80 ! zipOpenNewFileInZip @81 ! zipWriteInFileInZip @82 ! zipCloseFileInZip @83 ! zipClose @84 ! zipOpenNewFileInZip2 @85 ! zipCloseFileInZipRaw @86 ! zipOpen2 @87 ! zipOpenNewFileInZip3 @88 ! zipClose2 @89 ! unzGetFilePos @100 ! unzGoToFilePos @101 ! unzRepair @102 ! DLLVersion @190 ! InitializeFileFuncs @200 ! LVPath_ToText @201 ! LVPath_UtilFileInfo @202 ! LVPath_OpenFile @203 ! LVPath_HasResourceFork @204 ! LVPath_EncodeMacbinary @205 ! LVPath_DecodeMacbinary @206 --- 10,62 ---- EXPORTS ! DLLVersion ! InitializeFileFuncs ! LVPath_ToText ! LVPath_UtilFileInfo ! LVPath_OpenFile ! LVPath_HasResourceFork ! LVPath_EncodeMacbinary ! LVPath_DecodeMacbinary ! adler32 ! compress ! crc32 ! deflate ! inflate ! uncompress ! zlibVersion ! compress2 ! unzOpen ! unzClose ! unzGetGlobalInfo ! unzGetCurrentFileInfo ! unzGoToFirstFile ! unzGoToNextFile ! unzOpenCurrentFile ! unzReadCurrentFile ! unzOpenCurrentFile3 ! unztell ! unzeof ! unzCloseCurrentFile ! unzGetGlobalComment ! unzStringFileNameCompare ! unzLocateFile ! unzGetLocalExtrafield ! unzOpen2 ! unzOpenCurrentFile2 ! unzOpenCurrentFilePassword ! unzGetFilePos ! unzGoToFilePos ! unzRepair ! zipOpen ! zipOpenNewFileInZip ! zipWriteInFileInZip ! zipCloseFileInZip ! zipClose ! zipOpenNewFileInZip2 ! zipCloseFileInZipRaw ! zipOpen2 ! zipOpenNewFileInZip3 ! zipClose2 \ No newline at end of file Index: zlibvc.dsp =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/zlibvc.dsp,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** zlibvc.dsp 6 Dec 2007 14:18:00 -0000 1.12 --- zlibvc.dsp 27 Feb 2008 20:00:21 -0000 1.13 *************** *** 293,296 **** --- 293,297 ---- SOURCE=.\gzio.c + # PROP Exclude_From_Build 1 # End Source File # Begin Source File |
|
From: Rolf K. <lab...@us...> - 2008-02-27 19:11:38
|
Update of /cvsroot/opengtoolkit/lvzip/c_source/lvzip.xcodeproj In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv9940 Modified Files: project.pbxproj Log Message: Removed references to gzio.c as that code is not used at all Index: project.pbxproj =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/lvzip.xcodeproj/project.pbxproj,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** project.pbxproj 17 Sep 2007 16:13:02 -0000 1.3 --- project.pbxproj 27 Feb 2008 19:11:34 -0000 1.4 *************** *** 41,45 **** 839542EC0894F2490020C3E2 /* inffixed.h in Headers */ = {isa = PBXBuildFile; fileRef = 839542B50894F2490020C3E2 /* inffixed.h */; }; 839542ED0894F2490020C3E2 /* infback.c in Sources */ = {isa = PBXBuildFile; fileRef = 839542B60894F2490020C3E2 /* infback.c */; }; - 839542EE0894F2490020C3E2 /* gzio.c in Sources */ = {isa = PBXBuildFile; fileRef = 839542B70894F2490020C3E2 /* gzio.c */; }; 839542EF0894F2490020C3E2 /* gvmat32c.c in Sources */ = {isa = PBXBuildFile; fileRef = 839542B80894F2490020C3E2 /* gvmat32c.c */; }; 839542F10894F2490020C3E2 /* adler32.c in Sources */ = {isa = PBXBuildFile; fileRef = 839542BA0894F2490020C3E2 /* adler32.c */; }; --- 41,44 ---- *************** *** 87,91 **** 839542B50894F2490020C3E2 /* inffixed.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = inffixed.h; sourceTree = "<group>"; }; 839542B60894F2490020C3E2 /* infback.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = infback.c; sourceTree = "<group>"; }; - 839542B70894F2490020C3E2 /* gzio.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = gzio.c; sourceTree = "<group>"; }; 839542B80894F2490020C3E2 /* gvmat32c.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = gvmat32c.c; sourceTree = "<group>"; }; 839542BA0894F2490020C3E2 /* adler32.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = adler32.c; sourceTree = "<group>"; }; --- 86,89 ---- *************** *** 181,185 **** 839542B50894F2490020C3E2 /* inffixed.h */, 839542B60894F2490020C3E2 /* infback.c */, - 839542B70894F2490020C3E2 /* gzio.c */, 839542B80894F2490020C3E2 /* gvmat32c.c */, 839542BA0894F2490020C3E2 /* adler32.c */, --- 179,182 ---- *************** *** 294,298 **** 839542EB0894F2490020C3E2 /* inflate.c in Sources */, 839542ED0894F2490020C3E2 /* infback.c in Sources */, - 839542EE0894F2490020C3E2 /* gzio.c in Sources */, 839542EF0894F2490020C3E2 /* gvmat32c.c in Sources */, 839542F10894F2490020C3E2 /* adler32.c in Sources */, --- 291,294 ---- |
|
From: Rolf K. <lab...@us...> - 2008-02-27 19:09:29
|
Update of /cvsroot/opengtoolkit/lvzip/c_source/lvzip.xcode In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv9074 Modified Files: project.pbxproj Log Message: Removed references to gzio.c as that code is not used at all Index: project.pbxproj =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/lvzip.xcode/project.pbxproj,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** project.pbxproj 17 Sep 2007 16:13:02 -0000 1.7 --- project.pbxproj 27 Feb 2008 19:09:25 -0000 1.8 *************** *** 322,333 **** sourceTree = "<group>"; }; - 839542B70894F2490020C3E2 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.c; - path = gzio.c; - refType = 4; - sourceTree = "<group>"; - }; 839542B80894F2490020C3E2 = { fileEncoding = 30; --- 322,325 ---- |
|
From: Jim K. <jk...@us...> - 2008-02-18 21:38:37
|
Update of /cvsroot/opengtoolkit/dynamicpalette In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv22320 Modified Files: ogrsc_dynamicpalette.spec Log Message: added support for LabVIEW 8.6 Index: ogrsc_dynamicpalette.spec =================================================================== RCS file: /cvsroot/opengtoolkit/dynamicpalette/ogrsc_dynamicpalette.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** ogrsc_dynamicpalette.spec 10 Mar 2007 18:47:33 -0000 1.8 --- ogrsc_dynamicpalette.spec 18 Feb 2008 21:38:39 -0000 1.9 *************** *** 3,7 **** Name=ogrsc_dynamicpalette ! Version=0.16 Release=1 --- 3,7 ---- Name=ogrsc_dynamicpalette ! Version=0.17 Release=1 *************** *** 31,35 **** [Platform] ! Exclusive_LabVIEW_Version="6.0, 6.1, 7.0, 7.1, 8.0, 8.1, 8.2, 8.5" Exclusive_LabVIEW_System=All --- 31,35 ---- [Platform] ! Exclusive_LabVIEW_Version="6.0, 6.1, 7.0, 7.1, 8.0, 8.1, 8.2, 8.5, 8.6" Exclusive_LabVIEW_System=All *************** *** 62,66 **** Replace Mode=Always ! Exclusive_LabVIEW_Version= 6.0, 6.1, 7.0, 7.1, 8.0, 8.1, 8.2, 8.5 Num Files=1 --- 62,66 ---- Replace Mode=Always ! Exclusive_LabVIEW_Version= 6.0, 6.1, 7.0, 7.1, 8.0, 8.1, 8.2, 8.5, 8.6 Num Files=1 *************** *** 78,82 **** Replace Mode=Always ! Exclusive_LabVIEW_Version= 8.0, 8.1, 8.2, 8.5 Num Files=1 --- 78,82 ---- Replace Mode=Always ! Exclusive_LabVIEW_Version= 8.0, 8.1, 8.2, 8.5, 8.6 Num Files=1 *************** *** 997,1001 **** Replace Mode=Always ! Exclusive_LabVIEW_Version= 7.1, 8.0, 8.1, 8.2, 8.5 Num Files=2 --- 997,1001 ---- Replace Mode=Always ! Exclusive_LabVIEW_Version= 7.1, 8.0, 8.1, 8.2, 8.5, 8.6 Num Files=2 *************** *** 1013,1017 **** Replace Mode=Always ! Exclusive_LabVIEW_Version= 7.1, 8.0, 8.1, 8.2, 8.5 Num Files=136 --- 1013,1017 ---- Replace Mode=Always ! Exclusive_LabVIEW_Version= 7.1, 8.0, 8.1, 8.2, 8.5, 8.6 Num Files=136 *************** *** 1163,1167 **** Replace Mode=Always ! Exclusive_LabVIEW_Version= 7.1, 8.0, 8.1, 8.2, 8.5 Num Files=2 --- 1163,1167 ---- Replace Mode=Always ! Exclusive_LabVIEW_Version= 7.1, 8.0, 8.1, 8.2, 8.5, 8.6 Num Files=2 *************** *** 1184,1188 **** Replace Mode=Always ! Exclusive_LabVIEW_Version= 7.1, 8.0, 8.1, 8.2, 8.5 Exclusive_OS=Windows NT --- 1184,1188 ---- Replace Mode=Always ! Exclusive_LabVIEW_Version= 7.1, 8.0, 8.1, 8.2, 8.5, 8.6 Exclusive_OS=Windows NT *************** *** 1202,1206 **** Replace Mode=Always ! Exclusive_LabVIEW_Version= 7.1, 8.0, 8.1, 8.2, 8.5 Exclusive_OS=Windows NT --- 1202,1206 ---- Replace Mode=Always ! Exclusive_LabVIEW_Version= 7.1, 8.0, 8.1, 8.2, 8.5, 8.6 Exclusive_OS=Windows NT *************** *** 1236,1240 **** Replace Mode=Always ! Exclusive_LabVIEW_Version= 7.1, 8.0, 8.1, 8.2, 8.5 Exclusive_OS=Mac OS --- 1236,1240 ---- Replace Mode=Always ! Exclusive_LabVIEW_Version= 7.1, 8.0, 8.1, 8.2, 8.5, 8.6 Exclusive_OS=Mac OS *************** *** 1254,1258 **** Replace Mode=Always ! Exclusive_LabVIEW_Version= 7.1, 8.0, 8.1, 8.2, 8.5 Exclusive_OS=Mac OS >= 1.0 --- 1254,1258 ---- Replace Mode=Always ! Exclusive_LabVIEW_Version= 7.1, 8.0, 8.1, 8.2, 8.5, 8.6 Exclusive_OS=Mac OS >= 1.0 *************** *** 1285,1289 **** Replace Mode=Always ! Exclusive_LabVIEW_Version= 7.1, 8.0, 8.1, 8.2, 8.5 Exclusive_OS=Linux --- 1285,1289 ---- Replace Mode=Always ! Exclusive_LabVIEW_Version= 7.1, 8.0, 8.1, 8.2, 8.5, 8.6 Exclusive_OS=Linux *************** *** 1303,1307 **** Replace Mode=Always ! Exclusive_LabVIEW_Version= 7.1, 8.0, 8.1, 8.2, 8.5 Exclusive_OS=Linux --- 1303,1307 ---- Replace Mode=Always ! Exclusive_LabVIEW_Version= 7.1, 8.0, 8.1, 8.2, 8.5, 8.6 Exclusive_OS=Linux *************** *** 1326,1330 **** Replace Mode=Always ! Exclusive_LabVIEW_Version= 8.0, 8.1, 8.2, 8.5 Num Files=1 --- 1326,1330 ---- Replace Mode=Always ! Exclusive_LabVIEW_Version= 8.0, 8.1, 8.2, 8.5, 8.6 Num Files=1 *************** *** 1347,1351 **** Replace Mode=Always ! Exclusive_LabVIEW_Version= 8.0, 8.1, 8.2, 8.5 Num Files=1 --- 1347,1351 ---- Replace Mode=Always ! Exclusive_LabVIEW_Version= 8.0, 8.1, 8.2, 8.5, 8.6 Num Files=1 *************** *** 1375,1379 **** Replace Mode=Always ! Exclusive_LabVIEW_Version= 8.0, 8.1, 8.2, 8.5 Num Files=2 --- 1375,1379 ---- Replace Mode=Always ! Exclusive_LabVIEW_Version= 8.0, 8.1, 8.2, 8.5, 8.6 Num Files=2 |
|
From: Rolf K. <lab...@us...> - 2008-01-25 09:53:21
|
Update of /cvsroot/opengtoolkit/lvzip/c_source In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv19171 Modified Files: lvzip.cws lvzip.prj Log Message: Modifications to better support compilation with LabWindows CVI Index: lvzip.prj =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/lvzip.prj,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** lvzip.prj 10 Dec 2007 13:47:36 -0000 1.2 --- lvzip.prj 25 Jan 2008 09:53:22 -0000 1.3 *************** *** 470,474 **** [Compiler Defines] ! Compiler Defines = "/DWIN32_LEAN_AND_MEAN /DNO_vsnprintf" [Create Executable] --- 470,474 ---- [Compiler Defines] ! Compiler Defines = "/DWIN32_LEAN_AND_MEAN /DNO_vsnprintf /DNO_DUMMY_DECL" [Create Executable] Index: lvzip.cws =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/lvzip.cws,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** lvzip.cws 14 Dec 2007 21:36:20 -0000 1.3 --- lvzip.cws 25 Jan 2008 09:53:22 -0000 1.4 *************** *** 8,16 **** Active Project = 1 Project 0001 = "lvzip.prj" ! Drag Bar Left = 160 ! Window Top = 59 ! Window Left = 29 ! Window Bottom = 1045 ! Window Right = 1565 Maximized = False Maximized Children = False --- 8,16 ---- Active Project = 1 Project 0001 = "lvzip.prj" ! Drag Bar Left = 316 ! Window Top = 487 ! Window Left = 15 ! Window Bottom = 1473 ! Window Right = 1551 Maximized = False Maximized Children = False *************** *** 26,32 **** Break At First Statement = False Sort Type = "File Name" ! Number of Opened Files = 1 Window Confinement Region Enabled = True ! MainColumnWidth = 141 FileDateColumnWidth = 70 FileSizeColumnWidth = 70 --- 26,32 ---- Break At First Statement = False Sort Type = "File Name" ! Number of Opened Files = 2 Window Confinement Region Enabled = True ! MainColumnWidth = 297 FileDateColumnWidth = 70 FileSizeColumnWidth = 70 *************** *** 46,54 **** Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/lvutil.c" File Type = "CSource" ! Disk Date = 3280430225 In Projects = "1," Window Top = 25 Window Left = 6 - Window Z-Order = 1 Source Window State = "1,0,0,0,0,0,0,0,0,80,0,0,0,0,0,25,0,0,0,0,349,676,1,0," --- 46,53 ---- Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/lvutil.c" File Type = "CSource" ! Disk Date = 3280743663 In Projects = "1," Window Top = 25 Window Left = 6 Source Window State = "1,0,0,0,0,0,0,0,0,80,0,0,0,0,0,25,0,0,0,0,349,676,1,0," *************** *** 180,184 **** Window Top = 23 Window Left = 176 ! Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,38,0,570,975,1,0," [File 0017] --- 179,183 ---- Window Top = 23 Window Left = 176 ! Source Window State = "1,0,0,0,0,0,0,0,0,118,0,0,0,0,0,42,121,0,142,24,570,975,1,0," [File 0017] *************** *** 254,258 **** Window Top = 48 Window Left = 18 ! Source Window State = "1,26,32,26,0,0,0,0,0,0,0,0,0,0,0,0,0,0,17,15,371,941,1,0," [File 0026] --- 253,258 ---- Window Top = 48 Window Left = 18 ! Window Z-Order = 1 ! Source Window State = "1,26,32,26,0,0,0,0,0,114,0,0,0,0,0,26,251,0,264,20,371,941,1,0," [File 0026] *************** *** 324,330 **** Disk Date = 3279812177 In Projects = "1," ! Window Top = 23 ! Window Left = 27 ! Source Window State = "1,235,235,235,11,24,11,0,0,0,0,0,0,0,0,0,190,0,200,39,545,823,1,0," [File 0034] --- 324,330 ---- Disk Date = 3279812177 In Projects = "1," ! Window Top = 50 ! Window Left = 26 ! Source Window State = "1,90,127,127,6,9,9,0,0,99,0,0,0,0,0,40,0,0,0,13,545,823,1,0," [File 0034] *************** *** 335,339 **** Window Top = 48 Window Left = 18 ! Source Window State = "1,196,196,196,4,18,4,0,0,0,0,0,0,0,0,0,180,0,193,0,378,1028,1,0," [File 0035] --- 335,339 ---- Window Top = 48 Window Left = 18 ! Source Window State = "1,196,196,196,4,18,4,0,0,124,0,0,0,0,0,27,180,0,193,0,378,1028,1,0," [File 0035] *************** *** 351,355 **** Window Top = 26 Window Left = 154 ! Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1330,0,1347,135,526,1136,1,0," [File 0037] --- 351,356 ---- Window Top = 26 Window Left = 154 ! Window Z-Order = 2 ! Source Window State = "1,1332,1350,1350,11,17,17,0,0,138,0,0,0,0,0,38,228,0,237,11,526,1136,1,0," [File 0037] *************** *** 369,373 **** Window Top = 25 Window Left = 6 ! Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,568,1016,1,0," [Build Options 0001] --- 370,374 ---- Window Top = 25 Window Left = 6 ! Source Window State = "1,0,0,0,0,0,0,0,0,123,0,0,0,0,0,41,0,0,10,10,568,1016,1,0," [Build Options 0001] |
|
From: Rolf K. <lab...@us...> - 2007-12-17 13:41:24
|
Update of /cvsroot/opengtoolkit/lvzip/c_source In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv19044 Modified Files: lvutil.c Log Message: Hopefully successful bugfix for long path names in MacOS Index: lvutil.c =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/lvutil.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** lvutil.c 14 Dec 2007 21:36:20 -0000 1.5 --- lvutil.c 17 Dec 2007 13:41:22 -0000 1.6 *************** *** 84,90 **** } ! static OSErr MakeFileSpec(int16 vol, int32 dirID, ConstStr255 path, FSSpec *fss) { ! OSErr err = FSMakeFSSpec(vol, dirID, path, fss); if (err) { --- 84,90 ---- } ! static OSErr MakeFileSpec(int16 vRefNum, int32 dirID, ConstStr255 path, FSSpec *fss) { ! OSErr err = FSMakeFSSpec(vRefNum, dirID, path, fss); if (err) { *************** *** 97,130 **** else if (bdNamErr == err) { ! /* MacOSX seems to return sometimes bdNamErr for longer absolute ! filenames, so we try to catch that too. */ ! FSSpec fst; Str255 temp; ! uChar *p; ! int32 i = 0; ! DEBUGPRINTF(("MakeFileSpec: trying with subpaths")); - /* remove the last elt of the path and see if we have success */ - PStrCpy(temp, path); - p = (uChar*)&temp[PStrLen(path)]; ! do { ! for (; p > temp; p--, i++) ! if (*p == ':') break; ! if (p <= temp) ! return err; ! PStrLen(temp) = PStrLen(path) - (i + 1); ! err = FSMakeFSSpec(vol, dirID, temp, &fst); if (err) ! DEBUGPRINTF(("FSMakeFSSpec: err2 = %ld, path = %p", err, temp)); ! } while (bdNamErr == err); ! if (!err || (fnfErr == err)) { ! PStrLen(p) = i; ! err = MakeFileSpec(fst.vRefNum, fst.parID, p, fss); ! if (err) ! DEBUGPRINTF(("MakeFileSpec: err = %ld, path = %p", err, p)); } } --- 97,178 ---- else if (bdNamErr == err) { ! /* MacOSX seems to return sometimes bdNamErr for longer filenames, ! so we try to catch that too. */ Str255 temp; ! DEBUGPRINTF(("MakeFileSpec: trying with subpaths")); ! if (!vRefNum) { ! HParamBlockRec hpb; ! ! hpb.volumeParam.ioVRefNum = vRefNum; ! if (path == NULL ) ! { ! hpb.volumeParam.ioNamePtr = NULL; ! hpb.volumeParam.ioVolIndex = 0; /* use ioVRefNum only */ ! } ! else ! { ! PStrCpy(temp, path); ! hpb.volumeParam.ioNamePtr = (StringPtr)temp; ! hpb.volumeParam.ioVolIndex = -1; /* use ioNamePtr/ioVRefNum combination */ ! } ! err = OSErrToLVErr(PBHGetVInfoSync(&hpb)); if (err) ! DEBUGPRINTF(("PBHGetVInfo: err = %ld", err)); ! else ! vRefNum = hpb.volumeParam.ioVRefNum; ! } ! if (vRefNum) { ! FSSpec fst; ! uChar *p; ! int32 i = 0; ! ! /* remove the last elt(s) of the path and see if we have success */ ! PStrCpy(temp, path); ! p = (uChar*)&temp[PStrLen(path)]; ! ! do ! { ! for (; p > temp; p--, i++) ! { ! if (*p == ':') ! { ! break; ! p--, i++; ! } ! } ! if (p <= temp) ! return err; ! PStrLen(temp) = PStrLen(path) - i; ! err = FSMakeFSSpec(vRefNum, dirID, temp, &fst); ! if (err) ! DEBUGPRINTF(("FSMakeFSSpec: err2 = %ld, path = %p", err, temp)); ! } while (bdNamErr == err); ! ! if (!err || (fnfErr == err)) ! { ! CInfoPBRec cpb; ! ! PStrLen(p) = i; ! ! memset(&cpb, 0, sizeof(CInfoPBRec)); ! cpb.hFileInfo.ioNamePtr = fst.name; ! cpb.hFileInfo.ioVRefNum = vRefNum; ! cpb.hFileInfo.ioDirID = fst.parID; ! cpb.dirInfo.ioFDirIndex = 0; /* use ioNamePtr and ioDirID */ ! err = OSErrToLVErr(PBGetCatInfoSync(&cpb)); ! if (err) ! DEBUGPRINTF(("PBGetCatInfo: err = %ld", err)); ! else ! { ! err = MakeFileSpec(vRefNum, cpb.dirInfo.ioDrDirID, p, fss); ! if (err) ! DEBUGPRINTF(("MakeFileSpec: err = %ld, path = %p", err, p)); ! } ! } } } |
|
From: Jim K. <jk...@us...> - 2007-12-16 00:18:52
|
Update of /cvsroot/opengtoolkit/lvzip/c_source/lvzip.xcodeproj In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv17229 Modified Files: .cvsignore Removed Files: jameskring.pbxuser Log Message: changed .cvsignore to ignore *.pbxuser instead of just .pbxuser Index: .cvsignore =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/lvzip.xcodeproj/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** .cvsignore 15 Sep 2007 21:21:44 -0000 1.1 --- .cvsignore 16 Dec 2007 00:18:55 -0000 1.2 *************** *** 1,2 **** .DS_Store ! .pbxuser \ No newline at end of file --- 1,2 ---- .DS_Store ! *.pbxuser \ No newline at end of file --- jameskring.pbxuser DELETED --- |
