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.137 by root, Wed Jan 11 00:59:58 2006 UTC vs.
Revision 1.139 by root, Wed Jan 11 03:13:26 2006 UTC

349 349
350 get_options (r_argc, r_argv); 350 get_options (r_argc, r_argv);
351 351
352 if (!(display = displays.get (rs[Rs_display_name]))) 352 if (!(display = displays.get (rs[Rs_display_name])))
353 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 353 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
354
355 extract_resources ();
354 } 356 }
355 357
356 extract_resources ();
357 free (r_argv); 358 free (r_argv);
358 359
359 /* 360 /*
360 * set any defaults not already set 361 * set any defaults not already set
361 */ 362 */
1412 * the slave. 1413 * the slave.
1413 */ 1414 */
1414void 1415void
1415rxvt_term::run_command (const char *const *argv) 1416rxvt_term::run_command (const char *const *argv)
1416{ 1417{
1418 TEMP_ENV; // not very temporary...
1419
1417#if ENABLE_FRILLS 1420#if ENABLE_FRILLS
1418 if (rs[Rs_pty_fd]) 1421 if (rs[Rs_pty_fd])
1419 { 1422 {
1420 pty.pty = atoi (rs[Rs_pty_fd]); 1423 pty.pty = atoi (rs[Rs_pty_fd]);
1421 1424
1532 */ 1535 */
1533int 1536int
1534rxvt_term::run_child (const char *const *argv) 1537rxvt_term::run_child (const char *const *argv)
1535{ 1538{
1536 char *login; 1539 char *login;
1537
1538 TEMP_ENV; // not very temporary...
1539 1540
1540 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */ 1541 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1541 1542
1542 if (OPTION (Opt_console)) 1543 if (OPTION (Opt_console))
1543 { /* be virtual console, fail silently */ 1544 { /* be virtual console, fail silently */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines