diff options
| author |   krw <krw@openbsd.org> | 2011-04-21 02:44:15 +0000 |
|---|---|---|
| committer | krw <krw@openbsd.org> | 2011-04-21 02:44:15 +0000 |
| commit | 1c85f8b32e40b2b1b4e74ffb47fbfc44f8590ec8 (patch) | |
| tree | abbb3f9b4a42bc6d6663b9eb304d4a318e5a235f | |
| parent | ahci asks atascsi to reserve a ccb to use for error handling, but then (diff) | |
| download | wireguard-openbsd-1c85f8b32e40b2b1b4e74ffb47fbfc44f8590ec8.tar.xz wireguard-openbsd-1c85f8b32e40b2b1b4e74ffb47fbfc44f8590ec8.zip | |
Fix more long vs 64bit type mismatches. Now 4GB i386 <-> macppc
transfers work for Richard Toohey.
| -rw-r--r-- | usr.bin/rdist/docmd.c | 6 | ||||
| -rw-r--r-- | usr.bin/rdist/rdist.c | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/usr.bin/rdist/docmd.c b/usr.bin/rdist/docmd.c index c24ba7b85b9..fb14ded7830 100644 --- a/usr.bin/rdist/docmd.c +++ b/usr.bin/rdist/docmd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: docmd.c,v 1.23 2011/04/18 22:18:30 krw Exp $ */ +/* $OpenBSD: docmd.c,v 1.24 2011/04/21 02:44:15 krw Exp $ */ /* * Copyright (c) 1983 Regents of the University of California. @@ -404,13 +404,13 @@ makeconn(char *rhost) return(0); } if (min_freespace) { - (void) sendcmd(C_SETCONFIG, "%c%d", SC_FREESPACE, + (void) sendcmd(C_SETCONFIG, "%c%lld", SC_FREESPACE, min_freespace); if (response() < 0) return(0); } if (min_freefiles) { - (void) sendcmd(C_SETCONFIG, "%c%d", SC_FREEFILES, + (void) sendcmd(C_SETCONFIG, "%c%lld", SC_FREEFILES, min_freefiles); if (response() < 0) return(0); diff --git a/usr.bin/rdist/rdist.c b/usr.bin/rdist/rdist.c index 9deb307e37f..96fc5aa2f95 100644 --- a/usr.bin/rdist/rdist.c +++ b/usr.bin/rdist/rdist.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rdist.c,v 1.20 2011/04/10 15:47:28 krw Exp $ */ +/* $OpenBSD: rdist.c,v 1.21 2011/04/21 02:44:15 krw Exp $ */ /* * Copyright (c) 1983 Regents of the University of California. @@ -42,8 +42,8 @@ char *distfile = NULL; /* Name of distfile to use */ int maxchildren = MAXCHILDREN; /* Max no of concurrent PIDs */ int nflag = 0; /* Say without doing */ -long min_freespace = 0; /* Min filesys free space */ -long min_freefiles = 0; /* Min filesys free # files */ +int64_t min_freespace = 0; /* Min filesys free space */ +int64_t min_freefiles = 0; /* Min filesys free # files */ FILE *fin = NULL; /* Input file pointer */ char localmsglist[] = "stdout=all:notify=all:syslog=nerror,ferror"; char *remotemsglist = NULL; @@ -169,7 +169,7 @@ main(int argc, char **argv, char **envp) "'%s'", errstr, optarg); } else if (c == 'A') { - min_freefiles = (u_int64_t)strtonum(optarg, + min_freefiles = (int64_t)strtonum(optarg, 0, LLONG_MAX, &errstr); if (errstr) fatalerr("Minimum free files is %s: " |