WebSVN – Kolibri OS – Diff – /programs/cmm/liza/mail_box.c

 					DrawMailList();
+				}
 				if (id==EXIT_MAIL)
+				{
 					StopLoading();
-					CloseSocket(socket);
+					Close(socketnum);
 					LoginBoxLoop();
+				}
 				if (id==CHANGE_CHARSET)
+				{
 					DefineButton(0,0,Form.cwidth,Form.cheight, CLOSE_CHANGE_CHARSET+BT_HIDE+BT_NOFRAME);
 			default:
 				if (aim == SEND_NSTAT)
+				{
 					debug("Counting mail, awaiting answer...");
 					request_len = GetRequest("STAT", NULL);
-					WriteSocket(socket,request_len,#request);
+					Send(socketnum, #request, request_len, 0);
 					if (EAX == 0xffffffff) { debug("Error sending STAT. Retry..."w); break;}
 					aim = GET_ANSWER_NSTAT;
+				}
 				if (aim == GET_ANSWER_NSTAT)
 				{
-					if (!PollSocket(socket)) break;
+					ticks = Receive(socketnum, #immbuffer, BUFFERSIZE, 0);
-					socket_char=ReadSocket(socket);
-					immputc(socket_char);
+					if ((ticks == 0xffffff) || (ticks < 2)) break;
-					if (socket_char=='\n')
+					if (immbuffer[ticks-2]=='\n')
+					{
 						debug("GOT::");
 						debug(#immbuffer);
 							debug(itoa(mail_list.count));
 							listbuffer = free(listbuffer);
 							listbuffer = mem_Alloc(30*mail_list.count); //24* original
 							listpointer = listbuffer;
 							aim = SEND_NLIST;
-							debug("Recieving mail list...");
+							debug("Receiving mail list...");
-							immfree();
+						}
 						else
+						{
 							notify("Sorry, can't recieve your mail");
-							immfree();
 							aim=NULL;    //aim = SEND_NLIST;
+						}
+					}
+				}
 				if (aim == SEND_NLIST)
+				{
 					WriteText(5, Form.cheight-11, 0x80, sc.work_text, "Send LIST, awaiting answer...");
 					request_len = GetRequest("LIST", NULL);
-					WriteSocket(socket,request_len,#request);
+					Send(socketnum, #request, request_len, 0);
 					if (EAX == 0xffffffff) {debug("Error while sending LIST. Retry..."); break;}
 					aim = GET_ANSWER_NLIST;
+				}
 				if (aim == GET_ANSWER_NLIST)
 				{
-					ticks = PollSocket(socket);
-					if (!ticks) break;
-					for (;ticks>0;ticks--)
-					{
+					ticks = Receive(socketnum, #immbuffer, BUFFERSIZE, 0);
+					if ((ticks == 0xffffffff) || (ticks < 3)) break;
-						socket_char=ReadSocket(socket);
-						listputc(socket_char);
+					//for (;ticks>0;ticks--)
 					//{
-						if (socket_char=='.') //this way of checking end of message IS BAD
+						if (immbuffer[ticks-3]=='.') 	//this way of checking end of message IS BAD
+						{
 							aim = SEND_RETR;
 							debug("Got mail list");
 							DrawMailBox();
 							atr.CreateArray();
-							atr.CreateArray();
+							atr.SetSizes();
 							atr.SetSizes();
 					//}
+				}
 				if (aim == SEND_RETR)
+				{
 					from = to = date = subj = cur_charset = NULL;
 					letter_view.ClearList();
 					DrawMailBox();
 					debug("Send RETR, awaiting answer...");
 					request_len = GetRequest("RETR", itoa(mail_list.current+1));
-					WriteSocket(socket,request_len,#request);
+					Send(socketnum, #request, request_len, 0);
+					if (EAX == 0xffffffff) { notify("Error while trying to get letter from server"); aim=NULL; break;}
 					if (EAX == 0xffffffff) { notify("Error while trying to get letter from server"); aim=NULL; break;}
 					mailbuffer = free(mailbuffer);
-					mailbuffer = free(mailbuffer);
+					letter_size = atr.GetSize(mail_list.current+1) + 1024;
+					mailbuffer = malloc(letter_size);
-					letter_size = atr.GetSize(mail_list.current+1) + 1024;
+					if (!mailbuffer) {debug("alloc error!"); aim=NULL; break;}
-					mailbuffer = malloc(letter_size);
+					mailpointer = mailbuffer;
+					aim = GET_ANSWER_RETR;
-					mailpointer = mailbuffer;
+				}
-					aim = GET_ANSWER_RETR;
+				if (aim == GET_ANSWER_RETR)
+				{
+					ticks = Receive(socketnum, mailpointer, letter_size + mailbuffer - mailpointer , MSG_DONTWAIT);
+					if (ticks == 0xffffffff) break;
+					if (ticks == 0) break;
-				}
-				if (aim == GET_ANSWER_RETR)
-				{
-					ticks=PollSocket(socket);
-					if (!ticks) break;
-					for (;ticks>0;ticks--)
 					//debugi(EAX);
 						socket_char=ReadSocket(socket);
-						//debugch(socket_char);
+					mailpointer = mailpointer + ticks;
-						*mailpointer=socket_char;
+					//*mailpointer='\0';
-						mailpointer++;
+					//debug(mailbuffer);
 						*mailpointer='\0';
-						if (!aim) continue;
+					if (!aim) continue;
-						if (letter_size + mailbuffer - mailpointer - 2 < 0)
+					if (letter_size + mailbuffer - mailpointer - 2 < 0)
+					{
-							debug("Buffer overflow!!1 Realloc..."w);
+						debug("Resizing buffer");
-							letter_size += 4096;
+						letter_size += 4096;
-							mailbuffer = realloc(mailbuffer, letter_size);
+						mailbuffer = realloc(mailbuffer, letter_size);
-							if (!mailbuffer) {debug("Relloc error!"); aim=NULL; break;}
+						if (!mailbuffer) {debug("Realloc error!"); aim=NULL; break;}
-						}
+					}
 						if (letter_size>9000)
 					if (letter_size>9000)
 							id = mailpointer - mailbuffer * 100 ;
-							id /= letter_size - 1024;
+						id = mailpointer - mailbuffer * 100 ;
 void StopLoading()
+{
 	aim = NULL;
 	mailbuffer = free(mailbuffer);
 	to = from = date = subj = cur_charset = NULL;
-	while (PollSocket(socket)) ReadSocket(socket);
+}
 int GetMailCount(){
 	char tmpbuf4[512];

Subversion Repositories Kolibri OS

(root)/programs/cmm/liza/mail_box.c – Rev 3439 → 4139