d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Detect failure open condition for direct mode now

Browse Source 
Don't assume that modem descriptor must be >=3 in CloseModem,
just assume it is any valid descriptor >=0
This commit is contained in:
Andrey A. Chernov 1997-03-10 06:54:58 +00:00
parent 51e053d6cc
commit 87e63218ab
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
usr.sbin/ppp/modem.c
View File

@ -17,7 +17,7 @@
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
* WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
* $Id: modem.c,v 1.29 1997/02/22 16:10:36 peter Exp $
* $Id: modem.c,v 1.30 1997/03/10 06:21:02 ache Exp $
*
* TODO:
*/
@ -380,8 +380,14 @@ int mode;
mbits = 0;
if (mode & MODE_DIRECT) {
if (isatty(0))
if (isatty(0)) {
modem = open(ctermid(NULL), O_RDWR|O_NONBLOCK);
if (modem < 0) {
LogPrintf(LOG_PHASE_BIT, "Open Failed %s\n", ctermid(NULL));
return(modem);
}
} else if (modem < 0)
return(modem);
} else if (modem < 0) {
if (strncmp(VarDevice, "/dev", 4) == 0) {
strncpy(uucplock, rindex(VarDevice, '/')+1,sizeof(uucplock)-1);
@ -609,7 +615,7 @@ int flag;
void
CloseModem()
{
if (modem >= 3)
if (modem >= 0)
{
close(modem);
modem = -1;