flist = flist_new();
if (f != -1) {
- io_start_buffering(f);
+ io_start_buffering_out(f);
if (filesfrom_fd >= 0) {
if (argv[0] && !push_dir(argv[0], 0)) {
rprintf(FERROR, "push_dir %s failed: %s\n",
if (!f2 || !f2->basename)
return 1;
- if (!(c1 = f1->dirname)) {
+ if (!(c1 = (uchar*)f1->dirname)) {
state1 = fnc_BASE;
- c1 = f1->basename;
+ c1 = (uchar*)f1->basename;
}
- if (!(c2 = f2->dirname)) {
+ if (!(c2 = (uchar*)f2->dirname)) {
state2 = fnc_BASE;
- c2 = f2->basename;
+ c2 = (uchar*)f2->basename;
}
while (1) {
switch (state1) {
case fnc_DIR:
state1 = fnc_SLASH;
- c1 = "/";
+ c1 = (uchar*)"/";
break;
case fnc_SLASH:
state1 = fnc_BASE;
- c1 = f1->basename;
+ c1 = (uchar*)f1->basename;
break;
case fnc_BASE:
break;
switch (state2) {
case fnc_DIR:
state2 = fnc_SLASH;
- c2 = "/";
+ c2 = (uchar*)"/";
break;
case fnc_SLASH:
state2 = fnc_BASE;
- c2 = f2->basename;
+ c2 = (uchar*)f2->basename;
break;
case fnc_BASE:
if (!*c1)