Mercurial > hg > xemacs-beta
view lib-src/tcp.c @ 5634:2014ff433daf
Support hash COLLECTIONs, #'{all,try}-completion{s,}; add #'test-completion
src/ChangeLog addition:
2012-01-01 Aidan Kehoe <kehoea@parhasard.net>
Add #'test-completion, API from GNU.
Accept hash table COLLECTIONs in it and in the other
completion-oriented functions, #'try-completion,
#'all-completions, and those Lisp functions implemented in terms
of them.
* lisp.h: Update the prototype of map_obarray(), making FN
compatible with the FUNCTION argument of elisp_maphash();
* abbrev.c (abbrev_match_mapper):
* abbrev.c (record_symbol):
* doc.c (verify_doc_mapper):
* symbols.c (mapatoms_1):
* symbols.c (apropos_mapper):
Update these mapper functions to reflect the new argument to
map_obarray().
* symbols.c (map_obarray):
Call FN with two arguments, the string name of the symbol, and the
symbol itself, for API (mapper) compatibility with
elisp_maphash().
* minibuf.c (map_completion): New. Map a maphash_function_t across
a non function COLLECTION, as appropriate for #'try-completion and
friends.
* minibuf.c (map_completion_list): New. Map a maphash_function_t
across a pseudo-alist, as appropriate for the completion
functions.
* minibuf.c (ignore_completion_p): PRED needs to be called with
two args if and only if the collection is a hash table. Implement
this.
* minibuf.c (try_completion_mapper): New. The loop body of
#'try-completion, refactored out.
* minibuf.c (Ftry_completion): Use try_completion_mapper(),
map_completion().
* minibuf.c (all_completions_mapper): New. The loop body of
#'all-completions, refactored out.
* minibuf.c (Fall_completions): Use all_completions_mapper(),
map_completion().
* minibuf.c (test_completion_mapper): New. The loop body of
#'test-completion.
* minibuf.c (Ftest_completion): New, API from GNU.
* minibuf.c (syms_of_minibuf): Make Ftest_completion available.
tests/ChangeLog addition:
2012-01-01 Aidan Kehoe <kehoea@parhasard.net>
* automated/completion-tests.el: New.
Test #'try-completion, #'all-completion and #'test-completion with
list, vector and hash-table COLLECTION arguments.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Sun, 01 Jan 2012 15:18:52 +0000 |
parents | b9167d522a9a |
children |
line wrap: on
line source
/* * TCP/IP stream emulation for XEmacs. * Copyright (C) 1988, 1989, 1992, 1993 Free Software Foundation, Inc. * Author: Masanobu Umeda * Maintainer: umerin@mse.kyutech.ac.jp This file is part of XEmacs. XEmacs is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. XEmacs is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with XEmacs. If not, see <http://www.gnu.org/licenses/>. * * Yasunari, Itoh at PFU limited contributed for Fujitsu UTS and SX/A. * * Thu Apr 6 13:47:37 JST 1989 * USG fixes by Sakaeda <saka@mickey.trad.pf.fujitsu.junet> * * For Fujitsu UTS compile with: * cc -O -o tcp tcp.c -DFUJITSU_UTS -lu -lsocket */ #ifdef HAVE_CONFIG_H #include <config.h> #endif #include <stdio.h> #include <fcntl.h> #include <ctype.h> #include <sys/types.h> #ifdef FUJITSU_UTS #define USG #include <sys/ucbtypes.h> #include <sys/tisp/socket.h> #include <netdb.h> #include <sys/tisp/in.h> #else #include <sys/socket.h> #include <netdb.h> #include <netinet/in.h> #endif #ifdef USG #include <sys/stat.h> #include "syssignal.h" #endif #ifdef USG int selectable = 1; sigout () { fcntl (fileno (stdin), F_SETFL, 0); exit (-1); } #endif main (argc, argv) int argc; char *argv[]; { struct hostent *host; struct sockaddr_in sockin, sockme; struct servent *serv; char *hostname = NULL; char *service = "nntp"; int port; int readfds; int writefds; int server; /* NNTP Server */ int emacsIn = fileno (stdin); /* Emacs intput */ int emacsOut = fileno (stdout); /* Emacs output */ char buffer[1024]; int nbuffer; /* Number of bytes in buffer */ int wret; char *retry; /* retry bufferp */ int false = 0; /* FALSE flag for setsockopt () */ if (argc < 2) { fprintf (stderr, "Usage: %s HOST [SERVICE]\n", argv[0]); exit (1); } if (argc >= 2) hostname = argv[1]; if (argc >= 3) service = argv[2]; if ((host = gethostbyname (hostname)) == NULL) { perror ("gethostbyname"); exit (1); } if (isdigit (service[0])) port = atoi (service); else { serv = getservbyname (service, "tcp"); if (serv == NULL) { perror ("getservbyname"); exit (1); } port = serv->s_port; } memset (&sockin, 0, sizeof (sockin)); sockin.sin_family = host->h_addrtype; memcpy (&sockin.sin_addr, host->h_addr, host->h_length); sockin.sin_port = port; if ((server = socket (AF_INET, SOCK_STREAM, 0)) < 0) { perror ("socket"); exit (1); } if (setsockopt (server, SOL_SOCKET, SO_REUSEADDR, &false, sizeof (false))) { perror ("setsockopt"); exit (1); } memset (&sockme, 0, sizeof (sockme)); sockme.sin_family = sockin.sin_family; sockme.sin_addr.s_addr = INADDR_ANY; if (bind (server, &sockme, sizeof (sockme)) < 0) { perror ("bind"); exit (1); } if (connect (server, &sockin, sizeof (sockin)) < 0) { perror ("connect"); close (server); exit (1); } #ifdef O_NDELAY fcntl (server, F_SETFL, O_NDELAY); #ifdef USG /* USG pipe cannot not select emacsIn */ { struct stat statbuf; fstat (emacsIn, &statbuf); if (statbuf.st_mode & 010000) selectable = 0; if (!selectable) { signal (SIGINT, sigout); fcntl (emacsIn, F_SETFL, O_NDELAY); } } #endif #endif /* Connection established. */ while (1) { readfds = (1 << server) | (1 << emacsIn); if (select (32, &readfds, NULL, NULL, (struct timeval *)NULL) == -1) { perror ("select"); exit (1); } if (readfds & (1 << emacsIn)) { /* From Emacs */ nbuffer = read (emacsIn, buffer, sizeof buffer -1); #ifdef USG if (selectable && nbuffer == 0) { goto finish; } else if (!(readfds & (1 << server)) && nbuffer == 0) { sleep (1); } else #else if (nbuffer == 0) goto finish; #endif for (retry = buffer; nbuffer > 0; nbuffer -= wret, retry += wret) { writefds = 1 << server; if (select (server+1, NULL, &writefds, NULL, (struct timeval*)NULL) == -1) { perror ("select"); exit (1); } wret = write (server, retry, nbuffer); if (wret < 0) goto finish; } } if (readfds & (1 << server)) { /* From NNTP server */ nbuffer = read (server, buffer, sizeof buffer -1); if (nbuffer == 0) goto finish; for (retry = buffer; nbuffer > 0; nbuffer -= wret, retry += wret) { writefds = 1 << emacsOut; #ifdef USG if (selectable) #endif if (select (emacsOut+1, NULL, &writefds, NULL, (struct timeval*)NULL) == -1) { perror ("select"); exit (1); } wret = write (emacsOut, retry, nbuffer); if (wret < 0) goto finish; } } } /* End of communication. */ finish: close (server); #ifdef USG if (!selectable) fcntl (emacsIn, F_SETFL, 0); #endif close (emacsIn); close (emacsOut); exit (0); }