aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMike Buland <eichlan@xagasoft.com>2011-02-20 04:59:31 +0000
committerMike Buland <eichlan@xagasoft.com>2011-02-20 04:59:31 +0000
commit3bb19feba42174a08842e035d21edd424ce9ced1 (patch)
treee6a9e60fe4527414e8334db874538677c873b4a2 /src
parentc88a480b9bcabf9aad4f7b66685bbafacc022cc4 (diff)
downloadlibbu++-3bb19feba42174a08842e035d21edd424ce9ced1.tar.gz
libbu++-3bb19feba42174a08842e035d21edd424ce9ced1.tar.bz2
libbu++-3bb19feba42174a08842e035d21edd424ce9ced1.tar.xz
libbu++-3bb19feba42174a08842e035d21edd424ce9ced1.zip
Cleaned up a little, and added a bunch more stuff to myriadfs. As far as I can
tell, we're missing rename, chown, and chmod.
Diffstat (limited to 'src')
-rw-r--r--src/myriadfs.cpp223
-rw-r--r--src/myriadfs.h13
-rw-r--r--src/tools/myriadfs.cpp62
3 files changed, 253 insertions, 45 deletions
diff --git a/src/myriadfs.cpp b/src/myriadfs.cpp
index b4ba733..41ba652 100644
--- a/src/myriadfs.cpp
+++ b/src/myriadfs.cpp
@@ -112,7 +112,8 @@ void Bu::MyriadFs::stat( const Bu::String &sPath, Bu::MyriadFs::Stat &rBuf )
112 stat( iNode, rBuf, is ); 112 stat( iNode, rBuf, is );
113} 113}
114 114
115Bu::MyriadStream Bu::MyriadFs::open( const Bu::String &sPath, int iMode ) 115Bu::MyriadStream Bu::MyriadFs::open( const Bu::String &sPath, int iMode,
116 uint16_t uPerms )
116{ 117{
117 int32_t iParent = -1; 118 int32_t iParent = -1;
118 int32_t iNode; 119 int32_t iNode;
@@ -134,16 +135,10 @@ Bu::MyriadStream Bu::MyriadFs::open( const Bu::String &sPath, int iMode )
134 135
135 // The file wasn't found, but the path leading up to it was. 136 // The file wasn't found, but the path leading up to it was.
136 // first, figure out the final path element... 137 // first, figure out the final path element...
137 Bu::String::const_iterator iStart = sPath.begin(); 138 Bu::String sName = filePart( sPath );
138 if( *iStart == '/' )
139 iStart++;
140 sio << "Scanning for filename:" << sio.nl;
141 for( Bu::String::const_iterator iEnd = iStart.find('/'); iEnd;
142 iStart = iEnd+1, iEnd = iStart.find('/') ) { }
143 Bu::String sName( iStart, sPath.end() );
144 sio << "End filename: " << sName << sio.nl; 139 sio << "End filename: " << sName << sio.nl;
145 sio << "Parent inode: " << iParent << sio.nl; 140 sio << "Parent inode: " << iParent << sio.nl;
146 iNode = create( iParent, sName, 0664|typeRegFile, 0 ); 141 iNode = create( iParent, sName, (uPerms&permMask)|typeRegFile, 0 );
147 sio << "New iNode: " << iNode << sio.nl; 142 sio << "New iNode: " << iNode << sio.nl;
148 return openByInode( iNode ); 143 return openByInode( iNode );
149 } 144 }
@@ -183,13 +178,7 @@ void Bu::MyriadFs::create( const Bu::String &sPath, uint16_t iPerms,
183 178
184 // The file wasn't found, but the path leading up to it was. 179 // The file wasn't found, but the path leading up to it was.
185 // first, figure out the final path element... 180 // first, figure out the final path element...
186 Bu::String::const_iterator iStart = sPath.begin(); 181 Bu::String sName = filePart( sPath );
187 if( *iStart == '/' )
188 iStart++;
189 sio << "Scanning for filename:" << sio.nl;
190 for( Bu::String::const_iterator iEnd = iStart.find('/'); iEnd;
191 iStart = iEnd+1, iEnd = iStart.find('/') ) { }
192 Bu::String sName( iStart, sPath.end() );
193 sio << "End filename: " << sName << sio.nl; 182 sio << "End filename: " << sName << sio.nl;
194 sio << "Parent inode: " << iParent << sio.nl; 183 sio << "Parent inode: " << iParent << sio.nl;
195 iNode = create( iParent, sName, iPerms, uSpecial ); 184 iNode = create( iParent, sName, iPerms, uSpecial );
@@ -202,6 +191,49 @@ void Bu::MyriadFs::mkDir( const Bu::String &sPath, uint16_t iPerms )
202 create( sPath, (iPerms&permMask)|typeDir, 0 ); 191 create( sPath, (iPerms&permMask)|typeDir, 0 );
203} 192}
204 193
194void Bu::MyriadFs::mkSymLink( const Bu::String &sPath,
195 const Bu::String &sTarget )
196{
197 int32_t iParent = -1;
198 int32_t iNode;
199 try
200 {
201 iNode = lookupInode( sPath, iParent );
202 throw Bu::MyriadFsException("Path already exists.");
203 }
204 catch( Bu::MyriadFsException &e )
205 {
206 if( iParent < 0 )
207 throw;
208
209 // This means that an intermediate path component couldn't be found
210 if( e.getErrorCode() == 1 )
211 throw;
212
213 // The file wasn't found, but the path leading up to it was.
214 // first, figure out the final path element...
215 Bu::String sName = filePart( sPath );
216 sio << "End filename: " << sName << sio.nl;
217 sio << "Parent inode: " << iParent << sio.nl;
218 iNode = create( iParent, sName, 0777|typeSymLink, 0 );
219 sio << "New iNode: " << iNode << sio.nl;
220 MyriadStream ms = openByInode( iNode );
221 ms.write( sTarget );
222 }
223}
224
225Bu::String Bu::MyriadFs::readSymLink( const Bu::String &sPath )
226{
227 int32_t iParent = -1;
228 int32_t iNode;
229 iNode = lookupInode( sPath, iParent );
230 MyriadStream ms = openByInode( iNode );
231 Bu::String sRet;
232 sRet.setSize( ms.getSize() );
233 ms.read( sRet.getStr(), ms.getSize() );
234 return sRet;
235}
236
205Bu::MyriadFs::Dir Bu::MyriadFs::readDir( const Bu::String &sPath ) 237Bu::MyriadFs::Dir Bu::MyriadFs::readDir( const Bu::String &sPath )
206{ 238{
207 int32_t iParent = -1; 239 int32_t iParent = -1;
@@ -220,6 +252,59 @@ void Bu::MyriadFs::setTimes( const Bu::String &sPath, int64_t iATime,
220 setTimes( iNode, iATime, iMTime ); 252 setTimes( iNode, iATime, iMTime );
221} 253}
222 254
255void Bu::MyriadFs::unlink( const Bu::String &sPath )
256{
257 int32_t iParent = -1;
258 int32_t iNode;
259
260 iNode = lookupInode( sPath, iParent );
261
262 Dir lDir = readDir( iParent );
263
264 Bu::String sName = filePart( sPath );
265
266 for( Dir::iterator i = lDir.begin(); i; i++ )
267 {
268 if( sName == (*i).sName )
269 {
270 RawStat rs;
271 readInode( (*i).iNode, rs );
272 if( (rs.uPerms&typeMask) == typeDir )
273 {
274 MyriadStream msDir = mStore.openStream( rs.uStreamIndex );
275 int32_t iCount;
276 msDir.read( &iCount, 4 );
277 if( iCount > 0 )
278 {
279 throw Bu::MyriadFsException("Directory not empty.");
280 }
281 }
282 if( --rs.iLinks == 0 )
283 {
284 destroyNode( (*i).iNode );
285 }
286 else
287 {
288 writeInode( rs );
289 }
290 lDir.erase( i );
291 break;
292 }
293 }
294
295 Bu::MyriadStream ms = openByInode( iParent );
296 int32_t iNumChildren = lDir.getSize();
297 ms.write( &iNumChildren, 4 );
298 for( Dir::iterator i = lDir.begin(); i; i++ )
299 {
300 ms.write( &(*i).iNode, 4 );
301 uint8_t iSize = (*i).sName.getSize();
302 ms.write( &iSize, 1 );
303 ms.write( (*i).sName.getStr(), iSize );
304 }
305 ms.setSize( ms.tell() );
306}
307
223dev_t Bu::MyriadFs::devToSys( uint32_t uDev ) 308dev_t Bu::MyriadFs::devToSys( uint32_t uDev )
224{ 309{
225 return (((uDev&0xFFFF0000)>>8)&0xFF00) | ((uDev&0xFF)); 310 return (((uDev&0xFFFF0000)>>8)&0xFF00) | ((uDev&0xFF));
@@ -295,6 +380,36 @@ int32_t Bu::MyriadFs::lookupInode( Bu::String::const_iterator iStart,
295 throw Bu::MyriadFsException( 2, "Path not found"); 380 throw Bu::MyriadFsException( 2, "Path not found");
296} 381}
297 382
383void Bu::MyriadFs::readInode( int32_t iNode, RawStat &rs, MyriadStream &rIs )
384{
385 rIs.setPos( hNodeIndex.get( iNode )*sizeof(RawStat) );
386 if( rIs.read( &rs, sizeof(RawStat) ) < sizeof(RawStat) )
387 throw Bu::MyriadFsException("Filesystem corruption detected.");
388 if( rs.iNode != iNode )
389 throw Bu::MyriadFsException("Filesystem corruption detected.");
390}
391
392void Bu::MyriadFs::readInode( int32_t iNode, RawStat &rs )
393{
394 MyriadStream ms = mStore.openStream( 2 );
395 readInode( iNode, rs, ms );
396}
397
398void Bu::MyriadFs::writeInode( const RawStat &rs,
399 MyriadStream &rOs )
400{
401 rOs.setSize( hNodeIndex.getSize()*sizeof(RawStat) );
402 rOs.setPos( hNodeIndex.get( rs.iNode )*sizeof(RawStat) );
403 if( rOs.write( &rs, sizeof(RawStat) ) < sizeof(RawStat) )
404 throw Bu::MyriadFsException("Error writing inode to header stream.");
405}
406
407void Bu::MyriadFs::writeInode( const RawStat &rs )
408{
409 MyriadStream ms = mStore.openStream( 2 );
410 writeInode( rs, ms );
411}
412
298Bu::MyriadFs::Dir Bu::MyriadFs::readDir( int32_t iNode ) 413Bu::MyriadFs::Dir Bu::MyriadFs::readDir( int32_t iNode )
299{ 414{
300 Bu::MyriadStream ms = openByInode( iNode ); 415 Bu::MyriadStream ms = openByInode( iNode );
@@ -324,11 +439,8 @@ Bu::MyriadFs::Dir Bu::MyriadFs::readDir( int32_t iNode )
324 439
325Bu::MyriadStream Bu::MyriadFs::openByInode( int32_t iNode ) 440Bu::MyriadStream Bu::MyriadFs::openByInode( int32_t iNode )
326{ 441{
327 int32_t iIndex = hNodeIndex.get( iNode );
328 Bu::MyriadStream ms = mStore.openStream( 2 );
329 ms.setPos( iIndex*sizeof(RawStat) );
330 RawStat rs; 442 RawStat rs;
331 ms.read( &rs, sizeof(RawStat) ); 443 readInode( iNode, rs );
332 switch( (rs.uPerms&typeMask) ) 444 switch( (rs.uPerms&typeMask) )
333 { 445 {
334 case typeDir: 446 case typeDir:
@@ -371,10 +483,6 @@ int32_t Bu::MyriadFs::allocInode( uint16_t uPerms, uint32_t uSpecial )
371 { 483 {
372 if( !hNodeIndex.has( iNode ) ) 484 if( !hNodeIndex.has( iNode ) )
373 { 485 {
374 Bu::MyriadStream is = mStore.openStream( 2 );
375 is.setSize( (hNodeIndex.getSize()+1)*sizeof(RawStat) );
376 is.setPos( hNodeIndex.getSize()*sizeof(RawStat) );
377
378 hNodeIndex.insert( iNode, hNodeIndex.getSize() ); 486 hNodeIndex.insert( iNode, hNodeIndex.getSize() );
379 RawStat rs; 487 RawStat rs;
380 rs.iNode = iNode; 488 rs.iNode = iNode;
@@ -414,7 +522,7 @@ int32_t Bu::MyriadFs::allocInode( uint16_t uPerms, uint32_t uSpecial )
414 rs.iATime = time(NULL); 522 rs.iATime = time(NULL);
415 rs.iMTime = time(NULL); 523 rs.iMTime = time(NULL);
416 rs.iCTime = time(NULL); 524 rs.iCTime = time(NULL);
417 is.write( &rs, sizeof(RawStat) ); 525 writeInode( rs );
418 526
419 return iNode; 527 return iNode;
420 } 528 }
@@ -426,11 +534,8 @@ int32_t Bu::MyriadFs::allocInode( uint16_t uPerms, uint32_t uSpecial )
426 534
427void Bu::MyriadFs::stat( int32_t iNode, Stat &rBuf, MyriadStream &rIs ) 535void Bu::MyriadFs::stat( int32_t iNode, Stat &rBuf, MyriadStream &rIs )
428{ 536{
429 rIs.setPos( hNodeIndex.get( iNode )*sizeof(RawStat) );
430 RawStat rs; 537 RawStat rs;
431 rIs.read( &rs, sizeof(RawStat) ); 538 readInode( iNode, rs, rIs );
432 if( rs.iNode != iNode )
433 throw Bu::MyriadFsException("Filesystem corruption detected.");
434 rBuf.iNode = iNode; 539 rBuf.iNode = iNode;
435 rBuf.iUser = rs.iUser; 540 rBuf.iUser = rs.iUser;
436 rBuf.iGroup = rs.iGroup; 541 rBuf.iGroup = rs.iGroup;
@@ -459,11 +564,6 @@ void Bu::MyriadFs::stat( int32_t iNode, Stat &rBuf, MyriadStream &rIs )
459 } 564 }
460} 565}
461 566
462void Bu::MyriadFs::unlink( int32_t iNode )
463{
464
465}
466
467void Bu::MyriadFs::writeHeader() 567void Bu::MyriadFs::writeHeader()
468{ 568{
469 Bu::MyriadStream ms = mStore.openStream( 1 ); 569 Bu::MyriadStream ms = mStore.openStream( 1 );
@@ -489,11 +589,58 @@ void Bu::MyriadFs::setTimes( int32_t iNode, int64_t iATime, int64_t iMTime )
489 RawStat rs; 589 RawStat rs;
490 Bu::MyriadStream is = mStore.openStream( 2 ); 590 Bu::MyriadStream is = mStore.openStream( 2 );
491 591
492 is.setPos( hNodeIndex.get(iNode)*sizeof(RawStat) ); 592 readInode( iNode, rs, is );
493 is.read( &rs, sizeof(RawStat) );
494 rs.iATime = iATime; 593 rs.iATime = iATime;
495 rs.iMTime = iMTime; 594 rs.iMTime = iMTime;
496 is.setPos( hNodeIndex.get(iNode)*sizeof(RawStat) ); 595 writeInode( rs, is );
497 is.write( &rs, sizeof(RawStat) ); 596}
597
598void Bu::MyriadFs::destroyNode( int32_t iNode )
599{
600 if( iNode == 0 )
601 throw Bu::MyriadFsException("You cannot destroy the root.");
602
603 Bu::MyriadStream is = mStore.openStream( 2 );
604
605 // This will be overwritten with the last node
606 int32_t iPosition = hNodeIndex.get( iNode );
607 RawStat rsOld;
608 readInode( iNode, rsOld, is );
609 switch( (rsOld.uPerms&typeMask) )
610 {
611 case typeRegFile:
612 case typeDir:
613 case typeSymLink:
614 mStore.deleteStream( rsOld.uStreamIndex );
615 break;
616 }
617
618 hNodeIndex.erase( iNode );
619
620 // Read the last node, can't use the helpers, because we don't know the
621 // iNode yet.
622 if( iPosition != hNodeIndex.getSize() )
623 {
624 // If this is the last node, then we don't need to do anything, but
625 // this case handles what to do if we aren't on the last node
626 RawStat rs;
627 is.setPos( (hNodeIndex.getSize())*sizeof(RawStat) );
628 is.read( &rs, sizeof(RawStat) );
629
630 hNodeIndex.get( rs.iNode ) = iPosition;
631 writeInode( rs, is );
632 }
633
634 is.setSize( hNodeIndex.getSize() * sizeof(RawStat) );
635}
636
637Bu::String Bu::MyriadFs::filePart( const Bu::String &sPath )
638{
639 Bu::String::const_iterator iStart = sPath.begin();
640 if( *iStart == '/' )
641 iStart++;
642 for( Bu::String::const_iterator iEnd = iStart.find('/'); iEnd;
643 iStart = iEnd+1, iEnd = iStart.find('/') ) { }
644 return Bu::String( iStart, sPath.end() );
498} 645}
499 646
diff --git a/src/myriadfs.h b/src/myriadfs.h
index 0b9c97f..b54d170 100644
--- a/src/myriadfs.h
+++ b/src/myriadfs.h
@@ -133,13 +133,16 @@ namespace Bu
133 typedef Bu::List<Stat> Dir; 133 typedef Bu::List<Stat> Dir;
134 134
135 void stat( const Bu::String &sPath, Stat &rBuf ); 135 void stat( const Bu::String &sPath, Stat &rBuf );
136 MyriadStream open( const Bu::String &sPath, int iMode ); 136 MyriadStream open( const Bu::String &sPath, int iMode,
137 uint16_t uPerms=0664 );
137 void create( const Bu::String &sPath, uint16_t iPerms ); 138 void create( const Bu::String &sPath, uint16_t iPerms );
138 void create( const Bu::String &sPath, uint16_t iPerms, 139 void create( const Bu::String &sPath, uint16_t iPerms,
139 uint16_t iDevHi, uint16_t iDevLo ); 140 uint16_t iDevHi, uint16_t iDevLo );
140 void create( const Bu::String &sPath, uint16_t iPerms, 141 void create( const Bu::String &sPath, uint16_t iPerms,
141 uint32_t uSpecial ); 142 uint32_t uSpecial );
142 void mkDir( const Bu::String &sPath, uint16_t iPerms ); 143 void mkDir( const Bu::String &sPath, uint16_t iPerms );
144 void mkSymLink( const Bu::String &sPath, const Bu::String &sTarget );
145 Bu::String readSymLink( const Bu::String &sPath );
143 Dir readDir( const Bu::String &sPath ); 146 Dir readDir( const Bu::String &sPath );
144 void setTimes( const Bu::String &sPath, int64_t iATime, 147 void setTimes( const Bu::String &sPath, int64_t iATime,
145 int64_t iMTime ); 148 int64_t iMTime );
@@ -168,15 +171,21 @@ namespace Bu
168 int32_t lookupInode( const Bu::String &sPath, int32_t &iParent ); 171 int32_t lookupInode( const Bu::String &sPath, int32_t &iParent );
169 int32_t lookupInode( Bu::String::const_iterator iStart, 172 int32_t lookupInode( Bu::String::const_iterator iStart,
170 int32_t iNode, int32_t &iParent ); 173 int32_t iNode, int32_t &iParent );
174 void readInode( int32_t iNode, RawStat &rs, MyriadStream &rIs );
175 void readInode( int32_t iNode, RawStat &rs );
176 void writeInode( const RawStat &rs );
177 void writeInode( const RawStat &rs, MyriadStream &rOs );
171 Dir readDir( int32_t iNode ); 178 Dir readDir( int32_t iNode );
172 MyriadStream openByInode( int32_t iNode ); 179 MyriadStream openByInode( int32_t iNode );
173 int32_t create( int32_t iParent, const Bu::String &sName, 180 int32_t create( int32_t iParent, const Bu::String &sName,
174 uint16_t uPerms, uint32_t uSpecial ); 181 uint16_t uPerms, uint32_t uSpecial );
175 int32_t allocInode( uint16_t uPerms, uint32_t uSpecial ); 182 int32_t allocInode( uint16_t uPerms, uint32_t uSpecial );
176 void stat( int32_t iNode, Stat &rBuf, MyriadStream &rIs ); 183 void stat( int32_t iNode, Stat &rBuf, MyriadStream &rIs );
177 void unlink( int32_t iNode );
178 void writeHeader(); 184 void writeHeader();
179 void setTimes( int32_t iNode, int64_t iATime, int64_t iMTime ); 185 void setTimes( int32_t iNode, int64_t iATime, int64_t iMTime );
186 void destroyNode( int32_t iNode );
187
188 Bu::String filePart( const Bu::String &sPath );
180 189
181 private: 190 private:
182 Bu::Stream &rStore; 191 Bu::Stream &rStore;
diff --git a/src/tools/myriadfs.cpp b/src/tools/myriadfs.cpp
index c4004b7..8db59d7 100644
--- a/src/tools/myriadfs.cpp
+++ b/src/tools/myriadfs.cpp
@@ -29,7 +29,6 @@ extern "C" {
29 { 29 {
30 try 30 try
31 { 31 {
32 printf("myriadfs_getattr: Statting file: %s\n", sPath );
33 Bu::MyriadFs::Stat st; 32 Bu::MyriadFs::Stat st;
34 pFs->stat( sPath, st ); 33 pFs->stat( sPath, st );
35 stbuf->st_ino = st.iNode; 34 stbuf->st_ino = st.iNode;
@@ -78,7 +77,8 @@ extern "C" {
78 Bu::MyriadStream ms = pFs->open( sPath, 0 ); 77 Bu::MyriadStream ms = pFs->open( sPath, 0 );
79 fi->fh = iNextFileId; 78 fi->fh = iNextFileId;
80 hOpenFiles.insert( iNextFileId++, ms ); 79 hOpenFiles.insert( iNextFileId++, ms );
81 printf("File opened, %d files open now.\n", hOpenFiles.getSize() ); 80 printf("File '%s' opened, %d files open now.\n",
81 sPath, hOpenFiles.getSize() );
82 return 0; 82 return 0;
83 } 83 }
84 catch(...) 84 catch(...)
@@ -108,10 +108,11 @@ extern "C" {
108 { 108 {
109 try 109 try
110 { 110 {
111 Bu::MyriadStream ms = pFs->open( sPath, 0 ); 111 Bu::MyriadStream ms = pFs->open( sPath, 0, uPerms );
112 fi->fh = iNextFileId; 112 fi->fh = iNextFileId;
113 hOpenFiles.insert( iNextFileId++, ms ); 113 hOpenFiles.insert( iNextFileId++, ms );
114 printf("File created, %d files open now.\n", hOpenFiles.getSize() ); 114 printf("File '%s' created, %d files open now.\n",
115 sPath, hOpenFiles.getSize() );
115 return 0; 116 return 0;
116 } 117 }
117 catch(...) 118 catch(...)
@@ -136,7 +137,8 @@ extern "C" {
136 static int myriadfs_release( const char *sPath, struct fuse_file_info *fi ) 137 static int myriadfs_release( const char *sPath, struct fuse_file_info *fi )
137 { 138 {
138 hOpenFiles.erase( fi->fh ); 139 hOpenFiles.erase( fi->fh );
139 printf("File released, %d files open now.\n", hOpenFiles.getSize() ); 140 printf("File '%s' released, %d files open now.\n",
141 sPath, hOpenFiles.getSize() );
140 142
141 return 0; 143 return 0;
142 } 144 }
@@ -155,6 +157,52 @@ extern "C" {
155 return 0; 157 return 0;
156 } 158 }
157 159
160 static int myriadfs_unlink( const char *sPath )
161 {
162 try
163 {
164 pFs->unlink( sPath );
165 }
166 catch( Bu::MyriadFsException &e )
167 {
168 printf("MyriadFsException: %s\n", e.what() );
169 return -EACCES;
170 }
171 return 0;
172 }
173
174 static int myriadfs_symlink( const char *sTarget, const char *sPath )
175 {
176 try
177 {
178 printf("Path = '%s', Target = '%s'\n", sPath, sTarget );
179 pFs->mkSymLink( sPath, sTarget );
180 }
181 catch( Bu::MyriadFsException &e )
182 {
183 printf("MyriadFsException: %s\n", e.what() );
184 return -EACCES;
185 }
186 return 0;
187 }
188
189 static int myriadfs_readlink( const char *sPath, char *sOut, size_t s )
190 {
191 try
192 {
193 Bu::String sTrg = pFs->readSymLink( sPath );
194 size_t iLen = (s-1>sTrg.getSize())?(sTrg.getSize()):(s-1);
195 memcpy( sOut, sTrg.getStr(), iLen );
196 sOut[iLen] = '\0';
197 }
198 catch( Bu::MyriadFsException &e )
199 {
200 printf("MyriadFsException: %s\n", e.what() );
201 return -EACCES;
202 }
203 return 0;
204 }
205
158 static struct fuse_operations myriadfs_oper; 206 static struct fuse_operations myriadfs_oper;
159 207
160 int main( int argc, char *argv[] ) 208 int main( int argc, char *argv[] )
@@ -172,6 +220,10 @@ extern "C" {
172 myriadfs_oper.mknod = myriadfs_mknod; 220 myriadfs_oper.mknod = myriadfs_mknod;
173 myriadfs_oper.release = myriadfs_release; 221 myriadfs_oper.release = myriadfs_release;
174 myriadfs_oper.utimens = myriadfs_utimens; 222 myriadfs_oper.utimens = myriadfs_utimens;
223 myriadfs_oper.unlink = myriadfs_unlink;
224 myriadfs_oper.rmdir = myriadfs_unlink;
225 myriadfs_oper.symlink = myriadfs_symlink;
226 myriadfs_oper.readlink = myriadfs_readlink;
175 printf("Starting fuse_main.\n"); 227 printf("Starting fuse_main.\n");
176 int iRet = fuse_main( argc, argv, &myriadfs_oper, NULL ); 228 int iRet = fuse_main( argc, argv, &myriadfs_oper, NULL );
177 printf("Done with fuse_main.\n"); 229 printf("Done with fuse_main.\n");