make "echo hello > x" truncate file x.
This commit is contained in:
parent
672217ae2a
commit
af9eb9114c
6 changed files with 148 additions and 8 deletions
|
@ -52,6 +52,7 @@ struct inode* nameiparent(char*, char*);
|
|||
int readi(struct inode*, int, uint64, uint, uint);
|
||||
void stati(struct inode*, struct stat*);
|
||||
int writei(struct inode*, int, uint64, uint, uint);
|
||||
void itrunc(struct inode*);
|
||||
|
||||
// ramdisk.c
|
||||
void ramdiskinit(void);
|
||||
|
|
|
@ -2,3 +2,4 @@
|
|||
#define O_WRONLY 0x001
|
||||
#define O_RDWR 0x002
|
||||
#define O_CREATE 0x200
|
||||
#define O_TRUNC 0x400
|
||||
|
|
10
kernel/fs.c
10
kernel/fs.c
|
@ -22,7 +22,6 @@
|
|||
#include "file.h"
|
||||
|
||||
#define min(a, b) ((a) < (b) ? (a) : (b))
|
||||
static void itrunc(struct inode*);
|
||||
// there should be one superblock per disk device, but we run with
|
||||
// only one device
|
||||
struct superblock sb;
|
||||
|
@ -406,11 +405,8 @@ bmap(struct inode *ip, uint bn)
|
|||
}
|
||||
|
||||
// Truncate inode (discard contents).
|
||||
// Only called when the inode has no links
|
||||
// to it (no directory entries referring to it)
|
||||
// and has no in-memory reference to it (is
|
||||
// not an open file or current directory).
|
||||
static void
|
||||
// Caller must hold ip->lock.
|
||||
void
|
||||
itrunc(struct inode *ip)
|
||||
{
|
||||
int i, j;
|
||||
|
@ -463,7 +459,7 @@ readi(struct inode *ip, int user_dst, uint64 dst, uint off, uint n)
|
|||
struct buf *bp;
|
||||
|
||||
if(off > ip->size || off + n < off)
|
||||
return -1;
|
||||
return 0;
|
||||
if(off + n > ip->size)
|
||||
n = ip->size - off;
|
||||
|
||||
|
|
|
@ -341,6 +341,10 @@ sys_open(void)
|
|||
f->readable = !(omode & O_WRONLY);
|
||||
f->writable = (omode & O_WRONLY) || (omode & O_RDWR);
|
||||
|
||||
if((omode & O_TRUNC) && ip->type == T_FILE){
|
||||
itrunc(ip);
|
||||
}
|
||||
|
||||
iunlock(ip);
|
||||
end_op();
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue