d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Catch up with head.

Browse Source
This commit is contained in:
Navdeep Parhar 2015-11-26 02:16:25 +00:00
commit 8d4f972bad
705 changed files with 28907 additions and 32489 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ObsoleteFiles.inc
View File

@ -142,10 +142,6 @@ OLD_FILES+=usr/share/locale/sr_YU.UTF-8/LC_TIME
OLD_FILES+=usr/share/locale/sr_YU.UTF-8/LC_NUMERIC
OLD_FILES+=usr/share/locale/sr_YU.UTF-8/LC_MESSAGES
OLD_DIRS+=usr/share/locale/sr_YU.UTF-8
OLD_FILES+=usr/bin/colldef
OLD_FILES+=usr/share/man/man1/colldef.1.gz
OLD_FILES+=usr/bin/mklocale
OLD_FILES+=usr/share/man/man1/mklocale.1.gz
# 20151101: added missing _test suffix on multiple tests in lib/libc
OLD_FILES+=usr/tests/lib/libc/c063/faccessat
OLD_FILES+=usr/tests/lib/libc/c063/fchmodat

4
bin/rmail/Makefile
View File

@ -29,7 +29,7 @@ LDFLAGS+=${SENDMAIL_LDFLAGS}
# following:
# CFLAGS+= -DQUEUE_ONLY
sm_os.h:
ln -sf ${SENDMAIL_DIR}/include/sm/os/sm_os_freebsd.h sm_os.h
sm_os.h: ${SENDMAIL_DIR}/include/sm/os/sm_os_freebsd.h .NOMETA
ln -sf ${.ALLSRC} ${.TARGET}
.include <bsd.prog.mk>

1
bin/rmail/Makefile.depend
View File

@ -10,7 +10,6 @@ DIRDEPS = \
lib/libc \
lib/libcompiler_rt \
lib/libsm \
lib/libutil \
.include <dirdeps.mk>

18
bin/sh/mknodes.c
View File

@ -296,10 +296,10 @@ outfunc(FILE *cfile, int calcsize)
else
fputs(" return NULL;\n", cfile);
if (calcsize)
fputs(" funcblocksize += nodesize[n->type];\n", cfile);
fputs(" result->blocksize += nodesize[n->type];\n", cfile);
else {
fputs(" new = funcblock;\n", cfile);
fputs(" funcblock = (char *)funcblock + nodesize[n->type];\n", cfile);
fputs(" new = state->block;\n", cfile);
fputs(" state->block = (char *)state->block + nodesize[n->type];\n", cfile);
}
fputs(" switch (n->type) {\n", cfile);
for (sp = str ; sp < &str[nstr] ; sp++) {
@ -313,33 +313,33 @@ outfunc(FILE *cfile, int calcsize)
case T_NODE:
if (calcsize) {
indent(12, cfile);
fprintf(cfile, "calcsize(n->%s.%s);\n",
fprintf(cfile, "calcsize(n->%s.%s, result);\n",
sp->tag, fp->name);
} else {
indent(12, cfile);
fprintf(cfile, "new->%s.%s = copynode(n->%s.%s);\n",
fprintf(cfile, "new->%s.%s = copynode(n->%s.%s, state);\n",
sp->tag, fp->name, sp->tag, fp->name);
}
break;
case T_NODELIST:
if (calcsize) {
indent(12, cfile);
fprintf(cfile, "sizenodelist(n->%s.%s);\n",
fprintf(cfile, "sizenodelist(n->%s.%s, result);\n",
sp->tag, fp->name);
} else {
indent(12, cfile);
fprintf(cfile, "new->%s.%s = copynodelist(n->%s.%s);\n",
fprintf(cfile, "new->%s.%s = copynodelist(n->%s.%s, state);\n",
sp->tag, fp->name, sp->tag, fp->name);
}
break;
case T_STRING:
if (calcsize) {
indent(12, cfile);
fprintf(cfile, "funcstringsize += strlen(n->%s.%s) + 1;\n",
fprintf(cfile, "result->stringsize += strlen(n->%s.%s) + 1;\n",
sp->tag, fp->name);
} else {
indent(12, cfile);
fprintf(cfile, "new->%s.%s = nodesavestr(n->%s.%s);\n",
fprintf(cfile, "new->%s.%s = nodesavestr(n->%s.%s, state);\n",
sp->tag, fp->name, sp->tag, fp->name);
}
break;

66
bin/sh/nodes.c.pat
View File

@ -46,19 +46,24 @@
#include "mystring.h"
static int funcblocksize; /* size of structures in function */
static int funcstringsize; /* size of strings in node */
static pointer funcblock; /* block to allocate function from */
static char *funcstring; /* block to allocate strings from */
struct nodesize {
int blocksize; /* size of structures in function */
int stringsize; /* size of strings in node */
};
struct nodecopystate {
pointer block; /* block to allocate function from */
char *string; /* block to allocate strings from */
};
%SIZES
static void calcsize(union node *);
static void sizenodelist(struct nodelist *);
static union node *copynode(union node *);
static struct nodelist *copynodelist(struct nodelist *);
static char *nodesavestr(const char *);
static void calcsize(union node *, struct nodesize *);
static void sizenodelist(struct nodelist *, struct nodesize *);
static union node *copynode(union node *, struct nodecopystate *);
static struct nodelist *copynodelist(struct nodelist *, struct nodecopystate *);
static char *nodesavestr(const char *, struct nodecopystate *);
struct funcdef {
@ -73,18 +78,20 @@ struct funcdef {
struct funcdef *
copyfunc(union node *n)
{
struct nodesize sz;
struct nodecopystate st;
struct funcdef *fn;
if (n == NULL)
return NULL;
funcblocksize = offsetof(struct funcdef, n);
funcstringsize = 0;
calcsize(n);
fn = ckmalloc(funcblocksize + funcstringsize);
sz.blocksize = offsetof(struct funcdef, n);
sz.stringsize = 0;
calcsize(n, &sz);
fn = ckmalloc(sz.blocksize + sz.stringsize);
fn->refcount = 1;
funcblock = (char *)fn + offsetof(struct funcdef, n);
funcstring = (char *)fn + funcblocksize;
copynode(n);
st.block = (char *)fn + offsetof(struct funcdef, n);
st.string = (char *)fn + sz.blocksize;
copynode(n, &st);
return fn;
}
@ -97,7 +104,7 @@ getfuncnode(struct funcdef *fn)
static void
calcsize(union node *n)
calcsize(union node *n, struct nodesize *result)
{
%CALCSIZE
}
@ -105,11 +112,11 @@ calcsize(union node *n)
static void
sizenodelist(struct nodelist *lp)
sizenodelist(struct nodelist *lp, struct nodesize *result)
{
while (lp) {
funcblocksize += ALIGN(sizeof(struct nodelist));
calcsize(lp->n);
result->blocksize += ALIGN(sizeof(struct nodelist));
calcsize(lp->n, result);
lp = lp->next;
}
}
@ -117,7 +124,7 @@ sizenodelist(struct nodelist *lp)
static union node *
copynode(union node *n)
copynode(union node *n, struct nodecopystate *state)
{
union node *new;
@ -127,16 +134,17 @@ copynode(union node *n)
static struct nodelist *
copynodelist(struct nodelist *lp)
copynodelist(struct nodelist *lp, struct nodecopystate *state)
{
struct nodelist *start;
struct nodelist **lpp;
lpp = &start;
while (lp) {
*lpp = funcblock;
funcblock = (char *)funcblock + ALIGN(sizeof(struct nodelist));
(*lpp)->n = copynode(lp->n);
*lpp = state->block;
state->block = (char *)state->block +
ALIGN(sizeof(struct nodelist));
(*lpp)->n = copynode(lp->n, state);
lp = lp->next;
lpp = &(*lpp)->next;
}
@ -147,15 +155,15 @@ copynodelist(struct nodelist *lp)
static char *
nodesavestr(const char *s)
nodesavestr(const char *s, struct nodecopystate *state)
{
const char *p = s;
char *q = funcstring;
char *rtn = funcstring;
char *q = state->string;
char *rtn = state->string;
while ((*q++ = *p++) != '\0')
continue;
funcstring = q;
state->string = q;
return rtn;
}

1
cddl/lib/libavl/Makefile.depend
View File

@ -8,7 +8,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
usr.bin/xinstall.host \
.include <dirdeps.mk>

1
cddl/lib/libctf/Makefile.depend
View File

@ -11,7 +11,6 @@ DIRDEPS = \
lib/libcompiler_rt \
lib/libelf \
lib/libz \
usr.bin/xinstall.host \
.include <dirdeps.mk>

1
cddl/lib/libdtrace/Makefile.depend
View File

@ -15,7 +15,6 @@ DIRDEPS = \
lib/libproc \
lib/librtld_db \
lib/libthr \
usr.bin/xinstall.host \
usr.bin/yacc.host \

1
cddl/lib/libnvpair/Makefile.depend
View File

@ -10,7 +10,6 @@ DIRDEPS = \
lib/libc \
lib/libcompiler_rt \
lib/msun \
usr.bin/xinstall.host \
.include <dirdeps.mk>

1
cddl/lib/libumem/Makefile.depend
View File

@ -8,7 +8,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
usr.bin/xinstall.host \
.include <dirdeps.mk>

1
cddl/lib/libuutil/Makefile.depend
View File

@ -9,7 +9,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
usr.bin/xinstall.host \
.include <dirdeps.mk>

1
cddl/lib/libzfs/Makefile.depend
View File

@ -20,7 +20,6 @@ DIRDEPS = \
lib/libthr \
lib/libutil \
lib/msun \
usr.bin/xinstall.host \
.include <dirdeps.mk>

1
cddl/lib/libzfs_core/Makefile.depend
View File

@ -11,7 +11,6 @@ DIRDEPS = \
lib/libc \
lib/libcompiler_rt \
lib/msun \
usr.bin/xinstall.host \
.include <dirdeps.mk>

1
cddl/lib/libzpool/Makefile.depend
View File

@ -16,7 +16,6 @@ DIRDEPS = \
lib/libthr \
lib/libz \
lib/msun \
usr.bin/xinstall.host \
.include <dirdeps.mk>

2
cddl/usr.sbin/dtrace/tests/common/aggs/Makefile
View File

@ -186,4 +186,4 @@ CFILES= \
.include "../../Makefile.inc1"
.include "../../dtrace.test.mk"

2
cddl/usr.sbin/dtrace/tests/common/arithmetic/Makefile
View File

@ -29,4 +29,4 @@ CFILES= \
.include "../../Makefile.inc1"
.include "../../dtrace.test.mk"

2
cddl/usr.sbin/dtrace/tests/common/arrays/Makefile
View File

@ -26,4 +26,4 @@ CFILES= \
.include "../../Makefile.inc1"
.include "../../dtrace.test.mk"

2
cddl/usr.sbin/dtrace/tests/common/assocs/Makefile
View File

@ -29,4 +29,4 @@ CFILES= \
.include "../../Makefile.inc1"
.include "../../dtrace.test.mk"

2
cddl/usr.sbin/dtrace/tests/common/begin/Makefile
View File

@ -19,4 +19,4 @@ CFILES= \
.include "../../Makefile.inc1"
.include "../../dtrace.test.mk"

2
cddl/usr.sbin/dtrace/tests/common/bitfields/Makefile
View File

@ -23,4 +23,4 @@ CFILES= \
.include "../../Makefile.inc1"
.include "../../dtrace.test.mk"

2
cddl/usr.sbin/dtrace/tests/common/buffering/Makefile
View File

@ -34,4 +34,4 @@ CFILES= \
.include "../../Makefile.inc1"
.include "../../dtrace.test.mk"

2
cddl/usr.sbin/dtrace/tests/common/builtinvar/Makefile
View File

@ -45,4 +45,4 @@ CFILES= \
.include "../../Makefile.inc1"
.include "../../dtrace.test.mk"

2
cddl/usr.sbin/dtrace/tests/common/cg/Makefile
View File

@ -15,4 +15,4 @@ CFILES= \
.include "../../Makefile.inc1"
.include "../../dtrace.test.mk"

2
cddl/usr.sbin/dtrace/tests/common/clauses/Makefile
View File

@ -23,4 +23,4 @@ CFILES= \
.include "../../Makefile.inc1"
.include "../../dtrace.test.mk"

2
cddl/usr.sbin/dtrace/tests/common/cpc/Makefile
View File

@ -24,4 +24,4 @@ CFILES= \
.include "../../Makefile.inc1"
.include "../../dtrace.test.mk"

2
cddl/usr.sbin/dtrace/tests/common/decls/Makefile
View File

@ -27,4 +27,4 @@ CFILES= \
.include "../../Makefile.inc1"
.include "../../dtrace.test.mk"

2
cddl/usr.sbin/dtrace/tests/common/docsExamples/Makefile
View File

@ -29,4 +29,4 @@ CFILES= \
.include "../../Makefile.inc1"
.include "../../dtrace.test.mk"

2
cddl/usr.sbin/dtrace/tests/common/drops/Makefile
View File

@ -21,4 +21,4 @@ CFILES= \
.include "../../Makefile.inc1"
.include "../../dtrace.test.mk"

2
cddl/usr.sbin/dtrace/tests/common/dtraceUtil/Makefile
View File

@ -115,4 +115,4 @@ CFILES= \
.include "../../Makefile.inc1"
.include "../../dtrace.test.mk"

2
cddl/usr.sbin/dtrace/tests/common/end/Makefile
View File

@ -18,4 +18,4 @@ CFILES= \
.include "../../Makefile.inc1"
.include "../../dtrace.test.mk"

2
cddl/usr.sbin/dtrace/tests/common/enum/Makefile
View File

@ -18,4 +18,4 @@ CFILES= \
.include "../../Makefile.inc1"
.include "../../dtrace.test.mk"

2
cddl/usr.sbin/dtrace/tests/common/error/Makefile
View File

@ -18,4 +18,4 @@ CFILES= \
.include "../../Makefile.inc1"
.include "../../dtrace.test.mk"

2
cddl/usr.sbin/dtrace/tests/common/exit/Makefile
View File

@ -16,4 +16,4 @@ CFILES= \
.include "../../Makefile.inc1"
.include "../../dtrace.test.mk"

2
cddl/usr.sbin/dtrace/tests/common/fbtprovider/Makefile
View File

@ -23,4 +23,4 @@ CFILES= \
.include "../../Makefile.inc1"
.include "../../dtrace.test.mk"

2
cddl/usr.sbin/dtrace/tests/common/funcs/Makefile
View File

@ -110,4 +110,4 @@ CFILES= \
.include "../../Makefile.inc1"
.include "../../dtrace.test.mk"

2
cddl/usr.sbin/dtrace/tests/common/grammar/Makefile
View File

@ -17,4 +17,4 @@ CFILES= \
.include "../../Makefile.inc1"
.include "../../dtrace.test.mk"

2
cddl/usr.sbin/dtrace/tests/common/include/Makefile
View File

@ -14,4 +14,4 @@ CFILES= \
.include "../../Makefile.inc1"
.include "../../dtrace.test.mk"

2
cddl/usr.sbin/dtrace/tests/common/inline/Makefile
View File

@ -25,4 +25,4 @@ CFILES= \
.include "../../Makefile.inc1"
.include "../../dtrace.test.mk"

2
cddl/usr.sbin/dtrace/tests/common/io/Makefile
View File

@ -15,4 +15,4 @@ CFILES= \
tst.fds.c \
.include "../../Makefile.inc1"
.include "../../dtrace.test.mk"

2
cddl/usr.sbin/dtrace/tests/common/ip/Makefile
View File

@ -33,4 +33,4 @@ CFILES= \
.include "../../Makefile.inc1"
.include "../../dtrace.test.mk"

2
cddl/usr.sbin/dtrace/tests/common/java_api/Makefile
View File

@ -41,4 +41,4 @@ CFILES= \
tst.ProbeData.c \
.include "../../Makefile.inc1"
.include "../../dtrace.test.mk"

2
cddl/usr.sbin/dtrace/tests/common/json/Makefile
View File

@ -20,4 +20,4 @@ CFILES= \
tst.usdt.c \
.include "../../Makefile.inc1"
.include "../../dtrace.test.mk"

2
cddl/usr.sbin/dtrace/tests/common/lexer/Makefile
View File

@ -27,4 +27,4 @@ CFILES= \
.include "../../Makefile.inc1"
.include "../../dtrace.test.mk"

2
cddl/usr.sbin/dtrace/tests/common/llquantize/Makefile
View File

@ -47,4 +47,4 @@ CFILES= \
.include "../../Makefile.inc1"
.include "../../dtrace.test.mk"

2
cddl/usr.sbin/dtrace/tests/common/mdb/Makefile
View File

@ -14,4 +14,4 @@ CFILES= \
.include "../../Makefile.inc1"
.include "../../dtrace.test.mk"

2
cddl/usr.sbin/dtrace/tests/common/mib/Makefile
View File

@ -16,4 +16,4 @@ CFILES= \
.include "../../Makefile.inc1"
.include "../../dtrace.test.mk"

2
cddl/usr.sbin/dtrace/tests/common/misc/Makefile
View File

@ -27,4 +27,4 @@ CFILES= \
.include "../../Makefile.inc1"
.include "../../dtrace.test.mk"

2
cddl/usr.sbin/dtrace/tests/common/multiaggs/Makefile
View File

@ -31,4 +31,4 @@ CFILES= \
.include "../../Makefile.inc1"
.include "../../dtrace.test.mk"

2
cddl/usr.sbin/dtrace/tests/common/nfs/Makefile
View File

@ -16,4 +16,4 @@ CFILES= \
tst.call3.c \
.include "../../Makefile.inc1"
.include "../../dtrace.test.mk"

2
cddl/usr.sbin/dtrace/tests/common/offsetof/Makefile
View File

@ -25,4 +25,4 @@ CFILES= \
.include "../../Makefile.inc1"
.include "../../dtrace.test.mk"

2
cddl/usr.sbin/dtrace/tests/common/operators/Makefile
View File

@ -15,4 +15,4 @@ CFILES= \
.include "../../Makefile.inc1"
.include "../../dtrace.test.mk"

2
cddl/usr.sbin/dtrace/tests/common/pid/Makefile
View File

@ -66,4 +66,4 @@ CFILES= \
tst.weak2.c \
.include "../../Makefile.inc1"
.include "../../dtrace.test.mk"

2
cddl/usr.sbin/dtrace/tests/common/plockstat/Makefile
View File

@ -16,4 +16,4 @@ CFILES= \
.include "../../Makefile.inc1"
.include "../../dtrace.test.mk"

2
cddl/usr.sbin/dtrace/tests/common/pointers/Makefile
View File

@ -45,4 +45,4 @@ CFILES= \
.include "../../Makefile.inc1"
.include "../../dtrace.test.mk"

2
cddl/usr.sbin/dtrace/tests/common/pragma/Makefile
View File

@ -27,4 +27,4 @@ CFILES= \
.include "../../Makefile.inc1"
.include "../../dtrace.test.mk"

2
cddl/usr.sbin/dtrace/tests/common/predicates/Makefile
View File

@ -22,4 +22,4 @@ CFILES= \
.include "../../Makefile.inc1"
.include "../../dtrace.test.mk"

2
cddl/usr.sbin/dtrace/tests/common/preprocessor/Makefile
View File

@ -50,4 +50,4 @@ CFILES= \
.include "../../Makefile.inc1"
.include "../../dtrace.test.mk"

2
cddl/usr.sbin/dtrace/tests/common/print/Makefile
View File

@ -29,4 +29,4 @@ CFILES= \
.include "../../Makefile.inc1"
.include "../../dtrace.test.mk"

2
cddl/usr.sbin/dtrace/tests/common/printa/Makefile
View File

@ -37,4 +37,4 @@ CFILES= \
.include "../../Makefile.inc1"
.include "../../dtrace.test.mk"

2
cddl/usr.sbin/dtrace/tests/common/printf/Makefile
View File

@ -65,4 +65,4 @@ CFILES= \
.include "../../Makefile.inc1"
.include "../../dtrace.test.mk"

2
cddl/usr.sbin/dtrace/tests/common/privs/Makefile
View File

@ -21,4 +21,4 @@ CFILES= \
.include "../../Makefile.inc1"
.include "../../dtrace.test.mk"

2
cddl/usr.sbin/dtrace/tests/common/probes/Makefile
View File

@ -33,4 +33,4 @@ CFILES= \
.include "../../Makefile.inc1"
.include "../../dtrace.test.mk"

2
cddl/usr.sbin/dtrace/tests/common/proc/Makefile
View File

@ -27,4 +27,4 @@ CFILES= \
LDADD.tst.sigwait.exe+= -lrt
DPADD.tst.sigwait.exe+= ${LIBRT}
.include "../../Makefile.inc1"
.include "../../dtrace.test.mk"

2
cddl/usr.sbin/dtrace/tests/common/profile-n/Makefile
View File

@ -50,4 +50,4 @@ CFILES= \
tst.ufuncsort.c \
.include "../../Makefile.inc1"
.include "../../dtrace.test.mk"

2
cddl/usr.sbin/dtrace/tests/common/providers/Makefile
View File

@ -41,4 +41,4 @@ CFILES= \
.include "../../Makefile.inc1"
.include "../../dtrace.test.mk"

2
cddl/usr.sbin/dtrace/tests/common/raise/Makefile
View File

@ -18,4 +18,4 @@ CFILES= \
tst.raise3.c \
.include "../../Makefile.inc1"
.include "../../dtrace.test.mk"

2
cddl/usr.sbin/dtrace/tests/common/rates/Makefile
View File

@ -18,4 +18,4 @@ CFILES= \
.include "../../Makefile.inc1"
.include "../../dtrace.test.mk"

2
cddl/usr.sbin/dtrace/tests/common/safety/Makefile
View File

@ -51,4 +51,4 @@ CFILES= \
.include "../../Makefile.inc1"
.include "../../dtrace.test.mk"

2
cddl/usr.sbin/dtrace/tests/common/scalars/Makefile
View File

@ -34,4 +34,4 @@ CFILES= \
.include "../../Makefile.inc1"
.include "../../dtrace.test.mk"

2
cddl/usr.sbin/dtrace/tests/common/sched/Makefile
View File

@ -16,4 +16,4 @@ CFILES= \
.include "../../Makefile.inc1"
.include "../../dtrace.test.mk"

2
cddl/usr.sbin/dtrace/tests/common/scripting/Makefile
View File

@ -46,4 +46,4 @@ CFILES= \
.include "../../Makefile.inc1"
.include "../../dtrace.test.mk"

2
cddl/usr.sbin/dtrace/tests/common/sdt/Makefile
View File

@ -14,4 +14,4 @@ CFILES= \
tst.sdtargs.c \
.include "../../Makefile.inc1"
.include "../../dtrace.test.mk"

2
cddl/usr.sbin/dtrace/tests/common/sizeof/Makefile
View File

@ -28,4 +28,4 @@ CFILES= \
.include "../../Makefile.inc1"
.include "../../dtrace.test.mk"

2
cddl/usr.sbin/dtrace/tests/common/speculation/Makefile
View File

@ -72,4 +72,4 @@ CFILES= \
.include "../../Makefile.inc1"
.include "../../dtrace.test.mk"

2
cddl/usr.sbin/dtrace/tests/common/stability/Makefile
View File

@ -14,4 +14,4 @@ CFILES= \
.include "../../Makefile.inc1"
.include "../../dtrace.test.mk"

2
cddl/usr.sbin/dtrace/tests/common/stack/Makefile
View File

@ -19,4 +19,4 @@ CFILES= \
.include "../../Makefile.inc1"
.include "../../dtrace.test.mk"

2
cddl/usr.sbin/dtrace/tests/common/stackdepth/Makefile
View File

@ -14,4 +14,4 @@ CFILES= \
.include "../../Makefile.inc1"
.include "../../dtrace.test.mk"

2
cddl/usr.sbin/dtrace/tests/common/stop/Makefile
View File

@ -16,4 +16,4 @@ CFILES= \
tst.stop2.c \
.include "../../Makefile.inc1"
.include "../../dtrace.test.mk"

2
cddl/usr.sbin/dtrace/tests/common/strlen/Makefile
View File

@ -14,4 +14,4 @@ CFILES= \
.include "../../Makefile.inc1"
.include "../../dtrace.test.mk"

2
cddl/usr.sbin/dtrace/tests/common/strtoll/Makefile
View File

@ -17,4 +17,4 @@ CFILES= \
.include "../../Makefile.inc1"
.include "../../dtrace.test.mk"

2
cddl/usr.sbin/dtrace/tests/common/struct/Makefile
View File

@ -28,4 +28,4 @@ CFILES= \
.include "../../Makefile.inc1"
.include "../../dtrace.test.mk"

2
cddl/usr.sbin/dtrace/tests/common/syscall/Makefile
View File

@ -15,4 +15,4 @@ CFILES= \
tst.args.c \
.include "../../Makefile.inc1"
.include "../../dtrace.test.mk"

2
cddl/usr.sbin/dtrace/tests/common/sysevent/Makefile
View File

@ -16,4 +16,4 @@ CFILES= \
tst.post_chan.c \
.include "../../Makefile.inc1"
.include "../../dtrace.test.mk"

2
cddl/usr.sbin/dtrace/tests/common/tick-n/Makefile
View File

@ -35,4 +35,4 @@ CFILES= \
.include "../../Makefile.inc1"
.include "../../dtrace.test.mk"

2
cddl/usr.sbin/dtrace/tests/common/trace/Makefile
View File

@ -21,4 +21,4 @@ CFILES= \
.include "../../Makefile.inc1"
.include "../../dtrace.test.mk"

2
cddl/usr.sbin/dtrace/tests/common/tracemem/Makefile
View File

@ -23,4 +23,4 @@ CFILES= \
.include "../../Makefile.inc1"
.include "../../dtrace.test.mk"

2
cddl/usr.sbin/dtrace/tests/common/translators/Makefile
View File

@ -48,4 +48,4 @@ CFILES= \
.include "../../Makefile.inc1"
.include "../../dtrace.test.mk"

2
cddl/usr.sbin/dtrace/tests/common/typedef/Makefile
View File

@ -18,4 +18,4 @@ CFILES= \
.include "../../Makefile.inc1"
.include "../../dtrace.test.mk"

2
cddl/usr.sbin/dtrace/tests/common/types/Makefile
View File

@ -66,4 +66,4 @@ CFILES= \
.include "../../Makefile.inc1"
.include "../../dtrace.test.mk"

2
cddl/usr.sbin/dtrace/tests/common/uctf/Makefile
View File

@ -38,4 +38,4 @@ CFILES= \
WITH_CTF=YES
.include "../../Makefile.inc1"
.include "../../dtrace.test.mk"

2
cddl/usr.sbin/dtrace/tests/common/union/Makefile
View File

@ -24,4 +24,4 @@ CFILES= \
.include "../../Makefile.inc1"
.include "../../dtrace.test.mk"

2
cddl/usr.sbin/dtrace/tests/common/usdt/Makefile
View File

@ -62,4 +62,4 @@ CFILES= \
tst.forker.c \
.include "../../Makefile.inc1"
.include "../../dtrace.test.mk"

2
cddl/usr.sbin/dtrace/tests/common/ustack/Makefile
View File

@ -17,4 +17,4 @@ CFILES= \
tst.spin.c \
.include "../../Makefile.inc1"
.include "../../dtrace.test.mk"

2
cddl/usr.sbin/dtrace/tests/common/vars/Makefile
View File

@ -20,4 +20,4 @@ CFILES= \
.include "../../Makefile.inc1"
.include "../../dtrace.test.mk"

2
cddl/usr.sbin/dtrace/tests/common/version/Makefile
View File

@ -14,4 +14,4 @@ CFILES= \
.include "../../Makefile.inc1"
.include "../../dtrace.test.mk"

0
cddl/usr.sbin/dtrace/tests/Makefile.inc1 → cddl/usr.sbin/dtrace/tests/dtrace.test.mk
View File

2
cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh
View File

@ -63,7 +63,7 @@ CFILES= \\
$tcfiles
$special
.include "../../Makefile.inc1"
.include "../../dtrace.test.mk"
__EOF__
mv -f $makefile ${ORIGINDIR}/../common/${basedir}/Makefile

4
contrib/bmake/parse.c
View File

@ -2390,15 +2390,19 @@ static void
ParseTrackInput(const char *name)
{
char *old;
char *ep;
char *fp = NULL;
size_t name_len = strlen(name);
old = Var_Value(MAKE_MAKEFILES, VAR_GLOBAL, &fp);
if (old) {
ep = old + strlen(old) - name_len;
/* does it contain name? */
for (; old != NULL; old = strchr(old, ' ')) {
if (*old == ' ')
old++;
if (old >= ep)
break; /* cannot contain name */
if (memcmp(old, name, name_len) == 0
&& (old[name_len] == 0 || old[name_len] == ' '))
goto cleanup;

2
contrib/sendmail/include/sm/conf.h
View File

@ -1019,7 +1019,9 @@ extern unsigned int sleepX __P((unsigned int seconds));
# if __FreeBSD__ >= 2
# include <osreldate.h>
# if __FreeBSD_version >= 199512 /* 2.2-current when it appeared */
# if __FreeBSD_version < 500012
# include <libutil.h>
# endif
# define SPT_TYPE SPT_BUILTIN
# endif /* __FreeBSD_version >= 199512 */
# if __FreeBSD_version >= 222000 /* 2.2.2-release and later */

2
contrib/wpa/src/drivers/driver_bsd.c
View File

@ -1497,6 +1497,8 @@ get80211opmode(struct bsd_driver_data *drv)
}
if (ifmr.ifm_current & IFM_IEEE80211_HOSTAP)
return IEEE80211_M_HOSTAP;
if (ifmr.ifm_current & IFM_IEEE80211_IBSS)
return IEEE80211_M_IBSS;
if (ifmr.ifm_current & IFM_IEEE80211_MONITOR)
return IEEE80211_M_MONITOR;
#ifdef IEEE80211_M_MBSS

Some files were not shown because too many files have changed in this diff Show More