1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
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
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
|
Index: Wnn/jserver/do_filecom.c
===================================================================
RCS file: /home/cvs/private/hrs/freewnn/Wnn/jserver/do_filecom.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -p -r1.1.1.1 -r1.2
--- Wnn/jserver/do_filecom.c 20 Dec 2008 07:13:30 -0000 1.1.1.1
+++ Wnn/jserver/do_filecom.c 2 Jan 2010 11:51:24 -0000 1.2
@@ -868,82 +868,96 @@ js_file_write (void)
void
js_file_receive (void)
{
- int env_id, fid;
- struct wnn_file_uniq fq;
- int mode = 1;
- int i;
- int error = 0;
+ int env_id, fid;
+ struct wnn_file_uniq fq;
+ int mode = 1;
+ int i;
+ int error = 0;
+
+ env_id = get4_cur(); /* env_id */
+ fid = get4_cur();
+ if (find_fid_in_env(env_id, fid) == -1) {
+ fprintf(stderr, "find_fid_in_env failed\n");
+
+ /* valid */
+ /* dummy */
+ puts_cur ("!");
+ putc_purge();
+
+ error = 1;
+ } else {
+ fprintf(stderr, "find_fid_in_env success: %s\n",
+ files[fid].name);
+ puts_cur(files[fid].name);
+ putc_purge();
+
+ }
+
+ fprintf(stderr, "get4\n");
+ if (get4_cur() == -1) {
+ /* Ack */
+ return;
+ }
+ fprintf(stderr, "get4: end\n");
+
+ fprintf(stderr, "get4 x 3 start\n");
+
+ fq.time = get4_cur();
+ fq.dev = get4_cur();
+ fq.inode = get4_cur();
+
+ fprintf(stderr, "get4 x 3 end\n");
+
+ for (i = 0; i < WNN_HOSTLEN; i++) {
+ fq.createhost[i] = getc_cur();
+ }
+
+ if (error || files[fid].ref_count == -1) {
+ wnn_errorno = WNN_FID_ERROR;
+ error_ret ();
+ putc_purge ();
+ return;
+ }
+
+ if (fq.time != 0) {
+ /* Old File Exist */
+ mode = must_write_file (&files[fid], &fq);
+ }
+
+ if (mode == -1) {
+ wnn_errorno = WNN_FID_ERROR;
+ error_ret ();
+ putc_purge ();
+ return;
+ } else if (mode == 0) {
+ /* need not saving */
+ put4_cur(0);
+ putc_purge();
+ return;
+ }
+
+ put4_cur (mode);
+ putc_purge ();
+
+ if (get4_cur () == -1)
+ return;
+
+ if (rcv_file (&files[fid], mode) == -1) {
+ /* wnn_errorno=WNN_FILE_WRITE_ERROR; */
+ error_ret();
+ putc_purge();
+ return;
+ }
+
+ if (mode == 1 || mode == 2) {
+ clear_dirty_bit (&files[fid]);
+ }
- env_id = get4_cur (); /* env_id */
- fid = get4_cur ();
- /**/ if (find_fid_in_env (env_id, fid) == -1)
- { /* valid */
- puts_cur ("!");
- putc_purge (); /* dummy */
- error = 1;
- }
- else
- {
- puts_cur (files[fid].name);
- putc_purge ();
- }
- if (get4_cur () == -1)
- return; /* Ack */
-
- fq.time = get4_cur ();
- fq.dev = get4_cur ();
- fq.inode = get4_cur ();
- for (i = 0; i < WNN_HOSTLEN; i++)
- {
- fq.createhost[i] = getc_cur ();
- }
- if (error || files[fid].ref_count == -1)
- {
- wnn_errorno = WNN_FID_ERROR;
- error_ret ();
- putc_purge ();
- return;
- }
- if (fq.time != 0)
- { /* Old File Exist */
- mode = must_write_file (&files[fid], &fq);
- }
-
- if (mode == -1)
- {
- wnn_errorno = WNN_FID_ERROR;
- error_ret ();
- putc_purge ();
- return;
- }
- else if (mode == 0)
- { /* need not saving */
- put4_cur (0);
- putc_purge ();
- return;
- }
- put4_cur (mode);
- putc_purge ();
-
- if (get4_cur () == -1)
- return;
-
- /**/ if (rcv_file (&files[fid], mode) == -1)
- {
-/* wnn_errorno=WNN_FILE_WRITE_ERROR; */ error_ret ();
- putc_purge ();
- return;
- }
- if (mode == 1 || mode == 2)
- {
- clear_dirty_bit (&files[fid]);
- }
-
- put4_cur (0);
+ put4_cur (0);
/*
- put4_cur(fid);
+ put4_cur(fid);
*/
- putc_purge ();
+ putc_purge();
}
@@ -994,18 +1008,18 @@ del_fid_from_env (int env_id, int fid)
int
find_fid_in_env (int env_id, int fid)
{
- register int i;
- register int *file = env[env_id]->file;
- for (i = 0; i < WNN_MAX_FILE_OF_AN_ENV; i++)
- {
- if ((file)[i] == -1)
- continue;
- if ((file)[i] == fid)
- {
- return i;
- }
- }
- return -1;
+ int i;
+ int *file = env[env_id]->file;
+
+ for (i = 0; i < WNN_MAX_FILE_OF_AN_ENV; i++) {
+ if ((file)[i] == -1)
+ continue;
+ if ((file)[i] == fid) {
+ return i;
+ }
+ }
+
+ return -1;
}
static int
|
