sambuc/retrobsd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fsutil library: use names for inode ops.

Browse Source
This commit is contained in:
Serge Vakulenko
2014-07-31 17:46:24 -07:00
parent 2293493bfd
commit eb1fb36b6b
5 changed files with 46 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tools/fsutil/bsdfs.h
View File

@@ -145,6 +145,13 @@ typedef struct {
unsigned long offset; /* current i/o offset */ unsigned long offset; /* current i/o offset */
} fs_file_t; } fs_file_t;
typedef enum {
INODE_OP_LOOKUP, /* lookup inode by name */
INODE_OP_CREATE, /* create new file */
INODE_OP_DELETE, /* delete file */
INODE_OP_LINK, /* make a link to a file */
} fs_op_t;
int fs_seek (fs_t *fs, unsigned long offset); int fs_seek (fs_t *fs, unsigned long offset);
int fs_read8 (fs_t *fs, unsigned char *val); int fs_read8 (fs_t *fs, unsigned char *val);
int fs_read16 (fs_t *fs, unsigned short *val); int fs_read16 (fs_t *fs, unsigned short *val);
@@ -177,7 +184,7 @@ int fs_inode_write (fs_inode_t *inode, unsigned long offset,
unsigned char *data, unsigned long bytes); unsigned char *data, unsigned long bytes);
int fs_inode_alloc (fs_t *fs, fs_inode_t *inode); int fs_inode_alloc (fs_t *fs, fs_inode_t *inode);
int fs_inode_by_name (fs_t *fs, fs_inode_t *inode, const char *name, int fs_inode_by_name (fs_t *fs, fs_inode_t *inode, const char *name,
int op, int mode); fs_op_t op, int mode);
int inode_build_list (fs_t *fs); int inode_build_list (fs_t *fs);
int fs_write_block (fs_t *fs, unsigned bnum, unsigned char *data); int fs_write_block (fs_t *fs, unsigned bnum, unsigned char *data);

4
tools/fsutil/file.c
View File

@@ -29,7 +29,7 @@ extern int verbose;
int fs_file_create (fs_t *fs, fs_file_t *file, const char *name, int mode) int fs_file_create (fs_t *fs, fs_file_t *file, const char *name, int mode)
{ {
if (! fs_inode_by_name (fs, &file->inode, name, 1, mode)) { if (! fs_inode_by_name (fs, &file->inode, name, INODE_OP_CREATE, mode)) {
fprintf (stderr, "%s: inode open failed\n", name); fprintf (stderr, "%s: inode open failed\n", name);
return 0; return 0;
} }
@@ -46,7 +46,7 @@ int fs_file_create (fs_t *fs, fs_file_t *file, const char *name, int mode)
int fs_file_open (fs_t *fs, fs_file_t *file, const char *name, int wflag) int fs_file_open (fs_t *fs, fs_file_t *file, const char *name, int wflag)
{ {
if (! fs_inode_by_name (fs, &file->inode, name, 0, 0)) { if (! fs_inode_by_name (fs, &file->inode, name, INODE_OP_LOOKUP, 0)) {
fprintf (stderr, "%s: inode open failed\n", name); fprintf (stderr, "%s: inode open failed\n", name);
return 0; return 0;
} }

8
tools/fsutil/fsutil.c
View File

@@ -300,13 +300,13 @@ void add_directory (fs_t *fs, char *name)
*p = 0; *p = 0;
else else
*buf = 0; *buf = 0;
if (! fs_inode_by_name (fs, &parent, buf, 0, 0)) { if (! fs_inode_by_name (fs, &parent, buf, INODE_OP_LOOKUP, 0)) {
fprintf (stderr, "%s: cannot open directory\n", buf); fprintf (stderr, "%s: cannot open directory\n", buf);
return; return;
} }
/* Create directory. */ /* Create directory. */
int done = fs_inode_by_name (fs, &dir, name, 1, INODE_MODE_FDIR | 0777); int done = fs_inode_by_name (fs, &dir, name, INODE_OP_CREATE, INODE_MODE_FDIR | 0777);
if (! done) { if (! done) {
fprintf (stderr, "%s: directory inode create failed\n", name); fprintf (stderr, "%s: directory inode create failed\n", name);
return; return;
@@ -320,7 +320,7 @@ void add_directory (fs_t *fs, char *name)
/* Make parent link '..' */ /* Make parent link '..' */
strcpy (buf, name); strcpy (buf, name);
strcat (buf, "/.."); strcat (buf, "/..");
if (! fs_inode_by_name (fs, &dir, buf, 3, parent.number)) { if (! fs_inode_by_name (fs, &dir, buf, INODE_OP_LINK, parent.number)) {
fprintf (stderr, "%s: dotdot link failed\n", name); fprintf (stderr, "%s: dotdot link failed\n", name);
return; return;
} }
@@ -349,7 +349,7 @@ void add_device (fs_t *fs, char *name, char *spec)
fprintf (stderr, "expected c<major>:<minor> or b<major>:<minor>\n"); fprintf (stderr, "expected c<major>:<minor> or b<major>:<minor>\n");
return; return;
} }
if (! fs_inode_by_name (fs, &dev, name, 1, 0666 | if (! fs_inode_by_name (fs, &dev, name, INODE_OP_CREATE, 0666 |
((type == 'b') ? INODE_MODE_FBLK : INODE_MODE_FCHR))) { ((type == 'b') ? INODE_MODE_FBLK : INODE_MODE_FCHR))) {
fprintf (stderr, "%s: device inode create failed\n", name); fprintf (stderr, "%s: device inode create failed\n", name);
return; return;

15
tools/fsutil/inode.c
View File

@@ -551,13 +551,8 @@ void fs_dirent_unpack (fs_dirent_t *dirent, unsigned char *data)
* Return 1 when the inode was found. * Return 1 when the inode was found.
* Return 2 when the inode was created/deleted/linked. * Return 2 when the inode was created/deleted/linked.
*/ */
#define LOOKUP 0 /* perform name lookup only */
#define CREATE 1 /* setup for file creation */
#define DELETE 2 /* setup for file deletion */
#define LINK 3 /* setup for link */
int fs_inode_by_name (fs_t *fs, fs_inode_t *inode, const char *name, int fs_inode_by_name (fs_t *fs, fs_inode_t *inode, const char *name,
int op, int mode) fs_op_t op, int mode)
{ {
fs_inode_t dir; fs_inode_t dir;
int c, namlen, reclen; int c, namlen, reclen;
@@ -577,7 +572,7 @@ int fs_inode_by_name (fs_t *fs, fs_inode_t *inode, const char *name,
c = *name++; c = *name++;
while (c == '/') while (c == '/')
c = *name++; c = *name++;
if (! c && op != LOOKUP) { if (! c && op != INODE_OP_LOOKUP) {
/* Cannot write or delete root directory. */ /* Cannot write or delete root directory. */
return 0; return 0;
} }
@@ -631,7 +626,7 @@ cloop:
/* Here a component matched in a directory. /* Here a component matched in a directory.
* If there is more pathname, go back to * If there is more pathname, go back to
* cloop, otherwise return. */ * cloop, otherwise return. */
if (op == DELETE && ! c) { if (op == INODE_OP_DELETE && ! c) {
goto delete_file; goto delete_file;
} }
if (! fs_inode_get (fs, &dir, dirent.inum)) { if (! fs_inode_get (fs, &dir, dirent.inum)) {
@@ -643,9 +638,9 @@ cloop:
} }
/* If at the end of the directory, the search failed. /* If at the end of the directory, the search failed.
* Report what is appropriate as per flag. */ * Report what is appropriate as per flag. */
if (op == CREATE && ! c) if (op == INODE_OP_CREATE && ! c)
goto create_file; goto create_file;
if (op == LINK && ! c) if (op == INODE_OP_LINK && ! c)
goto create_link; goto create_link;
return 0; return 0;

51
tools/fsutil/mount.c
View File

@@ -116,7 +116,7 @@ int op_getattr(const char *path, struct stat *statbuf)
printlog("--- op_getattr(path=\"%s\", statbuf=%p)\n", path, statbuf); printlog("--- op_getattr(path=\"%s\", statbuf=%p)\n", path, statbuf);
if (! fs_inode_by_name (fs, &inode, path, 0, 0)) { if (! fs_inode_by_name (fs, &inode, path, INODE_OP_LOOKUP, 0)) {
printlog("--- search failed\n"); printlog("--- search failed\n");
return -ENOENT; return -ENOENT;
} }
@@ -307,7 +307,7 @@ int op_unlink(const char *path)
printlog("--- op_unlink(path=\"%s\")\n", path); printlog("--- op_unlink(path=\"%s\")\n", path);
/* Get the file type. */ /* Get the file type. */
if (! fs_inode_by_name (fs, &inode, path, 0, 0)) { if (! fs_inode_by_name (fs, &inode, path, INODE_OP_LOOKUP, 0)) {
printlog("--- search failed\n"); printlog("--- search failed\n");
return -ENOENT; return -ENOENT;
} }
@@ -317,7 +317,7 @@ int op_unlink(const char *path)
} }
/* Delete file. */ /* Delete file. */
if (! fs_inode_by_name (fs, &inode, path, 2, 0)) { if (! fs_inode_by_name (fs, &inode, path, INODE_OP_DELETE, 0)) {
printlog("--- delete failed\n"); printlog("--- delete failed\n");
return -EIO; return -EIO;
} }
@@ -337,7 +337,7 @@ int op_rmdir(const char *path)
printlog("--- op_rmdir(path=\"%s\")\n", path); printlog("--- op_rmdir(path=\"%s\")\n", path);
/* Get the file type. */ /* Get the file type. */
if (! fs_inode_by_name (fs, &inode, path, 0, 0)) { if (! fs_inode_by_name (fs, &inode, path, INODE_OP_LOOKUP, 0)) {
printlog("--- search failed\n"); printlog("--- search failed\n");
return -ENOENT; return -ENOENT;
} }
@@ -357,20 +357,20 @@ int op_rmdir(const char *path)
*p = 0; *p = 0;
else else
*buf = 0; *buf = 0;
if (! fs_inode_by_name (fs, &parent, buf, 0, 0)) { if (! fs_inode_by_name (fs, &parent, buf, INODE_OP_LOOKUP, 0)) {
printlog("--- parent not found\n"); printlog("--- parent not found\n");
return -ENOENT; return -ENOENT;
} }
/* Delete directory. /* Delete directory.
* Need to decrease a link count first. */ * Need to decrease a link count first. */
if (! fs_inode_by_name (fs, &inode, path, 0, 0)) { if (! fs_inode_by_name (fs, &inode, path, INODE_OP_LOOKUP, 0)) {
printlog("--- directory not found\n"); printlog("--- directory not found\n");
return -ENOENT; return -ENOENT;
} }
--inode.nlink; --inode.nlink;
fs_inode_save (&inode, 1); fs_inode_save (&inode, 1);
if (! fs_inode_by_name (fs, &inode, path, 2, 0)) { if (! fs_inode_by_name (fs, &inode, path, INODE_OP_DELETE, 0)) {
printlog("--- delete failed\n"); printlog("--- delete failed\n");
return -EIO; return -EIO;
} }
@@ -404,13 +404,15 @@ int op_mkdir(const char *path, mode_t mode)
*p = 0; *p = 0;
else else
*buf = 0; *buf = 0;
if (! fs_inode_by_name (fs, &parent, buf, 0, 0)) { if (! fs_inode_by_name (fs, &parent, buf, INODE_OP_LOOKUP, 0)) {
printlog("--- parent not found\n"); printlog("--- parent not found\n");
return -ENOENT; return -ENOENT;
} }
/* Create directory. */ /* Create directory. */
int done = fs_inode_by_name (fs, &dir, path, 1, INODE_MODE_FDIR | (mode & 07777)); mode &= 07777;
mode |= INODE_MODE_FDIR;
int done = fs_inode_by_name (fs, &dir, path, INODE_OP_CREATE, mode);
if (! done) { if (! done) {
printlog("--- cannot create dir inode\n"); printlog("--- cannot create dir inode\n");
return -ENOENT; return -ENOENT;
@@ -424,7 +426,7 @@ int op_mkdir(const char *path, mode_t mode)
/* Make parent link '..' */ /* Make parent link '..' */
strcpy (buf, path); strcpy (buf, path);
strcat (buf, "/.."); strcat (buf, "/..");
if (! fs_inode_by_name (fs, &dir, buf, 3, parent.number)) { if (! fs_inode_by_name (fs, &dir, buf, INODE_OP_LINK, parent.number)) {
printlog("--- dotdot link failed\n"); printlog("--- dotdot link failed\n");
return -EIO; return -EIO;
} }
@@ -448,7 +450,7 @@ int op_link(const char *path, const char *newpath)
printlog("--- op_link(path=\"%s\", newpath=\"%s\")\n", path, newpath); printlog("--- op_link(path=\"%s\", newpath=\"%s\")\n", path, newpath);
/* Find source. */ /* Find source. */
if (! fs_inode_by_name (fs, &source, path, 0, 0)) { if (! fs_inode_by_name (fs, &source, path, INODE_OP_LOOKUP, 0)) {
printlog("--- source not found\n"); printlog("--- source not found\n");
return -ENOENT; return -ENOENT;
} }
@@ -459,7 +461,7 @@ int op_link(const char *path, const char *newpath)
} }
/* Create target link. */ /* Create target link. */
if (! fs_inode_by_name (fs, &target, newpath, 3, source.number)) { if (! fs_inode_by_name (fs, &target, newpath, INODE_OP_LINK, source.number)) {
printlog("--- link failed\n"); printlog("--- link failed\n");
return -EIO; return -EIO;
} }
@@ -477,7 +479,7 @@ int op_rename(const char *path, const char *newpath)
printlog("--- op_rename(path=\"%s\", newpath=\"%s\")\n", path, newpath); printlog("--- op_rename(path=\"%s\", newpath=\"%s\")\n", path, newpath);
/* Find source and increase the link count. */ /* Find source and increase the link count. */
if (! fs_inode_by_name (fs, &source, path, 0, 0)) { if (! fs_inode_by_name (fs, &source, path, INODE_OP_LOOKUP, 0)) {
printlog("--- source not found\n"); printlog("--- source not found\n");
return -ENOENT; return -ENOENT;
} }
@@ -485,13 +487,13 @@ int op_rename(const char *path, const char *newpath)
fs_inode_save (&source, 1); fs_inode_save (&source, 1);
/* Create target link. */ /* Create target link. */
if (! fs_inode_by_name (fs, &target, newpath, 3, source.number)) { if (! fs_inode_by_name (fs, &target, newpath, INODE_OP_LINK, source.number)) {
printlog("--- link failed\n"); printlog("--- link failed\n");
return -EIO; return -EIO;
} }
/* Delete the source. */ /* Delete the source. */
if (! fs_inode_by_name (fs, &source, path, 2, 0)) { if (! fs_inode_by_name (fs, &source, path, INODE_OP_DELETE, 0)) {
printlog("--- delete failed\n"); printlog("--- delete failed\n");
return -EIO; return -EIO;
} }
@@ -511,7 +513,7 @@ int op_mknod(const char *path, mode_t mode, dev_t dev)
path, mode, dev); path, mode, dev);
/* Check if the file already exists. */ /* Check if the file already exists. */
if (fs_inode_by_name (fs, &inode, path, 0, 0)) { if (fs_inode_by_name (fs, &inode, path, INODE_OP_LOOKUP, 0)) {
printlog("--- already exists\n"); printlog("--- already exists\n");
return -EEXIST; return -EEXIST;
} }
@@ -527,7 +529,7 @@ int op_mknod(const char *path, mode_t mode, dev_t dev)
return -EINVAL; return -EINVAL;
/* Create the file. */ /* Create the file. */
if (! fs_inode_by_name (fs, &inode, path, 1, mode)) { if (! fs_inode_by_name (fs, &inode, path, INODE_OP_CREATE, mode)) {
printlog("--- create failed\n"); printlog("--- create failed\n");
return -EIO; return -EIO;
} }
@@ -555,7 +557,7 @@ int op_readlink(const char *path, char *link, size_t size)
path, link, size); path, link, size);
/* Open the file. */ /* Open the file. */
if (! fs_inode_by_name (fs, &inode, path, 0, 0)) { if (! fs_inode_by_name (fs, &inode, path, INODE_OP_LOOKUP, 0)) {
printlog("--- file not found\n"); printlog("--- file not found\n");
return -ENOENT; return -ENOENT;
} }
@@ -586,13 +588,14 @@ int op_symlink(const char *path, const char *newpath)
printlog("--- op_symlink(path=\"%s\", newpath=\"%s\")\n", path, newpath); printlog("--- op_symlink(path=\"%s\", newpath=\"%s\")\n", path, newpath);
/* Check if the file already exists. */ /* Check if the file already exists. */
if (fs_inode_by_name (fs, &inode, newpath, 0, 0)) { if (fs_inode_by_name (fs, &inode, newpath, INODE_OP_LOOKUP, 0)) {
printlog("--- already exists\n"); printlog("--- already exists\n");
return -EEXIST; return -EEXIST;
} }
/* Create symlink. */
mode = 0777 | INODE_MODE_FLNK; mode = 0777 | INODE_MODE_FLNK;
if (! fs_inode_by_name (fs, &inode, newpath, 1, mode)) { if (! fs_inode_by_name (fs, &inode, newpath, INODE_OP_CREATE, mode)) {
printlog("--- create failed\n"); printlog("--- create failed\n");
return -EIO; return -EIO;
} }
@@ -623,7 +626,7 @@ int op_chmod(const char *path, mode_t mode)
printlog("--- op_chmod(path=\"%s\", mode=0%03o)\n", path, mode); printlog("--- op_chmod(path=\"%s\", mode=0%03o)\n", path, mode);
/* Open the file. */ /* Open the file. */
if (! fs_inode_by_name (fs, &inode, path, 0, 0)) { if (! fs_inode_by_name (fs, &inode, path, INODE_OP_LOOKUP, 0)) {
printlog("--- file not found\n"); printlog("--- file not found\n");
return -ENOENT; return -ENOENT;
} }
@@ -647,7 +650,7 @@ int op_chown(const char *path, uid_t uid, gid_t gid)
printlog("--- op_chown(path=\"%s\", uid=%d, gid=%d)\n", path, uid, gid); printlog("--- op_chown(path=\"%s\", uid=%d, gid=%d)\n", path, uid, gid);
/* Open the file. */ /* Open the file. */
if (! fs_inode_by_name (fs, &inode, path, 0, 0)) { if (! fs_inode_by_name (fs, &inode, path, INODE_OP_LOOKUP, 0)) {
printlog("--- file not found\n"); printlog("--- file not found\n");
return -ENOENT; return -ENOENT;
} }
@@ -671,7 +674,7 @@ int op_utime(const char *path, struct utimbuf *ubuf)
printlog("--- op_utime(path=\"%s\", ubuf=%p)\n", path, ubuf); printlog("--- op_utime(path=\"%s\", ubuf=%p)\n", path, ubuf);
/* Open the file. */ /* Open the file. */
if (! fs_inode_by_name (fs, &inode, path, 0, 0)) { if (! fs_inode_by_name (fs, &inode, path, INODE_OP_LOOKUP, 0)) {
printlog("--- file not found\n"); printlog("--- file not found\n");
return -ENOENT; return -ENOENT;
} }
@@ -756,7 +759,7 @@ int op_readdir(const char *path, void *buf, fuse_fill_dir_t filler, off_t offset
printlog("--- op_readdir(path=\"%s\", buf=%p, filler=%p, offset=%lld, fi=%p)\n", printlog("--- op_readdir(path=\"%s\", buf=%p, filler=%p, offset=%lld, fi=%p)\n",
path, buf, filler, offset, fi); path, buf, filler, offset, fi);
if (! fs_inode_by_name (fs, &dir, path, 0, 0)) { if (! fs_inode_by_name (fs, &dir, path, INODE_OP_LOOKUP, 0)) {
printlog("--- cannot find path %s\n", path); printlog("--- cannot find path %s\n", path);
return -ENOENT; return -ENOENT;
} }