diff options
| author | Karel Zak | 2011-03-29 10:45:57 +0200 |
|---|---|---|
| committer | Karel Zak | 2011-03-29 10:45:57 +0200 |
| commit | 741a5b1085c6e47c8076b9960fa59cd5dd204b96 (patch) | |
| tree | d84b52cb38c137aee1b8ac1426e39d096b0ff411 /partx | |
| parent | include: [c.h] add definition wrappers for old libc versions (diff) | |
| download | kernel-qcow2-util-linux-741a5b1085c6e47c8076b9960fa59cd5dd204b96.tar.gz kernel-qcow2-util-linux-741a5b1085c6e47c8076b9960fa59cd5dd204b96.tar.xz kernel-qcow2-util-linux-741a5b1085c6e47c8076b9960fa59cd5dd204b96.zip | |
partx: add fallback for openat() to be usable on old systems
Reported-by: "Gabor Z. Papp" <gzp@papp.hu>
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'partx')
| -rw-r--r-- | partx/Makefile.am | 1 | ||||
| -rw-r--r-- | partx/partx.c | 10 |
2 files changed, 8 insertions, 3 deletions
diff --git a/partx/Makefile.am b/partx/Makefile.am index 67ba7c53e..46fc64172 100644 --- a/partx/Makefile.am +++ b/partx/Makefile.am @@ -7,6 +7,7 @@ usrsbin_exec_PROGRAMS += partx partx_SOURCES = partx.c partx.h \ $(top_srcdir)/lib/blkdev.c \ $(top_srcdir)/lib/tt.c \ + $(top_srcdir)/lib/at.c \ $(top_srcdir)/lib/mbsalign.c \ $(top_srcdir)/lib/strutils.c \ $(top_srcdir)/lib/linux_version.c diff --git a/partx/partx.c b/partx/partx.c index 62a8f872d..f4741d86d 100644 --- a/partx/partx.c +++ b/partx/partx.c @@ -36,6 +36,7 @@ #include "strutils.h" #include "xalloc.h" #include "partx.h" +#include "at.h" /* this is the default upper limit, could be modified by --nr */ #define SLICES_MAX 256 @@ -178,7 +179,7 @@ err: static int get_max_partno(const char *disk, dev_t devno) { - char path[PATH_MAX], *parent; + char path[PATH_MAX], *parent, *dirname = NULL; struct stat st; DIR *dir; struct dirent *d; @@ -200,7 +201,9 @@ static int get_max_partno(const char *disk, dev_t devno) if (!dir) goto dflt; - while ((d = readdir(dir))) { + dirname = xstrdup(path); + + while ((d = readdir(dir))) { int fd; if (!strcmp(d->d_name, ".") || @@ -214,7 +217,7 @@ static int get_max_partno(const char *disk, dev_t devno) continue; snprintf(path, sizeof(path), "%s/partition", d->d_name); - fd = openat(dirfd(dir), path, O_RDONLY); + fd = open_at(dirfd(dir), dirname, path, O_RDONLY); if (fd) { int x = 0; FILE *f = fdopen(fd, "r"); @@ -226,6 +229,7 @@ static int get_max_partno(const char *disk, dev_t devno) } } + free(dirname); closedir(dir); return partno; dflt: |