summary refs log tree commit diff
path: root/inet
diff options
context:
space:
mode:
Diffstat (limited to 'inet')
-rw-r--r--inet/ether_ntoh.c4
-rw-r--r--inet/gethstbynm.c2
-rw-r--r--inet/rcmd.c4
-rw-r--r--inet/ruserpass.c4
4 files changed, 7 insertions, 7 deletions
diff --git a/inet/ether_ntoh.c b/inet/ether_ntoh.c
index 93c2cf8b2a..ab3650f2a2 100644
--- a/inet/ether_ntoh.c
+++ b/inet/ether_ntoh.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996 Free Software Foundation, Inc.
+/* Copyright (C) 1996, 1997 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
 
@@ -21,7 +21,7 @@
 #include <netinet/if_ether.h>
 #include <string.h>
 
-#include "../nss/nsswitch.h"
+#include <nss/nsswitch.h>
 
 /* Because the `ethers' lookup does not fit so well in the scheme so
    we define a dummy struct here which helps us to use the available
diff --git a/inet/gethstbynm.c b/inet/gethstbynm.c
index 08ee4cd40a..38d045c4db 100644
--- a/inet/gethstbynm.c
+++ b/inet/gethstbynm.c
@@ -35,4 +35,4 @@
 
 #define HANDLE_DIGITS_DOTS	1
 
-#include "../nss/getXXbyYY.c"
+#include <nss/getXXbyYY.c>
diff --git a/inet/rcmd.c b/inet/rcmd.c
index 92ce094807..d496a7a8fa 100644
--- a/inet/rcmd.c
+++ b/inet/rcmd.c
@@ -330,8 +330,8 @@ again:
 
 		dirlen = strlen (pwd->pw_dir);
 		pbuf = alloca (dirlen + sizeof "/.rhosts");
-		memcpy (pbuf, pwd->pw_dir, dirlen);
-		memcpy (pbuf + dirlen, "/.rhosts", sizeof "/.rhosts");
+		__mempcpy (__mempcpy (pbuf, pwd->pw_dir, dirlen),
+			   "/.rhosts", sizeof "/.rhosts");
 
 		/*
 		 * Change effective uid while opening .rhosts.  If root and
diff --git a/inet/ruserpass.c b/inet/ruserpass.c
index a0a4b97bdb..421bfc5e2d 100644
--- a/inet/ruserpass.c
+++ b/inet/ruserpass.c
@@ -63,7 +63,7 @@ static	FILE *cfile;
 static char tokval[100];
 
 static struct toktab {
-	char *tokstr;
+	const char *tokstr;
 	int tval;
 } toktab[]= {
 	{ "default",	DEFAULT },
@@ -98,7 +98,7 @@ ruserpass(host, aname, apass)
 
 	buf = alloca (strlen (hdir) + 8);
 
-	(void) sprintf(buf, "%s/.netrc", hdir);
+	__stpcpy (__stpcpy (buf, hdir), "/.netrc");
 	cfile = fopen(buf, "r");
 	if (cfile == NULL) {
 		if (errno != ENOENT)