diff options
| -rw-r--r-- | ChangeLog | 22 | ||||
| -rw-r--r-- | localedata/ChangeLog | 4 | ||||
| -rw-r--r-- | manual/examples/inetcli.c | 4 | ||||
| -rw-r--r-- | manual/examples/inetsrv.c | 2 | ||||
| -rw-r--r-- | manual/examples/isockad.c | 2 | ||||
| -rw-r--r-- | manual/examples/mkfsock.c | 9 | ||||
| -rw-r--r-- | manual/examples/mkisock.c | 2 |
7 files changed, 32 insertions, 13 deletions
@@ -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> * Makefile (parent-mostlyclean): Use object-suffixes-for-libc for diff --git a/localedata/ChangeLog b/localedata/ChangeLog index 671b690..fe9b664 100644 --- a/localedata/ChangeLog +++ b/localedata/ChangeLog @@ -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> * Makefile: Fix test rules from last patch. diff --git a/manual/examples/inetcli.c b/manual/examples/inetcli.c index 258c689..35dfb37 100644 --- a/manual/examples/inetcli.c +++ b/manual/examples/inetcli.c @@ -9,7 +9,7 @@ #define PORT 5555 #define MESSAGE "Yow!!! Are we having fun yet?!?" -#define SERVERHOST "churchy.gnu.ai.mit.edu" +#define SERVERHOST "mescaline.gnu.org" void write_to_server (int filedes) @@ -30,7 +30,7 @@ main (void) { extern void init_sockaddr (struct sockaddr_in *name, const char *hostname, - unsigned short int port); + uint16_t port); int sock; struct sockaddr_in servername; diff --git a/manual/examples/inetsrv.c b/manual/examples/inetsrv.c index bd86e80..3d544c0 100644 --- a/manual/examples/inetsrv.c +++ b/manual/examples/inetsrv.c @@ -37,7 +37,7 @@ read_from_client (int filedes) int main (void) { - extern int make_socket (unsigned short int port); + extern int make_socket (uint16_t port); int sock; fd_set active_fd_set, read_fd_set; int i; diff --git a/manual/examples/isockad.c b/manual/examples/isockad.c index 54ec1cc..9c21149 100644 --- a/manual/examples/isockad.c +++ b/manual/examples/isockad.c @@ -7,7 +7,7 @@ void init_sockaddr (struct sockaddr_in *name, const char *hostname, - unsigned short int port) + uint16_t port) { struct hostent *hostinfo; diff --git a/manual/examples/mkfsock.c b/manual/examples/mkfsock.c index d3750ec..46729d1 100644 --- a/manual/examples/mkfsock.c +++ b/manual/examples/mkfsock.c @@ -13,7 +13,6 @@ make_named_socket (const char *filename) size_t size; /* Create the socket. */ - sock = socket (PF_UNIX, SOCK_DGRAM, 0); if (sock < 0) { @@ -22,14 +21,16 @@ make_named_socket (const char *filename) } /* Bind a name to the socket. */ - 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 offset of the start of the filename, 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) + strlen (name.sun_path) + 1); diff --git a/manual/examples/mkisock.c b/manual/examples/mkisock.c index 07411bb..2fd8b3d 100644 --- a/manual/examples/mkisock.c +++ b/manual/examples/mkisock.c @@ -4,7 +4,7 @@ #include <netinet/in.h> int -make_socket (unsigned short int port) +make_socket (uint16_t port) { int sock; struct sockaddr_in name; |