Diff

Differences From Artifact [47404c0424]:

To Artifact [ddfbe04eb0]:


67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
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, unsigned long elapsed);

void logevent(char *string)
{
}








<
<







67
68
69
70
71
72
73


74
75
76
77
78
79
80
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 gui_update_stats(char *name, unsigned long size,
			     int percentage, unsigned long elapsed);

void logevent(char *string)
{
}

739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
    sprintf(buf, "C0644 %lu %s\n", size, last);
    if (verbose)
	tell_user(stderr, "Sending file modes: %s", buf);
    back->send(buf, strlen(buf));
    if (response())
	return;

    if (statistics) {
	stat_bytes = 0;
	stat_starttime = time(NULL);
	stat_lasttime = 0;
    }

    for (i = 0; i < size; i += 4096) {
	char transbuf[4096];
	DWORD j, k = 4096;
	if (i + k > size)
	    k = size - i;
	if (!ReadFile(f, transbuf, k, &j, NULL) || j != k) {







<
|
|
|
<







737
738
739
740
741
742
743

744
745
746

747
748
749
750
751
752
753
    sprintf(buf, "C0644 %lu %s\n", size, last);
    if (verbose)
	tell_user(stderr, "Sending file modes: %s", buf);
    back->send(buf, strlen(buf));
    if (response())
	return;


    stat_bytes = 0;
    stat_starttime = time(NULL);
    stat_lasttime = 0;


    for (i = 0; i < size; i += 4096) {
	char transbuf[4096];
	DWORD j, k = 4096;
	if (i + k > size)
	    k = size - i;
	if (!ReadFile(f, transbuf, k, &j, NULL) || j != k) {
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
	if (f == INVALID_HANDLE_VALUE) {
	    run_err("%s: Cannot create file", namebuf);
	    continue;
	}

	back->send("", 1);

	if (statistics) {
	    stat_bytes = 0;
	    stat_starttime = time(NULL);
	    stat_lasttime = 0;
	    if ((stat_name = strrchr(namebuf, '/')) == NULL)
		stat_name = namebuf;
	    else
		stat_name++;
	    if (strrchr(stat_name, '\\') != NULL)
		stat_name = strrchr(stat_name, '\\') + 1;
	}

	for (i = 0; i < size; i += 4096) {
	    char transbuf[4096];
	    DWORD j, k = 4096;
	    if (i + k > size)
		k = size - i;
	    if (ssh_scp_recv(transbuf, k) == 0)







<
|
|
|
|
|
|
|
|
|
<







930
931
932
933
934
935
936

937
938
939
940
941
942
943
944
945

946
947
948
949
950
951
952
	if (f == INVALID_HANDLE_VALUE) {
	    run_err("%s: Cannot create file", namebuf);
	    continue;
	}

	back->send("", 1);


	stat_bytes = 0;
	stat_starttime = time(NULL);
	stat_lasttime = 0;
	if ((stat_name = strrchr(namebuf, '/')) == NULL)
	    stat_name = namebuf;
	else
	    stat_name++;
	if (strrchr(stat_name, '\\') != NULL)
	    stat_name = strrchr(stat_name, '\\') + 1;


	for (i = 0; i < size; i += 4096) {
	    char transbuf[4096];
	    DWORD j, k = 4096;
	    if (i + k > size)
		k = size - i;
	    if (ssh_scp_recv(transbuf, k) == 0)