chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Introduce loop_read_exact helper
[elogind.git]
/
src
/
libsystemd
/
sd-id128
/
sd-id128.c
diff --git
a/src/libsystemd/sd-id128/sd-id128.c
b/src/libsystemd/sd-id128/sd-id128.c
index 9ee40ab91eaaee64a3f13dc61dc354bc8de26400..f0ffedc38b39c9c363a4a1b80ab2760a77108f33 100644
(file)
--- a/
src/libsystemd/sd-id128/sd-id128.c
+++ b/
src/libsystemd/sd-id128/sd-id128.c
@@
-108,9
+108,9
@@
_public_ int sd_id128_get_machine(sd_id128_t *ret) {
static thread_local bool saved_machine_id_valid = false;
_cleanup_close_ int fd = -1;
char buf[33];
static thread_local bool saved_machine_id_valid = false;
_cleanup_close_ int fd = -1;
char buf[33];
- ssize_t k;
unsigned j;
sd_id128_t t;
unsigned j;
sd_id128_t t;
+ int r;
assert_return(ret, -EINVAL);
assert_return(ret, -EINVAL);
@@
-123,13
+123,9
@@
_public_ int sd_id128_get_machine(sd_id128_t *ret) {
if (fd < 0)
return -errno;
if (fd < 0)
return -errno;
- k = loop_read(fd, buf, 33, false);
- if (k < 0)
- return (int) k;
-
- if (k != 33)
- return -EIO;
-
+ r = loop_read_exact(fd, buf, 33, false);
+ if (r < 0)
+ return r;
if (buf[32] !='\n')
return -EIO;
if (buf[32] !='\n')
return -EIO;
@@
-157,10
+153,10
@@
_public_ int sd_id128_get_boot(sd_id128_t *ret) {
static thread_local bool saved_boot_id_valid = false;
_cleanup_close_ int fd = -1;
char buf[36];
static thread_local bool saved_boot_id_valid = false;
_cleanup_close_ int fd = -1;
char buf[36];
- ssize_t k;
unsigned j;
sd_id128_t t;
char *p;
unsigned j;
sd_id128_t t;
char *p;
+ int r;
assert_return(ret, -EINVAL);
assert_return(ret, -EINVAL);
@@
-173,21
+169,21
@@
_public_ int sd_id128_get_boot(sd_id128_t *ret) {
if (fd < 0)
return -errno;
if (fd < 0)
return -errno;
- k = loop_read(fd, buf, 36, false);
- if (k < 0)
- return (int) k;
-
- if (k != 36)
- return -EIO;
+ r = loop_read_exact(fd, buf, 36, false);
+ if (r < 0)
+ return r;
for (j = 0, p = buf; j < 16; j++) {
int a, b;
for (j = 0, p = buf; j < 16; j++) {
int a, b;
- if (p >= buf +
k
)
+ if (p >= buf +
35
)
return -EIO;
return -EIO;
- if (*p == '-')
+ if (*p == '-')
{
p++;
p++;
+ if (p >= buf + 35)
+ return -EIO;
+ }
a = unhexchar(p[0]);
b = unhexchar(p[1]);
a = unhexchar(p[0]);
b = unhexchar(p[1]);
@@
-208,26
+204,18
@@
_public_ int sd_id128_get_boot(sd_id128_t *ret) {
}
_public_ int sd_id128_randomize(sd_id128_t *ret) {
}
_public_ int sd_id128_randomize(sd_id128_t *ret) {
- _cleanup_close_ int fd = -1;
sd_id128_t t;
sd_id128_t t;
-
ssize_t k
;
+
int r
;
assert_return(ret, -EINVAL);
assert_return(ret, -EINVAL);
- fd = open("/dev/urandom", O_RDONLY|O_CLOEXEC|O_NOCTTY);
- if (fd < 0)
- return -errno;
-
- k = loop_read(fd, &t, 16, false);
- if (k < 0)
- return (int) k;
-
- if (k != 16)
- return -EIO;
+ r = dev_urandom(&t, sizeof(t));
+ if (r < 0)
+ return r;
/* Turn this into a valid v4 UUID, to be nice. Note that we
* only guarantee this for newly generated UUIDs, not for
/* Turn this into a valid v4 UUID, to be nice. Note that we
* only guarantee this for newly generated UUIDs, not for
- * pre-existing ones.*/
+ * pre-existing ones.
*/
*ret = make_v4_uuid(t);
return 0;
*ret = make_v4_uuid(t);
return 0;