]>
Commit | Line | Data |
---|---|---|
9355e2a1 JB |
1 | --- screen-4.6.1/doc/screen.1.orig 2017-07-12 19:34:02.890716565 +0200 |
2 | +++ screen-4.6.1/doc/screen.1 2017-07-12 19:34:56.057382623 +0200 | |
3 | @@ -1226,7 +1226,7 @@ | |
46dabc15 PG |
4 | .PP |
5 | Change the filename used for reading and writing with the paste buffer. | |
6 | If the optional argument to the \*Qbufferfile\*U command is omitted, | |
ef2adeff JB |
7 | -the default setting (\*Q/tmp/screen\-exchange\*U) is reactivated. |
8 | +the default setting (\*Q$HOME/.screen\-exchange\*U) is reactivated. | |
46dabc15 PG |
9 | The following example will paste the system's password file into |
10 | the | |
11 | .I screen | |
9355e2a1 JB |
12 | @@ -1540,7 +1540,7 @@ |
13 | \fBA\fP toggles in append mode and sets a (second) mark. | |
14 | .PP | |
46dabc15 | 15 | \fB>\fP sets the (second) mark and writes the contents of the paste buffer to |
ef2adeff JB |
16 | -the screen-exchange file (/tmp/screen\-exchange per default) once copy-mode is |
17 | +the screen-exchange file ($HOME/.screen\-exchange per default) once copy-mode is | |
46dabc15 | 18 | finished. |
9355e2a1 | 19 | .PP |
46dabc15 | 20 | This example demonstrates how to dump the whole scrollback buffer |
9355e2a1 | 21 | @@ -3651,7 +3651,7 @@ |
46dabc15 PG |
22 | users on the same host. If an encoding is specified the paste buffer |
23 | is recoded on the fly to match the encoding. | |
24 | The filename can be set with the \fIbufferfile\fP | |
ef2adeff JB |
25 | -command and defaults to \*Q/tmp/screen\-exchange\*U. |
26 | +command and defaults to \*Q$HOME/.screen\-exchange\*U. | |
9355e2a1 JB |
27 | .RE |
28 | .TP | |
46dabc15 | 29 | .BR "writelock " [ on | "off\fR|\fBauto\fR]" |
9355e2a1 | 30 | @@ -5030,7 +5030,7 @@ |
46dabc15 | 31 | Written by the "termcap" output function |
ef2adeff | 32 | .IP /tmp/screens/screen\-exchange |
46dabc15 | 33 | or |
ef2adeff JB |
34 | -.IP /tmp/screen\-exchange |
35 | +.IP $HOME/.screen\-exchange | |
46dabc15 PG |
36 | .I screen |
37 | `interprocess communication buffer' | |
38 | .IP hardcopy.[0-9] | |
39 | --- ./doc/screen.texinfo.org Wed Jun 19 13:36:55 2002 | |
40 | +++ ./doc/screen.texinfo Wed Jun 19 13:49:42 2002 | |
41 | @@ -3000,7 +3000,7 @@ | |
42 | ||
43 | @noindent | |
44 | @kbd{>} sets the (second) mark and writes the contents of the paste buffer | |
45 | -to the screen-exchange file (@file{/tmp/screen-exchange} per default) | |
46 | +to the screen-exchange file (@file{$HOME/.screen-exchange} per default) | |
47 | once copy-mode is finished. @xref{Screen Exchange}.@* | |
48 | This example demonstrates how to dump the | |
49 | whole scrollback buffer to that file: @*@kbd{C-a [ g SPACE G $ >}. | |
50 | @@ -3124,7 +3124,7 @@ | |
51 | (none)@* | |
52 | Change the filename used for reading and writing with the paste buffer. | |
53 | If the @var{exchange-file} parameter is omitted, @code{screen} reverts | |
54 | -to the default of @file{/tmp/screen-exchange}. The following example | |
55 | +to the default of @file{$HOME/.screen-exchange}. The following example | |
56 | will paste the system's password file into the screen window (using the | |
57 | paste buffer, where a copy remains): | |
58 | ||
59 | @@ -4843,7 +4843,7 @@ | |
60 | Written by the @code{dumptermcap} command | |
61 | ||
62 | @item /usr/tmp/screens/screen-exchange or | |
63 | -@itemx /tmp/screen-exchange | |
64 | +@itemx $HOME/.screen-exchange | |
65 | @code{screen} interprocess communication buffer | |
66 | ||
67 | @item hardcopy.[0-9] | |
68 | --- ./etc/etcscreenrc.org Sat Apr 28 17:25:34 2001 | |
69 | +++ ./etc/etcscreenrc Wed Jun 19 13:51:34 2002 | |
70 | @@ -1,6 +1,6 @@ | |
71 | # | |
72 | # This is an example for the global screenrc file. | |
73 | -# You may want to install this file as /usr/local/etc/screenrc. | |
74 | +# You may want to install this file as /etc/screenrc. | |
75 | # Check config.h for the exact location. | |
76 | # | |
77 | # Flaws of termcap and standard settings are done here. | |
78 | @@ -92,3 +92,6 @@ | |
79 | bind 'O' login off | |
80 | bind '}' history | |
81 | ||
82 | +# On Debian GNU/Linux, `<--' (Backspace key) should send char `\177': | |
83 | +bindkey -k kb stuff "\177" | |
84 | + | |
85 | --- ./process.c.org Mon Feb 11 13:30:08 2002 | |
86 | +++ ./process.c Wed Jun 19 13:52:22 2002 | |
87 | @@ -2356,7 +2356,7 @@ | |
88 | #ifdef COPY_PASTE | |
89 | case RC_BUFFERFILE: | |
90 | if (*args == 0) | |
91 | - BufferFile = SaveStr(DEFAULT_BUFFERFILE); | |
92 | + BufferFile = SaveStr(bufferfile); | |
93 | else if (ParseSaveStr(act, &BufferFile)) | |
94 | break; | |
95 | if (msgok) | |
c3c32d9c ER |
96 | --- screen-4.5.0/screen.c~ 2017-01-19 11:46:42.000000000 +0200 |
97 | +++ screen-4.5.0/screen.c 2017-01-19 11:47:53.835503179 +0200 | |
46dabc15 PG |
98 | @@ -109,6 +109,7 @@ |
99 | FILE *dfp; | |
100 | #endif | |
101 | ||
102 | +char bufferfile[MAXPATHLEN]; | |
103 | ||
104 | extern char Term[], screenterm[], **environ, Termcap[]; | |
105 | int force_vt = 1; | |
106 | @@ -271,7 +272,7 @@ | |
107 | char *name; | |
108 | struct passwd *ppp; | |
109 | { | |
110 | - int n; | |
111 | + int n, len; | |
112 | #ifdef SHADOWPW | |
113 | struct spwd *sss = NULL; | |
114 | static char *spw = NULL; | |
c3c32d9c | 115 | @@ -303,11 +303,16 @@ |
46dabc15 PG |
116 | pw_try_again: |
117 | #endif | |
118 | n = 0; | |
119 | + len = 13; | |
d51ebebf | 120 | if (ppp->pw_passwd[0] == '#' && ppp->pw_passwd[1] == '#' && strcmp(ppp->pw_passwd + 2, ppp->pw_name) == 0) |
46dabc15 | 121 | n = 13; |
c3c32d9c | 122 | - for (; n < 13; n++) { |
46dabc15 | 123 | + else if (!strncmp(ppp->pw_passwd, "$1$", 3)) { /* MD5-based passwords */ |
d51ebebf JB |
124 | + n = 13; |
125 | + len = 34; | |
46dabc15 | 126 | + } |
46910f0d | 127 | + for (; n < len; n++) { |
c3c32d9c ER |
128 | char c = ppp->pw_passwd[n]; |
129 | - if (!(c == '.' || c == '/' || c == '$' || | |
130 | + if (!(c == '.' || c == '/' || (len == 34 && c == '$') || | |
131 | (c >= '0' && c <= '9') || | |
132 | (c >= 'a' && c <= 'z') || | |
133 | (c >= 'A' && c <= 'Z'))) | |
b81ee7b6 | 134 | @@ -479,9 +479,6 @@ |
46dabc15 | 135 | timestring = SaveStr("%c:%s %M %d %H%? %l%?"); |
b81ee7b6 ER |
136 | wlisttit = SaveStr(" Num Name%=Flags"); |
137 | wliststr = SaveStr("%4n %t%=%f"); | |
46dabc15 PG |
138 | -#ifdef COPY_PASTE |
139 | - BufferFile = SaveStr(DEFAULT_BUFFERFILE); | |
140 | -#endif | |
141 | ShellProg = NULL; | |
142 | #ifdef POW_DETACH | |
143 | PowDetachString = 0; | |
144 | @@ -902,6 +905,8 @@ | |
145 | #endif /* DEBUG */ | |
146 | } | |
147 | ||
148 | + snprintf(bufferfile,sizeof(bufferfile),"%s/.screen-exchange", home); | |
149 | + BufferFile = SaveStr(bufferfile); | |
150 | #ifdef _MODE_T | |
151 | oumask = umask(0); /* well, unsigned never fails? jw. */ | |
152 | #else | |
153 | --- ./screen.h.org Tue Jan 8 16:42:45 2002 | |
154 | +++ ./screen.h Wed Jun 19 14:01:15 2002 | |
155 | @@ -44,6 +44,7 @@ | |
156 | #include "layer.h" | |
157 | #include "term.h" | |
158 | ||
159 | +extern char bufferfile[MAXPATHLEN]; | |
160 | ||
161 | #ifdef DEBUG | |
162 | # define STATIC /* a function that the debugger should see */ | |
163 | --- ./window.c.org Tue Jan 8 20:47:31 2002 | |
164 | +++ ./window.c Wed Jun 19 14:03:39 2002 | |
165 | @@ -1549,6 +1549,12 @@ | |
166 | FreePseudowin(w); | |
167 | return -1; | |
168 | } | |
169 | + if (ioctl(w->w_ptyfd, TIOCPKT, (char *)&flag)) | |
170 | + { | |
171 | + Msg(errno, "TIOCPKT ioctl on parent"); | |
172 | + FreePseudowin(w); | |
173 | + return -1; | |
174 | + } | |
175 | } | |
176 | #endif /* TIOCPKT */ | |
177 | ||
178 | @@ -1587,6 +1593,14 @@ | |
179 | w->w_readev.condpos = w->w_readev.condneg = 0; | |
180 | free((char *)pwin); | |
181 | w->w_pwin = NULL; | |
182 | +#ifdef TIOCPKT | |
183 | + { | |
184 | + int flag = 1; | |
185 | + | |
186 | + if (ioctl(w->w_ptyfd, TIOCPKT, (char *)&flag)) | |
187 | + Msg(errno, "TIOCPKT reset on parent failed"); | |
188 | + } | |
189 | +#endif /* TIOCPKT */ | |
190 | } | |
191 | ||
192 | #endif /* PSEUDOS */ |