Diff

Differences From Artifact [5729f7aece]:

To Artifact [ed7c38a9a9]:


54
55
56
57
58
59
60
61

62
63
64
65
66
67
68
69
70
71
72
73
74


75
76
77
78
79
80
81
54
55
56
57
58
59
60

61
62
63
64
65
66
67
68
69
70
71
72
73

74
75
76
77
78
79
80
81
82







-
+












-
+
+







static char *password = NULL;
static int errs = 0;
/* GUI Adaptation - Sept 2000 */
#define NAME_STR_MAX 2048
static char statname[NAME_STR_MAX+1];
static unsigned long statsize = 0;
static int statperct = 0;
static time_t statelapsed = 0;
static unsigned long statelapsed = 0;
static int gui_mode = 0;
static char *gui_hwnd = NULL;

static void source(char *src);
static void rsource(char *src);
static void sink(char *targ, char *src);
/* GUI Adaptation - Sept 2000 */
static void tell_char(FILE *stream, char c);
static void tell_str(FILE *stream, char *str);
static void tell_user(FILE *stream, char *fmt, ...);
static void send_char_msg(unsigned int msg_id, char c);
static void send_str_msg(unsigned int msg_id, char *str);
static void gui_update_stats(char *name, unsigned long size, int percentage, time_t elapsed);
static void gui_update_stats(char *name, unsigned long size,
                             int percentage, unsigned long elapsed);

void begin_session(void) { }
void logevent(char *string) { }

void verify_ssh_host_key(char *host, int port, char *keytype,
                         char *keystr, char *fingerprint) {
    int ret;
178
179
180
181
182
183
184
185

186
187
188
189
190
191
192
179
180
181
182
183
184
185

186
187
188
189
190
191
192
193







-
+







    va_start(ap, fmt);
    vsprintf(str, fmt, ap);
    va_end(ap);
    strcat(str, "\n");
    tell_str(stream, str);
}

static void gui_update_stats(char *name, unsigned long size, int percentage, time_t elapsed)
static void gui_update_stats(char *name, unsigned long size, int percentage, unsigned long elapsed)
{
    unsigned int i;

    if (strcmp(name,statname) != 0)
    {
	for( i = 0; i < strlen(name); ++i )
	    send_msg( (HWND)atoi(gui_hwnd), WM_STATS_CHAR, (WPARAM)name[i]);
486
487
488
489
490
491
492
493


494
495
496
497
498
499
500
487
488
489
490
491
492
493

494
495
496
497
498
499
500
501
502







-
+
+







    float ratebs;
    unsigned long eta;
    char etastr[10];
    int pct;

    /* GUI Adaptation - Sept 2000 */
    if (gui_mode)
	gui_update_stats(name, size, ((done *100) / size), now-start);
	gui_update_stats(name, size, (int)(100 * (done*1.0/size)),
                         (unsigned long)difftime(now, start));
    else {
	if (now > start)
	    ratebs = (float) done / (now - start);
	else
	    ratebs = (float) done;

	if (ratebs < 1.0)