Diff for /embedaddon/rsync/progress.c between versions 1.1.1.2 and 1.1.1.3

version 1.1.1.2, 2013/10/14 07:51:14 version 1.1.1.3, 2016/11/01 09:54:32
Line 4 Line 4
  * Copyright (C) 1996-2000 Andrew Tridgell   * Copyright (C) 1996-2000 Andrew Tridgell
  * Copyright (C) 1996 Paul Mackerras   * Copyright (C) 1996 Paul Mackerras
  * Copyright (C) 2001, 2002 Martin Pool <mbp@samba.org>   * Copyright (C) 2001, 2002 Martin Pool <mbp@samba.org>
 * Copyright (C) 2003-2013 Wayne Davison * Copyright (C) 2003-2015 Wayne Davison
  *   *
  * This program is free software; you can redistribute it and/or modify   * 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   * it under the terms of the GNU General Public License as published by
Line 177  void show_progress(OFF_T ofs, OFF_T size) Line 177  void show_progress(OFF_T ofs, OFF_T size)
   
         gettimeofday(&now, NULL);          gettimeofday(&now, NULL);
   
           if (INFO_GTE(PROGRESS, 2)) {
                   ofs = stats.total_transferred_size - size + ofs;
                   size = stats.total_size;
           }
   
         if (!ph_start.time.tv_sec) {          if (!ph_start.time.tv_sec) {
                 int i;                  int i;
   
Line 212  void show_progress(OFF_T ofs, OFF_T size) Line 217  void show_progress(OFF_T ofs, OFF_T size)
                 return;                  return;
 #endif  #endif
   
        if (INFO_GTE(PROGRESS, 2)) {        rprint_progress(ofs, size, &now, False);
                rprint_progress(stats.total_transferred_size, 
                                stats.total_size, &now, False); 
        } else 
                rprint_progress(ofs, size, &now, False); 
 }  }

Removed from v.1.1.1.2  
changed lines
  Added in v.1.1.1.3


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>