Menu
▾
▴
SF.net SVN: frontierkernel:[1826] Frontier/trunk/Common
|
From: <and...@us...> - 2009-08-30 19:58:58
|
Revision: 1826
http://frontierkernel.svn.sourceforge.net/frontierkernel/?rev=1826&view=rev
Author: andreradke
Date: 2009-08-30 19:58:42 +0000 (Sun, 30 Aug 2009)
Log Message:
-----------
In file.folderFromPath, don't fail silently if an nil filespec is passed in. Also don't accept a string containing just a non-existing volume name in filespec() coercion, restoring previous behaviour.
Modified Paths:
--------------
Frontier/trunk/Common/headers/strings.h
Frontier/trunk/Common/source/fileops.c
Frontier/trunk/Common/source/filepath.c
Frontier/trunk/Common/source/strings.c
Modified: Frontier/trunk/Common/headers/strings.h
===================================================================
--- Frontier/trunk/Common/headers/strings.h 2009-08-30 13:02:40 UTC (rev 1825)
+++ Frontier/trunk/Common/headers/strings.h 2009-08-30 19:58:42 UTC (rev 1826)
@@ -106,6 +106,8 @@
extern boolean stringreplaceall (char, char, bigstring);
+extern boolean stringswapall (char, char, bigstring);
+
extern boolean textlastword (ptrbyte, long, byte, bigstring);
extern boolean textfirstword (ptrbyte, long, byte, bigstring);
Modified: Frontier/trunk/Common/source/fileops.c
===================================================================
--- Frontier/trunk/Common/source/fileops.c 2009-08-30 13:02:40 UTC (rev 1825)
+++ Frontier/trunk/Common/source/fileops.c 2009-08-30 19:58:42 UTC (rev 1826)
@@ -3072,23 +3072,30 @@
boolean getfileparentfolder ( const ptrfilespec fs, ptrfilespec fsparent ) {
+ // 2009-08-30 aradke: handle null filespecs. don't fail silently if an error occurs.
//
// 2006-08-24 creedon: FSRef-ized
- //
- // this function used to use oserror but I don't think oserror can handle osstatus properly
+ HFSUniStr255 name;
+ OSErr err;
- HFSUniStr255 name;
- OSErr err = FSGetCatalogInfo ( &( *fs ).fsref, kFSCatInfoNone, NULL, &name, NULL, &( *fsparent ).fsref );
+ if ( !FSRefValid ( &(*fs).fsref ) ) {
+
+ clearbytes ( fsparent, sizeof(tyfilespec) );
+
+ return ( true );
+ }
+
+ err = FSGetCatalogInfo ( &( *fs ).fsref, kFSCatInfoNone, NULL, &name, NULL, &( *fsparent ).fsref );
- if ( err != noErr )
+ if ( oserror(err) )
return ( false );
if ( ( *fs ).path == NULL ) {
err = FSGetCatalogInfo ( &( *fsparent ).fsref, kFSCatInfoNone, NULL, &name, NULL, &( *fsparent ).fsref );
- if ( err != noErr )
+ if ( oserror(err) )
return ( false );
}
Modified: Frontier/trunk/Common/source/filepath.c
===================================================================
--- Frontier/trunk/Common/source/filepath.c 2009-08-30 13:02:40 UTC (rev 1825)
+++ Frontier/trunk/Common/source/filepath.c 2009-08-30 19:58:42 UTC (rev 1826)
@@ -67,7 +67,7 @@
FSRef volumesfsref;
OSErr err;
- status = FSPathMakeRef ( "/Volumes", &volumesfsref, NULL );
+ status = FSPathMakeRef ( (UInt8*) "/Volumes", &volumesfsref, NULL );
err = FSCompareFSRefs ( &( *fs ).fsref , &volumesfsref );
@@ -267,8 +267,45 @@
} // filespectopath
+#ifdef MACVERSION
+
+static OSStatus pathtofsref ( bigstring bspath, FSRef *ref ) {
+
+ /*
+ 2009-08-30 aradke: mac-only helper function for pathtofilespec for converting from a pascal string (path) to an FSRef
+ */
+
+ bigstring bs;
+ CFStringRef csref;
+ char str[256];
+
+ copystring(bspath, bs);
+
+ // convert from colon-delimited to slash-delimited path
+
+ stringswapall(':', '/', bs);
+
+ // convert from Mac Roman to UTF-8 */
+
+ csref = CFStringCreateWithPascalString(kCFAllocatorDefault, bs, kCFStringEncodingMacRoman);
+
+ CFStringGetCString(csref, str, sizeof(str), kCFStringEncodingUTF8);
+
+ CFRelease(csref);
+
+ // finally, pass our temporary copy of the string to the underlying system function
+
+ return FSPathMakeRef((UInt8*) str, ref, NULL);
+ } /*pathtofsref*/
+
+#endif
+
+
boolean pathtofilespec ( bigstring bspath, ptrfilespec fs ) {
+ // 2009-08-30 aradke: refactored mac version to make it easier to understand.
+ // fixed bug where a bspath containing a non-existing volume name was accepted as valid,
+ // e.g. filespec("foobar:"), thus deviating from previous behaviour.
//
// 2006-10-16 creedon: for Mac, FSRef-ized
//
@@ -287,239 +324,96 @@
// non-existant files, we don't give up right away.
//
- bigstring bsfolder;
+ #ifdef MACVERSION
+ FSRef fsr;
+ HFSUniStr255 name;
+ OSErr err;
+ bigstring bspathtmp, bsfullpath, bsfile, bsfolder;
+ short ix = 1;
+ boolean flvolume = false;
+ #endif
+ #ifdef WIN95VERSION
+ bigstring bsfolder;
+ #endif
+
clearbytes ( fs, sizeof ( *fs ) );
if ( isemptystring ( bspath ) )
return ( true );
#ifdef MACVERSION
+
+ // create cleaned-up full path representation of our input suitable for pathtosref
- FSRef fsr;
- HFSUniStr255 name;
- OSErr err;
- OSStatus status;
- bigstring bs, bspathtmp;
- short ix = 1, ixslashpos = 0, slashpos [ 255 ];
-
copystring ( bspath, bspathtmp );
cleanendoffilename ( bspathtmp );
- if ( scanstring ( ':', bspath, &ix ) && ( ix > 1 ) ) { // full path, includes a colon, not the first character
+ if ( scanstring ( ':', bspath, &ix ) && ( ix > 1 ) ) {
- bigstring bsfile, bsfullpath;
+ // contains a colon but doesn't start with one, so it must be a full path
+
+ if ( ix == stringlength ( bspath ) ) // the colon we found is the last char, so bspath is a volume name
+ flvolume = true;
- copystring ( bspathtmp, bsfullpath );
+ copystring ( BIGSTRING ( "\x09" ":Volumes:" ), bsfullpath ); // FIXME: what if bspath was just a non-existing volume name like "foo:" ???
- insertstring ( BIGSTRING ( "\x09" ":Volumes:" ), bsfullpath );
+ pushstring ( bspathtmp, bsfullpath );
+ }
- copystring ( bsfullpath, bs );
-
- /* convert to / delimited path */ {
+ else {
+
+ // it's a partial path, prefix with default directory (see initfsdefault)
+
+ tyfilespec fst;
+ OSStatus status;
- while ( scanstring ( '/', bs, &ix ) )
- slashpos [ ixslashpos++ ] = ix++;
-
- stringreplaceall ( ':', '/', bs );
-
- while ( ixslashpos > 0 )
- setstringcharacter ( bs, slashpos [ --ixslashpos ] - 1, ':' );
- }
+ ( void ) extendfilespec ( &fsdefault, &fst );
- /* convert from Mac Roman to UTF-8 */ {
+ status = FSRefMakePath ( &fst.fsref, ( UInt8 * ) bsfullpath, sizeof(bsfullpath) ); // bsfullpath is now a c string
- CFStringRef csr = CFStringCreateWithPascalString ( kCFAllocatorDefault, bs,
- kCFStringEncodingMacRoman );
+ convertcstring ( bsfullpath ); // bsfullpath is now a bigstring
+
+ stringswapall ( '/', ':', bsfullpath ); // convert to colon-delimited path
- CFStringGetCString ( csr, ( char * ) bs, sizeof ( bs ), kCFStringEncodingUTF8 );
-
- CFRelease ( csr );
+ if ( bspathtmp [ 1 ] != chpathseparator ) // append path separator if partial path doesn't begin with one
+ pushchar ( chpathseparator, bsfullpath );
+
+ pushstring ( bspathtmp, bsfullpath ); // finally append partial path
+ }
- }
+ // now see if the full path resolves
- status = FSPathMakeRef ( bs, &fsr, NULL );
+ if ( pathtofsref ( bsfullpath, &fsr ) == noErr ) {
+
+ err = FSGetCatalogInfo ( &fsr, kFSCatInfoNone, NULL, &name, NULL, &fsr );
- if ( status == noErr ) {
+ ( *fs ).fsref = fsr;
- err = FSGetCatalogInfo ( &fsr, kFSCatInfoNone, NULL, &name, NULL, &fsr );
-
- ( *fs ).fsref = fsr;
-
- ( *fs ).path = CFStringCreateWithCharacters ( kCFAllocatorDefault, name.unicode, name.length );
-
- return ( true );
-
- } // if
+ ( *fs ).path = CFStringCreateWithCharacters ( kCFAllocatorDefault, name.unicode, name.length );
+
+ return ( true );
+ }
+ // full path did not resolve but we actually only require the parent folder to exist
+
+ if ( ! flvolume ) { // volumes don't have a parent folder
+
filefrompath ( bsfullpath, bsfile );
folderfrompath ( bsfullpath, bsfolder );
-
- /* convert to / delimited path */ {
-
- ix = 1;
- ixslashpos = 0;
-
- while ( scanstring ( '/', bsfolder, &ix ) )
- slashpos [ ixslashpos++ ] = ix++;
-
- stringreplaceall ( ':', '/', bsfolder );
-
- while ( ixslashpos > 0 )
- setstringcharacter ( bsfolder, slashpos [ --ixslashpos ] - 1, ':' );
- }
-
- /* convert from Mac Roman to UTF-8 */ {
-
- CFStringRef csr = CFStringCreateWithPascalString ( kCFAllocatorDefault, bsfolder,
- kCFStringEncodingMacRoman );
-
- CFStringGetCString ( csr, ( char * ) bsfolder, sizeof ( bsfolder ), kCFStringEncodingUTF8 );
-
- CFRelease ( csr );
-
- }
-
- status = FSPathMakeRef ( bsfolder, &fsr, NULL );
- if ( status == noErr ) {
+ if ( pathtofsref ( bsfolder, &fsr ) == noErr ) {
( *fs ).fsref = fsr;
- ( *fs ).path = CFStringCreateWithPascalString ( kCFAllocatorDefault, bsfile,
- kCFStringEncodingMacRoman );
+ ( *fs ).path = CFStringCreateWithPascalString ( kCFAllocatorDefault, bsfile, kCFStringEncodingMacRoman );
return ( true );
-
- } // if
-
- } // end full path
-
- else { // partial path
-
- bigstring bspartialpath;
- tyfilespec fst;
-
- copystring ( bspathtmp, bspartialpath );
-
- if ( bspartialpath [ 1 ] != chpathseparator )
- insertchar ( chpathseparator, bspartialpath );
-
- ( void ) extendfilespec ( &fsdefault, &fst );
-
- status = FSRefMakePath ( &fst.fsref, ( UInt8 * ) bs, 256 ); // bs is now a c string
-
- convertcstring ( bs ); // bs is now a bigstring
-
- /* convert bs to colon delimited path */ {
-
- ix = 1;
- ixslashpos = 0;
-
- while ( scanstring ( ':', bs, &ix ) )
- slashpos [ ixslashpos++ ] = ix++;
-
- stringreplaceall ( '/', ':', bs );
-
- while ( ixslashpos > 0 )
- setstringcharacter ( bs, slashpos [ --ixslashpos ] - 1, '/' );
}
-
- insertstring ( bs, bspartialpath ); // we now have a full path
-
- copystring ( bspartialpath, bs );
-
- /* convert bs to / delimited path */ {
-
- ix = 1;
- ixslashpos = 0;
-
- while ( scanstring ( '/', bs, &ix ) )
- slashpos [ ixslashpos++ ] = ix++;
-
- stringreplaceall ( ':', '/', bs );
-
- while ( ixslashpos > 0 )
- setstringcharacter ( bs, slashpos [ --ixslashpos ] - 1, ':' );
- }
-
- /* convert from Mac Roman to UTF-8 */ {
-
- CFStringRef csr = CFStringCreateWithPascalString ( kCFAllocatorDefault, bsfolder,
- kCFStringEncodingMacRoman );
-
- CFStringGetCString ( csr, ( char * ) bsfolder, sizeof ( bsfolder ), kCFStringEncodingUTF8 );
-
- CFRelease ( csr );
+ }
- }
-
- status = FSPathMakeRef ( bs, &fsr, NULL );
-
- if ( status == noErr ) {
-
- err = FSGetCatalogInfo ( &fsr, kFSCatInfoNone, NULL, &name, NULL, &fsr );
-
- ( *fs ).fsref = fsr;
-
- ( *fs ).path = CFStringCreateWithCharacters ( kCFAllocatorDefault, name.unicode, name.length );
-
- return ( true );
-
- } // if
-
- /* try parent of path */ {
-
- bigstring bsfile;
-
- filefrompath ( bspartialpath, bsfile );
-
- folderfrompath ( bspartialpath, bsfolder );
-
- /* convert to slash delimited path */ {
-
- ix = 1;
- ixslashpos = 0;
-
- while ( scanstring ( '/', bsfolder, &ix ) )
- slashpos [ ixslashpos++ ] = ix++;
-
- stringreplaceall ( ':', '/', bsfolder );
-
- while ( ixslashpos > 0 )
- setstringcharacter ( bsfolder, slashpos [ --ixslashpos ] - 1, ':' );
- }
-
- /* convert from Mac Roman to UTF-8 */ {
-
- CFStringRef csr = CFStringCreateWithPascalString ( kCFAllocatorDefault, bsfolder,
- kCFStringEncodingMacRoman );
-
- CFStringGetCString ( csr, ( char * ) bsfolder, sizeof ( bsfolder ), kCFStringEncodingUTF8 );
-
- CFRelease ( csr );
-
- }
-
- status = FSPathMakeRef ( bsfolder, &fsr, NULL );
-
- if ( status == noErr ) {
-
- ( *fs ).fsref = fsr;
-
- ( *fs ).path = CFStringCreateWithPascalString ( kCFAllocatorDefault, bsfile,
- kCFStringEncodingMacRoman );
-
- return ( true );
-
- } // if
-
- } // end try parent of path
-
- } // end partial path
-
return ( false );
#endif
Modified: Frontier/trunk/Common/source/strings.c
===================================================================
--- Frontier/trunk/Common/source/strings.c 2009-08-30 13:02:40 UTC (rev 1825)
+++ Frontier/trunk/Common/source/strings.c 2009-08-30 19:58:42 UTC (rev 1826)
@@ -687,6 +687,30 @@
} /*stringreplaceall*/
+boolean stringswapall (char ch1, char ch2, bigstring bs) {
+
+ /*
+ 2009-08-30 aradke: replace all instances of ch1 with ch2 and vice versa, useful for converting posix file paths
+ */
+
+ int ct = stringlength(bs);
+ unsigned char* p = stringbaseaddress(bs);
+
+ while (ct > 0) {
+
+ if (*p == ch1)
+ *p = ch2;
+ else if (*p == ch2)
+ *p = ch1;
+
+ p++;
+ ct--;
+ }
+
+ return (true);
+ } /*stringswapall*/
+
+
boolean textlastword (ptrbyte ptext, long len, byte chdelim, bigstring bsdest) {
/*
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
