Update ppp_available and the no_ppp_msg message

[ppp.git] / pppd / utils.c

diff --git a/pppd/utils.c b/pppd/utils.c
index fb2c6aa20b05af1cfb9be9c27b3d8f3520c87a55..062b17e4a8db64cc11e42c43ffe184219f313f51 100644 (file)
--- a/pppd/utils.c
+++ b/pppd/utils.c
@@ -10,16 +10,11 @@
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. The name(s) of the authors of this software must not be used to
+ * 2. The name(s) of the authors of this software must not be used to
  *    endorse or promote products derived from this software without
  *    prior written permission.
  *
- * 4. Redistributions of any form whatsoever must retain the following
+ * 3. Redistributions of any form whatsoever must retain the following
  *    acknowledgment:
  *    "This product includes software developed by Paul Mackerras
  *     <paulus@samba.org>".
@@ -33,7 +28,7 @@
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#define RCSID  "$Id: utils.c,v 1.21 2003/03/30 08:26:56 paulus Exp $"
+#define RCSID  "$Id: utils.c,v 1.25 2008/06/03 12:06:37 paulus Exp $"
 
 #include <stdio.h>
 #include <ctype.h>
@@ -123,7 +118,7 @@ strlcat(dest, src, len)
 /*
  * slprintf - format a message into a buffer.  Like sprintf except we
  * also specify the length of the output buffer, and we handle
- * %r (recursive format), %m (error message), %v (visible string),
+ * %m (error message), %v (visible string),
  * %q (quoted string), %t (current time) and %I (IP address) formats.
  * Doesn't do floating-point formats.
  * Returns the number of chars put into buf.
@@ -241,8 +236,8 @@ vslprintf(buf, buflen, fmt, args)
                base = 10;
                break;
            default:
-               *buf++ = '%'; --buflen;
-               *buf++ = 'l'; --buflen;
+               OUTCHAR('%');
+               OUTCHAR('l');
                --fmt;          /* so %lz outputs %lz etc. */
                continue;
            }
@@ -292,6 +287,7 @@ vslprintf(buf, buflen, fmt, args)
                     (ip >> 16) & 0xff, (ip >> 8) & 0xff, ip & 0xff);
            str = num;
            break;
+#if 0  /* not used, and breaks on S/390, apparently */
        case 'r':
            f = va_arg(args, char *);
 #ifndef __powerpc__
@@ -303,6 +299,7 @@ vslprintf(buf, buflen, fmt, args)
            buf += n;
            buflen -= n;
            continue;
+#endif
        case 't':
            time(&t);
            str = ctime(&t);
@@ -530,7 +527,7 @@ static int llevel;          /* level for logging */
 
 void
 init_pr_log(prefix, level)
-     char *prefix;
+     const char *prefix;
      int level;
 {
        linep = line;
@@ -720,6 +717,7 @@ error __V((char *fmt, ...))
 
     logit(LOG_ERR, fmt, pvar);
     va_end(pvar);
+    ++error_count;
 }
 
 /*