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
Document that --ignore-times thwarts all --link-dest linking.
[rsync/rsync.git]
/
util.c
diff --git
a/util.c
b/util.c
index
85b2227
..
d8d396c
100644
(file)
--- a/
util.c
+++ b/
util.c
@@
-111,13
+111,13
@@
void print_child_argv(char **cmd)
void out_of_memory(char *str)
{
void out_of_memory(char *str)
{
- rprintf(FERROR, "ERROR: out of memory in %s
\n", str
);
+ rprintf(FERROR, "ERROR: out of memory in %s
[%s]\n", str, who_am_i()
);
exit_cleanup(RERR_MALLOC);
}
void overflow_exit(char *str)
{
exit_cleanup(RERR_MALLOC);
}
void overflow_exit(char *str)
{
- rprintf(FERROR, "ERROR: buffer overflow in %s
\n", str
);
+ rprintf(FERROR, "ERROR: buffer overflow in %s
[%s]\n", str, who_am_i()
);
exit_cleanup(RERR_MALLOC);
}
exit_cleanup(RERR_MALLOC);
}
@@
-1033,7
+1033,8
@@
char *full_fname(const char *fn)
} else
m1 = m2 = m3 = "";
} else
m1 = m2 = m3 = "";
- asprintf(&result, "\"%s%s%s\"%s%s%s", p1, p2, fn, m1, m2, m3);
+ if (asprintf(&result, "\"%s%s%s\"%s%s%s", p1, p2, fn, m1, m2, m3) <= 0)
+ out_of_memory("full_fname");
return result;
}
return result;
}