comparison lib-src/gnuslib.c @ 175:2d532a89d707 r20-3b14

Import from CVS: tag r20-3b14
author cvs
date Mon, 13 Aug 2007 09:50:14 +0200
parents 929b76928fce
children e45d5e7c476e
comparison
equal deleted inserted replaced
174:bb3568571b84 175:2d532a89d707
78 char *hostarg; 78 char *hostarg;
79 int portarg; 79 int portarg;
80 int *s; 80 int *s;
81 { 81 {
82 #ifdef INTERNET_DOMAIN_SOCKETS 82 #ifdef INTERNET_DOMAIN_SOCKETS
83 char localhost[HOSTNAMSZ];
84 char *ptr; 83 char *ptr;
85 if (hostarg == NULL) 84 if (hostarg == NULL)
86 hostarg = getenv("GNU_HOST"); 85 hostarg = getenv("GNU_HOST");
87 if (portarg == 0 && (ptr=getenv("GNU_PORT")) != NULL) 86 if (portarg == 0 && (ptr=getenv("GNU_PORT")) != NULL)
88 portarg = atoi(ptr); 87 portarg = atoi(ptr);
112 return (int) CONN_UNIX; 111 return (int) CONN_UNIX;
113 #elif defined(SYSV_IPC) 112 #elif defined(SYSV_IPC)
114 *s = connect_to_ipc_server(); 113 *s = connect_to_ipc_server();
115 return (int) CONN_IPC; 114 return (int) CONN_IPC;
116 #elif defined(INTERNET_DOMAIN_SOCKETS) 115 #elif defined(INTERNET_DOMAIN_SOCKETS)
117 gethostname(localhost,HOSTNAMSZ); /* use this host by default */ 116 {
118 *s = connect_to_internet_server(localhost, portarg); 117 char localhost[HOSTNAMSZ];
119 return (int) CONN_INTERNET; 118 gethostname(localhost,HOSTNAMSZ); /* use this host by default */
119 *s = connect_to_internet_server(localhost, portarg);
120 return (int) CONN_INTERNET;
121 }
120 #endif /* IPC type */ 122 #endif /* IPC type */
121 } 123 }
122 } 124 }
123 125
124 #ifdef SYSV_IPC 126 #ifdef SYSV_IPC
223 /* 225 /*
224 read_line -- read a \n terminated line from a socket 226 read_line -- read a \n terminated line from a socket
225 */ 227 */
226 int read_line(int s, char *dest) 228 int read_line(int s, char *dest)
227 { 229 {
228 char *index = NULL;
229 int length; 230 int length;
230 int offset=0; 231 int offset=0;
231 char buffer[GSERV_BUFSZ+1]; 232 char buffer[GSERV_BUFSZ+1];
232 233
233 while ((length=read(s,buffer+offset,1)>0) && buffer[offset]!='\n' 234 while ((length=read(s,buffer+offset,1)>0) && buffer[offset]!='\n'