chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
journalctl: output FSS key as QR code on generating
[elogind.git]
/
src
/
shared
/
util.c
diff --git
a/src/shared/util.c
b/src/shared/util.c
index 2e7ae63db2e50253d4a50ad42b2243bab13dd98d..041b759287753044b787570f00c8b4e4b5579568 100644
(file)
--- a/
src/shared/util.c
+++ b/
src/shared/util.c
@@
-909,8
+909,7
@@
int load_env_file(
continue;
if (!(u = normalize_env_assignment(p))) {
continue;
if (!(u = normalize_env_assignment(p))) {
- log_error("Out of memory.");
- r = -ENOMEM;
+ r = log_oom();
goto finish;
}
goto finish;
}
@@
-918,8
+917,7
@@
int load_env_file(
free(u);
if (!t) {
free(u);
if (!t) {
- log_error("Out of memory.");
- r = -ENOMEM;
+ r = log_oom();
goto finish;
}
goto finish;
}
@@
-1564,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;
@@
-1687,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));
}
@@
-3001,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);
@@
-3078,7
+3089,6
@@
bool hostname_is_set(void) {
return !isempty(u.nodename) && !streq(u.nodename, "(none)");
}
return !isempty(u.nodename) && !streq(u.nodename, "(none)");
}
-
static char *lookup_uid(uid_t uid) {
long bufsize;
char *buf, *name;
static char *lookup_uid(uid_t uid) {
long bufsize;
char *buf, *name;
@@
-3776,18
+3786,27
@@
int fd_columns(int fd) {
return ws.ws_col;
}
return ws.ws_col;
}
-
unsigned columns(voi
d) {
- static __thread int parsed_columns = 0;
+
static unsigned columns_cached(bool cache
d) {
+ static __thread int parsed_columns = 0
, env_columns = -1
;
const char *e;
const char *e;
- if (_likely_(parsed_columns > 0))
+ if (_likely_(parsed_columns > 0
&& cached
))
return parsed_columns;
return parsed_columns;
- e = getenv("COLUMNS");
- if (e)
- parsed_columns = atoi(e);
+ if (_unlikely_(env_columns == -1)) {
+ e = getenv("COLUMNS");
+ if (e)
+ env_columns = atoi(e);
+ else
+ env_columns = 0;
+ }
- if (parsed_columns <= 0)
+ if (env_columns > 0) {
+ parsed_columns = env_columns;
+ return parsed_columns;
+ }
+
+ if (parsed_columns <= 0 || !cached)
parsed_columns = fd_columns(STDOUT_FILENO);
if (parsed_columns <= 0)
parsed_columns = fd_columns(STDOUT_FILENO);
if (parsed_columns <= 0)
@@
-3796,6
+3815,14
@@
unsigned columns(void) {
return parsed_columns;
}
return parsed_columns;
}
+unsigned columns(void) {
+ return columns_cached(true);
+}
+
+unsigned columns_uncached(void) {
+ return columns_cached(false);
+}
+
int fd_lines(int fd) {
struct winsize ws;
zero(ws);
int fd_lines(int fd) {
struct winsize ws;
zero(ws);
@@
-4278,7
+4305,7
@@
void execute_directory(const char *directory, DIR *d, char *argv[]) {
continue;
if (asprintf(&path, "%s/%s", directory, de->d_name) < 0) {
continue;
if (asprintf(&path, "%s/%s", directory, de->d_name) < 0) {
- log_
error("Out of memory."
);
+ log_
oom(
);
continue;
}
continue;
}
@@
-4329,7
+4356,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