diff options
| author | Ethan Yonker <dees_troy@teamw.in> | 2015-10-09 18:15:26 +0200 |
|---|---|---|
| committer | Ethan Yonker <dees_troy@teamw.in> | 2015-10-09 18:15:29 +0200 |
| commit | c798c9cd2486e0ff83776002c74f113677b10a84 (patch) | |
| tree | d128a80cbc58e63a622fda2774e727611f9d2cd4 /libblkid | |
| parent | Add TW_IGNORE_ABS_MT_TRACKING_ID (diff) | |
| parent | merge in mnc-release history after reset to mnc-dev (diff) | |
| download | android_bootable_recovery-c798c9cd2486e0ff83776002c74f113677b10a84.tar android_bootable_recovery-c798c9cd2486e0ff83776002c74f113677b10a84.tar.gz android_bootable_recovery-c798c9cd2486e0ff83776002c74f113677b10a84.tar.bz2 android_bootable_recovery-c798c9cd2486e0ff83776002c74f113677b10a84.tar.lz android_bootable_recovery-c798c9cd2486e0ff83776002c74f113677b10a84.tar.xz android_bootable_recovery-c798c9cd2486e0ff83776002c74f113677b10a84.tar.zst android_bootable_recovery-c798c9cd2486e0ff83776002c74f113677b10a84.zip | |
Diffstat (limited to 'libblkid')
| -rw-r--r-- | libblkid/include/all-io.h | 2 | ||||
| -rw-r--r-- | libblkid/lib/exec_shell.c | 1 | ||||
| -rw-r--r-- | libblkid/lib/fileutils.c | 4 | ||||
| -rw-r--r-- | libblkid/lib/sysfs.c | 7 |
4 files changed, 12 insertions, 2 deletions
diff --git a/libblkid/include/all-io.h b/libblkid/include/all-io.h index 1fad66e53..9a4aeba3b 100644 --- a/libblkid/include/all-io.h +++ b/libblkid/include/all-io.h @@ -49,7 +49,7 @@ static inline int fwrite_all(const void *ptr, size_t size, } else if (errno != EINTR && errno != EAGAIN) return -1; if (errno == EAGAIN) /* Try later, *sigh* */ - xusleep(250000); + usleep(250000); } return 0; } diff --git a/libblkid/lib/exec_shell.c b/libblkid/lib/exec_shell.c index 2b263644d..2b723acb4 100644 --- a/libblkid/lib/exec_shell.c +++ b/libblkid/lib/exec_shell.c @@ -20,6 +20,7 @@ #include <string.h> #include <unistd.h> #include <sys/types.h> +#include <libgen.h> #include "nls.h" #include "c.h" diff --git a/libblkid/lib/fileutils.c b/libblkid/lib/fileutils.c index 4e884d39a..c6eb0d6c9 100644 --- a/libblkid/lib/fileutils.c +++ b/libblkid/lib/fileutils.c @@ -14,6 +14,10 @@ #include "fileutils.h" #include "pathnames.h" +#ifndef _PATH_TMP +#define _PATH_TMP "/tmp/" +#endif + /* Create open temporary file in safe way. Please notice that the * file permissions are -rw------- by default. */ int xmkstemp(char **tmpname, char *dir) diff --git a/libblkid/lib/sysfs.c b/libblkid/lib/sysfs.c index 63a90dcbc..8070750fa 100644 --- a/libblkid/lib/sysfs.c +++ b/libblkid/lib/sysfs.c @@ -5,6 +5,8 @@ * Written by Karel Zak <kzak@redhat.com> */ #include <ctype.h> +#include <string.h> +#include <libgen.h> #include "c.h" #include "at.h" @@ -13,6 +15,9 @@ #include "fileutils.h" #include "all-io.h" +#define STRINGIFY(x) #x +#define EXPAND(x) STRINGIFY(x) + char *sysfs_devno_attribute_path(dev_t devno, char *buf, size_t bufsiz, const char *attr) { @@ -436,7 +441,7 @@ int sysfs_write_string(struct sysfs_cxt *cxt, const char *attr, const char *str) int sysfs_write_u64(struct sysfs_cxt *cxt, const char *attr, uint64_t num) { - char buf[sizeof(stringify_value(ULLONG_MAX))]; + char buf[sizeof(STRINGIFY(ULLONG_MAX))]; int fd, rc = 0, len, errsv; fd = sysfs_open(cxt, attr, O_WRONLY|O_CLOEXEC); |