ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/init.C
(Generate patch)

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.125 by root, Wed Dec 21 19:50:16 2005 UTC vs.
Revision 1.127 by root, Fri Dec 23 14:46:34 2005 UTC

371 if (!rs[Rs_iconName]) 371 if (!rs[Rs_iconName])
372 rs[Rs_iconName] = rs[Rs_name]; 372 rs[Rs_iconName] = rs[Rs_name];
373 } 373 }
374 374
375 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 375 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
376 saveLines = min (i, std::numeric_limits<int16_t>::max ()); 376 saveLines = min (i, MAX_SAVELINES);
377 377
378#if ENABLE_FRILLS 378#if ENABLE_FRILLS
379 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0) 379 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0)
380 int_bwidth = min (i, std::numeric_limits<int16_t>::max ()); 380 int_bwidth = min (i, std::numeric_limits<int16_t>::max ());
381 381
1197 /* 1197 /*
1198 * standard System V termios interface 1198 * standard System V termios interface
1199 */ 1199 */
1200 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1200 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1201 { 1201 {
1202 /* return error - use system defaults */ 1202 // return error - use system defaults,
1203 // where possible, and zero elsewhere
1204 memset (tio, 0, sizeof (ttymode_t));
1205
1203 tio->c_cc[VINTR] = CINTR; 1206 tio->c_cc[VINTR] = CINTR;
1204 tio->c_cc[VQUIT] = CQUIT; 1207 tio->c_cc[VQUIT] = CQUIT;
1205 tio->c_cc[VERASE] = CERASE; 1208 tio->c_cc[VERASE] = CERASE;
1209#ifdef VERASE2
1210 tio->c_cc[VERASE2] = CERASE2;
1211#endif
1206 tio->c_cc[VKILL] = CKILL; 1212 tio->c_cc[VKILL] = CKILL;
1207 tio->c_cc[VSTART] = CSTART; 1213 tio->c_cc[VSTART] = CSTART;
1208 tio->c_cc[VSTOP] = CSTOP; 1214 tio->c_cc[VSTOP] = CSTOP;
1209 tio->c_cc[VSUSP] = CSUSP; 1215 tio->c_cc[VSUSP] = CSUSP;
1210# ifdef VDSUSP 1216# ifdef VDSUSP
1404{ 1410{
1405#if ENABLE_FRILLS 1411#if ENABLE_FRILLS
1406 if (rs[Rs_pty_fd]) 1412 if (rs[Rs_pty_fd])
1407 { 1413 {
1408 pty.pty = atoi (rs[Rs_pty_fd]); 1414 pty.pty = atoi (rs[Rs_pty_fd]);
1415
1416 if (getfd_hook)
1417 pty.pty = (*getfd_hook) (pty.pty);
1418
1409 fcntl (pty.pty, F_SETFL, O_NONBLOCK); 1419 if (pty.pty < 0 || fcntl (pty.pty, F_SETFL, O_NONBLOCK))
1420 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1410 } 1421 }
1411 else 1422 else
1412#endif 1423#endif
1413 if (!pty.get ()) 1424 if (!pty.get ())
1414 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1425 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines