aboutsummaryrefslogtreecommitdiff
path: root/src/unstable/myriadfs.cpp
diff options
context:
space:
mode:
authorMike Buland <eichlan@xagasoft.com>2020-02-04 19:27:37 -0800
committerMike Buland <eichlan@xagasoft.com>2020-02-04 19:27:37 -0800
commit9459cb32504c9d269bc467190bba41897f86a97b (patch)
treee16a916fbbd071462ca0e9ce94fae88f062f289a /src/unstable/myriadfs.cpp
parentfd830279725081d95e3f08f768ed6879c92fe838 (diff)
parented5e7684b766a3914b30c5b449608542695fd3b8 (diff)
downloadlibbu++-9459cb32504c9d269bc467190bba41897f86a97b.tar.gz
libbu++-9459cb32504c9d269bc467190bba41897f86a97b.tar.bz2
libbu++-9459cb32504c9d269bc467190bba41897f86a97b.tar.xz
libbu++-9459cb32504c9d269bc467190bba41897f86a97b.zip
Merge branch 'master' into unicode
Diffstat (limited to '')
-rw-r--r--src/unstable/myriadfs.cpp30
1 files changed, 15 insertions, 15 deletions
diff --git a/src/unstable/myriadfs.cpp b/src/unstable/myriadfs.cpp
index 7a87662..6b51195 100644
--- a/src/unstable/myriadfs.cpp
+++ b/src/unstable/myriadfs.cpp
@@ -121,7 +121,7 @@ Bu::MyriadStream Bu::MyriadFs::open( const Bu::String &sPath, int /*iMode*/,
121 try 121 try
122 { 122 {
123 iNode = lookupInode( sPath, iParent ); 123 iNode = lookupInode( sPath, iParent );
124 sio << "File found." << sio.nl; 124// sio << "File found." << sio.nl;
125 // The file was found 125 // The file was found
126 return openByInode( iNode ); 126 return openByInode( iNode );
127 } 127 }
@@ -137,10 +137,10 @@ Bu::MyriadStream Bu::MyriadFs::open( const Bu::String &sPath, int /*iMode*/,
137 // The file wasn't found, but the path leading up to it was. 137 // The file wasn't found, but the path leading up to it was.
138 // first, figure out the final path element... 138 // first, figure out the final path element...
139 Bu::String sName = filePart( sPath ); 139 Bu::String sName = filePart( sPath );
140 sio << "End filename: " << sName << sio.nl; 140// sio << "End filename: " << sName << sio.nl;
141 sio << "Parent inode: " << iParent << sio.nl; 141// sio << "Parent inode: " << iParent << sio.nl;
142 iNode = create( iParent, sName, (uPerms&permMask)|typeRegFile, 0 ); 142 iNode = create( iParent, sName, (uPerms&permMask)|typeRegFile, 0 );
143 sio << "New iNode: " << iNode << sio.nl; 143// sio << "New iNode: " << iNode << sio.nl;
144 return openByInode( iNode ); 144 return openByInode( iNode );
145 } 145 }
146} 146}
@@ -164,7 +164,7 @@ void Bu::MyriadFs::create( const Bu::String &sPath, uint16_t iPerms,
164 try 164 try
165 { 165 {
166 iNode = lookupInode( sPath, iParent ); 166 iNode = lookupInode( sPath, iParent );
167 sio << "File found." << sio.nl; 167// sio << "File found." << sio.nl;
168 } 168 }
169 catch( Bu::MyriadFsException &e ) 169 catch( Bu::MyriadFsException &e )
170 { 170 {
@@ -178,10 +178,10 @@ void Bu::MyriadFs::create( const Bu::String &sPath, uint16_t iPerms,
178 // The file wasn't found, but the path leading up to it was. 178 // The file wasn't found, but the path leading up to it was.
179 // first, figure out the final path element... 179 // first, figure out the final path element...
180 Bu::String sName = filePart( sPath ); 180 Bu::String sName = filePart( sPath );
181 sio << "End filename: " << sName << sio.nl; 181// sio << "End filename: " << sName << sio.nl;
182 sio << "Parent inode: " << iParent << sio.nl; 182// sio << "Parent inode: " << iParent << sio.nl;
183 iNode = create( iParent, sName, iPerms, uSpecial ); 183 iNode = create( iParent, sName, iPerms, uSpecial );
184 sio << "New iNode: " << iNode << sio.nl; 184// sio << "New iNode: " << iNode << sio.nl;
185 } 185 }
186 // The file was found 186 // The file was found
187 //throw Bu::MyriadFsException("Path already exists."); 187 //throw Bu::MyriadFsException("Path already exists.");
@@ -213,10 +213,10 @@ void Bu::MyriadFs::mkSymLink( const Bu::String &sTarget,
213 // The file wasn't found, but the path leading up to it was. 213 // The file wasn't found, but the path leading up to it was.
214 // first, figure out the final path element... 214 // first, figure out the final path element...
215 Bu::String sName = filePart( sPath ); 215 Bu::String sName = filePart( sPath );
216 sio << "End filename: " << sName << sio.nl; 216// sio << "End filename: " << sName << sio.nl;
217 sio << "Parent inode: " << iParent << sio.nl; 217// sio << "Parent inode: " << iParent << sio.nl;
218 iNode = create( iParent, sName, 0777|typeSymLink, 0 ); 218 iNode = create( iParent, sName, 0777|typeSymLink, 0 );
219 sio << "New iNode: " << iNode << sio.nl; 219// sio << "New iNode: " << iNode << sio.nl;
220 MyriadStream ms = openByInode( iNode ); 220 MyriadStream ms = openByInode( iNode );
221 ms.write( sTarget ); 221 ms.write( sTarget );
222 return; 222 return;
@@ -249,8 +249,8 @@ void Bu::MyriadFs::mkHardLink( const Bu::String &sTarget,
249 // The file wasn't found, but the path leading up to it was. 249 // The file wasn't found, but the path leading up to it was.
250 // first, figure out the final path element... 250 // first, figure out the final path element...
251 Bu::String sName = filePart( sPath ); 251 Bu::String sName = filePart( sPath );
252 sio << "End filename: " << sName << sio.nl; 252// sio << "End filename: " << sName << sio.nl;
253 sio << "Parent inode: " << iParent << sio.nl; 253// sio << "Parent inode: " << iParent << sio.nl;
254 addToDir( iParent, iNode, sName ); 254 addToDir( iParent, iNode, sName );
255 MyriadStream is = mStore.openStream( 2 ); 255 MyriadStream is = mStore.openStream( 2 );
256 RawStat rs; 256 RawStat rs;
@@ -558,8 +558,8 @@ int32_t Bu::MyriadFs::allocInode( uint16_t uPerms, uint32_t uSpecial )
558 558
559 case typeDir: 559 case typeDir:
560 rs.uStreamIndex = mStore.createStream(); 560 rs.uStreamIndex = mStore.createStream();
561 sio << "Creating directory node, storage: " 561// sio << "Creating directory node, storage: "
562 << rs.uStreamIndex << sio.nl; 562// << rs.uStreamIndex << sio.nl;
563 { 563 {
564 Bu::MyriadStream msDir = mStore.openStream( 564 Bu::MyriadStream msDir = mStore.openStream(
565 rs.uStreamIndex 565 rs.uStreamIndex