SF.net SVN: frontierkernel: [1447] Frontier/branches/FSRef_Migration/Common/source/fileloop.c

[<cre...@us...>]

Revision: 1447
Author:   creecode
Date:     2006-07-07 17:47:26 -0700 (Fri, 07 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/frontierkernel/?rev=1447&view=rev

Log Message:
-----------
on Mac in fileloop skip .vol and Spotlight directories

minor code formatting tweaks

Modified Paths:
--------------
    Frontier/branches/FSRef_Migration/Common/source/fileloop.c
Modified: Frontier/branches/FSRef_Migration/Common/source/fileloop.c
===================================================================
--- Frontier/branches/FSRef_Migration/Common/source/fileloop.c	2006-07-08 00:43:24 UTC (rev 1446)
+++ Frontier/branches/FSRef_Migration/Common/source/fileloop.c	2006-07-08 00:47:26 UTC (rev 1447)
@@ -401,20 +401,27 @@
 			if (oserror (errcode)) // errcode != noErr
 				goto error;
 			
-			// if it's a folder, insert a colon at the end of the file name
+			if ( fs.parID == fsRtParID ) {
 			
-			if (foldertestcipbr (&pb))
-				if (!pushchar (':', bsfile))
-					goto error;
-			
-			/*
-			if (filefilter != nil) {
-				
-				if (!(*filefilter) (bspath, bsfile))
+				if ( equalstrings ( bsfile, "\x0F" ".Spotlight-V100" ) ) // skip Spotlight
 					continue;
+					
+				if ( equalstrings ( bsfile, "\x04" ".vol" ) ) // skip .vol ( volfs )
+					continue;
 				}
-			*/
 			
+			if ( foldertestcipbr ( &pb ) )			
+				if ( ! pushchar ( ':', bsfile ) ) // if it's a folder, insert a colon at the end of the file name
+					goto error;
+			
+			//
+			// if (filefilter != nil) {
+			//	
+			// 	if (!(*filefilter) (bspath, bsfile))
+			// 		continue;
+			// 	}
+			//
+			
 			if (!newtexthandle (bsfile, &hstring))
 				goto error;
 			
@@ -672,7 +679,6 @@
 		OSErr err;
 		FSSpec fsfile;
 		
-
 		if (!opgetlisthandle ((**h).hfilelist, (**h).ixdirectory++, nil, &hdata))
 			return (false);
 		
@@ -718,11 +724,11 @@
 				
 				if ((err == noErr) || (err == fnfErr)) { // 3.0.4b1 dmb
 				
-					FSpMakeFSRef ( &fsfile, &( *fsfilet ).fsref );
+					err = FSpMakeFSRef ( &fsfile, &( *fsfilet ).fsref );
 					
 					getfilespecparent ( &( *fsfilet ) );
 					
-					return (true);
+					return ( true );
 					
 					}
 				
@@ -741,7 +747,7 @@
 				
 				getfilespecparent ( &( *fsfilet ) );
 				
-				return (true);
+				return ( true );
 				}
 			}
 		


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