CVS commit: src/share/man/man5
Module Name:src Committed By: wiz Date: Sat Jun 29 08:14:31 UTC 2013 Modified Files: src/share/man/man5: login.conf.5 Log Message: Improve wording. To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/share/man/man5/login.conf.5 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man5/login.conf.5 diff -u src/share/man/man5/login.conf.5:1.27 src/share/man/man5/login.conf.5:1.28 --- src/share/man/man5/login.conf.5:1.27 Sat Jun 29 04:52:55 2013 +++ src/share/man/man5/login.conf.5 Sat Jun 29 08:14:31 2013 @@ -1,4 +1,4 @@ -.\ $NetBSD: login.conf.5,v 1.27 2013/06/29 04:52:55 yamt Exp $ +.\ $NetBSD: login.conf.5,v 1.28 2013/06/29 08:14:31 wiz Exp $ .\ .\ Copyright (c) 1995,1996,1997 Berkeley Software Design, Inc. .\ All rights reserved. @@ -169,7 +169,7 @@ Maximum number of processes. .sp .It Sy maxthread Ta number Ta Ta Maximum number of threads. -First thread of each process are not counted against this. +The first thread of each process is not counted against this. .\ .sp .It Sy memorylocked Ta size Ta Ta
CVS commit: src/share/misc
Module Name:src
Committed By: jdf
Date: Sat Jun 29 12:22:48 UTC 2013
Modified Files:
src/share/misc: acronyms.comp
Log Message:
Added entries: BIOS, DP, DVI, HDMI
Changed entries: BIOS, CGA, DDWG, DP, DVI, EGA, HDCP, HDMI, MCGA, MDA, OQL,
RAID, RDF, SMBIOS, SVGA, VESA, VGA, XGA
Patch supplied by Bug Hunting.
To generate a diff of this commit:
cvs rdiff -u -r1.137 -r1.138 src/share/misc/acronyms.comp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/misc/acronyms.comp
diff -u src/share/misc/acronyms.comp:1.137 src/share/misc/acronyms.comp:1.138
--- src/share/misc/acronyms.comp:1.137 Wed Jun 5 21:03:57 2013
+++ src/share/misc/acronyms.comp Sat Jun 29 12:22:48 2013
@@ -1,4 +1,4 @@
-$NetBSD: acronyms.comp,v 1.137 2013/06/05 21:03:57 dholland Exp $
+$NetBSD: acronyms.comp,v 1.138 2013/06/29 12:22:48 jdf Exp $
3WHS three-way handshake
8VSB 8-state vestigial side band modulation
AA anti-aliasing
@@ -108,7 +108,8 @@ BFT binary file transfer
BGA ball grid array
BGP Border Gateway Protocol
BIND Berkeley Internet Name Daemon
-BIOS basic input/output system
+BIOS Basic Input/Output System
+BIOS built-in operating system
BIST built-in self-test
BIU bus interface unit
BKDG BIOS and kernel developer's guide
@@ -181,7 +182,7 @@ CF compact flash
CFG context-free grammar
CFG control-flow graph
CG control gate
-CGA color graphics {adapter,array}
+CGA Color Graphics Adapter
CGI common gateway interface
CGN Carrier-Grade NAT
CHAP Challenge-Handshake Authentication Protocol
@@ -284,7 +285,7 @@ DDK device driver kit
DDL data description language
DDR double data rate
DDS direct digital sound
-DDWG digital display working group
+DDWG Digital Display Working Group
DE debugging extensions
DE desktop environment
DEA data encryption algorithm
@@ -320,6 +321,7 @@ DOF data over fibre
DOM document object model
DOS denial of service
DOS disk operating system
+DP DisplayPort
DPC deferred procedure call
DPCM differential pulse code modulation
DPD dead peer detection
@@ -351,7 +353,8 @@ DVB digital video broadcasting
DVCS distributed version control system
DVD digital versatile disc
DVFS dynamic voltage and frequency scaling
-DVI digital visual interface
+DVI device independent
+DVI Digital Visual Interface
DVR digital video recorder
E-XER extended XML encoding rules
EABI embedded-application binary interface
@@ -372,7 +375,7 @@ EEPROM electrically erasable programmabl
EFI extensible firmware interface
EFL emitter follower logic
EFM eight to fourteen modulation
-EGA enhanced graphics {adapter,array}
+EGA Enhanced Graphics Adapter
EGP exterior gateway protocol
EH extension header
EIDE enchanced IDE
@@ -483,9 +486,10 @@ HCF halt and catch fire
HCI host controller interface
HCI human-computer interaction
HCL hardware compatibility list
-HDCP high-bandwidth digital content protection
+HDCP High-bandwidth Digital Content Protection
HDD hard disk drive
HDL hardware description language
+HDMI High-Definition Multimedia Interface
HDTV high-definition television
HF high frequency
HFM highest frequency mode
@@ -673,13 +677,13 @@ MC memory controller
MCA machine check architecture
MCC multiversion concurrency control
MCE machine check exception
-MCGA multicolor graphics adapter
+MCGA Multi-Color Graphics Array
MCH memory controller hub
MCM multi-chip module
MCQ memory controlled queue
MD machine-dependent
MDA mail delivery agent
-MDA monochrome display adapter
+MDA Monochrome Display Adapter
MDRAM multibank dynamic random access memory
MESI modified, exclusive, shared, invalid
MFC merge from current
@@ -798,7 +802,7 @@ OOP object oriented programming
OOSE object oriented software engineering
OPM operations per minute
OPS operations per second
-OQL object query language
+OQL Object Query Language
ORM object-relational mapping
OS operating system
OSD open source definition
@@ -941,7 +945,7 @@ RA remote assistance
RA resource affinity
RA router advertisement
RAD rapid application development
-RAID redundant array of inexpensive disks
+RAID redundant array of {independent,inexpensive} disks
RAM random access memory
RAS remote access service
RAS restartable atomic sequence
@@ -953,7 +957,7 @@ RC remote control
RCS Revision Control System
RCS revision control system
RCU read, copy, update
-RDF resource description format
+RDF Resource Description Framework
RDM relational data model
RDMA remote direct memory access
RE regular expression
@@ -1062,7 +1066,7 @@ SLRU segmented LRU
SMA smart memory access
SMAF system management action field
SMART self-monitoring analysis and reporting technology
-SMBIOS system management BIOS
+SMBIOS System Management BIOS
SMC system management controller
SMI structure of management information
SMI system management interrupt
@@ -1113,7 +1117,7 @@ STP shielded twisted pair
SUS Single Unix Specification
CVS commit: src/usr.bin/make
Module Name:src Committed By: christos Date: Sat Jun 29 15:19:32 UTC 2013 Modified Files: src/usr.bin/make: main.c Log Message: PR/47973: Justin Cormack: build uses sys/signal.h not in POSIX To generate a diff of this commit: cvs rdiff -u -r1.214 -r1.215 src/usr.bin/make/main.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/make/main.c diff -u src/usr.bin/make/main.c:1.214 src/usr.bin/make/main.c:1.215 --- src/usr.bin/make/main.c:1.214 Tue Jun 18 16:06:09 2013 +++ src/usr.bin/make/main.c Sat Jun 29 11:19:32 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: main.c,v 1.214 2013/06/18 20:06:09 sjg Exp $ */ +/* $NetBSD: main.c,v 1.215 2013/06/29 15:19:32 christos Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -69,7 +69,7 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = $NetBSD: main.c,v 1.214 2013/06/18 20:06:09 sjg Exp $; +static char rcsid[] = $NetBSD: main.c,v 1.215 2013/06/29 15:19:32 christos Exp $; #else #include sys/cdefs.h #ifndef lint @@ -81,7 +81,7 @@ __COPYRIGHT(@(#) Copyright (c) 1988, 19 #if 0 static char sccsid[] = @(#)main.c 8.3 (Berkeley) 3/19/94; #else -__RCSID($NetBSD: main.c,v 1.214 2013/06/18 20:06:09 sjg Exp $); +__RCSID($NetBSD: main.c,v 1.215 2013/06/29 15:19:32 christos Exp $); #endif #endif /* not lint */ #endif @@ -117,13 +117,13 @@ __RCSID($NetBSD: main.c,v 1.214 2013/06 #include sys/time.h #include sys/param.h #include sys/resource.h -#include sys/signal.h #include sys/stat.h #include sys/utsname.h #include sys/wait.h #include errno.h #include fcntl.h +#include signal.h #include stdarg.h #include stdio.h #include stdlib.h
CVS commit: src/sys/lib/libkern
Module Name:src Committed By: rmind Date: Sat Jun 29 16:02:01 UTC 2013 Modified Files: src/sys/lib/libkern: Makefile.libkern Log Message: libkern: add murmurhash module. To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/sys/lib/libkern/Makefile.libkern Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/lib/libkern/Makefile.libkern diff -u src/sys/lib/libkern/Makefile.libkern:1.24 src/sys/lib/libkern/Makefile.libkern:1.25 --- src/sys/lib/libkern/Makefile.libkern:1.24 Mon Jun 24 04:21:20 2013 +++ src/sys/lib/libkern/Makefile.libkern Sat Jun 29 16:02:01 2013 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.libkern,v 1.24 2013/06/24 04:21:20 riastradh Exp $ +# $NetBSD: Makefile.libkern,v 1.25 2013/06/29 16:02:01 rmind Exp $ # # Variable definitions for libkern. @@ -61,7 +61,7 @@ SRCS+= cpuset.c inet_addr.c intoa.c .if empty(SRCS:Mbyte_swap_8.*) SRCS+= bswap64.c .endif -SRCS+= md4c.c md5c.c rmd160.c sha1.c sha2.c +SRCS+= md4c.c md5c.c rmd160.c sha1.c sha2.c murmurhash.c SRCS+= pmatch.c arc4random.c bcd.c mcount.c mertwist.c crc32.c SRCS+= ppath_kmem_alloc.c
CVS commit: src/sys/sys
Module Name:src
Committed By: rmind
Date: Sat Jun 29 16:50:51 UTC 2013
Modified Files:
src/sys/sys: syscallvar.h
Log Message:
sy_invoke: cache the predicate value and simplify the logic (also, fix the
tab/space mess while here).
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/sys/syscallvar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/sys/syscallvar.h
diff -u src/sys/sys/syscallvar.h:1.7 src/sys/sys/syscallvar.h:1.8
--- src/sys/sys/syscallvar.h:1.7 Wed Jun 26 08:30:40 2013
+++ src/sys/sys/syscallvar.h Sat Jun 29 16:50:51 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: syscallvar.h,v 1.7 2013/06/26 08:30:40 matt Exp $ */
+/* $NetBSD: syscallvar.h,v 1.8 2013/06/29 16:50:51 rmind Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -68,27 +68,27 @@ static inline int
sy_invoke(const struct sysent *sy, struct lwp *l, const void *uap,
register_t *rval, int code)
{
+ const bool do_trace = l-l_proc-p_trace_enabled
+ (sy-sy_flags SYCALL_INDIRECT) == 0;
int error;
-if (!__predict_false(l-l_proc-p_trace_enabled)
-|| __predict_false(sy-sy_flags SYCALL_INDIRECT)
-|| (error = trace_enter(code, uap, sy-sy_narg)) == 0) {
-rval[0] = 0;
+ if (__predict_true(!do_trace) || (error = trace_enter(code, uap,
+ sy-sy_narg)) == 0) {
+ rval[0] = 0;
#if !defined(__mips__)
/*
* Due to the mips userland code for SYS_break needing v1 to be
* preserved, we can't clear this on mips.
*/
-rval[1] = 0;
+ rval[1] = 0;
#endif
-error = sy_call(sy, l, uap, rval);
-}
-
-if (__predict_false(l-l_proc-p_trace_enabled)
- !__predict_false(sy-sy_flags SYCALL_INDIRECT)) {
-trace_exit(code, rval, error);
-}
- return error;
+ error = sy_call(sy, l, uap, rval);
+ }
+
+ if (__predict_false(do_trace)) {
+ trace_exit(code, rval, error);
+ }
+ return error;
}
/* inclusion in the kernel currently depends on SYSCALL_DEBUG */
CVS commit: src/sbin/umount
Module Name:src
Committed By: christos
Date: Sat Jun 29 22:53:04 UTC 2013
Modified Files:
src/sbin/umount: Makefile umount.c
Log Message:
Use the protocol we mounted the filesystem with instead of always udp.
(untested, but should fail back to udp).
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sbin/umount/Makefile
cvs rdiff -u -r1.43 -r1.44 src/sbin/umount/umount.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/umount/Makefile
diff -u src/sbin/umount/Makefile:1.16 src/sbin/umount/Makefile:1.17
--- src/sbin/umount/Makefile:1.16 Sat Jan 21 06:59:53 2006
+++ src/sbin/umount/Makefile Sat Jun 29 18:53:04 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2006/01/21 11:59:53 dsl Exp $
+# $NetBSD: Makefile,v 1.17 2013/06/29 22:53:04 christos Exp $
# @(#)Makefile 8.4 (Berkeley) 6/22/95
.include bsd.own.mk
@@ -11,9 +11,9 @@ MAN= umount.8
CPPFLAGS+= -DSMALL
.else
MOUNT= ${NETBSDSRCDIR}/sbin/mount
-CPPFLAGS+= -I${MOUNT}
-.PATH: ${MOUNT}
-SRCS+= vfslist.c
+CPPFLAGS+= -I${MOUNT} -I${MOUNT}_nfs
+.PATH: ${MOUNT} ${MOUNT}_nfs
+SRCS+= vfslist.c getnfsargs.c
.endif
.include bsd.prog.mk
Index: src/sbin/umount/umount.c
diff -u src/sbin/umount/umount.c:1.43 src/sbin/umount/umount.c:1.44
--- src/sbin/umount/umount.c:1.43 Tue Aug 5 16:57:45 2008
+++ src/sbin/umount/umount.c Sat Jun 29 18:53:04 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: umount.c,v 1.43 2008/08/05 20:57:45 pooka Exp $ */
+/* $NetBSD: umount.c,v 1.44 2013/06/29 22:53:04 christos Exp $ */
/*-
* Copyright (c) 1980, 1989, 1993
@@ -39,7 +39,7 @@ __COPYRIGHT(@(#) Copyright (c) 1980, 19
#if 0
static char sccsid[] = @(#)umount.c 8.8 (Berkeley) 5/8/95;
#else
-__RCSID($NetBSD: umount.c,v 1.43 2008/08/05 20:57:45 pooka Exp $);
+__RCSID($NetBSD: umount.c,v 1.44 2013/06/29 22:53:04 christos Exp $);
#endif
#endif /* not lint */
@@ -67,6 +67,7 @@ __RCSID($NetBSD: umount.c,v 1.43 2008/0
typedef enum { MNTANY, MNTON, MNTFROM } mntwhat;
#ifndef SMALL
+#include mount_nfs.h
#include mountprog.h
static int fake, verbose;
@@ -76,6 +77,7 @@ static struct addrinfo *nfshost_ai = NUL
static int namematch(const struct addrinfo *);
static int sacmp(const struct sockaddr *, const struct sockaddr *);
static int xdr_dir(XDR *, char *);
+static const char *getmntproto(const char *);
#endif /* !SMALL */
static int fflag;
@@ -273,7 +275,8 @@ umountfs(const char *name, const char **
#ifndef SMALL
if (ai != NULL !(fflag MNT_FORCE)) {
- clp = clnt_create(hostp, RPCPROG_MNT, RPCMNT_VER1, udp);
+ clp = clnt_create(hostp, RPCPROG_MNT, RPCMNT_VER1,
+ getmntproto(mntpt));
if (clp == NULL) {
clnt_pcreateerror(Cannot MNT PRC);
return 1;
@@ -381,6 +384,28 @@ xdr_dir(XDR *xdrsp, char *dirp)
{
return xdr_string(xdrsp, dirp, RPCMNT_PATHLEN);
}
+
+static const char *
+getmntproto(const char *mntpt)
+{
+ struct nfs_args nfsargs;
+ struct sockaddr_storage sa;
+ int proto;
+
+ char *name = strdup(mntpt);
+ memset(sa, 0, sizeof(sa));
+ nfsargs.addr = (struct sockaddr *)sa;
+ nfsargs.addrlen = sizeof(sa);
+ if ((name = strdup(mntpt)) == NULL)
+ err(EXIT_FAILURE, strdup);
+ if (!getnfsargs(name, nfsargs))
+ proto = IPPROTO_UDP;
+ else
+ proto = nfsargs.proto;
+
+ // XXX: Return udp6/tcp6 too?
+ return proto == IPPROTO_UDP ? udp : tcp;
+}
#endif /* !SMALL */
static void
CVS commit: src/sbin/mount_nfs
Module Name:src
Committed By: christos
Date: Sat Jun 29 22:56:26 UTC 2013
Modified Files:
src/sbin/mount_nfs: getnfsargs.c getnfsargs_small.c mount_nfs.c
mount_nfs.h
Log Message:
declare the variables that getnfsargs need in getnfsargs so that they can
easily be used from other programs.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sbin/mount_nfs/getnfsargs.c
cvs rdiff -u -r1.9 -r1.10 src/sbin/mount_nfs/getnfsargs_small.c
cvs rdiff -u -r1.70 -r1.71 src/sbin/mount_nfs/mount_nfs.c
cvs rdiff -u -r1.2 -r1.3 src/sbin/mount_nfs/mount_nfs.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/mount_nfs/getnfsargs.c
diff -u src/sbin/mount_nfs/getnfsargs.c:1.15 src/sbin/mount_nfs/getnfsargs.c:1.16
--- src/sbin/mount_nfs/getnfsargs.c:1.15 Fri Mar 1 13:25:17 2013
+++ src/sbin/mount_nfs/getnfsargs.c Sat Jun 29 18:56:26 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: getnfsargs.c,v 1.15 2013/03/01 18:25:17 joerg Exp $ */
+/* $NetBSD: getnfsargs.c,v 1.16 2013/06/29 22:56:26 christos Exp $ */
/*
* Copyright (c) 1992, 1993, 1994
@@ -42,7 +42,7 @@ __COPYRIGHT(@(#) Copyright (c) 1992, 19
#if 0
static char sccsid[] = @(#)mount_nfs.c 8.11 (Berkeley) 5/4/95;
#else
-__RCSID($NetBSD: getnfsargs.c,v 1.15 2013/03/01 18:25:17 joerg Exp $);
+__RCSID($NetBSD: getnfsargs.c,v 1.16 2013/06/29 22:56:26 christos Exp $);
#endif
#endif /* not lint */
@@ -76,6 +76,13 @@ __RCSID($NetBSD: getnfsargs.c,v 1.15 20
#include mount_nfs.h
+int retrycnt = DEF_RETRY;
+int opflags = 0;
+int force2 = 0;
+int force3 = 0;
+int mnttcp_ok = 1;
+int port = 0;
+
struct nfhret {
u_long stat;
long vers;
Index: src/sbin/mount_nfs/getnfsargs_small.c
diff -u src/sbin/mount_nfs/getnfsargs_small.c:1.9 src/sbin/mount_nfs/getnfsargs_small.c:1.10
--- src/sbin/mount_nfs/getnfsargs_small.c:1.9 Wed Jul 6 05:02:54 2011
+++ src/sbin/mount_nfs/getnfsargs_small.c Sat Jun 29 18:56:26 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: getnfsargs_small.c,v 1.9 2011/07/06 09:02:54 mrg Exp $ */
+/* $NetBSD: getnfsargs_small.c,v 1.10 2013/06/29 22:56:26 christos Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -90,7 +90,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: getnfsargs_small.c,v 1.9 2011/07/06 09:02:54 mrg Exp $);
+__RCSID($NetBSD: getnfsargs_small.c,v 1.10 2013/06/29 22:56:26 christos Exp $);
#include sys/param.h
#include sys/mount.h
@@ -130,6 +130,13 @@ struct nfhret {
u_char nfh[NFSX_V3FHMAX];
};
+int retrycnt = DEF_RETRY;
+int opflags = 0;
+int force2 = 0;
+int force3 = 0;
+int mnttcp_ok = 1;
+int port = 0;
+
/* Ripped from src/sys/arch/i386/stand/libsa/nfs.c */
static int
nfs_getrootfh(struct iodesc *d, const char *path, int mntvers, struct nfhret *nfhret)
Index: src/sbin/mount_nfs/mount_nfs.c
diff -u src/sbin/mount_nfs/mount_nfs.c:1.70 src/sbin/mount_nfs/mount_nfs.c:1.71
--- src/sbin/mount_nfs/mount_nfs.c:1.70 Fri Mar 1 13:25:17 2013
+++ src/sbin/mount_nfs/mount_nfs.c Sat Jun 29 18:56:26 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: mount_nfs.c,v 1.70 2013/03/01 18:25:17 joerg Exp $ */
+/* $NetBSD: mount_nfs.c,v 1.71 2013/06/29 22:56:26 christos Exp $ */
/*
* Copyright (c) 1992, 1993, 1994
@@ -42,7 +42,7 @@ __COPYRIGHT(@(#) Copyright (c) 1992, 19
#if 0
static char sccsid[] = @(#)mount_nfs.c 8.11 (Berkeley) 5/4/95;
#else
-__RCSID($NetBSD: mount_nfs.c,v 1.70 2013/03/01 18:25:17 joerg Exp $);
+__RCSID($NetBSD: mount_nfs.c,v 1.71 2013/06/29 22:56:26 christos Exp $);
#endif
#endif /* not lint */
@@ -150,15 +150,6 @@ struct nfs_args nfsdefargs = {
.hostname = NULL,
};
-#define DEF_RETRY 1
-
-int retrycnt = DEF_RETRY;
-int opflags = 0;
-int force2 = 0;
-int force3 = 0;
-int mnttcp_ok = 1;
-int port = 0;
-
static void shownfsargs(const struct nfs_args *);
int mount_nfs(int argc, char **argv);
/* void set_rpc_maxgrouplist(int); */
Index: src/sbin/mount_nfs/mount_nfs.h
diff -u src/sbin/mount_nfs/mount_nfs.h:1.2 src/sbin/mount_nfs/mount_nfs.h:1.3
--- src/sbin/mount_nfs/mount_nfs.h:1.2 Thu Oct 16 05:12:54 2008
+++ src/sbin/mount_nfs/mount_nfs.h Sat Jun 29 18:56:26 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: mount_nfs.h,v 1.2 2008/10/16 09:12:54 pooka Exp $ */
+/* $NetBSD: mount_nfs.h,v 1.3 2013/06/29 22:56:26 christos Exp $ */
/*
* Copyright (c) 1992, 1993, 1994
@@ -48,6 +48,8 @@ extern int opflags;
extern int mnttcp_ok;
extern int port;
+#define DEF_RETRY 1
+
int getnfsargs(char *, struct nfs_args *);
void mount_nfs_dogetargs(struct nfs_args *, int, const char *);
void mount_nfs_parseargs(int, char **, struct nfs_args *, int *,
CVS commit: src/sbin/umount
Module Name:src Committed By: christos Date: Sat Jun 29 23:06:29 UTC 2013 Modified Files: src/sbin/umount: umount.c Log Message: one copy of the name is enough, and free it. To generate a diff of this commit: cvs rdiff -u -r1.44 -r1.45 src/sbin/umount/umount.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/umount/umount.c diff -u src/sbin/umount/umount.c:1.44 src/sbin/umount/umount.c:1.45 --- src/sbin/umount/umount.c:1.44 Sat Jun 29 18:53:04 2013 +++ src/sbin/umount/umount.c Sat Jun 29 19:06:29 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: umount.c,v 1.44 2013/06/29 22:53:04 christos Exp $ */ +/* $NetBSD: umount.c,v 1.45 2013/06/29 23:06:29 christos Exp $ */ /*- * Copyright (c) 1980, 1989, 1993 @@ -39,7 +39,7 @@ __COPYRIGHT(@(#) Copyright (c) 1980, 19 #if 0 static char sccsid[] = @(#)umount.c 8.8 (Berkeley) 5/8/95; #else -__RCSID($NetBSD: umount.c,v 1.44 2013/06/29 22:53:04 christos Exp $); +__RCSID($NetBSD: umount.c,v 1.45 2013/06/29 23:06:29 christos Exp $); #endif #endif /* not lint */ @@ -391,8 +391,8 @@ getmntproto(const char *mntpt) struct nfs_args nfsargs; struct sockaddr_storage sa; int proto; + char *name; - char *name = strdup(mntpt); memset(sa, 0, sizeof(sa)); nfsargs.addr = (struct sockaddr *)sa; nfsargs.addrlen = sizeof(sa); @@ -402,6 +402,7 @@ getmntproto(const char *mntpt) proto = IPPROTO_UDP; else proto = nfsargs.proto; + free(name); // XXX: Return udp6/tcp6 too? return proto == IPPROTO_UDP ? udp : tcp;
CVS commit: src/sys/sys
Module Name:src Committed By: rmind Date: Sun Jun 30 00:00:53 UTC 2013 Modified Files: src/sys/sys: param.h Log Message: Welcome to NetBSD 6.99.23: pfil(9) changes. To generate a diff of this commit: cvs rdiff -u -r1.431 -r1.432 src/sys/sys/param.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/sys/param.h diff -u src/sys/sys/param.h:1.431 src/sys/sys/param.h:1.432 --- src/sys/sys/param.h:1.431 Sun Jun 16 13:33:30 2013 +++ src/sys/sys/param.h Sun Jun 30 00:00:53 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.431 2013/06/16 13:33:30 hannken Exp $ */ +/* $NetBSD: param.h,v 1.432 2013/06/30 00:00:53 rmind Exp $ */ /*- * Copyright (c) 1982, 1986, 1989, 1993 @@ -63,7 +63,7 @@ * 2.99.9 (299000900) */ -#define __NetBSD_Version__ 699002200 /* NetBSD 6.99.22 */ +#define __NetBSD_Version__ 699002300 /* NetBSD 6.99.23 */ #define __NetBSD_Prereq__(M,m,p) (M) * 1) + \ (m) * 100) + (p) * 100) = __NetBSD_Version__)
