annotate netinstall/simpsock.cc @ 844:047d37eb70d7

[xemacs-hg @ 2002-05-16 13:30:23 by ben] ui fixes for things that were bothering me bytecode.c, editfns.c, lisp.h, lread.c: Fix save-restriction to use markers rather than pseudo-markers (integers representing the amount of text on either side of the region). That way, all inserts are handled correctly, not just those inside old restriction. Add buffer argument to save_restriction_save(). process.c: Clean up very dirty and kludgy code that outputs into a buffer -- use proper unwind protects, etc. font-lock.c: Do save-restriction/widen around the function -- otherwise, incorrect results will ensue when a buffer has been narrowed before a call to e.g. `buffer-syntactic-context' -- something that happens quite often. fileio.c: Look for a handler for make-temp-name. window.c, winslots.h: Try to solve this annoying problem: have two frames displaying the buffer, in different places; in one, temporarily switch away to another buffer and then back -- and you've lost your position; it's reset to the other one in the other frame. My current solution involves window-level caches of buffers and points (also a cache for window-start); when set-window-buffer is called, it looks to see if the buffer was previously visited in the window, and if so, uses the most recent point at that time. (It's a marker, so it handles changes.) #### Note: It could be argued that doing it on the frame level would be better -- e.g. if you visit a buffer temporarily through a grep, and then go back to that buffer, you presumably want the grep's position rather than some previous position provided everything was in the same frame, even though the grep was in another window in the frame. However, doing it on the frame level fails when you have two windows on the same frame. Perhaps we keep both a window and a frame cache, and use the frame cache if there are no other windows on the frame showing the buffer, else the window's cache? This is probably something to be configurable using a specifier. Suggestions please please please? window.c: Clean up a bit code that deals with the annoyance of window-point vs. point. dialog.el: Function to ask a multiple-choice question, automatically choosing a dialog box or minibuffer representation as necessary. Generalized version of yes-or-no-p, y-or-n-p. files.el: Use get-user-response to ask "yes/no/diff" question when recovering. "diff" means that a diff is displayed between the current file and the autosave. (Converts/deconverts escape-quoted as necessary. No more complaints from you, Mr. Turnbull!) One known problem: when a dialog is used, it's modal, so you can't scroll the diff. Will fix soon. lisp-mode.el: If we're filling a string, don't treat semicolon as a comment, which would give very unfriendly results. Uses `buffer-syntactic-context'. simple.el: all changes back to the beginning. (Useful if you've saved the file in the middle of the changes.) simple.el: Add option kill-word-into-kill-ring, which controls whether words deleted with kill-word, backward-kill-word, etc. are "cut" into the kill ring, or "cleared" into nothingness. (My preference is the latter, by far. I'd almost go so far as suggesting we make it the default, as you can always select a word and then cut it if you want it cut.) menubar-items.el: Add option corresponding to kill-word-into-kill-ring.
author ben
date Thu, 16 May 2002 13:30:58 +0000
parents 3078fd1074e8
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
448
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
1 /*
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
2 * Copyright (c) 2000, Red Hat, Inc.
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
3 *
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
4 * This program is free software; you can redistribute it and/or modify
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
5 * it under the terms of the GNU General Public License as published by
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
6 * the Free Software Foundation; either version 2 of the License, or
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
7 * (at your option) any later version.
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
8 *
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
9 * A copy of the GNU General Public License can be found at
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
10 * http://www.gnu.org/
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
11 *
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
12 * Written by DJ Delorie <dj@cygnus.com>
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
13 *
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
14 */
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
15
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
16 /* Simplified socket access functions */
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
17
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
18 #include "win32.h"
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
19 #include <winsock.h>
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
20 #include <stdio.h>
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
21 #include <stdarg.h>
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
22 #include <stdlib.h>
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
23
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
24 #include "simpsock.h"
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
25 #include "msg.h"
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
26
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
27 #define SSBUFSZ 1024
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
28
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
29 SimpleSocket::SimpleSocket (char *hostname, int port)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
30 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
31 static int initted = 0;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
32 if (!initted)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
33 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
34 initted = 1;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
35 WSADATA d;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
36 WSAStartup (MAKEWORD (1,1), &d);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
37 }
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
38
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
39 s = INVALID_SOCKET;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
40 buf = (char *) malloc (SSBUFSZ + 3);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
41 putp = getp = 0;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
42
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
43 int i1, i2, i3, i4;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
44 unsigned char ip[4];
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
45
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
46 if (sscanf (hostname, "%d.%d.%d.%d", &i1, &i2, &i3, &i4) == 4)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
47 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
48 ip[0] = i1;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
49 ip[1] = i2;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
50 ip[2] = i3;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
51 ip[3] = i4;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
52 }
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
53 else
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
54 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
55 struct hostent *he;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
56 he = gethostbyname (hostname);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
57 if (!he)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
58 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
59 msg ("Can't resolve `%s'\n", hostname);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
60 return;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
61 }
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
62 memcpy (ip, he->h_addr_list[0], 4);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
63 }
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
64
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
65 s = socket (AF_INET, SOCK_STREAM, 0);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
66 if (s == INVALID_SOCKET)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
67 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
68 msg ("Can't create socket, %d", WSAGetLastError ());
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
69 return;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
70 }
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
71
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
72 struct sockaddr_in name;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
73
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
74 memset (&name, 0, sizeof (name));
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
75 name.sin_family = AF_INET;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
76 name.sin_port = htons (port);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
77 memcpy (&name.sin_addr, ip, 4);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
78
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
79 if (connect (s, (sockaddr *)&name, sizeof(name)))
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
80 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
81 msg ("Can't connect to %s:%d", hostname, port);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
82 closesocket (s);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
83 s = INVALID_SOCKET;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
84 return;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
85 }
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
86
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
87 return;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
88 }
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
89
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
90 SimpleSocket::~SimpleSocket ()
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
91 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
92 if (s != INVALID_SOCKET)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
93 closesocket (s);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
94 s = INVALID_SOCKET;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
95 if (buf)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
96 free (buf);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
97 buf = 0;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
98 }
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
99
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
100 int
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
101 SimpleSocket::ok ()
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
102 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
103 if (s == INVALID_SOCKET)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
104 return 0;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
105 return 1;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
106 }
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
107
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
108 int
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
109 SimpleSocket::printf (char *fmt, ...)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
110 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
111 char localbuf[SSBUFSZ];
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
112 va_list args;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
113 va_start (args, fmt);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
114 vsprintf (localbuf, fmt, args);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
115 return send (s, localbuf, strlen (localbuf), 0);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
116 }
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
117
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
118 int
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
119 SimpleSocket::write (char *localbuf, int len)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
120 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
121 return send (s, localbuf, len, 0);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
122 }
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
123
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
124 int
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
125 SimpleSocket::fill ()
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
126 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
127 if (putp == getp)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
128 putp = getp = 0;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
129
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
130 int n = SSBUFSZ - putp;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
131 if (n == 0)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
132 return 0;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
133 int r = recv (s, buf + putp, n, 0);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
134 if (r > 0)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
135 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
136 putp += r;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
137 return r;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
138 }
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
139 return 0;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
140 }
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
141
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
142 char *
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
143 SimpleSocket::gets ()
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
144 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
145 if (getp > 0 && putp > getp)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
146 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
147 memmove (buf, buf+getp, putp-getp);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
148 putp -= getp;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
149 getp = 0;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
150 }
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
151 if (putp == getp)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
152 fill();
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
153
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
154 // getp is zero, always, here, and putp is the count
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
155 char *nl;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
156 while ((nl = (char *)memchr (buf, '\n', putp)) == NULL && putp < SSBUFSZ)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
157 if (fill () <= 0)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
158 break;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
159
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
160 if (nl)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
161 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
162 getp = nl - buf + 1;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
163 while ((*nl == '\n' || *nl == '\r') && nl >= buf)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
164 *nl-- = 0;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
165 }
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
166 else
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
167 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
168 getp = putp;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
169 nl = buf + putp;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
170 nl[1] = 0;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
171 }
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
172
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
173 return buf;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
174 }
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
175
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
176 #define MIN(a,b) ((a) < (b) ? (a) : (b))
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
177
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
178 int
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
179 SimpleSocket::read (char *ubuf, int ulen)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
180 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
181 int n, rv=0;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
182 if (putp > getp)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
183 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
184 n = MIN (ulen, putp-getp);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
185 memmove (ubuf, buf+getp, n);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
186 getp += n;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
187 ubuf += n;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
188 ulen -= n;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
189 rv += n;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
190 }
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
191 while (ulen > 0)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
192 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
193 n = recv (s, ubuf, ulen, 0);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
194 if (n <= 0)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
195 return rv;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
196 ubuf += n;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
197 ulen -= n;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
198 rv += n;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
199 }
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
200 return rv;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
201 }