extern int timint, rtimo, nfils, hcflg, xflg, flow, mdmtyp, network;
extern int oopts, omode, oname, opath, nopush, isguest, xcmdsrc, rcdactive;
extern int rejection, moving, fncact, bye_active, urserver, fatalio;
- extern int protocol, prefixing, filcnt, carrier, fnspath, interrupted;
+ extern int protocol, prefixing, carrier, fnspath, interrupted;
+ extern long filcnt;
extern int recursive, inserver, nzxopts, idletmo, srvidl, xfrint;
extern struct ck_p ptab[];
extern int remfile, rempipe, xferstat, filestatus, wearealike, fackpath;
extern int quiet, tsecs, parity, backgrd, nakstate, atcapu, wslotn, winlo;
extern int wslots, success, xitsta, rprintf, discard, cdtimo, keep, fdispla;
extern int timef, stdinf, rscapu, sendmode, epktflg, epktrcvd, epktsent;
- extern int binary, fncnv;
- extern long speed, ffc, crc16, calibrate, dest;
+ extern int binary, fncnv, dest;
+ extern long speed, crc16;
+ CK_OFF_T calibrate, ffc;
#ifdef COMMENT
extern char *TYPCMD, *DIRCMD, *DIRCM2;
#endif /* COMMENT */
static VOID
wheremsg() {
- extern int quiet, filrej;
- int n;
+ extern int quiet;
+ extern long filrej;
+ long n;
n = filcnt - filrej;
debug(F101,"wheremsg n","",n);
switch (myjob) {
case 's':
if (sfspec) {
- printf(" SENT: (%d files)",n);
+ printf(" SENT: (%ld files)",n);
if (srfspec)
printf(" Last: [%s]",srfspec);
printf(" (%s)\r\n", success ? "OK" : "FAILED");
case 'r':
case 'v':
if (rrfspec) {
- printf(" RCVD: (%d files)",n);
+ printf(" RCVD: (%ld files)",n);
if (rfspec)
printf(" Last: [%s]",rfspec);
printf(" (%s)\r\n", success ? "OK" : "FAILED");
ack(); /* If OK, acknowledge */
#endif /* CK_RESEND */
} else { /* Otherwise */
- extern long fsize;
+ extern CK_OFF_T fsize;
char *r;
r = getreason(iattr.reply.val);
ack1((CHAR *)iattr.reply.val); /* refuse to accept the file */
setflow() {
extern int flow, autoflow, mdmtyp, cxtype, cxflow[];
#ifndef NODIAL
- extern int dialcapas, dialfc;
+ extern int dialfc;
+ extern long dialcapas;
extern MDMINF * modemp[];
MDMINF * p = NULL;
long bits = 0;
Thanks to Mark Wooding (Closes: #660066).
* New patch: 030_fix_dialmessage: fix \v(dialmessage) when dialsta
is unset. Further thanks to Mark Wooding (Closes: #660276).
+ * New patch: 040_fix_types: fix inconsistent type declarations that can
+ cause a bus error on some platforms. Patch from Edward Berner,
+ via upstream.
* New patch: 900_ck_patch: set ck_patch as we have modified source.
* Fix pending l10n issues. Debconf translations:
+ Dutch; (Thanks to Jeroen Schot). Closes: #660843
* Update Homepage: to new kermitproject.org site (Closes: #666516).
Thanks to Anders Andersson.
- -- Ian Beckwith <ianb@debian.org> Wed, 09 May 2012 02:25:15 +0100
+ -- Ian Beckwith <ianb@debian.org> Wed, 09 May 2012 05:42:35 +0100
ckermit (302-1) unstable; urgency=low
--- /dev/null
+Index: ckermit/ckcpro.w
+===================================================================
+--- ckermit.orig/ckcpro.w 2012-05-09 05:25:12.000000000 +0100
++++ ckermit/ckcpro.w 2012-05-09 05:26:59.000000000 +0100
+@@ -60,7 +60,8 @@
+ extern int timint, rtimo, nfils, hcflg, xflg, flow, mdmtyp, network;
+ extern int oopts, omode, oname, opath, nopush, isguest, xcmdsrc, rcdactive;
+ extern int rejection, moving, fncact, bye_active, urserver, fatalio;
+- extern int protocol, prefixing, filcnt, carrier, fnspath, interrupted;
++ extern int protocol, prefixing, carrier, fnspath, interrupted;
++ extern long filcnt;
+ extern int recursive, inserver, nzxopts, idletmo, srvidl, xfrint;
+ extern struct ck_p ptab[];
+ extern int remfile, rempipe, xferstat, filestatus, wearealike, fackpath;
+@@ -151,8 +152,9 @@
+ extern int quiet, tsecs, parity, backgrd, nakstate, atcapu, wslotn, winlo;
+ extern int wslots, success, xitsta, rprintf, discard, cdtimo, keep, fdispla;
+ extern int timef, stdinf, rscapu, sendmode, epktflg, epktrcvd, epktsent;
+- extern int binary, fncnv;
+- extern long speed, ffc, crc16, calibrate, dest;
++ extern int binary, fncnv, dest;
++ extern long speed, crc16;
++ CK_OFF_T calibrate, ffc;
+ #ifdef COMMENT
+ extern char *TYPCMD, *DIRCMD, *DIRCM2;
+ #endif /* COMMENT */
+@@ -208,8 +210,9 @@
+
+ static VOID
+ wheremsg() {
+- extern int quiet, filrej;
+- int n;
++ extern int quiet;
++ extern long filrej;
++ long n;
+ n = filcnt - filrej;
+ debug(F101,"wheremsg n","",n);
+
+@@ -247,7 +250,7 @@
+ switch (myjob) {
+ case 's':
+ if (sfspec) {
+- printf(" SENT: (%d files)",n);
++ printf(" SENT: (%ld files)",n);
+ if (srfspec)
+ printf(" Last: [%s]",srfspec);
+ printf(" (%s)\r\n", success ? "OK" : "FAILED");
+@@ -256,7 +259,7 @@
+ case 'r':
+ case 'v':
+ if (rrfspec) {
+- printf(" RCVD: (%d files)",n);
++ printf(" RCVD: (%ld files)",n);
+ if (rfspec)
+ printf(" Last: [%s]",rfspec);
+ printf(" (%s)\r\n", success ? "OK" : "FAILED");
+@@ -1507,7 +1510,7 @@
+ ack(); /* If OK, acknowledge */
+ #endif /* CK_RESEND */
+ } else { /* Otherwise */
+- extern long fsize;
++ extern CK_OFF_T fsize;
+ char *r;
+ r = getreason(iattr.reply.val);
+ ack1((CHAR *)iattr.reply.val); /* refuse to accept the file */
+Index: ckermit/ckuusx.c
+===================================================================
+--- ckermit.orig/ckuusx.c 2012-05-09 05:25:12.000000000 +0100
++++ ckermit/ckuusx.c 2012-05-09 05:26:59.000000000 +0100
+@@ -2361,7 +2361,8 @@
+ setflow() {
+ extern int flow, autoflow, mdmtyp, cxtype, cxflow[];
+ #ifndef NODIAL
+- extern int dialcapas, dialfc;
++ extern int dialfc;
++ extern long dialcapas;
+ extern MDMINF * modemp[];
+ MDMINF * p = NULL;
+ long bits = 0;
010_multiarch-makefile.patch
020_fix_ptys.patch
030_fix_dialmessage.patch
+040_fix_types.patch
900_ck_patch.patch