3
0
forked from pool/util-linux
Dr. Werner Fink 2014-01-10 13:23:44 +00:00 committed by Git OBS Bridge
parent 18266d8ec7
commit b7f38c0413

View File

@ -8,7 +8,7 @@ console as the flags are locked.
--- term-utils/agetty.c --- term-utils/agetty.c
+++ term-utils/agetty.c 2014-01-10 13:05:50.411075349 +0000 +++ term-utils/agetty.c 2014-01-10 13:05:50.411075349 +0000
@@ -281,8 +281,9 @@ @@ -281,8 +281,9 @@ static void login_options_to_argv(char *
static char *fakehost; static char *fakehost;
#ifdef DEBUGGING #ifdef DEBUGGING
@ -19,7 +19,7 @@ console as the flags are locked.
# endif # endif
# define debug(s) do { fprintf(dbf,s); fflush(dbf); } while (0) # define debug(s) do { fprintf(dbf,s); fflush(dbf); } while (0)
FILE *dbf; FILE *dbf;
@@ -320,8 +321,12 @@ @@ -320,8 +321,12 @@ int main(int argc, char **argv)
#ifdef DEBUGGING #ifdef DEBUGGING
dbf = fopen(DEBUG_OUTPUT, "w"); dbf = fopen(DEBUG_OUTPUT, "w");
@ -33,7 +33,7 @@ console as the flags are locked.
#endif /* DEBUGGING */ #endif /* DEBUGGING */
/* Parse command-line arguments. */ /* Parse command-line arguments. */
@@ -473,7 +478,6 @@ @@ -473,7 +478,6 @@ int main(int argc, char **argv)
if (options.osrelease) if (options.osrelease)
free(options.osrelease); free(options.osrelease);
#ifdef DEBUGGING #ifdef DEBUGGING
@ -41,7 +41,7 @@ console as the flags are locked.
if (close_stream(dbf) != 0) if (close_stream(dbf) != 0)
log_err("write failed: %s", DEBUG_OUTPUT); log_err("write failed: %s", DEBUG_OUTPUT);
#endif #endif
@@ -1090,6 +1094,23 @@ @@ -1090,6 +1094,23 @@ static void termio_init(struct options *
{ {
speed_t ispeed, ospeed; speed_t ispeed, ospeed;
struct winsize ws; struct winsize ws;
@ -65,7 +65,7 @@ console as the flags are locked.
if (op->flags & F_VCONSOLE) { if (op->flags & F_VCONSOLE) {
#if defined(IUTF8) && defined(KDGKBMODE) #if defined(IUTF8) && defined(KDGKBMODE)
@@ -1154,9 +1175,6 @@ @@ -1154,9 +1175,6 @@ static void termio_init(struct options *
* later on. * later on.
*/ */
@ -75,7 +75,7 @@ console as the flags are locked.
#ifdef IUTF8 #ifdef IUTF8
tp->c_iflag = tp->c_iflag & IUTF8; tp->c_iflag = tp->c_iflag & IUTF8;
if (tp->c_iflag & IUTF8) if (tp->c_iflag & IUTF8)
@@ -1216,8 +1234,11 @@ @@ -1216,8 +1234,11 @@ static void termio_init(struct options *
if (op->flags & F_RTSCTS) if (op->flags & F_RTSCTS)
tp->c_cflag |= CRTSCTS; tp->c_cflag |= CRTSCTS;
#endif #endif
@ -88,7 +88,7 @@ console as the flags are locked.
/* Go to blocking input even in local mode. */ /* Go to blocking input even in local mode. */
fcntl(STDIN_FILENO, F_SETFL, fcntl(STDIN_FILENO, F_SETFL,
@@ -1238,6 +1259,10 @@ @@ -1238,6 +1259,10 @@ static void reset_vc(const struct option
if (tcsetattr(STDIN_FILENO, TCSADRAIN, tp)) if (tcsetattr(STDIN_FILENO, TCSADRAIN, tp))
log_warn(_("setting terminal attributes failed: %m")); log_warn(_("setting terminal attributes failed: %m"));