Date: Sat, 26 Apr 2008 03:14:31 GMT From: John Birrell <jb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 140653 for review Message-ID: <200804260314.m3Q3EVih080056@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=140653 Change 140653 by jb@freebsd3 on 2008/04/26 03:14:12 IFC. Ugh. Contrary to a previous submit message, *THIS* is the commit that brings all the vendor files back without the FreeBSD changes, so this project will definitely not build until those changes are added back via cvs. Yuk. Affected files ... .. //depot/projects/dtrace/ports/MOVED#81 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c#4 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dstyle.pl#4 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dtest.pl#5 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.dupgtype.d#4 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.dupttype.d#4 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.psinfo.d#4 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.psinfo1.d#4 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroModuleProbes.d.ksh#4 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.hton.d#4 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntoa.d#4 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntoa6.d#4 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntop.d#4 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.mutex_owned.d#4 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.mutex_owner.d#4 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.mutex_type_adaptive.d#4 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.substr.d#4 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.substr.d.out#4 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.create.ksh#4 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exec.ksh#4 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.execfail.ENOENT.ksh#4 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.execfail.ksh#4 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exitcore.ksh#4 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exitexit.ksh#4 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.sigwait.c#4 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.sigwait.d#4 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise1.d#4 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise2.c#4 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise2.d#4 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise3.c#4 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise3.d#4 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.rw.d#4 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/trace/tst.misc.d#4 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/tracemem/tst.rootvp.d#4 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/mdb/tools/common/die.c#3 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/mdb/tools/common/util.h#3 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/sgs/include/_string_table.h#2 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/sgs/include/alist.h#3 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/sgs/include/debug.h#3 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/sgs/include/sgs.h#4 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/sgs/include/string_table.h#2 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/sgs/messages/sgs.ident#2 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/sgs/tools/common/findprime.c#3 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/sgs/tools/common/sgsmsg.c#2 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/sgs/tools/common/string_table.c#2 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/common/avl/avl.c#2 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/common/ctf/ctf_create.c#2 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/common/ctf/ctf_decl.c#2 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/common/ctf/ctf_error.c#2 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/common/ctf/ctf_hash.c#2 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/common/ctf/ctf_impl.h#2 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/common/ctf/ctf_labels.c#2 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/common/ctf/ctf_lookup.c#2 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/common/ctf/ctf_open.c#2 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/common/ctf/ctf_types.c#2 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/common/ctf/ctf_util.c#2 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/head/nlist.h#2 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/head/note.h#2 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/head/storclass.h#2 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/head/syms.h#2 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libctf/common/ctf_lib.c#4 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libctf/common/ctf_subr.c#4 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c#4 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_aggregate.c#4 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_cc.c#5 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_cg.c#4 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c#4 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_dof.c#4 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_error.c#4 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_errtags.h#4 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_handle.c#4 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_ident.c#4 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h#5 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_lex.l#4 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c#5 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_map.c#4 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_module.c#4 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c#5 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_options.c#4 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_parser.c#4 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.c#5 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pragma.c#5 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_printf.c#4 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_proc.c#4 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_proc.h#4 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_program.c#4 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_provider.c#4 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_subr.c#4 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_work.c#4 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dtrace.h#4 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/mkerrtags.sh#4 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/mknames.sh#4 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libgen/common/gmatch.c#4 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/common/list.c#4 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/common/memory.c#4 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/alist.c#4 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/alist.h#4 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/barrier.c#4 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/barrier.h#4 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/ctf.c#4 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/ctfconvert.c#4 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/ctfmerge.c#4 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/ctftools.h#4 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c#4 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/fixup_tdescs.c#4 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/hash.c#4 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/iidesc.c#4 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/input.c#4 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/merge.c#4 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/output.c#4 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/st_parse.c#4 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/stabs.c#4 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/strtab.c#4 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/strtab.h#4 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/tdata.c#4 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/traverse.c#4 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/traverse.h#4 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/util.c#4 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/dump/dump.c#4 integrate .. //depot/projects/dtrace/src/etc/network.subr#14 integrate .. //depot/projects/dtrace/src/lib/libc/sys/mkdir.2#7 integrate .. //depot/projects/dtrace/src/share/man/man5/rc.conf.5#28 integrate .. //depot/projects/dtrace/src/sys/dev/igb/if_igb.c#4 integrate Differences ... ==== //depot/projects/dtrace/ports/MOVED#81 (text+ko) ==== @@ -1,7 +1,7 @@ # # MOVED - a list of (recently) moved or removed ports # -# $FreeBSD: ports/MOVED,v 1.1578 2008/04/25 20:23:33 miwi Exp $ +# $FreeBSD: ports/MOVED,v 1.1579 2008/04/25 23:21:08 pav Exp $ # # Each entry consists of a single line containing the following four # fields in the order named, separated with the pipe (`|') character: @@ -3459,3 +3459,4 @@ net/ocaml-netclient||2008-04-25|Has expired: is part of ocaml-net net/samplicator||2008-04-25|Has expired: Project has vanished graphics/entice||2008-04-25|Has expired: Broken and unmaintained +security/wpa_supplicant||2008-04-26|Obsolete, newer version in base ==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c#4 (text) ==== @@ -34,20 +34,15 @@ #include <stdlib.h> #include <stdarg.h> #include <stdio.h> -#include <string.h> #include <strings.h> #include <unistd.h> #include <limits.h> #include <fcntl.h> #include <errno.h> #include <signal.h> -#if defined(sun) #include <alloca.h> -#endif #include <libgen.h> -#if defined(sun) #include <libproc.h> -#endif typedef struct dtrace_cmd { void (*dc_func)(struct dtrace_cmd *); /* function to compile arg */ @@ -97,9 +92,8 @@ static int g_status = E_SUCCESS; static int g_grabanon = 0; static const char *g_ofile = NULL; -static FILE *g_ofp; +static FILE *g_ofp = stdout; static dtrace_hdl_t *g_dtp; -#if defined(sun) static char *g_etcfile = "/etc/system"; static const char *g_etcbegin = "* vvvv Added by DTrace"; static const char *g_etcend = "* ^^^^ Added by DTrace"; @@ -114,7 +108,6 @@ "* chapter of the Solaris Dynamic Tracing Guide for details.", "*", NULL }; -#endif static int usage(FILE *fp) @@ -202,10 +195,6 @@ static void dfatal(const char *fmt, ...) { -#if !defined(sun) && defined(NEED_ERRLOC) - char *p_errfile = NULL; - int errline = 0; -#endif va_list ap; va_start(ap, fmt); @@ -223,11 +212,6 @@ (void) fprintf(stderr, "%s\n", dtrace_errmsg(g_dtp, dtrace_errno(g_dtp))); } -#if !defined(sun) && defined(NEED_ERRLOC) - dt_get_errloc(g_dtp, &p_errfile, &errline); - if (p_errfile != NULL) - printf("File '%s', line %d\n", p_errfile, errline); -#endif /* * Close the DTrace handle to ensure that any controlled processes are @@ -388,7 +372,6 @@ free(buf); } -#if defined(sun) static void etcsystem_prune(void) { @@ -499,7 +482,6 @@ error("added forceload directives to %s\n", g_ofile); } -#endif static void print_probe_info(const dtrace_probeinfo_t *p) @@ -629,26 +611,12 @@ p = (uchar_t *)dof; q = p + dof->dofh_loadsz; -#if defined(sun) oprintf("dof-data-%d=0x%x", n, *p++); while (p < q) oprintf(",0x%x", *p++); oprintf(";\n"); -#else - /* - * On FreeBSD, the DOF data is handled as a kernel environment (kenv) - * string. We use two hex characters per DOF byte. - */ - oprintf("dof-data-%d=%02x", n, *p++); - - while (p < q) - oprintf("%02x", *p++); - - oprintf("\n"); -#endif - dtrace_dof_destroy(g_dtp, dof); } @@ -773,8 +741,6 @@ static void prochandler(struct ps_prochandle *P, const char *msg, void *arg) { -fatal("DOODAD in function %s, file %s, line %d\n",__FUNCTION__,__FILE__,__LINE__); -#ifdef DOODAD const psinfo_t *prp = Ppsinfo(P); int pid = Pstatus(P)->pr_pid; char name[SIG2STR_MAX]; @@ -812,7 +778,6 @@ g_pslive--; break; } -#endif } /*ARGSUSED*/ @@ -1194,10 +1159,9 @@ dtrace_optval_t opt; dtrace_cmd_t *dcp; - g_ofp = stdout; int done = 0, mode = 0; - int err, i, c; - char *p, **v; + int err, i; + char c, *p, **v; struct ps_prochandle *P; pid_t pid; @@ -1224,7 +1188,7 @@ * options into g_argv[], and abort if any invalid options are found. */ for (optind = 1; optind < argc; optind++) { - while ((c = getopt(argc, argv, DTRACE_OPTSTR)) != -1) { + while ((c = getopt(argc, argv, DTRACE_OPTSTR)) != EOF) { switch (c) { case '3': if (strcmp(optarg, "2") != 0) { @@ -1373,14 +1337,8 @@ dtrace_errmsg(NULL, err)); } -#if defined(__i386__) - /* XXX The 32-bit seems to need more buffer space by default -sson */ - (void) dtrace_setopt(g_dtp, "bufsize", "12m"); - (void) dtrace_setopt(g_dtp, "aggsize", "12m"); -#else (void) dtrace_setopt(g_dtp, "bufsize", "4m"); (void) dtrace_setopt(g_dtp, "aggsize", "4m"); -#endif /* * If -G is specified, enable -xlink=dynamic and -xunodefs to permit @@ -1413,7 +1371,7 @@ * this time; these will compiled as part of the fourth processing pass. */ for (optind = 1; optind < argc; optind++) { - while ((c = getopt(argc, argv, DTRACE_OPTSTR)) != -1) { + while ((c = getopt(argc, argv, DTRACE_OPTSTR)) != EOF) { switch (c) { case 'a': if (dtrace_setopt(g_dtp, "grabanon", 0) != 0) @@ -1570,7 +1528,7 @@ * may been affected by any library options set by the second pass. */ for (optind = 1; optind < argc; optind++) { - while ((c = getopt(argc, argv, DTRACE_OPTSTR)) != -1) { + while ((c = getopt(argc, argv, DTRACE_OPTSTR)) != EOF) { switch (c) { case 'c': if ((v = make_argv(optarg)) == NULL) @@ -1658,21 +1616,10 @@ case DMODE_ANON: if (g_ofile == NULL) -#if defined(sun) g_ofile = "/kernel/drv/dtrace.conf"; -#else - /* - * On FreeBSD, anonymous DOF data is written to - * the DTrace DOF file that the boot loader will - * read if booting with the DTrace option. - */ - g_ofile = "/boot/dtrace.dof"; -#endif dof_prune(g_ofile); /* strip out any old DOF directives */ -#if defined(sun) etcsystem_prune(); /* string out any forceload directives */ -#endif if (g_cmdc == 0) { dtrace_close(g_dtp); @@ -1703,10 +1650,8 @@ * that itself contains a #pragma D option quiet. */ error("saved anonymous enabling in %s\n", g_ofile); -#if defined(sun) etcsystem_add(); error("run update_drv(1M) or reboot to enable changes\n"); -#endif dtrace_close(g_dtp); return (g_status); @@ -1835,11 +1780,6 @@ if (sigaction(SIGTERM, NULL, &oact) == 0 && oact.sa_handler != SIG_IGN) (void) sigaction(SIGTERM, &act, NULL); -#if !defined(sun) - if (sigaction(SIGUSR1, NULL, &oact) == 0 && oact.sa_handler != SIG_IGN) - (void) sigaction(SIGUSR1, &act, NULL); -#endif - /* * Now that tracing is active and we are ready to consume trace data, * continue any grabbed or created processes, setting them running ==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dstyle.pl#4 (text+ko) ==== @@ -1,4 +1,4 @@ -#!/usr/local/bin/perl +#!/usr/perl5/bin/perl # # CDDL HEADER START # ==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dtest.pl#5 (xtext) ==== @@ -1,4 +1,4 @@ -#!/usr/local/bin/perl +#!/usr/perl5/bin/perl # # CDDL HEADER START # @@ -43,7 +43,7 @@ @dtrace_argv = (); -$ksh_path = '/bin/sh'; +$ksh_path = '/usr/bin/ksh'; @files = (); %exceptions = (); @@ -273,7 +273,7 @@ } $fullname = "$dir/$name"; - $exe = "./$base.exe"; + $exe = "$dir/$base.exe"; $exe_pid = -1; if ($opt_a && ($status != 0 || $tag != 0 || $droptag != 0 || @@ -592,7 +592,7 @@ # Ensure that $PATH contains a cc(1) so that we can execute the # test programs that require compilation of C code. # -#$ENV{'PATH'} = $ENV{'PATH'} . ':/ws/onnv-tools/SUNWspro/SS11/bin'; +$ENV{'PATH'} = $ENV{'PATH'} . ':/ws/onnv-tools/SUNWspro/SS11/bin'; if ($opt_b) { logmsg("badioctl'ing ... "); ==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.dupgtype.d#4 (text+ko) ==== @@ -40,8 +40,3 @@ x[123] = `kmem_flags; x[456] = *`rootvp; } - -ERROR -{ - exit(1); -} ==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.dupttype.d#4 (text+ko) ==== @@ -40,8 +40,3 @@ self->x[123] = `kmem_flags; self->x[456] = *`rootvp; } - -ERROR -{ - exit(1); -} ==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.psinfo.d#4 (text+ko) ==== @@ -53,8 +53,3 @@ printf("address of process = %u\n", curpsinfo->pr_addr); exit (0); } - -ERROR -{ - exit(1); -} ==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.psinfo1.d#4 (text+ko) ==== @@ -49,8 +49,3 @@ printf("address of process = %u\n", curpsinfo->pr_addr); exit (0); } - -ERROR -{ - exit(1); -} ==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroModuleProbes.d.ksh#4 (text+ko) ==== @@ -46,7 +46,7 @@ dtrace=$1 $dtrace -qZm wassup'{printf("Iamkool");}' \ --qm BEGIN'{printf("I am done"); exit(0);}' +-qm unix'{printf("I am done"); exit(0);}' status=$? ==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.hton.d#4 (text+ko) ==== @@ -30,9 +30,7 @@ * ASSERTION: Test network byte-ordering routines. */ -#if defined(__amd64__) || defined(__i386__) -#define _LITTLE_ENDIAN -#endif +#include <sys/isa_defs.h> BEGIN { ==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntoa.d#4 (text+ko) ==== @@ -28,17 +28,17 @@ #pragma D option quiet -in_addr_t *ip4a; -in_addr_t *ip4b; -in_addr_t *ip4c; -in_addr_t *ip4d; +ipaddr_t *ip4a; +ipaddr_t *ip4b; +ipaddr_t *ip4c; +ipaddr_t *ip4d; BEGIN { - this->buf4a = alloca(sizeof (in_addr_t)); - this->buf4b = alloca(sizeof (in_addr_t)); - this->buf4c = alloca(sizeof (in_addr_t)); - this->buf4d = alloca(sizeof (in_addr_t)); + this->buf4a = alloca(sizeof (ipaddr_t)); + this->buf4b = alloca(sizeof (ipaddr_t)); + this->buf4c = alloca(sizeof (ipaddr_t)); + this->buf4d = alloca(sizeof (ipaddr_t)); ip4a = this->buf4a; ip4b = this->buf4b; ip4c = this->buf4c; ==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntoa6.d#4 (text+ko) ==== @@ -53,35 +53,35 @@ ip6f = this->buf6f; ip6g = this->buf6g; - ip6a->__u6_addr.__u6_addr8[0] = 0xfe; - ip6a->__u6_addr.__u6_addr8[1] = 0x80; - ip6a->__u6_addr.__u6_addr8[8] = 0x02; - ip6a->__u6_addr.__u6_addr8[9] = 0x14; - ip6a->__u6_addr.__u6_addr8[10] = 0x4f; - ip6a->__u6_addr.__u6_addr8[11] = 0xff; - ip6a->__u6_addr.__u6_addr8[12] = 0xfe; - ip6a->__u6_addr.__u6_addr8[13] = 0x0b; - ip6a->__u6_addr.__u6_addr8[14] = 0x76; - ip6a->__u6_addr.__u6_addr8[15] = 0xc8; - ip6b->__u6_addr.__u6_addr8[0] = 0x10; - ip6b->__u6_addr.__u6_addr8[1] = 0x80; - ip6b->__u6_addr.__u6_addr8[10] = 0x08; - ip6b->__u6_addr.__u6_addr8[11] = 0x08; - ip6b->__u6_addr.__u6_addr8[13] = 0x20; - ip6b->__u6_addr.__u6_addr8[13] = 0x0c; - ip6b->__u6_addr.__u6_addr8[14] = 0x41; - ip6b->__u6_addr.__u6_addr8[15] = 0x7a; - ip6c->__u6_addr.__u6_addr8[15] = 0x01; - ip6e->__u6_addr.__u6_addr8[12] = 0x7f; - ip6e->__u6_addr.__u6_addr8[15] = 0x01; - ip6f->__u6_addr.__u6_addr8[10] = 0xff; - ip6f->__u6_addr.__u6_addr8[11] = 0xff; - ip6f->__u6_addr.__u6_addr8[12] = 0x7f; - ip6f->__u6_addr.__u6_addr8[15] = 0x01; - ip6g->__u6_addr.__u6_addr8[10] = 0xff; - ip6g->__u6_addr.__u6_addr8[11] = 0xfe; - ip6g->__u6_addr.__u6_addr8[12] = 0x7f; - ip6g->__u6_addr.__u6_addr8[15] = 0x01; + ip6a->_S6_un._S6_u8[0] = 0xfe; + ip6a->_S6_un._S6_u8[1] = 0x80; + ip6a->_S6_un._S6_u8[8] = 0x02; + ip6a->_S6_un._S6_u8[9] = 0x14; + ip6a->_S6_un._S6_u8[10] = 0x4f; + ip6a->_S6_un._S6_u8[11] = 0xff; + ip6a->_S6_un._S6_u8[12] = 0xfe; + ip6a->_S6_un._S6_u8[13] = 0x0b; + ip6a->_S6_un._S6_u8[14] = 0x76; + ip6a->_S6_un._S6_u8[15] = 0xc8; + ip6b->_S6_un._S6_u8[0] = 0x10; + ip6b->_S6_un._S6_u8[1] = 0x80; + ip6b->_S6_un._S6_u8[10] = 0x08; + ip6b->_S6_un._S6_u8[11] = 0x08; + ip6b->_S6_un._S6_u8[13] = 0x20; + ip6b->_S6_un._S6_u8[13] = 0x0c; + ip6b->_S6_un._S6_u8[14] = 0x41; + ip6b->_S6_un._S6_u8[15] = 0x7a; + ip6c->_S6_un._S6_u8[15] = 0x01; + ip6e->_S6_un._S6_u8[12] = 0x7f; + ip6e->_S6_un._S6_u8[15] = 0x01; + ip6f->_S6_un._S6_u8[10] = 0xff; + ip6f->_S6_un._S6_u8[11] = 0xff; + ip6f->_S6_un._S6_u8[12] = 0x7f; + ip6f->_S6_un._S6_u8[15] = 0x01; + ip6g->_S6_un._S6_u8[10] = 0xff; + ip6g->_S6_un._S6_u8[11] = 0xfe; + ip6g->_S6_un._S6_u8[12] = 0x7f; + ip6g->_S6_un._S6_u8[15] = 0x01; printf("%s\n", inet_ntoa6(ip6a)); printf("%s\n", inet_ntoa6(ip6b)); ==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntop.d#4 (text+ko) ==== @@ -28,13 +28,10 @@ #pragma D option quiet -inline int AF_INET = 2; -inline int AF_INET6 = 28; - -in_addr_t *ip4a; -in_addr_t *ip4b; -in_addr_t *ip4c; -in_addr_t *ip4d; +ipaddr_t *ip4a; +ipaddr_t *ip4b; +ipaddr_t *ip4c; +ipaddr_t *ip4d; struct in6_addr *ip6a; struct in6_addr *ip6b; struct in6_addr *ip6c; @@ -46,10 +43,10 @@ BEGIN { - this->buf4a = alloca(sizeof (in_addr_t)); - this->buf4b = alloca(sizeof (in_addr_t)); - this->buf4c = alloca(sizeof (in_addr_t)); - this->buf4d = alloca(sizeof (in_addr_t)); + this->buf4a = alloca(sizeof (ipaddr_t)); + this->buf4b = alloca(sizeof (ipaddr_t)); + this->buf4c = alloca(sizeof (ipaddr_t)); + this->buf4d = alloca(sizeof (ipaddr_t)); this->buf6a = alloca(sizeof (struct in6_addr)); this->buf6b = alloca(sizeof (struct in6_addr)); this->buf6c = alloca(sizeof (struct in6_addr)); @@ -75,51 +72,51 @@ *ip4b = htonl(0x7f000001); *ip4c = htonl(0xffffffff); *ip4d = htonl(0x00000000); - ip6a->__u6_addr.__u6_addr8[0] = 0xfe; - ip6a->__u6_addr.__u6_addr8[1] = 0x80; - ip6a->__u6_addr.__u6_addr8[8] = 0x02; - ip6a->__u6_addr.__u6_addr8[9] = 0x14; - ip6a->__u6_addr.__u6_addr8[10] = 0x4f; - ip6a->__u6_addr.__u6_addr8[11] = 0xff; - ip6a->__u6_addr.__u6_addr8[12] = 0xfe; - ip6a->__u6_addr.__u6_addr8[13] = 0x0b; - ip6a->__u6_addr.__u6_addr8[14] = 0x76; - ip6a->__u6_addr.__u6_addr8[15] = 0xc8; - ip6b->__u6_addr.__u6_addr8[0] = 0x10; - ip6b->__u6_addr.__u6_addr8[1] = 0x80; - ip6b->__u6_addr.__u6_addr8[10] = 0x08; - ip6b->__u6_addr.__u6_addr8[11] = 0x08; - ip6b->__u6_addr.__u6_addr8[13] = 0x20; - ip6b->__u6_addr.__u6_addr8[13] = 0x0c; - ip6b->__u6_addr.__u6_addr8[14] = 0x41; - ip6b->__u6_addr.__u6_addr8[15] = 0x7a; - ip6c->__u6_addr.__u6_addr8[15] = 0x01; - ip6e->__u6_addr.__u6_addr8[12] = 0x7f; - ip6e->__u6_addr.__u6_addr8[15] = 0x01; - ip6f->__u6_addr.__u6_addr8[10] = 0xff; - ip6f->__u6_addr.__u6_addr8[11] = 0xff; - ip6f->__u6_addr.__u6_addr8[12] = 0x7f; - ip6f->__u6_addr.__u6_addr8[15] = 0x01; - ip6g->__u6_addr.__u6_addr8[10] = 0xff; - ip6g->__u6_addr.__u6_addr8[11] = 0xfe; - ip6g->__u6_addr.__u6_addr8[12] = 0x7f; - ip6g->__u6_addr.__u6_addr8[15] = 0x01; - ip6h->__u6_addr.__u6_addr8[0] = 0xff; - ip6h->__u6_addr.__u6_addr8[1] = 0xff; - ip6h->__u6_addr.__u6_addr8[2] = 0xff; - ip6h->__u6_addr.__u6_addr8[3] = 0xff; - ip6h->__u6_addr.__u6_addr8[4] = 0xff; - ip6h->__u6_addr.__u6_addr8[5] = 0xff; - ip6h->__u6_addr.__u6_addr8[6] = 0xff; - ip6h->__u6_addr.__u6_addr8[7] = 0xff; - ip6h->__u6_addr.__u6_addr8[8] = 0xff; - ip6h->__u6_addr.__u6_addr8[9] = 0xff; - ip6h->__u6_addr.__u6_addr8[10] = 0xff; - ip6h->__u6_addr.__u6_addr8[11] = 0xff; - ip6h->__u6_addr.__u6_addr8[12] = 0xff; - ip6h->__u6_addr.__u6_addr8[13] = 0xff; - ip6h->__u6_addr.__u6_addr8[14] = 0xff; - ip6h->__u6_addr.__u6_addr8[15] = 0xff; + ip6a->_S6_un._S6_u8[0] = 0xfe; + ip6a->_S6_un._S6_u8[1] = 0x80; + ip6a->_S6_un._S6_u8[8] = 0x02; + ip6a->_S6_un._S6_u8[9] = 0x14; + ip6a->_S6_un._S6_u8[10] = 0x4f; + ip6a->_S6_un._S6_u8[11] = 0xff; + ip6a->_S6_un._S6_u8[12] = 0xfe; + ip6a->_S6_un._S6_u8[13] = 0x0b; + ip6a->_S6_un._S6_u8[14] = 0x76; + ip6a->_S6_un._S6_u8[15] = 0xc8; + ip6b->_S6_un._S6_u8[0] = 0x10; + ip6b->_S6_un._S6_u8[1] = 0x80; + ip6b->_S6_un._S6_u8[10] = 0x08; + ip6b->_S6_un._S6_u8[11] = 0x08; + ip6b->_S6_un._S6_u8[13] = 0x20; + ip6b->_S6_un._S6_u8[13] = 0x0c; + ip6b->_S6_un._S6_u8[14] = 0x41; + ip6b->_S6_un._S6_u8[15] = 0x7a; + ip6c->_S6_un._S6_u8[15] = 0x01; + ip6e->_S6_un._S6_u8[12] = 0x7f; + ip6e->_S6_un._S6_u8[15] = 0x01; + ip6f->_S6_un._S6_u8[10] = 0xff; + ip6f->_S6_un._S6_u8[11] = 0xff; + ip6f->_S6_un._S6_u8[12] = 0x7f; + ip6f->_S6_un._S6_u8[15] = 0x01; + ip6g->_S6_un._S6_u8[10] = 0xff; + ip6g->_S6_un._S6_u8[11] = 0xfe; + ip6g->_S6_un._S6_u8[12] = 0x7f; + ip6g->_S6_un._S6_u8[15] = 0x01; + ip6h->_S6_un._S6_u8[0] = 0xff; + ip6h->_S6_un._S6_u8[1] = 0xff; + ip6h->_S6_un._S6_u8[2] = 0xff; + ip6h->_S6_un._S6_u8[3] = 0xff; + ip6h->_S6_un._S6_u8[4] = 0xff; + ip6h->_S6_un._S6_u8[5] = 0xff; + ip6h->_S6_un._S6_u8[6] = 0xff; + ip6h->_S6_un._S6_u8[7] = 0xff; + ip6h->_S6_un._S6_u8[8] = 0xff; + ip6h->_S6_un._S6_u8[9] = 0xff; + ip6h->_S6_un._S6_u8[10] = 0xff; + ip6h->_S6_un._S6_u8[11] = 0xff; + ip6h->_S6_un._S6_u8[12] = 0xff; + ip6h->_S6_un._S6_u8[13] = 0xff; + ip6h->_S6_un._S6_u8[14] = 0xff; + ip6h->_S6_un._S6_u8[15] = 0xff; printf("%s\n", inet_ntop(AF_INET, ip4a)); printf("%s\n", inet_ntop(AF_INET, ip4b)); ==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.mutex_owned.d#4 (text+ko) ==== @@ -38,8 +38,8 @@ lockstat:::adaptive-acquire { - this->owned = mutex_owned((struct mtx *)arg0); - this->owner = mutex_owner((struct mtx *)arg0); + this->owned = mutex_owned((kmutex_t *)arg0); + this->owner = mutex_owner((kmutex_t *)arg0); } lockstat:::adaptive-acquire ==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.mutex_owner.d#4 (text+ko) ==== @@ -41,17 +41,17 @@ #pragma D option quiet -struct thread *ptr; +kthread_t *ptr; BEGIN { i = 0; } -lockstat::mtx_lock:adaptive-acquire +lockstat:genunix:mutex_enter:adaptive-acquire { - ptr = mutex_owner((struct mtx *)arg0); + ptr = mutex_owner((kmutex_t *)arg0); i++; } ==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.mutex_type_adaptive.d#4 (text+ko) ==== @@ -44,9 +44,9 @@ ret = -99; } -mtx_lock:adaptive-acquire +mutex_enter:adaptive-acquire { - ret = mutex_type_adaptive((struct mtx *)arg0); + ret = mutex_type_adaptive((kmutex_t *)arg0); i++; } ==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.substr.d#4 (text+ko) ==== @@ -20,20 +20,18 @@ */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" #pragma D option quiet -#pragma D option strsize=32 struct { int index; int length; int nolen; - int alt; } command[int]; int i; @@ -41,9 +39,6 @@ BEGIN { str = "foobarbazbop"; - str2 = ""; - altstr = "CRAIG: Positioned them, I don't "; - altstr2 = "know... I'm fairly wide guy."; command[i].index = 3; command[i].nolen = 1; @@ -113,18 +108,6 @@ command[i].length = -1; i++; - command[i].index = 3; - command[i].length = -4; - i++; - - command[i].index = 3; - command[i].length = -20; - i++; - - command[i].index = -10; - command[i].length = -5; - i++; - command[i].index = 0; command[i].length = 400; i++; @@ -161,16 +144,6 @@ command[i].length = strlen(str) - 1; i++; - command[i].index = 100; - command[i].length = 10; - command[i].alt = 1; - i++; - - command[i].index = 100; - command[i].nolen = 1; - command[i].alt = 1; - i++; - end = i; i = 0; printf("#!/usr/perl5/bin/perl\n\nBEGIN {\n"); @@ -180,21 +153,17 @@ tick-1ms /i < end && command[i].nolen/ { - this->str = command[i].alt ? altstr : str; - this->str2 = command[i].alt ? altstr2 : str2; - this->result = substr(command[i].alt ? - "CRAIG: Positioned them, I don't know... I'm fairly wide guy." : - str, command[i].index); + this->result = substr(str, command[i].index); - printf("\tif (substr(\"%s%s\", %d) ne \"%s\") {\n", - this->str, this->str2, command[i].index, this->result); + printf("\tif (substr(\"%s\", %d) != \"%s\") {\n", + str, command[i].index, this->result); - printf("\t\tprintf(\"perl => substr(\\\"%s%s\\\", %d) = ", - this->str, this->str2, command[i].index); - printf("\\\"%%s\\\"\\n\",\n\t\t substr(\"%s%s\", %d));\n", - this->str, this->str2, command[i].index); - printf("\t\tprintf(\" D => substr(\\\"%s%s\\\", %d) = ", - this->str, this->str2, command[i].index); + printf("\t\tprintf(\"perl => substr(\\\"%s\\\", %d) = ", + str, command[i].index); + printf("\\\"%%s\\\"\\n\",\n\t\t substr(\"%s\", %d));\n", + str, command[i].index); + printf("\t\tprintf(\" D => substr(\\\"%s\\\", %d) = ", + str, command[i].index); printf("\\\"%%s\\\"\\n\",\n\t\t \"%s\");\n", this->result); printf("\t\t$failed++;\n"); printf("\t}\n\n"); @@ -203,21 +172,16 @@ tick-1ms /i < end && !command[i].nolen/ { - this->str = command[i].alt ? altstr : str; - this->str2 = command[i].alt ? altstr2 : str2; - this->result = substr(command[i].alt ? - "CRAIG: Positioned them, I don't know... I'm fairly wide guy." : + this->result = substr(str, command[i].index, command[i].length); + + printf("\tif (substr(\"%s\", %d, %d) != \"%s\") {\n", + str, command[i].index, command[i].length, this->result); + printf("\t\tprintf(\"perl => substr(\\\"%s\\\", %d, %d) = ", + str, command[i].index, command[i].length); + printf("\\\"%%s\\\"\\n\",\n\t\t substr(\"%s\", %d, %d));\n", + str, command[i].index, command[i].length); + printf("\t\tprintf(\" D => substr(\\\"%s\\\", %d, %d) = ", str, command[i].index, command[i].length); - - printf("\tif (substr(\"%s%s\", %d, %d) ne \"%s\") {\n", - this->str, this->str2, command[i].index, command[i].length, - this->result); - printf("\t\tprintf(\"perl => substr(\\\"%s%s\\\", %d, %d) = ", - this->str, this->str2, command[i].index, command[i].length); - printf("\\\"%%s\\\"\\n\",\n\t\t substr(\"%s%s\", %d, %d));\n", - this->str, this->str2, command[i].index, command[i].length); - printf("\t\tprintf(\" D => substr(\\\"%s%s\\\", %d, %d) = ", - this->str, this->str2, command[i].index, command[i].length); printf("\\\"%%s\\\"\\n\",\n\t\t \"%s\");\n", this->result); printf("\t\t$failed++;\n"); printf("\t}\n\n"); ==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.substr.d.out#4 (text+ko) ==== @@ -1,7 +1,7 @@ #!/usr/perl5/bin/perl BEGIN { - if (substr("foobarbazbop", 3) ne "barbazbop") { + if (substr("foobarbazbop", 3) != "barbazbop") { printf("perl => substr(\"foobarbazbop\", 3) = \"%s\"\n", substr("foobarbazbop", 3)); printf(" D => substr(\"foobarbazbop\", 3) = \"%s\"\n", @@ -9,7 +9,7 @@ $failed++; } - if (substr("foobarbazbop", 300) ne "") { + if (substr("foobarbazbop", 300) != "") { printf("perl => substr(\"foobarbazbop\", 300) = \"%s\"\n", substr("foobarbazbop", 300)); printf(" D => substr(\"foobarbazbop\", 300) = \"%s\"\n", @@ -17,7 +17,7 @@ $failed++; } - if (substr("foobarbazbop", -10) ne "obarbazbop") { + if (substr("foobarbazbop", -10) != "obarbazbop") { printf("perl => substr(\"foobarbazbop\", -10) = \"%s\"\n", substr("foobarbazbop", -10)); printf(" D => substr(\"foobarbazbop\", -10) = \"%s\"\n", @@ -25,7 +25,7 @@ $failed++; } - if (substr("foobarbazbop", 0) ne "foobarbazbop") { + if (substr("foobarbazbop", 0) != "foobarbazbop") { printf("perl => substr(\"foobarbazbop\", 0) = \"%s\"\n", substr("foobarbazbop", 0)); printf(" D => substr(\"foobarbazbop\", 0) = \"%s\"\n", @@ -33,7 +33,7 @@ $failed++; } - if (substr("foobarbazbop", 1) ne "oobarbazbop") { + if (substr("foobarbazbop", 1) != "oobarbazbop") { printf("perl => substr(\"foobarbazbop\", 1) = \"%s\"\n", substr("foobarbazbop", 1)); printf(" D => substr(\"foobarbazbop\", 1) = \"%s\"\n", @@ -41,7 +41,7 @@ $failed++; } - if (substr("foobarbazbop", 11) ne "p") { + if (substr("foobarbazbop", 11) != "p") { printf("perl => substr(\"foobarbazbop\", 11) = \"%s\"\n", substr("foobarbazbop", 11)); printf(" D => substr(\"foobarbazbop\", 11) = \"%s\"\n", @@ -49,7 +49,7 @@ $failed++; } - if (substr("foobarbazbop", 12) ne "") { + if (substr("foobarbazbop", 12) != "") { printf("perl => substr(\"foobarbazbop\", 12) = \"%s\"\n", substr("foobarbazbop", 12)); printf(" D => substr(\"foobarbazbop\", 12) = \"%s\"\n", @@ -57,7 +57,7 @@ $failed++; } - if (substr("foobarbazbop", 13) ne "") { + if (substr("foobarbazbop", 13) != "") { printf("perl => substr(\"foobarbazbop\", 13) = \"%s\"\n", substr("foobarbazbop", 13)); printf(" D => substr(\"foobarbazbop\", 13) = \"%s\"\n", @@ -65,7 +65,7 @@ $failed++; } - if (substr("foobarbazbop", 8, 20) ne "zbop") { + if (substr("foobarbazbop", 8, 20) != "zbop") { printf("perl => substr(\"foobarbazbop\", 8, 20) = \"%s\"\n", substr("foobarbazbop", 8, 20)); printf(" D => substr(\"foobarbazbop\", 8, 20) = \"%s\"\n", @@ -73,7 +73,7 @@ $failed++; } >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200804260314.m3Q3EVih080056>