X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/24172e4b2f632d32a51a27a4faa6ce731e2059eb..fb7b9ddcb1165ad0ab9aba773e050816068d0b61:/progress.c diff --git a/progress.c b/progress.c index db30a84a..cd462a38 100644 --- a/progress.c +++ b/progress.c @@ -1,22 +1,23 @@ -/* -*- c-file-style: "linux" -*- +/* + * Routines to output progress information during a file transfer. * - * Copyright (C) 1996-2000 by Andrew Tridgell - * Copyright (C) Paul Mackerras 1996 - * Copyright (C) 2001, 2002 by Martin Pool + * Copyright (C) 1996-2000 Andrew Tridgell + * Copyright (C) 1996 Paul Mackerras + * Copyright (C) 2001, 2002 Martin Pool + * 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 as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * 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., 675 Mass Ave, Cambridge, MA 02139, USA. + * 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. */ #include "rsync.h" @@ -102,8 +103,8 @@ static void rprint_progress(OFF_T ofs, OFF_T size, struct timeval *now, stats.num_files - stats.current_file_index - 1, stats.num_files); } else - strcpy(eol, "\r"); - rprintf(FINFO, "%12s %3d%% %7.2f%s %4d:%02d:%02d%s", + strlcpy(eol, "\r", sizeof eol); + rprintf(FCLIENT, "%12s %3d%% %7.2f%s %4d:%02d:%02d%s", human_num(ofs), pct, rate, units, remain_h, remain_m, remain_s, eol); }