systemd-analyze: use argparse instead of getopt

[elogind.git] / src / shared / util.c

diff --git a/src/shared/util.c b/src/shared/util.c
index 2a8afae0ecebb122d9ab07feaa80f330252b9dbe..5a326ec43512f7cd85927daaa2f105f0e8da7b9a 100644 (file)
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -77,6 +77,10 @@ char **saved_argv = NULL;
 static volatile unsigned cached_columns = 0;
 static volatile unsigned cached_lines = 0;
 
+bool is_efiboot(void) {
+        return access("/sys/firmware/efi", F_OK) >= 0;
+}
+
 size_t page_size(void) {
         static __thread size_t pgsz = 0;
         long r;
@@ -6144,16 +6148,16 @@ out:
 const char *draw_special_char(DrawSpecialChar ch) {
         static const char *draw_table[2][_DRAW_SPECIAL_CHAR_MAX] = {
                 /* UTF-8 */ {
-                        [DRAW_BOX_VERT]           = "\342\224\202", /* │ */
-                        [DRAW_BOX_VERT_AND_RIGHT] = "\342\224\234", /* ├ */
-                        [DRAW_BOX_UP_AND_RIGHT]   = "\342\224\224", /* └ */
-                        [DRAW_TRIANGULAR_BULLET]  = "\342\200\243", /* ‣ */
+                        [DRAW_TREE_VERT]          = "\342\224\202 ",            /* │  */
+                        [DRAW_TREE_BRANCH]        = "\342\224\234\342\224\200", /* ├─ */
+                        [DRAW_TREE_RIGHT]         = "\342\224\224\342\224\200", /* └─ */
+                        [DRAW_TRIANGULAR_BULLET]  = "\342\200\243 ",            /* ‣  */
                 },
                 /* ASCII fallback */ {
-                        [DRAW_BOX_VERT] = "|",
-                        [DRAW_BOX_VERT_AND_RIGHT] = "+",
-                        [DRAW_BOX_UP_AND_RIGHT]   = "\\",
-                        [DRAW_TRIANGULAR_BULLET]  = ">",
+                        [DRAW_TREE_VERT]          = "| ",
+                        [DRAW_TREE_BRANCH]        = "|-",
+                        [DRAW_TREE_RIGHT]         = "`-",
+                        [DRAW_TRIANGULAR_BULLET]  = "> ",
                 }
         };