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: really include .journal~ files in listing
[elogind.git]
/
src
/
shared
/
util.c
diff --git
a/src/shared/util.c
b/src/shared/util.c
index 5f360085a29a75539adea7c89fab5fafd398a62e..736cb15a5f9c22ad0f393bd63aa5838a9c1c147a 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));
}
@@
-1788,7
+1800,7
@@
char *ascii_strlower(char *t) {
return t;
}
return t;
}
-
bool ignore_file
(const char *filename) {
+
static bool ignore_file_allow_backup
(const char *filename) {
assert(filename);
return
assert(filename);
return
@@
-1796,7
+1808,6
@@
bool ignore_file(const char *filename) {
streq(filename, "lost+found") ||
streq(filename, "aquota.user") ||
streq(filename, "aquota.group") ||
streq(filename, "lost+found") ||
streq(filename, "aquota.user") ||
streq(filename, "aquota.group") ||
- endswith(filename, "~") ||
endswith(filename, ".rpmnew") ||
endswith(filename, ".rpmsave") ||
endswith(filename, ".rpmorig") ||
endswith(filename, ".rpmnew") ||
endswith(filename, ".rpmsave") ||
endswith(filename, ".rpmorig") ||
@@
-1805,6
+1816,15
@@
bool ignore_file(const char *filename) {
endswith(filename, ".swp");
}
endswith(filename, ".swp");
}
+bool ignore_file(const char *filename) {
+ assert(filename);
+
+ if (endswith(filename, "~"))
+ return false;
+
+ return ignore_file_allow_backup(filename);
+}
+
int fd_nonblock(int fd, bool nonblock) {
int flags;
int fd_nonblock(int fd, bool nonblock) {
int flags;
@@
-2999,7
+3019,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);
@@
-3076,7
+3097,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;
@@
-3774,18
+3794,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)
@@
-3794,6
+3823,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);
@@
-4233,7
+4270,12
@@
bool dirent_is_file(const struct dirent *de) {
bool dirent_is_file_with_suffix(const struct dirent *de, const char *suffix) {
assert(de);
bool dirent_is_file_with_suffix(const struct dirent *de, const char *suffix) {
assert(de);
- if (!dirent_is_file(de))
+ if (de->d_type != DT_REG &&
+ de->d_type != DT_LNK &&
+ de->d_type != DT_UNKNOWN)
+ return false;
+
+ if (ignore_file_allow_backup(de->d_name))
return false;
return endswith(de->d_name, suffix);
return false;
return endswith(de->d_name, suffix);
@@
-4327,7
+4369,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