Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- Auto-set --verbose if --dry-run is specified w/o --log-format.
[rsync/rsync.git]
/
io.c
diff --git
a/io.c
b/io.c
index
e2dc152
..
004ae66
100644
(file)
--- a/
io.c
+++ b/
io.c
@@
-149,7
+149,7
@@
static void check_timeout(void)
if (t - last_io >= io_timeout) {
if (!am_server && !am_daemon) {
if (t - last_io >= io_timeout) {
if (!am_server && !am_daemon) {
- rprintf(FERROR, "io timeout after %d seconds - exiting\n",
+ rprintf(FERROR, "io timeout after %d seconds -
-
exiting\n",
(int)(t-last_io));
}
exit_cleanup(RERR_TIMEOUT);
(int)(t-last_io));
}
exit_cleanup(RERR_TIMEOUT);
@@
-750,14
+750,13
@@
int64 read_longint(int f)
if ((int32)ret != (int32)0xffffffff)
return ret;
if ((int32)ret != (int32)0xffffffff)
return ret;
-#ifdef INT64_IS_OFF_T
- if (sizeof (int64) < 8) {
- rprintf(FERROR, "Integer overflow: attempted 64-bit offset\n");
- exit_cleanup(RERR_UNSUPPORTED);
- }
-#endif
+#if SIZEOF_INT64 < 8
+ rprintf(FERROR, "Integer overflow: attempted 64-bit offset\n");
+ exit_cleanup(RERR_UNSUPPORTED);
+#else
readfd(f,b,8);
ret = IVAL(b,0) | (((int64)IVAL(b,4))<<32);
readfd(f,b,8);
ret = IVAL(b,0) | (((int64)IVAL(b,4))<<32);
+#endif
return ret;
}
return ret;
}
@@
-787,19
+786,20
@@
void read_sum_head(int f, struct sum_struct *sum)
sum->count = read_int(f);
sum->blength = read_int(f);
if (sum->blength < 0 || sum->blength > MAX_BLOCK_SIZE) {
sum->count = read_int(f);
sum->blength = read_int(f);
if (sum->blength < 0 || sum->blength > MAX_BLOCK_SIZE) {
- rprintf(FERROR, "Invalid block length %ld\n",
- (long)sum->blength);
+ rprintf(FERROR, "
[%s]
Invalid block length %ld\n",
+
who_am_i(),
(long)sum->blength);
exit_cleanup(RERR_PROTOCOL);
}
sum->s2length = protocol_version < 27 ? csum_length : (int)read_int(f);
if (sum->s2length < 0 || sum->s2length > MD4_SUM_LENGTH) {
exit_cleanup(RERR_PROTOCOL);
}
sum->s2length = protocol_version < 27 ? csum_length : (int)read_int(f);
if (sum->s2length < 0 || sum->s2length > MD4_SUM_LENGTH) {
- rprintf(FERROR, "Invalid checksum length %d\n", sum->s2length);
+ rprintf(FERROR, "[%s] Invalid checksum length %d\n",
+ who_am_i(), sum->s2length);
exit_cleanup(RERR_PROTOCOL);
}
sum->remainder = read_int(f);
if (sum->remainder < 0 || sum->remainder > sum->blength) {
exit_cleanup(RERR_PROTOCOL);
}
sum->remainder = read_int(f);
if (sum->remainder < 0 || sum->remainder > sum->blength) {
- rprintf(FERROR, "Invalid remainder length %ld\n",
- (long)sum->remainder);
+ rprintf(FERROR, "
[%s]
Invalid remainder length %ld\n",
+
who_am_i(),
(long)sum->remainder);
exit_cleanup(RERR_PROTOCOL);
}
}
exit_cleanup(RERR_PROTOCOL);
}
}
@@
-1084,18
+1084,16
@@
void write_longint(int f, int64 x)
return;
}
return;
}
-#ifdef INT64_IS_OFF_T
- if (sizeof (int64) < 8) {
- rprintf(FERROR, "Integer overflow: attempted 64-bit offset\n");
- exit_cleanup(RERR_UNSUPPORTED);
- }
-#endif
-
+#if SIZEOF_INT64 < 8
+ rprintf(FERROR, "Integer overflow: attempted 64-bit offset\n");
+ exit_cleanup(RERR_UNSUPPORTED);
+#else
write_int(f, (int32)0xFFFFFFFF);
SIVAL(b,0,(x&0xFFFFFFFF));
SIVAL(b,4,((x>>32)&0xFFFFFFFF));
writefd(f,b,8);
write_int(f, (int32)0xFFFFFFFF);
SIVAL(b,0,(x&0xFFFFFFFF));
SIVAL(b,4,((x>>32)&0xFFFFFFFF));
writefd(f,b,8);
+#endif
}
void write_buf(int f,char *buf,size_t len)
}
void write_buf(int f,char *buf,size_t len)