This commit is contained in:
cgd 1997-11-05 21:29:29 +00:00
parent bad15fd37f
commit 1c9d9590f6
3 changed files with 24 additions and 17 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: mknod.c,v 1.9 1997/09/15 03:46:31 lukem Exp $ */ /* $NetBSD: mknod.c,v 1.10 1997/11/05 21:29:29 cgd Exp $ */
/* /*
* Copyright (c) 1989, 1993 * Copyright (c) 1989, 1993
@ -46,7 +46,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 1993\n\
#if 0 #if 0
static char sccsid[] = "@(#)mknod.c 8.1 (Berkeley) 6/5/93"; static char sccsid[] = "@(#)mknod.c 8.1 (Berkeley) 6/5/93";
#else #else
__RCSID("$NetBSD: mknod.c,v 1.9 1997/09/15 03:46:31 lukem Exp $"); __RCSID("$NetBSD: mknod.c,v 1.10 1997/11/05 21:29:29 cgd Exp $");
#endif #endif
#endif /* not lint */ #endif /* not lint */
@ -88,11 +88,13 @@ main(argc, argv)
} }
exit(0); exit(0);
/* NOTREACHED */
} }
void void
usage() usage()
{ {
fprintf(stderr, "usage: mknod name [b | c] major minor\n"); (void)fprintf(stderr, "usage: mknod name [b | c] major minor\n");
exit(1); exit(1);
/* NOTREACHED */
} }

View File

@ -1,4 +1,4 @@
/* $NetBSD: mount.c,v 1.39 1997/11/01 18:38:29 drochner Exp $ */ /* $NetBSD: mount.c,v 1.40 1997/11/05 21:29:33 cgd Exp $ */
/* /*
* Copyright (c) 1980, 1989, 1993, 1994 * Copyright (c) 1980, 1989, 1993, 1994
@ -43,7 +43,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1989, 1993, 1994\n\
#if 0 #if 0
static char sccsid[] = "@(#)mount.c 8.25 (Berkeley) 5/8/95"; static char sccsid[] = "@(#)mount.c 8.25 (Berkeley) 5/8/95";
#else #else
__RCSID("$NetBSD: mount.c,v 1.39 1997/11/01 18:38:29 drochner Exp $"); __RCSID("$NetBSD: mount.c,v 1.40 1997/11/05 21:29:33 cgd Exp $");
#endif #endif
#endif /* not lint */ #endif /* not lint */
@ -106,7 +106,7 @@ static struct opt {
{ 0 } { 0 }
}; };
static char ffs[] = "ffs"; static char ffs_fstype[] = "ffs";
int int
main(argc, argv) main(argc, argv)
@ -123,7 +123,7 @@ main(argc, argv)
all = forceall = init_flags = 0; all = forceall = init_flags = 0;
options = NULL; options = NULL;
vfslist = NULL; vfslist = NULL;
vfstype = ffs; vfstype = ffs_fstype;
while ((ch = getopt(argc, argv, "Aadfo:rwt:uv")) != -1) while ((ch = getopt(argc, argv, "Aadfo:rwt:uv")) != -1)
switch (ch) { switch (ch) {
case 'A': case 'A':
@ -199,9 +199,12 @@ main(argc, argv)
} }
} }
exit(rval); exit(rval);
/* NOTREACHED */
case 1: case 1:
if (vfslist != NULL) if (vfslist != NULL) {
usage(); usage();
/* NOTREACHED */
}
if (init_flags & MNT_UPDATE) { if (init_flags & MNT_UPDATE) {
if ((mntbuf = getmntpt(*argv)) == NULL) if ((mntbuf = getmntpt(*argv)) == NULL)
@ -261,6 +264,7 @@ main(argc, argv)
} }
exit(rval); exit(rval);
/* NOTREACHED */
} }
int int
@ -359,7 +363,7 @@ mountfs(vfstype, spec, name, flags, options, mntopts, skipmounted)
if (flags & MNT_UPDATE) { if (flags & MNT_UPDATE) {
catopt(&optbuf, "update"); catopt(&optbuf, "update");
/* Figure out the fstype only if we defaulted to ffs */ /* Figure out the fstype only if we defaulted to ffs */
if (vfstype == ffs && statfs(name, &sf) != -1) if (vfstype == ffs_fstype && statfs(name, &sf) != -1)
vfstype = sf.f_fstypename; vfstype = sf.f_fstypename;
} }
@ -398,7 +402,7 @@ mountfs(vfstype, spec, name, flags, options, mntopts, skipmounted)
do { do {
(void)snprintf(execname, (void)snprintf(execname,
sizeof(execname), "%s/%s", *edir, execbase); sizeof(execname), "%s/%s", *edir, execbase);
execv(execname, (char * const *)argv); (void)execv(execname, (char * const *)argv);
if (errno != ENOENT) if (errno != ENOENT)
warn("exec %s for %s", execname, name); warn("exec %s for %s", execname, name);
} while (*++edir != NULL); } while (*++edir != NULL);
@ -555,4 +559,5 @@ usage()
"[-adfruvw] [-t ffs | external_type]", "[-adfruvw] [-t ffs | external_type]",
"[-dfruvw] special | node"); "[-dfruvw] special | node");
exit(1); exit(1);
/* NOTREACHED */
} }

View File

@ -1,4 +1,4 @@
/* $NetBSD: ping.c,v 1.32 1997/09/15 07:21:12 lukem Exp $ */ /* $NetBSD: ping.c,v 1.33 1997/11/05 21:29:36 cgd Exp $ */
/* /*
* Copyright (c) 1989, 1993 * Copyright (c) 1989, 1993
@ -61,7 +61,7 @@
#include <sys/cdefs.h> #include <sys/cdefs.h>
#ifndef lint #ifndef lint
__RCSID("$NetBSD: ping.c,v 1.32 1997/09/15 07:21:12 lukem Exp $"); __RCSID("$NetBSD: ping.c,v 1.33 1997/11/05 21:29:36 cgd Exp $");
#endif #endif
#include <stdio.h> #include <stdio.h>
@ -234,7 +234,7 @@ main(int argc, char *argv[])
if (tcgetattr (0, &ts) != -1) { if (tcgetattr (0, &ts) != -1) {
reset_kerninfo = !(ts.c_lflag & NOKERNINFO); reset_kerninfo = !(ts.c_lflag & NOKERNINFO);
ts.c_lflag |= NOKERNINFO; ts.c_lflag |= NOKERNINFO;
tcsetattr (0, TCSANOW, &ts); (void)tcsetattr(0, TCSANOW, &ts);
} }
#endif #endif
while ((c = getopt(argc, argv, while ((c = getopt(argc, argv,
@ -1126,7 +1126,7 @@ prefinish(int s)
|| nreceived == 0) /* or if remote is dead */ || nreceived == 0) /* or if remote is dead */
finish(0); finish(0);
signal(s, finish); /* do this only the 1st time */ (void)signal(s, finish); /* do this only the 1st time */
if (npackets > ntransmitted) /* let the normal limit work */ if (npackets > ntransmitted) /* let the normal limit work */
npackets = ntransmitted; npackets = ntransmitted;
@ -1145,7 +1145,7 @@ finish(int s)
if (reset_kerninfo && tcgetattr (0, &ts) != -1) { if (reset_kerninfo && tcgetattr (0, &ts) != -1) {
ts.c_lflag &= ~NOKERNINFO; ts.c_lflag &= ~NOKERNINFO;
tcsetattr (0, TCSANOW, &ts); (void)tcsetattr(0, TCSANOW, &ts);
} }
(void)signal(SIGINFO, SIG_IGN); (void)signal(SIGINFO, SIG_IGN);
#else #else
@ -1584,7 +1584,7 @@ gethost(const char *arg,
{ {
struct hostent *hp; struct hostent *hp;
memset(sa, 0, sizeof(*sa)); (void)memset(sa, 0, sizeof(*sa));
sa->sin_family = AF_INET; sa->sin_family = AF_INET;
/* If it is an IP address, try to convert it to a name to /* If it is an IP address, try to convert it to a name to
@ -1612,7 +1612,7 @@ gethost(const char *arg,
if (hp->h_addrtype != AF_INET) if (hp->h_addrtype != AF_INET)
errx(1, "%s only supported with IP", arg); errx(1, "%s only supported with IP", arg);
memmove(&sa->sin_addr, hp->h_addr, sizeof(sa->sin_addr)); (void)memmove(&sa->sin_addr, hp->h_addr, sizeof(sa->sin_addr));
if (realname) { if (realname) {
(void)strncpy(realname, hp->h_name, realname_len); (void)strncpy(realname, hp->h_name, realname_len);