From 3ed8eafccb0f8880be295e67486347e5ffd93320 Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Mon, 30 Jan 2006 07:18:16 +0000 Subject: [PATCH] The robust_rename() function now takes a "partialptr" arg that, if non-NULL, will be used if we are forced to copy the file. --- util.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/util.c b/util.c index 3d88b15c..d37ab61e 100644 --- a/util.c +++ b/util.c @@ -377,8 +377,11 @@ int robust_unlink(const char *fname) } /* Returns 0 on successful rename, 1 if we successfully copied the file - * across filesystems, -2 if copy_file() failed, and -1 on other errors. */ -int robust_rename(const char *from, const char *to, int mode) + * across filesystems, -2 if copy_file() failed, and -1 on other errors. + * If partialptr is not NULL and we need to do a copy, copy the file into + * the active partial-dir instead of over the destination file. */ +int robust_rename(char *from, char *to, char *partialptr, + int mode) { int tries = 4; @@ -394,6 +397,11 @@ int robust_rename(const char *from, const char *to, int mode) break; #endif case EXDEV: + if (partialptr) { + if (!handle_partial_dir(partialptr,PDIR_CREATE)) + return -1; + to = partialptr; + } if (copy_file(from, to, mode) != 0) return -2; do_unlink(from); -- 2.34.1