search for: updateprogressmeter

...***************************************************" -#define MAX_BARLENGTH (sizeof(BAR) - 1) - -/* Visual statistics about files as they are transferred. */ -void progressmeter(int); - -/* Returns width of the terminal (for progress meter calculations). */ -int getttywidth(void); +static void updateprogressmeter(int done); int do_cmd(char *host, char *remuser, char *cmd, int *fdin, int *fdout, int argc); /* Struct for addargs */ arglist args; -/* Time a transfer started. */ -static struct timeval start; - /* Number of bytes of current file transferred so far. */ volatile off_t statbytes; @@ -569...

...- clean up and simplified a little to remove the 'flag' status. It now understands how to initialize itself and how to terminate itself. Along with a malloced status bar instead of the original fix width bar. 2. removed all initialization code from scp.c for progressmeter() and moved to updateprogressmeter(). 3. Added two callback per upload/download function in sftp-client.c. One to start the session the second to clean up after itself (same logic as in scp now). 4. fixed up sftp-int.c to pass the call backs. Note, I normally don't do callbacks. So I need someone to review to ensure I did n...

...quot; */ -#define STALLTIME 5 -/* alarm() interval for updating progress meter */ -#define PROGRESSTIME 1 - -/* Visual statistics about files as they are transferred. */ -void progressmeter(int); - -/* Returns width of the terminal (for progress meter calculations). */ -int getttywidth(void); +void updateprogressmeter(int ignore); int do_cmd(char *host, char *remuser, char *cmd, int *fdin, int *fdout, int argc); /* Struct for addargs */ arglist args; -/* Time a transfer started. */ -static struct timeval start; - /* Number of bytes of current file transferred so far. */ volatile off_t statbytes; @@ -5...

...T (for instance, SunOS does not). Also, for the non-SA_RESTART case in scp.c sa.sa_flags was not being initialized (noted by dworkin at village.org). - todd --- scp.c.DIST Sat Feb 17 17:56:33 2001 +++ scp.c Sat Feb 17 17:57:59 2001 @@ -1224,8 +1224,9 @@ struct sigaction sa; sa.sa_handler = updateprogressmeter; sigemptyset((sigset_t *)&sa.sa_mask); + sa.sa_flags = 0; #ifdef SA_RESTART - sa.sa_flags = SA_RESTART; + sa.sa_flags |= SA_RESTART; #endif sigaction(SIGALRM, &sa, NULL); alarmtimer(1); --- misc.c.DIST Fri Feb 16 07:58:12 2001 +++ misc.c Sat Feb 17 17:59:53 2001 @@ -108,8 +108...

...se(pout[0]); *************** *** 191,196 **** --- 196,203 ---- *fdout = pin[1]; close(pout[1]); *fdin = pout[0]; + /* esb */ + (void) signal(SIGTERM, killchild); return 0; } *************** *** 1086,1091 **** --- 1093,1105 ---- signal(SIGALRM, updateprogressmeter); alarm(PROGRESSTIME); errno = save_errno; + } + + static void + killchild(int signo) + { + kill (childpid, signo); + _exit(1); } static int ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee.

...ern int optind; /* check if RSA support exists */ if (rsa_alive() == 0) { ======================================================================== --- scp.c.orig-1.2.2 Thu Jan 13 23:45:51 2000 +++ scp.c Sun Feb 13 15:58:20 2000 @@ -1229,7 +1229,10 @@ struct sigaction sa; sa.sa_handler = updateprogressmeter; sigemptyset(&sa.sa_mask); - sa.sa_flags = SA_RESTART; + sa.sa_flags = 0; +#ifdef SA_RESTART + sa.sa_flags |= SA_RESTART; +#endif /* SA_RESTART */ sigaction(SIGALRM, &sa, NULL); alarmtimer(1); } else if (flag == 1) { ============================================================...

...0; (i < n) && (i < width); i++) + temp[i] = '='; + + if (i < width) + temp[i] = '>'; + + for (i++; i < width; i++) + temp[i] = '-'; + + snprintf(buf, MAX_GAUGELEN, "[%s]", temp); +} - if (flag == -1) { - mysignal(SIGALRM, updateprogressmeter); - alarm(PROGRESSTIME); - } else if (flag == 1) { - alarm(0); - atomicio(write, fileno(stdout), "\n", 1); - statbytes = 0; - } +void progressmeter(int flag) +{ + static const char indicator[] = "|/-\\"; + static struct timeval lastupdate; + static off_t lastsize; +...

...TOS, (void *) &throughput, sizeof(throughput)) < 0) error("setsockopt IPTOS_THROUGHPUT: %.100s", strerror(errno)); +#endif } } --- scp.c.DIST Mon May 1 05:10:33 2000 +++ scp.c Fri May 5 12:19:25 2000 @@ -1235,7 +1235,9 @@ struct sigaction sa; sa.sa_handler = updateprogressmeter; sigemptyset(&sa.sa_mask); +#ifdef SA_RESTART sa.sa_flags = SA_RESTART; +#endif sigaction(SIGALRM, &sa, NULL); alarmtimer(1); } else if (flag == 1) { --- ssh-agent.c.DIST Mon May 1 04:59:51 2000 +++ ssh-agent.c Fri May 5 12:22:05 2000 @@ -507,6 +507,7 @@ struct sockaddr_un...