| /trunk/uspace/lib/libfs/libfs.c |
|---|
| 148,9 → 148,9 |
| if (last < next) |
| last += PLB_SIZE; |
| void *par = NULL; |
| void *cur = ops->root_get(dev_handle); |
| void *tmp = NULL; |
| fs_node_t *par = NULL; |
| fs_node_t *cur = ops->root_get(dev_handle); |
| fs_node_t *tmp = NULL; |
| if (ops->plb_get_char(next) == '/') |
| next++; /* eat slash */ |
| 189,29 → 189,28 |
| ipc_answer_0(rid, ENOTDIR); |
| goto out; |
| } |
| void *nodep; |
| fs_node_t *fn; |
| if (lflag & L_CREATE) |
| nodep = ops->create(dev_handle, lflag); |
| fn = ops->create(dev_handle, lflag); |
| else |
| nodep = ops->node_get(dev_handle, |
| fn = ops->node_get(dev_handle, |
| index); |
| if (nodep) { |
| if (fn) { |
| int rc; |
| rc = ops->link(cur, nodep, component); |
| rc = ops->link(cur, fn, component); |
| if (rc != EOK) { |
| if (lflag & L_CREATE) { |
| (void)ops->destroy( |
| nodep); |
| (void)ops->destroy(fn); |
| } |
| ipc_answer_0(rid, rc); |
| } else { |
| ipc_answer_5(rid, EOK, |
| fs_handle, dev_handle, |
| ops->index_get(nodep), |
| ops->size_get(nodep), |
| ops->lnkcnt_get(nodep)); |
| ops->node_put(nodep); |
| ops->index_get(fn), |
| ops->size_get(fn), |
| ops->lnkcnt_get(fn)); |
| ops->node_put(fn); |
| } |
| } else { |
| ipc_answer_0(rid, ENOSPC); |
| 263,26 → 262,26 |
| assert(len); |
| component[len] = '\0'; |
| void *nodep; |
| fs_node_t *fn; |
| if (lflag & L_CREATE) |
| nodep = ops->create(dev_handle, lflag); |
| fn = ops->create(dev_handle, lflag); |
| else |
| nodep = ops->node_get(dev_handle, index); |
| if (nodep) { |
| fn = ops->node_get(dev_handle, index); |
| if (fn) { |
| int rc; |
| rc = ops->link(cur, nodep, component); |
| rc = ops->link(cur, fn, component); |
| if (rc != EOK) { |
| if (lflag & L_CREATE) |
| (void)ops->destroy(nodep); |
| (void)ops->destroy(fn); |
| ipc_answer_0(rid, rc); |
| } else { |
| ipc_answer_5(rid, EOK, |
| fs_handle, dev_handle, |
| ops->index_get(nodep), |
| ops->size_get(nodep), |
| ops->lnkcnt_get(nodep)); |
| ops->node_put(nodep); |
| ops->index_get(fn), |
| ops->size_get(fn), |
| ops->lnkcnt_get(fn)); |
| ops->node_put(fn); |
| } |
| } else { |
| ipc_answer_0(rid, ENOSPC); |
| /trunk/uspace/lib/libfs/libfs.h |
|---|
| 42,21 → 42,25 |
| #include <async.h> |
| typedef struct { |
| void * (* match)(void *, const char *); |
| void * (* node_get)(dev_handle_t, fs_index_t); |
| void (* node_put)(void *); |
| void * (* create)(dev_handle_t, int); |
| int (* destroy)(void *); |
| int (* link)(void *, void *, const char *); |
| int (* unlink)(void *, void *); |
| fs_index_t (* index_get)(void *); |
| size_t (* size_get)(void *); |
| unsigned (* lnkcnt_get)(void *); |
| bool (* has_children)(void *); |
| void *(* root_get)(dev_handle_t); |
| void *data; /**< Data of the file system implementation. */ |
| } fs_node_t; |
| typedef struct { |
| fs_node_t * (* match)(fs_node_t *, const char *); |
| fs_node_t * (* node_get)(dev_handle_t, fs_index_t); |
| void (* node_put)(fs_node_t *); |
| fs_node_t * (* create)(dev_handle_t, int); |
| int (* destroy)(fs_node_t *); |
| int (* link)(fs_node_t *, fs_node_t *, const char *); |
| int (* unlink)(fs_node_t *, fs_node_t *); |
| fs_index_t (* index_get)(fs_node_t *); |
| size_t (* size_get)(fs_node_t *); |
| unsigned (* lnkcnt_get)(fs_node_t *); |
| bool (* has_children)(fs_node_t *); |
| fs_node_t *(* root_get)(dev_handle_t); |
| char (* plb_get_char)(unsigned pos); |
| bool (* is_directory)(void *); |
| bool (* is_file)(void *); |
| bool (* is_directory)(fs_node_t *); |
| bool (* is_file)(fs_node_t *); |
| } libfs_ops_t; |
| typedef struct { |