X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/16edf86595a5a990a942fa045dfb523dae1fe6cb..4fd842f98df4970f6e49a0365dbed60774e56c09:/sender.c diff --git a/sender.c b/sender.c index 8a3a7d5c..13ae8e4d 100644 --- a/sender.c +++ b/sender.c @@ -6,7 +6,7 @@ * Copyright (C) 2003-2007 Wayne Davison * * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as + * it under the terms of the GNU General Public License version 3 as * published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, @@ -15,8 +15,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. + * with this program; if not, visit the http://fsf.org website. */ #include "rsync.h" @@ -135,7 +134,7 @@ void successful_send(int ndx) } file = flist->files[ndx - flist->ndx_start]; - if (!push_flist_dir(F_ROOTDIR(file), -1)) + if (!push_pathname(F_PATHNAME(file), -1)) return; f_name(file, fname); @@ -212,13 +211,13 @@ void send_files(int f_in, int f_out) send_extra_file_list(f_out, FILECNT_LOOKAHEAD); file = cur_flist->files[ndx - cur_flist->ndx_start]; - if (F_ROOTDIR(file)) { - path = F_ROOTDIR(file); + if (F_PATHNAME(file)) { + path = F_PATHNAME(file); slash = "/"; } else { path = slash = ""; } - if (!push_flist_dir(F_ROOTDIR(file), -1)) + if (!push_pathname(F_PATHNAME(file), -1)) continue; f_name(file, fname);