Index: head/usr.sbin/fdwrite/fdwrite.c
===================================================================
--- head/usr.sbin/fdwrite/fdwrite.c	(revision 129862)
+++ head/usr.sbin/fdwrite/fdwrite.c	(revision 129863)
@@ -1,198 +1,198 @@
 /*
  * ----------------------------------------------------------------------------
  * "THE BEER-WARE LICENSE" (Revision 42):
  * <phk@FreeBSD.org> wrote this file.  As long as you retain this notice you
  * can do whatever you want with this stuff. If we meet some day, and you think
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
  * $FreeBSD$
  *
  */
 
 #include <ctype.h>
 #include <err.h>
 #include <fcntl.h>
 #include <paths.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <strings.h>
+#include <string.h>
 #include <unistd.h>
 
 #include <sys/fdcio.h>
 
 int
 format_track(int fd, int cyl, int secs, int head, int rate,
      int gaplen, int secsize, int fill,int interleave)
 {
     struct fd_formb f;
     register int i,j;
     int il[100];
 
     memset(il,0,sizeof il);
     for(j = 0, i = 1; i <= secs; i++) {
 	while(il[(j%secs)+1]) j++;
 	il[(j%secs)+1] = i;
 	j += interleave;
     }
 
     f.format_version = FD_FORMAT_VERSION;
     f.head = head;
     f.cyl = cyl;
     f.transfer_rate = rate;
 
     f.fd_formb_secshift = secsize;
     f.fd_formb_nsecs = secs;
     f.fd_formb_gaplen = gaplen;
     f.fd_formb_fillbyte = fill;
     for(i = 0; i < secs; i++) {
 	f.fd_formb_cylno(i) = cyl;
 	f.fd_formb_headno(i) = head;
 	f.fd_formb_secno(i) = il[i+1];
 	f.fd_formb_secsize(i) = secsize;
     }
     return ioctl(fd, FD_FORM, (caddr_t)&f);
 }
 
 static void
 usage()
 {
 	fprintf(stderr, "usage: fdwrite [-v] [-y] [-f inputfile] [-d device]\n");
 	exit(2);
 }
 
 int
 main(int argc, char **argv)
 {
     int inputfd = -1, c, fdn = 0, i,j,fd;
     int bpt, verbose=1, nbytes=0, track;
     int interactive = 1, fdopts;
     char *device= "/dev/fd0", *trackbuf = 0,*vrfybuf = 0;
     struct fd_type fdt;
     FILE *tty;
 
     setbuf(stdout,0);
     while((c = getopt(argc, argv, "d:f:vy")) != -1)
 	    switch(c) {
 	    case 'd':	/* Which drive */
 		    device = optarg;
 		    break;
 
 	    case 'f':	/* input file */
 		    if (inputfd >= 0)
 			    close(inputfd);
 		    inputfd = open(optarg,O_RDONLY);
 		    if (inputfd < 0)
 			    err(1, "%s", optarg);
 		    break;
 
 	    case 'v':  /* Toggle verbosity */
 		    verbose = !verbose;
 		    break;
 
 	    case 'y':  /* Don't confirm? */
 		    interactive = 0;
 		    break;
 
 	    case '?': default:
 		    usage();
 	    }
 
     if (inputfd < 0)
 	inputfd = 0;
 
     if (!isatty(1))
 	interactive = 0;
 
     if(optind < argc)
 	    usage();
 
     tty = fopen(_PATH_TTY,"r+");
     if(!tty)
 	    err(1, _PATH_TTY);
     setbuf(tty,0);
 
     for(j=1;j > 0;) {
         fdn++;
 	if (interactive) {
 	    fprintf(tty,
 		    "Please insert floppy #%d in drive %s and press return >",
 		    fdn,device);
 	    while(1) {
 		i = getc(tty);
 		if(i == '\n') break;
 	    }
 	}
 
 	if((fd = open(device, O_RDWR)) < 0)
 	    err(1, "%s", device);
 
 	if(ioctl(fd, FD_GTYPE, &fdt) < 0)
 	    errx(1, "not a floppy disk: %s", device);
 	fdopts = FDOPT_NOERRLOG;
 	if (ioctl(fd, FD_SOPTS, &fdopts) == -1)
 		err(1, "ioctl(FD_SOPTS, FDOPT_NOERRLOG)");
 
 	bpt = fdt.sectrac * (1<<fdt.secsize) * 128;
 	if(!trackbuf) {
 	    trackbuf = malloc(bpt);
 	    if(!trackbuf) errx(1, "malloc");
 	}
 	if(!vrfybuf) {
 	    vrfybuf = malloc(bpt);
 	    if(!vrfybuf) errx(1, "malloc");
 	}
 
 	if(fdn == 1) {
 	    if(verbose) {
 		printf("Format: %d cylinders, %d heads, %d sectors, %d bytes = %dkb\n",
 		fdt.tracks,fdt.heads,fdt.sectrac,(1<<fdt.secsize) * 128,
 		fdt.tracks*bpt*fdt.heads/1024);
 
 	    }
 	    memset(trackbuf,0,bpt);
 	    for(j=0;inputfd >= 0 && j<bpt;j+=i) {
 		if(!(i = read(inputfd,trackbuf+j,bpt-j))) {
 		    close(inputfd);
 		    inputfd = -1;
 		    break;
 		}
 		nbytes += i;
 	    }
 	}
 	for (track = 0; track < fdt.tracks * fdt.heads; track++) {
 	    if(verbose) printf("\r%3d ",fdt.tracks * fdt.heads-track);
 	    if(verbose) putc((j ? 'I':'Z'),stdout);
 	    format_track(fd, track / fdt.heads, fdt.sectrac, track % fdt.heads,
 		    fdt.trans, fdt.f_gap, fdt.secsize, 0xe6,
 		    fdt.f_inter);
 	    if(verbose) putc('F',stdout);
 
 	    if (lseek (fd, (long) track*bpt, 0) < 0) err(1, "lseek");
 	    if (write (fd, trackbuf, bpt) != bpt) err(1, "write");
 	    if(verbose) putc('W',stdout);
 
 	    if (lseek (fd, (long) track*bpt, 0) < 0) err(1, "lseek");
 	    if (read (fd, vrfybuf, bpt) != bpt) err(1, "read");
 	    if(verbose) putc('R',stdout);
 
 	    if (memcmp(trackbuf,vrfybuf,bpt)) err(1, "compare");
 	    if(verbose) putc('C',stdout);
 
 	    memset(trackbuf,0,bpt);
 	    for(j=0;inputfd >= 0 && j<bpt;j+=i) {
 		if(!(i = read(inputfd,trackbuf+j,bpt-j))) {
 		    close(inputfd);
 		    inputfd = -1;
 		    break;
 		}
 		nbytes += i;
 	    }
 	}
 	close(fd);
 	putc('\r',stdout);
     }
     if(verbose)
 	printf("%d bytes on %d flopp%s\n",nbytes,fdn,fdn==1?"y":"ies");
     exit(0);
 }
Index: head/usr.sbin/mount_portalfs/pt_tcp.c
===================================================================
--- head/usr.sbin/mount_portalfs/pt_tcp.c	(revision 129862)
+++ head/usr.sbin/mount_portalfs/pt_tcp.c	(revision 129863)
@@ -1,165 +1,165 @@
 /*
  * Copyright (c) 1992, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
  * All rights reserved.
  *
  * This code is derived from software donated to Berkeley by
  * Jan-Simon Pendry.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
  *	This product includes software developed by the University of
  *	California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
  *	@(#)pt_tcp.c	8.5 (Berkeley) 4/28/95
  */
 
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
 #include <errno.h>
 #include <stdlib.h>
-#include <strings.h>
+#include <string.h>
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/syslog.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <netdb.h>
 
 #include "portald.h"
 
 /*
  * Key will be tcp/host/port[/"priv"]
  * Create a TCP socket connected to the
  * requested host and port.
  * Some trailing suffix values have special meanings.
  * An unrecognized suffix is an error.
  */
 int portal_tcp(pcr, key, v, kso, fdp)
 	struct portal_cred *pcr;
 	char *key;
 	char **v;
 	int kso;
 	int *fdp;
 {
 	char host[MAXHOSTNAMELEN];
 	char port[MAXHOSTNAMELEN];
 	char *p = key + (v[1] ? strlen(v[1]) : 0);
 	char *q;
 	struct hostent *hp;
 	struct servent *sp;
 	struct in_addr **ipp;
 	struct in_addr *ip[2];
 	struct in_addr ina;
 	u_short s_port;
 	int priv = 0;
 	struct sockaddr_in sain;
 
 	q = strchr(p, '/');
 	if (q == 0 || q - p >= sizeof(host))
 		return (EINVAL);
 	*q = '\0';
 	strcpy(host, p);
 	p = q + 1;
 
 	q = strchr(p, '/');
 	if (q)
 		*q = '\0';
 	if (strlen(p) >= sizeof(port))
 		return (EINVAL);
 	strcpy(port, p);
 	if (q) {
 		p = q + 1;
 		if (strcmp(p, "priv") == 0) {
 			if (pcr->pcr_uid == 0)
 				priv = 1;
 			else
 				return (EPERM);
 		} else {
 			return (EINVAL);
 		}
 	}
 
 	hp = gethostbyname(host);
 	if (hp != 0) {
 		ipp = (struct in_addr **) hp->h_addr_list;
 	} else {
 		ina.s_addr = inet_addr(host);
 		if (ina.s_addr == INADDR_NONE)
 			return (EINVAL);
 		ip[0] = &ina;
 		ip[1] = 0;
 		ipp = ip;
 	}
 #ifdef DEBUG
 	printf ("inet address for %s is %s\n", host, inet_ntoa(*ipp[0]));
 #endif
 
 	sp = getservbyname(port, "tcp");
 	if (sp != NULL) {
 		s_port = (u_short)sp->s_port;
 	} else {
 		s_port = strtoul(port, &p, 0);
 		if (s_port == 0 || *p != '\0')
 			return (EINVAL);
 		s_port = htons(s_port);
 	}
 #ifdef DEBUG
 	printf ("port number for %s is %d\n", port, (int)ntohs(s_port));
 #endif
 
 	memset(&sain, 0, sizeof(sain));
 	sain.sin_len = sizeof(sain);
 	sain.sin_family = AF_INET;
 	sain.sin_port = s_port;
 
 	while (ipp[0]) {
 		int so;
 
 		if (priv)
 			so = rresvport((int *) 0);
 		else
 			so = socket(AF_INET, SOCK_STREAM, 0);
 		if (so < 0) {
 			syslog(LOG_ERR, "socket: %m");
 			return (errno);
 		}
 
 		sain.sin_addr = *ipp[0];
 		if (connect(so, (struct sockaddr *) &sain, sizeof(sain)) == 0) {
 			*fdp = so;
 			return (0);
 		}
 		(void) close(so);
 
 		ipp++;
 	}
 
 	return (errno);
 }
Index: head/usr.sbin/mount_portalfs/pt_tcplisten.c
===================================================================
--- head/usr.sbin/mount_portalfs/pt_tcplisten.c	(revision 129862)
+++ head/usr.sbin/mount_portalfs/pt_tcplisten.c	(revision 129863)
@@ -1,209 +1,209 @@
 /*
  * Copyright (c) 1992, 1993
  *  The Regents of the University of California.  All rights reserved.
  * All rights reserved.
  *
  * This code is derived from software donated to Berkeley by
  * Jan-Simon Pendry.
  *
  * Modified by Duncan Barclay.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
  *  This product includes software developed by the University of
  *  California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
  *  @(#)pt_tcp.c  8.3 (Berkeley) 3/27/94
  *
  * pt_tcp.c,v 1.1.1.1 1994/05/26 06:34:34 rgrimes Exp
  */
 
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
 #include <stdio.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <errno.h>
-#include <strings.h>
+#include <string.h>
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/syslog.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <netdb.h>
 
 #include "portald.h"
 
 /*
  * Key will be tcplisten/host/port
  *
  * Create a TCP socket bound to the requested host and port.
  * If the host is "ANY" the receving address will be set to INADDR_ANY.
  * If the port is 0 the caller must find out the returned port number
  * using a call to getsockname.
  *
  * XXX!  The owner of the socket will be root rather then the user.  This
  * 	 may cause remote auth (identd) to return unexpected results.
  *
  */
 int portal_tcplisten(pcr, key, v, kso, fdp)
        struct portal_cred *pcr;
        char *key;
        char **v;
        int kso;
        int *fdp;
 {
        char host[MAXHOSTNAMELEN];
        char port[MAXHOSTNAMELEN];
        char *p = key + (v[1] ? strlen(v[1]) : 0);
        char *q;
        struct hostent *hp;
        struct servent *sp;
        struct in_addr **ipp;
        struct in_addr *ip[2];
        struct in_addr ina;
        u_short s_port;
        int any = 0;
        struct sockaddr_in sain;
 
        q = strchr(p, '/');
        if (q == 0 || q - p >= sizeof(host))
                return (EINVAL);
        *q = '\0';
        snprintf(host, sizeof(host), "%s", p);
        p = q + 1;
 
        q = strchr(p, '/');
        if (q)
                *q = '\0';
        if (strlen(p) >= sizeof(port))
                return (EINVAL);
        snprintf(port, sizeof(port), "%s", p);
 
        if (strcmp(host, "ANY") == 0) {
                any = 1;
        } else {
                hp = gethostbyname(host);
                if (hp != 0) {
                        ipp = (struct in_addr **) hp->h_addr_list;
                } else {
                        ina.s_addr = inet_addr(host);
                        if (ina.s_addr == INADDR_NONE)
                                return (EINVAL);
                        ip[0] = &ina;
                        ip[1] = 0;
                        ipp = ip;
                }
        }
 #ifdef DEBUG
        if (any)
                printf("INADDR_ANY to be used for hostname\n");
        else
                printf("inet address for %s is %s\n", host, inet_ntoa(*ipp[0]));
 #endif
 
        sp = getservbyname(port, "tcp");
        if (sp != NULL) {
                s_port = (u_short) sp->s_port;
         } else {
                s_port = strtoul(port, &p, 0);
                if (*p != '\0')
                        return (EINVAL);
                s_port = htons(s_port);
        }
        if ((ntohs(s_port) != 0) &&
            (ntohs(s_port) <= IPPORT_RESERVED) &&
            (pcr->pcr_uid != 0))
                return (EPERM);
 #ifdef DEBUG
        printf("port number for %s is %d\n", port, ntohs(s_port));
 #endif
 
        memset(&sain, 0, sizeof(sain));
        sain.sin_len = sizeof(sain);
        sain.sin_family = AF_INET;
        sain.sin_port = s_port;
 
        if (any) {
                int so;
                int sock;
 
                so = socket(AF_INET, SOCK_STREAM, 0);
                if (so < 0) {
                        syslog(LOG_ERR, "socket: %m");
                        return (errno);
                }
 
                sain.sin_addr.s_addr = INADDR_ANY;
                if (bind(so, (struct sockaddr *) &sain, sizeof(sain)) == 0) {
                        listen(so, 1);
                        if ((sock = accept(so, (struct sockaddr *)0, (int *)0)) == -1) {
                                syslog(LOG_ERR, "accept: %m");
                                (void) close(so);
                                return (errno);
                        }
                        *fdp = sock;
                        (void) close(so);
                        return (0);
                }
                syslog(LOG_ERR, "bind: %m");
                (void) close(so);
                return (errno);
        }
 
        while (ipp[0]) {
                int so;
                int sock;
 
                so = socket(AF_INET, SOCK_STREAM, 0);
                if (so < 0) {
                        syslog(LOG_ERR, "socket: %m");
                        return (errno);
                }
 
                sain.sin_addr = *ipp[0];
                if (bind(so, (struct sockaddr *) &sain, sizeof(sain)) == 0) {
                        listen(so, 1);
                        if ((sock = accept(so, (struct sockaddr *)0, (int *)0)) == -1) {
                                syslog(LOG_ERR, "accept: %m");
                                (void) close(so);
                                return (errno);
                        }
                        *fdp = sock;
                        (void) close(so);
                        return (0);
                }
                (void) close(so);
 
                ipp++;
        }
 
        syslog(LOG_ERR, "bind: %m");
        return (errno);
 
 }