diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2015-10-13 09:37:32 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2015-10-15 08:56:23 +0200 |
commit | 77073ab24d4e95e6d2f18ed1aecebdfed22f795b (patch) | |
tree | b80b35a8e25b5816e53f9289c085d84a247131d9 | |
parent | 867ada484f883a3332012ba45de4082403091136 (diff) | |
download | barebox-77073ab24d4e95e6d2f18ed1aecebdfed22f795b.tar.gz barebox-77073ab24d4e95e6d2f18ed1aecebdfed22f795b.tar.xz |
filetype: Use cdev_open
a cdev has to be opened before usage. Use cdev_open instead of
cdev_by_name.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r-- | common/filetype.c | 4 | ||||
-rw-r--r-- | fs/fs.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/common/filetype.c b/common/filetype.c index dc2ff3f5f0..9ec8ebf7c2 100644 --- a/common/filetype.c +++ b/common/filetype.c @@ -369,9 +369,10 @@ enum filetype cdev_detect_type(const char *name) struct cdev *cdev; void *buf; - cdev = cdev_by_name(name); + cdev = cdev_open(name, O_RDONLY); if (!cdev) return type; + buf = xzalloc(FILE_TYPE_SAFE_BUFSIZE); ret = cdev_read(cdev, buf, FILE_TYPE_SAFE_BUFSIZE, 0, 0); if (ret < 0) @@ -396,5 +397,6 @@ enum filetype cdev_detect_type(const char *name) err_out: free(buf); + cdev_close(cdev); return type; } @@ -1205,8 +1205,6 @@ static const char *detect_fs(const char *filename) struct driver_d *drv; struct fs_driver_d *fdrv; - if (!strncmp(filename, "/dev/", 5)) - filename += 5; type = cdev_detect_type(filename); if (type == filetype_unknown) |