mirrors/ppp
0
0
Fork 0
mirror of https://github.com/paulusmack/ppp.git synced 2024-11-26 21:15:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

pppd: Fix printing 64-bit counters (#528)

Browse Source 
Add support of format specifiers %lld and %llu to the function vslprintf
and use the correct specifiers for printing 64-bit counters.

Signed-off-by: Tomas Paukrt <tomaspaukrt@email.cz>
This commit is contained in:
Tomas Paukrt 2024-10-29 06:40:55 +01:00 committed by GitHub
parent 346125f375
commit f7120b5cea
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pppd/main.c
View File

@ -1332,7 +1332,7 @@ print_link_stats(void)
if (link_stats_print && link_stats_valid) {
int t = (link_connect_time + 5) / 6; /* 1/10ths of minutes */
info("Connect time %d.%d minutes.", t/10, t%10);
info("Sent %u bytes, received %u bytes.",
info("Sent %llu bytes, received %llu bytes.",
link_stats.bytes_out, link_stats.bytes_in);
link_stats_print = 0;
}

28
pppd/utils.c
View File

@ -142,8 +142,8 @@ vslprintf(char *buf, int buflen, const char *fmt, va_list args)
int c, i, n;
int width, prec, fillch;
int base, len, neg, quoted;
long lval = 0;
unsigned long val = 0;
long long lval = 0;
unsigned long long val = 0;
char *str, *buf0;
const char *f;
unsigned char *p;
@ -208,6 +208,30 @@ vslprintf(char *buf, int buflen, const char *fmt, va_list args)
case 'l':
c = *fmt++;
switch (c) {
case 'l':
c = *fmt++;
switch (c) {
case 'd':
lval = va_arg(args, long long);
if (lval < 0) {
neg = 1;
val = -lval;
} else
val = lval;
base = 10;
break;
case 'u':
val = va_arg(args, unsigned long long);
base = 10;
break;
default:
OUTCHAR('%');
OUTCHAR('l');
OUTCHAR('l');
--fmt; /* so %llz outputs %llz etc. */
continue;
}
break;
case 'd':
lval = va_arg(args, long);
if (lval < 0) {