mirror/rsync
1
0
Fork 0
mirror of https://github.com/RsyncProject/rsync.git synced 2026-05-18 11:55:32 -04:00
Code Issues Packages Projects Releases Wiki Activity

The --iconv option now converts the content of a symlink too.

Browse Source
This commit is contained in:
Wayne Davison
2008-08-01 19:12:33 -07:00
parent 95d1d2a9a4
commit 91dd3d0d48
2 changed files with 97 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
NEWS
View File

@@ -22,6 +22,9 @@ Changes since 3.0.3:
- Improved the keep-alive check in the generator to fire consistently in
incremental-recursion mode when --timeout is enabled.
- The --iconv option now converts the content of a symlink too, instead
of leaving it in the wrong character-set.
- When using --iconv, if a filename fails to convert on the receiving side,
this no longer interferes with deletions in the root-dir of the transfer.

113
flist.c
View File

@@ -386,7 +386,11 @@ int change_pathname(struct file_struct *file, const char *dir, int dirlen)
return 1;
}
static void send_file_entry(int f, const char *fname, struct file_struct *file, int ndx, int first_ndx)
static void send_file_entry(int f, const char *fname, struct file_struct *file,
#ifdef SUPPORT_LINKS
const char *symlink_name, int symlink_len,
#endif
int ndx, int first_ndx)
{
static time_t modtime;
static mode_t mode;
@@ -575,11 +579,9 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
}
#ifdef SUPPORT_LINKS
if (preserve_links && S_ISLNK(mode)) {
const char *sl = F_SYMLINK(file);
int len = strlen(sl);
write_varint30(f, len);
write_buf(f, sl, len);
if (symlink_len) {
write_varint30(f, symlink_len);
write_buf(f, symlink_name, symlink_len);
}
#endif
@@ -680,7 +682,7 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
who_am_i(), lastname, strerror(errno));
outbuf.len = 0;
}
outbuf.buf[outbuf.len] = '\0';
thisname[outbuf.len] = '\0';
}
#endif
@@ -811,6 +813,13 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
linkname_len - 1);
overflow_exit("recv_file_entry");
}
#ifdef ICONV_OPTION
/* We don't know how much extra room we need to convert
* the as-yet-unread symlink name when converting it,
* so let's hope that a double-size buffer is plenty. */
if (ic_recv != (iconv_t)-1)
linkname_len = linkname_len * 2 + 1;
#endif
if (munge_symlinks)
linkname_len += SYMLINK_PREFIX_LEN;
}
@@ -945,14 +954,40 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
if (first_hlink_ndx >= flist->ndx_start) {
struct file_struct *first = flist->files[first_hlink_ndx - flist->ndx_start];
memcpy(bp, F_SYMLINK(first), linkname_len);
} else if (munge_symlinks) {
strlcpy(bp, SYMLINK_PREFIX, linkname_len);
bp += SYMLINK_PREFIX_LEN;
linkname_len -= SYMLINK_PREFIX_LEN;
read_sbuf(f, bp, linkname_len - 1);
} else {
read_sbuf(f, bp, linkname_len - 1);
if (sanitize_paths)
if (munge_symlinks) {
strlcpy(bp, SYMLINK_PREFIX, linkname_len);
bp += SYMLINK_PREFIX_LEN;
linkname_len -= SYMLINK_PREFIX_LEN;
}
#ifdef ICONV_OPTION
if (ic_recv != (iconv_t)-1) {
xbuf outbuf, inbuf;
alloc_len = linkname_len;
linkname_len /= 2; /* (linkname_len-1) / 2 for odd values. */
/* Read the symlink name into the end of our double-sized
* buffer and then convert it into the right spot. */
INIT_XBUF(inbuf, bp + alloc_len - linkname_len,
linkname_len - 1, (size_t)-1);
read_sbuf(f, inbuf.buf, inbuf.len);
INIT_XBUF(outbuf, bp, 0, alloc_len);
if (iconvbufs(ic_recv, &inbuf, &outbuf, 0) < 0) {
io_error |= IOERR_GENERAL;
rprintf(FERROR_XFER,
"[%s] cannot convert symlink name for: %s (%s)\n",
who_am_i(), full_fname(thisname), strerror(errno));
bp = (char*)file->basename;
*bp++ = '\0';
outbuf.len = 0;
}
bp[outbuf.len] = '\0';
} else
#endif
read_sbuf(f, bp, linkname_len - 1);
if (sanitize_paths && !munge_symlinks && *bp)
sanitize_path(bp, bp, "", lastdir_depth, SP_DEFAULT);
}
}
@@ -1310,10 +1345,27 @@ static struct file_struct *send_file_name(int f, struct file_list *flist,
if (f >= 0) {
char fbuf[MAXPATHLEN];
#ifdef SUPPORT_LINKS
const char *symlink_name;
int symlink_len;
#ifdef ICONV_OPTION
char symlink_buf[MAXPATHLEN];
#endif
#endif
#if defined SUPPORT_ACLS || defined SUPPORT_XATTRS
stat_x sx;
#endif
#ifdef SUPPORT_LINKS
if (preserve_links && S_ISLNK(file->mode)) {
symlink_name = F_SYMLINK(file);
symlink_len = strlen(symlink_name);
} else {
symlink_name = NULL;
symlink_len = 0;
}
#endif
#ifdef ICONV_OPTION
if (ic_send != (iconv_t)-1) {
xbuf outbuf, inbuf;
@@ -1326,7 +1378,7 @@ static struct file_struct *send_file_name(int f, struct file_list *flist,
if (iconvbufs(ic_send, &inbuf, &outbuf, 0) < 0)
goto convert_error;
outbuf.size += 2;
outbuf.buf[outbuf.len++] = '/';
fbuf[outbuf.len++] = '/';
}
INIT_XBUF_STRLEN(inbuf, (char*)file->basename);
@@ -1338,7 +1390,26 @@ static struct file_struct *send_file_name(int f, struct file_list *flist,
who_am_i(), f_name(file, fbuf), strerror(errno));
return NULL;
}
outbuf.buf[outbuf.len] = '\0';
fbuf[outbuf.len] = '\0';
#ifdef SUPPORT_LINKS
if (symlink_len) {
INIT_XBUF(inbuf, (char*)symlink_name, symlink_len, (size_t)-1);
INIT_CONST_XBUF(outbuf, symlink_buf);
if (iconvbufs(ic_send, &inbuf, &outbuf, 0) < 0) {
io_error |= IOERR_GENERAL;
f_name(file, fbuf);
rprintf(FERROR_XFER,
"[%s] cannot convert symlink name for: %s (%s)\n",
who_am_i(), full_fname(fbuf), strerror(errno));
return NULL;
}
symlink_buf[outbuf.len] = '\0';
symlink_name = symlink_buf;
symlink_len = outbuf.len;
}
#endif
} else
#endif
f_name(file, fbuf);
@@ -1363,7 +1434,11 @@ static struct file_struct *send_file_name(int f, struct file_list *flist,
}
#endif
send_file_entry(f, fbuf, file, flist->used, flist->ndx_start);
send_file_entry(f, fbuf, file,
#ifdef SUPPORT_LINKS
symlink_name, symlink_len,
#endif
flist->used, flist->ndx_start);
#ifdef SUPPORT_ACLS
if (preserve_acls && !S_ISLNK(file->mode)) {
@@ -2232,8 +2307,8 @@ struct file_list *recv_file_list(int f)
maybe_emit_filelist_progress(flist->used);
if (verbose > 2) {
rprintf(FINFO, "recv_file_name(%s)\n",
f_name(file, NULL));
char *name = f_name(file, NULL);
rprintf(FINFO, "recv_file_name(%s)\n", NS(name));
}
}
file_total += flist->used;