Book a Demo!
CoCalc Logo Icon
StoreFeaturesDocsShareSupportNewsAboutPoliciesSign UpSign In
freebsd
GitHub Repository: freebsd/freebsd-ports
 Path: blob/main/japanese/FreeWnn-lib/files/patch-Wnn-jserver-do_filecom.c
18157 views
1
Index: Wnn/jserver/do_filecom.c

2
===================================================================

3
RCS file: /home/cvs/private/hrs/freewnn/Wnn/jserver/do_filecom.c,v

4
retrieving revision 1.1.1.1

5
retrieving revision 1.2

6
diff -u -p -r1.1.1.1 -r1.2

7
--- Wnn/jserver/do_filecom.c	20 Dec 2008 07:13:30 -0000	1.1.1.1

8
+++ Wnn/jserver/do_filecom.c	2 Jan 2010 11:51:24 -0000	1.2

9
@@ -868,82 +868,96 @@ js_file_write (void)

10
 void

11
 js_file_receive (void)

12
 {

13
-  int env_id, fid;

14
-  struct wnn_file_uniq fq;

15
-  int mode = 1;

16
-  int i;

17
-  int error = 0;

18
+	int env_id, fid;

19
+	struct wnn_file_uniq fq;

20
+	int mode = 1;

21
+	int i;

22
+	int error = 0;

23
+

24
+	env_id = get4_cur();         /* env_id */

25
+	fid = get4_cur();

26
+	if (find_fid_in_env(env_id, fid) == -1) {

27
+		fprintf(stderr, "find_fid_in_env failed\n");

28
+

29
+		/* valid */

30
+		/* dummy */

31
+		puts_cur ("!");

32
+		putc_purge();

33
+		

34
+		error = 1;

35
+	} else {

36
+		fprintf(stderr, "find_fid_in_env success: %s\n",

37
+			files[fid].name);

38
+		puts_cur(files[fid].name);

39
+		putc_purge();

40
+

41
+	}

42
+

43
+	fprintf(stderr, "get4\n");

44
+       	if (get4_cur() == -1) {

45
+		/* Ack */

46
+		return;

47
+	}

48
+	fprintf(stderr, "get4: end\n");

49
+

50
+	fprintf(stderr, "get4 x 3 start\n");

51
+

52
+	fq.time = get4_cur();

53
+	fq.dev = get4_cur();

54
+	fq.inode = get4_cur();

55
+

56
+	fprintf(stderr, "get4 x 3 end\n");

57
+

58
+	for (i = 0; i < WNN_HOSTLEN; i++) {

59
+		fq.createhost[i] = getc_cur();

60
+	}

61
+

62
+	if (error || files[fid].ref_count == -1) {

63
+		wnn_errorno = WNN_FID_ERROR;

64
+		error_ret ();

65
+		putc_purge ();

66
+		return;

67
+	}

68
+

69
+	if (fq.time != 0) {

70
+		/* Old File Exist */

71
+		mode = must_write_file (&files[fid], &fq);

72
+	}

73
+

74
+	if (mode == -1) {

75
+		wnn_errorno = WNN_FID_ERROR;

76
+		error_ret ();

77
+		putc_purge ();

78
+		return;

79
+	} else if (mode == 0) {

80
+		/* need not saving */

81
+		put4_cur(0);

82
+		putc_purge();

83
+		return;

84
+	}

85
+

86
+	put4_cur (mode);

87
+	putc_purge ();

88
+

89
+	if (get4_cur () == -1)

90
+		return;

91
+

92
+	if (rcv_file (&files[fid], mode) == -1) {

93
+		/*      wnn_errorno=WNN_FILE_WRITE_ERROR; */

94
+		error_ret();

95
+		putc_purge();

96
+		return;

97
+	}

98
+

99
+	if (mode == 1 || mode == 2) {

100
+		clear_dirty_bit (&files[fid]);

101
+	}

102
 

103
-  env_id = get4_cur ();         /* env_id */

104
-  fid = get4_cur ();

105
-   /**/ if (find_fid_in_env (env_id, fid) == -1)

106
-    {                           /* valid */

107
-      puts_cur ("!");

108
-      putc_purge ();            /* dummy */

109
-      error = 1;

110
-    }

111
-  else

112
-    {

113
-      puts_cur (files[fid].name);

114
-      putc_purge ();

115
-    }

116
-  if (get4_cur () == -1)

117
-    return;                     /* Ack */

118
-

119
-  fq.time = get4_cur ();

120
-  fq.dev = get4_cur ();

121
-  fq.inode = get4_cur ();

122
-  for (i = 0; i < WNN_HOSTLEN; i++)

123
-    {

124
-      fq.createhost[i] = getc_cur ();

125
-    }

126
-  if (error || files[fid].ref_count == -1)

127
-    {

128
-      wnn_errorno = WNN_FID_ERROR;

129
-      error_ret ();

130
-      putc_purge ();

131
-      return;

132
-    }

133
-  if (fq.time != 0)

134
-    {                           /* Old File Exist */

135
-      mode = must_write_file (&files[fid], &fq);

136
-    }

137
-

138
-  if (mode == -1)

139
-    {

140
-      wnn_errorno = WNN_FID_ERROR;

141
-      error_ret ();

142
-      putc_purge ();

143
-      return;

144
-    }

145
-  else if (mode == 0)

146
-    {                           /* need not saving */

147
-      put4_cur (0);

148
-      putc_purge ();

149
-      return;

150
-    }

151
-  put4_cur (mode);

152
-  putc_purge ();

153
-

154
-  if (get4_cur () == -1)

155
-    return;

156
-

157
-   /**/ if (rcv_file (&files[fid], mode) == -1)

158
-    {

159
-/*      wnn_errorno=WNN_FILE_WRITE_ERROR; */ error_ret ();

160
-      putc_purge ();

161
-      return;

162
-    }

163
-  if (mode == 1 || mode == 2)

164
-    {

165
-      clear_dirty_bit (&files[fid]);

166
-    }

167
-

168
-  put4_cur (0);

169
+	put4_cur (0);

170
 /*

171
- put4_cur(fid);

172
+  put4_cur(fid);

173
 */

174
-  putc_purge ();

175
+	putc_purge();

176
 }

177
 

178
 

179
@@ -994,18 +1008,18 @@ del_fid_from_env (int env_id, int fid)

180
 int

181
 find_fid_in_env (int env_id, int fid)

182
 {

183
-  register int i;

184
-  register int *file = env[env_id]->file;

185
-  for (i = 0; i < WNN_MAX_FILE_OF_AN_ENV; i++)

186
-    {

187
-      if ((file)[i] == -1)

188
-        continue;

189
-      if ((file)[i] == fid)

190
-        {

191
-          return i;

192
-        }

193
-    }

194
-  return -1;

195
+	int i;

196
+	int *file = env[env_id]->file;

197
+

198
+	for (i = 0; i < WNN_MAX_FILE_OF_AN_ENV; i++) {

199
+		if ((file)[i] == -1)

200
+			continue;

201
+		if ((file)[i] == fid) {

202
+			return i;

203
+		}

204
+	}

205
+

206
+	return -1;

207
 }

208
 

209
 static int

210


211