annotate netinstall/simpsock.cc @ 814:a634e3b7acc8

[xemacs-hg @ 2002-04-14 12:41:59 by ben] latest changes TODO.ben-mule-21-5: Update. make-docfile.c: Add basic support for handling ISO 2022 doc strings -- we parse the basic charset designation sequences so we know whether we're in ASCII and have to pay attention to end quotes and such. Reformat code according to coding standards. abbrev.el: Add `global-abbrev-mode', which turns on or off abbrev-mode in all buffers. Added `defining-abbrev-turns-on-abbrev-mode' -- if non-nil, defining an abbrev through an interactive function will automatically turn on abbrev-mode, either globally or locally depending on the command. This is the "what you'd expect" behavior. indent.el: general function for indenting a balanced expression in a mode-correct way. Works similar to indent-region in that a mode can specify a specific command to do the whole operation; if not, figure out the region using forward-sexp and indent each line using indent-according-to-mode. keydefs.el: Removed. Modify M-C-backslash to do indent-region-or-balanced-expression. Make S-Tab just insert a TAB char, like it's meant to do. make-docfile.el: Now that we're using the call-process-in-lisp, we need to load an extra file win32-native.el because we're running a bare temacs. menubar-items.el: Totally redo the Cmds menu so that most used commands appear directly on the menu and less used commands appear in submenus. The old way may have been very pretty, but rather impractical. process.el: Under Windows, don't ever use old-call-process-internal, even in batch mode. We can do processes in batch mode. subr.el: Someone recoded truncate-string-to-width, saying "the FSF version is too complicated and does lots of hard-to-understand stuff" but the resulting recoded version was *totally* wrong! it misunderstood the basic point of this function, which is work in *columns* not chars. i dumped ours and copied the version from FSF 21.1. Also added truncate-string-with-continuation-dots, since this idiom is used often. config.inc.samp, xemacs.mak: Separate out debug and optimize flags. Remove all vestiges of USE_MINIMAL_TAGBITS, USE_INDEXED_LRECORD_IMPLEMENTATION, and GUNG_HO, since those ifdefs have long been removed. Make error-checking support actually work. Some rearrangement of config.inc.samp to make it more logical. Remove callproc.c and ntproc.c from xemacs.mak, no longer used. Make pdump the default. lisp.h: Add support for strong type-checking of Bytecount, Bytebpos, Charcount, Charbpos, and others, by making them classes, overloading the operators to provide integer-like operation and carefully controlling what operations are allowed. Not currently enabled in C++ builds because there are still a number of compile errors, and it won't really work till we merge in my "8-bit-Mule" workspace, in which I make use of the new types Charxpos, Bytexpos, Memxpos, representing a "position" either in a buffer or a string. (This is especially important in the extent code.) abbrev.c, alloc.c, eval.c, buffer.c, buffer.h, editfns.c, fns.c, text.h: Warning fixes, some of them related to new C++ strict type checking of Bytecount, Charbpos, etc. dired.c: Caught an actual error due to strong type checking -- char len being passed when should be byte len. alloc.c, backtrace.h, bytecode.c, bytecode.h, eval.c, sysdep.c: Further optimize Ffuncall: -- process arg list at compiled-function creation time, converting into an array for extra-quick access at funcall time. -- rewrite funcall_compiled_function to use it, and inline this function. -- change the order of check for magic stuff in SPECBIND_FAST_UNSAFE to be faster. -- move the check for need to garbage collect into the allocation code, so only a single flag needs to be checked in funcall. buffer.c, symbols.c: add debug funs to check on mule optimization info in buffers and strings. eval.c, emacs.c, text.c, regex.c, scrollbar-msw.c, search.c: Fix evil crashes due to eistrings not properly reinitialized under pdump. Redo a bit some of the init routines; convert some complex_vars_of() into simple vars_of(), because they didn't need complex processing. callproc.c, emacs.c, event-stream.c, nt.c, process.c, process.h, sysdep.c, sysdep.h, syssignal.h, syswindows.h, ntproc.c: Delete. Hallelujah, praise the Lord, there is no god but Allah!!! fix so that processes can be invoked in bare temacs -- thereby eliminating any need for callproc.c. (currently only eliminated under NT.) remove all crufty and unnecessary old process code in ntproc.c and elsewhere. move non-callproc-specific stuff (mostly environment) into process.c, so callproc.c can be left out under NT. console-tty.c, doc.c, file-coding.c, file-coding.h, lstream.c, lstream.h: fix doc string handling so it works with Japanese, etc docs. change handling of "character mode" so callers don't have to manually set it (quite error-prone). event-msw.c: spacing fixes. lread.c: eliminate unused crufty vintage-19 "FSF defun hack" code. lrecord.h: improve pdump description docs. buffer.c, ntheap.c, unexnt.c, win32.c, emacs.c: Mule-ize some unexec and startup code. It was pseudo-Mule-ized before by simply always calling the ...A versions of functions, but that won't cut it -- eventually we want to be able to run properly even if XEmacs has been installed in a Japanese directory. (The current problem is the timing of the loading of the Unicode tables; this will eventually be fixed.) Go through and fix various other places where the code was not Mule-clean. Provide a function mswindows_get_module_file_name() to get our own name without resort to PATH_MAX and such. Add a big comment in main() about the problem with Unicode table load timing that I just alluded to. emacs.c: When error-checking is enabled (interpreted as "user is developing XEmacs"), don't ask user to "pause to read messages" when a fatal error has occurred, because it will wedge if we are in an inner modal loop (typically when a menu is popped up) and make us unable to get a useful stack trace in the debugger. text.c: Correct update_entirely_ascii_p_flag to actually work. lisp.h, symsinit.h: declarations for above changes.
author ben
date Sun, 14 Apr 2002 12:43:31 +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 }