chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
unit: use the UNIT() macro consistently
[elogind.git]
/
src
/
util.c
diff --git
a/src/util.c
b/src/util.c
index 3179502f6c01466b3614fba82d1699ffc1337986..b6e490d457a3562ad1e97037bdd9fbe7a9687bd9 100644
(file)
--- a/
src/util.c
+++ b/
src/util.c
@@
-2467,14
+2467,14
@@
int ask(char *ret, const char *replies, const char *text, ...) {
bool need_nl = true;
if (on_tty)
bool need_nl = true;
if (on_tty)
- fputs(
"\x1B[1m"
, stdout);
+ fputs(
ANSI_HIGHLIGHT_ON
, stdout);
va_start(ap, text);
vprintf(text, ap);
va_end(ap);
if (on_tty)
va_start(ap, text);
vprintf(text, ap);
va_end(ap);
if (on_tty)
- fputs(
"\x1B[0m"
, stdout);
+ fputs(
ANSI_HIGHLIGHT_OFF
, stdout);
fflush(stdout);
fflush(stdout);
@@
-3077,6
+3077,8
@@
int parse_bytes(const char *t, off_t *bytes) {
{ "M", 1024ULL*1024ULL },
{ "G", 1024ULL*1024ULL*1024ULL },
{ "T", 1024ULL*1024ULL*1024ULL*1024ULL },
{ "M", 1024ULL*1024ULL },
{ "G", 1024ULL*1024ULL*1024ULL },
{ "T", 1024ULL*1024ULL*1024ULL*1024ULL },
+ { "P", 1024ULL*1024ULL*1024ULL*1024ULL*1024ULL },
+ { "E", 1024ULL*1024ULL*1024ULL*1024ULL*1024ULL*1024ULL },
{ "", 1 },
};
{ "", 1 },
};
@@
-4402,31
+4404,37
@@
int vtnr_from_tty(const char *tty) {
return i;
}
return i;
}
-
const char *default_term_for_tty
(const char *tty) {
+
bool tty_is_vc_resolve
(const char *tty) {
char *active = NULL;
char *active = NULL;
-
const char *term
;
+
bool b
;
assert(tty);
if (startswith(tty, "/dev/"))
tty += 5;
assert(tty);
if (startswith(tty, "/dev/"))
tty += 5;
- /* Resolve where /dev/console is pointing when determining
- * TERM */
+ /* Resolve where /dev/console is pointing to */
if (streq(tty, "console"))
if (read_one_line_file("/sys/class/tty/console/active", &active) >= 0) {
/* If multiple log outputs are configured the
* last one is what /dev/console points to */
if (streq(tty, "console"))
if (read_one_line_file("/sys/class/tty/console/active", &active) >= 0) {
/* If multiple log outputs are configured the
* last one is what /dev/console points to */
- if ((tty = strrchr(active, ' ')))
+ tty = strrchr(active, ' ');
+ if (tty)
tty++;
else
tty = active;
}
tty++;
else
tty = active;
}
-
term = tty_is_vc(tty) ? "TERM=linux" : "TERM=vt100"
;
+
b = tty_is_vc(tty)
;
free(active);
free(active);
- return term;
+ return b;
+}
+
+const char *default_term_for_tty(const char *tty) {
+ assert(tty);
+
+ return tty_is_vc_resolve(tty) ? "TERM=linux" : "TERM=vt100";
}
bool dirent_is_file(const struct dirent *de) {
}
bool dirent_is_file(const struct dirent *de) {
@@
-6076,6
+6084,8
@@
char *format_bytes(char *buf, size_t l, off_t t) {
const char *suffix;
off_t factor;
} table[] = {
const char *suffix;
off_t factor;
} table[] = {
+ { "E", 1024ULL*1024ULL*1024ULL*1024ULL*1024ULL*1024ULL },
+ { "P", 1024ULL*1024ULL*1024ULL*1024ULL*1024ULL },
{ "T", 1024ULL*1024ULL*1024ULL*1024ULL },
{ "G", 1024ULL*1024ULL*1024ULL },
{ "M", 1024ULL*1024ULL },
{ "T", 1024ULL*1024ULL*1024ULL*1024ULL },
{ "G", 1024ULL*1024ULL*1024ULL },
{ "M", 1024ULL*1024ULL },