From: Karel Zak Date: Fri, 18 Feb 2011 13:36:04 +0000 (+0100) Subject: lsblk: fix readlink() usage X-Git-Tag: v2.20-rc1~543 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cc6b1d11eabf9d86849a80f2ca8b4c0afd45844f;p=thirdparty%2Futil-linux.git lsblk: fix readlink() usage Reported-by: Steve Grubb Signed-off-by: Karel Zak --- diff --git a/misc-utils/lsblk.c b/misc-utils/lsblk.c index 1616f19727..9b00826eb5 100644 --- a/misc-utils/lsblk.c +++ b/misc-utils/lsblk.c @@ -768,7 +768,7 @@ static int process_one_device(char *devname) { struct blkdev_cxt parent = {}, cxt = {}; struct stat st; - char buf[PATH_MAX]; + char buf[PATH_MAX + 1]; dev_t disk = 0; if (stat(devname, &st) || !S_ISBLK(st.st_mode)) { @@ -795,7 +795,7 @@ static int process_one_device(char *devname) major(st.st_rdev), minor(st.st_rdev)); diskname = xstrdup(buf); - len = readlink(path, buf, sizeof(buf)); + len = readlink(path, buf, PATH_MAX); if (len < 0) { warn(_("%s: failed to read link"), path); return EXIT_FAILURE; diff --git a/shlibs/uuid/man/uuid_generate_time_safe.3 b/shlibs/uuid/man/uuid_generate_time_safe.3 deleted file mode 100644 index 8405486e98..0000000000 --- a/shlibs/uuid/man/uuid_generate_time_safe.3 +++ /dev/null @@ -1 +0,0 @@ -.so man3/uuid_generate.3