Differences From Artifact [8970481265]:

• File unix/uxpty.c — part of check-in [e86c47be22] at 2013-07-19 12:44:22 on branch trunk — Add a missing error check in pterm's child-process setup. Shouldn't really fail, but might as well be careful. (user: simon size: 30418)

To Artifact [c2636dfa5a]:

• File unix/uxpty.c — part of check-in [04c7a24906] at 2013-07-19 13:10:02 on branch trunk — Centralise calls to fcntl into functions that carefully check the error returns. (user: simon size: 30214)

369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391

    cloexec(pty->master_fd);

    pty->name[FILENAME_MAX-1] = '\0';
    strncpy(pty->name, ptsname(pty->master_fd), FILENAME_MAX-1);
#endif

    {
        /*
         * Set the pty master into non-blocking mode.
         */
        int fl;
	fl = fcntl(pty->master_fd, F_GETFL);
	if (fl != -1 && !(fl & O_NONBLOCK))
	    fcntl(pty->master_fd, F_SETFL, fl | O_NONBLOCK);
    }

    if (!ptys_by_fd)
	ptys_by_fd = newtree234(pty_compare_by_fd);
    add234(ptys_by_fd, pty);
}

/*

<
<
<
<
<
|
<
<
<

369
370
371
372
373
374
375





376



377
378
379
380
381
382
383

    cloexec(pty->master_fd);

    pty->name[FILENAME_MAX-1] = '\0';
    strncpy(pty->name, ptsname(pty->master_fd), FILENAME_MAX-1);
#endif






    nonblock(pty->master_fd);




    if (!ptys_by_fd)
	ptys_by_fd = newtree234(pty_compare_by_fd);
    add234(ptys_by_fd, pty);
}

/*