Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix compile on alpha:

Browse Source 
* cast all %qd printfs to (long long) [inspired by billc@warped.net]
* replace sscanf %qd with strtoq() et al
This commit is contained in:
lukem 1997-07-21 14:03:48 +00:00
parent 5e436cd360
commit 609496986e
2 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
usr.bin/ftp/cmds.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: cmds.c,v 1.25 1997/07/20 09:45:38 lukem Exp $ */
/* $NetBSD: cmds.c,v 1.26 1997/07/21 14:03:48 lukem Exp $ */
/*
* Copyright (c) 1985, 1989, 1993, 1994
@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)cmds.c 8.6 (Berkeley) 10/9/94";
#else
__RCSID("$NetBSD: cmds.c,v 1.25 1997/07/20 09:45:38 lukem Exp $");
__RCSID("$NetBSD: cmds.c,v 1.26 1997/07/21 14:03:48 lukem Exp $");
#endif
#endif /* not lint */
@ -1923,7 +1923,7 @@ restart(argc, argv)
else {
restart_point = atol(argv[1]);
printf("Restarting at %qd. Execute get, put or append to"
"initiate transfer\n", restart_point);
"initiate transfer\n", (long long)restart_point);
}
}
@ -2015,7 +2015,7 @@ sizecmd(argc, argv)
}
size = remotesize(argv[1], 1);
if (size != -1)
printf("%s\t%qd\n", argv[1], size);
printf("%s\t%qd\n", argv[1], (long long)size);
code = size;
}

22
usr.bin/ftp/util.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: util.c,v 1.10 1997/07/20 09:46:03 lukem Exp $ */
/* $NetBSD: util.c,v 1.11 1997/07/21 14:03:49 lukem Exp $ */
/*
* Copyright (c) 1985, 1989, 1993, 1994
@ -35,7 +35,7 @@
#include <sys/cdefs.h>
#ifndef lint
__RCSID("$NetBSD: util.c,v 1.10 1997/07/20 09:46:03 lukem Exp $");
__RCSID("$NetBSD: util.c,v 1.11 1997/07/21 14:03:49 lukem Exp $");
#endif /* not lint */
/*
@ -453,9 +453,17 @@ remotesize(file, noisy)
size = -1;
if (debug == 0)
verbose = -1;
if (command("SIZE %s", file) == COMPLETE)
sscanf(reply_string, "%*s %qd", &size);
else if (noisy && debug == 0)
if (command("SIZE %s", file) == COMPLETE) {
char *cp, *ep;
cp = strchr(reply_string, ' ');
if (cp != NULL) {
cp++;
size = strtoq(cp, &ep, 10);
if (*ep != '\0' && !isspace(*ep))
size = -1;
}
} else if (noisy && debug == 0)
puts(reply_string);
verbose = overbose;
return (size);
@ -582,7 +590,7 @@ progressmeter(flag)
abbrevsize >>= 10;
}
snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf),
" %5qd %c%c ", abbrevsize, prefixes[i],
" %5qd %c%c ", (long long)abbrevsize, prefixes[i],
prefixes[i] == ' ' ? ' ' : 'B');
timersub(&now, &lastupdate, &wait);
@ -661,7 +669,7 @@ ptransfer(siginfo)
meg = 1;
(void)snprintf(buf, sizeof(buf),
"%qd byte%s %s in %.2f seconds (%.2f %sB/s)\n",
bytes, bytes == 1 ? "" : "s", direction, elapsed,
(long long)bytes, bytes == 1 ? "" : "s", direction, elapsed,
bs / (1024.0 * (meg ? 1024.0 : 1.0)), meg ? "M" : "K");
if (siginfo && bytes > 0 && elapsed > 0.0 && filesize >= 0
&& bytes + restart_point <= filesize) {