Date: Sun, 22 May 2011 20:41:10 +0000 (UTC) From: Attilio Rao <attilio@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r222197 - in projects/largeSMP: bin/ed bin/pax bin/ps bin/sh contrib/top lib/clang sbin/atacontrol sbin/hastd sbin/mount_reiserfs share/examples/diskless share/examples/drivers share/ex... Message-ID: <201105222041.p4MKfAGl089747@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: attilio Date: Sun May 22 20:41:10 2011 New Revision: 222197 URL: http://svn.freebsd.org/changeset/base/222197 Log: MFC Added: projects/largeSMP/tools/build/options/WITHOUT_KERNEL_SYMBOLS - copied unchanged from r222195, head/tools/build/options/WITHOUT_KERNEL_SYMBOLS projects/largeSMP/tools/regression/bin/sh/builtins/dot4.0 - copied unchanged from r222195, head/tools/regression/bin/sh/builtins/dot4.0 projects/largeSMP/tools/regression/bin/sh/parameters/positional1.0 - copied unchanged from r222195, head/tools/regression/bin/sh/parameters/positional1.0 projects/largeSMP/tools/regression/bin/sh/parser/alias4.0 - copied unchanged from r222195, head/tools/regression/bin/sh/parser/alias4.0 projects/largeSMP/tools/regression/bin/sh/parser/alias5.0 - copied unchanged from r222195, head/tools/regression/bin/sh/parser/alias5.0 Modified: projects/largeSMP/bin/ed/POSIX projects/largeSMP/bin/pax/ar_io.c projects/largeSMP/bin/pax/ar_subs.c projects/largeSMP/bin/pax/buf_subs.c projects/largeSMP/bin/pax/cpio.c projects/largeSMP/bin/pax/file_subs.c projects/largeSMP/bin/pax/ftree.c projects/largeSMP/bin/pax/options.c projects/largeSMP/bin/pax/pat_rep.c projects/largeSMP/bin/pax/pax.c projects/largeSMP/bin/pax/sel_subs.c projects/largeSMP/bin/pax/tables.c projects/largeSMP/bin/pax/tar.c projects/largeSMP/bin/ps/ps.c projects/largeSMP/bin/sh/eval.c projects/largeSMP/bin/sh/main.c projects/largeSMP/bin/sh/mkinit.c projects/largeSMP/bin/sh/mktokens projects/largeSMP/bin/sh/parser.c projects/largeSMP/bin/sh/parser.h projects/largeSMP/bin/sh/sh.1 projects/largeSMP/lib/clang/clang.build.mk projects/largeSMP/sbin/atacontrol/atacontrol.8 projects/largeSMP/sbin/atacontrol/atacontrol.c projects/largeSMP/sbin/hastd/secondary.c projects/largeSMP/sbin/mount_reiserfs/mount_reiserfs.8 projects/largeSMP/sbin/mount_reiserfs/mount_reiserfs.c projects/largeSMP/share/examples/diskless/README.TEMPLATING projects/largeSMP/share/examples/drivers/make_device_driver.sh projects/largeSMP/share/examples/libvgl/demo.c projects/largeSMP/share/examples/netgraph/ether.bridge projects/largeSMP/share/examples/netgraph/frame_relay projects/largeSMP/share/examples/netgraph/ngctl projects/largeSMP/share/examples/netgraph/raw projects/largeSMP/share/examples/netgraph/virtual.chain projects/largeSMP/share/examples/netgraph/virtual.lan projects/largeSMP/share/man/man4/aio.4 projects/largeSMP/share/man/man4/ata.4 projects/largeSMP/share/man/man4/coretemp.4 projects/largeSMP/share/man/man4/ichwd.4 projects/largeSMP/share/man/man4/pst.4 projects/largeSMP/share/man/man4/ucycom.4 projects/largeSMP/share/man/man5/reiserfs.5 projects/largeSMP/share/man/man5/src.conf.5 projects/largeSMP/share/man/man9/LOCK_PROFILING.9 projects/largeSMP/share/man/man9/pseudofs.9 projects/largeSMP/share/man/man9/sbuf.9 projects/largeSMP/share/man/man9/zone.9 projects/largeSMP/share/misc/bsd-family-tree projects/largeSMP/share/mk/bsd.own.mk projects/largeSMP/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c projects/largeSMP/sys/conf/kern.post.mk projects/largeSMP/sys/conf/kmod.mk projects/largeSMP/sys/dev/ath/ath_hal/ah.c projects/largeSMP/sys/dev/ath/ath_hal/ar9002/ar9280_attach.c projects/largeSMP/sys/fs/cd9660/cd9660_vfsops.c projects/largeSMP/sys/fs/ext2fs/ext2_vfsops.c projects/largeSMP/sys/fs/hpfs/hpfs_vfsops.c projects/largeSMP/sys/fs/msdosfs/msdosfs_vfsops.c projects/largeSMP/sys/fs/nfsclient/nfs_clvnops.c projects/largeSMP/sys/fs/nfsserver/nfs_nfsdport.c projects/largeSMP/sys/fs/ntfs/ntfs_vfsops.c projects/largeSMP/sys/fs/nullfs/null_vfsops.c projects/largeSMP/sys/fs/tmpfs/tmpfs_vfsops.c projects/largeSMP/sys/fs/udf/udf_vfsops.c projects/largeSMP/sys/fs/unionfs/union_vfsops.c projects/largeSMP/sys/gnu/fs/reiserfs/reiserfs_vfsops.c projects/largeSMP/sys/gnu/fs/xfs/FreeBSD/support/kdb.c projects/largeSMP/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c projects/largeSMP/sys/kern/vfs_default.c projects/largeSMP/sys/kern/vfs_syscalls.c projects/largeSMP/sys/modules/wlan/Makefile projects/largeSMP/sys/net80211/ieee80211_var.h projects/largeSMP/sys/nfsclient/nfs_vnops.c projects/largeSMP/sys/nfsserver/nfs_srvsubs.c projects/largeSMP/sys/nlm/nlm_prot_impl.c projects/largeSMP/sys/sys/mount.h projects/largeSMP/sys/sys/param.h projects/largeSMP/sys/ufs/ffs/ffs_vfsops.c projects/largeSMP/sys/ufs/ufs/ufs_extern.h projects/largeSMP/sys/ufs/ufs/ufs_vfsops.c projects/largeSMP/sys/vm/uma_core.c projects/largeSMP/sys/vm/uma_int.h projects/largeSMP/tools/tools/iso/check-iso3166.pl projects/largeSMP/usr.sbin/makefs/cd9660.c projects/largeSMP/usr.sbin/makefs/cd9660.h projects/largeSMP/usr.sbin/makefs/cd9660/cd9660_eltorito.c projects/largeSMP/usr.sbin/makefs/makefs.8 Directory Properties: projects/largeSMP/ (props changed) projects/largeSMP/cddl/contrib/opensolaris/ (props changed) projects/largeSMP/contrib/bind9/ (props changed) projects/largeSMP/contrib/binutils/ (props changed) projects/largeSMP/contrib/bzip2/ (props changed) projects/largeSMP/contrib/dialog/ (props changed) projects/largeSMP/contrib/ee/ (props changed) projects/largeSMP/contrib/expat/ (props changed) projects/largeSMP/contrib/file/ (props changed) projects/largeSMP/contrib/gcc/ (props changed) projects/largeSMP/contrib/gdb/ (props changed) projects/largeSMP/contrib/gdtoa/ (props changed) projects/largeSMP/contrib/gnu-sort/ (props changed) projects/largeSMP/contrib/groff/ (props changed) projects/largeSMP/contrib/less/ (props changed) projects/largeSMP/contrib/libpcap/ (props changed) projects/largeSMP/contrib/libstdc++/ (props changed) projects/largeSMP/contrib/llvm/ (props changed) projects/largeSMP/contrib/llvm/tools/clang/ (props changed) projects/largeSMP/contrib/ncurses/ (props changed) projects/largeSMP/contrib/netcat/ (props changed) projects/largeSMP/contrib/ntp/ (props changed) projects/largeSMP/contrib/one-true-awk/ (props changed) projects/largeSMP/contrib/openbsm/ (props changed) projects/largeSMP/contrib/openpam/ (props changed) projects/largeSMP/contrib/pf/ (props changed) projects/largeSMP/contrib/sendmail/ (props changed) projects/largeSMP/contrib/tcpdump/ (props changed) projects/largeSMP/contrib/tcsh/ (props changed) projects/largeSMP/contrib/top/ (props changed) projects/largeSMP/contrib/top/install-sh (props changed) projects/largeSMP/contrib/tzcode/stdtime/ (props changed) projects/largeSMP/contrib/tzcode/zic/ (props changed) projects/largeSMP/contrib/tzdata/ (props changed) projects/largeSMP/contrib/wpa/ (props changed) projects/largeSMP/contrib/xz/ (props changed) projects/largeSMP/crypto/openssh/ (props changed) projects/largeSMP/crypto/openssl/ (props changed) projects/largeSMP/gnu/lib/ (props changed) projects/largeSMP/gnu/usr.bin/binutils/ (props changed) projects/largeSMP/gnu/usr.bin/cc/cc_tools/ (props changed) projects/largeSMP/gnu/usr.bin/gdb/ (props changed) projects/largeSMP/lib/libc/ (props changed) projects/largeSMP/lib/libc/stdtime/ (props changed) projects/largeSMP/lib/libutil/ (props changed) projects/largeSMP/lib/libz/ (props changed) projects/largeSMP/sbin/ (props changed) projects/largeSMP/sbin/ipfw/ (props changed) projects/largeSMP/share/mk/bsd.arch.inc.mk (props changed) projects/largeSMP/share/zoneinfo/ (props changed) projects/largeSMP/sys/ (props changed) projects/largeSMP/sys/amd64/include/xen/ (props changed) projects/largeSMP/sys/boot/ (props changed) projects/largeSMP/sys/boot/i386/efi/ (props changed) projects/largeSMP/sys/boot/ia64/efi/ (props changed) projects/largeSMP/sys/boot/ia64/ski/ (props changed) projects/largeSMP/sys/boot/powerpc/boot1.chrp/ (props changed) projects/largeSMP/sys/boot/powerpc/ofw/ (props changed) projects/largeSMP/sys/cddl/contrib/opensolaris/ (props changed) projects/largeSMP/sys/conf/ (props changed) projects/largeSMP/sys/contrib/dev/acpica/ (props changed) projects/largeSMP/sys/contrib/octeon-sdk/ (props changed) projects/largeSMP/sys/contrib/pf/ (props changed) projects/largeSMP/sys/contrib/x86emu/ (props changed) projects/largeSMP/usr.bin/calendar/ (props changed) projects/largeSMP/usr.bin/csup/ (props changed) projects/largeSMP/usr.bin/procstat/ (props changed) projects/largeSMP/usr.sbin/ndiscvt/ (props changed) projects/largeSMP/usr.sbin/zic/ (props changed) Modified: projects/largeSMP/bin/ed/POSIX ============================================================================== --- projects/largeSMP/bin/ed/POSIX Sun May 22 20:39:07 2011 (r222196) +++ projects/largeSMP/bin/ed/POSIX Sun May 22 20:41:10 2011 (r222197) @@ -75,7 +75,7 @@ DEVIATIONS 2) Since the behavior of `u' (undo) within a `g' (global) command list is not specified by POSIX, it follows the behavior of the SunOS ed: undo forces a global command list to be executed only once, rather than - for each line matching a global pattern. In addtion, each instance of + for each line matching a global pattern. In addition, each instance of `u' within a global command undoes all previous commands (including undo's) in the command list. This seems the best way, since the alternatives are either too complicated to implement or too confusing @@ -83,7 +83,7 @@ DEVIATIONS The global/undo combination is useful for masking errors that would otherwise cause a script to fail. For instance, an ed script - to remove any occurences of either `censor1' or `censor2' might be + to remove any occurrences of either `censor1' or `censor2' might be written as: ed - file <<EOF 1g/.*/u\ Modified: projects/largeSMP/bin/pax/ar_io.c ============================================================================== --- projects/largeSMP/bin/pax/ar_io.c Sun May 22 20:39:07 2011 (r222196) +++ projects/largeSMP/bin/pax/ar_io.c Sun May 22 20:41:10 2011 (r222197) @@ -204,7 +204,7 @@ ar_open(const char *name) /* * set default blksz on read. APPNDs writes rdblksz on the last volume * On all new archive volumes, we shift to wrblksz (if the user - * specified one, otherwize we will continue to use rdblksz). We + * specified one, otherwise we will continue to use rdblksz). We * must to set blocksize based on what kind of device the archive is * stored. */ @@ -381,7 +381,7 @@ ar_close(void) /* * If we have not determined the format yet, we just say how many bytes - * we have skipped over looking for a header to id. there is no way we + * we have skipped over looking for a header to id. There is no way we * could have written anything yet. */ if (frmt == NULL) { @@ -595,7 +595,7 @@ ar_read(char *buf, int cnt) * Return: * Number of bytes written. 0 indicates end of volume reached and with no * flaws (as best that can be detected). A -1 indicates an unrecoverable - * error in the archive occured. + * error in the archive occurred. */ int @@ -679,7 +679,7 @@ ar_write(char *buf, int bsz) * if this is a block aligned archive format, we may have a bad archive * if the format wants the header to start at a BLKMULT boundary. While * we can deal with the mis-aligned data, it violates spec and other - * archive readers will likely fail. if the format is not block + * archive readers will likely fail. If the format is not block * aligned, the user may be lucky (and the archive is ok). */ if (res >= 0) { @@ -794,7 +794,7 @@ ar_rdsync(void) /* * ar_fow() - * Move the I/O position within the archive foward the specified number of + * Move the I/O position within the archive forward the specified number of * bytes as supported by the device. If we cannot move the requested * number of bytes, return the actual number of bytes moved in skipped. * Return: @@ -813,7 +813,7 @@ ar_fow(off_t sksz, off_t *skipped) return(0); /* - * we cannot move foward at EOF or error + * we cannot move forward at EOF or error */ if (lstrval <= 0) return(lstrval); @@ -822,7 +822,7 @@ ar_fow(off_t sksz, off_t *skipped) * Safer to read forward on devices where it is hard to find the end of * the media without reading to it. With tapes we cannot be sure of the * number of physical blocks to skip (we do not know physical block - * size at this point), so we must only read foward on tapes! + * size at this point), so we must only read forward on tapes! */ if (artyp != ISREG) return(0); @@ -907,7 +907,7 @@ ar_rev(off_t sksz) /* * we may try to go backwards past the start when the archive - * is only a single record. If this hapens and we are on a + * is only a single record. If this happens and we are on a * multi volume archive, we need to go to the end of the * previous volume and continue our movement backwards from * there. @@ -1046,7 +1046,7 @@ get_phys(void) } /* - * read foward to the file mark, then back up in front of the filemark + * read forward to the file mark, then back up in front of the filemark * (this is a bit paranoid, but should be safe to do). */ while ((res = read(arfd, scbuf, sizeof(scbuf))) > 0) Modified: projects/largeSMP/bin/pax/ar_subs.c ============================================================================== --- projects/largeSMP/bin/pax/ar_subs.c Sun May 22 20:39:07 2011 (r222196) +++ projects/largeSMP/bin/pax/ar_subs.c Sun May 22 20:41:10 2011 (r222197) @@ -854,7 +854,7 @@ copy(void) } /* - * Non standard -Y and -Z flag. When the exisiting file is + * Non standard -Y and -Z flag. When the existing file is * same age or newer skip */ if ((Yflag || Zflag) && ((lstat(arcn->name, &sb) == 0))) { @@ -1096,7 +1096,7 @@ next_head(ARCHD *arcn) } /* - * ok got a valid header, check for trailer if format encodes it in the + * ok got a valid header, check for trailer if format encodes it in * the header. */ if (frmt->inhead && ((*frmt->trail_cpio)(arcn) == 0)) { Modified: projects/largeSMP/bin/pax/buf_subs.c ============================================================================== --- projects/largeSMP/bin/pax/buf_subs.c Sun May 22 20:39:07 2011 (r222196) +++ projects/largeSMP/bin/pax/buf_subs.c Sun May 22 20:41:10 2011 (r222197) @@ -145,7 +145,7 @@ rd_start(void) } if (wrblksz % BLKMULT) { paxwarn(1, "Write block size %d is not a %d byte multiple", - wrblksz, BLKMULT); + wrblksz, BLKMULT); return(-1); } } @@ -182,13 +182,13 @@ cp_start(void) * the start of the header of the first file added to the archive. The * format specific end read function tells us how many bytes to move * backwards in the archive to be positioned BEFORE the trailer. Two - * different postions have to be adjusted, the O.S. file offset (e.g. the + * different positions have to be adjusted, the O.S. file offset (e.g. the * position of the tape head) and the write point within the data we have * stored in the read (soon to become write) buffer. We may have to move * back several records (the number depends on the size of the archive * record and the size of the format trailer) to read up the record where * the first byte of the trailer is recorded. Trailers may span (and - * overlap) record boundries. + * overlap) record boundaries. * We first calculate which record has the first byte of the trailer. We * move the OS file offset back to the start of this record and read it * up. We set the buffer write pointer to be at this byte (the byte where @@ -196,10 +196,10 @@ cp_start(void) * start of this record so a flush of this buffer will replace the record * in the archive. * A major problem is rewriting this last record. For archives stored - * on disk files, this is trival. However, many devices are really picky + * on disk files, this is trivial. However, many devices are really picky * about the conditions under which they will allow a write to occur. * Often devices restrict the conditions where writes can be made writes, - * so it may not be feasable to append archives stored on all types of + * so it may not be feasible to append archives stored on all types of * devices. * Return: * 0 for success, -1 for failure @@ -365,7 +365,7 @@ rd_sync(void) * pback() * push the data used during the archive id phase back into the I/O * buffer. This is required as we cannot be sure that the header does NOT - * overlap a block boundry (as in the case we are trying to recover a + * overlap a block boundary (as in the case we are trying to recover a * flawed archived). This was not designed to be used for any other * purpose. (What software engineering, HA!) * WARNING: do not even THINK of pback greater than BLKMULT, unless the @@ -382,7 +382,7 @@ pback(char *pt, int cnt) /* * rd_skip() - * skip foward in the archive during an archive read. Used to get quickly + * skip forward in the archive during an archive read. Used to get quickly * past file data and padding for files the user did NOT select. * Return: * 0 if ok, -1 failure, and 1 when EOF on the archive volume was detected. @@ -396,7 +396,7 @@ rd_skip(off_t skcnt) off_t skipped = 0; /* - * consume what data we have in the buffer. If we have to move foward + * consume what data we have in the buffer. If we have to move forward * whole records, we call the low level skip function to see if we can * move within the archive without doing the expensive reads on data we * do not want. @@ -453,7 +453,7 @@ rd_skip(off_t skcnt) * wr_fin() * flush out any data (and pad if required) the last block. We always pad * with zero (even though we do not have to). Padding with 0 makes it a - * lot easier to recover if the archive is damaged. zero paddding SHOULD + * lot easier to recover if the archive is damaged. zero padding SHOULD * BE a requirement.... */ @@ -530,7 +530,7 @@ rd_wrbuf(char *in, int cpcnt) /* * read error, return what we got (or the error if * no data was copied). The caller must know that an - * error occured and has the best knowledge what to + * error occurred and has the best knowledge what to * do with it */ if ((res = cpcnt - incnt) > 0) @@ -584,7 +584,7 @@ wr_skip(off_t skcnt) /* * wr_rdfile() - * fill write buffer with the contents of a file. We are passed an open + * fill write buffer with the contents of a file. We are passed an open * file descriptor to the file and the archive structure that describes the * file we are storing. The variable "left" is modified to contain the * number of bytes of the file we were NOT able to write to the archive. @@ -671,7 +671,7 @@ rd_wrfile(ARCHD *arcn, int ofd, off_t *l int isem = 1; int rem; int sz = MINFBSZ; - struct stat sb; + struct stat sb; u_long crc = 0L; /* @@ -884,7 +884,7 @@ buf_flush(int bufcnt) /* * if we have reached the user specified byte count for each archive - * volume, prompt for the next volume. (The non-standrad -R flag). + * volume, prompt for the next volume. (The non-standard -R flag). * NOTE: If the wrlimit is smaller than wrcnt, we will always write * at least one record. We always round limit UP to next blocksize. */ @@ -944,7 +944,7 @@ buf_flush(int bufcnt) } else if (cnt > 0) { /* * Oh drat we got a partial write! - * if format doesnt care about alignment let it go, + * if format doesn't care about alignment let it go, * we warned the user in ar_write().... but this means * the last record on this volume violates pax spec.... */ Modified: projects/largeSMP/bin/pax/cpio.c ============================================================================== --- projects/largeSMP/bin/pax/cpio.c Sun May 22 20:39:07 2011 (r222196) +++ projects/largeSMP/bin/pax/cpio.c Sun May 22 20:41:10 2011 (r222197) @@ -627,7 +627,7 @@ vcpio_rd(ARCHD *arcn, char *buf) return(-1); /* - * skip padding. header + filename is aligned to 4 byte boundries + * skip padding. header + filename is aligned to 4 byte boundaries */ if (rd_skip((off_t)(VCPIO_PAD(sizeof(HD_VCPIO) + nsz))) < 0) return(-1); @@ -942,7 +942,7 @@ bcpio_rd(ARCHD *arcn, char *buf) return(-1); /* - * header + file name are aligned to 2 byte boundries, skip if needed + * header + file name are aligned to 2 byte boundaries, skip if needed */ if (rd_skip((off_t)(BCPIO_PAD(sizeof(HD_BCPIO) + nsz))) < 0) return(-1); @@ -989,8 +989,8 @@ bcpio_endrd(void) * bcpio_wr() * copy the data in the ARCHD to buffer in old binary cpio format * There is a real chance of field overflow with this critter. So we - * always check the conversion is ok. nobody in his their right mind - * should write an achive in this format... + * always check that the conversion is ok. nobody in their right mind + * should write an archive in this format... * Return * 0 if file has data to be written after the header, 1 if file has NO * data to write after the header, -1 if archive write failed Modified: projects/largeSMP/bin/pax/file_subs.c ============================================================================== --- projects/largeSMP/bin/pax/file_subs.c Sun May 22 20:39:07 2011 (r222196) +++ projects/largeSMP/bin/pax/file_subs.c Sun May 22 20:41:10 2011 (r222197) @@ -84,9 +84,9 @@ file_creat(ARCHD *arcn) * works. We have to take special handling when the file does exist. To * detect this, we use O_EXCL. For example when trying to create a * file and a character device or fifo exists with the same name, we - * can accidently open the device by mistake (or block waiting to open) - * If we find that the open has failed, then figure spend the effort to - * figure out why. This strategy was found to have better average + * can accidentally open the device by mistake (or block waiting to + * open). If we find that the open has failed, then spend the effort + * to figure out why. This strategy was found to have better average * performance in common use than checking the file (and the path) * first with lstat. */ @@ -559,7 +559,7 @@ chk_path( char *name, uid_t st_uid, gid_ for(;;) { /* - * work foward from the first / and check each part of the path + * work forward from the first / and check each part of the path */ spt = strchr(spt, '/'); if (spt == NULL) @@ -600,7 +600,7 @@ chk_path( char *name, uid_t st_uid, gid_ (void)set_ids(name, st_uid, st_gid); /* - * make sure the user doen't have some strange umask that + * make sure the user doesn't have some strange umask that * causes this newly created directory to be unusable. We fix * the modes and restore them back to the creation default at * the end of pax @@ -716,11 +716,11 @@ set_pmode(char *fnm, mode_t mode) * uses lseek whenever it detects the input data is all 0 within that * file block. In more detail, the strategy is as follows: * While the input is all zero keep doing an lseek. Keep track of when we - * pass over file block boundries. Only write when we hit a non zero + * pass over file block boundaries. Only write when we hit a non zero * input. once we have written a file block, we continue to write it to * the end (we stop looking at the input). When we reach the start of the * next file block, start checking for zero blocks again. Working on file - * block boundries significantly reduces the overhead when copying files + * block boundaries significantly reduces the overhead when copying files * that are NOT very sparse. This overhead (when compared to a write) is * almost below the measurement resolution on many systems. Without it, * files with holes cannot be safely copied. It does has a side effect as @@ -923,7 +923,7 @@ set_crc(ARCHD *arcn, int fd) /* * safety check. we want to avoid archiving files that are active as - * they can create inconsistant archive copies. + * they can create inconsistent archive copies. */ if (cpcnt != arcn->sb.st_size) paxwarn(1, "File changed size %s", arcn->org_name); Modified: projects/largeSMP/bin/pax/ftree.c ============================================================================== --- projects/largeSMP/bin/pax/ftree.c Sun May 22 20:39:07 2011 (r222196) +++ projects/largeSMP/bin/pax/ftree.c Sun May 22 20:41:10 2011 (r222197) @@ -101,8 +101,8 @@ ftree_start(void) /* * optional user flags that effect file traversal * -H command line symlink follow only (half follow) - * -L follow sylinks (logical) - * -P do not follow sylinks (physical). This is the default. + * -L follow symlinks (logical) + * -P do not follow symlinks (physical). This is the default. * -X do not cross over mount points * -t preserve access times on files read. * -n select only the first member of a file tree when a match is found Modified: projects/largeSMP/bin/pax/options.c ============================================================================== --- projects/largeSMP/bin/pax/options.c Sun May 22 20:39:07 2011 (r222196) +++ projects/largeSMP/bin/pax/options.c Sun May 22 20:41:10 2011 (r222197) @@ -887,7 +887,7 @@ tar_options(int argc, char **argv) sawpat = 1; } /* - * if patterns were added, we are doing chdir() + * if patterns were added, we are doing chdir() * on a file-by-file basis, else, just one * global chdir (if any) after opening input. */ Modified: projects/largeSMP/bin/pax/pat_rep.c ============================================================================== --- projects/largeSMP/bin/pax/pat_rep.c Sun May 22 20:39:07 2011 (r222196) +++ projects/largeSMP/bin/pax/pat_rep.c Sun May 22 20:41:10 2011 (r222197) @@ -397,7 +397,7 @@ pat_sel(ARCHD *arcn) /* * should never happen.... */ - paxwarn(1, "Pattern list inconsistant"); + paxwarn(1, "Pattern list inconsistent"); return(-1); } *ppt = pt->fow; Modified: projects/largeSMP/bin/pax/pax.c ============================================================================== --- projects/largeSMP/bin/pax/pax.c Sun May 22 20:39:07 2011 (r222196) +++ projects/largeSMP/bin/pax/pax.c Sun May 22 20:41:10 2011 (r222197) @@ -372,7 +372,7 @@ gen_init(void) /* * signal handling to reset stored directory times and modes. Since * we deal with broken pipes via failed writes we ignore it. We also - * deal with any file size limit thorugh failed writes. Cpu time + * deal with any file size limit thorough failed writes. Cpu time * limits are caught and a cleanup is forced. */ if ((sigemptyset(&s_mask) < 0) || (sigaddset(&s_mask, SIGTERM) < 0) || Modified: projects/largeSMP/bin/pax/sel_subs.c ============================================================================== --- projects/largeSMP/bin/pax/sel_subs.c Sun May 22 20:39:07 2011 (r222196) +++ projects/largeSMP/bin/pax/sel_subs.c Sun May 22 20:41:10 2011 (r222197) @@ -376,7 +376,7 @@ trng_add(char *str) } /* - * by default we only will check file mtime, but usee can specify + * by default we only will check file mtime, but the user can specify * mtime, ctime (inode change time) or both. */ if ((flgpt == NULL) || (*flgpt == '\0')) Modified: projects/largeSMP/bin/pax/tables.c ============================================================================== --- projects/largeSMP/bin/pax/tables.c Sun May 22 20:39:07 2011 (r222196) +++ projects/largeSMP/bin/pax/tables.c Sun May 22 20:41:10 2011 (r222197) @@ -209,7 +209,7 @@ chk_lnk(ARCHD *arcn) * purg_lnk * remove reference for a file that we may have added to the data base as * a potential source for hard links. We ended up not using the file, so - * we do not want to accidently point another file at it later on. + * we do not want to accidentally point another file at it later on. */ void @@ -306,14 +306,14 @@ lnk_end(void) * An append with an -u must read the archive and store the modification time * for every file on that archive before starting the write phase. It is clear * that this is one HUGE database. To save memory space, the actual file names - * are stored in a scatch file and indexed by an in memory hash table. The + * are stored in a scratch file and indexed by an in memory hash table. The * hash table is indexed by hashing the file path. The nodes in the table store * the length of the filename and the lseek offset within the scratch file * where the actual name is stored. Since there are never any deletions to this * table, fragmentation of the scratch file is never an issue. Lookups seem to * not exhibit any locality at all (files in the database are rarely * looked up more than once...). So caching is just a waste of memory. The - * only limitation is the amount of scatch file space available to store the + * only limitation is the amount of scratch file space available to store the * path names. */ Modified: projects/largeSMP/bin/pax/tar.c ============================================================================== --- projects/largeSMP/bin/pax/tar.c Sun May 22 20:39:07 2011 (r222196) +++ projects/largeSMP/bin/pax/tar.c Sun May 22 20:41:10 2011 (r222197) @@ -291,7 +291,7 @@ tar_chksm(char *blk, int len) /* * tar_id() * determine if a block given to us is a valid tar header (and not a USTAR - * header). We have to be on the lookout for those pesky blocks of all + * header). We have to be on the lookout for those pesky blocks of all * zero's. * Return: * 0 if a tar header, -1 otherwise Modified: projects/largeSMP/bin/ps/ps.c ============================================================================== --- projects/largeSMP/bin/ps/ps.c Sun May 22 20:39:07 2011 (r222196) +++ projects/largeSMP/bin/ps/ps.c Sun May 22 20:41:10 2011 (r222197) @@ -219,7 +219,7 @@ main(int argc, char *argv[]) case 'A': /* * Exactly the same as `-ax'. This has been - * added for compatability with SUSv3, but for + * added for compatibility with SUSv3, but for * now it will not be described in the man page. */ nselectors++; Modified: projects/largeSMP/bin/sh/eval.c ============================================================================== --- projects/largeSMP/bin/sh/eval.c Sun May 22 20:39:07 2011 (r222196) +++ projects/largeSMP/bin/sh/eval.c Sun May 22 20:41:10 2011 (r222197) @@ -714,15 +714,9 @@ evalcommand(union node *cmd, int flags, oexitstatus = exitstatus; exitstatus = 0; for (argp = cmd->ncmd.args ; argp ; argp = argp->narg.next) { - char *p = argp->narg.text; - if (varflag && is_name(*p)) { - do { - p++; - } while (is_in_name(*p)); - if (*p == '=') { - expandarg(argp, &varlist, EXP_VARTILDE); - continue; - } + if (varflag && isassignment(argp->narg.text)) { + expandarg(argp, &varlist, EXP_VARTILDE); + continue; } expandarg(argp, &arglist, EXP_FULL | EXP_TILDE); varflag = 0; Modified: projects/largeSMP/bin/sh/main.c ============================================================================== --- projects/largeSMP/bin/sh/main.c Sun May 22 20:39:07 2011 (r222196) +++ projects/largeSMP/bin/sh/main.c Sun May 22 20:41:10 2011 (r222197) @@ -281,7 +281,6 @@ readcmdfile(const char *name) static char * find_dot_file(char *basename) { - static char localname[FILENAME_MAX+1]; char *fullname; const char *path = pathval(); struct stat statb; @@ -291,10 +290,14 @@ find_dot_file(char *basename) return basename; while ((fullname = padvance(&path, basename)) != NULL) { - strcpy(localname, fullname); + if ((stat(fullname, &statb) == 0) && S_ISREG(statb.st_mode)) { + /* + * Don't bother freeing here, since it will + * be freed by the caller. + */ + return fullname; + } stunalloc(fullname); - if ((stat(fullname, &statb) == 0) && S_ISREG(statb.st_mode)) - return localname; } return basename; } Modified: projects/largeSMP/bin/sh/mkinit.c ============================================================================== --- projects/largeSMP/bin/sh/mkinit.c Sun May 22 20:39:07 2011 (r222196) +++ projects/largeSMP/bin/sh/mkinit.c Sun May 22 20:41:10 2011 (r222197) @@ -75,7 +75,7 @@ __FBSDID("$FreeBSD$"); /* - * A text structure is basicly just a string that grows as more characters + * A text structure is basically just a string that grows as more characters * are added onto the end of it. It is implemented as a linked list of * blocks of characters. The routines addstr and addchar append a string * or a single character, respectively, to a text structure. Writetext Modified: projects/largeSMP/bin/sh/mktokens ============================================================================== --- projects/largeSMP/bin/sh/mktokens Sun May 22 20:39:07 2011 (r222196) +++ projects/largeSMP/bin/sh/mktokens Sun May 22 20:41:10 2011 (r222197) @@ -50,7 +50,6 @@ TPIPE 0 "|" TLP 0 "(" TRP 1 ")" TENDCASE 1 ";;" -TENDBQUOTE 1 "`" TREDIR 0 redirection TWORD 0 word TIF 0 "if" Modified: projects/largeSMP/bin/sh/parser.c ============================================================================== --- projects/largeSMP/bin/sh/parser.c Sun May 22 20:39:07 2011 (r222196) +++ projects/largeSMP/bin/sh/parser.c Sun May 22 20:41:10 2011 (r222197) @@ -619,6 +619,7 @@ simplecmd(union node **rpp, union node * union node **orig_rpp = rpp; union node *n = NULL; int special; + int savecheckkwd; /* If we don't have any redirections already, then we must reset */ /* rpp to be the address of the local redir variable. */ @@ -634,7 +635,10 @@ simplecmd(union node **rpp, union node * */ orig_rpp = rpp; + savecheckkwd = CHKALIAS; + for (;;) { + checkkwd = savecheckkwd; if (readtoken() == TWORD) { n = (union node *)stalloc(sizeof (struct narg)); n->type = NARG; @@ -642,6 +646,8 @@ simplecmd(union node **rpp, union node * n->narg.backquote = backquotelist; *app = n; app = &n->narg.next; + if (savecheckkwd != 0 && !isassignment(wordtext)) + savecheckkwd = 0; } else if (lasttoken == TREDIR) { *rpp = n = redirnode; rpp = &n->nfile.next; @@ -1859,6 +1865,22 @@ goodname(const char *name) } +int +isassignment(const char *p) +{ + if (!is_name(*p)) + return 0; + p++; + for (;;) { + if (*p == '=') + return 1; + else if (!is_in_name(*p)) + return 0; + p++; + } +} + + /* * Called when an unexpected token is read during the parse. The argument * is the token that is expected, or -1 if more than one type of token can Modified: projects/largeSMP/bin/sh/parser.h ============================================================================== --- projects/largeSMP/bin/sh/parser.h Sun May 22 20:39:07 2011 (r222196) +++ projects/largeSMP/bin/sh/parser.h Sun May 22 20:41:10 2011 (r222197) @@ -80,4 +80,5 @@ extern const char *const parsekwd[]; union node *parsecmd(int); void fixredir(union node *, const char *, int); int goodname(const char *); +int isassignment(const char *); char *getprompt(void *); Modified: projects/largeSMP/bin/sh/sh.1 ============================================================================== --- projects/largeSMP/bin/sh/sh.1 Sun May 22 20:39:07 2011 (r222196) +++ projects/largeSMP/bin/sh/sh.1 Sun May 22 20:41:10 2011 (r222197) @@ -32,7 +32,7 @@ .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 .\" $FreeBSD$ .\" -.Dd May 20, 2011 +.Dd May 21, 2011 .Dt SH 1 .Os .Sh NAME @@ -506,8 +506,8 @@ The following are keywords: An alias is a name and corresponding value set using the .Ic alias built-in command. -Whenever a keyword may occur (see above), -and after checking for keywords, the shell +Wherever the command word of a simple command may occur, +and after checking for keywords if a keyword may occur, the shell checks the word to see if it matches an alias. If it does, it replaces it in the input stream with its value. For example, if there is an alias called Modified: projects/largeSMP/lib/clang/clang.build.mk ============================================================================== --- projects/largeSMP/lib/clang/clang.build.mk Sun May 22 20:39:07 2011 (r222196) +++ projects/largeSMP/lib/clang/clang.build.mk Sun May 22 20:41:10 2011 (r222197) @@ -15,7 +15,7 @@ CFLAGS+= -O1 TARGET_ARCH?= ${MACHINE_ARCH} # XXX: 8.0, to keep __FreeBSD_cc_version happy -CFLAGS+=-DLLVM_HOSTTRIPLE=\"${TARGET_ARCH}-undermydesk-freebsd9.0\" +CFLAGS+=-DLLVM_HOSTTRIPLE=\"${TARGET_ARCH:C/amd64/x86_64/}-unknown-freebsd9.0\" .ifndef LLVM_REQUIRES_EH CXXFLAGS+=-fno-exceptions Modified: projects/largeSMP/sbin/atacontrol/atacontrol.8 ============================================================================== --- projects/largeSMP/sbin/atacontrol/atacontrol.8 Sun May 22 20:39:07 2011 (r222196) +++ projects/largeSMP/sbin/atacontrol/atacontrol.8 Sun May 22 20:41:10 2011 (r222197) @@ -1,5 +1,5 @@ .\" -.\" Copyright (c) 2000,2001,2002 Søren Schmidt <sos@FreeBSD.org> +.\" Copyright (c) 2000,2001,2002 Søren Schmidt <sos@FreeBSD.org> .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without Modified: projects/largeSMP/sbin/atacontrol/atacontrol.c ============================================================================== --- projects/largeSMP/sbin/atacontrol/atacontrol.c Sun May 22 20:39:07 2011 (r222196) +++ projects/largeSMP/sbin/atacontrol/atacontrol.c Sun May 22 20:41:10 2011 (r222197) @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2000 - 2006 Søren Schmidt <sos@FreeBSD.org> + * Copyright (c) 2000 - 2006 Søren Schmidt <sos@FreeBSD.org> * All rights reserved. * * Redistribution and use in source and binary forms, with or without Modified: projects/largeSMP/sbin/hastd/secondary.c ============================================================================== --- projects/largeSMP/sbin/hastd/secondary.c Sun May 22 20:39:07 2011 (r222196) +++ projects/largeSMP/sbin/hastd/secondary.c Sun May 22 20:41:10 2011 (r222197) @@ -514,6 +514,7 @@ requnpack(struct hast_resource *res, str goto end; } switch (hio->hio_cmd) { + case HIO_FLUSH: case HIO_KEEPALIVE: break; case HIO_READ: Modified: projects/largeSMP/sbin/mount_reiserfs/mount_reiserfs.8 ============================================================================== --- projects/largeSMP/sbin/mount_reiserfs/mount_reiserfs.8 Sun May 22 20:39:07 2011 (r222196) +++ projects/largeSMP/sbin/mount_reiserfs/mount_reiserfs.8 Sun May 22 20:41:10 2011 (r222197) @@ -1,7 +1,7 @@ .\" .\" Copyright (c) 1993,1994 Christopher G. Demetriou .\" Copyright (c) 1999 Semen Ustimenko -.\" Copyright (c) 2005 Jean-Sébastien Pédron +.\" Copyright (c) 2005 Jean-Sébastien Pédron .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without Modified: projects/largeSMP/sbin/mount_reiserfs/mount_reiserfs.c ============================================================================== --- projects/largeSMP/sbin/mount_reiserfs/mount_reiserfs.c Sun May 22 20:39:07 2011 (r222196) +++ projects/largeSMP/sbin/mount_reiserfs/mount_reiserfs.c Sun May 22 20:41:10 2011 (r222197) @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2005 Jean-Sébastien Pédron + * Copyright (c) 2005 Jean-Sébastien Pédron * All rights reserved. * * Redistribution and use in source and binary forms, with or without Modified: projects/largeSMP/share/examples/diskless/README.TEMPLATING ============================================================================== --- projects/largeSMP/share/examples/diskless/README.TEMPLATING Sun May 22 20:39:07 2011 (r222196) +++ projects/largeSMP/share/examples/diskless/README.TEMPLATING Sun May 22 20:41:10 2011 (r222197) @@ -136,7 +136,7 @@ be useful to set up clients and server f should never be overwritten by the templating copy. - TYPICAL CUSTOMIZED CONFIGRATION SOFTLINKS + TYPICAL CUSTOMIZED CONFIGURATION SOFTLINKS The following files typically need to be turned into softlinks to /conf/ME/<filename>: @@ -261,9 +261,9 @@ be useful to set up clients and server f identity.pub WHEN INITIALLY CONVERTING A TARGET MACHINE TO USE TEMPLATING, ALWAYS - MAKE A FULL BACKUP OF THE TARGET MACHINE FIRST! You may accidently delete - files on the target during the conversion due to forgetting to enter - items into appropriate .cpignore files on the source. + MAKE A FULL BACKUP OF THE TARGET MACHINE FIRST! You may accidentally + delete files on the target during the conversion due to forgetting to + enter items into appropriate .cpignore files on the source. SECURITY CONSIDERATIONS WITH NFS ROOT EXPORT FROM TEMPLATE MACHINE SECURITY CONSIDERATIONS WITH NFS USR EXPORT FROM TEMPLATE MACHINE Modified: projects/largeSMP/share/examples/drivers/make_device_driver.sh ============================================================================== --- projects/largeSMP/share/examples/drivers/make_device_driver.sh Sun May 22 20:39:07 2011 (r222196) +++ projects/largeSMP/share/examples/drivers/make_device_driver.sh Sun May 22 20:41:10 2011 (r222197) @@ -485,7 +485,7 @@ ${1}_isa_probe (device_t device) /*rid*/0, membase, memsize); /* * We found one, return non-positive numbers.. - * Return -N if we cant handle it, but not well. + * Return -N if we can't handle it, but not well. * Return -2 if we would LIKE the device. * Return -1 if we want it a lot. * Return 0 if we MUST get the device. Modified: projects/largeSMP/share/examples/libvgl/demo.c ============================================================================== --- projects/largeSMP/share/examples/libvgl/demo.c Sun May 22 20:39:07 2011 (r222196) +++ projects/largeSMP/share/examples/libvgl/demo.c Sun May 22 20:41:10 2011 (r222197) @@ -1,5 +1,5 @@ /*- - * Copyright (c) 1991-1997 Søren Schmidt + * Copyright (c) 1991-1997 Søren Schmidt * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -42,15 +42,15 @@ main(int argc, char **argv) // set graphics mode, here 320x240 256 colors // supported modes are (from <sys/consio.h>): - // SW_VGA_CG320: std VGA 320x200 256 colors - // SW_VGA_MODEX: Modex VGA 320x240 256 colors - // SW_VGA_VG640: std VGA 640x480 16 colors + // SW_VGA_CG320: std VGA 320x200 256 colors + // SW_VGA_MODEX: Modex VGA 320x240 256 colors + // SW_VGA_VG640: std VGA 640x480 16 colors VGLInit(SW_VGA_MODEX); // initialize mouse and show pointer VGLMouseInit(VGL_MOUSESHOW); - // VGLDisplay is a ptr to a struct Bitmap defined and initialized by + // VGLDisplay is a ptr to a struct Bitmap defined and initialized by // libvgl. The Bitmap points directly to screen memory etc. xsize=VGLDisplay->Xsize; ysize=VGLDisplay->Ysize; @@ -61,7 +61,7 @@ main(int argc, char **argv) VGLClear(tmp, 0); // fill the screen with colored lines - for (y=0; y<ysize; y++) + for (y=0; y<ysize; y++) VGLLine(VGLDisplay, 0, y, xsize-1, y, y/2 % 256); // draw some lines and circles just to show off @@ -72,7 +72,7 @@ main(int argc, char **argv) VGLEllipse(VGLDisplay, 256, 0, 256, 256, 63); VGLEllipse(VGLDisplay, 0, 256, 256, 256, 0); - // some text is also usefull + // some text is also useful VGLBitmapString(VGLDisplay, 100,100, "This is text", 63, 0, 0, VGL_DIR_RIGHT); sleep(2); @@ -86,7 +86,7 @@ main(int argc, char **argv) "This is text", 63, 0, 0, VGL_DIR_DOWN); sleep(2); - // now show some simple bitblit + // now show some simple bitblit for (i=0; i<256; i++) for (j=0; j<256; j++) tmp->Bitmap[i+256*j] = i%16; @@ -106,12 +106,12 @@ main(int argc, char **argv) // loop around drawing and copying while (++i) { VGLBitmapCopy(VGLDisplay, rand()%xsize, rand()%ysize, - VGLDisplay, rand()%xsize, rand()%ysize, - rand()%xsize, rand()%ysize); + VGLDisplay, rand()%xsize, rand()%ysize, + rand()%xsize, rand()%ysize); VGLLine(VGLDisplay, rand()%xsize, rand()%ysize, rand()%xsize, rand()%ysize, rand()%256); VGLEllipse(VGLDisplay, rand()%xsize, rand()%ysize, - rand()%xsize/2, rand()%ysize/2, rand()%256); + rand()%xsize/2, rand()%ysize/2, rand()%256); rand(); if (i > 1000) break; } @@ -120,4 +120,3 @@ main(int argc, char **argv) VGLEnd(); return 0; } - Modified: projects/largeSMP/share/examples/netgraph/ether.bridge ============================================================================== --- projects/largeSMP/share/examples/netgraph/ether.bridge Sun May 22 20:39:07 2011 (r222196) +++ projects/largeSMP/share/examples/netgraph/ether.bridge Sun May 22 20:41:10 2011 (r222197) @@ -40,7 +40,7 @@ BRIDGE_NAME="bnet0" # machine as well then set ${LOCAL_IFACES} as well (they may also be # listed in ${BRIDGE_IFACES}). Of course, any ${LOCAL_IFACE} must # be ifconfig(8)ured separately. If you don't want a ${LOCAL_IFACE} -# then assign it the emtpy string. +# then assign it the empty string. BRIDGE_IFACES="de0 fxp0 fxp1" LOCAL_IFACES="fxp0 fxp1" Modified: projects/largeSMP/share/examples/netgraph/frame_relay ============================================================================== --- projects/largeSMP/share/examples/netgraph/frame_relay Sun May 22 20:39:07 2011 (r222196) +++ projects/largeSMP/share/examples/netgraph/frame_relay Sun May 22 20:41:10 2011 (r222197) @@ -13,13 +13,13 @@ ngctl mkpeer ${CARD}: frame_relay rawdat # Link management protocol node. ngctl mkpeer ${CARD}:rawdata lmi dlci0 auto0 -# Also attach dlci 1023, as it needs both to try autoconfiguring. +# Also attach dlci 1023, as it needs both to try auto-configuring. # The Link management protocol is now alive and probing.. ngctl connect ${CARD}:rawdata ${CARD}:rawdata.dlci0 dlci1023 auto1023 # Attach the DLCI(channel) the Telco has assigned you to -# a node to hadle whatever protocol encapsulation your peer -# is using. In this case rfc1490 encapsulation. +# a node to handle whatever protocol encapsulation your peer +# is using. In this case RFC1490 encapsulation. ngctl mkpeer ${CARD}:rawdata rfc1490 dlci${DLCI} downstream @@ -34,8 +34,8 @@ ngctl mkpeer ${CARD}:rawdata.dlci${DLCI} # Then use ifconfig on interface ng0 as usual # A variant on this whole set might use the 'name' command to make it more -# readable. but it doesn't work if you have multiple lines or dlcis -# e.g. +# readable. But it doesn't work if you have multiple lines or dlcis +# e.g. # ngctl mkpeer ${CARD}: frame_relay rawdata downstream # ngctl name ${CARD}:rawdata mux # ngctl mkpeer mux: lmi dlci0 auto0 Modified: projects/largeSMP/share/examples/netgraph/ngctl ============================================================================== --- projects/largeSMP/share/examples/netgraph/ngctl Sun May 22 20:39:07 2011 (r222196) +++ projects/largeSMP/share/examples/netgraph/ngctl Sun May 22 20:41:10 2011 (r222197) @@ -46,7 +46,7 @@ # Note that we used ngctl's ``name'' command to do this. However, # the following manually constructed netgraph message would have -# acomplished the exact same thing: +# accomplished the exact same thing: + msg foo name { name="fred" } @@ -85,7 +85,7 @@ # As soon as we sent the message, we got back a response. Here # ngctl is telling us that it received a control message with the -# NGF_RESP (response) flag set, the reponse was to a prior ``getname'' +# NGF_RESP (response) flag set, the response was to a prior ``getname'' # control message, that the originator was the node addressable # as ``fred:''. The message arguments field is then displayed to # us in its ASCII form. In this case, what we get back is a struct Modified: projects/largeSMP/share/examples/netgraph/raw ============================================================================== --- projects/largeSMP/share/examples/netgraph/raw Sun May 22 20:39:07 2011 (r222196) +++ projects/largeSMP/share/examples/netgraph/raw Sun May 22 20:41:10 2011 (r222197) @@ -6,7 +6,7 @@ CARD=sr0 # create an interface "ng0" and attach it to the sync port. -# The packets had jolly well better be ip because we are not discriminating. +# The packets had jolly well better be IP because we are not discriminating. ngctl mkpeer ${CARD}: iface rawdata inet # if ng0 already exists, use a CONNECT command instead of a mkpeer. e.g. Modified: projects/largeSMP/share/examples/netgraph/virtual.chain ============================================================================== --- projects/largeSMP/share/examples/netgraph/virtual.chain Sun May 22 20:39:07 2011 (r222196) +++ projects/largeSMP/share/examples/netgraph/virtual.chain Sun May 22 20:41:10 2011 (r222197) @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (c) 2010, Yavuz Gokirmak +# Copyright (c) 2010, Yavuz Gokirmak # # All rights reserved. # @@ -14,7 +14,6 @@ # # $FreeBSD$ # -# # This script creates and connects n router like nodes. Complex wide # area topologies can be created with the help of script. # @@ -25,9 +24,9 @@ # # 0. Make your own copy of this example script. # -# 1. Edit the definition of ${TARGET_TOPOLOGY} to define your virtual +# 1. Edit the definition of ${TARGET_TOPOLOGY} to define your virtual # nodes. Virtual topology definition includes node names and their -# IP address. Target top. sytax: ( name|ip<->name|ip ... ) +# IP address. Target top. syntax: ( name|ip<->name|ip ... ) # Example 1: ( n1|10.0.2.1/30<->n2|10.0.2.2/30 ...) # Example 2: ( n1|2001:b90::14a/125<->n1|2001:b90::14b/125 ...) # @@ -35,21 +34,21 @@ # # 3. Add necessary static route commands for each virtual node. For # example assume you have three virtual nodes connected each other -# llike a chain ( n1 is connected to n2, n2 is connecte to n3 ). -# In order to estabklish connectivity among these virtual nodes, +# like a chain (n1 is connected to n2, n2 is connected to n3). +# In order to establish connectivity among these virtual nodes, # you have to add default routes to node n1 and node n3. Example # static route command is: -# STATIC_ROUTE0="jexec n1 route add -inet default 10.0.2.2" -# STATIC_ROUTE1="jexec n3 route add -inet default 10.0.2.5" -# After defining default routes with above format you have to set +# STATIC_ROUTE0="jexec n1 route add -inet default 10.0.2.2" +# STATIC_ROUTE1="jexec n3 route add -inet default 10.0.2.5" +# After defining default routes with above format you have to set # the total number of static route commands as: # STATIC_ROUTE_CNT=2 # # 4. Stop bridging by running this script with "stop" as the # command line argument. -# -# 5. This cript uses a template file in order to carry information -# between start and stop calls. +# +# 5. This script uses a template file in order to carry information +# between start and stop calls. # In the start call, the netgraph interfaces and jails are created. # At the stop phase, all created objects should be removed. # DO NOT delete the temporary file between the start and stop phases. @@ -84,8 +83,8 @@ # # -# List the names of virtual nodes and their IP addresses. Use ':' -# character to seperate node name from node IP address and netmask. +# List the names of virtual nodes and their IP addresses. Use ':' +# character to separate node name from node IP address and netmask. TARGET_TOPOLOGY="n1|10.0.2.1/30<->n2|10.0.2.2/30 n2|10.0.2.5/30<->n3|10.0.2.6/30 n2|10.0.2.9/30<->n4|10.0.2.10/30" STATIC_ROUTE0="jexec n1 route add -inet default 10.0.2.2" @@ -93,10 +92,10 @@ STATIC_ROUTE1="jexec n3 route add -inet STATIC_ROUTE2="jexec n4 route add -inet default 10.0.2.9" STATIC_ROUTE_CNT=3 -# MAC manifacturer prefix. This can be modified according to needs. -MAC_PREFIX="00:1d:92" +# MAC manufacturer prefix. This can be modified according to needs. +MAC_PREFIX="00:1d:92" -# Temporary file is important for proper execution of script. +# Temporary file is important for proper execution of script. TEMP_FILE="/var/tmp/.virtual.chain.tmp" # Set root directory for jails to be created. @@ -112,7 +111,7 @@ JAIL_PATH="/usr/jails/router" virtual_chain_start() { # Load netgraph KLD's as necessary. - + for KLD in ng_ether ng_bridge ng_eiface; do if ! kldstat -v | grep -qw ${KLD}; then echo -n "Loading ${KLD}.ko... " @@ -122,21 +121,21 @@ virtual_chain_start() { done # Reset all interfaces and jails. If temporary file can not be found - # script assumes that there is no previous configuration. - + # script assumes that there is no previous configuration. + if [ ! -e ${TEMP_FILE} ]; then echo "No previous configuration(${TEMP_FILE}) found to clean-up." else echo -n "Cleaning previous configuration..." virtual_chain_stop echo "done" - fi + fi - # Create temporary file for usage. This file includes generated + # Create temporary file for usage. This file includes generated # interface names and jail names. All bridges, interfaces and jails - # are written to file while created. In clean-up process written - # objects are cleaned (i.e removed) from system. - + # are written to file while created. In clean-up process written + # objects are cleaned (i.e. removed) from system. + if [ -e ${TEMP_FILE} ]; then touch ${TEMP_FILE} fi @@ -144,40 +143,40 @@ virtual_chain_start() { # Attach other interfaces as well. for CONNECTION in ${TARGET_TOPOLOGY}; do - + # Virtual connections are defined in TARGET_TOPOLOGY variable. # They have the form of 'nodeName|IPaddr'. Below two lines split - + PEER1=`echo ${CONNECTION} | awk -F"<->" '{print $1}'` PEER1_NAME=`echo ${PEER1} | awk -F"|" '{print $1}'` PEER1_IP=`echo ${PEER1} | awk -F"|" '{print $2}'` - + PEER2=`echo ${CONNECTION} | awk -F"<->" '{print $2}'` PEER2_NAME=`echo ${PEER2} | awk -F"|" '{print $1}'` PEER2_IP=`echo ${PEER2} | awk -F"|" '{print $2}'` # !!! if not created already.. - # Create virtual node (jail) with given name and using + # Create virtual node (jail) with given name and using # JAIL_PATH as root directory for jail. virtual_chain_create_peer_if_necessary ${PEER1_NAME} virtual_chain_create_peer_if_necessary ${PEER2_NAME} # create an interface for peer with the given peer IP. Get interface - # for future use; you will connect this interface to the other + # for future use; you will connect this interface to the other # peers' (PEER2) interface. virtual_chain_create_interface_with_ip ${PEER1_NAME} ${PEER1_IP} PEER1_INTERFACE=${RET_INTERFACE} - + # create an interface for peer with the given peer IP. Get interface - # for future use; you will connect this interface to the other + # for future use; you will connect this interface to the other # peers' (PEER2) interface. virtual_chain_create_interface_with_ip ${PEER2_NAME} ${PEER2_IP} PEER2_INTERFACE=${RET_INTERFACE} # Connect virtual interface to other interface. Syntax is : *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201105222041.p4MKfAGl089747>