mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-29 00:01:12 +00:00
Update.
1998-03-30 17:20 Ulrich Drepper <drepper@cygnus.com> * Makerules: Remove duplicate rules to handle stamp.oS. 1998-03-30 Andreas Jaeger <aj@arthur.rhein-neckar.de> * manual/examples/inetsrv.c (main): Change prototype of make_socket following change in mkisock.c. * manual/examples/inetcli.c (SERVERHOST): Use mescaline.gnu.org as example host. (main): Change prototype of init_sockaddr following change in isockadd.c. * manual/examples/mkisock.c (make_socket): Use uint16_t for port. * manual/examples/isockad.c (init_sockaddr): Likewise. * manual/examples/mkfsock.c (make_named_socket): Removed blank lines for clarification. (make_named_socket): Use strncpy instead of strcpy. Reported by Francesco Potorti` <F.Potorti@cnuce.cnr.it>.
This commit is contained in:
parent
6a6c1f9829
commit
001426b899
22
ChangeLog
22
ChangeLog
@ -1,3 +1,25 @@
|
|||||||
|
1998-03-30 17:20 Ulrich Drepper <drepper@cygnus.com>
|
||||||
|
|
||||||
|
* Makerules: Remove duplicate rules to handle stamp.oS.
|
||||||
|
|
||||||
|
1998-03-30 Andreas Jaeger <aj@arthur.rhein-neckar.de>
|
||||||
|
|
||||||
|
* manual/examples/inetsrv.c (main): Change prototype of
|
||||||
|
make_socket following change in mkisock.c.
|
||||||
|
|
||||||
|
* manual/examples/inetcli.c (SERVERHOST): Use mescaline.gnu.org as
|
||||||
|
example host.
|
||||||
|
(main): Change prototype of init_sockaddr following change in
|
||||||
|
isockadd.c.
|
||||||
|
|
||||||
|
* manual/examples/mkisock.c (make_socket): Use uint16_t for port.
|
||||||
|
* manual/examples/isockad.c (init_sockaddr): Likewise.
|
||||||
|
|
||||||
|
* manual/examples/mkfsock.c (make_named_socket): Removed blank
|
||||||
|
lines for clarification.
|
||||||
|
(make_named_socket): Use strncpy instead of strcpy.
|
||||||
|
Reported by Francesco Potorti` <F.Potorti@cnuce.cnr.it>.
|
||||||
|
|
||||||
1998-03-30 13:28 Ulrich Drepper <drepper@cygnus.com>
|
1998-03-30 13:28 Ulrich Drepper <drepper@cygnus.com>
|
||||||
|
|
||||||
* Makefile (parent-mostlyclean): Use object-suffixes-for-libc for
|
* Makefile (parent-mostlyclean): Use object-suffixes-for-libc for
|
||||||
|
@ -1,7 +1,3 @@
|
|||||||
1998-03-30 17:20 Ulrich Drepper <drepper@cygnus.com>
|
|
||||||
|
|
||||||
* Makerules: Remove duplicate rules to handle stamp.oS.
|
|
||||||
|
|
||||||
1998-03-30 Ulrich Drepper <drepper@cygnus.com>
|
1998-03-30 Ulrich Drepper <drepper@cygnus.com>
|
||||||
|
|
||||||
* Makefile: Fix test rules from last patch.
|
* Makefile: Fix test rules from last patch.
|
||||||
|
@ -9,7 +9,7 @@
|
|||||||
|
|
||||||
#define PORT 5555
|
#define PORT 5555
|
||||||
#define MESSAGE "Yow!!! Are we having fun yet?!?"
|
#define MESSAGE "Yow!!! Are we having fun yet?!?"
|
||||||
#define SERVERHOST "churchy.gnu.ai.mit.edu"
|
#define SERVERHOST "mescaline.gnu.org"
|
||||||
|
|
||||||
void
|
void
|
||||||
write_to_server (int filedes)
|
write_to_server (int filedes)
|
||||||
@ -30,7 +30,7 @@ main (void)
|
|||||||
{
|
{
|
||||||
extern void init_sockaddr (struct sockaddr_in *name,
|
extern void init_sockaddr (struct sockaddr_in *name,
|
||||||
const char *hostname,
|
const char *hostname,
|
||||||
unsigned short int port);
|
uint16_t port);
|
||||||
int sock;
|
int sock;
|
||||||
struct sockaddr_in servername;
|
struct sockaddr_in servername;
|
||||||
|
|
||||||
|
@ -37,7 +37,7 @@ read_from_client (int filedes)
|
|||||||
int
|
int
|
||||||
main (void)
|
main (void)
|
||||||
{
|
{
|
||||||
extern int make_socket (unsigned short int port);
|
extern int make_socket (uint16_t port);
|
||||||
int sock;
|
int sock;
|
||||||
fd_set active_fd_set, read_fd_set;
|
fd_set active_fd_set, read_fd_set;
|
||||||
int i;
|
int i;
|
||||||
|
@ -7,7 +7,7 @@
|
|||||||
void
|
void
|
||||||
init_sockaddr (struct sockaddr_in *name,
|
init_sockaddr (struct sockaddr_in *name,
|
||||||
const char *hostname,
|
const char *hostname,
|
||||||
unsigned short int port)
|
uint16_t port)
|
||||||
{
|
{
|
||||||
struct hostent *hostinfo;
|
struct hostent *hostinfo;
|
||||||
|
|
||||||
|
@ -13,7 +13,6 @@ make_named_socket (const char *filename)
|
|||||||
size_t size;
|
size_t size;
|
||||||
|
|
||||||
/* Create the socket. */
|
/* Create the socket. */
|
||||||
|
|
||||||
sock = socket (PF_UNIX, SOCK_DGRAM, 0);
|
sock = socket (PF_UNIX, SOCK_DGRAM, 0);
|
||||||
if (sock < 0)
|
if (sock < 0)
|
||||||
{
|
{
|
||||||
@ -22,14 +21,16 @@ make_named_socket (const char *filename)
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* Bind a name to the socket. */
|
/* Bind a name to the socket. */
|
||||||
|
|
||||||
name.sun_family = AF_FILE;
|
name.sun_family = AF_FILE;
|
||||||
strcpy (name.sun_path, filename);
|
strncpy (name.sun_path, filename, sizeof (name.sun_path));
|
||||||
|
|
||||||
/* The size of the address is
|
/* The size of the address is
|
||||||
the offset of the start of the filename,
|
the offset of the start of the filename,
|
||||||
plus its length,
|
plus its length,
|
||||||
plus one for the terminating null byte. */
|
plus one for the terminating null byte.
|
||||||
|
Alternativly you can just do:
|
||||||
|
size = SUN_LEN (&name);
|
||||||
|
*/
|
||||||
size = (offsetof (struct sockaddr_un, sun_path)
|
size = (offsetof (struct sockaddr_un, sun_path)
|
||||||
+ strlen (name.sun_path) + 1);
|
+ strlen (name.sun_path) + 1);
|
||||||
|
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
#include <netinet/in.h>
|
#include <netinet/in.h>
|
||||||
|
|
||||||
int
|
int
|
||||||
make_socket (unsigned short int port)
|
make_socket (uint16_t port)
|
||||||
{
|
{
|
||||||
int sock;
|
int sock;
|
||||||
struct sockaddr_in name;
|
struct sockaddr_in name;
|
||||||
|
Loading…
Reference in New Issue
Block a user