chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
journal: don't write tag objects if nothing has been written since the last time
[elogind.git]
/
src
/
shared
/
util.c
diff --git
a/src/shared/util.c
b/src/shared/util.c
index af975956dbca755091ca60981e5432e37b8328a4..cbf44ebdfd618a2b69cb6748c16005870a4e4717 100644
(file)
--- a/
src/shared/util.c
+++ b/
src/shared/util.c
@@
-1562,19
+1562,25
@@
char *cescape(const char *s) {
return r;
}
return r;
}
-char *cunescape_length
(const char *s, size_t length
) {
+char *cunescape_length
_with_prefix(const char *s, size_t length, const char *prefix
) {
char *r, *t;
const char *f;
char *r, *t;
const char *f;
+ size_t pl;
assert(s);
assert(s);
- /* Undoes C style string escaping */
+ /* Undoes C style string escaping, and optionally prefixes it. */
+
+ pl = prefix ? strlen(prefix) : 0;
- r = new(char, length+1);
+ r = new(char,
pl+
length+1);
if (!r)
return r;
if (!r)
return r;
- for (f = s, t = r; f < s + length; f++) {
+ if (prefix)
+ memcpy(r, prefix, pl);
+
+ for (f = s, t = r + pl; f < s + length; f++) {
if (*f != '\\') {
*(t++) = *f;
if (*f != '\\') {
*(t++) = *f;
@@
-1685,7
+1691,13
@@
finish:
return r;
}
return r;
}
+char *cunescape_length(const char *s, size_t length) {
+ return cunescape_length_with_prefix(s, length, NULL);
+}
+
char *cunescape(const char *s) {
char *cunescape(const char *s) {
+ assert(s);
+
return cunescape_length(s, strlen(s));
}
return cunescape_length(s, strlen(s));
}
@@
-2999,7
+3011,8
@@
unsigned long long random_ull(void) {
uint64_t ull;
ssize_t r;
uint64_t ull;
ssize_t r;
- if ((fd = open("/dev/urandom", O_RDONLY|O_CLOEXEC|O_NOCTTY)) < 0)
+ fd = open("/dev/urandom", O_RDONLY|O_CLOEXEC|O_NOCTTY);
+ if (fd < 0)
goto fallback;
r = loop_read(fd, &ull, sizeof(ull), true);
goto fallback;
r = loop_read(fd, &ull, sizeof(ull), true);
@@
-4344,7
+4357,7
@@
void execute_directory(const char *directory, DIR *d, char *argv[]) {
}
if ((path = hashmap_remove(pids, UINT_TO_PTR(si.si_pid)))) {
}
if ((path = hashmap_remove(pids, UINT_TO_PTR(si.si_pid)))) {
- if (!is_clean_exit(si.si_code, si.si_status)) {
+ if (!is_clean_exit(si.si_code, si.si_status
, NULL
)) {
if (si.si_code == CLD_EXITED)
log_error("%s exited with exit status %i.", path, si.si_status);
else
if (si.si_code == CLD_EXITED)
log_error("%s exited with exit status %i.", path, si.si_status);
else