Release v.4.6.1

Bug: 51402

src/ChangeLog

@@ -1,3 +1,9 @@
+Version 4.6.1 (10/07/2017):
+  * Fixes:
+	- problems with starting session in some cases
+	- parallel make install
+	- segfault when querying info on nonUTF locale
+
 Version 4.6.0 (28/06/2017):
   * Update Unicode wide tables to 9.0
   * Support more serial speeds

src/Makefile.in

@@ -82,7 +82,7 @@ screen: $(OFILES)
 	$(CC) -c -I. -I$(srcdir) $(M_CFLAGS) $(CPPFLAGS) $(DEFS) \
 	    $(OPTIONS) $(CFLAGS) $<
 
-install_bin: .version screen
+install_bin: .version screen installdirs
 	-if [ -f $(DESTDIR)$(bindir)/$(SCREEN) ] && [ ! -f $(DESTDIR)$(bindir)/$(SCREEN).old ]; \
 		then mv $(DESTDIR)$(bindir)/$(SCREEN) $(DESTDIR)$(bindir)/$(SCREEN).old; fi
 	$(INSTALL_PROGRAM) screen $(DESTDIR)$(bindir)/$(SCREEN)

src/doc/screen.1

@@ -1,5 +1,5 @@
 .\" vi:set wm=5
-.TH SCREEN 1 "Jun 2017"
+.TH SCREEN 1 "Jul 2017"
 .if n .ds Q \&"
 .if n .ds U \&"
 .if t .ds Q ``

src/doc/screen.texinfo

@@ -7,7 +7,7 @@
 @finalout
 @setchapternewpage odd
 @c %**end of header
-@set version 4.6.0
+@set version 4.6.1
 
 @direntry
 * Screen: (screen).             Full-screen window manager.

src/patchlevel.h

@@ -533,6 +533,6 @@
 #define ORIGIN "GNU"
 #define REV 4
 #define VERS 6
-#define PATCHLEVEL 0
-#define DATE "28-Jun-17"
+#define PATCHLEVEL 1
+#define DATE "10-Jul-17"
 #define STATE ""

src/process.c

@@ -5771,7 +5771,7 @@ ShowInfo()
   if (wp->w_encoding != UTF8)
 #  endif
 # endif
-    if (D_CC0 || (D_CS0 && *D_CS0))
+    if (display && (D_CC0 || (D_CS0 && *D_CS0)))
       {
 	if (wp->w_gr == 2)
 	  {

src/screen.c

@@ -999,6 +999,7 @@ int main(int ac, char** av)
   attach_tty = "";
   if (!detached && !lsflag && !cmdflag && !(dflag && !mflag && !rflag && !xflag) &&
       !(sty && !SockMatch && !mflag && !rflag && !xflag)) {
+    int fl;
 
     /* ttyname implies isatty */
     SetTtyname(true, &st);
@@ -1006,6 +1007,11 @@ int main(int ac, char** av)
     tty_mode = (int)st.st_mode & 0777;
 #endif
 
+    fl = fcntl(0, F_GETFL, 0);
+    if (fl != -1 && (fl & (O_RDWR|O_RDONLY|O_WRONLY)) == O_RDWR)
+      attach_fd = 0;
+
+
     if (attach_fd == -1) {
       if ((n = secopen(attach_tty, O_RDWR | O_NONBLOCK, 0)) < 0)
         Panic(0, "Cannot open your terminal '%s' - please check.", attach_tty);