Prep v234: Apply missing upstream fixes in src/basic (1/6)

[elogind.git] / src / basic / terminal-util.c

diff --git a/src/basic/terminal-util.c b/src/basic/terminal-util.c
index 8f46c9267b1a091c1137199d81bf8692d5a88e9c..6cf623d5196fc16d7ca4b908829a406d1a6704aa 100644 (file)
--- a/src/basic/terminal-util.c
+++ b/src/basic/terminal-util.c
@@ -144,33 +144,40 @@ int read_one_char(FILE *f, char *ret, usec_t t, bool *need_nl) {
         return 0;
 }
 
         return 0;
 }
 

-int ask_char(char *ret, const char *replies, const char *text, ...) {
+#define DEFAULT_ASK_REFRESH_USEC (2*USEC_PER_SEC)
+
+int ask_char(char *ret, const char *replies, const char *fmt, ...) {

         int r;
 
         assert(ret);
         assert(replies);
         int r;
 
         assert(ret);
         assert(replies);

-        assert(text);
+        assert(fmt);

 
         for (;;) {
                 va_list ap;
                 char c;
                 bool need_nl = true;
 
 
         for (;;) {
                 va_list ap;
                 char c;
                 bool need_nl = true;
 

-                if (on_tty())
+                if (colors_enabled())

                         fputs(ANSI_HIGHLIGHT, stdout);
 
                         fputs(ANSI_HIGHLIGHT, stdout);
 

-                va_start(ap, text);
-                vprintf(text, ap);
+                putchar('\r');
+
+                va_start(ap, fmt);
+                vprintf(fmt, ap);

                 va_end(ap);
 
                 va_end(ap);
 

-                if (on_tty())
+                if (colors_enabled())

                         fputs(ANSI_NORMAL, stdout);
 
                 fflush(stdout);
 
                         fputs(ANSI_NORMAL, stdout);
 
                 fflush(stdout);
 

-                r = read_one_char(stdin, &c, USEC_INFINITY, &need_nl);
+                r = read_one_char(stdin, &c, DEFAULT_ASK_REFRESH_USEC, &need_nl);

                 if (r < 0) {
 
                 if (r < 0) {
 

+                        if (r == -ETIMEDOUT)
+                                continue;
+

                         if (r == -EBADMSG) {
                                 puts("Bad input, please try again.");
                                 continue;
                         if (r == -EBADMSG) {
                                 puts("Bad input, please try again.");
                                 continue;


@@ -200,14 +207,14 @@ int ask_string(char **ret, const char *text, ...) {
                 char line[LINE_MAX];
                 va_list ap;
 
                 char line[LINE_MAX];
                 va_list ap;
 

-                if (on_tty())
+                if (colors_enabled())

                         fputs(ANSI_HIGHLIGHT, stdout);
 
                 va_start(ap, text);
                 vprintf(text, ap);
                 va_end(ap);
 
                         fputs(ANSI_HIGHLIGHT, stdout);
 
                 va_start(ap, text);
                 vprintf(text, ap);
                 va_end(ap);
 

-                if (on_tty())
+                if (colors_enabled())

                         fputs(ANSI_NORMAL, stdout);
 
                 fflush(stdout);
                         fputs(ANSI_NORMAL, stdout);
 
                 fflush(stdout);


@@ -347,12 +354,7 @@ int open_terminal(const char *name, int mode) {
         }
 
         r = isatty(fd);
         }
 
         r = isatty(fd);

-        if (r < 0) {
-                safe_close(fd);
-                return -errno;
-        }
-
-        if (!r) {
+        if (r == 0) {

                 safe_close(fd);
                 return -ENOTTY;
         }
                 safe_close(fd);
                 return -ENOTTY;
         }


@@ -462,7 +464,7 @@ int acquire_terminal(
                                         goto fail;
                                 }
 
                                         goto fail;
                                 }
 

-                                r = fd_wait_for_event(fd, POLLIN, ts + timeout - n);
+                                r = fd_wait_for_event(notify, POLLIN, ts + timeout - n);

                                 if (r < 0)
                                         goto fail;
 
                                 if (r < 0)
                                         goto fail;
 


@@ -792,7 +794,7 @@ bool tty_is_vc_resolve(const char *tty) {
 }
 
 const char *default_term_for_tty(const char *tty) {
 }
 
 const char *default_term_for_tty(const char *tty) {

-        return tty && tty_is_vc_resolve(tty) ? "TERM=linux" : "TERM=vt220";
+        return tty && tty_is_vc_resolve(tty) ? "linux" : "vt220";

 }
 #endif // 0
 
 }
 #endif // 0
 


@@ -898,9 +900,7 @@ int make_stdio(int fd) {
 
         /* Explicitly unset O_CLOEXEC, since if fd was < 3, then
          * dup2() was a NOP and the bit hence possibly set. */
 
         /* Explicitly unset O_CLOEXEC, since if fd was < 3, then
          * dup2() was a NOP and the bit hence possibly set. */

-        fd_cloexec(STDIN_FILENO, false);
-        fd_cloexec(STDOUT_FILENO, false);
-        fd_cloexec(STDERR_FILENO, false);
+        stdio_unset_cloexec();

 
         return 0;
 }
 
         return 0;
 }


@@ -1205,19 +1205,39 @@ int open_terminal_in_namespace(pid_t pid, const char *name, int mode) {
 }
 #endif // 0
 
 }
 #endif // 0
 

+static bool getenv_terminal_is_dumb(void) {
+        const char *e;
+
+        e = getenv("TERM");
+        if (!e)
+                return true;
+
+        return streq(e, "dumb");
+}
+
+bool terminal_is_dumb(void) {
+        if (!on_tty())
+                return true;
+
+        return getenv_terminal_is_dumb();
+}
+

 bool colors_enabled(void) {
         static int enabled = -1;
 
         if (_unlikely_(enabled < 0)) {
 bool colors_enabled(void) {
         static int enabled = -1;
 
         if (_unlikely_(enabled < 0)) {

-                const char *colors;
-
-                colors = getenv("SYSTEMD_COLORS");
-                if (colors)
-                        enabled = parse_boolean(colors) != 0;
-                else if (streq_ptr(getenv("TERM"), "dumb"))
-                        enabled = false;
+#if 0 /// elogind does not allow such forcing, and we are never init!
+                int val;
+
+                val = getenv_bool("SYSTEMD_COLORS");
+                if (val >= 0)
+                        enabled = val;
+                else if (getpid() == 1)
+                        /* PID1 outputs to the console without holding it open all the time */
+                        enabled = !getenv_terminal_is_dumb();

                 else
                 else

-                        enabled = on_tty();
+#endif // 0
+                        enabled = !terminal_is_dumb();

         }
 
         return enabled;
         }
 
         return enabled;