dropbear: progressmeter.c annotate

annotate progressmeter.c @ 363:6ba2894ec8d5 channel-fix

Rearranged (and hopefully simplified) channel close/eof handling

author	Matt Johnston <matt@ucc.asn.au>
date	Sat, 07 Oct 2006 17:48:55 +0000
parents	b72f98803e46
children

rev	line source
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1 #ifdef PROGRESS_METER
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	2 /*
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	3 * Copyright (c) 2003 Nils Nordman. All rights reserved.
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	4 *
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	5 * Redistribution and use in source and binary forms, with or without
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	6 * modification, are permitted provided that the following conditions
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	7 * are met:
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	8 * 1. Redistributions of source code must retain the above copyright
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	9 * notice, this list of conditions and the following disclaimer.
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	10 * 2. Redistributions in binary form must reproduce the above copyright
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	11 * notice, this list of conditions and the following disclaimer in the
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	12 * documentation and/or other materials provided with the distribution.
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	13 *
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	14 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	15 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	16 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	17 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	18 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	19 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	20 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	21 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	23 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	24 */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	25
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	26 #include "includes.h"
287 b72f98803e46 Update to scp from OpenSSH portable 4.3p2 Matt Johnston <matt@ucc.asn.au> parents: 38 diff changeset	27 /RCSID("$OpenBSD: progressmeter.c,v 1.24 2005/06/07 13:25:23 jaredy Exp $");/
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	28
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	29 #include "progressmeter.h"
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	30 #include "atomicio.h"
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	31 #include "scpmisc.h"
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	32
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	33 #define DEFAULT_WINSIZE 80
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	34 #define MAX_WINSIZE 512
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	35 #define PADDING 1 /* padding between the progress indicators */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	36 #define UPDATE_INTERVAL 1 /* update the progress meter every second */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	37 #define STALL_TIME 5 /* we're stalled after this many seconds */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	38
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	39 /* determines whether we can output to the terminal */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	40 static int can_output(void);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	41
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	42 /* formats and inserts the specified size into the given buffer */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	43 static void format_size(char *, int, off_t);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	44 static void format_rate(char *, int, off_t);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	45
287 b72f98803e46 Update to scp from OpenSSH portable 4.3p2 Matt Johnston <matt@ucc.asn.au> parents: 38 diff changeset	46 /* window resizing */
b72f98803e46 Update to scp from OpenSSH portable 4.3p2 Matt Johnston <matt@ucc.asn.au> parents: 38 diff changeset	47 static void sig_winch(int);
b72f98803e46 Update to scp from OpenSSH portable 4.3p2 Matt Johnston <matt@ucc.asn.au> parents: 38 diff changeset	48 static void setscreensize(void);
b72f98803e46 Update to scp from OpenSSH portable 4.3p2 Matt Johnston <matt@ucc.asn.au> parents: 38 diff changeset	49
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	50 /* updates the progressmeter to reflect the current state of the transfer */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	51 void refresh_progress_meter(void);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	52
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	53 /* signal handler for updating the progress meter */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	54 static void update_progress_meter(int);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	55
287 b72f98803e46 Update to scp from OpenSSH portable 4.3p2 Matt Johnston <matt@ucc.asn.au> parents: 38 diff changeset	56 static time_t start; /* start progress */
b72f98803e46 Update to scp from OpenSSH portable 4.3p2 Matt Johnston <matt@ucc.asn.au> parents: 38 diff changeset	57 static time_t last_update; /* last progress update */
b72f98803e46 Update to scp from OpenSSH portable 4.3p2 Matt Johnston <matt@ucc.asn.au> parents: 38 diff changeset	58 static char file; / name of the file being transferred */
b72f98803e46 Update to scp from OpenSSH portable 4.3p2 Matt Johnston <matt@ucc.asn.au> parents: 38 diff changeset	59 static off_t end_pos; /* ending position of transfer */
b72f98803e46 Update to scp from OpenSSH portable 4.3p2 Matt Johnston <matt@ucc.asn.au> parents: 38 diff changeset	60 static off_t cur_pos; /* transfer position as of last refresh */
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	61 static volatile off_t counter; / progress counter */
287 b72f98803e46 Update to scp from OpenSSH portable 4.3p2 Matt Johnston <matt@ucc.asn.au> parents: 38 diff changeset	62 static long stalled; /* how long we have been stalled */
b72f98803e46 Update to scp from OpenSSH portable 4.3p2 Matt Johnston <matt@ucc.asn.au> parents: 38 diff changeset	63 static int bytes_per_second; /* current speed in bytes per second */
b72f98803e46 Update to scp from OpenSSH portable 4.3p2 Matt Johnston <matt@ucc.asn.au> parents: 38 diff changeset	64 static int win_size; /* terminal window size */
b72f98803e46 Update to scp from OpenSSH portable 4.3p2 Matt Johnston <matt@ucc.asn.au> parents: 38 diff changeset	65 static volatile sig_atomic_t win_resized; /* for window resizing */
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	66
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	67 /* units for format_size */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	68 static const char unit[] = " KMGT";
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	69
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	70 static int
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	71 can_output(void)
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	72 {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	73 return (getpgrp() == tcgetpgrp(STDOUT_FILENO));
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	74 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	75
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	76 static void
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	77 format_rate(char *buf, int size, off_t bytes)
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	78 {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	79 int i;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	80
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	81 bytes *= 100;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	82 for (i = 0; bytes >= 100*1000 && unit[i] != 'T'; i++)
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	83 bytes = (bytes + 512) / 1024;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	84 if (i == 0) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	85 i++;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	86 bytes = (bytes + 512) / 1024;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	87 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	88 snprintf(buf, size, "%3lld.%1lld%c%s",
287 b72f98803e46 Update to scp from OpenSSH portable 4.3p2 Matt Johnston <matt@ucc.asn.au> parents: 38 diff changeset	89 (long long) (bytes + 5) / 100,
b72f98803e46 Update to scp from OpenSSH portable 4.3p2 Matt Johnston <matt@ucc.asn.au> parents: 38 diff changeset	90 (long long) (bytes + 5) / 10 % 10,
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	91 unit[i],
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	92 i ? "B" : " ");
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	93 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	94
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	95 static void
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	96 format_size(char *buf, int size, off_t bytes)
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	97 {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	98 int i;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	99
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	100 for (i = 0; bytes >= 10000 && unit[i] != 'T'; i++)
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	101 bytes = (bytes + 512) / 1024;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	102 snprintf(buf, size, "%4lld%c%s",
287 b72f98803e46 Update to scp from OpenSSH portable 4.3p2 Matt Johnston <matt@ucc.asn.au> parents: 38 diff changeset	103 (long long) bytes,
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	104 unit[i],
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	105 i ? "B" : " ");
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	106 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	107
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	108 void
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	109 refresh_progress_meter(void)
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	110 {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	111 char buf[MAX_WINSIZE + 1];
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	112 time_t now;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	113 off_t transferred;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	114 double elapsed;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	115 int percent;
287 b72f98803e46 Update to scp from OpenSSH portable 4.3p2 Matt Johnston <matt@ucc.asn.au> parents: 38 diff changeset	116 off_t bytes_left;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	117 int cur_speed;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	118 int hours, minutes, seconds;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	119 int i, len;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	120 int file_len;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	121
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	122 transferred = *counter - cur_pos;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	123 cur_pos = *counter;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	124 now = time(NULL);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	125 bytes_left = end_pos - cur_pos;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	126
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	127 if (bytes_left > 0)
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	128 elapsed = now - last_update;
287 b72f98803e46 Update to scp from OpenSSH portable 4.3p2 Matt Johnston <matt@ucc.asn.au> parents: 38 diff changeset	129 else {
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	130 elapsed = now - start;
287 b72f98803e46 Update to scp from OpenSSH portable 4.3p2 Matt Johnston <matt@ucc.asn.au> parents: 38 diff changeset	131 /* Calculate true total speed when done */
b72f98803e46 Update to scp from OpenSSH portable 4.3p2 Matt Johnston <matt@ucc.asn.au> parents: 38 diff changeset	132 transferred = end_pos;
b72f98803e46 Update to scp from OpenSSH portable 4.3p2 Matt Johnston <matt@ucc.asn.au> parents: 38 diff changeset	133 bytes_per_second = 0;
b72f98803e46 Update to scp from OpenSSH portable 4.3p2 Matt Johnston <matt@ucc.asn.au> parents: 38 diff changeset	134 }
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	135
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	136 /* calculate speed */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	137 if (elapsed != 0)
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	138 cur_speed = (transferred / elapsed);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	139 else
287 b72f98803e46 Update to scp from OpenSSH portable 4.3p2 Matt Johnston <matt@ucc.asn.au> parents: 38 diff changeset	140 cur_speed = transferred;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	141
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	142 #define AGE_FACTOR 0.9
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	143 if (bytes_per_second != 0) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	144 bytes_per_second = (bytes_per_second * AGE_FACTOR) +
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	145 (cur_speed * (1.0 - AGE_FACTOR));
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	146 } else
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	147 bytes_per_second = cur_speed;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	148
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	149 /* filename */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	150 buf[0] = '\0';
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	151 file_len = win_size - 35;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	152 if (file_len > 0) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	153 len = snprintf(buf, file_len + 1, "\r%s", file);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	154 if (len < 0)
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	155 len = 0;
287 b72f98803e46 Update to scp from OpenSSH portable 4.3p2 Matt Johnston <matt@ucc.asn.au> parents: 38 diff changeset	156 if (len >= file_len + 1)
b72f98803e46 Update to scp from OpenSSH portable 4.3p2 Matt Johnston <matt@ucc.asn.au> parents: 38 diff changeset	157 len = file_len;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	158 for (i = len; i < file_len; i++ )
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	159 buf[i] = ' ';
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	160 buf[file_len] = '\0';
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	161 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	162
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	163 /* percent of transfer done */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	164 if (end_pos != 0)
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	165 percent = ((float)cur_pos / end_pos) * 100;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	166 else
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	167 percent = 100;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	168 snprintf(buf + strlen(buf), win_size - strlen(buf),
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	169 " %3d%% ", percent);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	170
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	171 /* amount transferred */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	172 format_size(buf + strlen(buf), win_size - strlen(buf),
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	173 cur_pos);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	174 strlcat(buf, " ", win_size);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	175
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	176 /* bandwidth usage */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	177 format_rate(buf + strlen(buf), win_size - strlen(buf),
287 b72f98803e46 Update to scp from OpenSSH portable 4.3p2 Matt Johnston <matt@ucc.asn.au> parents: 38 diff changeset	178 (off_t)bytes_per_second);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	179 strlcat(buf, "/s ", win_size);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	180
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	181 /* ETA */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	182 if (!transferred)
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	183 stalled += elapsed;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	184 else
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	185 stalled = 0;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	186
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	187 if (stalled >= STALL_TIME)
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	188 strlcat(buf, "- stalled -", win_size);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	189 else if (bytes_per_second == 0 && bytes_left)
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	190 strlcat(buf, " --:-- ETA", win_size);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	191 else {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	192 if (bytes_left > 0)
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	193 seconds = bytes_left / bytes_per_second;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	194 else
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	195 seconds = elapsed;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	196
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	197 hours = seconds / 3600;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	198 seconds -= hours * 3600;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	199 minutes = seconds / 60;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	200 seconds -= minutes * 60;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	201
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	202 if (hours != 0)
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	203 snprintf(buf + strlen(buf), win_size - strlen(buf),
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	204 "%d:%02d:%02d", hours, minutes, seconds);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	205 else
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	206 snprintf(buf + strlen(buf), win_size - strlen(buf),
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	207 " %02d:%02d", minutes, seconds);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	208
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	209 if (bytes_left > 0)
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	210 strlcat(buf, " ETA", win_size);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	211 else
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	212 strlcat(buf, " ", win_size);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	213 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	214
287 b72f98803e46 Update to scp from OpenSSH portable 4.3p2 Matt Johnston <matt@ucc.asn.au> parents: 38 diff changeset	215 atomicio(vwrite, STDOUT_FILENO, buf, win_size - 1);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	216 last_update = now;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	217 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	218
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	219 static void
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	220 update_progress_meter(int ignore)
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	221 {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	222 int save_errno;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	223
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	224 save_errno = errno;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	225
287 b72f98803e46 Update to scp from OpenSSH portable 4.3p2 Matt Johnston <matt@ucc.asn.au> parents: 38 diff changeset	226 if (win_resized) {
b72f98803e46 Update to scp from OpenSSH portable 4.3p2 Matt Johnston <matt@ucc.asn.au> parents: 38 diff changeset	227 setscreensize();
b72f98803e46 Update to scp from OpenSSH portable 4.3p2 Matt Johnston <matt@ucc.asn.au> parents: 38 diff changeset	228 win_resized = 0;
b72f98803e46 Update to scp from OpenSSH portable 4.3p2 Matt Johnston <matt@ucc.asn.au> parents: 38 diff changeset	229 }
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	230 if (can_output())
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	231 refresh_progress_meter();
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	232
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	233 signal(SIGALRM, update_progress_meter);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	234 alarm(UPDATE_INTERVAL);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	235 errno = save_errno;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	236 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	237
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	238 void
287 b72f98803e46 Update to scp from OpenSSH portable 4.3p2 Matt Johnston <matt@ucc.asn.au> parents: 38 diff changeset	239 start_progress_meter(char f, off_t filesize, off_t ctr)
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	240 {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	241 start = last_update = time(NULL);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	242 file = f;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	243 end_pos = filesize;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	244 cur_pos = 0;
287 b72f98803e46 Update to scp from OpenSSH portable 4.3p2 Matt Johnston <matt@ucc.asn.au> parents: 38 diff changeset	245 counter = ctr;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	246 stalled = 0;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	247 bytes_per_second = 0;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	248
287 b72f98803e46 Update to scp from OpenSSH portable 4.3p2 Matt Johnston <matt@ucc.asn.au> parents: 38 diff changeset	249 setscreensize();
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	250 if (can_output())
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	251 refresh_progress_meter();
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	252
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	253 signal(SIGALRM, update_progress_meter);
287 b72f98803e46 Update to scp from OpenSSH portable 4.3p2 Matt Johnston <matt@ucc.asn.au> parents: 38 diff changeset	254 signal(SIGWINCH, sig_winch);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	255 alarm(UPDATE_INTERVAL);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	256 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	257
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	258 void
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	259 stop_progress_meter(void)
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	260 {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	261 alarm(0);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	262
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	263 if (!can_output())
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	264 return;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	265
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	266 /* Ensure we complete the progress */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	267 if (cur_pos != end_pos)
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	268 refresh_progress_meter();
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	269
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	270 atomicio(vwrite, STDOUT_FILENO, "\n", 1);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	271 }
287 b72f98803e46 Update to scp from OpenSSH portable 4.3p2 Matt Johnston <matt@ucc.asn.au> parents: 38 diff changeset	272
b72f98803e46 Update to scp from OpenSSH portable 4.3p2 Matt Johnston <matt@ucc.asn.au> parents: 38 diff changeset	273 static void
b72f98803e46 Update to scp from OpenSSH portable 4.3p2 Matt Johnston <matt@ucc.asn.au> parents: 38 diff changeset	274 sig_winch(int sig)
b72f98803e46 Update to scp from OpenSSH portable 4.3p2 Matt Johnston <matt@ucc.asn.au> parents: 38 diff changeset	275 {
b72f98803e46 Update to scp from OpenSSH portable 4.3p2 Matt Johnston <matt@ucc.asn.au> parents: 38 diff changeset	276 win_resized = 1;
b72f98803e46 Update to scp from OpenSSH portable 4.3p2 Matt Johnston <matt@ucc.asn.au> parents: 38 diff changeset	277 }
b72f98803e46 Update to scp from OpenSSH portable 4.3p2 Matt Johnston <matt@ucc.asn.au> parents: 38 diff changeset	278
b72f98803e46 Update to scp from OpenSSH portable 4.3p2 Matt Johnston <matt@ucc.asn.au> parents: 38 diff changeset	279 static void
b72f98803e46 Update to scp from OpenSSH portable 4.3p2 Matt Johnston <matt@ucc.asn.au> parents: 38 diff changeset	280 setscreensize(void)
b72f98803e46 Update to scp from OpenSSH portable 4.3p2 Matt Johnston <matt@ucc.asn.au> parents: 38 diff changeset	281 {
b72f98803e46 Update to scp from OpenSSH portable 4.3p2 Matt Johnston <matt@ucc.asn.au> parents: 38 diff changeset	282 struct winsize winsize;
b72f98803e46 Update to scp from OpenSSH portable 4.3p2 Matt Johnston <matt@ucc.asn.au> parents: 38 diff changeset	283
b72f98803e46 Update to scp from OpenSSH portable 4.3p2 Matt Johnston <matt@ucc.asn.au> parents: 38 diff changeset	284 if (ioctl(STDOUT_FILENO, TIOCGWINSZ, &winsize) != -1 &&
b72f98803e46 Update to scp from OpenSSH portable 4.3p2 Matt Johnston <matt@ucc.asn.au> parents: 38 diff changeset	285 winsize.ws_col != 0) {
b72f98803e46 Update to scp from OpenSSH portable 4.3p2 Matt Johnston <matt@ucc.asn.au> parents: 38 diff changeset	286 if (winsize.ws_col > MAX_WINSIZE)
b72f98803e46 Update to scp from OpenSSH portable 4.3p2 Matt Johnston <matt@ucc.asn.au> parents: 38 diff changeset	287 win_size = MAX_WINSIZE;
b72f98803e46 Update to scp from OpenSSH portable 4.3p2 Matt Johnston <matt@ucc.asn.au> parents: 38 diff changeset	288 else
b72f98803e46 Update to scp from OpenSSH portable 4.3p2 Matt Johnston <matt@ucc.asn.au> parents: 38 diff changeset	289 win_size = winsize.ws_col;
b72f98803e46 Update to scp from OpenSSH portable 4.3p2 Matt Johnston <matt@ucc.asn.au> parents: 38 diff changeset	290 } else
b72f98803e46 Update to scp from OpenSSH portable 4.3p2 Matt Johnston <matt@ucc.asn.au> parents: 38 diff changeset	291 win_size = DEFAULT_WINSIZE;
b72f98803e46 Update to scp from OpenSSH portable 4.3p2 Matt Johnston <matt@ucc.asn.au> parents: 38 diff changeset	292 win_size += 1; /* trailing \0 */
b72f98803e46 Update to scp from OpenSSH portable 4.3p2 Matt Johnston <matt@ucc.asn.au> parents: 38 diff changeset	293 }
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	294 #endif /* PROGRESS_METER */

Mercurial > dropbear

annotate progressmeter.c @ 363:6ba2894ec8d5 channel-fix