* 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.10 2000/03/27 01:36:48 paulus Exp $"
#include <stdio.h>
#include <ctype.h>
#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
va_list args;
int n;
-#if __STDC__
+#if defined(__STDC__)
va_start(args, fmt);
#else
char *buf;
if (*fmt == 0)
break;
c = *++fmt;
- width = prec = 0;
+ width = 0;
+ prec = -1;
fillch = ' ';
if (c == '0') {
fillch = '0';
prec = va_arg(args, int);
c = *++fmt;
} else {
+ prec = 0;
while (isdigit(c)) {
prec = prec * 10 + c - '0';
c = *++fmt;
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) {
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) {
va_list pvar;
struct buffer_info *bi;
-#if __STDC__
+#if defined(__STDC__)
va_start(pvar, fmt);
#else
void *arg;
va_list pvar;
char buf[256];
-#if __STDC__
+#if defined(__STDC__)
va_start(pvar, fmt);
#else
void *arg;
va_list args;
{
int n;
- char buf[256];
+ char buf[1024];
n = vslprintf(buf, sizeof(buf), fmt, args);
syslog(level, "%s", buf);
{
va_list pvar;
-#if __STDC__
+#if defined(__STDC__)
va_start(pvar, fmt);
#else
char *fmt;
{
va_list pvar;
-#if __STDC__
+#if defined(__STDC__)
va_start(pvar, fmt);
#else
char *fmt;
{
va_list pvar;
-#if __STDC__
+#if defined(__STDC__)
va_start(pvar, fmt);
#else
char *fmt;
{
va_list pvar;
-#if __STDC__
+#if defined(__STDC__)
va_start(pvar, fmt);
#else
char *fmt;
{
va_list pvar;
-#if __STDC__
+#if defined(__STDC__)
va_start(pvar, fmt);
#else
char *fmt;
{
va_list pvar;
-#if __STDC__
+#if defined(__STDC__)
va_start(pvar, fmt);
#else
char *fmt;