opengtoolkit-svn Mailing List for OpenG Toolkit (Page 4)

Brought to you by: jgcode, jkring

opengtoolkit-svn — OpenG Toolkit SVN commits mailing list

You can subscribe to this list here.

2007	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec (2)
2008	Jan (7)	Feb (2)	Mar (32)	Apr (25)	May (11)	Jun (25)	Jul (5)	Aug (8)	Sep	Oct (8)	Nov (13)	Dec (17)
2009	Jan (34)	Feb (18)	Mar (4)	Apr	May (9)	Jun (1)	Jul (9)	Aug	Sep (12)	Oct	Nov (9)	Dec (1)
2010	Jan (1)	Feb (14)	Mar	Apr	May (4)	Jun (14)	Jul (4)	Aug	Sep	Oct	Nov (4)	Dec (225)
2011	Jan (17)	Feb	Mar	Apr (27)	May (24)	Jun (1)	Jul (3)	Aug (22)	Sep (24)	Oct (22)	Nov (6)	Dec (4)
2012	Jan	Feb	Mar	Apr	May	Jun	Jul (6)	Aug	Sep	Oct	Nov	Dec
2013	Jan	Feb	Mar (2)	Apr	May	Jun	Jul	Aug	Sep (2)	Oct	Nov	Dec
2014	Jan	Feb	Mar	Apr	May (4)	Jun	Jul (1)	Aug	Sep	Oct	Nov	Dec
2015	Jan	Feb (1)	Mar	Apr (8)	May (21)	Jun	Jul (2)	Aug	Sep (1)	Oct	Nov	Dec
2016	Jan	Feb	Mar (1)	Apr	May	Jun	Jul	Aug (1)	Sep (1)	Oct	Nov	Dec (1)
2017	Jan	Feb	Mar	Apr (2)	May	Jun	Jul	Aug	Sep (1)	Oct	Nov	Dec
2018	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov (1)	Dec (27)
2019	Jan	Feb	Mar	Apr	May	Jun	Jul (5)	Aug (7)	Sep (16)	Oct (3)	Nov	Dec

Flat | Threaded

<< < 1 2 3 4 5 6 .. 32 > >> (Page 4 of 32)

[Opengtoolkit-svn] SF.net SVN: opengtoolkit:[1525] trunk/lvzip

From: <lab...@us...> - 2015-05-06 17:23:53

Revision: 1525
          http://sourceforge.net/p/opengtoolkit/svn/1525
Author:   labviewer
Date:     2015-05-06 17:23:50 +0000 (Wed, 06 May 2015)
Log Message:
-----------
Fix an error when checking if a file has a resource data

Modified Paths:
--------------
    trunk/lvzip/c_source/lvutil.c
    trunk/lvzip/source/lvzlib.framework.zip

Modified: trunk/lvzip/c_source/lvutil.c
===================================================================
--- trunk/lvzip/c_source/lvutil.c	2015-05-06 16:15:31 UTC (rev 1524)
+++ trunk/lvzip/c_source/lvutil.c	2015-05-06 17:23:50 UTC (rev 1525)
@@ -539,7 +539,7 @@
     if (!err)
     {
         ssize_t len = getxattr((const char)LStrBuf(*lstr), XATTR_RESOURCEFORK_NAME, NULL, 0, 0, O_NOFOLLOW);
-        if (len)
+        if (len != -1)
         {
             if (hasResFork)
                 *hasResFork = LV_TRUE;

Modified: trunk/lvzip/source/lvzlib.framework.zip
===================================================================
(Binary files differ)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opengtoolkit-svn] SF.net SVN: opengtoolkit:[1524] trunk/lvzip/c_source/lvapi.c

From: <lab...@us...> - 2015-05-06 16:15:33

Revision: 1524
          http://sourceforge.net/p/opengtoolkit/svn/1524
Author:   labviewer
Date:     2015-05-06 16:15:31 +0000 (Wed, 06 May 2015)
Log Message:
-----------
Add version information about the LabVIEW wrapper too

Modified Paths:
--------------
    trunk/lvzip/c_source/lvapi.c

Modified: trunk/lvzip/c_source/lvapi.c
===================================================================
--- trunk/lvzip/c_source/lvapi.c	2015-05-06 16:08:15 UTC (rev 1523)
+++ trunk/lvzip/c_source/lvapi.c	2015-05-06 16:15:31 UTC (rev 1524)
@@ -144,9 +144,12 @@
 	return err;
 }
 
+static char version[250];
+
 LibAPI(const char *) lvzlib_zlibVersion(void)
 {
-	return zlibVersion();
+    snprintf(version, sizeof(version), "LabVIEW ZIP library, version: 4.1\nzlib version: %s", zlibVersion());
+    return version;
 }
 
 LibAPI(int) lvzlib_compress(Bytef *dest, uLongf *destLen,

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opengtoolkit-svn] SF.net SVN: opengtoolkit:[1523] trunk/lvzip/c_source

From: <lab...@us...> - 2015-05-06 16:08:18

Revision: 1523
          http://sourceforge.net/p/opengtoolkit/svn/1523
Author:   labviewer
Date:     2015-05-06 16:08:15 +0000 (Wed, 06 May 2015)
Log Message:
-----------
Make code compile on Mac

Modified Paths:
--------------
    trunk/lvzip/c_source/lvutil.c
    trunk/lvzip/c_source/lvutil.h

Modified: trunk/lvzip/c_source/lvutil.c
===================================================================
--- trunk/lvzip/c_source/lvutil.c	2015-05-03 19:14:24 UTC (rev 1522)
+++ trunk/lvzip/c_source/lvutil.c	2015-05-06 16:08:15 UTC (rev 1523)
@@ -178,15 +178,15 @@
 	if (!hfsPath)
 		return mgArgErr;
 
-    if (*hsfPath)
-        LStrLen(**hsfPath) = 0;
+    if (*hfsPath)
+        LStrLen(**hfsPath) = 0;
 
-    urlRef = CFURLCreateFromFileSystemRepresentation(NULL, posixPath, len, false);
+    urlRef = CFURLCreateFromFileSystemRepresentation(NULL, posixPath, len, isDir);
     if (!urlRef)
     {
 		return mFullErr;
 	}
-    hsfRef = CFURLCopyFileSystemPath(urlRef, kCFURLHFSPathStyle);
+    hfsRef = CFURLCopyFileSystemPath(urlRef, kCFURLHFSPathStyle);
     CFRelease(urlRef);
     if (hfsRef)
     {
@@ -199,7 +199,7 @@
 				err = NumericArrayResize(uB, 1, (UHandle*)hfsPath, len + 1);
 				if (!err)
 				{
-					if (CFStringGetBytes(hsfRef, range, encoding, 0, false, LStrBuf(**hfsPath), len, &len) > 0)
+					if (CFStringGetBytes(hfsRef, range, encoding, 0, false, LStrBuf(**hfsPath), len, &len) > 0)
 					{
 						LStrBuf(**hfsPath)[len] = 0;
 						LStrLen(**hfsPath) = len;
@@ -970,12 +970,12 @@
 {
 	MgErr err = mgNoErr;
 #if usesHFSPath
-	LStrHandle hsfPath = NULL;
+	LStrHandle hfsPath = NULL;
 	/* Convert the posix path to an HFS path */
 	err = ConvertFromPosixPath(str, len, &hfsPath, isDir);
 	if (!err)
 	{
-		err = FTextToPath(LStrBuf(*hfsPath), LStrLen(*hsfPath), path);
+		err = FTextToPath(LStrBuf(*hfsPath), LStrLen(*hfsPath), path);
 	}
 #else
 	Unused(isDir);

Modified: trunk/lvzip/c_source/lvutil.h
===================================================================
--- trunk/lvzip/c_source/lvutil.h	2015-05-03 19:14:24 UTC (rev 1522)
+++ trunk/lvzip/c_source/lvutil.h	2015-05-06 16:08:15 UTC (rev 1523)
@@ -616,6 +616,7 @@
 
 /* Convert the path into a string representation for the current platform */
 LibAPI(MgErr) LVPath_ToText(Path path, LStrHandle *str);
+LibAPI(MgErr) LVPath_FromText(CStr str, int32 len, Path *path, LVBoolean isDir);
 
 /* Check if the file path points to has a resource fork */
 LibAPI(MgErr) LVPath_HasResourceFork(Path path, LVBoolean *hasResFork, uInt32 *sizeLow, uInt32 *sizeHigh);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opengtoolkit-svn] SF.net SVN: opengtoolkit:[1522] trunk/lvzip/c_source/lvutil.c

From: <lab...@us...> - 2015-05-03 19:14:27

Revision: 1522
          http://sourceforge.net/p/opengtoolkit/svn/1522
Author:   labviewer
Date:     2015-05-03 19:14:24 +0000 (Sun, 03 May 2015)
Log Message:
-----------
Silence some compile warnings on unix 

Modified Paths:
--------------
    trunk/lvzip/c_source/lvutil.c

Modified: trunk/lvzip/c_source/lvutil.c
===================================================================
--- trunk/lvzip/c_source/lvutil.c	2015-05-03 18:50:52 UTC (rev 1521)
+++ trunk/lvzip/c_source/lvutil.c	2015-05-03 19:14:24 UTC (rev 1522)
@@ -1059,8 +1059,8 @@
     {
 #if MacOSX || Unix
         struct stat st;
-        char *buf;
-        int len;
+        char *buf = NULL;
+        int len = 0;
 
         if (lstat((const char*)LStrBuf(*src), &st))
         {
@@ -1085,7 +1085,7 @@
             }
             else if (retval < len)
             {
-				err = LVPath_FromText(buf, retval, target, LV_FALSE);
+				err = LVPath_FromText((CStr)buf, retval, target, LV_FALSE);
                 free(buf);
                 break;
             }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opengtoolkit-svn] SF.net SVN: opengtoolkit:[1521] trunk/lvzip/c_source

From: <lab...@us...> - 2015-05-03 18:50:54

Revision: 1521
          http://sourceforge.net/p/opengtoolkit/svn/1521
Author:   labviewer
Date:     2015-05-03 18:50:52 +0000 (Sun, 03 May 2015)
Log Message:
-----------
implemented the Windows side of links

Modified Paths:
--------------
    trunk/lvzip/c_source/lvutil.c
    trunk/lvzip/c_source/lvutil.h

Modified: trunk/lvzip/c_source/lvutil.c
===================================================================
--- trunk/lvzip/c_source/lvutil.c	2015-05-03 15:20:13 UTC (rev 1520)
+++ trunk/lvzip/c_source/lvutil.c	2015-05-03 18:50:52 UTC (rev 1521)
@@ -168,6 +168,58 @@
     return err;
 }
 
+static MgErr ConvertFromPosixPath(ConstCStr posixPath, int32 len, LStrHandle *hfsPath, Boolean isDir)
+{
+    MgErr err = mFullErr;
+    CFURLRef urlRef = NULL;
+    CFStringRef hfsRef;
+    uInt32 encoding = CFStringGetSystemEncoding();
+
+	if (!hfsPath)
+		return mgArgErr;
+
+    if (*hsfPath)
+        LStrLen(**hsfPath) = 0;
+
+    urlRef = CFURLCreateFromFileSystemRepresentation(NULL, posixPath, len, false);
+    if (!urlRef)
+    {
+		return mFullErr;
+	}
+    hsfRef = CFURLCopyFileSystemPath(urlRef, kCFURLHFSPathStyle);
+    CFRelease(urlRef);
+    if (hfsRef)
+    {
+		CFIndex len;
+		CFRange range = CFRangeMake(0, CFStringGetLength(hfsRef));
+		if (CFStringGetBytes(hfsRef, range, encoding, 0, false, NULL, 0, &len) > 0)
+		{
+			if (len > 0)
+			{
+				err = NumericArrayResize(uB, 1, (UHandle*)hfsPath, len + 1);
+				if (!err)
+				{
+					if (CFStringGetBytes(hsfRef, range, encoding, 0, false, LStrBuf(**hfsPath), len, &len) > 0)
+					{
+						LStrBuf(**hfsPath)[len] = 0;
+						LStrLen(**hfsPath) = len;
+					}
+					else
+					{
+						err = bogusError;
+					}
+				}
+			}
+		}
+		else
+		{
+			err = bogusError;
+		}
+        CFRelease(hfsRef);
+    }
+    return err;
+}
+
 static MgErr FSMakePathRef(Path path, FSRef *ref)
 {
 	LStrHandle str = NULL;
@@ -914,6 +966,24 @@
 	return err;
 }
 
+LibAPI(MgErr) LVPath_FromText(CStr str, int32 len, Path *path, LVBoolean isDir)
+{
+	MgErr err = mgNoErr;
+#if usesHFSPath
+	LStrHandle hsfPath = NULL;
+	/* Convert the posix path to an HFS path */
+	err = ConvertFromPosixPath(str, len, &hfsPath, isDir);
+	if (!err)
+	{
+		err = FTextToPath(LStrBuf(*hfsPath), LStrLen(*hsfPath), path);
+	}
+#else
+	Unused(isDir);
+	err = FTextToPath(str, len, path);
+#endif
+	return err;
+}
+
 LibAPI(MgErr) LVPath_CreateLink(Path path, uInt32 flags, Path target)
 {
     MgErr err = mgNoErr;
@@ -954,7 +1024,7 @@
                 {
                     if (flags & kLinkDir)
                         err = mgNotSupported;
-                    else if (!CreateHardLinkA(LStrBuf(*src), LStrBuf(*tgt), NULL)
+                    else if (!CreateHardLinkA(LStrBuf(*src), LStrBuf(*tgt), NULL))
                     {
                         err = Win32ToLVFileErr();
                     }
@@ -974,6 +1044,8 @@
     return err;
 }
 
+#define PREPARSE_DATA_BUFFER_SIZE 16*1024
+
 LibAPI(MgErr) LVPath_ReadLink(Path path, Path *target)
 {
     MgErr err = mgNoErr;
@@ -1013,7 +1085,7 @@
             }
             else if (retval < len)
             {
-
+				err = LVPath_FromText(buf, retval, target, LV_FALSE);
                 free(buf);
                 break;
             }
@@ -1021,28 +1093,64 @@
             buf = realloc(buf, len);
         }
 #elif Win32
-        if (GetFileAttributes(fpath) & REPARSE_FOLDER == REPARSE_FOLDER)
+        if ((GetFileAttributesA(LStrBuf(*src)) & REPARSE_FOLDER) == REPARSE_FOLDER)
         {
-            // Open the file correctly depending on the string type.
-            HANDLE handle = CreateFileA(fpath, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_FLAG_OPEN_REPARSE_POINT, 0);
+			PREPARSE_DATA_BUFFER buffer = NULL;
+            // Open the target file
+            HANDLE handle = CreateFileA(LStrBuf(*src), GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_FLAG_OPEN_REPARSE_POINT, NULL);
+            if (handle != INVALID_HANDLE_VALUE)
+			{
+				DWORD bytes;
+				// Maximum REPARSE_DATA_BUFFER_SIZE = 16384 = (16*1024)
+                buffer = (PREPARSE_DATA_BUFFER)malloc(PREPARSE_DATA_BUFFER_SIZE);
+				if (DeviceIoControl(handle, FSCTL_GET_REPARSE_POINT, NULL, 0, buffer, PREPARSE_DATA_BUFFER_SIZE, &bytes, NULL))
+                    err = Win32ToLVFileErr();
+
+				if (bytes < 9)
+					err = fEOF;
+
+                // Close the handle to our file so we're not locking it anymore.
+                CloseHandle(handle);
+			}
+			else
+			{
+                err = Win32ToLVFileErr();
+			}
             
-            // MAXIMUM_REPARSE_DATA_BUFFER_SIZE = 16384 = (16*1024)
-            buffer = DeviceIoControl(handle, FSCTL_GET_REPARSE_POINT, NULL, 16*1024)
-            // Above will return an ugly string (byte array), so we'll need to parse it.
-            // But first, we'll close the handle to our file so we're not locking it anymore.
-            CloseHandle(handle)
-            
-            // Minimum possible length (assuming that the length of the target is bigger than 0)
-            if len(buffer) < 9:
-                return None
-            // Parse and return our result.
-            result = parse_reparse_buffer(buffer)
-            offset = result[SYMBOLIC_LINK]['substitute_name_offset']
-            ending = offset + result[SYMBOLIC_LINK]['substitute_name_length']
-            rpath = result[SYMBOLIC_LINK]['buffer'][offset:ending].replace('\x00','')
-            if len(rpath) > 4 and rpath[0:4] == '\\??\\':
-                rpath = rpath[4:]
-                return rpath;
+			if (!err)
+			{
+				PWCHAR start;
+				USHORT length;
+				int32 numBytes;
+				LStrHandle dest = NULL;
+
+				switch (buffer->ReparseTag)
+				{
+				    case IO_REPARSE_TAG_SYMLINK:
+						start = (PWCHAR)((char)buffer->SymbolicLinkReparseBuffer.PathBuffer + buffer->SymbolicLinkReparseBuffer.SubstituteNameOffset);
+						length = buffer->SymbolicLinkReparseBuffer.SubstituteNameLength / sizeof(WCHAR);
+						break;
+					default:
+						start = (PWCHAR)((char)buffer->MountPointReparseBuffer.PathBuffer + buffer->MountPointReparseBuffer.SubstituteNameOffset);
+						length = buffer->SymbolicLinkReparseBuffer.SubstituteNameLength / sizeof(WCHAR);
+						break;
+				}
+				// Skip possible path prefix
+				if (length > 4 && !CompareStringW(LOCALE_SYSTEM_DEFAULT, 0, start, 4, L"\\\\??\\", 4));
+				    start += 4;
+		
+				numBytes = WideCharToMultiByte(CP_ACP, 0, start, length, NULL, 0, NULL, NULL);
+				if (numBytes > 0 && numBytes <= PREPARSE_DATA_BUFFER_SIZE)
+				{ 
+					numBytes = WideCharToMultiByte(CP_ACP, 0, start, length, (LPSTR)buffer, numBytes, NULL, NULL);
+					if (numBytes > 0)
+					{ 
+						err = LVPath_FromText((CStr)buffer, numBytes, target, LV_FALSE);
+					}
+				}
+			}
+			if (buffer)
+				free(buffer);
         }
 #else
         err = mgNotSupported;

Modified: trunk/lvzip/c_source/lvutil.h
===================================================================
--- trunk/lvzip/c_source/lvutil.h	2015-05-03 15:20:13 UTC (rev 1520)
+++ trunk/lvzip/c_source/lvutil.h	2015-05-03 18:50:52 UTC (rev 1521)
@@ -543,6 +543,7 @@
 Path FNotAPath(Path);
 Bool32 FIsAPath(Path path);
 Bool32 FIsAbsPath(Path path);
+MgErr FTextToPath(UPtr str, int32 len, Path* path);
 MgErr FPathToText(Path path, LStrPtr lstr);
 MgErr FPathToPath(Path *p);
 Bool32 FIsAPathOfType(Path path, int32 ofType);
@@ -556,6 +557,7 @@
 MgErr FNewRefNum(Path path, File fd, LVRefNum* refnum);
 Bool32 FIsARefNum(LVRefNum);
 MgErr FDisposeRefNum(LVRefNum);
+Bool32 FExists(ConstPath path);
 MgErr FRefNumToFD(LVRefNum, File*);
 MgErr FGetInfo(ConstPath path, FInfoPtr infop);
 MgErr FGetInfo64(ConstPath path, FInfo64Ptr infop, FGetInfoWhich which);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opengtoolkit-svn] SF.net SVN: opengtoolkit:[1520] trunk/lvzip/source

From: <lab...@us...> - 2015-05-03 15:20:15

Revision: 1520
          http://sourceforge.net/p/opengtoolkit/svn/1520
Author:   labviewer
Date:     2015-05-03 15:20:13 +0000 (Sun, 03 May 2015)
Log Message:
-----------
Revert to old LV version

Modified Paths:
--------------
    trunk/lvzip/source/fileutil.llb/FILE Copy Fork From File.vi
    trunk/lvzip/source/fileutil.llb/FILE Copy Fork To File.vi
    trunk/lvzip/source/fileutil.llb/FILE Get Directory Content.vi
    trunk/lvzip/source/fileutil.llb/FILE Open File Refnum.vi
    trunk/lvzip/source/fileutil.llb/FILE Resource File Info.vi
    trunk/lvzip/source/fileutil.llb/FILE Resource Header.ctl
    trunk/lvzip/source/fileutil.llb/FILE Size Padding.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Block Size.vi
    trunk/lvzip/source/lvzip.llb/ZLIB CRC32.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Close Read File.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Close Unzip Archive.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Close Write File.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Close Zip Archive.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Common Path to Specific Path.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Compress Directory.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Compress File Info.ctl
    trunk/lvzip/source/lvzip.llb/ZLIB Convert File Info.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Deflate.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Delete Files From Archive.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Enumerate File Contents.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Extract All Files To Dir.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Extract File.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Extract Stream.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Extract.vi
    trunk/lvzip/source/lvzip.llb/ZLIB File Info.ctl
    trunk/lvzip/source/lvzip.llb/ZLIB File Information.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Get Current File Info.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Get File CRC32.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Get File.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Get Global Info.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Go To First File.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Go To Next File.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Inflate.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Initialize File Functions.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Initialize Stream Functions.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Locate File.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Move Raw File.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Open Read File.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Open Unzip Archive.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Open Unzip Stream.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Open Unzip.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Open Write File.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Open ZIP Mode.ctl
    trunk/lvzip/source/lvzip.llb/ZLIB Open Zip Archive.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Open Zip Stream.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Open Zip.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Path to Path String.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Read Compressed File.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Read Compressed Stream.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Read Local Extra Data.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Specific Path to Common Path.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Store File.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Store Stream.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Store.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Transfer Raw File.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Uncompress File Info.ctl
    trunk/lvzip/source/lvzip.llb/ZLIB Unzip Handle.ctl
    trunk/lvzip/source/lvzip.llb/ZLIB Write File.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Write Stream.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Zip Handle.ctl
    trunk/lvzip/source/macbin.llb/MACBIN CCITT_CRC16.vi
    trunk/lvzip/source/macbin.llb/MACBIN Create Header.vi
    trunk/lvzip/source/macbin.llb/MACBIN Decode MacBinary.vi
    trunk/lvzip/source/macbin.llb/MACBIN Encode MacBinary.vi
    trunk/lvzip/source/macbin.llb/MACBIN Macbinary Header.ctl
    trunk/lvzip/source/macbin.llb/MACBIN Read Header.vi
    trunk/lvzip/source/macbin.llb/MACBIN Resource File Info.vi
    trunk/lvzip/source/macbin.llb/MACBIN Verify Header.vi

Modified: trunk/lvzip/source/fileutil.llb/FILE Copy Fork From File.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/fileutil.llb/FILE Copy Fork To File.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/fileutil.llb/FILE Get Directory Content.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/fileutil.llb/FILE Open File Refnum.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/fileutil.llb/FILE Resource File Info.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/fileutil.llb/FILE Resource Header.ctl
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/fileutil.llb/FILE Size Padding.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Block Size.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB CRC32.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Close Read File.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Close Unzip Archive.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Close Write File.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Close Zip Archive.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Common Path to Specific Path.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Compress Directory.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Compress File Info.ctl
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Convert File Info.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Deflate.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Delete Files From Archive.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Enumerate File Contents.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Extract All Files To Dir.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Extract File.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Extract Stream.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Extract.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB File Info.ctl
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB File Information.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Get Current File Info.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Get File CRC32.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Get File.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Get Global Info.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Go To First File.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Go To Next File.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Inflate.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Initialize File Functions.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Initialize Stream Functions.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Locate File.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Move Raw File.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Open Read File.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Open Unzip Archive.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Open Unzip Stream.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Open Unzip.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Open Write File.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Open ZIP Mode.ctl
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Open Zip Archive.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Open Zip Stream.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Open Zip.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Path to Path String.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Read Compressed File.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Read Compressed Stream.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Read Local Extra Data.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Specific Path to Common Path.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Store File.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Store Stream.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Store.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Transfer Raw File.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Uncompress File Info.ctl
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Unzip Handle.ctl
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Write File.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Write Stream.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Zip Handle.ctl
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/macbin.llb/MACBIN CCITT_CRC16.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/macbin.llb/MACBIN Create Header.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/macbin.llb/MACBIN Decode MacBinary.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/macbin.llb/MACBIN Encode MacBinary.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/macbin.llb/MACBIN Macbinary Header.ctl
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/macbin.llb/MACBIN Read Header.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/macbin.llb/MACBIN Resource File Info.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/macbin.llb/MACBIN Verify Header.vi
===================================================================
(Binary files differ)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opengtoolkit-svn] SF.net SVN: opengtoolkit:[1519] trunk/lvzip

From: <lab...@us...> - 2015-05-03 15:15:58

Revision: 1519
          http://sourceforge.net/p/opengtoolkit/svn/1519
Author:   labviewer
Date:     2015-05-03 15:15:55 +0000 (Sun, 03 May 2015)
Log Message:
-----------
Add some preliminary support for link handling

Modified Paths:
--------------
    trunk/lvzip/c_source/lvutil.c
    trunk/lvzip/c_source/lvutil.h
    trunk/lvzip/source/fileutil.llb/FILE Copy Fork From File.vi
    trunk/lvzip/source/fileutil.llb/FILE Copy Fork To File.vi
    trunk/lvzip/source/fileutil.llb/FILE Get Directory Content.vi
    trunk/lvzip/source/fileutil.llb/FILE Open File Refnum.vi
    trunk/lvzip/source/fileutil.llb/FILE Resource File Info.vi
    trunk/lvzip/source/fileutil.llb/FILE Resource Header.ctl
    trunk/lvzip/source/fileutil.llb/FILE Size Padding.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Block Size.vi
    trunk/lvzip/source/lvzip.llb/ZLIB CRC32.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Close Read File.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Close Unzip Archive.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Close Write File.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Close Zip Archive.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Common Path to Specific Path.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Compress Directory.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Compress File Info.ctl
    trunk/lvzip/source/lvzip.llb/ZLIB Convert File Info.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Deflate.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Delete Files From Archive.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Enumerate File Contents.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Extract All Files To Dir.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Extract File.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Extract Stream.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Extract.vi
    trunk/lvzip/source/lvzip.llb/ZLIB File Info.ctl
    trunk/lvzip/source/lvzip.llb/ZLIB File Information.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Get Current File Info.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Get File CRC32.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Get File.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Get Global Info.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Go To First File.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Go To Next File.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Inflate.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Initialize File Functions.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Initialize Stream Functions.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Locate File.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Move Raw File.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Open Read File.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Open Unzip Archive.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Open Unzip Stream.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Open Unzip.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Open Write File.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Open ZIP Mode.ctl
    trunk/lvzip/source/lvzip.llb/ZLIB Open Zip Archive.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Open Zip Stream.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Open Zip.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Path to Path String.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Read Compressed File.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Read Compressed Stream.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Read Local Extra Data.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Specific Path to Common Path.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Store File.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Store Stream.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Store.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Transfer Raw File.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Uncompress File Info.ctl
    trunk/lvzip/source/lvzip.llb/ZLIB Unzip Handle.ctl
    trunk/lvzip/source/lvzip.llb/ZLIB Write File.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Write Stream.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Zip Handle.ctl
    trunk/lvzip/source/macbin.llb/MACBIN CCITT_CRC16.vi
    trunk/lvzip/source/macbin.llb/MACBIN Create Header.vi
    trunk/lvzip/source/macbin.llb/MACBIN Decode MacBinary.vi
    trunk/lvzip/source/macbin.llb/MACBIN Encode MacBinary.vi
    trunk/lvzip/source/macbin.llb/MACBIN Macbinary Header.ctl
    trunk/lvzip/source/macbin.llb/MACBIN Read Header.vi
    trunk/lvzip/source/macbin.llb/MACBIN Resource File Info.vi
    trunk/lvzip/source/macbin.llb/MACBIN Verify Header.vi
    trunk/lvzip/tests/lvzip-test add to empty archive.vi
    trunk/lvzip/tests/lvzip-test-delete files from archive.vi
    trunk/lvzip/tests/lvzip-test-memory stream.vi
    trunk/lvzip/tests/lvzip-test-sm text files.vi
    trunk/lvzip/tests/lvzip-test-string compress.vi

Modified: trunk/lvzip/c_source/lvutil.c
===================================================================
--- trunk/lvzip/c_source/lvutil.c	2015-05-03 11:21:46 UTC (rev 1518)
+++ trunk/lvzip/c_source/lvutil.c	2015-05-03 15:15:55 UTC (rev 1519)
@@ -32,6 +32,37 @@
  #ifndef INVALID_FILE_ATTRIBUTES
   #define INVALID_FILE_ATTRIBUTES ((DWORD)-1)
  #endif
+ #define REPARSE_FOLDER (FILE_ATTRIBUTE_DIRECTORY | FILE_ATTRIBUTE_REPARSE_POINT)
+ typedef struct _REPARSE_DATA_BUFFER
+ {
+    ULONG  ReparseTag;
+    USHORT ReparseDataLength;
+    USHORT Reserved;
+    union
+    {
+        struct
+        {
+            USHORT SubstituteNameOffset;
+            USHORT SubstituteNameLength;
+            USHORT PrintNameOffset;
+            USHORT PrintNameLength;
+            ULONG Flags;
+            WCHAR PathBuffer[1];
+        } SymbolicLinkReparseBuffer;
+        struct
+        {
+            USHORT SubstituteNameOffset;
+            USHORT SubstituteNameLength;
+            USHORT PrintNameOffset;
+            USHORT PrintNameLength;
+            WCHAR PathBuffer[1];
+        } MountPointReparseBuffer;
+        struct
+        {
+            UCHAR  DataBuffer[1];
+        } GenericReparseBuffer;
+    } DUMMYUNIONNAME;
+ } REPARSE_DATA_BUFFER, *PREPARSE_DATA_BUFFER;
 #elif Unix
  #include <errno.h>
  #include <dirent.h>
@@ -307,7 +338,7 @@
 }
 #endif
 
-#if usesPosixPath
+#if MacOSX || Unix
 static MgErr UnixToLVFileErr(void)
 {
     switch (errno)
@@ -883,6 +914,145 @@
 	return err;
 }
 
+LibAPI(MgErr) LVPath_CreateLink(Path path, uInt32 flags, Path target)
+{
+    MgErr err = mgNoErr;
+    LStrHandle src = NULL;
+    LStrHandle tgt = NULL;
+
+    if (!FIsAbsPath(path))
+        return mgArgErr;
+
+    err = LVPath_ToText(path, &src);
+    if (!err)
+    {
+        err = LVPath_ToText(target, &tgt);
+        if (!err)
+        {
+#if MacOSX || Unix
+            if (flags & kLinkHard)
+            {
+                if (link((const char*)LStrBuf(*src), (const char*)LStrBuf(*tgt)))
+                    err = UnixToLVFileErr();
+            }
+            else
+            {
+                if (symlink((const char*)LStrBuf(*src), (const char*)LStrBuf(*tgt)))
+                    err = UnixToLVFileErr();
+            }
+#elif Win32
+            if (FExists(target))
+            {
+                FInfoRec finfo;
+                err = FGetInfo(target, &finfo);
+                if (!err && finfo.folder)
+                    flags |= kLinkDir;
+            }
+            if (!err)
+            {
+                if (flags & kLinkHard)
+                {
+                    if (flags & kLinkDir)
+                        err = mgNotSupported;
+                    else if (!CreateHardLinkA(LStrBuf(*src), LStrBuf(*tgt), NULL)
+                    {
+                        err = Win32ToLVFileErr();
+                    }
+                }
+                else if (!CreateSymbolicLinkA(LStrBuf(*src), LStrBuf(*tgt), flags & kLinkDir ? SYMBOLIC_LINK_FLAG_DIRECTORY : 0))
+                {
+                    err = Win32ToLVFileErr();
+                }
+            }
+#else
+            err = mgNotSupported;
+#endif
+            DSDisposeHandle((UHandle)tgt);
+        }
+        DSDisposeHandle((UHandle)src);
+    }
+    return err;
+}
+
+LibAPI(MgErr) LVPath_ReadLink(Path path, Path *target)
+{
+    MgErr err = mgNoErr;
+    LStrHandle src = NULL;
+
+    if (!FIsAbsPath(path))
+        return mgArgErr;
+
+    err = LVPath_ToText(path, &src);
+    if (!err)
+    {
+#if MacOSX || Unix
+        struct stat st;
+        char *buf;
+        int len;
+
+        if (lstat((const char*)LStrBuf(*src), &st))
+        {
+            err = UnixToLVFileErr();
+        }
+        else
+        {
+            len = st.st_size + 1;
+            buf = malloc(len);
+            if (!buf)
+            {
+                err = mFullErr;
+            }
+        }
+        
+        while (!err)
+        {
+            ssize_t retval = readlink((const char*)LStrBuf(*src), buf, len);
+            if (retval < 0)
+            {
+                err = UnixToLVFileErr();
+            }
+            else if (retval < len)
+            {
+
+                free(buf);
+                break;
+            }
+            len += len;
+            buf = realloc(buf, len);
+        }
+#elif Win32
+        if (GetFileAttributes(fpath) & REPARSE_FOLDER == REPARSE_FOLDER)
+        {
+            // Open the file correctly depending on the string type.
+            HANDLE handle = CreateFileA(fpath, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_FLAG_OPEN_REPARSE_POINT, 0);
+            
+            // MAXIMUM_REPARSE_DATA_BUFFER_SIZE = 16384 = (16*1024)
+            buffer = DeviceIoControl(handle, FSCTL_GET_REPARSE_POINT, NULL, 16*1024)
+            // Above will return an ugly string (byte array), so we'll need to parse it.
+            // But first, we'll close the handle to our file so we're not locking it anymore.
+            CloseHandle(handle)
+            
+            // Minimum possible length (assuming that the length of the target is bigger than 0)
+            if len(buffer) < 9:
+                return None
+            // Parse and return our result.
+            result = parse_reparse_buffer(buffer)
+            offset = result[SYMBOLIC_LINK]['substitute_name_offset']
+            ending = offset + result[SYMBOLIC_LINK]['substitute_name_length']
+            rpath = result[SYMBOLIC_LINK]['buffer'][offset:ending].replace('\x00','')
+            if len(rpath) > 4 and rpath[0:4] == '\\??\\':
+                rpath = rpath[4:]
+                return rpath;
+        }
+#else
+        err = mgNotSupported;
+#endif
+        DSDisposeHandle((UHandle)src);
+    }
+    return err;
+}
+
+
 static MgErr lvfile_CloseFile(FileRefNum ioRefNum)
 {
 	MgErr err = mgNoErr;

Modified: trunk/lvzip/c_source/lvutil.h
===================================================================
--- trunk/lvzip/c_source/lvutil.h	2015-05-03 11:21:46 UTC (rev 1518)
+++ trunk/lvzip/c_source/lvutil.h	2015-05-03 15:15:55 UTC (rev 1519)
@@ -310,7 +310,7 @@
     int16 h;
 } LVPoint;
 
-typedef uChar        Str255[256], *PStr, *CStr, *UPtr, **UHandle;
+typedef uChar        Str255[256], *PStr, *CStr, *UPtr, **UHandle, **PStrHandle;
 typedef const uChar  *ConstCStr, *ConstPStr, *ConstUPtr, ConstStr255[256];
 
 #define PStrBuf(b)  (&((PStr)(b))[1])
@@ -531,14 +531,28 @@
 #define kNotARefNum ((LVRefNum)0L)	/* canonical invalid magic cookie */
 
 /* LabVIEW exported functions */
+MgErr FRelPath(ConstPath start, ConstPath end, Path relPath);
+MgErr FAddPath(ConstPath basePath, ConstPath relPath, Path newPath);
+MgErr FAppendName(Path path, ConstPStr name);
+MgErr FName(ConstPath path, PStrHandle name);
+MgErr FNamePtr(ConstPath path, PStr name);
+MgErr FDirName(ConstPath path, Path dir);
+MgErr FVolName(ConstPath path, Path vol);
+Path FMakePath(Path path, int32 type, ...);
+Path FEmptyPath(Path);
+Path FNotAPath(Path);
 Bool32 FIsAPath(Path path);
+Bool32 FIsAbsPath(Path path);
 MgErr FPathToText(Path path, LStrPtr lstr);
 MgErr FPathToPath(Path *p);
-MgErr FAppendName(Path path, PStr name);
 Bool32 FIsAPathOfType(Path path, int32 ofType);
 MgErr FGetPathType(Path, int32*);
 int32 FDepth(Path path);
 MgErr FDisposePath(Path p);
+
+#define FIsAbsPath(path) FIsAPathOfType(path, fAbsPath)
+#define FIsRelPath(path) FIsAPathOfType(path, fRelPath)
+
 MgErr FNewRefNum(Path path, File fd, LVRefNum* refnum);
 Bool32 FIsARefNum(LVRefNum);
 MgErr FDisposeRefNum(LVRefNum);
@@ -588,21 +602,36 @@
 	FMListDetails elm[1];
 } FileInfoArrRec, *FileInfoArrPtr, **FileInfoArrHdl;
 
+#define kLinkNone 0
+#define kLinkHard 1
+#define kLinkDir  2
+
 /* Our exported functions */
+/**************************/
+    
+/* Version string of the zlib library */
 LibAPI(void) DLLVersion OF((uChar*  Version));
 
+/* Convert the path into a string representation for the current platform */
 LibAPI(MgErr) LVPath_ToText(Path path, LStrHandle *str);
+
+/* Check if the file path points to has a resource fork */
 LibAPI(MgErr) LVPath_HasResourceFork(Path path, LVBoolean *hasResFork, uInt32 *sizeLow, uInt32 *sizeHigh);
+
+/* List the directory contents with an additional array with flags and file type for each file in the names array */
+LibAPI(MgErr) LVPath_ListDirectory(Path dirname, LStrArrHdl *names, FileInfoArrHdl *fileInfo);
+    
+/* Retrieve MacOS finder information from the file, unsupported on non Mac platforms */
+LibAPI(MgErr) LVPath_UtilFileInfo(Path path, uInt8 write, uInt8 *isDirectory, LVFileInfo *finderInfo, LStrHandle comment);
+
+/* Create and read a link */
+LibAPI(MgErr) LVPath_CreateLink(Path path, uInt32 flags, Path target);
+LibAPI(MgErr) LVPath_ReadLink(Path path, Path *target);
+
+/* Legacy functions not supported on Mac OSX and all non-Mac platforms */
 LibAPI(MgErr) LVPath_EncodeMacbinary(Path srcFileName, Path dstFileName);
 LibAPI(MgErr) LVPath_DecodeMacbinary(Path srcFileName, Path dstFileName);
-LibAPI(MgErr) LVPath_ListDirectory(Path dirname, LStrArrHdl *names, FileInfoArrHdl *fileInfo);
 
-LibAPI(MgErr) LVPath_UtilFileInfo(Path path,
-                   uInt8 write,
-                   uInt8 *isDirectory,
-                   LVFileInfo *finderInfo,
-                   LStrHandle comment);
-
 typedef union
 {
 	int64 q;

Modified: trunk/lvzip/source/fileutil.llb/FILE Copy Fork From File.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/fileutil.llb/FILE Copy Fork To File.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/fileutil.llb/FILE Get Directory Content.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/fileutil.llb/FILE Open File Refnum.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/fileutil.llb/FILE Resource File Info.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/fileutil.llb/FILE Resource Header.ctl
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/fileutil.llb/FILE Size Padding.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Block Size.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB CRC32.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Close Read File.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Close Unzip Archive.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Close Write File.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Close Zip Archive.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Common Path to Specific Path.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Compress Directory.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Compress File Info.ctl
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Convert File Info.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Deflate.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Delete Files From Archive.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Enumerate File Contents.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Extract All Files To Dir.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Extract File.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Extract Stream.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Extract.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB File Info.ctl
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB File Information.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Get Current File Info.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Get File CRC32.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Get File.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Get Global Info.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Go To First File.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Go To Next File.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Inflate.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Initialize File Functions.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Initialize Stream Functions.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Locate File.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Move Raw File.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Open Read File.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Open Unzip Archive.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Open Unzip Stream.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Open Unzip.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Open Write File.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Open ZIP Mode.ctl
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Open Zip Archive.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Open Zip Stream.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Open Zip.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Path to Path String.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Read Compressed File.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Read Compressed Stream.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Read Local Extra Data.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Specific Path to Common Path.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Store File.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Store Stream.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Store.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Transfer Raw File.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Uncompress File Info.ctl
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Unzip Handle.ctl
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Write File.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Write Stream.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Zip Handle.ctl
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/macbin.llb/MACBIN CCITT_CRC16.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/macbin.llb/MACBIN Create Header.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/macbin.llb/MACBIN Decode MacBinary.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/macbin.llb/MACBIN Encode MacBinary.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/macbin.llb/MACBIN Macbinary Header.ctl
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/macbin.llb/MACBIN Read Header.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/macbin.llb/MACBIN Resource File Info.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/macbin.llb/MACBIN Verify Header.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/tests/lvzip-test add to empty archive.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/tests/lvzip-test-delete files from archive.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/tests/lvzip-test-memory stream.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/tests/lvzip-test-sm text files.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/tests/lvzip-test-string compress.vi
===================================================================
(Binary files differ)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opengtoolkit-svn] SF.net SVN: opengtoolkit:[1518] trunk/lvzip/source

From: <lab...@us...> - 2015-05-03 11:21:48

Revision: 1518
          http://sourceforge.net/p/opengtoolkit/svn/1518
Author:   labviewer
Date:     2015-05-03 11:21:46 +0000 (Sun, 03 May 2015)
Log Message:
-----------
Change copyright period

Modified Paths:
--------------
    trunk/lvzip/source/fileutil.llb/FILE Copy Fork From File.vi
    trunk/lvzip/source/fileutil.llb/FILE Copy Fork To File.vi
    trunk/lvzip/source/fileutil.llb/FILE Get Directory Content.vi
    trunk/lvzip/source/fileutil.llb/FILE Has Resource Fork.vi
    trunk/lvzip/source/fileutil.llb/FILE Open File Refnum.vi
    trunk/lvzip/source/fileutil.llb/FILE Resource File Info.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Block Size.vi
    trunk/lvzip/source/lvzip.llb/ZLIB CRC32.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Close Read File.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Close Unzip Archive.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Close Write File.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Close Zip Archive.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Compress Directory.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Compress Files.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Convert File Info.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Copy Raw File.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Deflate.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Delete Files From Archive.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Enumerate File Contents Old.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Enumerate File Contents.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Extract All Files To Dir.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Extract File.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Extract Stream.vi
    trunk/lvzip/source/lvzip.llb/ZLIB File Information.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Get Current File Info Old.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Get Current File Info.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Get Current File Pos.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Get File CRC32.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Get File.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Get Global Info.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Get Version.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Go To File Pos.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Go To First File.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Go To Next File.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Inflate.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Initialize File Functions.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Initialize Stream Functions.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Locate File.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Move Raw File.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Open Read File.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Open Unzip Archive.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Open Unzip Stream.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Open Write File.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Open Zip Archive.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Path to Path String.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Read Compressed File.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Read Compressed Stream.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Read Local Extra Data.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Store File.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Store Stream.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Transfer Raw File.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Write File.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Write Stream.vi
    trunk/lvzip/source/macbin.llb/MACBIN CCITT_CRC16.vi
    trunk/lvzip/source/macbin.llb/MACBIN Create Header.vi
    trunk/lvzip/source/macbin.llb/MACBIN Decode MacBinary.vi
    trunk/lvzip/source/macbin.llb/MACBIN Encode MacBinary.vi
    trunk/lvzip/source/macbin.llb/MACBIN Read Header.vi
    trunk/lvzip/source/macbin.llb/MACBIN Resource File Info.vi
    trunk/lvzip/source/macbin.llb/MACBIN Verify Header.vi

Added Paths:
-----------
    trunk/lvzip/source/fileutil.llb/FILE Size Padding.vi

Removed Paths:
-------------
    trunk/lvzip/source/macbin.llb/MACBIN Has Resource Fork.vi
    trunk/lvzip/source/macbin.llb/MACBIN Size Padding.vi

Modified: trunk/lvzip/source/fileutil.llb/FILE Copy Fork From File.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/fileutil.llb/FILE Copy Fork To File.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/fileutil.llb/FILE Get Directory Content.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/fileutil.llb/FILE Has Resource Fork.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/fileutil.llb/FILE Open File Refnum.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/fileutil.llb/FILE Resource File Info.vi
===================================================================
(Binary files differ)

Added: trunk/lvzip/source/fileutil.llb/FILE Size Padding.vi
===================================================================
(Binary files differ)

Index: trunk/lvzip/source/fileutil.llb/FILE Size Padding.vi
===================================================================
--- trunk/lvzip/source/fileutil.llb/FILE Size Padding.vi	2015-05-03 10:48:20 UTC (rev 1517)
+++ trunk/lvzip/source/fileutil.llb/FILE Size Padding.vi	2015-05-03 11:21:46 UTC (rev 1518)

Property changes on: trunk/lvzip/source/fileutil.llb/FILE Size Padding.vi
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: trunk/lvzip/source/lvzip.llb/ZLIB Block Size.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB CRC32.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Close Read File.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Close Unzip Archive.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Close Write File.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Close Zip Archive.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Compress Directory.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Compress Files.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Convert File Info.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Copy Raw File.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Deflate.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Delete Files From Archive.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Enumerate File Contents Old.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Enumerate File Contents.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Extract All Files To Dir.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Extract File.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Extract Stream.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB File Information.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Get Current File Info Old.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Get Current File Info.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Get Current File Pos.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Get File CRC32.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Get File.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Get Global Info.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Get Version.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Go To File Pos.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Go To First File.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Go To Next File.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Inflate.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Initialize File Functions.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Initialize Stream Functions.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Locate File.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Move Raw File.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Open Read File.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Open Unzip Archive.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Open Unzip Stream.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Open Write File.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Open Zip Archive.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Path to Path String.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Read Compressed File.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Read Compressed Stream.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Read Local Extra Data.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Store File.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Store Stream.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Transfer Raw File.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Write File.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Write Stream.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/macbin.llb/MACBIN CCITT_CRC16.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/macbin.llb/MACBIN Create Header.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/macbin.llb/MACBIN Decode MacBinary.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/macbin.llb/MACBIN Encode MacBinary.vi
===================================================================
(Binary files differ)

Deleted: trunk/lvzip/source/macbin.llb/MACBIN Has Resource Fork.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/macbin.llb/MACBIN Read Header.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/macbin.llb/MACBIN Resource File Info.vi
===================================================================
(Binary files differ)

Deleted: trunk/lvzip/source/macbin.llb/MACBIN Size Padding.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/macbin.llb/MACBIN Verify Header.vi
===================================================================
(Binary files differ)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opengtoolkit-svn] SF.net SVN: opengtoolkit:[1517] trunk/lvzip/source

From: <lab...@us...> - 2015-05-03 10:48:22

Revision: 1517
          http://sourceforge.net/p/opengtoolkit/svn/1517
Author:   labviewer
Date:     2015-05-03 10:48:20 +0000 (Sun, 03 May 2015)
Log Message:
-----------
Restructure organization of file functions and cleanup some old code

Modified Paths:
--------------
    trunk/lvzip/source/lvzip.llb/ZLIB Close Read File.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Close Unzip Archive.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Close Write File.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Close Zip Archive.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Compress Directory.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Compress Files.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Deflate.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Delete Files From Archive.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Extract All Files To Dir.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Extract Stream.vi
    trunk/lvzip/source/lvzip.llb/ZLIB File Information.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Get Current File Info.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Get Current File Pos.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Get Global Info.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Go To File Pos.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Go To First File.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Go To Next File.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Inflate.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Initialize File Functions.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Initialize Stream Functions.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Locate File.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Move Raw File.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Open Read File.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Open Unzip Archive.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Open Unzip Stream.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Open Unzip.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Open Write File.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Open Zip Archive.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Open Zip Stream.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Open Zip.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Path to Path String.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Read Compressed File.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Read Compressed Stream.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Read Local Extra Data.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Store File.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Store Stream.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Transfer Raw File.vi
    trunk/lvzip/source/lvzip.llb/ZLIB VI Tree.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Write File.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Write Stream.vi
    trunk/lvzip/source/lvzlib.dll
    trunk/lvzip/source/lvzlib64.dll
    trunk/lvzip/source/macbin.llb/DecodemacBinary.vi
    trunk/lvzip/source/macbin.llb/EncodemacBinary.vi
    trunk/lvzip/source/macbin.llb/MACBIN Create Header.vi
    trunk/lvzip/source/macbin.llb/MACBIN Decode MacBinary.vi
    trunk/lvzip/source/macbin.llb/MACBIN Encode MacBinary.vi
    trunk/lvzip/source/macbin.llb/MACBIN Read Header.vi
    trunk/lvzip/source/macbin.llb/MACBIN Resource File Info.vi
    trunk/lvzip/source/macbin.llb/MACBIN VI Tree.vi
    trunk/lvzip/source/macbin.llb/MACBIN Verify Header.vi

Added Paths:
-----------
    trunk/lvzip/source/fileutil.llb/
    trunk/lvzip/source/fileutil.llb/FILE Copy Fork From File.vi
    trunk/lvzip/source/fileutil.llb/FILE Copy Fork To File.vi
    trunk/lvzip/source/fileutil.llb/FILE Get Directory Content.vi
    trunk/lvzip/source/fileutil.llb/FILE Has Resource Fork.vi
    trunk/lvzip/source/fileutil.llb/FILE Open File Refnum.vi
    trunk/lvzip/source/fileutil.llb/FILE Resource File Info.vi
    trunk/lvzip/source/fileutil.llb/FILE Resource Header.ctl

Removed Paths:
-------------
    trunk/lvzip/source/macbin.llb/MACBIN Copy Fork From File.vi
    trunk/lvzip/source/macbin.llb/MACBIN Copy Fork To File.vi
    trunk/lvzip/source/macbin.llb/MACBIN Open File Refnum.vi
    trunk/lvzip/source/macbin.llb/MACBIN Resource File Info Core.vi
    trunk/lvzip/source/macbin.llb/MACBIN Resource Header.ctl

Index: trunk/lvzip/source/fileutil.llb
===================================================================
--- trunk/lvzip/source/fileutil.llb	2015-05-03 10:47:14 UTC (rev 1516)
+++ trunk/lvzip/source/fileutil.llb	2015-05-03 10:48:20 UTC (rev 1517)

Property changes on: trunk/lvzip/source/fileutil.llb
___________________________________________________________________
Added: bugtraq:label
## -0,0 +1 ##
+TrackerID:
\ No newline at end of property
Added: bugtraq:url
## -0,0 +1 ##
+https://sourceforge.net/support/tracker.php?aid=%BUGID%
\ No newline at end of property
Added: bugtraq:message
## -0,0 +1 ##
+TrackerID: %BUGID%
\ No newline at end of property
Added: trunk/lvzip/source/fileutil.llb/FILE Copy Fork From File.vi
===================================================================
(Binary files differ)

Index: trunk/lvzip/source/fileutil.llb/FILE Copy Fork From File.vi
===================================================================
--- trunk/lvzip/source/fileutil.llb/FILE Copy Fork From File.vi	2015-05-03 10:47:14 UTC (rev 1516)
+++ trunk/lvzip/source/fileutil.llb/FILE Copy Fork From File.vi	2015-05-03 10:48:20 UTC (rev 1517)

Property changes on: trunk/lvzip/source/fileutil.llb/FILE Copy Fork From File.vi
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/lvzip/source/fileutil.llb/FILE Copy Fork To File.vi
===================================================================
(Binary files differ)

Index: trunk/lvzip/source/fileutil.llb/FILE Copy Fork To File.vi
===================================================================
--- trunk/lvzip/source/fileutil.llb/FILE Copy Fork To File.vi	2015-05-03 10:47:14 UTC (rev 1516)
+++ trunk/lvzip/source/fileutil.llb/FILE Copy Fork To File.vi	2015-05-03 10:48:20 UTC (rev 1517)

Property changes on: trunk/lvzip/source/fileutil.llb/FILE Copy Fork To File.vi
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/lvzip/source/fileutil.llb/FILE Get Directory Content.vi
===================================================================
(Binary files differ)

Index: trunk/lvzip/source/fileutil.llb/FILE Get Directory Content.vi
===================================================================
--- trunk/lvzip/source/fileutil.llb/FILE Get Directory Content.vi	2015-05-03 10:47:14 UTC (rev 1516)
+++ trunk/lvzip/source/fileutil.llb/FILE Get Directory Content.vi	2015-05-03 10:48:20 UTC (rev 1517)

Property changes on: trunk/lvzip/source/fileutil.llb/FILE Get Directory Content.vi
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/lvzip/source/fileutil.llb/FILE Has Resource Fork.vi
===================================================================
(Binary files differ)

Index: trunk/lvzip/source/fileutil.llb/FILE Has Resource Fork.vi
===================================================================
--- trunk/lvzip/source/fileutil.llb/FILE Has Resource Fork.vi	2015-05-03 10:47:14 UTC (rev 1516)
+++ trunk/lvzip/source/fileutil.llb/FILE Has Resource Fork.vi	2015-05-03 10:48:20 UTC (rev 1517)

Property changes on: trunk/lvzip/source/fileutil.llb/FILE Has Resource Fork.vi
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/lvzip/source/fileutil.llb/FILE Open File Refnum.vi
===================================================================
(Binary files differ)

Index: trunk/lvzip/source/fileutil.llb/FILE Open File Refnum.vi
===================================================================
--- trunk/lvzip/source/fileutil.llb/FILE Open File Refnum.vi	2015-05-03 10:47:14 UTC (rev 1516)
+++ trunk/lvzip/source/fileutil.llb/FILE Open File Refnum.vi	2015-05-03 10:48:20 UTC (rev 1517)

Property changes on: trunk/lvzip/source/fileutil.llb/FILE Open File Refnum.vi
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/lvzip/source/fileutil.llb/FILE Resource File Info.vi
===================================================================
(Binary files differ)

Index: trunk/lvzip/source/fileutil.llb/FILE Resource File Info.vi
===================================================================
--- trunk/lvzip/source/fileutil.llb/FILE Resource File Info.vi	2015-05-03 10:47:14 UTC (rev 1516)
+++ trunk/lvzip/source/fileutil.llb/FILE Resource File Info.vi	2015-05-03 10:48:20 UTC (rev 1517)

Property changes on: trunk/lvzip/source/fileutil.llb/FILE Resource File Info.vi
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/lvzip/source/fileutil.llb/FILE Resource Header.ctl
===================================================================
(Binary files differ)

Index: trunk/lvzip/source/fileutil.llb/FILE Resource Header.ctl
===================================================================
--- trunk/lvzip/source/fileutil.llb/FILE Resource Header.ctl	2015-05-03 10:47:14 UTC (rev 1516)
+++ trunk/lvzip/source/fileutil.llb/FILE Resource Header.ctl	2015-05-03 10:48:20 UTC (rev 1517)

Property changes on: trunk/lvzip/source/fileutil.llb/FILE Resource Header.ctl
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: trunk/lvzip/source/lvzip.llb/ZLIB Close Read File.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Close Unzip Archive.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Close Write File.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Close Zip Archive.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Compress Directory.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Compress Files.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Deflate.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Delete Files From Archive.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Extract All Files To Dir.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Extract Stream.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB File Information.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Get Current File Info.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Get Current File Pos.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Get Global Info.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Go To File Pos.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Go To First File.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Go To Next File.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Inflate.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Initialize File Functions.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Initialize Stream Functions.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Locate File.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Move Raw File.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Open Read File.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Open Unzip Archive.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Open Unzip Stream.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Open Unzip.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Open Write File.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Open Zip Archive.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Open Zip Stream.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Open Zip.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Path to Path String.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Read Compressed File.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Read Compressed Stream.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Read Local Extra Data.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Store File.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Store Stream.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Transfer Raw File.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB VI Tree.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Write File.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Write Stream.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzlib.dll
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzlib64.dll
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/macbin.llb/DecodemacBinary.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/macbin.llb/EncodemacBinary.vi
===================================================================
(Binary files differ)

Deleted: trunk/lvzip/source/macbin.llb/MACBIN Copy Fork From File.vi
===================================================================
(Binary files differ)

Deleted: trunk/lvzip/source/macbin.llb/MACBIN Copy Fork To File.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/macbin.llb/MACBIN Create Header.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/macbin.llb/MACBIN Decode MacBinary.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/macbin.llb/MACBIN Encode MacBinary.vi
===================================================================
(Binary files differ)

Deleted: trunk/lvzip/source/macbin.llb/MACBIN Open File Refnum.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/macbin.llb/MACBIN Read Header.vi
===================================================================
(Binary files differ)

Deleted: trunk/lvzip/source/macbin.llb/MACBIN Resource File Info Core.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/macbin.llb/MACBIN Resource File Info.vi
===================================================================
(Binary files differ)

Deleted: trunk/lvzip/source/macbin.llb/MACBIN Resource Header.ctl
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/macbin.llb/MACBIN VI Tree.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/macbin.llb/MACBIN Verify Header.vi
===================================================================
(Binary files differ)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opengtoolkit-svn] SF.net SVN: opengtoolkit:[1516] trunk/lvzip/c_source

From: <lab...@us...> - 2015-05-03 10:47:17

Revision: 1516
          http://sourceforge.net/p/opengtoolkit/svn/1516
Author:   labviewer
Date:     2015-05-03 10:47:14 +0000 (Sun, 03 May 2015)
Log Message:
-----------
Add a function to enumerate directory contents with extra flag info

Modified Paths:
--------------
    trunk/lvzip/c_source/lvutil.c
    trunk/lvzip/c_source/lvutil.h
    trunk/lvzip/c_source/unzip.c

Modified: trunk/lvzip/c_source/lvutil.c
===================================================================
--- trunk/lvzip/c_source/lvutil.c	2015-05-02 19:48:51 UTC (rev 1515)
+++ trunk/lvzip/c_source/lvutil.c	2015-05-03 10:47:14 UTC (rev 1516)
@@ -338,7 +338,10 @@
     }
     return fIOErr;   /* fIOErr generally signifies some unknown file error */
 }
+#endif
+#endif
 
+#if usesPosixPath || usesWinPath
 static int32 MakePathDSString(Path path, LStrPtr *lstr, int32 reserve)
 {
     int32 pathLen = -1;
@@ -357,13 +360,81 @@
     return err;
 }
 #endif
-#endif
 
 LibAPI(void) DLLVersion(uChar* version)
 {
     sprintf((char*)version, "lvzlib V 2.2, date: %s, time: %s",__DATE__,__TIME__);
 }
 
+LibAPI(MgErr) LVPath_ListDirectory(Path folderPath, LStrArrHdl *nameArr, FileInfoArrHdl *typeArr)
+{
+	MgErr err;
+	FInfoRec foldInfo;
+	FMListDetails **typeList = NULL;
+	FDirEntHandle nameList = NULL;
+
+	if (!FIsAPath(folderPath))
+		return mgArgErr;
+	/* Check that we have actually a folder */
+	err = FGetInfo(folderPath, &foldInfo);
+	if (err)
+		return err;
+	if (!foldInfo.folder)
+		return mgArgErr;
+
+	nameList = (FDirEntHandle)AZNewHClr(4);
+	if (!nameList)
+		return mFullErr;
+	typeList = (FMListDetails **)AZNewHandle(0);
+	if (!typeList)
+	{
+		AZDisposeHandle((UHandle)nameList);
+		return mFullErr;
+	}
+	err = FListDir(folderPath, nameList, typeList);
+	if (!err)
+	{
+		int32 i = 0, n = CPStrLen(*nameList);
+	    UPtr fName = CPStrBuf(*nameList);
+		err = NumericArrayResize(uPtr, 1, (UHandle*)nameArr, n);
+		if (!err)
+		{
+			LStrHandle *names = (**nameArr)->elm;
+		    err = NumericArrayResize(uL, 1, (UHandle*)typeArr, n * 2);
+			if (!err)
+			{
+				for (i = 0; i < n; i++, names++)
+				{
+					err = NumericArrayResize(uB, 1, (UHandle*)names, PStrLen(fName));
+					if (err)
+				        break;
+
+					MoveBlock(PStrBuf(fName), LStrBuf(**names), PStrLen(fName));
+					LStrLen(**names) = PStrLen(fName);
+					fName += PStrSize(fName);
+				}
+				MoveBlock((ConstUPtr)*typeList, (UPtr)((**typeArr)->elm), n * sizeof(FMListDetails));
+				(**typeArr)->numItems = i;
+			}
+			n = (**nameArr)->numItems;
+			(**nameArr)->numItems = i;
+			/* Clear out possibly superfluous handles */
+			if (n > i)
+			{
+				for (; i < n; i++, names++)
+				{
+					if (*names)
+						DSDisposeHandle((UHandle)*names);
+					*names = NULL;
+				}
+			}
+		}
+	}
+	AZDisposeHandle((UHandle)nameList);
+	AZDisposeHandle((UHandle)typeList);
+	return err;
+}
+
 LibAPI(MgErr) LVPath_HasResourceFork(Path path, LVBoolean *hasResFork, uInt32 *sizeLow, uInt32 *sizeHigh)
 {
     MgErr  err = mgNoErr;

Modified: trunk/lvzip/c_source/lvutil.h
===================================================================
--- trunk/lvzip/c_source/lvutil.h	2015-05-02 19:48:51 UTC (rev 1515)
+++ trunk/lvzip/c_source/lvutil.h	2015-05-03 10:47:14 UTC (rev 1516)
@@ -186,6 +186,12 @@
 
 typedef int32           Bool32;
 
+#if ProcessorType==kX64
+#define uPtr uQ
+#else
+#define uPtr uL
+#endif
+
 /*** The Support Manager ***/
 
 #define HiNibble(x)		(uInt8)(((x)>>4) & 0x0F)
@@ -336,6 +342,10 @@
 #define LStrLenH(h) ((h) ? (*(h))->cnt : 0)
 #define LStrBufH(h) ((h) ? (*(h))->str : NULL)
 
+/*** Concatenated Pascal String Support Functions ***/
+#define CPStrLen		LStrLen			/* concatenated Pascal vs. LabVIEW strings */
+#define CPStrBuf		LStrBuf			/* concatenated Pascal vs. LabVIEW strings */
+
 typedef struct {
     int32   cnt;
     uChar   str[256];
@@ -521,6 +531,7 @@
 #define kNotARefNum ((LVRefNum)0L)	/* canonical invalid magic cookie */
 
 /* LabVIEW exported functions */
+Bool32 FIsAPath(Path path);
 MgErr FPathToText(Path path, LStrPtr lstr);
 MgErr FPathToPath(Path *p);
 MgErr FAppendName(Path path, PStr name);
@@ -544,12 +555,20 @@
 
 UPtr DSNewPClr(size_t size);
 MgErr DSDisposePtr(UPtr);
+UHandle DSNewHandle(size_t size);
 UHandle DSNewHClr(size_t size);
 MgErr DSSetHandleSize(UHandle, size_t);
 int32 DSGetHandleSize(UHandle);
 MgErr DSDisposeHandle(UHandle);
 MgErr DSCopyHandle(void *ph, const void *hsrc);
 
+UHandle AZNewHandle(size_t size);
+UHandle AZNewHClr(size_t size);
+MgErr AZSetHandleSize(UHandle, size_t);
+int32 AZGetHandleSize(UHandle);
+MgErr AZDisposeHandle(UHandle);
+MgErr AZCopyHandle(void *ph, const void *hsrc);
+
 void MoveBlock(ConstUPtr ps, UPtr pd, size_t size);
 
 MgErr NumericArrayResize(int32, int32, UHandle*, size_t);
@@ -557,6 +576,18 @@
 #define Min(a, b)      ((a) < (b)) ? (a) : (b) 
 #define Max(a, b)      ((a) > (b)) ? (a) : (b) 
 
+typedef struct
+{
+	int32 numItems;
+	LStrHandle elm[1];
+} LStrArrRec, *LStrArrPtr, **LStrArrHdl;
+
+typedef struct
+{
+	int32 numItems;
+	FMListDetails elm[1];
+} FileInfoArrRec, *FileInfoArrPtr, **FileInfoArrHdl;
+
 /* Our exported functions */
 LibAPI(void) DLLVersion OF((uChar*  Version));
 
@@ -564,6 +595,7 @@
 LibAPI(MgErr) LVPath_HasResourceFork(Path path, LVBoolean *hasResFork, uInt32 *sizeLow, uInt32 *sizeHigh);
 LibAPI(MgErr) LVPath_EncodeMacbinary(Path srcFileName, Path dstFileName);
 LibAPI(MgErr) LVPath_DecodeMacbinary(Path srcFileName, Path dstFileName);
+LibAPI(MgErr) LVPath_ListDirectory(Path dirname, LStrArrHdl *names, FileInfoArrHdl *fileInfo);
 
 LibAPI(MgErr) LVPath_UtilFileInfo(Path path,
                    uInt8 write,

Modified: trunk/lvzip/c_source/unzip.c
===================================================================
--- trunk/lvzip/c_source/unzip.c	2015-05-02 19:48:51 UTC (rev 1515)
+++ trunk/lvzip/c_source/unzip.c	2015-05-03 10:47:14 UTC (rev 1516)
@@ -2040,7 +2040,6 @@
     return err;
 }
 
-
 /*
   Get the global comment string of the ZipFile, in the szComment buffer.
   uSizeBuf is the size of the szComment buffer.
@@ -2119,5 +2118,5 @@
 
 ZEXTERN int ZEXPORT unzSetOffset (unzFile file, uLong pos)
 {
-    return unzSetOffset64(file,pos);
+    return unzSetOffset64(file, pos);
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opengtoolkit-svn] SF.net SVN: opengtoolkit:[1515] trunk/lvzip/c_source

From: <lab...@us...> - 2015-05-02 19:48:54

Revision: 1515
          http://sourceforge.net/p/opengtoolkit/svn/1515
Author:   labviewer
Date:     2015-05-02 19:48:51 +0000 (Sat, 02 May 2015)
Log Message:
-----------
More code cleanup

Modified Paths:
--------------
    trunk/lvzip/c_source/lvutil.c
    trunk/lvzip/c_source/lvutil.h

Modified: trunk/lvzip/c_source/lvutil.c
===================================================================
--- trunk/lvzip/c_source/lvutil.c	2015-05-01 22:54:47 UTC (rev 1514)
+++ trunk/lvzip/c_source/lvutil.c	2015-05-02 19:48:51 UTC (rev 1515)
@@ -50,18 +50,36 @@
  #include <CoreFoundation/CoreFoundation.h>
  #include "MacBinaryIII.h"
  #include <sys/stat.h>
+ #include <sys/xattr.h>
+ #define ftello64 ftello
+ #define fseeko64 fseeko
+ #define ftruncate64 ftruncate
+ #if ProcessorType!=kX64
+  #define MacSpec	FSRef
+  #define MacIsInvisible(cpb) ((cpb).hFileInfo.ioFlFndrInfo.fdFlags & kIsInvisible)
+  #define MacIsInvFolder(cpb) ((cpb).dirInfo.ioDrUsrWds.frFlags & kIsInvisible)
+  #define MacIsDir(cpb)   ((cpb).nodeFlags & ioDirMask)
+  #define MacIsStationery(cpb) ((cpb).hFileInfo.ioFlFndrInfo.fdFlags & kIsStationery)
+  #define MacIsAlias(cpb) ((cpb).hFileInfo.ioFlFndrInfo.fdFlags & kIsAlias)
+  #define kFileChanged    (1L<<7)
+  static MgErr OSErrToLVErr(OSErr err);
+ #endif
+#endif
 
- #define MacSpec	FSRef
- #define MacIsInvisible(cpb) ((cpb).hFileInfo.ioFlFndrInfo.fdFlags & kIsInvisible)
- #define MacIsInvFolder(cpb) ((cpb).dirInfo.ioDrUsrWds.frFlags & kIsInvisible)
- #define MacIsDir(cpb)   ((cpb).nodeFlags & ioDirMask)
- #define MacIsStationery(cpb) ((cpb).hFileInfo.ioFlFndrInfo.fdFlags & kIsStationery)
- #define MacIsAlias(cpb) ((cpb).hFileInfo.ioFlFndrInfo.fdFlags & kIsAlias)
- #define kFileChanged    (1L<<7)
- static MgErr OSErrToLVErr(OSErr err);
+#define usesHFSPath MacOS && ProcessorType!=kX64
+#define usesPosixPath Unix || (MacOSX && ProcessorType==kX64)
+#define usesWinPath Win32
+
+#if usesHFSPath
+typedef SInt16 FileRefNum;
+#elif usesPosixPath
+typedef FILE* FileRefNum;
+#elif usesWinPath
+typedef HANDLE FileRefNum;
 #endif
 
-#if MacOSX
+#if MacOS
+#if usesHFSPath
 static MgErr ConvertToPosixPath(const LStrHandle hfsPath, LStrHandle *posixPath, Boolean isDir)
 {
     MgErr err = mFullErr;
@@ -123,19 +141,21 @@
 {
 	LStrHandle str = NULL;
     MgErr err = LVPath_ToText(path, &str);
-    DEBUGPRINTF(("FPathToText1: path = %z", path));
+    DEBUGPRINTF(((CStr)"FPathToText1: path = %z", path));
 	if (!err)
 	{
 	    err = OSErrToLVErr(FSPathMakeRef(LStrBuf(*str), ref, NULL));
 		if (err)
 		{
-			DEBUGPRINTF(("FSPathMakeRef: err = %ld, len = %ld, path = %s", err, LStrLen(*str), LStrBuf(*str)));
+			DEBUGPRINTF(((CStr)"FSPathMakeRef: err = %ld, len = %ld, path = %s", err, LStrLen(*str), LStrBuf(*str)));
 		}
 		DSDisposeHandle((UHandle)str);
     }
     return err;
 }
+#endif
 
+#if MacOS && !MacOSX
 /* Convert a Macintosh UTDDateTime to a LabVIEW timestamp and vice versa */
 static void MacConvertFromLVTime(uInt32 lTime, UTCDateTime *mTime)
 {
@@ -148,7 +168,9 @@
 {
 	*lTime = mTime->lowSeconds;
 }
+#endif
 
+#if usesHFSPath
 static MgErr OSErrToLVErr(OSErr err)
 {
     switch(err)
@@ -193,24 +215,8 @@
     return fIOErr; /* fIOErr generally signifies some unknown file error */
 }
 #endif
+#endif
 
-static int32 MakePathDSString(Path path, LStrPtr *lstr, int32 reserve)
-{
-    int32 pathLen = -1;
-
-    MgErr err = FPathToText(path, (LStrPtr)&pathLen);
-    if (!err)
-    {
-		*lstr = (LStrPtr)DSNewPClr(sizeof(int32) + pathLen + reserve + 1);
-		if (!*lstr)
-			return mFullErr;
-		(*lstr)->cnt = pathLen;
-		err = FPathToText(path, *lstr);
-		if (err)
-			DSDisposePtr((UPtr)*lstr);
-    }
-    return err;
-}
 #if Win32
 /* int64 100ns intervals from Jan 1 1601 GMT to Jan 1 1904 GMT */
 static const FILETIME dt1904FileTime = {
@@ -283,6 +289,7 @@
 #include <string.h>
 #include <utime.h>
 
+#if Unix
 /* seconds between Jan 1 1904 GMT and Jan 1 1970 GMT */
 #define dt1970re1904    2082844800L
 
@@ -298,7 +305,9 @@
 {
 		*time = sTime + dt1970re1904;
 }
+#endif
 
+#if usesPosixPath
 static MgErr UnixToLVFileErr(void)
 {
     switch (errno)
@@ -330,7 +339,25 @@
     return fIOErr;   /* fIOErr generally signifies some unknown file error */
 }
 
+static int32 MakePathDSString(Path path, LStrPtr *lstr, int32 reserve)
+{
+    int32 pathLen = -1;
+    
+    MgErr err = FPathToText(path, (LStrPtr)&pathLen);
+    if (!err)
+    {
+        *lstr = (LStrPtr)DSNewPClr(sizeof(int32) + pathLen + reserve + 1);
+        if (!*lstr)
+            return mFullErr;
+        (*lstr)->cnt = pathLen;
+        err = FPathToText(path, *lstr);
+        if (err)
+            DSDisposePtr((UPtr)*lstr);
+    }
+    return err;
+}
 #endif
+#endif
 
 LibAPI(void) DLLVersion(uChar* version)
 {
@@ -341,16 +368,36 @@
 {
     MgErr  err = mgNoErr;
 #if MacOSX
+    LStrHandle lstr = NULL;
+#elif MacOS
     FSRef ref;
 #else
     Unused(path);
 #endif
-	*hasResFork = 0;
+    if (hasResFork)
+	    *hasResFork = 0;
 	if (sizeLow)
 		*sizeLow = 0;
 	if (sizeHigh)
 		*sizeHigh = 0;
 #if MacOSX
+    err = LVPath_ToText(path, &lstr);
+    if (!err)
+    {
+        ssize_t len = getxattr((const char)LStrBuf(*lstr), XATTR_RESOURCEFORK_NAME, NULL, 0, 0, O_NOFOLLOW);
+        if (len)
+        {
+            if (hasResFork)
+                *hasResFork = LV_TRUE;
+            if (sizeLow)
+                *sizeLow = Lo32(len);
+            if (sizeHigh)
+                *sizeHigh = Hi32(len);
+           
+        }
+        DSDisposeHandle((UHandle)lstr);
+    }
+#elif MacOS
     err = FSMakePathRef(path, &ref);
     if (!err)
     {
@@ -361,10 +408,10 @@
 		err = OSErrToLVErr(FSGetCatalogInfo(&ref, whichInfo, &catalogInfo, NULL, NULL,NULL));
 		if (!err && catalogInfo.nodeFlags & kFSNodeIsDirectoryMask)
 			err = fIOErr;
-		if (!err)
+		if (!err && catalogInfo.rsrcLogicalSize > 0)
 		{
 			if (hasResFork)
-				*hasResFork = catalogInfo.rsrcLogicalSize > 0;
+				*hasResFork = LV_TRUE;
 			if (sizeLow)
 				*sizeLow = Lo32(catalogInfo.rsrcLogicalSize);
 			if (sizeHigh)
@@ -664,9 +711,7 @@
 			buf.actime = statbuf.st_atime;
 			buf.modtime = statbuf.st_mtime;
 
-			/* No modification of creation time in Unix?
 			UnixConvertFromLVTime(fileInfo->cDate, &statbuf.st_ctime);
-			*/
 			UnixConvertFromLVTime(fileInfo->mDate, &buf.modtime);
 			if (utime((const char*)lstr->str, &buf))
 				err = fIOErr;
@@ -758,7 +803,7 @@
 		{
 			err = FPathToText(path, **str);
 			LStrLen(**str) = pathLen;
-#if MacOSX && (ProcessorType == kX86)
+#if usesHFSPath
 			if (!err)
 				err = ConvertToPosixPath(*str, str, false);
 #endif
@@ -767,25 +812,17 @@
 	return err;
 }
 
-#if MacOSX
-#define FileRefNum SInt16
-#elif Unix
-#define FileRefNum FILE*
-#elif Win32
-#define FileRefNum HANDLE
-#endif
-
 static MgErr lvfile_CloseFile(FileRefNum ioRefNum)
 {
 	MgErr err = mgNoErr;
-#if MacOSX
+#if usesHFSPath
 	err = OSErrToLVErr(FSCloseFork(ioRefNum));
-#elif Unix
+#elif usesPosixPath
 	if (fclose(ioRefNum))
 	{
 		err = UnixToLVFileErr();
 	}
-#elif Win32
+#elif usesWinPath
 	if (!CloseHandle(ioRefNum))
 	{
 		err = Win32ToLVFileErr();
@@ -796,18 +833,18 @@
 
 static MgErr lvfile_GetSize(FileRefNum ioRefNum, FileOffset *size)
 {
-#if Unix || Win32
+#if usesPosixPath || usesWinPath
 	FileOffset tell;
-#if Win32
-	MgErr err;
+#if usesWinPath
+    MgErr err;
 #endif
 #endif
 	if (0 == ioRefNum)
 		return mgArgErr;
 	size->q = 0;
-#if MacOSX
+#if usesHFSPath
 	return OSErrToLVErr(FSGetForkSize(ioRefNum, &(size->q)));
-#elif Unix
+#elif usesPosixPath
 	errno = 0;
 	tell.q = ftello64(ioRefNum);
 	if (tell.q == - 1)
@@ -827,7 +864,7 @@
 	{
 		return UnixToLVFileErr();
 	}
-#elif Win32
+#elif usesWinPath
 	tell.q = 0;
 	tell.l.lo = SetFilePointer(ioRefNum, 0, &tell.l.hi, FILE_CURRENT);
 	if (tell.l.lo == INVALID_SET_FILE_POINTER && GetLastError() != NO_ERROR)
@@ -856,9 +893,9 @@
 
 static MgErr lvfile_SetSize(FileRefNum ioRefNum, FileOffset *size)
 {
-#if Unix || Win32
+#if usesPosixPath || usesWinPath
 	FileOffset tell;
-#if Win32
+#if usesWinPath
 	MgErr err = mgNoErr;
 #endif
 #endif
@@ -866,9 +903,9 @@
 		return mgArgErr;
 	if (size->q < 0)
 		return mgArgErr;
-#if MacOSX
+#if usesHFSPath
 	return OSErrToLVErr(FSSetForkSize(ioRefNum, fsFromStart, size->q));
-#elif Unix
+#elif usesPosixPath
 	errno = 0;
 	if (fflush(ioRefNum) != 0)
 	{
@@ -887,8 +924,8 @@
 	{
 		return UnixToLVFileErr();
 	}
-#elif Win32
-	tell.q = 0;
+#elif usesWinPath
+    tell.q = 0;
 	tell.l.lo = SetFilePointer(ioRefNum, 0, &tell.l.hi, FILE_CURRENT);
 	if (tell.l.lo == INVALID_SET_FILE_POINTER && GetLastError() != NO_ERROR)
 	{
@@ -924,11 +961,11 @@
 
 static MgErr lvfile_SetFilePos(FileRefNum ioRefNum, FileOffset *offs, uInt16 mode)
 {
-#if MacOSX
+#if usesHFSPath
 	OSErr ret;
-#elif Unix || Win32
+#elif usesPosixPath || usesWinPath
 	FileOffset size, sought, tell;
-#if Win32
+#if usesWinPath
 	MgErr err = mgNoErr;
 #endif
 #endif
@@ -937,7 +974,7 @@
 
 	if ((offs->q == 0) && (mode == fCurrent))
 		return noErr;
-#if MacOSX
+#if usesHFSPath
 	ret = FSSetForkPosition(ioRefNum, mode, offs->q);
 	if (ret == posErr)
 	{
@@ -948,7 +985,7 @@
 		ret = FSSetForkPosition(ioRefNum, fsFromLEOF, 0);
 	}
 	return OSErrToLVErr(ret);
-#elif Unix
+#elif usesPosixPath
 	errno = 0;
 	if (mode == fCurrent)
 	{
@@ -991,7 +1028,7 @@
 	{
 		return UnixToLVFileErr();
 	}
-#elif Win32
+#elif usesWinPath
 	size.l.lo = GetFileSize(ioRefNum, &size.l.hi);
 	if (size.l.lo == INVALID_FILE_SIZE && GetLastError() != NO_ERROR)
 	{
@@ -1046,16 +1083,16 @@
 {
 	if (0 == ioRefNum)
 		return mgArgErr;
-#if MacOSX
+#if usesHFSPath
 	return OSErrToLVErr(FSGetForkPosition(ioRefNum, &tell->q));
-#elif Unix
+#elif usesPosixPath
 	errno = 0;
 	tell->q = ftello64(ioRefNum);
 	if (tell->q == -1)
 	{
 		return UnixToLVFileErr();
 	}
-#elif Win32
+#elif usesWinPath
 	tell->l.hi = 0;
 	tell->l.lo = SetFilePointer(ioRefNum, 0, &tell->l.hi, FILE_CURRENT);
 	if (tell->l.lo == INVALID_SET_FILE_POINTER /* && GetLastError() != NO_ERROR */)
@@ -1068,84 +1105,85 @@
 
 static MgErr lvfile_Read(FileRefNum ioRefNum, uInt32 inCount, uInt32 *outCount, UPtr buffer)
 {
-#if Unix
-	MgErr	err = mgNoErr;
+    MgErr	err = mgNoErr;
+#if usesPosixPath || usesWinPath
 	int		actCount;
-#elif Win32
-	Bool32	readSuccess;
-	int		actCount;
 #endif
-	if (0 == ioRefNum)
+
+    if (0 == ioRefNum)
 		return mgArgErr;
-#if MacOSX
-	return FMRead(ioRefNum, inCount, (int32*)&outCount, buffer);
-#elif Unix
+    if (outCount)
+        *outCount = 0;
+
+#if usesHFSPath
+	err = OSErrToLVErr(FSRead(ioRefNum, (SInt32*)&inCount, buffer));
+    if (!err && outCount)
+        *outCount = inCount;
+#elif usesPosixPath
 	errno = 0;
 	actCount = fread((char *)buffer, 1, inCount, ioRefNum);
 	if (ferror(ioRefNum))
 	{
-		err = fIOErr;
 		clearerr(ioRefNum);
+        return fIOErr;
 	}
-	else if (feof(ioRefNum))
+	if (feof(ioRefNum))
 	{
-		err = fEOF;
 		clearerr(ioRefNum);
+        err = fEOF;
 	}
-	if (outCount)
-		*outCount = actCount;
-	return err;
-#elif Win32
-	readSuccess = ReadFile(ioRefNum, buffer, inCount, &actCount, NULL);
-	if (outCount)
+    if (outCount)
+        *outCount = actCount;
+#elif usesWinPath
+	if (!ReadFile(ioRefNum, buffer, inCount, &actCount, NULL))
 	{
-		*outCount = actCount;
-	}
-	if (!readSuccess)
-	{
 		return Win32ToLVFileErr();
 	}
-
-	if (actCount == inCount)
+    if (outCount)
+        *outCount = actCount;
+	if (actCount != inCount)
 	{
-		return mgNoErr;
+		err = fEOF;
 	}
-	else
-	{
-		return fEOF;
-	}
 #endif
+    return err;
 }
 
 static MgErr lvfile_Write(FileRefNum ioRefNum, uInt32 inCount, uInt32 *outCount, UPtr buffer)
 {
-#if Unix || Win32
-	MgErr err = mgNoErr;
+    MgErr err = mgNoErr;
+#if usesPosixPath || usesWinPath
 	int actCount;
 #endif
 
 	if (0 == ioRefNum)
 		return mgArgErr;
-#if MacOSX
-	return FMWrite(ioRefNum, inCount, (int32*)outCount, buffer);
-#elif Win32
+    if (outCount)
+        *outCount = 0;
+
+#if usesHFSPath
+    err = OSErrToLVErr(FSWrite(ioRefNum, (SInt32*)outCount, buffer));
+    if (!err && outCount)
+        *outCount = inCount;
+#elif usesPosixPath
+    errno = 0;
+    actCount = fwrite((char *)buffer, 1, inCount, ioRefNum);
+    if (ferror(ioRefNum))
+    {
+        clearerr(ioRefNum);
+        return fIOErr;
+    }
+    if (outCount)
+        *outCount = actCount;
+#elif usesWinPath
 	if (!WriteFile(ioRefNum, buffer, inCount, &actCount, NULL))
-		err = Win32ToLVFileErr();
+    {
+		return Win32ToLVFileErr();
+    }
 	if (outCount)
 		*outCount = actCount;
+#endif
     return err;
-#elif Unix
-	errno = 0;
-	actCount = fwrite((char *)buffer, 1, inCount, ioRefNum);
-	if (ferror(ioRefNum))
-	{
-		err = fIOErr;
-		clearerr(ioRefNum);
-	}
-	if (outCount)
-		*outCount = actCount;
-    return err;
-#endif
 }
 
 LibAPI(MgErr) LVFile_OpenFile(LVRefNum *refnum, Path path, uInt8 rsrc, uInt32 openMode, uInt32 denyMode)
@@ -1153,21 +1191,20 @@
     MgErr err;
 	int32 type;
 	FileRefNum ioRefNum;
-    LStrPtr lstr;
-#if MacOSX
+#if usesHFSPath
     FSRef ref;
 	HFSUniStr255 forkName;
     int8 perm;
+    OSErr ret;
+#elif usesPosixPath
+    LStrPtr lstr;
     struct stat statbuf;
     char theMode[4];
-    OSErr ret;
-#elif Win32
+#elif usesWinPath
+    LStrPtr lstr;
     DWORD shareAcc, openAcc;
     DWORD createMode = OPEN_EXISTING;
     int32 attempts;
-#elif Unix
-    uChar theMode[3];
-    struct stat statbuf;
 #endif
     *refnum = 0;
     
@@ -1177,7 +1214,7 @@
 	
 	if ((type != fAbsPath) && (type != fUNCPath)) 
 		return mgArgErr;
-#if Win32
+#if usesWinPath
     if (FDepth(path) == 1L)
 		return mgArgErr;
 
@@ -1240,31 +1277,28 @@
 	{
 		err = Win32ToLVFileErr();
 	}
-#elif Unix || MacOSX
+#elif usesPosixPath
  #if Unix
 	if (rsrc)
 	{
 		return mgNotSupported;
 	}
 	else
+#endif
 	{
- #else
-	if (rsrc & 0x2)
-	{
- #endif
 		switch (openMode)
 		{
 			case openWriteOnly:
 				/* Treat write-only as read-write, since you can't open a file for write-only
 				   using buffered i/o functions without truncating the file. */
 			case openReadWrite:
-				StrCpy(theMode, (uChar *)"r+");
+				strcpy(theMode, "r+");
 				break;
 			case openReadOnly:
-				StrCpy(theMode, (uChar *)"r");
+				strcpy(theMode, "r");
 				break;
 			case openWriteOnlyTruncate:
-				StrCpy(theMode, (uChar *)"w");
+				strcpy(theMode, "w");
 				break;
 			default:
 				return mgArgErr;
@@ -1281,7 +1315,7 @@
 		}
 
 		err = MakePathDSString(path, &lstr, 5);
-		if (!err && rsrc & 0x1)
+		if (!err && rsrc)
 		{
 			strcpy((char*)(LStrBuf(lstr) + LStrLen(lstr)), "/rsrc");
 		}
@@ -1318,69 +1352,65 @@
 			}
 		}
  #endif
+ 	}
+#elif usesHFSPath
+    err = FSMakePathRef(path, &ref);
+    if (err)
+	{
+		DEBUGPRINTF(((CStr)"FSMakePathRef: err = %ld", err));
+		return err;
 	}
- #if MacOSX
-	else
+
+	switch (openMode)
 	{
-        err = FSMakePathRef(path, &ref);
-		if (err)
-		{
-			DEBUGPRINTF(("FSMakePathRef: err = %ld", err));
-			return err;
-		}
+		case openReadWrite:
+			perm = fsRdWrPerm;
+			break;
+		case openReadOnly:
+			perm = fsRdPerm;
+			break;
+		case openWriteOnly:
+		case openWriteOnlyTruncate:
+			perm = fsWrPerm;
+			break;
+		default:
+			return mgArgErr;
+	}
 
-		switch (openMode)
-		{
-			case openReadWrite:
-				perm = fsRdWrPerm;
-				break;
-			case openReadOnly:
-				perm = fsRdPerm;
-				break;
-			case openWriteOnly:
-			case openWriteOnlyTruncate:
-				perm = fsWrPerm;
-				break;
-			default:
-				return mgArgErr;
-		}
+	switch (denyMode)
+	{
+		case denyReadWrite:
+			perm |= fsRdDenyPerm | fsWrDenyPerm;
+			break;
+		case denyWriteOnly:
+			perm |= fsWrDenyPerm;
+			break;
+		case denyNeither:
+			/* leave all deny mode bits clear */
+			break;
+		default:
+			return mgArgErr;
+	}
 
-		switch (denyMode)
-		{
-			case denyReadWrite:
-				perm |= fsRdDenyPerm | fsWrDenyPerm;
-				break;
-			case denyWriteOnly:
-				perm |= fsWrDenyPerm;
-				break;
-			case denyNeither:
-				/* leave all deny mode bits clear */
-				break;
-			default:
-				return mgArgErr;
-		}
-
-		if (rsrc)
-		{
-			ret = FSGetResourceForkName(&forkName);
-		}
-		else
-		{
-			ret = FSGetDataForkName(&forkName);
-		}
-		if (ret == noErr)
-		{
-			ret = FSOpenFork(&ref, forkName.length, forkName.unicode, perm, &ioRefNum);
-		}
-		err = OSErrToLVErr(ret);
-		if (!err && openMode == openWriteOnlyTruncate)
-		{
-			FileOffset size;
-			size.q = 0;
-			err = lvfile_SetSize(ioRefNum, &size);
-		}
+    if (rsrc)
+	{
+		ret = FSGetResourceForkName(&forkName);
 	}
- #endif
+	else
+	{
+		ret = FSGetDataForkName(&forkName);
+	}
+	if (ret == noErr)
+	{
+		ret = FSOpenFork(&ref, forkName.length, forkName.unicode, perm, &ioRefNum);
+	}
+	err = OSErrToLVErr(ret);
+	if (!err && openMode == openWriteOnlyTruncate)
+	{
+		FileOffset size;
+		size.q = 0;
+		err = lvfile_SetSize(ioRefNum, &size);
+	}
 #else
 	err = mgNotSupported;
 #endif
@@ -1391,7 +1421,7 @@
 	if (err)
 	{
 		lvfile_CloseFile(ioRefNum);
-		DEBUGPRINTF(("OpenFile: err = %ld, rsrc = %d", err, (int16)rsrc));
+		DEBUGPRINTF(((CStr)"OpenFile: err = %ld, rsrc = %d", err, (int16)rsrc));
 	}
 	return err;
 }
@@ -1508,10 +1538,7 @@
 	CFStringEncoding encoding = CFStringConvertWindowsCodepageToEncoding(codePage);
 	if (encoding == kCFStringEncodingInvalidId)
 	{
-		if (codePage == CP_ACP)
-			encoding = GetApplicationTextEncoding();
-		else if (codePage == CP_OEMCP)
-			encoding = CFStringGetSystemEncoding();
+		encoding = CFStringGetSystemEncoding();
 	}
 	return encoding;
 }
@@ -1522,7 +1549,8 @@
 #if Win32
 	return acp ? GetACP() : GetOEMCP();
 #elif MacOSX
-	CFStringEncoding encoding = acp ? GetApplicationTextEncoding() : CFStringGetSystemEncoding();
+    Unused(acp);
+	CFStringEncoding encoding = CFStringGetSystemEncoding();
 	return CFStringConvertEncodingToWindowsCodepage(encoding);
 #else
     if (utf8_is_current_mbcs())
@@ -1586,8 +1614,9 @@
 LibAPI(MgErr) ConvertCPath(ConstCStr src, int32 srclen, uInt32 srccp, LStrHandle *dest, uInt32 destcp, char defaultChar, LVBoolean *defUsed, LVBoolean isDir)
 {
     MgErr err = mgNotSupported;
-#if Win32
-	err = ConvertCString(src, srclen, srccp, dest, destcp, defaultChar, defUsed);
+#if usesWinPath
+    Unused(isDir);
+    err = ConvertCString(src, srclen, srccp, dest, destcp, defaultChar, defUsed);
 	if (!err)
 	{
 		int32 len = LStrLen(**dest);
@@ -1606,9 +1635,12 @@
 			}
 		}
 	}
-#elif Unix
+#elif usesPosixPath
+    Unused(isDir);
 	err = ConvertCString(src, srclen, srccp, dest, destcp, defaultChar, defUsed);
-#elif MacOSX
+#elif usesHFSPath
+    Unused(defaultChar);
+    Unused(defUsed);
 	CFStringEncoding encoding = ConvertCodepageToEncoding(srccp);
 	if (encoding != kCFStringEncodingInvalidId)
 	{
@@ -1709,7 +1741,8 @@
 LibAPI(MgErr) ConvertLPath(const LStrHandle src, uInt32 srccp, LStrHandle *dest, uInt32 destcp, char defaultChar, LVBoolean *defUsed, LVBoolean isDir)
 {
     MgErr err = mgNotSupported;
-#if Win32
+#if usesWinPath
+    Unused(isDir);
 	err = ConvertLString(src, srccp, dest, destcp, defaultChar, defUsed);
 	if (!err)
 	{
@@ -1729,9 +1762,12 @@
 			}
 		}
 	}
-#elif Unix
+#elif usesPosixPath
+    Unused(isDir);
 	err = ConvertLString(src, srccp, dest, destcp, defaultChar, defUsed);
-#elif MacOSX
+#elif usesHFSPath
+    Unused(defaultChar);
+    Unused(defUsed);
 	CFStringEncoding encoding = ConvertCodepageToEncoding(srccp);
 	if (encoding != kCFStringEncodingInvalidId)
 	{
@@ -2023,10 +2059,11 @@
 			}
 		}
 #elif MacOSX
+        Unused(srclen);
 		CFStringEncoding encoding = ConvertCodepageToEncoding(codePage);
 		if (encoding != kCFStringEncodingInvalidId)
 		{
-			CFStringRef cfpath = CFStringCreateWithCStringNoCopy(kCFAllocatorDefault, src, encoding, kCFAllocatorNull);
+			CFStringRef cfpath = CFStringCreateWithCStringNoCopy(kCFAllocatorDefault, (const char)src, encoding, kCFAllocatorNull);
 			if (cfpath)
 			{
 				CFMutableStringRef cfpath2 = CFStringCreateMutableCopy(kCFAllocatorDefault, 0, cfpath);

Modified: trunk/lvzip/c_source/lvutil.h
===================================================================
--- trunk/lvzip/c_source/lvutil.h	2015-05-01 22:54:47 UTC (rev 1514)
+++ trunk/lvzip/c_source/lvutil.h	2015-05-02 19:48:51 UTC (rev 1515)
@@ -27,9 +27,6 @@
 #define kX64		10
 
 #if defined(macintosh) || defined(__PPCC__) || defined(THINK_C) || defined(__SC__) || defined(__MWERKS__) || defined(__APPLE_CC__)
- #ifdef __APPLE_CC__
-  #define MacOSX 1
- #endif
  #if defined(__powerc) || defined(__ppc__)
   #define ProcessorType	kPPC
   #define BigEndian 1
@@ -320,10 +317,18 @@
 int32 StrNCpy(CStr t, const CStr s, int32 l);
 int32 StrLen(ConstCStr str);
 
+/** @brief Concatenated Pascal string types. */
 typedef struct {
+    int32	cnt;		/* number of pascal strings that follow */
+    uChar	str[1];		/* cnt bytes of concatenated pascal strings */
+} CPStr, *CPStrPtr, **CPStrHandle;
+
+typedef struct {
     int32   cnt; 
     uChar   str[1];
 } LStr, *LStrPtr, **LStrHandle;
+typedef LStr const* ConstLStrP;
+typedef LStr const*const* ConstLStrH;
 
 #define LStrLen(p)  ((p)->cnt)
 #define LStrBuf(p)  ((p)->str)
@@ -468,6 +473,9 @@
 	FMFileType type;
 } FMListDetails;
 
+/** @brief Data types used to describe a list of entries from a directory. */
+typedef CPStr FDirEntRec, *FDirEntPtr, **FDirEntHandle;
+
 /** Type Flags used with FMListDetails */
 #define kIsFile				0x01
 #define kRecognizedType		0x02
@@ -530,6 +538,7 @@
 MgErr FSetInfo64(ConstPath path, FInfo64Ptr infop);
 MgErr FMRead(File fd, int32 inCount, int32* outCount, UPtr buffer);
 MgErr FMWrite(File fd, int32 inCount, int32* outCount, UPtr buffer);
+MgErr FListDir(ConstPath path, FDirEntHandle list, FMListDetails **);
 
 int32 DbgPrintf(CStr fmt, ...);
 
@@ -605,6 +614,7 @@
 LibAPI(MgErr) ZeroTerminateLString(LStrHandle *dest);
 
 LibAPI(uInt32) GetCurrentCodePage(LVBoolean acp);
+LibAPI(uInt32) determine_codepage(uLong *flags, LStrHandle string);
 LibAPI(MgErr) MultiByteCStrToWideString(ConstCStr src, int32 srclen, UStrHandle *dest, uInt32 codePage);
 LibAPI(MgErr) MultiByteToWideString(const LStrHandle src, UStrHandle *dest, uInt32 codePage);
 LibAPI(MgErr) WideStringToMultiByte(const UStrHandle src, LStrHandle *dest, uInt32 codePage, char defaultChar, LVBoolean *defaultCharWasUsed);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opengtoolkit-svn] SF.net SVN: opengtoolkit:[1514] trunk/lvzip/c_source

From: <lab...@us...> - 2015-05-01 22:54:49

Revision: 1514
          http://sourceforge.net/p/opengtoolkit/svn/1514
Author:   labviewer
Date:     2015-05-01 22:54:47 +0000 (Fri, 01 May 2015)
Log Message:
-----------
Updated project file to include the new lvapi.h file

Modified Paths:
--------------
    trunk/lvzip/c_source/lvapi.h
    trunk/lvzip/c_source/zlibvc.vcproj

Modified: trunk/lvzip/c_source/lvapi.h
===================================================================
--- trunk/lvzip/c_source/lvapi.h	2015-05-01 20:56:12 UTC (rev 1513)
+++ trunk/lvzip/c_source/lvapi.h	2015-05-01 22:54:47 UTC (rev 1514)
@@ -1,46 +1,38 @@
-//
-//  lvapi.h
-//  lvzip
-//
-//  Created by imac on 01-05-15.
-//
-//
-
-#ifndef lvzip_lvapi_h
-#define lvzip_lvapi_h
-LibAPI(const char *) lvzlib_zlibVersion(void);
-LibAPI(int) lvzlib_compress(Bytef *dest, uLongf *destLen, const Bytef *source, uLong sourceLen, int level);
-LibAPI(int) lvzlib_uncompress(Bytef *dest, uLongf *destLen, const Bytef *source, uLong sourceLen);
-LibAPI(uInt32) lvzlib_crc32(uInt32 crc, const Bytef *buf, uInt32 len);
-LibAPI(MgErr) lvzlib_zipOpen(const void *pathname, int append, LStrHandle *globalcomment, zlib_filefunc64_def* filefuncs, LVRefNum *refnum);
-LibAPI(MgErr) lvzlib_zipOpenNewFileInZip(LVRefNum *refnum, LStrHandle filename, const zip_fileinfo* zipfi,
-                                         const LStrHandle extrafield_local, const LStrHandle extrafield_global,
-                                         LStrHandle comment, int method, int level, int raw, int windowBits,
-                                         int memLevel, int strategy, const char* password, uLong crcForCrypting, uLong flags, int zip64);
-LibAPI(MgErr) lvzlib_zipWriteInFileInZip(LVRefNum *refnum, const LStrHandle buffer);
-LibAPI(MgErr) lvzlib_zipCloseFileInZipRaw32(LVRefNum *refnum, uInt32 uncompressedSize, uInt32 crc32);
-LibAPI(MgErr) lvzlib_zipCloseFileInZipRaw64(LVRefNum *refnum, uInt64 uncompressedSize, uInt32 crc32);
-LibAPI(MgErr) lvzlib_zipClose(LVRefNum *refnum, const LStrHandle globalComment, LStrHandle *stream);
-
-LibAPI(MgErr) lvzlib_unzOpen(const void *pathname, zlib_filefunc64_def* filefuncs, LVRefNum *refnum);
-LibAPI(MgErr) lvzlib_unzClose(LVRefNum *refnum);
-LibAPI(MgErr) lvzlib_unzGetGlobalInfo32(LVRefNum *refnum, LStrHandle *comment, uInt32 *nEntry);
-LibAPI(MgErr) lvzlib_unzGetGlobalInfo64(LVRefNum *refnum, LStrHandle *comment, uInt64 *nEntry);
-LibAPI(MgErr) lvzlib_unzLocateFile(LVRefNum *refnum, LStrHandle fileName, int iCaseSensitivity);
-LibAPI(MgErr) lvzlib_unzGetCurrentFileInfo32(LVRefNum *refnum, unz_file_info *pfile_info, LStrHandle *fileName,
-                                             LStrHandle *extraField, LStrHandle *comment);
-LibAPI(MgErr) lvzlib_unzGetCurrentFileInfo64(LVRefNum *refnum, unz_file_info64 *pfile_info, LStrHandle *fileName,
-                                             LStrHandle *extraField, LStrHandle *comment);
-LibAPI(MgErr) lvzlib_unzOpenCurrentFile(LVRefNum *refnum, int32* method, int32* level, int16 raw, const char* password);
-LibAPI(MgErr) lvzlib_unzGetLocalExtrafield(LVRefNum *refnum, LStrHandle *extra);
-LibAPI(MgErr) lvzlib_unzReadCurrentFile(LVRefNum *refnum, LStrHandle buffer);
-LibAPI(MgErr) lvzlib_unzCloseCurrentFile(LVRefNum *refnum);
-LibAPI(MgErr) lvzlib_unzGoToFirstFile(LVRefNum *refnum);
-LibAPI(MgErr) lvzlib_unzGoToNextFile(LVRefNum *refnum);
-LibAPI(MgErr) lvzlib_unzGoToFilePos32(LVRefNum *refnum, unz_file_pos *pos);
-LibAPI(MgErr) lvzlib_unzGoToFilePos64(LVRefNum *refnum, unz64_file_pos *pos);
-LibAPI(MgErr) lvzlib_unzGetFilePos32(LVRefNum *refnum, unz_file_pos *pos);
-LibAPI(MgErr) lvzlib_unzGetFilePos64(LVRefNum *refnum, unz64_file_pos *pos);
-
-
-#endif
+#include "lvutil.h"
+#include "zlib.h"
+#include "zip.h"
+#include "unzip.h"
+
+#ifndef lvzip_lvapi_h
+#define lvzip_lvapi_h
+LibAPI(const char *) lvzlib_zlibVersion(void);
+LibAPI(int) lvzlib_compress(Bytef *dest, uLongf *destLen, const Bytef *source, uLong sourceLen, int level);
+LibAPI(int) lvzlib_uncompress(Bytef *dest, uLongf *destLen, const Bytef *source, uLong sourceLen);
+LibAPI(uInt32) lvzlib_crc32(uInt32 crc, const Bytef *buf, uInt32 len);
+LibAPI(MgErr) lvzlib_zipOpen(const void *pathname, int append, LStrHandle *globalcomment, zlib_filefunc64_def* filefuncs, LVRefNum *refnum);
+LibAPI(MgErr) lvzlib_zipOpenNewFileInZip(LVRefNum *refnum, LStrHandle filename, const zip_fileinfo* zipfi,
+						   const LStrHandle extrafield_local, const LStrHandle extrafield_global,
+						   LStrHandle comment, int method, int level, int raw, int windowBits,
+						   int memLevel, int strategy, const char* password, uLong crcForCrypting, uLong flags, int zip64);
+LibAPI(MgErr) lvzlib_zipWriteInFileInZip(LVRefNum *refnum, const LStrHandle buffer);
+LibAPI(MgErr) lvzlib_zipCloseFileInZipRaw32(LVRefNum *refnum, uInt32 uncompressedSize, uInt32 crc32);
+LibAPI(MgErr) lvzlib_zipCloseFileInZipRaw64(LVRefNum *refnum, uInt64 uncompressedSize, uInt32 crc32);
+LibAPI(MgErr) lvzlib_zipClose(LVRefNum *refnum, const LStrHandle globalComment, LStrHandle *stream);
+LibAPI(MgErr) lvzlib_unzOpen(const void *pathname, zlib_filefunc64_def* filefuncs, LVRefNum *refnum);
+LibAPI(MgErr) lvzlib_unzClose(LVRefNum *refnum);
+LibAPI(MgErr) lvzlib_unzGetGlobalInfo32(LVRefNum *refnum, LStrHandle *comment, uInt32 *nEntry);
+LibAPI(MgErr) lvzlib_unzGetGlobalInfo64(LVRefNum *refnum, LStrHandle *comment, uInt64 *nEntry);
+LibAPI(MgErr) lvzlib_unzLocateFile(LVRefNum *refnum, LStrHandle fileName, int iCaseSensitivity);
+LibAPI(MgErr) lvzlib_unzGetCurrentFileInfo32(LVRefNum *refnum, unz_file_info *pfile_info, LStrHandle *fileName, LStrHandle *extraField, LStrHandle *comment);
+LibAPI(MgErr) lvzlib_unzGetCurrentFileInfo64(LVRefNum *refnum, unz_file_info64 *pfile_info, LStrHandle *fileName, LStrHandle *extraField, LStrHandle *comment);
+LibAPI(MgErr) lvzlib_unzOpenCurrentFile(LVRefNum *refnum, int32* method, int32* level, int16 raw, const char* password);
+LibAPI(MgErr) lvzlib_unzGetLocalExtrafield(LVRefNum *refnum, LStrHandle *extra);
+LibAPI(MgErr) lvzlib_unzReadCurrentFile(LVRefNum *refnum, LStrHandle buffer);
+LibAPI(MgErr) lvzlib_unzCloseCurrentFile(LVRefNum *refnum);
+LibAPI(MgErr) lvzlib_unzGoToFirstFile(LVRefNum *refnum);
+LibAPI(MgErr) lvzlib_unzGoToNextFile(LVRefNum *refnum);
+LibAPI(MgErr) lvzlib_unzGoToFilePos32(LVRefNum *refnum, unz_file_pos *pos);
+LibAPI(MgErr) lvzlib_unzGoToFilePos64(LVRefNum *refnum, unz64_file_pos *pos);
+LibAPI(MgErr) lvzlib_unzGetFilePos32(LVRefNum *refnum, unz_file_pos *pos);
+LibAPI(MgErr) lvzlib_unzGetFilePos64(LVRefNum *refnum, unz64_file_pos *pos);
+#endif

Modified: trunk/lvzip/c_source/zlibvc.vcproj
===================================================================
--- trunk/lvzip/c_source/zlibvc.vcproj	2015-05-01 20:56:12 UTC (rev 1513)
+++ trunk/lvzip/c_source/zlibvc.vcproj	2015-05-01 22:54:47 UTC (rev 1514)
@@ -1674,6 +1674,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\lvapi.h"
+				>
+			</File>
+			<File
 				RelativePath="lvutil.h"
 				>
 			</File>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opengtoolkit-svn] SF.net SVN: opengtoolkit:[1513] trunk/lvzip/tests/lvzip-test-memory stream. vi

From: <lab...@us...> - 2015-05-01 20:56:15

Revision: 1513
          http://sourceforge.net/p/opengtoolkit/svn/1513
Author:   labviewer
Date:     2015-05-01 20:56:12 +0000 (Fri, 01 May 2015)
Log Message:
-----------
Fix an error in the loop termination which did only execute once instead of 10 times when generating test strings

Modified Paths:
--------------
    trunk/lvzip/tests/lvzip-test-memory stream.vi

Modified: trunk/lvzip/tests/lvzip-test-memory stream.vi
===================================================================
(Binary files differ)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opengtoolkit-svn] SF.net SVN: opengtoolkit:[1512] trunk/lvzip/c_source

From: <lab...@us...> - 2015-05-01 20:41:57

Revision: 1512
          http://sourceforge.net/p/opengtoolkit/svn/1512
Author:   labviewer
Date:     2015-05-01 20:41:54 +0000 (Fri, 01 May 2015)
Log Message:
-----------
Fix call to LabVIEW file manager functions

Modified Paths:
--------------
    trunk/lvzip/c_source/lvutil.c
    trunk/lvzip/c_source/lvutil.h

Modified: trunk/lvzip/c_source/lvutil.c
===================================================================
--- trunk/lvzip/c_source/lvutil.c	2015-05-01 20:27:03 UTC (rev 1511)
+++ trunk/lvzip/c_source/lvutil.c	2015-05-01 20:41:54 UTC (rev 1512)
@@ -1068,9 +1068,7 @@
 
 static MgErr lvfile_Read(FileRefNum ioRefNum, uInt32 inCount, uInt32 *outCount, UPtr buffer)
 {
-#if MacOSX
-	OSErr	err;
-#elif Unix
+#if Unix
 	MgErr	err = mgNoErr;
 	int		actCount;
 #elif Win32
@@ -1080,19 +1078,7 @@
 	if (0 == ioRefNum)
 		return mgArgErr;
 #if MacOSX
-	err = FMRead(ioRefNum, (int32*)&inCount, buffer);
-	if (outCount)
-	{
-		if (err && err != eofErr)
-		{
-			*outCount = 0L;
-		}
-		else
-		{
-			*outCount = inCount;
-		}
-	}
-	return OSErrToLVErr(err);
+	return FMRead(ioRefNum, inCount, (int32*)&outCount, buffer);
 #elif Unix
 	errno = 0;
 	actCount = fread((char *)buffer, 1, inCount, ioRefNum);
@@ -1133,9 +1119,7 @@
 
 static MgErr lvfile_Write(FileRefNum ioRefNum, uInt32 inCount, uInt32 *outCount, UPtr buffer)
 {
-#if MacOSX
-	OSErr err;
-#elif Unix || Win32
+#if Unix || Win32
 	MgErr err = mgNoErr;
 	int actCount;
 #endif
@@ -1143,19 +1127,7 @@
 	if (0 == ioRefNum)
 		return mgArgErr;
 #if MacOSX
-	err = FMWrite(ioRefNum, (int32*)&inCount, buffer);
-	if (outCount)
-	{
-		if (err && err != dskFulErr)
-		{
-			*outCount = 0L;
-		}
-		else
-		{
-			*outCount = inCount;
-		}
-	}
-	return OSErrToLVErr(err);
+	return FMWrite(ioRefNum, inCount, (int32*)outCount, buffer);
 #elif Win32
 	if (!WriteFile(ioRefNum, buffer, inCount, &actCount, NULL))
 		err = Win32ToLVFileErr();

Modified: trunk/lvzip/c_source/lvutil.h
===================================================================
--- trunk/lvzip/c_source/lvutil.h	2015-05-01 20:27:03 UTC (rev 1511)
+++ trunk/lvzip/c_source/lvutil.h	2015-05-01 20:41:54 UTC (rev 1512)
@@ -528,6 +528,8 @@
 MgErr FGetInfo64(ConstPath path, FInfo64Ptr infop, FGetInfoWhich which);
 MgErr FSetInfo(ConstPath path, FInfoPtr infop);
 MgErr FSetInfo64(ConstPath path, FInfo64Ptr infop);
+MgErr FMRead(File fd, int32 inCount, int32* outCount, UPtr buffer);
+MgErr FMWrite(File fd, int32 inCount, int32* outCount, UPtr buffer);
 
 int32 DbgPrintf(CStr fmt, ...);
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opengtoolkit-svn] SF.net SVN: opengtoolkit:[1511] trunk/lvzip/c_source

From: <lab...@us...> - 2015-05-01 20:27:05

Revision: 1511
          http://sourceforge.net/p/opengtoolkit/svn/1511
Author:   labviewer
Date:     2015-05-01 20:27:03 +0000 (Fri, 01 May 2015)
Log Message:
-----------
Fix some errors

Modified Paths:
--------------
    trunk/lvzip/c_source/lvapi.c
    trunk/lvzip/c_source/lvutil.c
    trunk/lvzip/c_source/lvzip.xcodeproj/project.pbxproj
    trunk/lvzip/c_source/zip.h

Added Paths:
-----------
    trunk/lvzip/c_source/lvapi.h

Modified: trunk/lvzip/c_source/lvapi.c
===================================================================
--- trunk/lvzip/c_source/lvapi.c	2015-04-25 21:49:03 UTC (rev 1510)
+++ trunk/lvzip/c_source/lvapi.c	2015-05-01 20:27:03 UTC (rev 1511)
@@ -4,6 +4,7 @@
 #include "zip.h"
 #include "unzip.h"
 #include <string.h>
+#include "lvapi.h"
 
 #ifndef VERSIONMADEBY
 # define VERSIONMADEBY   (0x0) /* platform depedent */
@@ -231,12 +232,11 @@
 {
 	zipFile node;
 	MgErr err = lvzlibGetRefnum(refnum, &node, ZipMagic);
-	if(!err)
+	if (!err)
 	{
 		int retval = zipWriteInFileInZip(node, LStrBuf(*buffer), LStrLen(*buffer));
 		if (retval < 0)
 			return LibToMgErr(retval);
-		LStrLen(*buffer) = retval;
 	}
 	return err;
 }
@@ -271,7 +271,10 @@
 	{
 		int retval;
 		LStrHandle comment = NULL;
-		if (globalComment && LStrLen(*globalComment) > 0)
+        
+        *refnum = kNotARefNum;
+
+        if (globalComment && LStrLen(*globalComment) > 0)
 		{
 			err = ConvertLString(globalComment, CP_ACP, &comment, CP_OEMCP, 0, NULL);
 			if (err)

Added: trunk/lvzip/c_source/lvapi.h
===================================================================
--- trunk/lvzip/c_source/lvapi.h	                        (rev 0)
+++ trunk/lvzip/c_source/lvapi.h	2015-05-01 20:27:03 UTC (rev 1511)
@@ -0,0 +1,46 @@
+//
+//  lvapi.h
+//  lvzip
+//
+//  Created by imac on 01-05-15.
+//
+//
+
+#ifndef lvzip_lvapi_h
+#define lvzip_lvapi_h
+LibAPI(const char *) lvzlib_zlibVersion(void);
+LibAPI(int) lvzlib_compress(Bytef *dest, uLongf *destLen, const Bytef *source, uLong sourceLen, int level);
+LibAPI(int) lvzlib_uncompress(Bytef *dest, uLongf *destLen, const Bytef *source, uLong sourceLen);
+LibAPI(uInt32) lvzlib_crc32(uInt32 crc, const Bytef *buf, uInt32 len);
+LibAPI(MgErr) lvzlib_zipOpen(const void *pathname, int append, LStrHandle *globalcomment, zlib_filefunc64_def* filefuncs, LVRefNum *refnum);
+LibAPI(MgErr) lvzlib_zipOpenNewFileInZip(LVRefNum *refnum, LStrHandle filename, const zip_fileinfo* zipfi,
+                                         const LStrHandle extrafield_local, const LStrHandle extrafield_global,
+                                         LStrHandle comment, int method, int level, int raw, int windowBits,
+                                         int memLevel, int strategy, const char* password, uLong crcForCrypting, uLong flags, int zip64);
+LibAPI(MgErr) lvzlib_zipWriteInFileInZip(LVRefNum *refnum, const LStrHandle buffer);
+LibAPI(MgErr) lvzlib_zipCloseFileInZipRaw32(LVRefNum *refnum, uInt32 uncompressedSize, uInt32 crc32);
+LibAPI(MgErr) lvzlib_zipCloseFileInZipRaw64(LVRefNum *refnum, uInt64 uncompressedSize, uInt32 crc32);
+LibAPI(MgErr) lvzlib_zipClose(LVRefNum *refnum, const LStrHandle globalComment, LStrHandle *stream);
+
+LibAPI(MgErr) lvzlib_unzOpen(const void *pathname, zlib_filefunc64_def* filefuncs, LVRefNum *refnum);
+LibAPI(MgErr) lvzlib_unzClose(LVRefNum *refnum);
+LibAPI(MgErr) lvzlib_unzGetGlobalInfo32(LVRefNum *refnum, LStrHandle *comment, uInt32 *nEntry);
+LibAPI(MgErr) lvzlib_unzGetGlobalInfo64(LVRefNum *refnum, LStrHandle *comment, uInt64 *nEntry);
+LibAPI(MgErr) lvzlib_unzLocateFile(LVRefNum *refnum, LStrHandle fileName, int iCaseSensitivity);
+LibAPI(MgErr) lvzlib_unzGetCurrentFileInfo32(LVRefNum *refnum, unz_file_info *pfile_info, LStrHandle *fileName,
+                                             LStrHandle *extraField, LStrHandle *comment);
+LibAPI(MgErr) lvzlib_unzGetCurrentFileInfo64(LVRefNum *refnum, unz_file_info64 *pfile_info, LStrHandle *fileName,
+                                             LStrHandle *extraField, LStrHandle *comment);
+LibAPI(MgErr) lvzlib_unzOpenCurrentFile(LVRefNum *refnum, int32* method, int32* level, int16 raw, const char* password);
+LibAPI(MgErr) lvzlib_unzGetLocalExtrafield(LVRefNum *refnum, LStrHandle *extra);
+LibAPI(MgErr) lvzlib_unzReadCurrentFile(LVRefNum *refnum, LStrHandle buffer);
+LibAPI(MgErr) lvzlib_unzCloseCurrentFile(LVRefNum *refnum);
+LibAPI(MgErr) lvzlib_unzGoToFirstFile(LVRefNum *refnum);
+LibAPI(MgErr) lvzlib_unzGoToNextFile(LVRefNum *refnum);
+LibAPI(MgErr) lvzlib_unzGoToFilePos32(LVRefNum *refnum, unz_file_pos *pos);
+LibAPI(MgErr) lvzlib_unzGoToFilePos64(LVRefNum *refnum, unz64_file_pos *pos);
+LibAPI(MgErr) lvzlib_unzGetFilePos32(LVRefNum *refnum, unz_file_pos *pos);
+LibAPI(MgErr) lvzlib_unzGetFilePos64(LVRefNum *refnum, unz64_file_pos *pos);
+
+
+#endif

Modified: trunk/lvzip/c_source/lvutil.c
===================================================================
--- trunk/lvzip/c_source/lvutil.c	2015-04-25 21:49:03 UTC (rev 1510)
+++ trunk/lvzip/c_source/lvutil.c	2015-05-01 20:27:03 UTC (rev 1511)
@@ -72,10 +72,9 @@
 	if (!posixPath)
 		return mgArgErr;
 
-	if (*posixPath)
-		LStrLen(**posixPath) = 0;
-
 	fileRef = CFStringCreateWithBytes(kCFAllocatorDefault, LStrBuf(*hfsPath), LStrLen(*hfsPath), encoding, false);
+    if (*posixPath)
+        LStrLen(**posixPath) = 0;
     if (!fileRef)
     {
 		return mFullErr;
@@ -759,7 +758,7 @@
 		{
 			err = FPathToText(path, **str);
 			LStrLen(**str) = pathLen;
-#if MacOSX
+#if MacOSX && (ProcessorType == kX86)
 			if (!err)
 				err = ConvertToPosixPath(*str, str, false);
 #endif
@@ -1081,7 +1080,7 @@
 	if (0 == ioRefNum)
 		return mgArgErr;
 #if MacOSX
-	err = FSRead(ioRefNum, (int32*)&inCount, buffer);
+	err = FMRead(ioRefNum, (int32*)&inCount, buffer);
 	if (outCount)
 	{
 		if (err && err != eofErr)
@@ -1144,7 +1143,7 @@
 	if (0 == ioRefNum)
 		return mgArgErr;
 #if MacOSX
-	err = FSWrite(ioRefNum, (int32*)&inCount, buffer);
+	err = FMWrite(ioRefNum, (int32*)&inCount, buffer);
 	if (outCount)
 	{
 		if (err && err != dskFulErr)

Modified: trunk/lvzip/c_source/lvzip.xcodeproj/project.pbxproj
===================================================================
--- trunk/lvzip/c_source/lvzip.xcodeproj/project.pbxproj	2015-04-25 21:49:03 UTC (rev 1510)
+++ trunk/lvzip/c_source/lvzip.xcodeproj/project.pbxproj	2015-05-01 20:27:03 UTC (rev 1511)
@@ -86,6 +86,7 @@
 		839542BA0894F2490020C3E2 /* adler32.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = adler32.c; sourceTree = "<group>"; };
 		83D3E1AF080D116E00DE332C /* lvzlib.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = lvzlib.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		83D3E26C080D117700DE332C /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = "<absolute>"; };
+		88521A381AF4145000A9CDF7 /* lvapi.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = lvapi.h; sourceTree = "<group>"; };
 		888E74391ADD96A900C5AEFE /* utf.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = utf.c; sourceTree = "<group>"; };
 		888E743B1ADD96C200C5AEFE /* utf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = utf.h; sourceTree = "<group>"; };
 		888E743D1ADD96D700C5AEFE /* lvapi.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = lvapi.c; sourceTree = "<group>"; };
@@ -128,6 +129,7 @@
 		83D3E1B5080D116E00DE332C /* zlib Sources */ = {
 			isa = PBXGroup;
 			children = (
+				88521A381AF4145000A9CDF7 /* lvapi.h */,
 				888E743D1ADD96D700C5AEFE /* lvapi.c */,
 				888E743B1ADD96C200C5AEFE /* utf.h */,
 				888E74391ADD96A900C5AEFE /* utf.c */,
@@ -294,7 +296,7 @@
 		C77CC6B50C9C7C6500886AB2 /* Development */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
 				COPY_PHASE_STRIP = NO;
 				GCC_ALTIVEC_EXTENSIONS = NO;
 				GCC_CHAR_IS_UNSIGNED_CHAR = NO;
@@ -341,7 +343,7 @@
 		C77CC6B60C9C7C6500886AB2 /* Deployment */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
 				COPY_PHASE_STRIP = YES;
 				GCC_ALTIVEC_EXTENSIONS = NO;
 				GCC_CHAR_IS_UNSIGNED_CHAR = NO;
@@ -385,7 +387,7 @@
 		C77CC6B70C9C7C6500886AB2 /* Default */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
 				GCC_ALTIVEC_EXTENSIONS = NO;
 				GCC_CHAR_IS_UNSIGNED_CHAR = NO;
 				GCC_ENABLE_CPP_EXCEPTIONS = NO;
@@ -427,7 +429,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				"ADDITIONAL_SDKS[arch=i386]" = "";
-				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
 				GCC_CHAR_IS_UNSIGNED_CHAR = YES;
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
@@ -446,7 +448,7 @@
 		C77CC6BA0C9C7C6500886AB2 /* Deployment */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
 				GCC_CHAR_IS_UNSIGNED_CHAR = YES;
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
@@ -466,7 +468,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				"ADDITIONAL_SDKS[arch=*]" = "";
-				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
 				GCC_CHAR_IS_UNSIGNED_CHAR = YES;
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",

Modified: trunk/lvzip/c_source/zip.h
===================================================================
--- trunk/lvzip/c_source/zip.h	2015-04-25 21:49:03 UTC (rev 1510)
+++ trunk/lvzip/c_source/zip.h	2015-05-01 20:27:03 UTC (rev 1511)
@@ -143,6 +143,8 @@
                                    int append,
                                    zipcharpc* globalcomment,
                                    zlib_filefunc64_def* pzlib_filefunc_def));
+    
+ZEXTERN zipFile ZEXPORT zipOpen3 (const void *pathname, int append, zipcharpc* globalcomment, zlib_filefunc64_32_def* pzlib_filefunc64_32_def);
 
 ZEXTERN int ZEXPORT zipOpenNewFileInZip OF((zipFile file,
                        const char* filename,

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opengtoolkit-svn] SF.net SVN: opengtoolkit:[1510] trunk/lvzip/c_source

From: <lab...@us...> - 2015-04-25 21:49:06

Revision: 1510
          http://sourceforge.net/p/opengtoolkit/svn/1510
Author:   labviewer
Date:     2015-04-25 21:49:03 +0000 (Sat, 25 Apr 2015)
Log Message:
-----------
Fix some more Mac compile errors

Modified Paths:
--------------
    trunk/lvzip/c_source/lvutil.c
    trunk/lvzip/c_source/lvutil.h
    trunk/lvzip/c_source/lvzip.xcodeproj/project.pbxproj
    trunk/lvzip/c_source/utf.c
    trunk/lvzip/c_source/utf.h

Modified: trunk/lvzip/c_source/lvutil.c
===================================================================
--- trunk/lvzip/c_source/lvutil.c	2015-04-14 21:38:01 UTC (rev 1509)
+++ trunk/lvzip/c_source/lvutil.c	2015-04-25 21:49:03 UTC (rev 1510)
@@ -49,6 +49,7 @@
 #elif MacOSX
  #include <CoreFoundation/CoreFoundation.h>
  #include "MacBinaryIII.h"
+ #include <sys/stat.h>
 
  #define MacSpec	FSRef
  #define MacIsInvisible(cpb) ((cpb).hFileInfo.ioFlFndrInfo.fdFlags & kIsInvisible)
@@ -192,7 +193,8 @@
     }
     return fIOErr; /* fIOErr generally signifies some unknown file error */
 }
-#elif Unix || Win32
+#endif
+
 static int32 MakePathDSString(Path path, LStrPtr *lstr, int32 reserve)
 {
     int32 pathLen = -1;
@@ -329,7 +331,6 @@
     return fIOErr;   /* fIOErr generally signifies some unknown file error */
 }
 
-#endif 
 #endif
 
 LibAPI(void) DLLVersion(uChar* version)
@@ -383,7 +384,7 @@
 {
     MgErr err = mgNoErr;
 #if MacOSX
-    FInfoRec64 infoRec;
+    FInfoRec infoRec;
 #elif MacOS
 	FSRef ref;
 #elif Win32
@@ -417,11 +418,11 @@
         infoRec.location.h = fileInfo->location.h;
         infoRec.owner[0] = 0;
         infoRec.group[0] = 0;
-        err = FSetInfo64(path, &infoRec);
+        err = FSetInfo(path, &infoRec);
     }
     else
     {
-        err = FGetInfo64(path, &infoRec, kFGetInfoAll);
+        err = FGetInfo(path, &infoRec /*, kFGetInfoAll*/);
         if (!err)
         {
             fileInfo->creator = infoRec.creator;
@@ -705,7 +706,7 @@
 
 LibAPI(MgErr) LVPath_EncodeMacbinary(Path srcPath, Path dstPath)
 {
-#if MacOS
+#if MacOS && !MacOSX
     MacSpec srcFSSpec;
     MacSpec dstFSSpec;
     MgErr  err;
@@ -727,7 +728,7 @@
 
 LibAPI(MgErr) LVPath_DecodeMacbinary(Path srcPath, Path dstPath)
 {
-#if MacOS
+#if MacOS && !MacOSX
     MacSpec srcFSSpec;
     MacSpec dstFSSpec;
     MgErr  err;
@@ -1186,6 +1187,7 @@
     FSRef ref;
 	HFSUniStr255 forkName;
     int8 perm;
+    struct stat statbuf;
     char theMode[4];
     OSErr ret;
 #elif Win32

Modified: trunk/lvzip/c_source/lvutil.h
===================================================================
--- trunk/lvzip/c_source/lvutil.h	2015-04-14 21:38:01 UTC (rev 1509)
+++ trunk/lvzip/c_source/lvutil.h	2015-04-25 21:49:03 UTC (rev 1510)
@@ -4,6 +4,7 @@
 
    Copyright (C) 2002-2007 Rolf Kalbermatter
 */
+#define test
 #ifndef _lvUtil_H
 #define _lvUtil_H
 
@@ -13,25 +14,86 @@
 extern "C" {
 #endif
 
+    /* Possible values for ProcessorType */
+#define kM68000		1		/* OBSOLETE */
+#define kX86		2
+#define kSparc		3
+#define kPPC		4
+#define kPARISC		5
+#define kMIPS		6
+#define kDECAlpha	7		/* OBSOLETE */
+#define kPIC		8
+#define kARM		9
+#define kX64		10
+
 #if defined(macintosh) || defined(__PPCC__) || defined(THINK_C) || defined(__SC__) || defined(__MWERKS__) || defined(__APPLE_CC__)
- #define MacOS 1
  #ifdef __APPLE_CC__
   #define MacOSX 1
  #endif
- #if defined(__i386__)
+ #if defined(__powerc) || defined(__ppc__)
+  #define ProcessorType	kPPC
+  #define BigEndian 1
+ #elif defined(__i386__)
+  #define ProcessorType	kX86
   #define BigEndian 0
+ #elif defined(__x86_64)
+  #define ProcessorType	kX64
+  #define BigEndian 0
  #else
+  #define ProcessorType	kM68000
   #define BigEndian 1
  #endif
+ #define MacOS 1
+ #ifdef __APPLE_CC__
+  #define MacOSX 1
+ #endif
 #elif defined(WIN32) || defined(_WIN32)  || defined(__WIN32__) || defined(_WIN32_WCE)
+ #ifdef _M_PPC
+  #define ProcessorType	kPPC
+ #elif defined(_M_IX86)
+  #define ProcessorType	kX86
+ #elif defined(_M_X64)
+  #define ProcessorType	kX64
+ #elif defined(_M_ALPHA)
+  #define ProcessorType	kDECAlpha
+ #elif Compiler == kBorlandC
+  #define ProcessorType	kX86
+ #elif defined(_ARM_)
+  #define ProcessorType 	kARM
+ #else
+  #error "We don't know the ProcessorType architecture"
+ #endif
  #define Win32 1
  #if defined(_DEBUG) || defined(_CVI_DEBUG_)
   #define DEBUG 1
  #endif
  #define BigEndian 0
-#elif defined(linux)
+#elif defined(linux) || defined(__linux) || defined(__linux__)
+ #if defined(i386)
+  #define ProcessorType	kX86
+  #define BigEndian		0
+ #elif defined(__alpha)
+  #define ProcessorType	kDECAlpha
+  #define BigEndian		0
+ #elif defined(powerpc)
+  #define ProcessorType	kPPC
+  #define BigEndian		1
+ #elif defined(sparc)
+  #define ProcessorType	kSparc
+  #define BigEndian		1
+ #elif defined(mips)
+  #define ProcessorType	kMIPS
+  #define BigEndian		1
+ #elif defined(arm) || defined(__arm__)
+  #define ProcessorType	kARM
+  #define BigEndian		0
+ #elif defined(__x86_64__)
+  #define ProcessorType	kX64
+  #define BigEndian		0
+ #else
+  #error "Unknown Linux platform"
+ #endif
  #define Unix 1
- #define BigEndian 0
  #define HAVE_FCNTL
  #define HAVE_ICONV
  #define HAVE_WCRTOMB
@@ -39,8 +101,10 @@
  #define Unix 1
  #define VxWorks 1
  #if defined (__ppc)
+  #define ProcessorType	kPPC
   #define BigEndian 1
  #else
+  #define ProcessorType	kX86
   #define BigEndian 0
  #endif
 #else
@@ -514,11 +578,7 @@
 #endif
 } FileOffset;
 
-LibAPI(MgErr) LVFile_OpenFile(LVRefNum *refnum,
-                   Path path,
-                   uInt8 rsrc,
-				   uInt32 openMode,
-				   uInt32 denyMode);
+LibAPI(MgErr) LVFile_OpenFile(LVRefNum *refnum, Path path, uInt8 rsrc, uInt32 openMode, uInt32 denyMode);
 LibAPI(MgErr) LVFile_CloseFile(LVRefNum *refnum);
 LibAPI(MgErr) LVFile_GetSize(LVRefNum *refnum, FileOffset *size);
 LibAPI(MgErr) LVFile_SetSize(LVRefNum *refnum, FileOffset *size);

Modified: trunk/lvzip/c_source/lvzip.xcodeproj/project.pbxproj
===================================================================
--- trunk/lvzip/c_source/lvzip.xcodeproj/project.pbxproj	2015-04-14 21:38:01 UTC (rev 1509)
+++ trunk/lvzip/c_source/lvzip.xcodeproj/project.pbxproj	2015-04-25 21:49:03 UTC (rev 1510)
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 42;
+	objectVersion = 44;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -29,7 +29,6 @@
 		839542DD0894F2490020C3E2 /* zlib.h in Headers */ = {isa = PBXBuildFile; fileRef = 839542A60894F2490020C3E2 /* zlib.h */; };
 		839542DF0894F2490020C3E2 /* zip.h in Headers */ = {isa = PBXBuildFile; fileRef = 839542A80894F2490020C3E2 /* zip.h */; };
 		839542E00894F2490020C3E2 /* zip.c in Sources */ = {isa = PBXBuildFile; fileRef = 839542A90894F2490020C3E2 /* zip.c */; };
-		839542E10894F2490020C3E2 /* zconf.in.h in Headers */ = {isa = PBXBuildFile; fileRef = 839542AA0894F2490020C3E2 /* zconf.in.h */; };
 		839542E20894F2490020C3E2 /* zconf.h in Headers */ = {isa = PBXBuildFile; fileRef = 839542AB0894F2490020C3E2 /* zconf.h */; };
 		839542E30894F2490020C3E2 /* unzip.h in Headers */ = {isa = PBXBuildFile; fileRef = 839542AC0894F2490020C3E2 /* unzip.h */; };
 		839542E40894F2490020C3E2 /* unzip.c in Sources */ = {isa = PBXBuildFile; fileRef = 839542AD0894F2490020C3E2 /* unzip.c */; };
@@ -46,8 +45,6 @@
 		888E743A1ADD96A900C5AEFE /* utf.c in Sources */ = {isa = PBXBuildFile; fileRef = 888E74391ADD96A900C5AEFE /* utf.c */; };
 		888E743C1ADD96C200C5AEFE /* utf.h in Headers */ = {isa = PBXBuildFile; fileRef = 888E743B1ADD96C200C5AEFE /* utf.h */; };
 		888E743E1ADD96D700C5AEFE /* lvapi.c in Sources */ = {isa = PBXBuildFile; fileRef = 888E743D1ADD96D700C5AEFE /* lvapi.c */; };
-		C77CC6BF0C9C7D3200886AB2 /* liblvexports.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C77CC6BE0C9C7D3200886AB2 /* liblvexports.a */; };
-		C77CC6C20C9C7D6500886AB2 /* liblabviewcin.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C77CC6C10C9C7D6500886AB2 /* liblabviewcin.a */; };
 		C79368AC0C9ED687006083BF /* iomem.c in Sources */ = {isa = PBXBuildFile; fileRef = C79368AA0C9ED687006083BF /* iomem.c */; };
 		C79368AD0C9ED687006083BF /* iomem.h in Headers */ = {isa = PBXBuildFile; fileRef = C79368AB0C9ED687006083BF /* iomem.h */; };
 /* End PBXBuildFile section */
@@ -75,7 +72,6 @@
 		839542A60894F2490020C3E2 /* zlib.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = zlib.h; sourceTree = "<group>"; };
 		839542A80894F2490020C3E2 /* zip.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = zip.h; sourceTree = "<group>"; };
 		839542A90894F2490020C3E2 /* zip.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = zip.c; sourceTree = "<group>"; };
-		839542AA0894F2490020C3E2 /* zconf.in.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = zconf.in.h; sourceTree = "<group>"; };
 		839542AB0894F2490020C3E2 /* zconf.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = zconf.h; sourceTree = "<group>"; };
 		839542AC0894F2490020C3E2 /* unzip.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = unzip.h; sourceTree = "<group>"; };
 		839542AD0894F2490020C3E2 /* unzip.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = unzip.c; sourceTree = "<group>"; };
@@ -93,8 +89,6 @@
 		888E74391ADD96A900C5AEFE /* utf.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = utf.c; sourceTree = "<group>"; };
 		888E743B1ADD96C200C5AEFE /* utf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = utf.h; sourceTree = "<group>"; };
 		888E743D1ADD96D700C5AEFE /* lvapi.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = lvapi.c; sourceTree = "<group>"; };
-		C77CC6BE0C9C7D3200886AB2 /* liblvexports.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblvexports.a; path = "/Applications/National Instruments/LabVIEW 8.2/cintools/Mach-O/liblvexports.a"; sourceTree = "<absolute>"; };
-		C77CC6C10C9C7D6500886AB2 /* liblabviewcin.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblabviewcin.a; path = "/Applications/National Instruments/LabVIEW 8.2/cintools/Mach-O/liblabviewcin.a"; sourceTree = "<absolute>"; };
 		C79368AA0C9ED687006083BF /* iomem.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = iomem.c; sourceTree = "<group>"; };
 		C79368AB0C9ED687006083BF /* iomem.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = iomem.h; sourceTree = "<group>"; };
 /* End PBXFileReference section */
@@ -106,8 +100,6 @@
 			files = (
 				83D3E26D080D117700DE332C /* Carbon.framework in Frameworks */,
 				836583B4088D13980083EC20 /* System.framework in Frameworks */,
-				C77CC6BF0C9C7D3200886AB2 /* liblvexports.a in Frameworks */,
-				C77CC6C20C9C7D6500886AB2 /* liblabviewcin.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -119,8 +111,6 @@
 			children = (
 				C79368AA0C9ED687006083BF /* iomem.c */,
 				C79368AB0C9ED687006083BF /* iomem.h */,
-				C77CC6C10C9C7D6500886AB2 /* liblabviewcin.a */,
-				C77CC6BE0C9C7D3200886AB2 /* liblvexports.a */,
 				83D3E1B5080D116E00DE332C /* zlib Sources */,
 				83D3E26B080D117700DE332C /* Frameworks */,
 				83D3E19A080D116E00DE332C /* Products */,
@@ -162,7 +152,6 @@
 				839542A60894F2490020C3E2 /* zlib.h */,
 				839542A80894F2490020C3E2 /* zip.h */,
 				839542A90894F2490020C3E2 /* zip.c */,
-				839542AA0894F2490020C3E2 /* zconf.in.h */,
 				839542AB0894F2490020C3E2 /* zconf.h */,
 				839542AC0894F2490020C3E2 /* unzip.h */,
 				839542AD0894F2490020C3E2 /* unzip.c */,
@@ -207,7 +196,6 @@
 				839542DB0894F2490020C3E2 /* inftrees.h in Headers */,
 				839542DD0894F2490020C3E2 /* zlib.h in Headers */,
 				839542DF0894F2490020C3E2 /* zip.h in Headers */,
-				839542E10894F2490020C3E2 /* zconf.in.h in Headers */,
 				839542E20894F2490020C3E2 /* zconf.h in Headers */,
 				839542E30894F2490020C3E2 /* unzip.h in Headers */,
 				839542E60894F2490020C3E2 /* trees.h in Headers */,
@@ -306,7 +294,7 @@
 		C77CC6B50C9C7C6500886AB2 /* Development */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
 				COPY_PHASE_STRIP = NO;
 				GCC_ALTIVEC_EXTENSIONS = NO;
 				GCC_CHAR_IS_UNSIGNED_CHAR = NO;
@@ -325,12 +313,7 @@
 				GCC_WARN_UNUSED_PARAMETER = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = "";
-				LIBRARY_SEARCH_PATHS = (
-					"$(LIBRARY_SEARCH_PATHS_QUOTED_1)",
-					"$(LIBRARY_SEARCH_PATHS_QUOTED_2)",
-				);
-				LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SYSTEM_APPS_DIR)/National Instruments/LabVIEW 2009/cintools/Mach-O\"";
-				LIBRARY_SEARCH_PATHS_QUOTED_2 = "\"$(SYSTEM_APPS_DIR)/National Instruments/LabVIEW 2009/cintools/Mach-O\"";
+				LIBRARY_SEARCH_PATHS = "$(SYSTEM_APPS_DIR)/National\\ Instruments/LabVIEW\\ 2014/cintools/Mach-O";
 				LIBRARY_STYLE = DYNAMIC;
 				MACH_O_TYPE = mh_dylib;
 				MACOSX_DEPLOYMENT_TARGET = 10.8;
@@ -338,12 +321,13 @@
 				OTHER_LDFLAGS = (
 					"-multiply_defined",
 					warning,
+					"-llvexports",
 				);
 				OTHER_REZFLAGS = "";
 				PRODUCT_NAME = lvzlib;
 				REZ_SCRIPT_TYPE = Roman;
 				REZ_SUPPRESS_REDECLARED_RESOURCE_TYPE_WARNINGS = NO;
-				SDKROOT = macosx10.9;
+				SDKROOT = macosx10.8;
 				SECTORDER_FLAGS = "";
 				WARNING_CFLAGS = (
 					"-Wmost",
@@ -357,7 +341,7 @@
 		C77CC6B60C9C7C6500886AB2 /* Deployment */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
 				COPY_PHASE_STRIP = YES;
 				GCC_ALTIVEC_EXTENSIONS = NO;
 				GCC_CHAR_IS_UNSIGNED_CHAR = NO;
@@ -373,12 +357,7 @@
 				GCC_WARN_UNUSED_PARAMETER = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = "";
-				LIBRARY_SEARCH_PATHS = (
-					"$(LIBRARY_SEARCH_PATHS_QUOTED_1)",
-					"$(LIBRARY_SEARCH_PATHS_QUOTED_2)",
-				);
-				LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SYSTEM_APPS_DIR)/National Instruments/LabVIEW 2009/cintools/Mach-O\"";
-				LIBRARY_SEARCH_PATHS_QUOTED_2 = "\"$(SYSTEM_APPS_DIR)/National Instruments/LabVIEW 2009/cintools/Mach-O\"";
+				LIBRARY_SEARCH_PATHS = "$(SYSTEM_APPS_DIR)/National\\ Instruments/LabVIEW\\ 2014/cintools/Mach-O";
 				LIBRARY_STYLE = DYNAMIC;
 				MACH_O_TYPE = mh_dylib;
 				MACOSX_DEPLOYMENT_TARGET = 10.8;
@@ -386,12 +365,13 @@
 				OTHER_LDFLAGS = (
 					"-multiply_defined",
 					warning,
+					"-llvexports",
 				);
 				OTHER_REZFLAGS = "";
 				PRODUCT_NAME = lvzlib;
 				REZ_SCRIPT_TYPE = Roman;
 				REZ_SUPPRESS_REDECLARED_RESOURCE_TYPE_WARNINGS = NO;
-				SDKROOT = macosx10.9;
+				SDKROOT = macosx10.8;
 				SECTORDER_FLAGS = "";
 				WARNING_CFLAGS = (
 					"-Wmost",
@@ -405,7 +385,7 @@
 		C77CC6B70C9C7C6500886AB2 /* Default */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
 				GCC_ALTIVEC_EXTENSIONS = NO;
 				GCC_CHAR_IS_UNSIGNED_CHAR = NO;
 				GCC_ENABLE_CPP_EXCEPTIONS = NO;
@@ -419,12 +399,7 @@
 				GCC_WARN_UNUSED_PARAMETER = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = "";
-				LIBRARY_SEARCH_PATHS = (
-					"$(LIBRARY_SEARCH_PATHS_QUOTED_1)",
-					"$(LIBRARY_SEARCH_PATHS_QUOTED_2)",
-				);
-				LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SYSTEM_APPS_DIR)/National Instruments/LabVIEW 2009/cintools/Mach-O\"";
-				LIBRARY_SEARCH_PATHS_QUOTED_2 = "\"$(SYSTEM_APPS_DIR)/National Instruments/LabVIEW 2009/cintools/Mach-O\"";
+				LIBRARY_SEARCH_PATHS = "$(SYSTEM_APPS_DIR)/National\\ Instruments/LabVIEW\\ 2014/cintools/Mach-O";
 				LIBRARY_STYLE = DYNAMIC;
 				MACH_O_TYPE = mh_dylib;
 				MACOSX_DEPLOYMENT_TARGET = 10.8;
@@ -432,12 +407,13 @@
 				OTHER_LDFLAGS = (
 					"-multiply_defined",
 					warning,
+					"-llvexports",
 				);
 				OTHER_REZFLAGS = "";
 				PRODUCT_NAME = lvzlib;
 				REZ_SCRIPT_TYPE = Roman;
 				REZ_SUPPRESS_REDECLARED_RESOURCE_TYPE_WARNINGS = NO;
-				SDKROOT = macosx10.9;
+				SDKROOT = macosx10.8;
 				SECTORDER_FLAGS = "";
 				WARNING_CFLAGS = (
 					"-Wmost",
@@ -450,18 +426,59 @@
 		C77CC6B90C9C7C6500886AB2 /* Development */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				"ADDITIONAL_SDKS[arch=i386]" = "";
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+				GCC_CHAR_IS_UNSIGNED_CHAR = YES;
+				HEADER_SEARCH_PATHS = (
+					"$(inherited)",
+					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
+					"/Applications/National\\ Instruments/LabVIEW\\ 2014/cintools",
+				);
+				LD_DYLIB_INSTALL_NAME = lvzlib.framework;
+				LIBRARY_SEARCH_PATHS = "/Application/National\\ Instruments/LabVIEW\\ 2014/cintools";
+				MACH_O_TYPE = mh_dylib;
+				MACOSX_DEPLOYMENT_TARGET = 10.7;
+				ONLY_ACTIVE_ARCH = NO;
+				SDKROOT = macosx10.8;
 			};
 			name = Development;
 		};
 		C77CC6BA0C9C7C6500886AB2 /* Deployment */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+				GCC_CHAR_IS_UNSIGNED_CHAR = YES;
+				HEADER_SEARCH_PATHS = (
+					"$(inherited)",
+					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
+					"/Applications/National\\ Instruments/LabVIEW\\ 2014/cintools",
+				);
+				LD_DYLIB_INSTALL_NAME = lvzlib.framework;
+				LIBRARY_SEARCH_PATHS = "/Application/National\\ Instruments/LabVIEW\\ 2014/cintools";
+				MACH_O_TYPE = mh_dylib;
+				MACOSX_DEPLOYMENT_TARGET = 10.7;
+				ONLY_ACTIVE_ARCH = NO;
+				SDKROOT = macosx10.8;
 			};
 			name = Deployment;
 		};
 		C77CC6BB0C9C7C6500886AB2 /* Default */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				"ADDITIONAL_SDKS[arch=*]" = "";
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+				GCC_CHAR_IS_UNSIGNED_CHAR = YES;
+				HEADER_SEARCH_PATHS = (
+					"$(inherited)",
+					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
+					"/Applications/National\\ Instruments/LabVIEW\\ 2014/cintools",
+				);
+				LD_DYLIB_INSTALL_NAME = lvzlib.framework;
+				LIBRARY_SEARCH_PATHS = "/Application/National\\ Instruments/LabVIEW\\ 2014/cintools";
+				MACH_O_TYPE = mh_dylib;
+				MACOSX_DEPLOYMENT_TARGET = 10.7;
+				ONLY_ACTIVE_ARCH = NO;
+				SDKROOT = macosx10.8;
 			};
 			name = Default;
 		};

Modified: trunk/lvzip/c_source/utf.c
===================================================================
--- trunk/lvzip/c_source/utf.c	2015-04-14 21:38:01 UTC (rev 1509)
+++ trunk/lvzip/c_source/utf.c	2015-04-25 21:49:03 UTC (rev 1510)
@@ -16,42 +16,49 @@
 // Maximum valid value for a Unicode code point
 #define CODE_POINT_MAX      0x0010ffffu
 
-__inline uInt8 utf8_mask(uInt8 oc)
+static MgErr utf8_is_valid(const uInt8 *src, int32 *offset, int32 length);
+static MgErr utf8_replace_invalid(const uInt8 *src, int32 *soff, int32 slen, uInt8 *dest, int32 *doff, int32 dlen, uInt32 replacement);
+static MgErr utf8_advance(const uInt8 *src, int32 *offset, int32 length, int32 distance);
+static MgErr utf8_distance(const uInt8 *src, int32 *offset, int32 length);
+
+static uInt8 utf8_mask(uInt8 oc)
 {
     return (uInt8)(0xff & oc);
 }
 
-__inline uInt16 utf16_mask(uInt16 oc)
+static uInt16 utf16_mask(uInt16 oc)
 {
     return (uInt16)(0xffff & oc);
 }
 
-__inline LVBoolean utf8_is_trail(uInt8 oc)
+static LVBoolean utf8_is_trail(uInt8 oc)
 {
     return ((utf8_mask(oc) >> 6) == 0x2);
 }
 
-__inline LVBoolean utf16_is_lead_surrogate(uInt16 cp)
+static LVBoolean utf16_is_lead_surrogate(uInt16 cp)
 {
     return (LVBoolean)(cp >= LEAD_SURROGATE_MIN && cp <= LEAD_SURROGATE_MAX);
 }
 
-__inline LVBoolean utf16_is_trail_surrogate(uInt16 cp)
+/*
+static LVBoolean utf16_is_trail_surrogate(uInt16 cp)
 {
     return (LVBoolean)(cp >= TRAIL_SURROGATE_MIN && cp <= TRAIL_SURROGATE_MAX);
 }
+*/
 
-__inline LVBoolean utf32_is_surrogate(uInt32 cp)
+static LVBoolean utf32_is_surrogate(uInt32 cp)
 {
     return (LVBoolean)(cp >= LEAD_SURROGATE_MIN && cp <= TRAIL_SURROGATE_MAX);
 }
 
-__inline LVBoolean utf32_is_code_point_valid(uInt32 cp)
+static LVBoolean utf32_is_code_point_valid(uInt32 cp)
 {
     return (LVBoolean)(cp <= CODE_POINT_MAX && !utf32_is_surrogate(cp));
 }
 
-__inline int32 utf8_sequence_length(uInt8 oc)
+static int32 utf8_sequence_length(uInt8 oc)
 {
     uInt8 lead = utf8_mask(oc);
     if (lead < 0x80)
@@ -65,7 +72,7 @@
     return 0;
 }
 
-__inline LVBoolean utf32_is_overlong_sequence(uInt32 cp, int32 length)
+static LVBoolean utf32_is_overlong_sequence(uInt32 cp, int32 length)
 {
     if (cp < 0x80)
     {
@@ -355,7 +362,7 @@
     return err;
 }
 
-MgErr utf8_replace_invalid(const uInt8 *src, int32 *soff, int32 slen, uInt8 *dest, int32 *doff, int32 dlen, uInt32 replacement)
+static MgErr utf8_replace_invalid(const uInt8 *src, int32 *soff, int32 slen, uInt8 *dest, int32 *doff, int32 dlen, uInt32 replacement)
 {
 	MgErr err = mgNoErr;
     while (src[*soff] && (slen < 0 || *soff < slen))
@@ -388,7 +395,7 @@
     return err;
 }
 
-MgErr utf8_is_valid(const uInt8 *src, int32 *offset, int32 length)
+static MgErr utf8_is_valid(const uInt8 *src, int32 *offset, int32 length)
 {
 	MgErr err = mgNoErr;
 	while (!err && src[*offset] && (length < 0 || *offset < length))
@@ -512,15 +519,16 @@
 #endif
 }
 
+static wchar_t testchar = 0x00B0;
+
 LibAPI(LVBoolean) utf8_is_current_mbcs()
 {
-    static wchar_t test = 0x00B0;
     LVBoolean is_utf8 = LV_FALSE;
     char *result = malloc(MB_CUR_MAX);
     if (result)
     {
-        int len = wctomb(NULL, test);
-        len = wctomb(result, test);
+        int len = wctomb(NULL, testchar);
+        len = wctomb(result, testchar);
         if ((len == 2) && (result[0] == (char)0xC2) && (result[1] == (char)0xB0))
             is_utf8 = LV_TRUE;
         free(result);

Modified: trunk/lvzip/c_source/utf.h
===================================================================
--- trunk/lvzip/c_source/utf.h	2015-04-14 21:38:01 UTC (rev 1509)
+++ trunk/lvzip/c_source/utf.h	2015-04-25 21:49:03 UTC (rev 1510)
@@ -9,7 +9,7 @@
 extern "C" {
 #endif
 
-LibAPI(LVBoolean) utf8_is_current_mbcs();
+LibAPI(LVBoolean) utf8_is_current_mbcs(void);
 
 MgErr utf8_validate_next(const uInt8 *src, int32 *offset, int32 length, uInt32 *code_point);
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opengtoolkit-svn] SF.net SVN: opengtoolkit:[1509] trunk/lvzip/c_source

From: <lab...@us...> - 2015-04-14 21:38:08

Revision: 1509
          http://sourceforge.net/p/opengtoolkit/svn/1509
Author:   labviewer
Date:     2015-04-14 21:38:01 +0000 (Tue, 14 Apr 2015)
Log Message:
-----------
More MacOS X changes

Modified Paths:
--------------
    trunk/lvzip/c_source/lvutil.c
    trunk/lvzip/c_source/lvutil.h

Modified: trunk/lvzip/c_source/lvutil.c
===================================================================
--- trunk/lvzip/c_source/lvutil.c	2015-04-14 20:44:01 UTC (rev 1508)
+++ trunk/lvzip/c_source/lvutil.c	2015-04-14 21:38:01 UTC (rev 1509)
@@ -382,10 +382,10 @@
                                   LStrHandle comment)
 {
     MgErr err = mgNoErr;
-#if MacOS
-#if !MacOSX
+#if MacOSX
+    FInfoRec64 infoRec;
+#elif MacOS
 	FSRef ref;
-#endif
 #elif Win32
     LStrPtr lstr;
     HANDLE handle = NULL;
@@ -404,11 +404,37 @@
 #if MacOSX
     if (write)
     {
-        err = FSetInfo(path, fileInfo);
+        infoRec.creator = fileInfo->creator;
+        infoRec.type = fileInfo->type;
+        infoRec.permissions = 0;
+        infoRec.size = fileInfo->size;
+        infoRec.rfSize = fileInfo->rfSize;
+        infoRec.cdate = fileInfo->cDate;
+        infoRec.mdate = fileInfo->mDate;
+        infoRec.folder = *isDirectory;
+        infoRec.isInvisible = fileInfo->flags & kFIsInvisible;
+        infoRec.location.v = fileInfo->location.v;
+        infoRec.location.h = fileInfo->location.h;
+        infoRec.owner[0] = 0;
+        infoRec.group[0] = 0;
+        err = FSetInfo64(path, &infoRec);
     }
     else
     {
-        err = FGetInfo(path, fileInfo);
+        err = FGetInfo64(path, &infoRec, kFGetInfoAll);
+        if (!err)
+        {
+            fileInfo->creator = infoRec.creator;
+            fileInfo->type = infoRec.type;
+            fileInfo->size = infoRec.size;
+            fileInfo->rfSize = infoRec.rfSize;
+            fileInfo->cDate = infoRec.cdate;
+            fileInfo->mDate = infoRec.mdate;
+            *isDirectory = infoRec.folder;
+            fileInfo->flags = infoRec.isInvisible ? kFIsInvisible : 0;
+            fileInfo->location.v = infoRec.location.v;
+            fileInfo->location.h = infoRec.location.h;
+        }
     }
 #elif MacOS
 	err = FSMakePathRef(path, &ref);
@@ -1021,7 +1047,7 @@
 	if (0 == ioRefNum)
 		return mgArgErr;
 #if MacOSX
-	return OSErrToLVErr(FSGetForkPosition(ioRefNum, tell));
+	return OSErrToLVErr(FSGetForkPosition(ioRefNum, &tell->q));
 #elif Unix
 	errno = 0;
 	tell->q = ftello64(ioRefNum);
@@ -1584,7 +1610,7 @@
 }
 
 /* Converts a Unix style path to a LabVIEW platform path */
-LibAPI(MgErr) ConvertCPath(ConstCStr src, int32 srclen, uInt32 srccp, LStrHandle *dest, uInt32 destcp, char defaultChar, LVBoolean *defUsed)
+LibAPI(MgErr) ConvertCPath(ConstCStr src, int32 srclen, uInt32 srccp, LStrHandle *dest, uInt32 destcp, char defaultChar, LVBoolean *defUsed, LVBoolean isDir)
 {
     MgErr err = mgNotSupported;
 #if Win32
@@ -1707,7 +1733,7 @@
 #endif
 
 /* Converts a LabVIEW platform path to Unix style path */
-LibAPI(MgErr) ConvertLPath(const LStrHandle src, uInt32 srccp, LStrHandle *dest, uInt32 destcp, char defaultChar, LVBoolean *defUsed)
+LibAPI(MgErr) ConvertLPath(const LStrHandle src, uInt32 srccp, LStrHandle *dest, uInt32 destcp, char defaultChar, LVBoolean *defUsed, LVBoolean isDir)
 {
     MgErr err = mgNotSupported;
 #if Win32

Modified: trunk/lvzip/c_source/lvutil.h
===================================================================
--- trunk/lvzip/c_source/lvutil.h	2015-04-14 20:44:01 UTC (rev 1508)
+++ trunk/lvzip/c_source/lvutil.h	2015-04-14 21:38:01 UTC (rev 1509)
@@ -441,7 +441,9 @@
 enum { fAbsPath, fRelPath, fNotAPath, fUNCPath, nPathTypes};                            /* path type codes */
 
 Private(File);
-PrivateH(Path);
+typedef struct PATHREF PathRef;
+typedef PathRef* Path;
+typedef const PathRef* ConstPath;
 
 typedef MagicCookie LVRefNum;
 #define kNotARefNum ((LVRefNum)0L)	/* canonical invalid magic cookie */
@@ -459,7 +461,7 @@
 MgErr FDisposeRefNum(LVRefNum);
 MgErr FRefNumToFD(LVRefNum, File*);
 MgErr FGetInfo(ConstPath path, FInfoPtr infop);
-MgErr FGetInfo64(ConstPath path, FInfo64Ptr infop, FGetInfoWhich which));
+MgErr FGetInfo64(ConstPath path, FInfo64Ptr infop, FGetInfoWhich which);
 MgErr FSetInfo(ConstPath path, FInfoPtr infop);
 MgErr FSetInfo64(ConstPath path, FInfo64Ptr infop);
 
@@ -546,9 +548,9 @@
 LibAPI(MgErr) WideStringToMultiByte(const UStrHandle src, LStrHandle *dest, uInt32 codePage, char defaultChar, LVBoolean *defaultCharWasUsed);
 
 LibAPI(MgErr) ConvertCString(ConstCStr src, int32 srclen, uInt32 srccp, LStrHandle *dest, uInt32 destcp, char defaultChar, LVBoolean *defUsed);
-LibAPI(MgErr) ConvertCPath(ConstCStr src, int32 srclen, uInt32 srccp, LStrHandle *dest, uInt32 destcp, char defaultChar, LVBoolean *defUsed);
+LibAPI(MgErr) ConvertCPath(ConstCStr src, int32 srclen, uInt32 srccp, LStrHandle *dest, uInt32 destcp, char defaultChar, LVBoolean *defUsed, LVBoolean isDir);
 LibAPI(MgErr) ConvertLString(const LStrHandle src, uInt32 srccp, LStrHandle *dest, uInt32 destcp, char defaultChar, LVBoolean *defUsed);
-LibAPI(MgErr) ConvertLPath(const LStrHandle src, uInt32 srccp, LStrHandle *dest, uInt32 destcp, char defaultChar, LVBoolean *defUsed);
+LibAPI(MgErr) ConvertLPath(const LStrHandle src, uInt32 srccp, LStrHandle *dest, uInt32 destcp, char defaultChar, LVBoolean *defUsed, LVBoolean isDir);
 
 #ifdef __cplusplus
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opengtoolkit-svn] SF.net SVN: opengtoolkit:[1508] trunk/lvzip/c_source/lvutil.h

From: <lab...@us...> - 2015-04-14 20:44:08

Revision: 1508
          http://sourceforge.net/p/opengtoolkit/svn/1508
Author:   labviewer
Date:     2015-04-14 20:44:01 +0000 (Tue, 14 Apr 2015)
Log Message:
-----------


Modified Paths:
--------------
    trunk/lvzip/c_source/lvutil.h

Modified: trunk/lvzip/c_source/lvutil.h
===================================================================
--- trunk/lvzip/c_source/lvutil.h	2015-04-14 19:25:47 UTC (rev 1507)
+++ trunk/lvzip/c_source/lvutil.h	2015-04-14 20:44:01 UTC (rev 1508)
@@ -309,22 +309,111 @@
 
 /* File Manager */
 typedef struct {
-    uInt32 type;    /* handled by LabVIEW Type & Creator */
-    uInt32 creator; /* handled by LabVIEW Type & Creator */
-    uInt64 size;    /* not modified, use EOF */
-    uInt64 rfSize;  /* Mac only, not modified, use EOF */
-    uInt32 cDate;
-    uInt32 mDate;
-    uInt16 flags;   
-    LVPoint location;  /* Mac only */
+	uInt32 type;    /* handled by LabVIEW Type & Creator */
+	uInt32 creator; /* handled by LabVIEW Type & Creator */
+	uInt64 size;    /* not modified, use EOF */
+	uInt64 rfSize;  /* Mac only, not modified, use EOF */
+	uInt32 cDate;
+	uInt32 mDate;
+	uInt16 flags;   
+	LVPoint location;  /* Mac only */
 	uInt16 finderId;   /* Mac only */
-    uInt16 xFlags;     /* Mac only */
-    int32 putAwayId;   /* Mac only */
+	uInt16 xFlags;     /* Mac only */
+	int32 putAwayId;   /* Mac only */
 } LVFileInfo;
 
-#define kUnknownFileType    RTToL('?','?','?','?')
-#define kUnknownCreator     RTToL('?','?','?','?')
+typedef enum _FMFileType {
+	kInvalidType	=0,
+	kUnknownFileType=RTToL('?','?','?','?'),
+	kTextFileType	=RTToL('T','E','X','T'),
+	/** Typical directory types */
+	kHardDiskDirType=RTToL('h','d','s','k'),
+	kFloppyDirType	=RTToL('f','l','p','y'),
+	kNetDriveDirType=RTToL('s','r','v','r')
+}FMFileType;
 
+typedef enum  {
+	kInvalidCreator	=0,
+	kUnknownCreator =RTToL('?','?','?','?'),
+	/** LabVIEW creator type */
+	kLVCreatorType	=RTToL('L','B','V','W')
+}FMFileCreator;
+
+/** Used for FGetInfo */
+typedef struct {			/**< file/directory information record */
+	FMFileType type;		/**< system specific file type-- 0 for directories */
+	FMFileCreator creator;	/**< system specific file creator-- 0 for directories */
+	int32	permissions;	/**< system specific file access rights */
+	int32	size;			/**< file size in bytes (data fork on Mac) or entries in folder */
+	int32	rfSize;			/**< resource fork size (on Mac only) */
+	uInt32	cdate;			/**< creation date */
+	uInt32	mdate;			/**< last modification date */
+	Bool32	folder;			/**< indicates whether path refers to a folder */
+	Bool32	isInvisible; /**< indicates whether the file is visible in File Dialog */
+	struct {
+		int16 v, h;
+	} location;			/**< system specific geographical location */
+	Str255	owner;			/**< owner (in pascal string form) of file or folder */
+	Str255	group;			/**< group (in pascal string form) of file or folder */
+} FInfoRec, *FInfoPtr;
+
+/** Used for FGetInfo, 64-bit version */
+typedef uInt32	FGetInfoWhich;
+enum {
+	kFGetInfoType			= 1L << 0,
+	kFGetInfoCreator		= 1L << 1,
+	kFGetInfoPermissions	= 1L << 2,
+	kFGetInfoSize			= 1L << 3,
+	kFGetInfoRFSize			= 1L << 4,
+	kFGetInfoCDate			= 1L << 5,
+	kFGetInfoMDate			= 1L << 6,
+	kFGetInfoFolder			= 1L << 7,
+	kFGetInfoIsInvisible	= 1L << 8,
+	kFGetInfoLocation		= 1L << 9,
+	kFGetInfoOwner			= 1L << 10,
+	kFGetInfoGroup			= 1L << 11,
+	kFGetInfoAll			= 0xEFFFFFFFL
+};
+typedef struct {			/**< file/directory information record */
+	FMFileType type;		/**< system specific file type-- 0 for directories */
+	FMFileCreator creator;	/**< system specific file creator-- 0 for directories */
+	int32	permissions;	/**< system specific file access rights */
+	int64	size;			/**< file size in bytes (data fork on Mac) or entries in folder */
+	int64	rfSize;			/**< resource fork size (on Mac only) */
+	uInt32	cdate;			/**< creation date */
+	uInt32	mdate;			/**< last modification date */
+	Bool32	folder;			/**< indicates whether path refers to a folder */
+	Bool32	isInvisible; /**< indicates whether the file is visible in File Dialog */
+	struct {
+		int16 v, h;
+	} location;			/**< system specific geographical location */
+	Str255	owner;			/**< owner (in pascal string form) of file or folder */
+	Str255	group;			/**< group (in pascal string form) of file or folder */
+} FInfoRec64, *FInfo64Ptr;
+
+/** Used for FGetVolInfo */
+typedef struct {
+	uInt32	size;			/**< size in bytes of a volume */
+	uInt32	used;			/**< number of bytes used on volume */
+	uInt32	free;			/**< number of bytes available for use on volume */
+} VInfoRec;
+
+/** Used with FListDir2 */
+typedef struct {
+	int32 flags;
+	FMFileType type;
+} FMListDetails;
+
+/** Type Flags used with FMListDetails */
+#define kIsFile				0x01
+#define kRecognizedType		0x02
+#define kIsLink				0x04
+#define kFIsInvisible		0x08
+#define kIsTopLevelVI		0x10	/**< Used only for VIs in archives */
+#define kErrGettingType		0x20	/**< error occurred getting type info */
+#if Mac
+#define kFIsStationery		0x40
+#endif
     
 enum { openReadWrite, openReadOnly, openWriteOnly, openWriteOnlyTruncate }; /* open modes */
 enum { denyReadWrite, denyWriteOnly, denyNeither}; /* deny modes */
@@ -369,6 +458,10 @@
 Bool32 FIsARefNum(LVRefNum);
 MgErr FDisposeRefNum(LVRefNum);
 MgErr FRefNumToFD(LVRefNum, File*);
+MgErr FGetInfo(ConstPath path, FInfoPtr infop);
+MgErr FGetInfo64(ConstPath path, FInfo64Ptr infop, FGetInfoWhich which));
+MgErr FSetInfo(ConstPath path, FInfoPtr infop);
+MgErr FSetInfo64(ConstPath path, FInfo64Ptr infop);
 
 int32 DbgPrintf(CStr fmt, ...);
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opengtoolkit-svn] SF.net SVN: opengtoolkit:[1507] trunk/lvzip/c_source

From: <lab...@us...> - 2015-04-14 19:25:49

Revision: 1507
          http://sourceforge.net/p/opengtoolkit/svn/1507
Author:   labviewer
Date:     2015-04-14 19:25:47 +0000 (Tue, 14 Apr 2015)
Log Message:
-----------
Some Mac specific edits

Modified Paths:
--------------
    trunk/lvzip/c_source/MacBinaryIII.h
    trunk/lvzip/c_source/lvutil.c
    trunk/lvzip/c_source/lvutil.h
    trunk/lvzip/c_source/lvzip.xcodeproj/project.pbxproj
    trunk/lvzip/c_source/mztools.c
    trunk/lvzip/c_source/utf.c
    trunk/lvzip/c_source/zip.c

Modified: trunk/lvzip/c_source/MacBinaryIII.h
===================================================================
--- trunk/lvzip/c_source/MacBinaryIII.h	2015-04-10 10:11:59 UTC (rev 1506)
+++ trunk/lvzip/c_source/MacBinaryIII.h	2015-04-14 19:25:47 UTC (rev 1507)
@@ -12,7 +12,7 @@
 #include <String.h>
 
 #pragma once
-#pragma options align=mac68k
+//#pragma options align=mac68k
 /*
 000
             Byte
@@ -169,4 +169,4 @@
 }
 #endif
 
-#pragma options align=reset
+//#pragma options align=reset

Modified: trunk/lvzip/c_source/lvutil.c
===================================================================
--- trunk/lvzip/c_source/lvutil.c	2015-04-10 10:11:59 UTC (rev 1506)
+++ trunk/lvzip/c_source/lvutil.c	2015-04-14 19:25:47 UTC (rev 1507)
@@ -382,8 +382,10 @@
                                   LStrHandle comment)
 {
     MgErr err = mgNoErr;
-#if MacOSX
+#if MacOS
+#if !MacOSX
 	FSRef ref;
+#endif
 #elif Win32
     LStrPtr lstr;
     HANDLE handle = NULL;
@@ -400,6 +402,15 @@
       return mgArgErr;
 
 #if MacOSX
+    if (write)
+    {
+        err = FSetInfo(path, fileInfo);
+    }
+    else
+    {
+        err = FGetInfo(path, fileInfo);
+    }
+#elif MacOS
 	err = FSMakePathRef(path, &ref);
     if (!err)
     {
@@ -723,7 +734,7 @@
 			LStrLen(**str) = pathLen;
 #if MacOSX
 			if (!err)
-				err = ConvertToPosixPath(*str, str);
+				err = ConvertToPosixPath(*str, str, false);
 #endif
 		}
 	}
@@ -742,7 +753,7 @@
 {
 	MgErr err = mgNoErr;
 #if MacOSX
-	err = OSErrToLVErr(FSCloseFork(ioRefNum);
+	err = OSErrToLVErr(FSCloseFork(ioRefNum));
 #elif Unix
 	if (fclose(ioRefNum))
 	{
@@ -901,7 +912,7 @@
 	if ((offs->q == 0) && (mode == fCurrent))
 		return noErr;
 #if MacOSX
-	ret = FSSetForkPosition(ioRefNum, mode, offs.q);
+	ret = FSSetForkPosition(ioRefNum, mode, offs->q);
 	if (ret == posErr)
 	{
 		ret = FSSetForkPosition(ioRefNum, fsFromStart, 0);
@@ -1043,7 +1054,7 @@
 	if (0 == ioRefNum)
 		return mgArgErr;
 #if MacOSX
-	err = FSRead(ioRefNum, &inCount, buffer);
+	err = FSRead(ioRefNum, (int32*)&inCount, buffer);
 	if (outCount)
 	{
 		if (err && err != eofErr)
@@ -1105,8 +1116,8 @@
 
 	if (0 == ioRefNum)
 		return mgArgErr;
-#if Mac
-	err = FSWrite(ioRefNum, &inCount, buffer);
+#if MacOSX
+	err = FSWrite(ioRefNum, (int32*)&inCount, buffer);
 	if (outCount)
 	{
 		if (err && err != dskFulErr)
@@ -1124,7 +1135,7 @@
 		err = Win32ToLVFileErr();
 	if (outCount)
 		*outCount = actCount;
-	return err;
+    return err;
 #elif Unix
 	errno = 0;
 	actCount = fwrite((char *)buffer, 1, inCount, ioRefNum);
@@ -1135,7 +1146,7 @@
 	}
 	if (outCount)
 		*outCount = actCount;
-	return err;
+    return err;
 #endif
 }
 
@@ -1144,18 +1155,18 @@
     MgErr err;
 	int32 type;
 	FileRefNum ioRefNum;
+    LStrPtr lstr;
 #if MacOSX
     FSRef ref;
 	HFSUniStr255 forkName;
     int8 perm;
+    char theMode[4];
     OSErr ret;
 #elif Win32
-    LStrPtr lstr;
     DWORD shareAcc, openAcc;
     DWORD createMode = OPEN_EXISTING;
     int32 attempts;
 #elif Unix
-    LStrPtr lstr;
     uChar theMode[3];
     struct stat statbuf;
 #endif
@@ -1312,7 +1323,8 @@
  #if MacOSX
 	else
 	{
-		if (err = FSMakePathRef(path, &ref))
+        err = FSMakePathRef(path, &ref);
+		if (err)
 		{
 			DEBUGPRINTF(("FSMakePathRef: err = %ld", err));
 			return err;
@@ -1362,7 +1374,7 @@
 			ret = FSOpenFork(&ref, forkName.length, forkName.unicode, perm, &ioRefNum);
 		}
 		err = OSErrToLVErr(ret);
-		if (!err && if (openMode == openWriteOnlyTruncate)
+		if (!err && openMode == openWriteOnlyTruncate)
 		{
 			FileOffset size;
 			size.q = 0;
@@ -1613,13 +1625,13 @@
 		{
 			return mFullErr;
 		}
-		hsfRef = CFURLCopyFileSystemPath(urlRef, kCFURLHFSPathStyle);
+		hfsRef = CFURLCopyFileSystemPath(urlRef, kCFURLHFSPathStyle);
 		CFRelease(urlRef);
-		if (hsfRef)
+		if (hfsRef)
 		{
 			CFIndex len;
-			CFRange range = CFRangeMake(0, CFStringGetLength(posixRef));
-			if (CFStringGetBytes(hsfRef, range, encoding, 0, false, NULL, 0, &len) > 0)
+			CFRange range = CFRangeMake(0, CFStringGetLength(hfsRef));
+			if (CFStringGetBytes(hfsRef, range, encoding, 0, false, NULL, 0, &len) > 0)
 			{
 				if (len > 0)
 				{
@@ -1629,7 +1641,7 @@
 						encoding = ConvertCodepageToEncoding(destcp);
 						if (encoding != kCFStringEncodingInvalidId)
 						{
-							if (CFStringGetBytes(hsfRef, range, encoding, 0, false, LStrBuf(**dest), len, &len) > 0)
+							if (CFStringGetBytes(hfsRef, range, encoding, 0, false, LStrBuf(**dest), len, &len) > 0)
 							{
 								LStrBuf(**dest)[len] = 0;
 								LStrLen(**dest) = len;
@@ -1643,11 +1655,11 @@
 					}
 				}
 			}
-			CFRelease(hsfRef);
+			CFRelease(hfsRef);
 		}
 		else
 		{
-			err = mgFullErr;
+			err = mFullErr;
 		}
     }
 #endif
@@ -1730,7 +1742,7 @@
 		{
 			return mFullErr;
 		}
-		urlRef = CFURLCreateWithFileSystemPath(NULL, fileRef, kCFURLHSFPathStyle, isDir);
+		urlRef = CFURLCreateWithFileSystemPath(NULL, fileRef, kCFURLHFSPathStyle, isDir);
 		CFRelease(fileRef);
 		if (!urlRef)
 		{
@@ -1769,7 +1781,7 @@
 		}
 		else
 		{
-			err = mgFullErr;
+			err = mFullErr;
 		}
 	}
 #endif
@@ -2140,7 +2152,7 @@
 		{
 			CFMutableStringRef cfpath2 = CFStringCreateMutableCopy(NULL, 0, cfpath);
 			CFRelease(cfpath);
-			if (cpath2)
+			if (cfpath2)
 			{
 				CFStringNormalize(cfpath2, kCFStringNormalizationFormD);
 				CFStringEncoding encoding = ConvertCodepageToEncoding(codePage);

Modified: trunk/lvzip/c_source/lvutil.h
===================================================================
--- trunk/lvzip/c_source/lvutil.h	2015-04-10 10:11:59 UTC (rev 1506)
+++ trunk/lvzip/c_source/lvutil.h	2015-04-14 19:25:47 UTC (rev 1507)
@@ -325,6 +325,7 @@
 #define kUnknownFileType    RTToL('?','?','?','?')
 #define kUnknownCreator     RTToL('?','?','?','?')
 
+    
 enum { openReadWrite, openReadOnly, openWriteOnly, openWriteOnlyTruncate }; /* open modes */
 enum { denyReadWrite, denyWriteOnly, denyNeither}; /* deny modes */
 
@@ -364,7 +365,6 @@
 MgErr FGetPathType(Path, int32*);
 int32 FDepth(Path path);
 MgErr FDisposePath(Path p);
-
 MgErr FNewRefNum(Path path, File fd, LVRefNum* refnum);
 Bool32 FIsARefNum(LVRefNum);
 MgErr FDisposeRefNum(LVRefNum);

Modified: trunk/lvzip/c_source/lvzip.xcodeproj/project.pbxproj
===================================================================
--- trunk/lvzip/c_source/lvzip.xcodeproj/project.pbxproj	2015-04-10 10:11:59 UTC (rev 1506)
+++ trunk/lvzip/c_source/lvzip.xcodeproj/project.pbxproj	2015-04-14 19:25:47 UTC (rev 1507)
@@ -42,9 +42,10 @@
 		839542ED0894F2490020C3E2 /* infback.c in Sources */ = {isa = PBXBuildFile; fileRef = 839542B60894F2490020C3E2 /* infback.c */; };
 		839542EF0894F2490020C3E2 /* gvmat32c.c in Sources */ = {isa = PBXBuildFile; fileRef = 839542B80894F2490020C3E2 /* gvmat32c.c */; };
 		839542F10894F2490020C3E2 /* adler32.c in Sources */ = {isa = PBXBuildFile; fileRef = 839542BA0894F2490020C3E2 /* adler32.c */; };
-		83D3E21E080D117200DE332C /* MacBinaryIII.c in Sources */ = {isa = PBXBuildFile; fileRef = 83D3E1B3080D116E00DE332C /* MacBinaryIII.c */; };
-		83D3E21F080D117200DE332C /* MacBinaryIII.h in Headers */ = {isa = PBXBuildFile; fileRef = 83D3E1B4080D116E00DE332C /* MacBinaryIII.h */; };
 		83D3E26D080D117700DE332C /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 83D3E26C080D117700DE332C /* Carbon.framework */; };
+		888E743A1ADD96A900C5AEFE /* utf.c in Sources */ = {isa = PBXBuildFile; fileRef = 888E74391ADD96A900C5AEFE /* utf.c */; };
+		888E743C1ADD96C200C5AEFE /* utf.h in Headers */ = {isa = PBXBuildFile; fileRef = 888E743B1ADD96C200C5AEFE /* utf.h */; };
+		888E743E1ADD96D700C5AEFE /* lvapi.c in Sources */ = {isa = PBXBuildFile; fileRef = 888E743D1ADD96D700C5AEFE /* lvapi.c */; };
 		C77CC6BF0C9C7D3200886AB2 /* liblvexports.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C77CC6BE0C9C7D3200886AB2 /* liblvexports.a */; };
 		C77CC6C20C9C7D6500886AB2 /* liblabviewcin.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C77CC6C10C9C7D6500886AB2 /* liblabviewcin.a */; };
 		C79368AC0C9ED687006083BF /* iomem.c in Sources */ = {isa = PBXBuildFile; fileRef = C79368AA0C9ED687006083BF /* iomem.c */; };
@@ -88,9 +89,10 @@
 		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>"; };
 		83D3E1AF080D116E00DE332C /* lvzlib.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = lvzlib.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		83D3E1B3080D116E00DE332C /* MacBinaryIII.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = MacBinaryIII.c; sourceTree = SOURCE_ROOT; };
-		83D3E1B4080D116E00DE332C /* MacBinaryIII.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MacBinaryIII.h; sourceTree = SOURCE_ROOT; };
 		83D3E26C080D117700DE332C /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = "<absolute>"; };
+		888E74391ADD96A900C5AEFE /* utf.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = utf.c; sourceTree = "<group>"; };
+		888E743B1ADD96C200C5AEFE /* utf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = utf.h; sourceTree = "<group>"; };
+		888E743D1ADD96D700C5AEFE /* lvapi.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = lvapi.c; sourceTree = "<group>"; };
 		C77CC6BE0C9C7D3200886AB2 /* liblvexports.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblvexports.a; path = "/Applications/National Instruments/LabVIEW 8.2/cintools/Mach-O/liblvexports.a"; sourceTree = "<absolute>"; };
 		C77CC6C10C9C7D6500886AB2 /* liblabviewcin.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblabviewcin.a; path = "/Applications/National Instruments/LabVIEW 8.2/cintools/Mach-O/liblabviewcin.a"; sourceTree = "<absolute>"; };
 		C79368AA0C9ED687006083BF /* iomem.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = iomem.c; sourceTree = "<group>"; };
@@ -119,7 +121,6 @@
 				C79368AB0C9ED687006083BF /* iomem.h */,
 				C77CC6C10C9C7D6500886AB2 /* liblabviewcin.a */,
 				C77CC6BE0C9C7D3200886AB2 /* liblvexports.a */,
-				83D3E1B0080D116E00DE332C /* mac Specific */,
 				83D3E1B5080D116E00DE332C /* zlib Sources */,
 				83D3E26B080D117700DE332C /* Frameworks */,
 				83D3E19A080D116E00DE332C /* Products */,
@@ -134,18 +135,12 @@
 			name = Products;
 			sourceTree = "<group>";
 		};
-		83D3E1B0080D116E00DE332C /* mac Specific */ = {
-			isa = PBXGroup;
-			children = (
-				83D3E1B4080D116E00DE332C /* MacBinaryIII.h */,
-				83D3E1B3080D116E00DE332C /* MacBinaryIII.c */,
-			);
-			name = "mac Specific";
-			sourceTree = "<group>";
-		};
 		83D3E1B5080D116E00DE332C /* zlib Sources */ = {
 			isa = PBXGroup;
 			children = (
+				888E743D1ADD96D700C5AEFE /* lvapi.c */,
+				888E743B1ADD96C200C5AEFE /* utf.h */,
+				888E74391ADD96A900C5AEFE /* utf.c */,
 				839542890894F2480020C3E2 /* lvutil.h */,
 				8395428A0894F2480020C3E2 /* lvutil.c */,
 				8395428C0894F2480020C3E2 /* mztools.c */,
@@ -200,13 +195,13 @@
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				83D3E21F080D117200DE332C /* MacBinaryIII.h in Headers */,
 				839542C00894F2490020C3E2 /* lvutil.h in Headers */,
 				839542C60894F2490020C3E2 /* inffast.h in Headers */,
 				839542C90894F2490020C3E2 /* crc32.h in Headers */,
 				839542CB0894F2490020C3E2 /* crypt.h in Headers */,
 				839542CD0894F2490020C3E2 /* inflate.h in Headers */,
 				839542CE0894F2490020C3E2 /* deflate.h in Headers */,
+				888E743C1ADD96C200C5AEFE /* utf.h in Headers */,
 				839542CF0894F2490020C3E2 /* zutil.h in Headers */,
 				839542D90894F2490020C3E2 /* ioapi.h in Headers */,
 				839542DB0894F2490020C3E2 /* inftrees.h in Headers */,
@@ -248,6 +243,8 @@
 /* Begin PBXProject section */
 		83D3E190080D116E00DE332C /* Project object */ = {
 			isa = PBXProject;
+			attributes = {
+			};
 			buildConfigurationList = C77CC6B80C9C7C6500886AB2 /* Build configuration list for PBXProject "lvzip" */;
 			compatibilityVersion = "Xcode 2.4";
 			developmentRegion = English;
@@ -280,7 +277,6 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				83D3E21E080D117200DE332C /* MacBinaryIII.c in Sources */,
 				839542C10894F2490020C3E2 /* lvutil.c in Sources */,
 				839542C30894F2490020C3E2 /* mztools.c in Sources */,
 				839542C70894F2490020C3E2 /* inffast.c in Sources */,
@@ -289,10 +285,12 @@
 				839542CC0894F2490020C3E2 /* inftrees.c in Sources */,
 				839542D00894F2490020C3E2 /* zutil.c in Sources */,
 				839542D60894F2490020C3E2 /* compress.c in Sources */,
+				888E743E1ADD96D700C5AEFE /* lvapi.c in Sources */,
 				839542DA0894F2490020C3E2 /* ioapi.c in Sources */,
 				839542E00894F2490020C3E2 /* zip.c in Sources */,
 				839542E40894F2490020C3E2 /* unzip.c in Sources */,
 				839542E50894F2490020C3E2 /* uncompr.c in Sources */,
+				888E743A1ADD96A900C5AEFE /* utf.c in Sources */,
 				839542E70894F2490020C3E2 /* trees.c in Sources */,
 				839542EB0894F2490020C3E2 /* inflate.c in Sources */,
 				839542ED0894F2490020C3E2 /* infback.c in Sources */,
@@ -308,6 +306,7 @@
 		C77CC6B50C9C7C6500886AB2 /* Development */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
 				COPY_PHASE_STRIP = NO;
 				GCC_ALTIVEC_EXTENSIONS = NO;
 				GCC_CHAR_IS_UNSIGNED_CHAR = NO;
@@ -334,6 +333,7 @@
 				LIBRARY_SEARCH_PATHS_QUOTED_2 = "\"$(SYSTEM_APPS_DIR)/National Instruments/LabVIEW 2009/cintools/Mach-O\"";
 				LIBRARY_STYLE = DYNAMIC;
 				MACH_O_TYPE = mh_dylib;
+				MACOSX_DEPLOYMENT_TARGET = 10.8;
 				OTHER_CFLAGS = "-fno-inline";
 				OTHER_LDFLAGS = (
 					"-multiply_defined",
@@ -343,6 +343,7 @@
 				PRODUCT_NAME = lvzlib;
 				REZ_SCRIPT_TYPE = Roman;
 				REZ_SUPPRESS_REDECLARED_RESOURCE_TYPE_WARNINGS = NO;
+				SDKROOT = macosx10.9;
 				SECTORDER_FLAGS = "";
 				WARNING_CFLAGS = (
 					"-Wmost",
@@ -356,6 +357,7 @@
 		C77CC6B60C9C7C6500886AB2 /* Deployment */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
 				COPY_PHASE_STRIP = YES;
 				GCC_ALTIVEC_EXTENSIONS = NO;
 				GCC_CHAR_IS_UNSIGNED_CHAR = NO;
@@ -379,6 +381,7 @@
 				LIBRARY_SEARCH_PATHS_QUOTED_2 = "\"$(SYSTEM_APPS_DIR)/National Instruments/LabVIEW 2009/cintools/Mach-O\"";
 				LIBRARY_STYLE = DYNAMIC;
 				MACH_O_TYPE = mh_dylib;
+				MACOSX_DEPLOYMENT_TARGET = 10.8;
 				OTHER_CFLAGS = "-fno-inline";
 				OTHER_LDFLAGS = (
 					"-multiply_defined",
@@ -388,6 +391,7 @@
 				PRODUCT_NAME = lvzlib;
 				REZ_SCRIPT_TYPE = Roman;
 				REZ_SUPPRESS_REDECLARED_RESOURCE_TYPE_WARNINGS = NO;
+				SDKROOT = macosx10.9;
 				SECTORDER_FLAGS = "";
 				WARNING_CFLAGS = (
 					"-Wmost",
@@ -401,6 +405,7 @@
 		C77CC6B70C9C7C6500886AB2 /* Default */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
 				GCC_ALTIVEC_EXTENSIONS = NO;
 				GCC_CHAR_IS_UNSIGNED_CHAR = NO;
 				GCC_ENABLE_CPP_EXCEPTIONS = NO;
@@ -422,6 +427,7 @@
 				LIBRARY_SEARCH_PATHS_QUOTED_2 = "\"$(SYSTEM_APPS_DIR)/National Instruments/LabVIEW 2009/cintools/Mach-O\"";
 				LIBRARY_STYLE = DYNAMIC;
 				MACH_O_TYPE = mh_dylib;
+				MACOSX_DEPLOYMENT_TARGET = 10.8;
 				OTHER_CFLAGS = "-fno-inline";
 				OTHER_LDFLAGS = (
 					"-multiply_defined",
@@ -431,6 +437,7 @@
 				PRODUCT_NAME = lvzlib;
 				REZ_SCRIPT_TYPE = Roman;
 				REZ_SUPPRESS_REDECLARED_RESOURCE_TYPE_WARNINGS = NO;
+				SDKROOT = macosx10.9;
 				SECTORDER_FLAGS = "";
 				WARNING_CFLAGS = (
 					"-Wmost",

Modified: trunk/lvzip/c_source/mztools.c
===================================================================
--- trunk/lvzip/c_source/mztools.c	2015-04-10 10:11:59 UTC (rev 1506)
+++ trunk/lvzip/c_source/mztools.c	2015-04-14 19:25:47 UTC (rev 1507)
@@ -27,7 +27,7 @@
   WRITE_16((unsigned char*)(buff) + 2, (n) >> 16); \
 } while(0)
 
-extern int ZEXPORT unzRepair(file, fileOut, fileOutTmp, nRecovered, bytesRecovered)
+ZEXTERN int ZEXPORT unzRepair(file, fileOut, fileOutTmp, nRecovered, bytesRecovered)
 const char* file;
 const char* fileOut;
 const char* fileOutTmp;

Modified: trunk/lvzip/c_source/utf.c
===================================================================
--- trunk/lvzip/c_source/utf.c	2015-04-10 10:11:59 UTC (rev 1506)
+++ trunk/lvzip/c_source/utf.c	2015-04-14 19:25:47 UTC (rev 1507)
@@ -99,7 +99,7 @@
     if (!utf8_is_trail(src[*offset]))
         return INCOMPLETE_SEQUENCE;
 
-    return noErr;
+    return mgNoErr;
 }
 
 #define UTF8_INCREASE_AND_RETURN_ON_ERROR(src, offset, length) {MgErr ret = utf8_increase_safely(src, offset, length); if (ret) return ret;}
@@ -112,7 +112,7 @@
 
     *code_point = utf8_mask(src[*offset]);
 	++(*offset);
-    return noErr;
+    return mgNoErr;
 }
 
 static MgErr utf8_get_sequence_2(const uInt8 *src, int32 *offset, int32 length, uInt32 *code_point)
@@ -126,7 +126,7 @@
 
     *code_point = ((*code_point << 6) & 0x7c0) + (src[*offset] & 0x3f);
 	++(*offset);
-    return noErr;
+    return mgNoErr;
 }
 
 static MgErr utf8_get_sequence_3(const uInt8 *src, int32 *offset, int32 length, uInt32 *code_point)
@@ -144,7 +144,7 @@
 
     *code_point += src[*offset] & 0x3f;
 	++(*offset);
-    return noErr;
+    return mgNoErr;
 }
 
 static MgErr utf8_get_sequence_4(const uInt8 *src, int32 *offset, int32 length, uInt32 *code_point)
@@ -166,7 +166,7 @@
 
     *code_point += src[*offset++] & 0x3f;
 
-    return noErr;
+    return mgNoErr;
 }
 
 static MgErr utf8_append(uInt32 cp, uInt8 *buffer, int32 *offset, int32 length)
@@ -226,7 +226,7 @@
         }
         *offset += 4;
     }
-    return noErr;
+    return mgNoErr;
 }
 
 static MgErr utf8_next(const uInt8 *buffer, int32 *offset, int32 length, uInt32 *cp)
@@ -256,7 +256,7 @@
                 break;
         }
         *offset = (int32)(ptr - buffer);
-        return noErr;
+        return mgNoErr;
     }
     return mgArgErr;
 }
@@ -278,7 +278,7 @@
 
 MgErr utf8_advance(const uInt8 *src, int32 *offset, int32 length, int32 distance)
 {
-    MgErr err = noErr;
+    MgErr err = mgNoErr;
     int32 i = 0;
     uInt32 cp;
     for (; !err && i < distance; ++i)
@@ -290,7 +290,7 @@
 
 MgErr utf8_distance(const uInt8 *src, int32 *offset, int32 length)
 {
-    MgErr err = noErr;
+    MgErr err = mgNoErr;
     int32 i = 0;
     uInt32 cp;
     for (; !err && src[*offset] && (length < 0 || *offset < length); i++)
@@ -302,7 +302,7 @@
 
 MgErr utf8_validate_next(const uInt8 *src, int32 *offset, int32 length, uInt32 *code_point)
 {
-    MgErr err = noErr;
+    MgErr err = mgNoErr;
     uInt32 cp = 0;
 
     // Save the original value of offset so we can go back in case of failure
@@ -341,7 +341,7 @@
                 if (code_point)
                     *code_point = cp;
                 offset++;
-                return noErr;
+                return mgNoErr;
             }
             else
                 err = OVERLONG_SEQUENCE;
@@ -357,14 +357,14 @@
 
 MgErr utf8_replace_invalid(const uInt8 *src, int32 *soff, int32 slen, uInt8 *dest, int32 *doff, int32 dlen, uInt32 replacement)
 {
-	MgErr err = noErr;
+	MgErr err = mgNoErr;
     while (src[*soff] && (slen < 0 || *soff < slen))
     {
         int32 off = *soff;
         err = utf8_validate_next(src, soff, slen, NULL);
         switch (err)
 		{
-            case noErr:
+            case mgNoErr:
                 for (; off < *soff && *doff < dlen; off++, (*doff)++)
                     dest[*doff] = src[off];
                 break;
@@ -390,7 +390,7 @@
 
 MgErr utf8_is_valid(const uInt8 *src, int32 *offset, int32 length)
 {
-	MgErr err = noErr;
+	MgErr err = mgNoErr;
 	while (!err && src[*offset] && (length < 0 || *offset < length))
 	{
 		err = utf8_validate_next(src, offset, length, NULL);
@@ -400,7 +400,7 @@
 
 MgErr utf16to8(const uInt16 *src, int32 slen, uInt8 *dest, int32 *offset, int32 length)
 {
-    MgErr err = noErr;
+    MgErr err = mgNoErr;
 	int32 soff = 0, doff = offset ? *offset : 0;
     uInt32 cp = 0;
     while (!err && src[soff] && (slen < 0 || soff < slen))
@@ -421,7 +421,7 @@
 
 MgErr utf8to16(const uInt8 *src, int32 slen, uInt16 *dest, int32 *offset, int32 length)
 {
-    MgErr err = noErr;
+    MgErr err = mgNoErr;
     int32 soff = 0, doff = offset ? *offset : 0;
     uInt32 cp = 0;
     while (!err && src[soff] && (slen < 0 || soff < slen))
@@ -461,7 +461,7 @@
 
 MgErr utf32to8(const uInt32 *src, int32 slen, uInt8 *dest, int32 *offset, int32 length)
 {
-    MgErr err = noErr;
+    MgErr err = mgNoErr;
     int32 soff = 0, doff = offset ? *offset : 0;
     while (!err && src[soff] && (slen < 0 || soff < slen))
     {
@@ -474,7 +474,7 @@
 
 MgErr utf8to32(const uInt8 *src, int32 slen, uInt32 *dest, int32 *offset, int32 length)
 {
-    MgErr err = noErr;
+    MgErr err = mgNoErr;
     int32 soff = 0, doff = offset ? *offset : 0;
     uInt32 cp = 0;
     while (!err && src[soff] && (slen < 0 || soff < slen) && (!dest || doff < length))

Modified: trunk/lvzip/c_source/zip.c
===================================================================
--- trunk/lvzip/c_source/zip.c	2015-04-10 10:11:59 UTC (rev 1506)
+++ trunk/lvzip/c_source/zip.c	2015-04-14 19:25:47 UTC (rev 1507)
@@ -181,7 +181,6 @@
 
 } zip64_internal;
 
-
 #ifndef NOCRYPT
 #define INCLUDECRYPTINGCODE_IFCRYPTALLOWED
 #include "crypt.h"
@@ -638,7 +637,7 @@
   return relativeOffset;
 }
 
-int LoadCentralDirectoryRecord(zip64_internal* pziinit)
+local  int LoadCentralDirectoryRecord(zip64_internal* pziinit)
 {
   int err=ZIP_OK;
   ZPOS64_T byte_before_the_zipfile;/* byte before the zipfile, (>0 for sfx)*/
@@ -956,7 +955,7 @@
     return zipOpen3(pathname,append,NULL,NULL);
 }
 
-int Write_LocalFileHeader(zip64_internal* zi, const char* filename, uInt size_extrafield_local, const void* extrafield_local)
+local int Write_LocalFileHeader(zip64_internal* zi, const char* filename, uInt size_extrafield_local, const void* extrafield_local)
 {
   /* write the local header */
   int err;
@@ -1753,7 +1752,7 @@
     return zipCloseFileInZipRaw (file,0,0);
 }
 
-int Write_Zip64EndOfCentralDirectoryLocator(zip64_internal* zi, ZPOS64_T zip64eocd_pos_inzip)
+local int Write_Zip64EndOfCentralDirectoryLocator(zip64_internal* zi, ZPOS64_T zip64eocd_pos_inzip)
 {
   int err = ZIP_OK;
   ZPOS64_T pos = zip64eocd_pos_inzip - zi->add_position_when_writting_offset;
@@ -1775,7 +1774,7 @@
     return err;
 }
 
-int Write_Zip64EndOfCentralDirectoryRecord(zip64_internal* zi, uLong size_centraldir, ZPOS64_T centraldir_pos_inzip)
+local int Write_Zip64EndOfCentralDirectoryRecord(zip64_internal* zi, uLong size_centraldir, ZPOS64_T centraldir_pos_inzip)
 {
   int err = ZIP_OK;
 
@@ -1814,7 +1813,8 @@
   }
   return err;
 }
-int Write_EndOfCentralDirectoryRecord(zip64_internal* zi, uLong size_centraldir, ZPOS64_T centraldir_pos_inzip)
+
+local int Write_EndOfCentralDirectoryRecord(zip64_internal* zi, uLong size_centraldir, ZPOS64_T centraldir_pos_inzip)
 {
   int err = ZIP_OK;
 
@@ -1862,7 +1862,7 @@
    return err;
 }
 
-int Write_GlobalComment(zip64_internal* zi, const char* global_comment)
+local int Write_GlobalComment(zip64_internal* zi, const char* global_comment)
 {
   int err = ZIP_OK;
   uInt size_global_comment = 0;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opengtoolkit-svn] SF.net SVN: opengtoolkit:[1506] trunk/lvzip/RT Images/lvzlib_linux-x64.cdf

From: <lab...@us...> - 2015-04-10 10:12:02

Revision: 1506
          http://sourceforge.net/p/opengtoolkit/svn/1506
Author:   labviewer
Date:     2015-04-10 10:11:59 +0000 (Fri, 10 Apr 2015)
Log Message:
-----------
Fixed bug where the x64 RT target would copy the arm file to the target.

Modified Paths:
--------------
    trunk/lvzip/RT Images/lvzlib_linux-x64.cdf

Modified: trunk/lvzip/RT Images/lvzlib_linux-x64.cdf
===================================================================
--- trunk/lvzip/RT Images/lvzlib_linux-x64.cdf	2015-04-09 22:24:01 UTC (rev 1505)
+++ trunk/lvzip/RT Images/lvzlib_linux-x64.cdf	2015-04-10 10:11:59 UTC (rev 1506)
@@ -5,6 +5,6 @@
 	<ABSTRACT>Support files neccessary to use the OpenG ZIP library.</ABSTRACT>
 	<IMPLEMENTATION>
 		<OS VALUE="NI-Linux x64" />
-		<CODEBASE FILENAME="LinuxRT_arm/liblvzlib.so" TARGET="/usr/local/lib/liblvzlib.so"/>
+		<CODEBASE FILENAME="LinuxRT_x64/liblvzlib.so" TARGET="/usr/local/lib/liblvzlib.so"/>
 	</IMPLEMENTATION>
 </SOFTPKG>
\ No newline at end of file

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opengtoolkit-svn] SF.net SVN: opengtoolkit:[1505] trunk/lvzip

From: <lab...@us...> - 2015-04-09 22:24:03

Revision: 1505
          http://sourceforge.net/p/opengtoolkit/svn/1505
Author:   labviewer
Date:     2015-04-09 22:24:01 +0000 (Thu, 09 Apr 2015)
Log Message:
-----------
Making a few more changes to the packaging

Modified Paths:
--------------
    trunk/lvzip/PostInstall.vi
    trunk/lvzip/RT Images/LinuxRT_arm/liblvzlib.so
    trunk/lvzip/RT Images/LinuxRT_x64/liblvzlib.so
    trunk/lvzip/RT Images/lvzlib_linux-armv7a.cdf
    trunk/lvzip/RT Images/lvzlib_linux-x64.cdf
    trunk/lvzip/build_support/Call-Back VI - Rem namespace from Window Title - Sub.vi
    trunk/lvzip/build_support/Call-Back VI - Rem namespace from Window Title.vi
    trunk/lvzip/build_support/Pre-Post Build (testing).vi
    trunk/lvzip/c_source/.cproject
    trunk/lvzip/lvzip.ogbld
    trunk/lvzip/lvzip.ogpb
    trunk/lvzip/source/opengdoc.txt

Added Paths:
-----------
    trunk/lvzip/build lvzip 70.vi
    trunk/lvzip/source/lvzlib.so
    trunk/lvzip/source/lvzlib64.so

Removed Paths:
-------------
    trunk/lvzip/source/liblvzlib.so
    trunk/lvzip/source/liblvzlib64.so

Modified: trunk/lvzip/PostInstall.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/RT Images/LinuxRT_arm/liblvzlib.so
===================================================================
(Binary files differ)

Modified: trunk/lvzip/RT Images/LinuxRT_x64/liblvzlib.so
===================================================================
(Binary files differ)

Modified: trunk/lvzip/RT Images/lvzlib_linux-armv7a.cdf
===================================================================
--- trunk/lvzip/RT Images/lvzlib_linux-armv7a.cdf	2015-04-08 22:06:42 UTC (rev 1504)
+++ trunk/lvzip/RT Images/lvzlib_linux-armv7a.cdf	2015-04-09 22:24:01 UTC (rev 1505)
@@ -5,6 +5,6 @@
 	<ABSTRACT>Support files neccessary to use the OpenG ZIP library.</ABSTRACT>
 	<IMPLEMENTATION>
 		<OS VALUE="Linux-ARMv7-A"/>
-		<CODEBASE FILENAME="LinuxRT_arm/lvzlib.so" TARGET="/usr/local/lib/lvzlib.so" OWNER="root" GROUP="root" />
+		<CODEBASE FILENAME="LinuxRT_arm/liblvzlib.so" TARGET="/usr/local/lib/liblvzlib.so"/>
 	</IMPLEMENTATION>
 </SOFTPKG>
\ No newline at end of file

Modified: trunk/lvzip/RT Images/lvzlib_linux-x64.cdf
===================================================================
--- trunk/lvzip/RT Images/lvzlib_linux-x64.cdf	2015-04-08 22:06:42 UTC (rev 1504)
+++ trunk/lvzip/RT Images/lvzlib_linux-x64.cdf	2015-04-09 22:24:01 UTC (rev 1505)
@@ -5,6 +5,6 @@
 	<ABSTRACT>Support files neccessary to use the OpenG ZIP library.</ABSTRACT>
 	<IMPLEMENTATION>
 		<OS VALUE="NI-Linux x64" />
-		<CODEBASE FILENAME="LinuxRT_arm/lvzlib.so" TARGET="/usr/local/lib/lvzlib.so"/>
+		<CODEBASE FILENAME="LinuxRT_arm/liblvzlib.so" TARGET="/usr/local/lib/liblvzlib.so"/>
 	</IMPLEMENTATION>
 </SOFTPKG>
\ No newline at end of file

Added: trunk/lvzip/build lvzip 70.vi
===================================================================
(Binary files differ)

Index: trunk/lvzip/build lvzip 70.vi
===================================================================
--- trunk/lvzip/build lvzip 70.vi	2015-04-08 22:06:42 UTC (rev 1504)
+++ trunk/lvzip/build lvzip 70.vi	2015-04-09 22:24:01 UTC (rev 1505)

Property changes on: trunk/lvzip/build lvzip 70.vi
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: trunk/lvzip/build_support/Call-Back VI - Rem namespace from Window Title - Sub.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/build_support/Call-Back VI - Rem namespace from Window Title.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/build_support/Pre-Post Build (testing).vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/c_source/.cproject
===================================================================
--- trunk/lvzip/c_source/.cproject	2015-04-08 22:06:42 UTC (rev 1504)
+++ trunk/lvzip/c_source/.cproject	2015-04-09 22:24:01 UTC (rev 1505)
@@ -46,7 +46,7 @@
 							</tool>
 							<tool id="cdt.managedbuild.tool.gnu.cross.c.linker.166571776" name="Cross GCC Linker" superClass="cdt.managedbuild.tool.gnu.cross.c.linker">
 								<option defaultValue="true" id="gnu.c.link.option.shared.2007093736" name="Shared (-shared)" superClass="gnu.c.link.option.shared" valueType="boolean"/>
-								<option id="gnu.c.link.option.soname.2116511029" name="Shared object name (-Wl,-soname=)" superClass="gnu.c.link.option.soname" value="" valueType="string"/>
+								<option id="gnu.c.link.option.soname.2116511029" name="Shared object name (-Wl,-soname=)" superClass="gnu.c.link.option.soname" value="lvzlib.so" valueType="string"/>
 								<inputType id="cdt.managedbuild.tool.gnu.c.linker.input.170246944" superClass="cdt.managedbuild.tool.gnu.c.linker.input">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
 									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
@@ -116,7 +116,7 @@
 							</tool>
 							<tool id="cdt.managedbuild.tool.gnu.cross.c.linker.1269341061" name="Cross GCC Linker" superClass="cdt.managedbuild.tool.gnu.cross.c.linker">
 								<option defaultValue="true" id="gnu.c.link.option.shared.1568470041" name="Shared (-shared)" superClass="gnu.c.link.option.shared" valueType="boolean"/>
-								<option id="gnu.c.link.option.soname.1221077034" name="Shared object name (-Wl,-soname=)" superClass="gnu.c.link.option.soname" value="" valueType="string"/>
+								<option id="gnu.c.link.option.soname.1221077034" name="Shared object name (-Wl,-soname=)" superClass="gnu.c.link.option.soname" value="lvzlib.so" valueType="string"/>
 								<option id="gnu.c.link.option.libs.898536949" name="Libraries (-l)" superClass="gnu.c.link.option.libs" valueType="libs">
 									<listOptionValue builtIn="false" value="c"/>
 								</option>
@@ -187,7 +187,7 @@
 							</tool>
 							<tool id="cdt.managedbuild.tool.gnu.cross.c.linker.477639206" name="Cross GCC Linker" superClass="cdt.managedbuild.tool.gnu.cross.c.linker">
 								<option defaultValue="true" id="gnu.c.link.option.shared.2029103574" name="Shared (-shared)" superClass="gnu.c.link.option.shared" valueType="boolean"/>
-								<option id="gnu.c.link.option.soname.572765043" name="Shared object name (-Wl,-soname=)" superClass="gnu.c.link.option.soname" value="" valueType="string"/>
+								<option id="gnu.c.link.option.soname.572765043" name="Shared object name (-Wl,-soname=)" superClass="gnu.c.link.option.soname" value="lvzlib.so" valueType="string"/>
 								<inputType id="cdt.managedbuild.tool.gnu.c.linker.input.1838097184" superClass="cdt.managedbuild.tool.gnu.c.linker.input">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
 									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
@@ -256,7 +256,7 @@
 							</tool>
 							<tool id="cdt.managedbuild.tool.gnu.cross.c.linker.779141276" name="Cross GCC Linker" superClass="cdt.managedbuild.tool.gnu.cross.c.linker">
 								<option defaultValue="true" id="gnu.c.link.option.shared.424578524" name="Shared (-shared)" superClass="gnu.c.link.option.shared" valueType="boolean"/>
-								<option id="gnu.c.link.option.soname.1244426688" name="Shared object name (-Wl,-soname=)" superClass="gnu.c.link.option.soname" value="" valueType="string"/>
+								<option id="gnu.c.link.option.soname.1244426688" name="Shared object name (-Wl,-soname=)" superClass="gnu.c.link.option.soname" value="lvzlib.so" valueType="string"/>
 								<option id="gnu.c.link.option.libs.1119215829" name="Libraries (-l)" superClass="gnu.c.link.option.libs" valueType="libs">
 									<listOptionValue builtIn="false" value="c"/>
 								</option>
@@ -324,7 +324,7 @@
 							</tool>
 							<tool id="cdt.managedbuild.tool.gnu.cross.c.linker.198870300" name="Cross GCC Linker" superClass="cdt.managedbuild.tool.gnu.cross.c.linker">
 								<option defaultValue="true" id="gnu.c.link.option.shared.1898938371" name="Shared (-shared)" superClass="gnu.c.link.option.shared" valueType="boolean"/>
-								<option id="gnu.c.link.option.soname.1582106034" name="Shared object name (-Wl,-soname=)" superClass="gnu.c.link.option.soname" value="" valueType="string"/>
+								<option id="gnu.c.link.option.soname.1582106034" name="Shared object name (-Wl,-soname=)" superClass="gnu.c.link.option.soname" value="lvzlib.so" valueType="string"/>
 								<option id="gnu.c.link.option.libs.75776481" name="Libraries (-l)" superClass="gnu.c.link.option.libs" valueType="libs">
 									<listOptionValue builtIn="false" value="c"/>
 								</option>
@@ -389,7 +389,7 @@
 							</tool>
 							<tool id="cdt.managedbuild.tool.gnu.cross.c.linker.961407367" name="Cross GCC Linker" superClass="cdt.managedbuild.tool.gnu.cross.c.linker">
 								<option defaultValue="true" id="gnu.c.link.option.shared.785968802" name="Shared (-shared)" superClass="gnu.c.link.option.shared" valueType="boolean"/>
-								<option id="gnu.c.link.option.soname.444747950" name="Shared object name (-Wl,-soname=)" superClass="gnu.c.link.option.soname" value="" valueType="string"/>
+								<option id="gnu.c.link.option.soname.444747950" name="Shared object name (-Wl,-soname=)" superClass="gnu.c.link.option.soname" value="lvzlib.so" valueType="string"/>
 								<inputType id="cdt.managedbuild.tool.gnu.c.linker.input.2125924394" superClass="cdt.managedbuild.tool.gnu.c.linker.input">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
 									<additionalInput kind="additionalinput" paths="$(LIBS)"/>

Modified: trunk/lvzip/lvzip.ogbld
===================================================================
--- trunk/lvzip/lvzip.ogbld	2015-04-08 22:06:42 UTC (rev 1504)
+++ trunk/lvzip/lvzip.ogbld	2015-04-09 22:24:01 UTC (rev 1505)
@@ -87,16 +87,4 @@
 Save Level=0
 Default Destination=FALSE
 Apply New Password=""
-Namespace=""
-
-[SupportFiles 1]
-TargetDir=""
-OverwriteExisting=TRUE
-FollowVIDirHierarchy=FALSE
-Recursive=FALSE
-Exclude=FALSE
-SourceFile 1=lvzlib.*
-SourceFile 2=submenus/*.mnu
-SourceFile 3=readme.txt
-SourceFile 4=PreInstall.vi
-SourceFile 5=PostInstall.vi
\ No newline at end of file
+Namespace=""
\ No newline at end of file

Modified: trunk/lvzip/lvzip.ogpb
===================================================================
--- trunk/lvzip/lvzip.ogpb	2015-04-08 22:06:42 UTC (rev 1504)
+++ trunk/lvzip/lvzip.ogpb	2015-04-09 22:24:01 UTC (rev 1505)
@@ -11,7 +11,7 @@
 Description="The lvzip package contains several routines for operating on zip files.\0D\0A"
 Summary="OpenG Zip Tools"
 License="BSD (VIs), LGPL (Shared Library)"
-Copyright="1995-2014 Mark Adler, Jean-loup Gailly\0A1998-2014 Gilles Vollant\0A2002 - 2015 Christophe Salzmann, Jim Kring, Rolf Kalbermatter"
+Copyright="1995-2014 Mark Adler, Jean-loup Gailly\0A1998-2014 Gilles Vollant\0A2002 - 2009 Christophe Salzmann, Jim Kring\0A2002 - 2015 Rolf Kalbermatter"
 Distribution="OpenG Toolkit"
 Vendor=OpenG.org
 URL=http://wiki.openg.org/oglib_lvzip
@@ -147,7 +147,7 @@
 DirMode=0
 NameMode=0
 PPFix=""
-Target Dir="<OpenG.lib>/lvzip/RT Images/"
+Target Dir="<OpenG.lib>/lvzip/RT Images"
 Replace Mode="If Newer"
 Exclusive_OS="Windows NT,Windows 9x"
 Num Files=1

Deleted: trunk/lvzip/source/liblvzlib.so
===================================================================
(Binary files differ)

Deleted: trunk/lvzip/source/liblvzlib64.so
===================================================================
(Binary files differ)

Copied: trunk/lvzip/source/lvzlib.so (from rev 1504, trunk/lvzip/source/liblvzlib.so)
===================================================================
(Binary files differ)

Copied: trunk/lvzip/source/lvzlib64.so (from rev 1504, trunk/lvzip/source/liblvzlib64.so)
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/opengdoc.txt
===================================================================
--- trunk/lvzip/source/opengdoc.txt	2015-04-08 22:06:42 UTC (rev 1504)
+++ trunk/lvzip/source/opengdoc.txt	2015-04-09 22:24:01 UTC (rev 1505)
@@ -40,4 +40,5 @@
 
 Copyright (C) 1995-2004 Mark Adler, Jean-loup Gailly
 Copyright (C) 1998-2004 Gilles Vollant
-Copyright (C) 2002-2009 Rolf Kalbermatter, Jim Kring, Christoph Salzmann
+Copyright (C) 2002-2009 Jim Kring, Christoph Salzmann
+Copyright (C) 2002-2015 Rolf Kalbermatter

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opengtoolkit-svn] SF.net SVN: opengtoolkit:[1504] trunk/lvzip

From: <lab...@us...> - 2015-04-08 22:06:45

Revision: 1504
          http://sourceforge.net/p/opengtoolkit/svn/1504
Author:   labviewer
Date:     2015-04-08 22:06:42 +0000 (Wed, 08 Apr 2015)
Log Message:
-----------
finalize some more stuff

Modified Paths:
--------------
    trunk/lvzip/PostInstall.vi
    trunk/lvzip/PreUninstall.vi
    trunk/lvzip/lvzip.ogbld
    trunk/lvzip/lvzip.ogpb
    trunk/lvzip/source/lvzip.llb/ZLIB Common Path to Specific Path.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Compress Directory.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Extract All Files To Dir.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Get Current File Info Old.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Get Current File Info.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Move Raw File.vi
    trunk/lvzip/source/lvzip.llb/ZLIB Specific Path to Common Path.vi
    trunk/lvzip/source/lvzlib.dll
    trunk/lvzip/source/readme.txt
    trunk/lvzip/tests/lvzip-test-lg bin files.vi
    trunk/lvzip/tests/lvzip-test-memory stream.vi

Added Paths:
-----------
    trunk/lvzip/source/liblvzlib.so
    trunk/lvzip/source/liblvzlib64.so
    trunk/lvzip/source/lvzlib64.dll

Removed Paths:
-------------
    trunk/lvzip/source/64bit/
    trunk/lvzip/source/lvzlib.so
    trunk/lvzip/source/vxWorks LV8.2/
    trunk/lvzip/source/vxWorks LV8.5/

Modified: trunk/lvzip/PostInstall.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/PreUninstall.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/lvzip.ogbld
===================================================================
--- trunk/lvzip/lvzip.ogbld	2015-04-07 22:14:23 UTC (rev 1503)
+++ trunk/lvzip/lvzip.ogbld	2015-04-08 22:06:42 UTC (rev 1504)
@@ -99,19 +99,4 @@
 SourceFile 2=submenus/*.mnu
 SourceFile 3=readme.txt
 SourceFile 4=PreInstall.vi
-
-[SupportFiles 2]
-TargetDir="vxWorks82"
-OverwriteExisting=TRUE
-FollowVIDirHierarchy=FALSE
-Recursive=FALSE
-Exclude=FALSE
-SourceFile 1="vxWorks LV8.2/lvzlib.*"
-
-[SupportFiles 3]
-TargetDir="vxWorks85"
-OverwriteExisting=TRUE
-FollowVIDirHierarchy=FALSE
-Recursive=FALSE
-Exclude=FALSE
-SourceFile 1="vxWorks LV8.5/lvzlib.*"
+SourceFile 5=PostInstall.vi
\ No newline at end of file

Modified: trunk/lvzip/lvzip.ogpb
===================================================================
--- trunk/lvzip/lvzip.ogpb	2015-04-07 22:14:23 UTC (rev 1503)
+++ trunk/lvzip/lvzip.ogpb	2015-04-08 22:06:42 UTC (rev 1504)
@@ -1,27 +1,41 @@
+[OGPB Header]
+File Version=1.0.0
+
 [Package Name]
 Name=oglib_lvzip
-Version=2.6.1
-Release=2
+Version=4.1.0
+Release=1
+Display Name="OpenG ZIP Library"
 
 [Description]
-Description="The lvzip package contains several routines for operating on zip files.\0D\0A\0D\0AVersion 2.5.2: Adds support for the new palette locations of OpenG 4.x packages and removes dependency on ogrsc_dynamicpalette package.\0D\0AVersion 2.5.1: Fixes issue with broken VIs in LabVIEW 2009 due to calling (now) private config utilities.\0D\0AVersion 2.5: Changes license of LabVIEW sources from LGPL to BSD, Adds Memory Stream VIs to the palettes, Optimizes ZLIB Extract All Files to Dir, Fixes potential problem where error such as out of disk on finishing to add a file into an archive might get lost meaning that a corrupted archive could result without the user being informed about it, Fixes issue preventing adding files specified by UNC network path to zip archive.\0D\0AVersion 2.4 adds support for direct memory stream handling.\0D\0AVersion 2.3 adds support for transparent Mac Resource file handling through MacBinary encoding.\0D\0AVersion 2.2 adds support for appending files to an existing archive, deleting files from an archive and password support for adding and extracting files."
-
+Description="The lvzip package contains several routines for operating on zip files.\0D\0A"
 Summary="OpenG Zip Tools"
 License="BSD (VIs), LGPL (Shared Library)"
-Copyright="1995-2010 Mark Adler, Jean-loup Gailly\0A1998-2010 Gilles Vollant\0A2002 - 2011 Christophe Salzmann, Jim Kring, Rolf Kalbermatter"
+Copyright="1995-2014 Mark Adler, Jean-loup Gailly\0A1998-2014 Gilles Vollant\0A2002 - 2015 Christophe Salzmann, Jim Kring, Rolf Kalbermatter"
 Distribution="OpenG Toolkit"
-Icon=lvzip.bmp
 Vendor=OpenG.org
 URL=http://wiki.openg.org/oglib_lvzip
 Packager="Jim Kring <ji...@ji...>"
+Release Notes="Version 4.1: Updated to zlib 1.2.8 and added support for new cRIO targets\0AVersion 4.0: New palette menu structure\0AVersion 2.5.2: Adds support for the new palette locations of OpenG 4.x packages and removes dependency on ogrsc_dynamicpalette package.\0D\0AVersion 2.5.1: Fixes issue with broken VIs in LabVIEW 2009 due to calling (now) private config utilities.\0D\0AVersion 2.5: Changes license of LabVIEW sources from LGPL to BSD, Adds Memory Stream VIs to the palettes, Optimizes ZLIB Extract All Files to Dir, Fixes potential problem where error such as out of disk on finishing to add a file into an archive might get lost meaning that a corrupted archive could result without the user being informed about it, Fixes issue preventing adding files specified by UNC network path to zip archive.\0D\0AVersion 2.4 adds support for direct memory stream handling.\0D\0AVersion 2.3 adds support for transparent Mac Resource file handling through MacBinary encoding.\0D\0AVersion 2.2 adds support for appending files to an existing archive, deleting files from an archive and password support for adding and extracting files."
+Demo=FALSE
+System Package=FALSE
+Sub Package=FALSE
+close labview before install=FALSE
+restart labview after install=FALSE
+skip mass compile after install=FALSE
 
+[Package Info]
+Icon=lvzip.bmp
+License File=""
+
 [Platform]
-Exclusive_LabVIEW_Version=>=6.1
+Exclusive_LabVIEW_Version=>=7.0
 Exclusive_LabVIEW_System=All
 Exclusive_OS=All
 
 [Script VIs]
 Source Dir=""
+PreInstall=""
 PostInstall=PostInstall.vi
 PreUninstall=PreUninstall.vi
 PostUninstall=""
@@ -31,105 +45,145 @@
 
 [Dependencies]
 AutoReqProv=FALSE
-Requires="oglib_error >= 2.0, oglib_file >= 2.5"
+Requires=oglib_error>=2.0,oglib_file>=2.5
 Conflicts=""
 
 [Files]
-Num File Groups=13
+Num File Groups=11
+Source Dir=""
+Target Dir=""
+Passwords.<size(s)>=0
+Documentation=""
+NameMode=2
+PPFix=ogtlk
+Doc Groups=""
 
 [File Group 0]
-Source Dir=built/lvzip
+Source Dir=source/submenus
+DirMode=0
+NameMode=0
+PPFix=""
 Target Dir=<OpenG.lib>/lvzip
 Replace Mode=Always
-Num Files=2
+Num Files=1
 File 0=*.mnu
-File 1=*.txt
+Locked 0=-1
 
 [File Group 1]
+Source Dir=source
+DirMode=0
+NameMode=0
+PPFix=""
+Target Dir=<OpenG.lib>/lvzip
+Replace Mode=Always
+Num Files=1
+File 0=readme.txt
+Locked 0=-1
+
+[File Group 2]
 Source Dir=built/lvzip/lvzip.llb
+DirMode=0
+NameMode=0
+PPFix=""
 Target Dir=<OpenG.lib>/lvzip/lvzip.llb
 Replace Mode=Always
 Num Files=2
 File 0=*.vi
+Locked 0=-1
 File 1=*.ctl
+Locked 1=-1
 
-[File Group 2]
+[File Group 3]
 Source Dir=built/lvzip/macbin.llb
+DirMode=0
+NameMode=0
+PPFix=""
 Target Dir=<OpenG.lib>/lvzip/macbin.llb
 Replace Mode=Always
 Num Files=2
 File 0=*.vi
+Locked 0=-1
 File 1=*.ctl
+Locked 1=-1
 
-[File Group 3]
-Source Dir=built/lvzip
+[File Group 4]
+Source Dir=source
+DirMode=0
+NameMode=0
+PPFix=""
 Target Dir=<OpenG.lib>/lvzip
 Replace Mode=Always
-Exclusive_OS="Windows NT,Windows 9x"
+Exclusive_OS="Windows NT,Windows 9x,Windows x64"
 Num Files=1
-File 0=lvzlib.dll
+File 0=*.dll
+Locked 0=-1
 
-[File Group 4]
-Source Dir=built/lvzip/Win64
-Target Dir=<OpenG.lib>/lvzip
-Exclusive_OS="Win64"
-Num Files=1
-File 0=lvzlib.dll
-
 [File Group 5]
-Source Dir=built/lvzip
+Source Dir=source
+DirMode=0
+NameMode=0
+PPFix=""
 Target Dir=<OpenG.lib>/lvzip
 Replace Mode=Always
-Exclusive_OS=Linux
+Exclusive_OS="Linux,Linux x64"
 Num Files=1
-File 0=lvzlib.so
+File 0=*.so
+Locked 0=-1
 
 [File Group 6]
-Source Dir=built/lvzip
+Source Dir=source
+DirMode=0
+NameMode=0
+PPFix=""
 Target Dir=<OpenG.lib>/lvzip
 Replace Mode=Always
 Exclusive_OS="Mac OS>=10"
 Num Files=1
 File 0=lvzlib.framework.zip
+Locked 0=-1
 
 [File Group 7]
-Source Dir=built/lvzip/vxWorks82
-Target Dir=<OpenG.lib>/lvzip
-Exclusive_LabVIEW_Version=<=8.2
+Source Dir="built/RT Images"
+DirMode=0
+NameMode=0
+PPFix=""
+Target Dir="<OpenG.lib>/lvzip/RT Images/"
+Replace Mode="If Newer"
+Exclusive_OS="Windows NT,Windows 9x"
 Num Files=1
-File 0=lvzlib.out
+File 0=setup.exe
+Locked 0=-1
 
 [File Group 8]
-Source Dir=built/lvzip/vxWorks85
-Target Dir=<OpenG.lib>/lvzip
-Exclusive_LabVIEW_Version=>=8.5
+Source Dir="Dynamic Palette MNUs"
+DirMode=0
+NameMode=0
+PPFix=""
+Target Dir=<menus>/Categories/OpenG
+Replace Mode=Always
 Num Files=1
-File 0=lvzlib.out
+File 0=oglib_lvzip.mnu
+Locked 0=-1
 
 [File Group 9]
 Source Dir="Dynamic Palette MNUs"
+DirMode=0
+NameMode=0
+PPFix=""
 Target Dir=<user.lib>/_dynamicpalette_dirs/file
 Replace Mode=Always
 Num Files=1
 File 0=oglib_lvzip.mnu
+Locked 0=-1
 
 [File Group 10]
 Source Dir="Dynamic Palette MNUs"
+DirMode=0
+NameMode=0
+PPFix=""
 Target Dir=<user.lib>/_dynamicpalette_dirs/OpenG
 Replace Mode=Always
 Num Files=1
 File 0=oglib_lvzip.mnu
+Locked 0=-1
 
-[File Group 11]
-Source Dir="Dynamic Palette MNUs"
-Target Dir="<application>/menus/Categories/OpenG"
-Replace Mode=Always
-Num Files=1
-File 0=oglib_lvzip.mnu
-
-[File Group 12]
-Source Dir="Dynamic Palette MNUs"
-Target Dir="<application>/menus/Categories/OpenG"
-Replace Mode=If Newer
-Num Files=1
-File 0=dir.mnu
\ No newline at end of file

Added: trunk/lvzip/source/liblvzlib.so
===================================================================
(Binary files differ)

Index: trunk/lvzip/source/liblvzlib.so
===================================================================
--- trunk/lvzip/source/liblvzlib.so	2015-04-07 22:14:23 UTC (rev 1503)
+++ trunk/lvzip/source/liblvzlib.so	2015-04-08 22:06:42 UTC (rev 1504)

Property changes on: trunk/lvzip/source/liblvzlib.so
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/lvzip/source/liblvzlib64.so
===================================================================
(Binary files differ)

Index: trunk/lvzip/source/liblvzlib64.so
===================================================================
--- trunk/lvzip/source/liblvzlib64.so	2015-04-07 22:14:23 UTC (rev 1503)
+++ trunk/lvzip/source/liblvzlib64.so	2015-04-08 22:06:42 UTC (rev 1504)

Property changes on: trunk/lvzip/source/liblvzlib64.so
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: trunk/lvzip/source/lvzip.llb/ZLIB Common Path to Specific Path.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Compress Directory.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Extract All Files To Dir.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Get Current File Info Old.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Get Current File Info.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Move Raw File.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzip.llb/ZLIB Specific Path to Common Path.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzlib.dll
===================================================================
(Binary files differ)

Deleted: trunk/lvzip/source/lvzlib.so
===================================================================
(Binary files differ)

Added: trunk/lvzip/source/lvzlib64.dll
===================================================================
(Binary files differ)

Index: trunk/lvzip/source/lvzlib64.dll
===================================================================
--- trunk/lvzip/source/lvzlib64.dll	2015-04-07 22:14:23 UTC (rev 1503)
+++ trunk/lvzip/source/lvzlib64.dll	2015-04-08 22:06:42 UTC (rev 1504)

Property changes on: trunk/lvzip/source/lvzlib64.dll
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: trunk/lvzip/source/readme.txt
===================================================================
--- trunk/lvzip/source/readme.txt	2015-04-07 22:14:23 UTC (rev 1503)
+++ trunk/lvzip/source/readme.txt	2015-04-08 22:06:42 UTC (rev 1504)
@@ -1,7 +1,7 @@
-LabVIEW ZIP library, version 2.5.2
+LabVIEW ZIP library, version 4.1.0
 ----------------------------------
 
-Copyright 2002-2009 Rolf Kalbermatter
+Copyright 2002-2015 Rolf Kalbermatter
 
 
 Please read this document before you upgrade from a version of LVZIP
@@ -11,19 +11,24 @@
 in comparison to earlier versions which might require you to slightly redo
 your project.
 
-Release 2.6.1, Released: Jun. xx, 2010
+Release 4.1.0, Released: Mar. 05, 2015
 ======================================
 
 New features:
 -------------
-1) Upgraded to zlib 1.2.5 and minizip 1.1 sources
+1) Added some support for extended character codes with various character encodings.
 2) Support for ZIP64 Archives (>4GB) (an individual file inside the archive still
    needs to be smaller than 4GB when getting added or extracted and memory stream
    based retrieval is limited to < 2GB large archives due to LabVIEWs 2GB limit for
    string handles)
-3) Support for LabVIEW for 64 Bit
+3) Added support for Windows and Linux 64 bit platforms
+4) Added support for all NI-Linux RT platforrms
 
+Bug fixes:
+----------
+1) Upgraded to zlib 1.2.8 and included minizip
 
+
 Release 2.5.2, Released: Sep. 3, 2009
 =====================================
 

Modified: trunk/lvzip/tests/lvzip-test-lg bin files.vi
===================================================================
(Binary files differ)

Modified: trunk/lvzip/tests/lvzip-test-memory stream.vi
===================================================================
(Binary files differ)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opengtoolkit-svn] SF.net SVN: opengtoolkit:[1502] trunk/lvzip

From: <lab...@us...> - 2015-04-07 22:04:02

Revision: 1502
          http://sourceforge.net/p/opengtoolkit/svn/1502
Author:   labviewer
Date:     2015-04-07 22:03:55 +0000 (Tue, 07 Apr 2015)
Log Message:
-----------
Add RT images installer

Added Paths:
-----------
    trunk/lvzip/RT Images/LinuxRT_arm/
    trunk/lvzip/RT Images/LinuxRT_arm/liblvzlib.so
    trunk/lvzip/RT Images/LinuxRT_x64/
    trunk/lvzip/RT Images/LinuxRT_x64/liblvzlib.so
    trunk/lvzip/RT Images/lvzlib_linux-armv7a.cdf
    trunk/lvzip/RT Images/lvzlib_linux-x64.cdf
    trunk/lvzip/RT Images/lvzlib_pharlap.cdf
    trunk/lvzip/RT Images/lvzlib_vxworks61.cdf
    trunk/lvzip/RT Images/lvzlib_vxworks63.cdf
    trunk/lvzip/RT Images/pharlap/
    trunk/lvzip/RT Images/pharlap/lvzlib.dll
    trunk/lvzip/RT Images/vxworks61/
    trunk/lvzip/RT Images/vxworks61/lvzlib.out
    trunk/lvzip/RT Images/vxworks63/
    trunk/lvzip/RT Images/vxworks63/lvzlib.out
    trunk/lvzip/lvzip RT Images.iss

Removed Paths:
-------------
    trunk/lvzip/RT Images/OpenG ZIP Tools/

Index: trunk/lvzip/RT Images/LinuxRT_arm
===================================================================
--- trunk/lvzip/RT Images/LinuxRT_arm	2015-02-18 08:35:20 UTC (rev 1501)
+++ trunk/lvzip/RT Images/LinuxRT_arm	2015-04-07 22:03:55 UTC (rev 1502)

Property changes on: trunk/lvzip/RT Images/LinuxRT_arm
___________________________________________________________________
Added: bugtraq:label
## -0,0 +1 ##
+TrackerID:
\ No newline at end of property
Added: bugtraq:url
## -0,0 +1 ##
+https://sourceforge.net/support/tracker.php?aid=%BUGID%
\ No newline at end of property
Added: bugtraq:message
## -0,0 +1 ##
+TrackerID: %BUGID%
\ No newline at end of property
Added: trunk/lvzip/RT Images/LinuxRT_arm/liblvzlib.so
===================================================================
(Binary files differ)

Index: trunk/lvzip/RT Images/LinuxRT_arm/liblvzlib.so
===================================================================
--- trunk/lvzip/RT Images/LinuxRT_arm/liblvzlib.so	2015-02-18 08:35:20 UTC (rev 1501)
+++ trunk/lvzip/RT Images/LinuxRT_arm/liblvzlib.so	2015-04-07 22:03:55 UTC (rev 1502)

Property changes on: trunk/lvzip/RT Images/LinuxRT_arm/liblvzlib.so
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: trunk/lvzip/RT Images/LinuxRT_x64
===================================================================
--- trunk/lvzip/RT Images/LinuxRT_x64	2015-02-18 08:35:20 UTC (rev 1501)
+++ trunk/lvzip/RT Images/LinuxRT_x64	2015-04-07 22:03:55 UTC (rev 1502)

Property changes on: trunk/lvzip/RT Images/LinuxRT_x64
___________________________________________________________________
Added: bugtraq:label
## -0,0 +1 ##
+TrackerID:
\ No newline at end of property
Added: bugtraq:url
## -0,0 +1 ##
+https://sourceforge.net/support/tracker.php?aid=%BUGID%
\ No newline at end of property
Added: bugtraq:message
## -0,0 +1 ##
+TrackerID: %BUGID%
\ No newline at end of property
Added: trunk/lvzip/RT Images/LinuxRT_x64/liblvzlib.so
===================================================================
(Binary files differ)

Index: trunk/lvzip/RT Images/LinuxRT_x64/liblvzlib.so
===================================================================
--- trunk/lvzip/RT Images/LinuxRT_x64/liblvzlib.so	2015-02-18 08:35:20 UTC (rev 1501)
+++ trunk/lvzip/RT Images/LinuxRT_x64/liblvzlib.so	2015-04-07 22:03:55 UTC (rev 1502)

Property changes on: trunk/lvzip/RT Images/LinuxRT_x64/liblvzlib.so
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/lvzip/RT Images/lvzlib_linux-armv7a.cdf
===================================================================
--- trunk/lvzip/RT Images/lvzlib_linux-armv7a.cdf	                        (rev 0)
+++ trunk/lvzip/RT Images/lvzlib_linux-armv7a.cdf	2015-04-07 22:03:55 UTC (rev 1502)
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<?CDF version="1.5"?>
+<SOFTPKG NAME="{38D47F1D-07F2-4CA0-89DB-6F89598DA97C}" VERSION="4.1.0" TYPE="VISIBLE">
+	<TITLE>OpenG ZIP Tools</TITLE>
+	<ABSTRACT>Support files neccessary to use the OpenG ZIP library.</ABSTRACT>
+	<IMPLEMENTATION>
+		<OS VALUE="Linux-ARMv7-A"/>
+		<CODEBASE FILENAME="LinuxRT_arm/lvzlib.so" TARGET="/usr/local/lib/lvzlib.so" OWNER="root" GROUP="root" />
+	</IMPLEMENTATION>
+</SOFTPKG>
\ No newline at end of file

Added: trunk/lvzip/RT Images/lvzlib_linux-x64.cdf
===================================================================
--- trunk/lvzip/RT Images/lvzlib_linux-x64.cdf	                        (rev 0)
+++ trunk/lvzip/RT Images/lvzlib_linux-x64.cdf	2015-04-07 22:03:55 UTC (rev 1502)
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<?CDF version="1.5"?>
+<SOFTPKG NAME="{38D47F1D-07F2-4CA0-89DB-6F89598DA97C}" VERSION="4.1.0" TYPE="VISIBLE">
+	<TITLE>OpenG ZIP Tools</TITLE>
+	<ABSTRACT>Support files neccessary to use the OpenG ZIP library.</ABSTRACT>
+	<IMPLEMENTATION>
+		<OS VALUE="NI-Linux x64" />
+		<CODEBASE FILENAME="LinuxRT_arm/lvzlib.so" TARGET="/usr/local/lib/lvzlib.so"/>
+	</IMPLEMENTATION>
+</SOFTPKG>
\ No newline at end of file

Added: trunk/lvzip/RT Images/lvzlib_pharlap.cdf
===================================================================
--- trunk/lvzip/RT Images/lvzlib_pharlap.cdf	                        (rev 0)
+++ trunk/lvzip/RT Images/lvzlib_pharlap.cdf	2015-04-07 22:03:55 UTC (rev 1502)
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<?CDF version="1.2"?>
+<!DOCTYPE SOFTPKG SYSTEM "c:\cdf.dtd">
+<SOFTPKG NAME="{38D47F1D-07F2-4CA0-89DB-6F89598DA97C}" VERSION="4.1.0" TYPE="VISIBLE">
+	<TITLE>OpenG ZIP Tools</TITLE>
+	<ABSTRACT>Support files neccessary to use the OpenG ZIP library.</ABSTRACT>
+	<IMPLEMENTATION>
+		<OS VALUE="PharLap" />
+		<CODEBASE FILENAME="pharlap/lvzlib.dll" TARGET="/ni-rt/system/lvzlib.dll"/>
+	</IMPLEMENTATION>
+</SOFTPKG>
\ No newline at end of file

Added: trunk/lvzip/RT Images/lvzlib_vxworks61.cdf
===================================================================
--- trunk/lvzip/RT Images/lvzlib_vxworks61.cdf	                        (rev 0)
+++ trunk/lvzip/RT Images/lvzlib_vxworks61.cdf	2015-04-07 22:03:55 UTC (rev 1502)
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<?CDF version="1.2"?>
+<!DOCTYPE SOFTPKG SYSTEM "c:\cdf.dtd">
+<SOFTPKG NAME="{38D47F1D-07F2-4CA0-89DB-6F89598DA97C}" VERSION="4.1.0" TYPE="VISIBLE">
+	<TITLE>OpenG ZIP Tools</TITLE>
+	<ABSTRACT>Support files neccessary to use the OpenG ZIP library.</ABSTRACT>
+	<IMPLEMENTATION>
+		<DEVICECLASS VALUE="cRIO"/>	
+		<OS VALUE="VxWorks-PPC603" />
+		<CODEBASE FILENAME="vxworks61/lvzlib.out" TARGET="/ni-rt/system/lvzlib.out"/>
+		<DEPENDENCY>
+			<SOFTPKG NAME="{899452D2-C085-430B-B76D-7FDB33BB324A}" VERSION="8.2.0">
+				<TITLE>LabVIEW RT</TITLE>
+			</SOFTPKG>
+		</DEPENDENCY>
+	</IMPLEMENTATION>
+</SOFTPKG>
\ No newline at end of file

Added: trunk/lvzip/RT Images/lvzlib_vxworks63.cdf
===================================================================
--- trunk/lvzip/RT Images/lvzlib_vxworks63.cdf	                        (rev 0)
+++ trunk/lvzip/RT Images/lvzlib_vxworks63.cdf	2015-04-07 22:03:55 UTC (rev 1502)
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<?CDF version="1.2"?>
+<!DOCTYPE SOFTPKG SYSTEM "c:\cdf.dtd">
+<SOFTPKG NAME="{38D47F1D-07F2-4CA0-89DB-6F89598DA97C}" VERSION="4.1.0" TYPE="VISIBLE">
+	<TITLE>OpenG ZIP Tools</TITLE>
+	<ABSTRACT>Support files neccessary to use the OpenG ZIP library.</ABSTRACT>
+	<IMPLEMENTATION>
+		<OS VALUE="VxWorks-PPC603" />
+		<CODEBASE FILENAME="vxworks63/lvzlib.out" TARGET="/ni-rt/system/lvzlib.out"/>
+		<DEPENDENCY>
+			<SOFTPKG NAME="{899452D2-C085-430B-B76D-7FDB33BB324A}" VERSION="8.5.0">
+				<TITLE>LabVIEW RT</TITLE>
+			</SOFTPKG>
+		</DEPENDENCY>
+	</IMPLEMENTATION>
+</SOFTPKG>
\ No newline at end of file

Index: trunk/lvzip/RT Images/pharlap
===================================================================
--- trunk/lvzip/RT Images/pharlap	2015-02-18 08:35:20 UTC (rev 1501)
+++ trunk/lvzip/RT Images/pharlap	2015-04-07 22:03:55 UTC (rev 1502)

Property changes on: trunk/lvzip/RT Images/pharlap
___________________________________________________________________
Added: bugtraq:label
## -0,0 +1 ##
+TrackerID:
\ No newline at end of property
Added: bugtraq:url
## -0,0 +1 ##
+https://sourceforge.net/support/tracker.php?aid=%BUGID%
\ No newline at end of property
Added: bugtraq:message
## -0,0 +1 ##
+TrackerID: %BUGID%
\ No newline at end of property
Added: trunk/lvzip/RT Images/pharlap/lvzlib.dll
===================================================================
(Binary files differ)

Index: trunk/lvzip/RT Images/pharlap/lvzlib.dll
===================================================================
--- trunk/lvzip/RT Images/pharlap/lvzlib.dll	2015-02-18 08:35:20 UTC (rev 1501)
+++ trunk/lvzip/RT Images/pharlap/lvzlib.dll	2015-04-07 22:03:55 UTC (rev 1502)

Property changes on: trunk/lvzip/RT Images/pharlap/lvzlib.dll
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: trunk/lvzip/RT Images/vxworks61
===================================================================
--- trunk/lvzip/RT Images/vxworks61	2015-02-18 08:35:20 UTC (rev 1501)
+++ trunk/lvzip/RT Images/vxworks61	2015-04-07 22:03:55 UTC (rev 1502)

Property changes on: trunk/lvzip/RT Images/vxworks61
___________________________________________________________________
Added: bugtraq:label
## -0,0 +1 ##
+TrackerID:
\ No newline at end of property
Added: bugtraq:url
## -0,0 +1 ##
+https://sourceforge.net/support/tracker.php?aid=%BUGID%
\ No newline at end of property
Added: bugtraq:message
## -0,0 +1 ##
+TrackerID: %BUGID%
\ No newline at end of property
Added: trunk/lvzip/RT Images/vxworks61/lvzlib.out
===================================================================
(Binary files differ)

Index: trunk/lvzip/RT Images/vxworks61/lvzlib.out
===================================================================
--- trunk/lvzip/RT Images/vxworks61/lvzlib.out	2015-02-18 08:35:20 UTC (rev 1501)
+++ trunk/lvzip/RT Images/vxworks61/lvzlib.out	2015-04-07 22:03:55 UTC (rev 1502)

Property changes on: trunk/lvzip/RT Images/vxworks61/lvzlib.out
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: trunk/lvzip/RT Images/vxworks63
===================================================================
--- trunk/lvzip/RT Images/vxworks63	2015-02-18 08:35:20 UTC (rev 1501)
+++ trunk/lvzip/RT Images/vxworks63	2015-04-07 22:03:55 UTC (rev 1502)

Property changes on: trunk/lvzip/RT Images/vxworks63
___________________________________________________________________
Added: bugtraq:label
## -0,0 +1 ##
+TrackerID:
\ No newline at end of property
Added: bugtraq:url
## -0,0 +1 ##
+https://sourceforge.net/support/tracker.php?aid=%BUGID%
\ No newline at end of property
Added: bugtraq:message
## -0,0 +1 ##
+TrackerID: %BUGID%
\ No newline at end of property
Added: trunk/lvzip/RT Images/vxworks63/lvzlib.out
===================================================================
(Binary files differ)

Index: trunk/lvzip/RT Images/vxworks63/lvzlib.out
===================================================================
--- trunk/lvzip/RT Images/vxworks63/lvzlib.out	2015-02-18 08:35:20 UTC (rev 1501)
+++ trunk/lvzip/RT Images/vxworks63/lvzlib.out	2015-04-07 22:03:55 UTC (rev 1502)

Property changes on: trunk/lvzip/RT Images/vxworks63/lvzlib.out
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/lvzip/lvzip RT Images.iss
===================================================================
--- trunk/lvzip/lvzip RT Images.iss	                        (rev 0)
+++ trunk/lvzip/lvzip RT Images.iss	2015-04-07 22:03:55 UTC (rev 1502)
@@ -0,0 +1,14 @@
+; Script generated by the Inno Script Studio Wizard.
+; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
+
+[Setup]
+AppName=OpenG ZIP Library for NI RT controllers
+AppVersion=4.1
+DefaultDirName={reg:HKLM32\Software\National Instruments\RT Images,Path|{pf32}\National Instruments\RT Images}\OpenG ZIP Tools\4.1.0
+DisableDirPage=yes
+SourceDir=RT Images
+OutputDir=..\built\RT Images
+PrivilegesRequired=admin
+
+[Files]
+Source: "*.*"; DestDir: "{app}"; Flags: recursesubdirs

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opengtoolkit-svn] SF.net SVN: opengtoolkit:[1501] trunk/lvzip

From: <lab...@us...> - 2015-02-18 08:35:29

Revision: 1501
          http://sourceforge.net/p/opengtoolkit/svn/1501
Author:   labviewer
Date:     2015-02-18 08:35:20 +0000 (Wed, 18 Feb 2015)
Log Message:
-----------
Adding Realtime image support file structure

Added Paths:
-----------
    trunk/lvzip/RT Images/
    trunk/lvzip/RT Images/OpenG ZIP Tools/
    trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/
    trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/LinuxRT_arm/
    trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/LinuxRT_arm/lvzlib.so
    trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/LinuxRT_x64/
    trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/LinuxRT_x64/lvzlib.so
    trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/lvzlib_linux-armv7a.cdf
    trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/lvzlib_linux-x64.cdf
    trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/lvzlib_pharlap.cdf
    trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/lvzlib_vxworks61.cdf
    trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/lvzlib_vxworks63.cdf
    trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/pharlap/
    trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/pharlap/lvzlib.dll
    trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/vxworks61/
    trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/vxworks61/lvzlib.out
    trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/vxworks63/
    trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/vxworks63/lvzlib.out

Index: trunk/lvzip/RT Images
===================================================================
--- trunk/lvzip/RT Images	2015-02-01 01:27:50 UTC (rev 1500)
+++ trunk/lvzip/RT Images	2015-02-18 08:35:20 UTC (rev 1501)

Property changes on: trunk/lvzip/RT Images
___________________________________________________________________
Added: bugtraq:label
## -0,0 +1 ##
+TrackerID:
\ No newline at end of property
Added: bugtraq:url
## -0,0 +1 ##
+https://sourceforge.net/support/tracker.php?aid=%BUGID%
\ No newline at end of property
Added: bugtraq:message
## -0,0 +1 ##
+TrackerID: %BUGID%
\ No newline at end of property
Index: trunk/lvzip/RT Images/OpenG ZIP Tools
===================================================================
--- trunk/lvzip/RT Images/OpenG ZIP Tools	2015-02-01 01:27:50 UTC (rev 1500)
+++ trunk/lvzip/RT Images/OpenG ZIP Tools	2015-02-18 08:35:20 UTC (rev 1501)

Property changes on: trunk/lvzip/RT Images/OpenG ZIP Tools
___________________________________________________________________
Added: bugtraq:label
## -0,0 +1 ##
+TrackerID:
\ No newline at end of property
Added: bugtraq:url
## -0,0 +1 ##
+https://sourceforge.net/support/tracker.php?aid=%BUGID%
\ No newline at end of property
Added: bugtraq:message
## -0,0 +1 ##
+TrackerID: %BUGID%
\ No newline at end of property
Index: trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0
===================================================================
--- trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0	2015-02-01 01:27:50 UTC (rev 1500)
+++ trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0	2015-02-18 08:35:20 UTC (rev 1501)

Property changes on: trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0
___________________________________________________________________
Added: bugtraq:label
## -0,0 +1 ##
+TrackerID:
\ No newline at end of property
Added: bugtraq:url
## -0,0 +1 ##
+https://sourceforge.net/support/tracker.php?aid=%BUGID%
\ No newline at end of property
Added: bugtraq:message
## -0,0 +1 ##
+TrackerID: %BUGID%
\ No newline at end of property
Index: trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/LinuxRT_arm
===================================================================
--- trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/LinuxRT_arm	2015-02-01 01:27:50 UTC (rev 1500)
+++ trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/LinuxRT_arm	2015-02-18 08:35:20 UTC (rev 1501)

Property changes on: trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/LinuxRT_arm
___________________________________________________________________
Added: bugtraq:label
## -0,0 +1 ##
+TrackerID:
\ No newline at end of property
Added: bugtraq:url
## -0,0 +1 ##
+https://sourceforge.net/support/tracker.php?aid=%BUGID%
\ No newline at end of property
Added: bugtraq:message
## -0,0 +1 ##
+TrackerID: %BUGID%
\ No newline at end of property
Added: trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/LinuxRT_arm/lvzlib.so
===================================================================
(Binary files differ)

Index: trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/LinuxRT_arm/lvzlib.so
===================================================================
--- trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/LinuxRT_arm/lvzlib.so	2015-02-01 01:27:50 UTC (rev 1500)
+++ trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/LinuxRT_arm/lvzlib.so	2015-02-18 08:35:20 UTC (rev 1501)

Property changes on: trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/LinuxRT_arm/lvzlib.so
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/LinuxRT_x64
===================================================================
--- trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/LinuxRT_x64	2015-02-01 01:27:50 UTC (rev 1500)
+++ trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/LinuxRT_x64	2015-02-18 08:35:20 UTC (rev 1501)

Property changes on: trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/LinuxRT_x64
___________________________________________________________________
Added: bugtraq:label
## -0,0 +1 ##
+TrackerID:
\ No newline at end of property
Added: bugtraq:url
## -0,0 +1 ##
+https://sourceforge.net/support/tracker.php?aid=%BUGID%
\ No newline at end of property
Added: bugtraq:message
## -0,0 +1 ##
+TrackerID: %BUGID%
\ No newline at end of property
Added: trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/LinuxRT_x64/lvzlib.so
===================================================================
(Binary files differ)

Index: trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/LinuxRT_x64/lvzlib.so
===================================================================
--- trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/LinuxRT_x64/lvzlib.so	2015-02-01 01:27:50 UTC (rev 1500)
+++ trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/LinuxRT_x64/lvzlib.so	2015-02-18 08:35:20 UTC (rev 1501)

Property changes on: trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/LinuxRT_x64/lvzlib.so
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/lvzlib_linux-armv7a.cdf
===================================================================
--- trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/lvzlib_linux-armv7a.cdf	                        (rev 0)
+++ trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/lvzlib_linux-armv7a.cdf	2015-02-18 08:35:20 UTC (rev 1501)
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<?CDF version="1.5"?>
+<SOFTPKG NAME="{38D47F1D-07F2-4CA0-89DB-6F89598DA97C}" VERSION="4.1.0" TYPE="VISIBLE">
+	<TITLE>OpenG ZIP Tools</TITLE>
+	<ABSTRACT>Support files neccessary to use the OpenG ZIP library.</ABSTRACT>
+	<IMPLEMENTATION>
+		<OS VALUE="Linux-ARMv7-A"/>
+		<CODEBASE FILENAME="LinuxRT_arm/lvzlib.so" TARGET="/usr/lib/lvzlib.so"/>
+		<DEPENDENCY>
+			<SOFTPKG NAME="{899452D2-C085-430B-B76D-7FDB33BB324A}" VERSION="12.0">
+				<TITLE>LabVIEW Real-Time</TITLE>
+			</SOFTPKG>
+		</DEPENDENCY>
+	</IMPLEMENTATION>
+</SOFTPKG>
\ No newline at end of file

Added: trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/lvzlib_linux-x64.cdf
===================================================================
--- trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/lvzlib_linux-x64.cdf	                        (rev 0)
+++ trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/lvzlib_linux-x64.cdf	2015-02-18 08:35:20 UTC (rev 1501)
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<?CDF version="1.5"?>
+<SOFTPKG NAME="{38D47F1D-07F2-4CA0-89DB-6F89598DA97C}" VERSION="4.1.0" TYPE="VISIBLE">
+	<TITLE>OpenG ZIP Tools</TITLE>
+	<ABSTRACT>Support files neccessary to use the OpenG ZIP library.</ABSTRACT>
+	<IMPLEMENTATION>
+		<OS VALUE="NI-Linux x64" />
+		<CODEBASE FILENAME="LinuxRT_x64/lvzlib.so" TARGET="/usr/lib/lvzlib.so"/>
+		<DEPENDENCY>
+			<SOFTPKG NAME="{899452D2-C085-430B-B76D-7FDB33BB324A}" VERSION="12.0">
+				<TITLE>LabVIEW Real-Time</TITLE>
+			</SOFTPKG>
+		</DEPENDENCY>
+	</IMPLEMENTATION>
+</SOFTPKG>
\ No newline at end of file

Added: trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/lvzlib_pharlap.cdf
===================================================================
--- trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/lvzlib_pharlap.cdf	                        (rev 0)
+++ trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/lvzlib_pharlap.cdf	2015-02-18 08:35:20 UTC (rev 1501)
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<?CDF version="1.2"?>
+<!DOCTYPE SOFTPKG SYSTEM "c:\cdf.dtd">
+<SOFTPKG NAME="{38D47F1D-07F2-4CA0-89DB-6F89598DA97C}" VERSION="4.1.0" TYPE="VISIBLE">
+	<TITLE>OpenG ZIP Tools</TITLE>
+	<ABSTRACT>Support files neccessary to use the OpenG ZIP library.</ABSTRACT>
+	<IMPLEMENTATION>
+		<OS VALUE="PharLap" />
+		<CODEBASE FILENAME="pharlap/lvzlib.dll" TARGET="/ni-rt/system/lvzlib.dll"/>
+		<DEPENDENCY>
+			<SOFTPKG NAME="{899452D2-C085-430B-B76D-7FDB33BB324A}" VERSION="7.1.1">
+				<TITLE>LabVIEW RT</TITLE>
+			</SOFTPKG>
+		</DEPENDENCY>
+	</IMPLEMENTATION>
+</SOFTPKG>
\ No newline at end of file

Added: trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/lvzlib_vxworks61.cdf
===================================================================
--- trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/lvzlib_vxworks61.cdf	                        (rev 0)
+++ trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/lvzlib_vxworks61.cdf	2015-02-18 08:35:20 UTC (rev 1501)
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<?CDF version="1.2"?>
+<!DOCTYPE SOFTPKG SYSTEM "c:\cdf.dtd">
+<SOFTPKG NAME="{38D47F1D-07F2-4CA0-89DB-6F89598DA97C}" VERSION="4.1.0" TYPE="VISIBLE">
+	<TITLE>OpenG ZIP Tools</TITLE>
+	<ABSTRACT>Support files neccessary to use the OpenG ZIP library.</ABSTRACT>
+	<IMPLEMENTATION>
+		<OS VALUE="VxWorks-PPC603" />
+		<CODEBASE FILENAME="vxworks61/lvzlib.out" TARGET="/ni-rt/system/lvzlib.out"/>
+		<DEPENDENCY>
+			<SOFTPKG NAME="{899452D2-C085-430B-B76D-7FDB33BB324A}" VERSION="8.2.0">
+				<TITLE>LabVIEW RT</TITLE>
+			</SOFTPKG>
+		</DEPENDENCY>
+	</IMPLEMENTATION>
+</SOFTPKG>
\ No newline at end of file

Added: trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/lvzlib_vxworks63.cdf
===================================================================
--- trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/lvzlib_vxworks63.cdf	                        (rev 0)
+++ trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/lvzlib_vxworks63.cdf	2015-02-18 08:35:20 UTC (rev 1501)
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<?CDF version="1.2"?>
+<!DOCTYPE SOFTPKG SYSTEM "c:\cdf.dtd">
+<SOFTPKG NAME="{38D47F1D-07F2-4CA0-89DB-6F89598DA97C}" VERSION="4.1.0" TYPE="VISIBLE">
+	<TITLE>OpenG ZIP Tools</TITLE>
+	<ABSTRACT>Support files neccessary to use the OpenG ZIP library.</ABSTRACT>
+	<IMPLEMENTATION>
+		<OS VALUE="VxWorks-PPC603" />
+		<CODEBASE FILENAME="vxworks63/lvzlib.out" TARGET="/ni-rt/system/lvzlib.out"/>
+		<DEPENDENCY>
+			<SOFTPKG NAME="{899452D2-C085-430B-B76D-7FDB33BB324A}" VERSION="8.5.0">
+				<TITLE>LabVIEW RT</TITLE>
+			</SOFTPKG>
+		</DEPENDENCY>
+	</IMPLEMENTATION>
+</SOFTPKG>
\ No newline at end of file

Index: trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/pharlap
===================================================================
--- trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/pharlap	2015-02-01 01:27:50 UTC (rev 1500)
+++ trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/pharlap	2015-02-18 08:35:20 UTC (rev 1501)

Property changes on: trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/pharlap
___________________________________________________________________
Added: bugtraq:label
## -0,0 +1 ##
+TrackerID:
\ No newline at end of property
Added: bugtraq:url
## -0,0 +1 ##
+https://sourceforge.net/support/tracker.php?aid=%BUGID%
\ No newline at end of property
Added: bugtraq:message
## -0,0 +1 ##
+TrackerID: %BUGID%
\ No newline at end of property
Added: trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/pharlap/lvzlib.dll
===================================================================
(Binary files differ)

Index: trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/pharlap/lvzlib.dll
===================================================================
--- trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/pharlap/lvzlib.dll	2015-02-01 01:27:50 UTC (rev 1500)
+++ trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/pharlap/lvzlib.dll	2015-02-18 08:35:20 UTC (rev 1501)

Property changes on: trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/pharlap/lvzlib.dll
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/vxworks61
===================================================================
--- trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/vxworks61	2015-02-01 01:27:50 UTC (rev 1500)
+++ trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/vxworks61	2015-02-18 08:35:20 UTC (rev 1501)

Property changes on: trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/vxworks61
___________________________________________________________________
Added: bugtraq:label
## -0,0 +1 ##
+TrackerID:
\ No newline at end of property
Added: bugtraq:url
## -0,0 +1 ##
+https://sourceforge.net/support/tracker.php?aid=%BUGID%
\ No newline at end of property
Added: bugtraq:message
## -0,0 +1 ##
+TrackerID: %BUGID%
\ No newline at end of property
Added: trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/vxworks61/lvzlib.out
===================================================================
(Binary files differ)

Index: trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/vxworks61/lvzlib.out
===================================================================
--- trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/vxworks61/lvzlib.out	2015-02-01 01:27:50 UTC (rev 1500)
+++ trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/vxworks61/lvzlib.out	2015-02-18 08:35:20 UTC (rev 1501)

Property changes on: trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/vxworks61/lvzlib.out
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/vxworks63
===================================================================
--- trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/vxworks63	2015-02-01 01:27:50 UTC (rev 1500)
+++ trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/vxworks63	2015-02-18 08:35:20 UTC (rev 1501)

Property changes on: trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/vxworks63
___________________________________________________________________
Added: bugtraq:label
## -0,0 +1 ##
+TrackerID:
\ No newline at end of property
Added: bugtraq:url
## -0,0 +1 ##
+https://sourceforge.net/support/tracker.php?aid=%BUGID%
\ No newline at end of property
Added: bugtraq:message
## -0,0 +1 ##
+TrackerID: %BUGID%
\ No newline at end of property
Added: trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/vxworks63/lvzlib.out
===================================================================
(Binary files differ)

Index: trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/vxworks63/lvzlib.out
===================================================================
--- trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/vxworks63/lvzlib.out	2015-02-01 01:27:50 UTC (rev 1500)
+++ trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/vxworks63/lvzlib.out	2015-02-18 08:35:20 UTC (rev 1501)

Property changes on: trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/vxworks63/lvzlib.out
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Opengtoolkit-svn] SF.net SVN: opengtoolkit:[1497] trunk/lvzip/c_source/lvutil.c

From: <lab...@us...> - 2014-07-15 14:33:00

Revision: 1497
          http://sourceforge.net/p/opengtoolkit/svn/1497
Author:   labviewer
Date:     2014-07-15 14:32:57 +0000 (Tue, 15 Jul 2014)
Log Message:
-----------


Modified Paths:
--------------
    trunk/lvzip/c_source/lvutil.c

Modified: trunk/lvzip/c_source/lvutil.c
===================================================================
--- trunk/lvzip/c_source/lvutil.c	2014-07-15 14:11:25 UTC (rev 1496)
+++ trunk/lvzip/c_source/lvutil.c	2014-07-15 14:32:57 UTC (rev 1497)
@@ -1708,16 +1708,21 @@
 #if Unix
 #define UStrBuf(s)	(wchar_t*)LStrbuf(s)
 #ifdef HAVE_ICONV
-static char *iconv_getcharset(uInt32 codePage)
+TH_UI static char *iconv_getcharset(uInt32 codePage)
 {
+	static char[10] cp;
 	switch (codePage)
 	{
 		case CP_ACP:
-			return "ACP";
+			return "CHAR";
 		case CP_OEMCP:
+			/* FIXME: determine current local and return according OEM */
 			return "OEM";
 		case CP_UTF8:
-			return "UTF8";
+			return "UTF-8";
+		default:
+			sprintf_s(cp, 10, "CP%d", codepage);
+			return cp;
 	}
 	return NULL;
 }
@@ -1745,10 +1750,12 @@
 	return UnixToMgErr();
 }
 #else
-static MgErr unix_convert(const char *src, size_t len, UStrHandle *dest, const char *charset)
+/* We don't have a good way of converting from an arbitrary character set to wide char and back.
+   Just do default mbcs to wide char and vice versa ??? */
+static MgErr unix_convert_mbtow(const char *src, size_t len, UStrHandle *dest, const char *charset)
 {
-	size_t max = LStrLen(*src), numChars = 0, length;
-	char *pt = LStrBuf(*src);
+	size_t max = len, numChars = 0, length;
+	char *pt = (char*)src;
 #if HAVE_MBRTOWC
 	mbstate_t mbs;
 
@@ -1778,7 +1785,6 @@
 #endif
 	if (numChars > 0)
 	{
-		numChars;
 		err = NumericArrayResize(uB, 1, (UHandle*)dest, numChars * sizeof(wchar_t));
 		if (!err)
 		{

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Flat | Threaded

<< < 1 2 3 4 5 6 .. 32 > >> (Page 4 of 32)