Added Solaris-specific variables

[ppp.git] / pppd / utils.c

diff --git a/pppd/utils.c b/pppd/utils.c
index 0b1292d29df1f1fd258df1fefaea66c79c264ab3..307fb56affd7f0da90045fae7b05681f3d466904 100644 (file)
--- a/pppd/utils.c
+++ b/pppd/utils.c
@@ -16,9 +16,8 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
-#ifndef lint
-static char rcsid[] = "$Id: utils.c,v 1.4 1999/05/12 06:15:33 paulus Exp $";
-#endif
+
+#define RCSID  "$Id: utils.c,v 1.9 1999/09/08 01:13:46 masputra Exp $"
 
 #include <stdio.h>
 #include <ctype.h>
@@ -41,11 +40,13 @@ static char rcsid[] = "$Id: utils.c,v 1.4 1999/05/12 06:15:33 paulus Exp $";
 #include <sys/socket.h>
 #include <netinet/in.h>
 #ifdef SVR4
-#include <sys/sysmacros.h>
+#include <sys/mkdev.h>
 #endif
 
 #include "pppd.h"
 
+static const char rcsid[] = RCSID;
+
 #if defined(SUNOS4)
 extern char *strerror();
 #endif
@@ -114,7 +115,7 @@ slprintf __V((char *buf, int buflen, char *fmt, ...))
     va_list args;
     int n;
 
-#if __STDC__
+#if defined(__STDC__)
     va_start(args, fmt);
 #else
     char *buf;
@@ -171,7 +172,8 @@ vslprintf(buf, buflen, fmt, args)
        if (*fmt == 0)
            break;
        c = *++fmt;
-       width = prec = 0;
+       width = 0;
+       prec = -1;
        fillch = ' ';
        if (c == '0') {
            fillch = '0';
@@ -192,6 +194,7 @@ vslprintf(buf, buflen, fmt, args)
                prec = va_arg(args, int);
                c = *++fmt;
            } else {
+               prec = 0;
                while (isdigit(c)) {
                    prec = prec * 10 + c - '0';
                    c = *++fmt;
@@ -265,11 +268,11 @@ vslprintf(buf, buflen, fmt, args)
        case 'q':               /* quoted string */
            quoted = c == 'q';
            p = va_arg(args, unsigned char *);
-           if (fillch == '0' && prec > 0) {
+           if (fillch == '0' && prec >= 0) {
                n = prec;
            } else {
                n = strlen((char *)p);
-               if (prec > 0 && prec < n)
+               if (prec >= 0 && n > prec)
                    n = prec;
            }
            while (n > 0 && buflen > 0) {
@@ -354,7 +357,7 @@ vslprintf(buf, buflen, fmt, args)
            len = num + sizeof(num) - 1 - str;
        } else {
            len = strlen(str);
-           if (prec > 0 && len > prec)
+           if (prec >= 0 && len > prec)
                len = prec;
        }
        if (width > 0) {
@@ -386,7 +389,7 @@ vslp_printer __V((void *arg, char *fmt, ...))
     va_list pvar;
     struct buffer_info *bi;
 
-#if __STDC__
+#if defined(__STDC__)
     va_start(pvar, fmt);
 #else
     void *arg;
@@ -482,7 +485,7 @@ pr_log __V((void *arg, char *fmt, ...))
     va_list pvar;
     char buf[256];
 
-#if __STDC__
+#if defined(__STDC__)
     va_start(pvar, fmt);
 #else
     void *arg;
@@ -572,7 +575,7 @@ fatal __V((char *fmt, ...))
 {
     va_list pvar;
 
-#if __STDC__
+#if defined(__STDC__)
     va_start(pvar, fmt);
 #else
     char *fmt;
@@ -594,7 +597,7 @@ error __V((char *fmt, ...))
 {
     va_list pvar;
 
-#if __STDC__
+#if defined(__STDC__)
     va_start(pvar, fmt);
 #else
     char *fmt;
@@ -614,7 +617,7 @@ warn __V((char *fmt, ...))
 {
     va_list pvar;
 
-#if __STDC__
+#if defined(__STDC__)
     va_start(pvar, fmt);
 #else
     char *fmt;
@@ -634,7 +637,7 @@ notice __V((char *fmt, ...))
 {
     va_list pvar;
 
-#if __STDC__
+#if defined(__STDC__)
     va_start(pvar, fmt);
 #else
     char *fmt;
@@ -654,7 +657,7 @@ info __V((char *fmt, ...))
 {
     va_list pvar;
 
-#if __STDC__
+#if defined(__STDC__)
     va_start(pvar, fmt);
 #else
     char *fmt;
@@ -674,7 +677,7 @@ dbglog __V((char *fmt, ...))
 {
     va_list pvar;
 
-#if __STDC__
+#if defined(__STDC__)
     va_start(pvar, fmt);
 #else
     char *fmt;