summaryrefslogtreecommitdiffstats
path: root/usr.sbin/ppp/modem.c
diff options
context:
space:
mode:
authorbrian <brian@FreeBSD.org>1997-05-29 02:29:13 +0000
committerbrian <brian@FreeBSD.org>1997-05-29 02:29:13 +0000
commitba44f8b683fc712aaa6e6d1d27e47582779ffd67 (patch)
treef9d14336b72bbcc6d9a1b824a28795119e7acd9f /usr.sbin/ppp/modem.c
parentcb12eb9f1da3c4f679d96f98608d78b490066b0a (diff)
downloadFreeBSD-src-ba44f8b683fc712aaa6e6d1d27e47582779ffd67.zip
FreeBSD-src-ba44f8b683fc712aaa6e6d1d27e47582779ffd67.tar.gz
Correct the return of DialModem()
Suggested by: kfurge <kfurge@worldnet.att.net>
Diffstat (limited to 'usr.sbin/ppp/modem.c')
-rw-r--r--usr.sbin/ppp/modem.c19
1 files changed, 8 insertions, 11 deletions
diff --git a/usr.sbin/ppp/modem.c b/usr.sbin/ppp/modem.c
index 7568e2a..e4cbecd 100644
--- a/usr.sbin/ppp/modem.c
+++ b/usr.sbin/ppp/modem.c
@@ -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.39 1997/05/24 17:32:41 brian Exp $
+ * $Id: modem.c,v 1.40 1997/05/26 00:44:06 brian Exp $
*
* TODO:
*/
@@ -755,7 +755,7 @@ int
DialModem()
{
char ScriptBuffer[200];
- int excode = 0;
+ int excode;
strncpy(ScriptBuffer, VarDialScript,sizeof(ScriptBuffer)-1);
ScriptBuffer[sizeof(ScriptBuffer)-1] = '\0';
@@ -766,20 +766,17 @@ DialModem()
if (DoChat(ScriptBuffer) > 0) {
if ((mode & (MODE_INTER|MODE_AUTO)) == MODE_INTER)
fprintf(stderr, "login OK!\n");
- return(1);
- } else {
- if ((mode & (MODE_INTER|MODE_AUTO)) == MODE_INTER) {
- fprintf(stderr, "login failed.\n");
- excode = EX_NOLOGIN;
- }
+ return EX_DONE;
}
+ if ((mode & (MODE_INTER|MODE_AUTO)) == MODE_INTER)
+ fprintf(stderr, "login failed.\n");
ModemTimeout(); /* Dummy call to check modem status */
+ excode = EX_NOLOGIN;
}
else {
- if ((mode & (MODE_INTER|MODE_AUTO)) == MODE_INTER) {
+ if ((mode & (MODE_INTER|MODE_AUTO)) == MODE_INTER)
fprintf(stderr, "dial failed.\n");
- excode = EX_NODIAL;
- }
+ excode = EX_NODIAL;
}
HangupModem(0);
return(excode);
OpenPOWER on IntegriCloud