Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/loginutils/getty.c

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/loginutils/getty.c (modified) (6 diffs)

branches/3.3/mindi-busybox/loginutils/getty.c

@@ -22 +22 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
+//config:config GETTY
+//config:   bool "getty"
+//config:   default y
+//config:   select FEATURE_SYSLOG
+//config:   help
+//config:     getty lets you log in on a tty. It is normally invoked by init.
+//config:
+//config:     Note that you can save a few bytes by disabling it and
+//config:     using login applet directly.
+//config:     If you need to reset tty attributes before calling login,
+//config:     this script approximates getty:
+//config:
+//config:     exec </dev/$1 >/dev/$1 2>&1 || exit 1
+//config:     reset
+//config:     stty sane; stty ispeed 38400; stty ospeed 38400
+//config:     printf "%s login: " "`hostname`"
+//config:     read -r login
+//config:     exec /bin/login "$login"
+
+//applet:IF_GETTY(APPLET(getty, BB_DIR_SBIN, BB_SUID_DROP))
+
+//kbuild:lib-$(CONFIG_GETTY) += getty.o
 
 #include "libbb.h"
@@ -335 +357 @@
      */
 
-    /* line buffered input (NL or EOL or EOF chars end a line);
-     * recognize INT/QUIT/SUSP chars;
-     * echo input chars;
-     * echo BS-SP-BS on erase character;
-     * echo kill char specially, not as ^c (ECHOKE controls how exactly);
-     * erase all input via BS-SP-BS on kill char (else go to next line)
-     */
-    G.tty_attrs.c_lflag |= ICANON | ISIG | ECHO | ECHOE | ECHOK | ECHOKE;
+    /* ICANON  line buffered input (NL or EOL or EOF chars end a line);
+     * ISIG    recognize INT/QUIT/SUSP chars;
+     * ECHO    echo input chars;
+     * ECHOE   echo BS-SP-BS on erase character;
+     * ECHOK   echo kill char specially, not as ^c (ECHOKE controls how exactly);
+     * ECHOKE  erase all input via BS-SP-BS on kill char (else go to next line)
+     * ECHOCTL Echo ctrl chars as ^c (else echo verbatim:
+     *         e.g. up arrow emits "ESC-something" and thus moves cursor up!)
+     */
+    G.tty_attrs.c_lflag |= ICANON | ISIG | ECHO | ECHOE | ECHOK | ECHOKE | ECHOCTL;
     /* Other bits in c_lflag:
      * XCASE   Map uppercase to \lowercase [tried, doesn't work]
      * ECHONL  Echo NL even if ECHO is not set
-     * ECHOCTL Echo ctrl chars as ^c (else don't echo) - maybe set this?
      * ECHOPRT On erase, echo erased chars
      *         [qwe<BS><BS><BS> input looks like "qwe\ewq/" on screen]
@@ -520 +543 @@
 }
 
+static void sleep10(void)
+{
+    sleep(10);
+}
+
 int getty_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int getty_main(int argc UNUSED_PARAM, char **argv)
@@ -557 +585 @@
             //  getsid(0), getpgid(0));
             bb_perror_msg_and_die("setsid");
+            /*
+             * When we can end up here?
+             * Example: setsid() fails when run alone in interactive shell:
+             *  # getty 115200 /dev/tty2
+             * because shell's child (getty) is put in a new process group.
+             * But doesn't fail if shell is not interactive
+             * (and therefore doesn't create process groups for pipes),
+             * or if getty is not the first process in the process group:
+             *  # true | getty 115200 /dev/tty2
+             */
         }
         /* Looks like we are already a session leader.
@@ -589 +627 @@
 
     /* Logging. We want special flavor of error_msg_and_die */
-    die_sleep = 10;
+    die_func = sleep10;
     msg_eol = "\r\n";
     /* most likely will internally use fd #3 in CLOEXEC mode: */
@@ -696 +734 @@
      * and getty is not suid-root applet */
     /* With -n, logname == NULL, and login will ask for username instead */
-    BB_EXECLP(G.login, G.login, "--", logname, NULL);
+    BB_EXECLP(G.login, G.login, "--", logname, (char *)0);
     bb_error_msg_and_die("can't execute '%s'", G.login);
 }