PERFORCE change 37754 for review
Marcel Moolenaar
marcel at FreeBSD.org
Sun Sep 7 17:10:45 PDT 2003
http://perforce.freebsd.org/chv.cgi?CH=37754
Change 37754 by marcel at marcel_nfs on 2003/09/07 17:10:17
IFC @37752
Affected files ...
.. //depot/projects/ia64/Makefile.inc1#82 integrate
.. //depot/projects/ia64/bin/sh/arith.y#6 integrate
.. //depot/projects/ia64/bin/test/Makefile#3 integrate
.. //depot/projects/ia64/etc/etc.ia64/ttys#3 integrate
.. //depot/projects/ia64/gnu/usr.bin/binutils/gdb/Makefile#10 integrate
.. //depot/projects/ia64/gnu/usr.bin/cvs/cvsbug/Makefile#4 integrate
.. //depot/projects/ia64/gnu/usr.bin/cvs/lib/Makefile#6 integrate
.. //depot/projects/ia64/gnu/usr.bin/send-pr/Makefile#4 integrate
.. //depot/projects/ia64/sbin/mksnap_ffs/mksnap_ffs.8#3 integrate
.. //depot/projects/ia64/sbin/rcorder/rcorder.c#3 integrate
.. //depot/projects/ia64/share/examples/ipfw/change_rules.sh#3 integrate
.. //depot/projects/ia64/share/man/man4/uart.4#2 integrate
.. //depot/projects/ia64/share/mk/bsd.lib.mk#27 integrate
.. //depot/projects/ia64/share/mk/bsd.man.mk#10 integrate
.. //depot/projects/ia64/sys/alpha/alpha/pmap.c#41 integrate
.. //depot/projects/ia64/sys/coda/cnode.h#6 integrate
.. //depot/projects/ia64/sys/coda/coda.h#2 integrate
.. //depot/projects/ia64/sys/coda/coda_namecache.c#6 integrate
.. //depot/projects/ia64/sys/coda/coda_namecache.h#4 integrate
.. //depot/projects/ia64/sys/coda/coda_subr.c#7 integrate
.. //depot/projects/ia64/sys/coda/coda_subr.h#2 integrate
.. //depot/projects/ia64/sys/coda/coda_venus.c#6 integrate
.. //depot/projects/ia64/sys/coda/coda_venus.h#2 integrate
.. //depot/projects/ia64/sys/coda/coda_vfsops.c#10 integrate
.. //depot/projects/ia64/sys/coda/coda_vfsops.h#3 integrate
.. //depot/projects/ia64/sys/coda/coda_vnops.c#12 integrate
.. //depot/projects/ia64/sys/compat/linux/linux_misc.c#28 integrate
.. //depot/projects/ia64/sys/conf/NOTES#67 integrate
.. //depot/projects/ia64/sys/conf/options#66 integrate
.. //depot/projects/ia64/sys/dev/sound/isa/ad1816.c#8 integrate
.. //depot/projects/ia64/sys/dev/sound/isa/ess.c#6 integrate
.. //depot/projects/ia64/sys/dev/sound/isa/mss.c#11 integrate
.. //depot/projects/ia64/sys/dev/sound/isa/sb16.c#7 integrate
.. //depot/projects/ia64/sys/dev/sound/isa/sb8.c#6 integrate
.. //depot/projects/ia64/sys/dev/sound/isa/sndbuf_dma.c#2 integrate
.. //depot/projects/ia64/sys/dev/sound/pci/aureal.c#7 integrate
.. //depot/projects/ia64/sys/dev/sound/pci/aureal.h#2 integrate
.. //depot/projects/ia64/sys/dev/sound/pci/emu10k1.c#14 integrate
.. //depot/projects/ia64/sys/dev/sound/pci/es137x.c#9 integrate
.. //depot/projects/ia64/sys/dev/sound/pci/maestro.c#8 integrate
.. //depot/projects/ia64/sys/dev/sound/pci/neomagic-coeff.h#2 integrate
.. //depot/projects/ia64/sys/dev/sound/pci/neomagic.c#5 integrate
.. //depot/projects/ia64/sys/dev/sound/pci/neomagic.h#2 integrate
.. //depot/projects/ia64/sys/dev/sound/pci/solo.c#7 integrate
.. //depot/projects/ia64/sys/dev/sound/pci/t4dwave.c#10 integrate
.. //depot/projects/ia64/sys/dev/sound/pci/t4dwave.h#2 integrate
.. //depot/projects/ia64/sys/dev/sound/pcm/ac97.c#22 integrate
.. //depot/projects/ia64/sys/dev/sound/pcm/ac97.h#6 integrate
.. //depot/projects/ia64/sys/dev/sound/pcm/buffer.c#10 integrate
.. //depot/projects/ia64/sys/dev/sound/pcm/buffer.h#5 integrate
.. //depot/projects/ia64/sys/dev/sound/pcm/channel.c#12 integrate
.. //depot/projects/ia64/sys/dev/sound/pcm/channel.h#4 integrate
.. //depot/projects/ia64/sys/dev/sound/pcm/dsp.c#13 integrate
.. //depot/projects/ia64/sys/dev/sound/pcm/dsp.h#2 integrate
.. //depot/projects/ia64/sys/dev/sound/pcm/fake.c#4 integrate
.. //depot/projects/ia64/sys/dev/sound/pcm/feeder.c#13 integrate
.. //depot/projects/ia64/sys/dev/sound/pcm/feeder.h#5 integrate
.. //depot/projects/ia64/sys/dev/sound/pcm/feeder_fmt.c#8 integrate
.. //depot/projects/ia64/sys/dev/sound/pcm/mixer.c#9 integrate
.. //depot/projects/ia64/sys/dev/sound/pcm/mixer.h#2 integrate
.. //depot/projects/ia64/sys/dev/sound/pcm/sndstat.c#8 integrate
.. //depot/projects/ia64/sys/dev/sound/pcm/sound.c#15 integrate
.. //depot/projects/ia64/sys/dev/sound/pcm/sound.h#8 integrate
.. //depot/projects/ia64/sys/dev/sound/pcm/vchan.c#8 integrate
.. //depot/projects/ia64/sys/dev/sound/pcm/vchan.h#2 integrate
.. //depot/projects/ia64/sys/dev/uart/uart_cpu.h#3 integrate
.. //depot/projects/ia64/sys/dev/uart/uart_cpu_alpha.c#2 integrate
.. //depot/projects/ia64/sys/dev/uart/uart_cpu_amd64.c#2 integrate
.. //depot/projects/ia64/sys/dev/uart/uart_cpu_i386.c#2 integrate
.. //depot/projects/ia64/sys/dev/uart/uart_cpu_ia64.c#2 integrate
.. //depot/projects/ia64/sys/dev/uart/uart_cpu_pc98.c#2 integrate
.. //depot/projects/ia64/sys/dev/uart/uart_cpu_sparc64.c#2 integrate
.. //depot/projects/ia64/sys/dev/uart/uart_dev_sab82532.c#2 integrate
.. //depot/projects/ia64/sys/dev/uart/uart_dev_z8530.c#2 integrate
.. //depot/projects/ia64/sys/i386/i386/db_interface.c#12 integrate
.. //depot/projects/ia64/sys/i386/i386/machdep.c#44 integrate
.. //depot/projects/ia64/sys/i386/isa/clock.c#22 integrate
.. //depot/projects/ia64/sys/i386/linux/imgact_linux.c#12 integrate
.. //depot/projects/ia64/sys/ia64/acpica/madt.c#15 integrate
.. //depot/projects/ia64/sys/ia64/conf/GENERIC#36 integrate
.. //depot/projects/ia64/sys/ia64/conf/GENERIC.hints#9 integrate
.. //depot/projects/ia64/sys/ia64/ia64/pmap.c#74 integrate
.. //depot/projects/ia64/sys/kern/kern_umtx.c#8 integrate
.. //depot/projects/ia64/sys/modules/Makefile#62 integrate
.. //depot/projects/ia64/sys/modules/coda/Makefile#3 integrate
.. //depot/projects/ia64/sys/modules/coda5/Makefile#1 branch
.. //depot/projects/ia64/sys/modules/uart/Makefile#3 integrate
.. //depot/projects/ia64/sys/vm/vm_mmap.c#23 integrate
.. //depot/projects/ia64/usr.bin/colldef/colldef.1#6 integrate
.. //depot/projects/ia64/usr.bin/killall/killall.c#9 integrate
.. //depot/projects/ia64/usr.bin/rpcinfo/rpcinfo.c#6 integrate
.. //depot/projects/ia64/usr.bin/rsh/rsh.c#9 integrate
.. //depot/projects/ia64/usr.bin/script/script.1#3 integrate
.. //depot/projects/ia64/usr.bin/truss/main.c#9 integrate
.. //depot/projects/ia64/usr.bin/truss/setup.c#4 integrate
.. //depot/projects/ia64/usr.bin/w/w.c#8 integrate
.. //depot/projects/ia64/usr.sbin/chown/chown.c#10 integrate
Differences ...
==== //depot/projects/ia64/Makefile.inc1#82 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/Makefile.inc1,v 1.389 2003/09/01 06:43:24 scottl Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.390 2003/09/07 14:15:40 ru Exp $
#
# Make command line options:
# -DNO_KERBEROS Do not build Heimdal (Kerberos 5)
@@ -227,6 +227,7 @@
# world stage
WMAKEENV= ${CROSSENV} \
DESTDIR=${WORLDTMP} \
+ _SHLIBDIRPREFIX=${WORLDTMP} \
INSTALL="sh ${.CURDIR}/tools/install.sh" \
PATH=${TMPPATH}
WMAKE= ${WMAKEENV} ${MAKE} -f Makefile.inc1
==== //depot/projects/ia64/bin/sh/arith.y#6 (text+ko) ====
@@ -42,7 +42,7 @@
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/arith.y,v 1.16 2003/09/04 18:28:42 schweikh Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/arith.y,v 1.17 2003/09/07 10:14:56 schweikh Exp $");
#include <limits.h>
#include "shell.h"
@@ -155,7 +155,7 @@
} |
ARITH_VAR ARITH_ASSIGN expr
{
- if (arith_assign($1, $3) != 1)
+ if (arith_assign($1, $3) != 0)
yyerror("variable assignment error");
$$ = $3;
} |
==== //depot/projects/ia64/bin/test/Makefile#3 (text+ko) ====
@@ -1,8 +1,8 @@
# @(#)Makefile 8.1 (Berkeley) 5/31/93
-# $FreeBSD: src/bin/test/Makefile,v 1.9 2001/12/04 01:57:47 obrien Exp $
+# $FreeBSD: src/bin/test/Makefile,v 1.10 2003/09/07 12:52:17 ru Exp $
PROG= test
LINKS= ${BINDIR}/test ${BINDIR}/[
-MLINKS= test.1 '[.1'
+MLINKS= test.1 [.1
.include <bsd.prog.mk>
==== //depot/projects/ia64/etc/etc.ia64/ttys#3 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/etc/etc.ia64/ttys,v 1.2 2002/04/17 10:42:41 gerald Exp $
+# $FreeBSD: src/etc/etc.ia64/ttys,v 1.3 2003/09/07 06:02:36 marcel Exp $
# @(#)ttys 5.1 (Berkeley) 4/17/89
#
# This file specifies various information about terminals on the system.
@@ -33,7 +33,7 @@
console none unknown off secure
#
ttyv0 "/usr/libexec/getty Pc" cons25 on secure
-# Virtual terminals
+# Virtual terminals.
ttyv1 "/usr/libexec/getty Pc" cons25 on secure
ttyv2 "/usr/libexec/getty Pc" cons25 on secure
ttyv3 "/usr/libexec/getty Pc" cons25 on secure
@@ -42,13 +42,13 @@
ttyv6 "/usr/libexec/getty Pc" cons25 on secure
ttyv7 "/usr/libexec/getty Pc" cons25 on secure
ttyv8 "/usr/X11R6/bin/xdm -nodaemon" xterm off secure
-# Serial terminals
-# The 'dialup' keyword identifies dialin lines to login, fingerd etc.
-ttyd0 "/usr/libexec/getty std.9600" vt100 on secure
-ttyd1 "/usr/libexec/getty std.9600" dialup off secure
-ttyd2 "/usr/libexec/getty std.9600" dialup off secure
-ttyd3 "/usr/libexec/getty std.9600" dialup off secure
-# Pseudo terminals
+# Serial terminals. The 'dialup' keyword identifies dialin lines to login,
+# fingerd etc.
+ttyu0 "/usr/libexec/getty std.9600" vt100 on secure
+ttyu1 "/usr/libexec/getty std.9600" dialup off secure
+ttyu2 "/usr/libexec/getty std.9600" dialup off secure
+ttyu3 "/usr/libexec/getty std.9600" dialup off secure
+# Pseudo terminals.
ttyp0 none network
ttyp1 none network
ttyp2 none network
==== //depot/projects/ia64/gnu/usr.bin/binutils/gdb/Makefile#10 (text+ko) ====
@@ -1,12 +1,14 @@
-# $FreeBSD: src/gnu/usr.bin/binutils/gdb/Makefile,v 1.65 2003/03/21 00:30:53 iedowse Exp $
+# $FreeBSD: src/gnu/usr.bin/binutils/gdb/Makefile,v 1.68 2003/09/07 20:38:23 obrien Exp $
.include "../Makefile.inc0"
-.PATH: ${SRCDIR}/binutils
+GDBDIR= ${.CURDIR}/../../../../contrib/gdb
+.PATH: ${GDBDIR}/gdb ${GDBDIR}/gdb/cli ${GDBDIR}/gdb/mi
+.PATH: ${SRCDIR}/opcodes ${SRCDIR}/binutils
.if ${TARGET_ARCH} == "sparc64"
GDB_CPU= sparc
-.elif ${TARGET_ARCH} == "x86-64"
+.elif ${TARGET_ARCH} == "amd64"
GDB_CPU= i386
.else
GDB_CPU= ${TARGET_ARCH}
@@ -25,10 +27,12 @@
remote-utils.c signals.c source.c stabsread.c stack.c symfile.c \
symmisc.c symtab.c target.c thread.c top.c tracepoint.c \
typeprint.c ui-file.c ui-out.c utils.c valarith.c valops.c \
- valprint.c values.c wrapper.c \
+ varobj.c valprint.c values.c wrapper.c \
cli-cmds.c cli-cmds.h cli-decode.c cli-decode.h cli-out.c \
cli-script.c cli-script.h cli-setshow.c cli-setshow.h \
cli-utils.c cli-utils.h \
+ mi-cmd-break.c mi-cmd-disas.c mi-cmd-stack.c mi-cmd-var.c \
+ mi-cmds.c mi-console.c mi-getopt.c mi-main.c mi-out.c mi-parse.c\
serial.c ser-unix.c ser-tcp.c \
c-exp.y c-lang.c c-typeprint.c c-valprint.c \
ch-exp.c ch-lang.c ch-typeprint.c ch-valprint.c \
@@ -42,9 +46,7 @@
XSRCS+= freebsd-uthread.c kvm-fbsd.c solib-fbsd-kld.c
SRCS= init.c ${XSRCS} nm.h tm.h xm.h gdbversion.c xregex.h
-.if exists(${.CURDIR}/Makefile.${TARGET_ARCH})
.include "${.CURDIR}/Makefile.${TARGET_ARCH}"
-.endif
WARNS= 0
.if ${TARGET_ARCH} != ${MACHINE_ARCH}
@@ -52,34 +54,23 @@
.endif
CFLAGS+= -DDEFAULT_BFD_ARCH=bfd_${GDB_CPU}_arch
CFLAGS+= -I${.CURDIR}/${TARGET_ARCH}
-CFLAGS+= -I${SRCDIR}/binutils
-CFLAGS+= -I${SRCDIR}/bfd
-CFLAGS+= -I${GDBDIR}/gdb
-CFLAGS+= -I${GDBDIR}/gdb/config
-DPADD= ${LIBKVM}
-DPADD+= ${LIBM}
-DPADD+= ${RELTOP}/libbfd/libbfd.a
-DPADD+= ${RELTOP}/libopcodes/libopcodes.a
+CFLAGS+= -I${SRCDIR}/binutils -I${SRCDIR}/bfd
+CFLAGS+= -I${GDBDIR}/gdb -I${GDBDIR}/gdb/config
+CFLAGS+= -I$(.CURDIR) -I${DESTDIR}/usr/include/readline
+
+YFLAGS=
+
+DPADD= ${LIBKVM} ${LIBM}
+DPADD+= ${RELTOP}/libbfd/libbfd.a ${RELTOP}/libopcodes/libopcodes.a
DPADD+= ${LIBGNUREGEX}
DPADD+= ${RELTOP}/libiberty/libiberty.a
-DPADD+= ${LIBREADLINE}
-DPADD+= ${LIBTERMCAP}
-LDADD= -lkvm
-LDADD+= -lm
-LDADD+= ${RELTOP}/libbfd/libbfd.a
-LDADD+= ${RELTOP}/libopcodes/libopcodes.a
+DPADD+= ${LIBREADLINE} ${LIBTERMCAP}
+LDADD= -lkvm -lm
+LDADD+= ${RELTOP}/libbfd/libbfd.a ${RELTOP}/libopcodes/libopcodes.a
LDADD+= -lgnuregex
LDADD+= ${RELTOP}/libiberty/libiberty.a
-LDADD+= -lreadline
-LDADD+= -ltermcap
+LDADD+= -lreadline -ltermcap
-GDBDIR= ${.CURDIR}/../../../../contrib/gdb
-.PATH: ${GDBDIR}/gdb ${GDBDIR}/gdb/cli
-.PATH: ${SRCDIR}/opcodes
-
-CFLAGS+= -I$(.CURDIR) -I${DESTDIR}/usr/include/readline
-YFLAGS=
-
CLEANFILES= init.c init.c-tmp nm.h tm.h xm.h gdbversion.c xregex.h
# We do this by grepping through sources. If that turns out to be too slow,
@@ -140,9 +131,9 @@
GDB_VERSION= "5.2.1 (FreeBSD)"
gdbversion.c:
@echo '#include "version.h"' > ${.TARGET}
- @echo 'const char version[] = ${GDB_VERSION};' >>${.TARGET}
- @echo 'const char host_name[] = "${MACHINE_ARCH}-undermydesk-freebsd";' >>${.TARGET}
- @echo 'const char target_name[] = "${TARGET_ARCH}-undermydesk-freebsd";' >>${.TARGET}
+ @echo 'const char version[] = ${GDB_VERSION};' >>${.TARGET}
+ @echo 'const char host_name[] = "${MACHINE_ARCH}-undermydesk-freebsd";' >>${.TARGET}
+ @echo 'const char target_name[] = "${TARGET_ARCH}-undermydesk-freebsd";' >>${.TARGET}
xregex.h:
@echo '#include <gnuregex.h>' >${.TARGET}
==== //depot/projects/ia64/gnu/usr.bin/cvs/cvsbug/Makefile#4 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/gnu/usr.bin/cvs/cvsbug/Makefile,v 1.18 2003/01/21 23:00:36 peter Exp $
+# $FreeBSD: src/gnu/usr.bin/cvs/cvsbug/Makefile,v 1.19 2003/09/07 13:17:31 ru Exp $
MAINTAINER= peter at FreeBSD.org
@@ -12,10 +12,10 @@
MAN= cvsbug.8
CLEANFILES+= cvsbug
-VERSION!= sed < ${CVSDIR}/configure \
- -e '/^[ ]*VERSION=/!d' -e 's/.*=\(.*\)/\1/' -e q
cvsbug: cvsbug.in
- sed -e "s, at VERSION@,${VERSION}-FreeBSD,g" ${.ALLSRC} > ${.TARGET}
+ version=`sed < ${CVSDIR}/configure \
+ -e '/^[ ]*VERSION=/!d' -e 's/.*=\(.*\)/\1/' -e q`; \
+ sed -e "s, at VERSION@,$${version}-FreeBSD,g" ${.ALLSRC} > ${.TARGET}
.include <bsd.prog.mk>
==== //depot/projects/ia64/gnu/usr.bin/cvs/lib/Makefile#6 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/gnu/usr.bin/cvs/lib/Makefile,v 1.22 2003/01/21 23:00:36 peter Exp $
+# $FreeBSD: src/gnu/usr.bin/cvs/lib/Makefile,v 1.23 2003/09/07 13:09:47 ru Exp $
MAINTAINER= peter at FreeBSD.org
@@ -16,9 +16,6 @@
YFLAGS=
CLEANFILES+= config.h
-VERSION!= sed < ${CVSDIR}/configure \
- -e '/^[ ]*VERSION=/!d' -e 's/.*=\(.*\)/\1/' -e q
-
CVS_UMASK_DFLT?= 002
CVS_ADMIN_GROUP?= cvsadmin
CVS_TMPDIR_DFLT?= /tmp
@@ -29,7 +26,9 @@
xgetwd.c yesno.c
config.h: config.h.proto
- sed -e "s, at VERSION@,${VERSION}-FreeBSD,g" \
+ version=`sed < ${CVSDIR}/configure \
+ -e '/^[ ]*VERSION=/!d' -e 's/.*=\(.*\)/\1/' -e q`; \
+ sed -e "s, at VERSION@,$${version}-FreeBSD,g" \
-e "s, at UMASK_DFLT@,${CVS_UMASK_DFLT},g" \
-e "s, at TMPDIR_DFLT@,${CVS_TMPDIR_DFLT},g" \
-e "s, at CVS_ADMIN_GROUP@,${CVS_ADMIN_GROUP},g" \
==== //depot/projects/ia64/gnu/usr.bin/send-pr/Makefile#4 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/gnu/usr.bin/send-pr/Makefile,v 1.17 2002/07/29 09:40:09 ru Exp $
+# $FreeBSD: src/gnu/usr.bin/send-pr/Makefile,v 1.18 2003/09/07 13:38:07 ru Exp $
#
# Makefile for building a standalone send-pr.
#
@@ -7,7 +7,6 @@
MAN= send-pr.1
SUBMITTERS= current-users
RELEASE= `uname -rsm`
-RELEASE_EV!= uname -rsm
CLEANFILES+= send-pr send-pr.el
SUBDIR+= doc
@@ -22,8 +21,9 @@
${.ALLSRC:N*Makefile} > ${.TARGET}
send-pr.el: send-pr-el.in Makefile
+ default_release=`uname -rsm`; \
sed -e 's, at DATADIR@,/etc,g' \
- -e 's/@DEFAULT_RELEASE@/$(RELEASE_EV)/g' \
+ -e "s/@DEFAULT_RELEASE@/$${default_release}/g" \
-e 's/"unknown"/"$(SUBMITTERS)"/g' \
${.ALLSRC:N*Makefile} > ${.TARGET}
==== //depot/projects/ia64/sbin/mksnap_ffs/mksnap_ffs.8#3 (text+ko) ====
@@ -32,7 +32,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/sbin/mksnap_ffs/mksnap_ffs.8,v 1.2 2003/05/24 19:53:08 ru Exp $
+.\" $FreeBSD: src/sbin/mksnap_ffs/mksnap_ffs.8,v 1.3 2003/09/07 14:11:02 charnier Exp $
.\"
.Dd January 19, 2003
.Dt MKSNAP_FFS 8
@@ -67,7 +67,7 @@
.Sh SEE ALSO
.Xr chmod 2 ,
.Xr chown 8 ,
-.Xr mount_ffs 8
+.Xr mount 8
.Sh HISTORY
The
.Nm
==== //depot/projects/ia64/sbin/rcorder/rcorder.c#3 (text+ko) ====
@@ -33,6 +33,9 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sbin/rcorder/rcorder.c,v 1.2 2003/09/07 14:17:17 charnier Exp $");
+
#include <sys/types.h>
#include <sys/stat.h>
@@ -126,27 +129,27 @@
strnodelist *keep_list;
strnodelist *skip_list;
-void do_file __P((filenode *fnode));
-void strnode_add __P((strnodelist **, char *, filenode *));
-int skip_ok __P((filenode *fnode));
-int keep_ok __P((filenode *fnode));
-void satisfy_req __P((f_reqnode *rnode, char *filename));
-void crunch_file __P((char *));
-void parse_require __P((filenode *, char *));
-void parse_provide __P((filenode *, char *));
-void parse_before __P((filenode *, char *));
-void parse_keywords __P((filenode *, char *));
-filenode *filenode_new __P((char *));
-void add_require __P((filenode *, char *));
-void add_provide __P((filenode *, char *));
-void add_before __P((filenode *, char *));
-void add_keyword __P((filenode *, char *));
-void insert_before __P((void));
-Hash_Entry *make_fake_provision __P((filenode *));
-void crunch_all_files __P((void));
-void initialize __P((void));
-void generate_ordering __P((void));
-int main __P((int, char *[]));
+void do_file(filenode *fnode);
+void strnode_add(strnodelist **, char *, filenode *);
+int skip_ok(filenode *fnode);
+int keep_ok(filenode *fnode);
+void satisfy_req(f_reqnode *rnode, char *filename);
+void crunch_file(char *);
+void parse_require(filenode *, char *);
+void parse_provide(filenode *, char *);
+void parse_before(filenode *, char *);
+void parse_keywords(filenode *, char *);
+filenode *filenode_new(char *);
+void add_require(filenode *, char *);
+void add_provide(filenode *, char *);
+void add_before(filenode *, char *);
+void add_keyword(filenode *, char *);
+void insert_before(void);
+Hash_Entry *make_fake_provision(filenode *);
+void crunch_all_files(void);
+void initialize(void);
+void generate_ordering(void);
+int main(int, char *[]);
int
main(argc, argv)
==== //depot/projects/ia64/share/examples/ipfw/change_rules.sh#3 (text+ko) ====
@@ -24,7 +24,7 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: src/share/examples/ipfw/change_rules.sh,v 1.5 2003/02/13 12:02:51 brueffer Exp $
+# $FreeBSD: src/share/examples/ipfw/change_rules.sh,v 1.6 2003/09/07 07:52:56 jmg Exp $
# Change ipfw(8) rules with safety guarantees for remote operation
#
@@ -82,7 +82,7 @@
}
restore_rules() {
- nohup sh ${firewall_script} >/dev/null 2>&1
+ nohup sh ${firewall_script} </dev/null >/dev/null 2>&1
rm ${TMPFILE}
exit 1
}
@@ -129,10 +129,10 @@
if [ ${rules_edit} = yes ]; then
nohup sh ${firewall_script} ${firewall_type}.new \
- > ${TMPFILE} 2>&1
+ < /dev/null > ${TMPFILE} 2>&1
else
nohup sh ${firewall_script}.new \
- > ${TMPFILE} 2>&1
+ < /dev/null > ${TMPFILE} 2>&1
fi
sleep 2;
get_yes_no "Would you like to see the resulting new rules"
==== //depot/projects/ia64/share/man/man4/uart.4#2 (text+ko) ====
@@ -23,7 +23,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man4/uart.4,v 1.2 2003/09/06 23:46:29 hmp Exp $
+.\" $FreeBSD: src/share/man/man4/uart.4,v 1.3 2003/09/07 16:34:03 hmp Exp $
.\"
.Dd August 25, 2003
.Dt UART 4
@@ -113,5 +113,5 @@
device driver first appeared in
.Fx 5.2 .
.Sh AUTHORS
-This manual page is written by
+This manual page was written by
.An Marcel Molenaar Aq marcel at FreeBSD.ORG .
==== //depot/projects/ia64/share/mk/bsd.lib.mk#27 (text+ko) ====
@@ -1,5 +1,5 @@
# from: @(#)bsd.lib.mk 5.26 (Berkeley) 5/2/91
-# $FreeBSD: src/share/mk/bsd.lib.mk,v 1.153 2003/09/04 04:29:11 peter Exp $
+# $FreeBSD: src/share/mk/bsd.lib.mk,v 1.154 2003/09/07 14:15:40 ru Exp $
#
.include <bsd.init.mk>
@@ -208,10 +208,15 @@
${_INSTALLFLAGS} ${_SHLINSTALLFLAGS} \
${SHLIB_NAME} ${DESTDIR}${SHLIBDIR}
.if defined(SHLIB_LINK)
- ln -fs ${SHLIB_NAME} ${DESTDIR}${SHLIBDIR}/${SHLIB_LINK}
-.if (${LIBDIR} != ${SHLIBDIR})
- ln -fs ${LIBDIR:C|/[^/]+|/..|g:S|^/||}${SHLIBDIR}/${SHLIB_NAME} \
+.if ${SHLIBDIR} == ${LIBDIR}
+ ln -fs ${SHLIB_NAME} ${DESTDIR}${LIBDIR}/${SHLIB_LINK}
+.else
+ ln -fs ${_SHLIBDIRPREFIX}${SHLIBDIR}/${SHLIB_NAME} \
${DESTDIR}${LIBDIR}/${SHLIB_LINK}
+.if exists(${DESTDIR}${LIBDIR}/${SHLIB_NAME})
+ -chflags noschg ${DESTDIR}${LIBDIR}/${SHLIB_NAME}
+ rm -f ${DESTDIR}${LIBDIR}/${SHLIB_NAME}
+.endif
.endif
.endif
.endif
==== //depot/projects/ia64/share/mk/bsd.man.mk#10 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/share/mk/bsd.man.mk,v 1.52 2002/10/18 09:14:17 ru Exp $
+# $FreeBSD: src/share/mk/bsd.man.mk,v 1.53 2003/09/07 12:59:22 ru Exp $
#
# The include file <bsd.man.mk> handles installing manual pages and
# their links.
@@ -173,7 +173,7 @@
.endif
.endfor
.else
- @set `echo ${.ALLSRC} " " | sed 's/\.\([^.]*\) /.\1 \1 /g'`; \
+ @set ${.ALLSRC:C/\.([^.]*)$/.\1 \1/}; \
while : ; do \
case $$# in \
0) break;; \
@@ -204,7 +204,7 @@
.endif
.if !defined(NOMLINKS) && defined(MLINKS) && !empty(MLINKS)
- @set `echo ${MLINKS} " " | sed 's/\.\([^.]*\) /.\1 \1 /g'`; \
+ @set ${MLINKS:C/\.([^.]*)$/.\1 \1/}; \
while : ; do \
case $$# in \
0) break;; \
@@ -219,7 +219,7 @@
ln $${l}${ZEXT} $${t}${ZEXT}; \
done
.if defined(MANBUILDCAT) && !empty(MANBUILDCAT)
- @set `echo ${MLINKS} " " | sed 's/\.\([^.]*\) /.\1 \1 /g'`; \
+ @set ${MLINKS:C/\.([^.]*)$/.\1 \1/}; \
while : ; do \
case $$# in \
0) break;; \
==== //depot/projects/ia64/sys/alpha/alpha/pmap.c#41 (text+ko) ====
@@ -148,7 +148,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.135 2003/08/28 23:12:28 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.136 2003/09/07 20:02:38 alc Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -2749,23 +2749,30 @@
*/
if ((*pte & PG_FOW) == 0)
val |= MINCORE_MODIFIED|MINCORE_MODIFIED_OTHER;
- /*
- * Modified by someone
- */
- else if (m->dirty || pmap_is_modified(m))
- val |= MINCORE_MODIFIED_OTHER;
+ else {
+ /*
+ * Modified by someone
+ */
+ vm_page_lock_queues();
+ if (m->dirty || pmap_is_modified(m))
+ val |= MINCORE_MODIFIED_OTHER;
+ vm_page_unlock_queues();
+ }
/*
* Referenced by us
*/
if ((*pte & (PG_FOR | PG_FOE)) == 0)
val |= MINCORE_REFERENCED|MINCORE_REFERENCED_OTHER;
-
- /*
- * Referenced by someone
- */
- else if ((m->flags & PG_REFERENCED) || pmap_ts_referenced(m)) {
- val |= MINCORE_REFERENCED_OTHER;
- vm_page_flag_set(m, PG_REFERENCED);
+ else {
+ /*
+ * Referenced by someone
+ */
+ vm_page_lock_queues();
+ if ((m->flags & PG_REFERENCED) || pmap_ts_referenced(m)) {
+ val |= MINCORE_REFERENCED_OTHER;
+ vm_page_flag_set(m, PG_REFERENCED);
+ }
+ vm_page_unlock_queues();
}
}
return val;
==== //depot/projects/ia64/sys/coda/cnode.h#6 (text+ko) ====
@@ -27,7 +27,7 @@
* Mellon the rights to redistribute these changes without encumbrance.
*
* @(#) src/sys/coda/cnode.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $
- * $FreeBSD: src/sys/coda/cnode.h,v 1.12 2003/03/06 10:48:03 tjr Exp $
+ * $FreeBSD: src/sys/coda/cnode.h,v 1.13 2003/09/07 07:43:09 tjr Exp $
*
*/
@@ -101,7 +101,7 @@
struct cnode {
struct vnode *c_vnode;
u_short c_flags; /* flags (see below) */
- ViceFid c_fid; /* file handle */
+ CodaFid c_fid; /* file handle */
struct lock c_lock; /* new lock protocol */
struct vnode *c_ovp; /* open vnode pointer */
u_short c_ocount; /* count of openers */
@@ -197,7 +197,7 @@
extern int coda_vmflush(struct cnode *cp);
/* cfs_vnodeops.h */
-extern struct cnode *make_coda_node(ViceFid *fid, struct mount *vfsp, short type);
+extern struct cnode *make_coda_node(CodaFid *fid, struct mount *vfsp, short type);
extern int coda_vnodeopstats_init(void);
/* coda_vfsops.h */
==== //depot/projects/ia64/sys/coda/coda.h#2 (text+ko) ====
@@ -27,7 +27,7 @@
* Mellon the rights to redistribute these changes without encumbrance.
*
* @(#) src/sys/coda/coda.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $
- * $FreeBSD: src/sys/coda/coda.h,v 1.9 1999/12/29 04:54:30 peter Exp $
+ * $FreeBSD: src/sys/coda/coda.h,v 1.10 2003/09/07 07:43:09 tjr Exp $
*
*/
@@ -41,8 +41,8 @@
#ifndef _CODA_HEADER_
#define _CODA_HEADER_
+#include "opt_coda.h" /* for COMPAT_CODA_5 option */
-
/* Catch new _KERNEL defn for NetBSD */
#ifdef __NetBSD__
#include <sys/types.h>
@@ -162,59 +162,70 @@
#endif
-#ifndef _FID_T_
-#define _FID_T_ 1
-typedef u_long VolumeId;
-typedef u_long VnodeId;
-typedef u_long Unique_t;
-typedef u_long FileVersion;
-#endif
+#ifdef CODA_COMPAT_5
-#ifndef _VICEFID_T_
-#define _VICEFID_T_ 1
-typedef struct ViceFid {
- VolumeId Volume;
- VnodeId Vnode;
- Unique_t Unique;
-} ViceFid;
-#endif /* VICEFID */
+typedef struct {
+ u_long Volume;
+ u_long Vnode;
+ u_long Unique;
+} CodaFid;
+static __inline__ ino_t coda_f2i(CodaFid *fid)
+{
+ if (!fid) return 0;
+ return (fid->Unique + (fid->Vnode<<10) + (fid->Volume<<20));
+}
-#ifdef __linux__
-static __inline__ ino_t coda_f2i(struct ViceFid *fid)
+static __inline__ char * coda_f2s(CodaFid *fid)
+{
+ static char fid_str [35];
+ snprintf (fid_str, 35, "[%lx.%lx.%lx]", fid->Volume,
+ fid->Vnode, fid->Unique);
+ return fid_str;
+}
+
+static __inline__ int coda_fid_eq (CodaFid *fid1, CodaFid *fid2)
{
- if ( ! fid )
- return 0;
- if (fid->Vnode == 0xfffffffe || fid->Vnode == 0xffffffff)
- return ((fid->Volume << 20) | (fid->Unique & 0xfffff));
- else
- return (fid->Unique + (fid->Vnode<<10) + (fid->Volume<<20));
+ return (fid1->Volume == fid2->Volume &&
+ fid1->Vnode == fid2->Vnode &&
+ fid1->Unique == fid2->Unique);
}
-
-#else
-#define coda_f2i(fid)\
- ((fid) ? ((fid)->Unique + ((fid)->Vnode<<10) + ((fid)->Volume<<20)) : 0)
-#endif
+
+struct coda_cred {
+ u_int32_t cr_uid, cr_euid, cr_suid, cr_fsuid; /* Real, efftve, set, fs uid*/
+ u_int32_t cr_groupid, cr_egid, cr_sgid, cr_fsgid; /* same for groups */
+};
+#else /* CODA_COMPAT_5 */
-#ifndef __BIT_TYPES_DEFINED__
-#define u_int32_t unsigned int
-#endif
+typedef struct {
+ u_int32_t opaque[4];
+} CodaFid;
+static __inline__ ino_t coda_f2i(CodaFid *fid)
+{
+ if ( ! fid )
+ return 0;
+ return (fid->opaque[3] ^ (fid->opaque[2]<<10) ^ (fid->opaque[1]<<20) ^ fid->opaque[0]);
+}
+
+static __inline__ char * coda_f2s(CodaFid *fid)
+ {
+ static char fid_str [35];
+ snprintf (fid_str, 35, "[%x.%x.%x.%x]", fid->opaque[0],
+ fid->opaque[1], fid->opaque[2], fid->opaque[3]);
+ return fid_str;
+ }
-#ifndef _VUID_T_
-#define _VUID_T_
-typedef u_int32_t vuid_t;
-typedef u_int32_t vgid_t;
-#endif /*_VUID_T_ */
+static __inline__ int coda_fid_eq (CodaFid *fid1, CodaFid *fid2)
+{
+ return (fid1->opaque[0] == fid2->opaque[0] &&
+ fid1->opaque[1] == fid2->opaque[1] &&
+ fid1->opaque[2] == fid2->opaque[2] &&
+ fid1->opaque[3] == fid2->opaque[3]);
+}
-#ifndef _CODACRED_T_
-#define _CODACRED_T_
-struct coda_cred {
- vuid_t cr_uid, cr_euid, cr_suid, cr_fsuid; /* Real, efftve, set, fs uid*/
- vgid_t cr_groupid, cr_egid, cr_sgid, cr_fsgid; /* same for groups */
-};
-#endif
+#endif /* CODA_COMPAT_5 */
#ifndef _VENUS_VATTR_T_
#define _VENUS_VATTR_T_
@@ -227,8 +238,8 @@
int va_type; /* vnode type (for create) */
u_short va_mode; /* files access mode and type */
short va_nlink; /* number of references to file */
- vuid_t va_uid; /* owner user id */
- vgid_t va_gid; /* owner group id */
+ uid_t va_uid; /* owner user id */
+ gid_t va_gid; /* owner group id */
long va_fileid; /* file id */
u_quad_t va_size; /* file size in bytes */
long va_blocksize; /* blocksize preferred for i/o */
@@ -244,12 +255,21 @@
#endif
+/* structure used by CODA_STATFS for getting cache information from venus */
+struct coda_statfs {
+ int32_t f_blocks;
+ int32_t f_bfree;
+ int32_t f_bavail;
+ int32_t f_files;
+ int32_t f_ffree;
+};
+
/*
* Kernel <--> Venus communications.
*/
#define CODA_ROOT 2
-#define CODA_SYNC 3
+#define CODA_OPEN_BY_FD 3
#define CODA_OPEN 4
#define CODA_CLOSE 5
#define CODA_IOCTL 6
@@ -279,7 +299,8 @@
#define CODA_OPEN_BY_PATH 31
#define CODA_RESOLVE 32
#define CODA_REINTEGRATE 33
-#define CODA_NCALLS 34
+#define CODA_STATFS 34
+#define CODA_NCALLS 35
#define DOWNCALL(opcode) (opcode >= CODA_REPLACE && opcode <= CODA_PURGEFID)
@@ -293,21 +314,36 @@
#define CODA_KERNEL_VERSION 0
/* The old venus 4.6 compatible interface */
#define CODA_KERNEL_VERSION 1
-#endif
+#endif /* realms/cells */
+#ifdef CODA_COMPAT_5
/* venus_lookup gets an extra parameter to aid windows.*/
#define CODA_KERNEL_VERSION 2
+#else
+ /* 128-bit fids for realms */
+#define CODA_KERNEL_VERSION 3
+#endif
/*
* Venus <-> Coda RPC arguments
*/
+#ifdef CODA_COMPAT_5
struct coda_in_hdr {
unsigned long opcode;
- unsigned long unique; /* Keep multiple outstanding msgs distinct */
- u_short pid; /* Common to all */
- u_short pgid; /* Common to all */
+ unsigned long unique; /* Keep multiple outstanding msgs distinct */
+ u_short pid; /* Common to all */
+ u_short pgid; /* Common to all */
u_short sid; /* Common to all */
- struct coda_cred cred; /* Common to all */
+ struct coda_cred cred; /* Common to all */
+};
+#else
+struct coda_in_hdr {
+ u_int32_t opcode;
+ u_int32_t unique; /* Keep multiple outstanding msgs distinct */
+ pid_t pid; /* Common to all */
+ pid_t pgid; /* Common to all */
+ uid_t uid; /* Common to all */
};
+#endif
/* Really important that opcode and unique are 1st two fields! */
struct coda_out_hdr {
@@ -319,7 +355,7 @@
/* coda_root: NO_IN */
struct coda_root_out {
struct coda_out_hdr oh;
- ViceFid VFid;
+ CodaFid Fid;
};
struct coda_root_in {
@@ -332,7 +368,7 @@
/* coda_open: */
struct coda_open_in {
struct coda_in_hdr ih;
- ViceFid VFid;
+ CodaFid Fid;
int flags;
};
@@ -346,7 +382,7 @@
/* coda_close: */
struct coda_close_in {
struct coda_in_hdr ih;
- ViceFid VFid;
+ CodaFid Fid;
int flags;
};
@@ -357,7 +393,7 @@
/* coda_ioctl: */
struct coda_ioctl_in {
struct coda_in_hdr ih;
- ViceFid VFid;
+ CodaFid Fid;
int cmd;
int len;
int rwflag;
@@ -374,7 +410,7 @@
/* coda_getattr: */
struct coda_getattr_in {
struct coda_in_hdr ih;
- ViceFid VFid;
+ CodaFid Fid;
};
struct coda_getattr_out {
@@ -386,7 +422,7 @@
/* coda_setattr: NO_OUT */
struct coda_setattr_in {
struct coda_in_hdr ih;
- ViceFid VFid;
+ CodaFid Fid;
struct coda_vattr attr;
};
@@ -397,7 +433,7 @@
/* coda_access: NO_OUT */
struct coda_access_in {
struct coda_in_hdr ih;
- ViceFid VFid;
+ CodaFid Fid;
int flags;
};
@@ -413,14 +449,14 @@
/* coda_lookup: */
struct coda_lookup_in {
struct coda_in_hdr ih;
- ViceFid VFid;
+ CodaFid Fid;
int name; /* Place holder for data. */
int flags;
};
struct coda_lookup_out {
struct coda_out_hdr oh;
- ViceFid VFid;
+ CodaFid Fid;
int vtype;
};
@@ -428,7 +464,7 @@
/* coda_create: */
struct coda_create_in {
struct coda_in_hdr ih;
- ViceFid VFid;
+ CodaFid Fid;
struct coda_vattr attr;
int excl;
int mode;
@@ -437,7 +473,7 @@
struct coda_create_out {
struct coda_out_hdr oh;
- ViceFid VFid;
+ CodaFid Fid;
struct coda_vattr attr;
};
@@ -445,7 +481,7 @@
/* coda_remove: NO_OUT */
struct coda_remove_in {
struct coda_in_hdr ih;
- ViceFid VFid;
+ CodaFid Fid;
int name; /* Place holder for data. */
};
@@ -456,8 +492,8 @@
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list