diff options
| author | Enrico Scholz <enrico.scholz@sigma-chemnitz.de> | 2008-08-25 11:21:48 +0200 |
|---|---|---|
| committer | Artem Bityutskiy <Artem.Bityutskiy@nokia.com> | 2008-08-25 14:38:02 +0300 |
| commit | d5184fdeff3bb18e4d5c5fe00a91bd473e4ed26f (patch) | |
| tree | 37fdb342cfcc81da0ec03347efaef0fa1b51e3de /ubi-utils/src | |
| parent | c67a5c357443321dd252dceddb8e5304430e47c5 (diff) | |
ubi-utils: use 'stat(2)' instead of 'lstat(2)'
The UBI tools refuse to work with symlinks like
'/dev/ubi/bootloader -> ../ubi0_2' because they use 'lstat(2)' and get
information about the symlink but not about the device. This is
unwanted and fixed by this patch.
This patch renames 'struct stat stat' variables to 'st' to avoid
compilation errors.
Signed-off-by: Enrico Scholz <enrico.scholz@sigma-chemnitz.de>
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Diffstat (limited to 'ubi-utils/src')
| -rw-r--r-- | ubi-utils/src/libubi.c | 30 | ||||
| -rw-r--r-- | ubi-utils/src/nand2bin.c | 2 |
2 files changed, 16 insertions, 16 deletions
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); } |