Fixed compilation failure on Solaris due to new CHAP (missing chap-md5.o

[ppp.git] / chat / chat.c

diff --git a/chat/chat.c b/chat/chat.c
index 47248fa65c3d2897c293c2079f227a42a7152ac8..dc6cf2e3dea8a6fc75f5a4f1f66a40543dd475f2 100644 (file)
--- a/chat/chat.c
+++ b/chat/chat.c
@@ -87,7 +87,7 @@
 #endif
 
 #ifndef lint
-static const char rcsid[] = "$Id: chat.c,v 1.29 2003/03/04 06:17:21 fcusack Exp $";
+static const char rcsid[] = "$Id: chat.c,v 1.30 2004/01/17 05:47:55 carlsonj Exp $";
 #endif
 
 #include <stdio.h>
@@ -213,7 +213,7 @@ void *dup_mem __P((void *b, size_t c));
 void *copy_of __P((char *s));
 char *grow __P((char *s, char **p, size_t len));
 void usage __P((void));
-void logf __P((const char *fmt, ...));
+void msgf __P((const char *fmt, ...));
 void fatal __P((int code, const char *fmt, ...));
 SIGTYPE sigalrm __P((int signo));
 SIGTYPE sigint __P((int signo));
@@ -495,7 +495,7 @@ char line[1024];
 /*
  * Send a message to syslog and/or stderr.
  */
-void logf __V((const char *fmt, ...))
+void msgf __V((const char *fmt, ...))
 {
     va_list args;
 
@@ -558,7 +558,7 @@ int signo;
        fatal(2, "Can't set file mode flags on stdin: %m");
 
     if (verbose)
-       logf("alarm");
+       msgf("alarm");
 }
 
 void unalarm()
@@ -1001,9 +1001,9 @@ char *s;
  * The expectation did not occur. This is terminal.
  */
     if (fail_reason)
-       logf("Failed (%s)", fail_reason);
+       msgf("Failed (%s)", fail_reason);
     else
-       logf("Failed");
+       msgf("Failed");
     terminate(exit_code);
 }
 
@@ -1079,7 +1079,7 @@ register char *s;
        abort_string[n_aborts++] = s1;
 
        if (verbose)
-           logf("abort on (%v)", s);
+           msgf("abort on (%v)", s);
        return;
     }
 
@@ -1105,7 +1105,7 @@ register char *s;
                pack++;
                n_aborts--;
                if (verbose)
-                   logf("clear abort on (%v)", s);
+                   msgf("clear abort on (%v)", s);
            }
        }
         free(s1);
@@ -1129,7 +1129,7 @@ register char *s;
        report_string[n_reports++] = s1;
        
        if (verbose)
-           logf("report (%v)", s);
+           msgf("report (%v)", s);
        return;
     }
 
@@ -1155,7 +1155,7 @@ register char *s;
                pack++;
                n_reports--;
                if (verbose)
-                   logf("clear report (%v)", s);
+                   msgf("clear report (%v)", s);
            }
        }
         free(s1);
@@ -1173,7 +1173,7 @@ register char *s;
            timeout = DEFAULT_CHAT_TIMEOUT;
 
        if (verbose)
-           logf("timeout set to %d seconds", timeout);
+           msgf("timeout set to %d seconds", timeout);
 
        return;
     }
@@ -1236,7 +1236,7 @@ int get_char()
        return ((int)c & 0x7F);
 
     default:
-       logf("warning: read() on stdin returned %d", status);
+       msgf("warning: read() on stdin returned %d", status);
 
     case -1:
        if ((status = fcntl(0, F_GETFL, 0)) == -1)
@@ -1264,7 +1264,7 @@ int c;
        return (0);
        
     default:
-       logf("warning: write() on stdout returned %d", status);
+       msgf("warning: write() on stdout returned %d", status);
        
     case -1:
        if ((status = fcntl(0, F_GETFL, 0)) == -1)
@@ -1286,9 +1286,9 @@ int c;
 
        if (verbose) {
            if (errno == EINTR || errno == EWOULDBLOCK)
-               logf(" -- write timed out");
+               msgf(" -- write timed out");
            else
-               logf(" -- write failed: %m");
+               msgf(" -- write failed: %m");
        }
        return (0);
     }
@@ -1303,9 +1303,9 @@ register char *s;
 
     if (verbose) {
        if (quiet)
-           logf("send (??????)");
+           msgf("send (??????)");
        else
-           logf("send (%v)", s);
+           msgf("send (%v)", s);
     }
 
     alarm(timeout); alarmed = 0;
@@ -1392,17 +1392,17 @@ register char *string;
     minlen = (len > sizeof(fail_buffer)? len: sizeof(fail_buffer)) - 1;
 
     if (verbose)
-       logf("expect (%v)", string);
+       msgf("expect (%v)", string);
 
     if (len > STR_LEN) {
-       logf("expect string is too long");
+       msgf("expect string is too long");
        exit_code = 1;
        return 0;
     }
 
     if (len == 0) {
        if (verbose)
-           logf("got it");
+           msgf("got it");
        return (1);
     }
 
@@ -1416,16 +1416,16 @@ register char *string;
            echo_stderr(c);
        if (verbose && c == '\n') {
            if (s == logged)
-               logf("");       /* blank line */
+               msgf("");       /* blank line */
            else
-               logf("%0.*v", s - logged, logged);
+               msgf("%0.*v", s - logged, logged);
            logged = s + 1;
        }
 
        *s++ = c;
 
        if (verbose && s >= logged + 80) {
-           logf("%0.*v", s - logged, logged);
+           msgf("%0.*v", s - logged, logged);
            logged = s;
        }
 
@@ -1470,8 +1470,8 @@ register char *string;
            strncmp(s - len, string, len) == 0) {
            if (verbose) {
                if (s > logged)
-                   logf("%0.*v", s - logged, logged);
-               logf(" -- got it\n");
+                   msgf("%0.*v", s - logged, logged);
+               msgf(" -- got it\n");
            }
 
            alarm(0);
@@ -1484,8 +1484,8 @@ register char *string;
                strncmp(s - abort_len, abort_string[n], abort_len) == 0) {
                if (verbose) {
                    if (s > logged)
-                       logf("%0.*v", s - logged, logged);
-                   logf(" -- failed");
+                       msgf("%0.*v", s - logged, logged);
+                   msgf(" -- failed");
                }
 
                alarm(0);
@@ -1499,7 +1499,7 @@ register char *string;
        if (s >= end) {
            if (logged < s - minlen) {
                if (verbose)
-                   logf("%0.*v", s - logged, logged);
+                   msgf("%0.*v", s - logged, logged);
                logged = s;
            }
            s -= minlen;
@@ -1509,16 +1509,16 @@ register char *string;
        }
 
        if (alarmed && verbose)
-           logf("warning: alarm synchronization problem");
+           msgf("warning: alarm synchronization problem");
     }
 
     alarm(0);
     
     if (verbose && printed) {
        if (alarmed)
-           logf(" -- read timed out");
+           msgf(" -- read timed out");
        else
-           logf(" -- read failed: %m");
+           msgf(" -- read failed: %m");
     }
 
     exit_code = 3;