diff options
| -rw-r--r-- | ubi-utils/new-utils/src/libubi.c | 14 | ||||
| -rw-r--r-- | ubi-utils/src/libubi.c | 30 | ||||
| -rw-r--r-- | ubi-utils/src/nand2bin.c | 2 |
3 files changed, 23 insertions, 23 deletions
diff --git a/ubi-utils/new-utils/src/libubi.c b/ubi-utils/new-utils/src/libubi.c index 8f95108..10e3f2a 100644 --- a/ubi-utils/new-utils/src/libubi.c +++ b/ubi-utils/new-utils/src/libubi.c @@ -365,7 +365,7 @@ static int vol_node2nums(struct libubi *lib, const char *node, int *dev_num, int i, fd, major, minor; char file[strlen(lib->ubi_vol) + 100]; - if (lstat(node, &st)) + if (stat(node, &st)) return -1; if (!S_ISCHR(st.st_mode)) { @@ -427,20 +427,20 @@ static int vol_node2nums(struct libubi *lib, const char *node, int *dev_num, */ static int dev_node2num(struct libubi *lib, const char *node, int *dev_num) { - struct stat stat; + struct stat st; struct ubi_info info; int i, major, minor; - if (lstat(node, &stat)) + if (stat(node, &st)) return -1; - if (!S_ISCHR(stat.st_mode)) { + if (!S_ISCHR(st.st_mode)) { errno = EINVAL; return errmsg("\"%s\" is not a character device", node); } - major = major(stat.st_rdev); - minor = minor(stat.st_rdev); + major = major(st.st_rdev); + minor = minor(st.st_rdev); if (minor != 0) { errno = EINVAL; @@ -754,7 +754,7 @@ int ubi_node_type(libubi_t desc, const char *node) struct libubi *lib = (struct libubi *)desc; char file[strlen(lib->ubi_vol) + 100]; - if (lstat(node, &st)) + if (stat(node, &st)) return -1; if (!S_ISCHR(st.st_mode)) { diff --git a/ubi-utils/src/libubi.c b/ubi-utils/src/libubi.c index a028fc6..a536b47 100644 --- a/ubi-utils/src/libubi.c +++ b/ubi-utils/src/libubi.c @@ -754,20 +754,20 @@ static char *mkpath(const char *path, const char *name) */ static int find_dev_num(struct libubi *lib, const char *node) { - struct stat stat; + struct stat st; struct ubi_info info; int i, major, minor; - if (lstat(node, &stat)) + if (stat(node, &st)) return -1; - if (!S_ISCHR(stat.st_mode)) { + if (!S_ISCHR(st.st_mode)) { errno = EINVAL; return -1; } - major = major(stat.st_rdev); - minor = minor(stat.st_rdev); + major = major(st.st_rdev); + minor = minor(st.st_rdev); if (minor != 0) { errno = -EINVAL; @@ -811,21 +811,21 @@ static int find_dev_num(struct libubi *lib, const char *node) */ static int find_dev_num_vol(struct libubi *lib, const char *node) { - struct stat stat; + struct stat st; struct ubi_info info; int i, major; - if (lstat(node, &stat)) + if (stat(node, &st)) return -1; - if (!S_ISCHR(stat.st_mode)) { + if (!S_ISCHR(st.st_mode)) { errno = EINVAL; return -1; } - major = major(stat.st_rdev); + major = major(st.st_rdev); - if (minor(stat.st_rdev) == 0) { + if (minor(st.st_rdev) == 0) { errno = -EINVAL; return -1; } @@ -868,20 +868,20 @@ static int find_dev_num_vol(struct libubi *lib, const char *node) */ static int find_vol_num(struct libubi *lib, int dev_num, const char *node) { - struct stat stat; + struct stat st; struct ubi_dev_info info; int i, major, minor; - if (lstat(node, &stat)) + if (stat(node, &st)) return -1; - if (!S_ISCHR(stat.st_mode)) { + if (!S_ISCHR(st.st_mode)) { errno = EINVAL; return -1; } - major = major(stat.st_rdev); - minor = minor(stat.st_rdev); + major = major(st.st_rdev); + minor = minor(st.st_rdev); if (minor == 0) { errno = -EINVAL; diff --git a/ubi-utils/src/nand2bin.c b/ubi-utils/src/nand2bin.c index be62e30..93ba29f 100644 --- a/ubi-utils/src/nand2bin.c +++ b/ubi-utils/src/nand2bin.c @@ -456,7 +456,7 @@ main(int argc, char *argv[]) exit(EXIT_FAILURE); } - if (lstat(myargs.arg1, &file_info) != 0) { + if (stat(myargs.arg1, &file_info) != 0) { perror("Cannot fetch file size from input file.\n"); exit(EXIT_FAILURE); } |