Date: Sat, 6 Apr 2002 20:00:17 -0800 (PST) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 9253 for review Message-ID: <200204070400.g3740HV66402@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9253 Change 9253 by peter@peter_daintree on 2002/04/06 19:59:49 IFC @9252 (some changes merged in) Affected files ... ... //depot/projects/ia64/contrib/sort/init.c#2 integrate ... //depot/projects/ia64/contrib/sort/sort.c#2 integrate ... //depot/projects/ia64/gnu/usr.bin/cc/Makefile#2 integrate ... //depot/projects/ia64/gnu/usr.bin/cc/Makefile.fe#1 branch ... //depot/projects/ia64/gnu/usr.bin/cc/Makefile.tgt#2 integrate ... //depot/projects/ia64/gnu/usr.bin/cc/collect2/Makefile#2 integrate ... //depot/projects/ia64/gnu/usr.bin/gperf/Makefile#3 integrate ... //depot/projects/ia64/gnu/usr.bin/groff/src/devices/grodvi/Makefile#3 integrate ... //depot/projects/ia64/gnu/usr.bin/groff/src/devices/grohtml/Makefile#3 integrate ... //depot/projects/ia64/gnu/usr.bin/groff/src/devices/grolbp/Makefile#3 integrate ... //depot/projects/ia64/gnu/usr.bin/groff/src/devices/grolj4/Makefile#3 integrate ... //depot/projects/ia64/gnu/usr.bin/groff/src/devices/grops/Makefile#3 integrate ... //depot/projects/ia64/gnu/usr.bin/groff/src/devices/grotty/Makefile#3 integrate ... //depot/projects/ia64/gnu/usr.bin/groff/src/preproc/eqn/Makefile#3 integrate ... //depot/projects/ia64/gnu/usr.bin/groff/src/preproc/grn/Makefile#3 integrate ... //depot/projects/ia64/gnu/usr.bin/groff/src/preproc/html/Makefile#3 integrate ... //depot/projects/ia64/gnu/usr.bin/groff/src/preproc/pic/Makefile#3 integrate ... //depot/projects/ia64/gnu/usr.bin/groff/src/preproc/refer/Makefile#3 integrate ... //depot/projects/ia64/gnu/usr.bin/groff/src/preproc/tbl/Makefile#3 integrate ... //depot/projects/ia64/gnu/usr.bin/groff/src/roff/groff/Makefile#3 integrate ... //depot/projects/ia64/gnu/usr.bin/groff/src/roff/troff/Makefile#3 integrate ... //depot/projects/ia64/gnu/usr.bin/groff/src/utils/addftinfo/Makefile#3 integrate ... //depot/projects/ia64/gnu/usr.bin/groff/src/utils/hpftodit/Makefile#3 integrate ... //depot/projects/ia64/gnu/usr.bin/groff/src/utils/indxbib/Makefile#3 integrate ... //depot/projects/ia64/gnu/usr.bin/groff/src/utils/lkbib/Makefile#3 integrate ... //depot/projects/ia64/gnu/usr.bin/groff/src/utils/lookbib/Makefile#3 integrate ... //depot/projects/ia64/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile#3 integrate ... //depot/projects/ia64/gnu/usr.bin/tar/port.h#3 integrate ... //depot/projects/ia64/gnu/usr.bin/tar/prepend_args.c#2 integrate ... //depot/projects/ia64/share/colldef/README#1 branch ... //depot/projects/ia64/share/colldef/cs_CZ.ISO8859-2.src#2 integrate ... //depot/projects/ia64/sys/kern/vfs_aio.c#8 integrate ... //depot/projects/ia64/usr.bin/sed/process.c#5 integrate Differences ... ==== //depot/projects/ia64/contrib/sort/init.c#2 (text+ko) ==== @@ -34,6 +34,8 @@ * LIABILITY, OR TORT (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/contrib/sort/init.c,v 1.2 2002/04/07 00:49:00 ache Exp $ */ #include "sort.h" @@ -127,7 +129,7 @@ int tmp; col = cur_fld->icol.num ? (&(*cur_fld).tcol) : (&(*cur_fld).icol); pos += sscanf(pos, "%d", &(col->num)); - while (isdigit(*pos)) + while (isdigit((u_char)*pos)) pos++; if (col->num <= 0 && !(col->num == 0 && col == &(cur_fld->tcol))) errx(2, "field numbers must be positive"); @@ -136,7 +138,7 @@ errx(2, "cannot indent end of line"); ++pos; pos += sscanf(pos, "%d", &(col->indent)); - while (isdigit(*pos)) + while (isdigit((u_char)*pos)) pos++; if (&cur_fld->icol == col) col->indent--; @@ -243,7 +245,7 @@ argv[i] = vpos; vpos += sprintf(vpos, "-k"); tpos += sscanf(tpos, "%d", &v); - while (isdigit(*tpos)) + while (isdigit((u_char)*tpos)) tpos++; vpos += sprintf(vpos, "%d", v+1); if (*tpos == '.') { @@ -255,16 +257,16 @@ *vpos++ = *tpos++; vpos += sprintf(vpos, ","); if (argv[i+1] && - argv[i+1][0] == '-' && isdigit(argv[i+1][1])) { + argv[i+1][0] == '-' && isdigit((u_char)argv[i+1][1])) { tpos = argv[i+1] + 1; tpos += sscanf(tpos, "%d", &w); - while (isdigit(*tpos)) + while (isdigit((u_char)*tpos)) tpos++; x = 0; if (*tpos == '.') { ++tpos; tpos += sscanf(tpos, "%d", &x); - while (isdigit(*tpos)) + while (isdigit((u_char)*tpos)) tpos++; } if (x) { ==== //depot/projects/ia64/contrib/sort/sort.c#2 (text+ko) ==== @@ -34,6 +34,8 @@ * LIABILITY, OR TORT (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/contrib/sort/sort.c,v 1.2 2002/04/07 00:49:00 ache Exp $ */ /* Sort sorts a file using an optional user-defined key. @@ -46,8 +48,7 @@ #include "pathnames.h" #ifndef lint -__COPYRIGHT("@(#) Copyright (c) 1993\n\ - The Regents of the University of California. All rights reserved.\n"); +__COPYRIGHT("@(#) Copyright (c) 1993 The Regents of the University of California. All rights reserved."); #endif /* not lint */ #ifndef lint @@ -112,8 +113,7 @@ memset(fldtab, 0, (ND+2)*sizeof(struct field)); memset(d_mask, 0, NBINS); - d_mask[REC_D = '\n'] = REC_D_F; - SINGL_FLD = SEP_FLAG = 0; + d_mask[REC_D] = REC_D_F; d_mask['\t'] = d_mask[' '] = BLANK | FLD_D; ftpos = fldtab; many_files(); @@ -172,7 +172,7 @@ case 'R': if (REC_D != '\n') usage("multiple record delimiters"); - if ('\n' == (REC_D = *optarg)) + if ('\n' == (REC_D = (u_char)*optarg)) break; d_mask['\n'] = d_mask[' ']; d_mask[REC_D] = REC_D_F; @@ -252,7 +252,7 @@ } else if (!(ch = access(outpath, 0)) && strncmp(_PATH_DEV, outpath, 5)) { static const struct sigaction act = - { onsignal, {{0}}, SA_RESTART | SA_RESETHAND }; + { { onsignal }, SA_RESTART | SA_RESETHAND, { { 0 } } }; static const int sigtable[] = {SIGHUP, SIGINT, SIGPIPE, SIGXCPU, SIGXFSZ, SIGVTALRM, SIGPROF, 0}; int outfd; ==== //depot/projects/ia64/gnu/usr.bin/cc/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/cc/Makefile,v 1.25 2001/09/10 16:05:39 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/cc/Makefile,v 1.26 2002/04/06 23:12:44 obrien Exp $ # The order of some of these are rather important. Some depend on previous # subdirs. @@ -11,6 +11,9 @@ .if !defined(NO_CXX) SUBDIR+= cc1plus c++ c++filt doc +.if !defined(NO_COLLECT2) +SUBDIR+= collect2 +.endif .endif .if !defined(NO_OBJC) ==== //depot/projects/ia64/gnu/usr.bin/cc/Makefile.tgt#2 (text+ko) ==== @@ -1,1 +1,1 @@ -# $FreeBSD: src/gnu/usr.bin/cc/Makefile.tgt,v 1.1 2002/04/06 22:37:19 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/cc/Makefile.tgt,v 1.2 2002/04/06 23:17:36 obrien Exp $ ==== //depot/projects/ia64/gnu/usr.bin/cc/collect2/Makefile#2 (text+ko) ==== @@ -1,7 +1,30 @@ -# $FreeBSD: src/gnu/usr.bin/cc/collect2/Makefile,v 1.1 2002/04/06 09:35:05 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/cc/collect2/Makefile,v 1.2 2002/04/06 23:12:46 obrien Exp $ .include "../Makefile.inc" .PATH: ${GCCDIR} +PROG= collect2 +SRCS= collect2.c cplus-dem.c tlink.c underscore.c +BINDIR= /usr/libexec +NOMAN= +NOSHARED?=yes + +DPADD+= ${LIBCC_INT} +LDADD+= ${LIBCC_INT} + +CLEANFILES= tmp-dum.c tmp-dum.s underscore.c +underscore.c: Makefile + echo "int xxy_us_dummy;" >tmp-dum.c + ${CC} -S tmp-dum.c + echo '/*WARNING: This file is automatically generated!*/' >underscore.c + if grep _xxy_us_dummy tmp-dum.s > /dev/null ; then \ + echo "int prepends_underscore = 1;" >>underscore.c; \ + else \ + echo "int prepends_underscore = 0;" >>underscore.c; \ + fi + # wrong to do this here, but easiest way out to duplicate gcc.c. + echo "char *xstrerror(int e) { return strerror(e); }" >>underscore.c + rm -f tmp-dum.c tmp-dum.s + .include <bsd.prog.mk> ==== //depot/projects/ia64/gnu/usr.bin/gperf/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/gperf/Makefile,v 1.6 2000/10/13 12:22:47 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/gperf/Makefile,v 1.7 2002/04/07 02:40:52 peter Exp $ GPROFDIR= ${.CURDIR}/../../../contrib/gperf ==== //depot/projects/ia64/gnu/usr.bin/groff/src/devices/grodvi/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/groff/src/devices/grodvi/Makefile,v 1.1 2001/04/17 12:37:03 ru Exp $ +# $FreeBSD: src/gnu/usr.bin/groff/src/devices/grodvi/Makefile,v 1.2 2002/04/07 02:40:52 peter Exp $ PROG= grodvi SRCS= dvi.cc ==== //depot/projects/ia64/gnu/usr.bin/groff/src/devices/grohtml/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/groff/src/devices/grohtml/Makefile,v 1.1 2001/04/17 12:37:03 ru Exp $ +# $FreeBSD: src/gnu/usr.bin/groff/src/devices/grohtml/Makefile,v 1.2 2002/04/07 02:40:52 peter Exp $ PROG= post-grohtml SRCS= post-html.cc html-text.cc output.cc ==== //depot/projects/ia64/gnu/usr.bin/groff/src/devices/grolbp/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/groff/src/devices/grolbp/Makefile,v 1.1 2001/04/17 12:37:03 ru Exp $ +# $FreeBSD: src/gnu/usr.bin/groff/src/devices/grolbp/Makefile,v 1.2 2002/04/07 02:40:52 peter Exp $ PROG= grolbp SRCS= lbp.cc ==== //depot/projects/ia64/gnu/usr.bin/groff/src/devices/grolj4/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/groff/src/devices/grolj4/Makefile,v 1.1 2001/04/17 12:37:04 ru Exp $ +# $FreeBSD: src/gnu/usr.bin/groff/src/devices/grolj4/Makefile,v 1.2 2002/04/07 02:40:52 peter Exp $ PROG= grolj4 SRCS= lj4.cc ==== //depot/projects/ia64/gnu/usr.bin/groff/src/devices/grops/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/groff/src/devices/grops/Makefile,v 1.1 2001/04/17 12:37:04 ru Exp $ +# $FreeBSD: src/gnu/usr.bin/groff/src/devices/grops/Makefile,v 1.2 2002/04/07 02:40:53 peter Exp $ PROG= grops SRCS= ps.cc psrm.cc ==== //depot/projects/ia64/gnu/usr.bin/groff/src/devices/grotty/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/groff/src/devices/grotty/Makefile,v 1.1 2001/04/17 12:37:04 ru Exp $ +# $FreeBSD: src/gnu/usr.bin/groff/src/devices/grotty/Makefile,v 1.2 2002/04/07 02:40:53 peter Exp $ PROG= grotty SRCS= tty.cc ==== //depot/projects/ia64/gnu/usr.bin/groff/src/preproc/eqn/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/groff/src/preproc/eqn/Makefile,v 1.1 2001/04/17 12:37:10 ru Exp $ +# $FreeBSD: src/gnu/usr.bin/groff/src/preproc/eqn/Makefile,v 1.2 2002/04/07 02:40:53 peter Exp $ PROG= eqn SRCS= eqn.cc eqn_tab.h main.cc lex.cc \ ==== //depot/projects/ia64/gnu/usr.bin/groff/src/preproc/grn/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/groff/src/preproc/grn/Makefile,v 1.1 2001/04/17 12:37:10 ru Exp $ +# $FreeBSD: src/gnu/usr.bin/groff/src/preproc/grn/Makefile,v 1.2 2002/04/07 02:40:53 peter Exp $ PROG= grn SRCS= hdb.cc hpoint.cc hgraph.cc main.cc ==== //depot/projects/ia64/gnu/usr.bin/groff/src/preproc/html/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/groff/src/preproc/html/Makefile,v 1.1 2001/04/17 12:37:10 ru Exp $ +# $FreeBSD: src/gnu/usr.bin/groff/src/preproc/html/Makefile,v 1.2 2002/04/07 02:40:53 peter Exp $ PROG= pre-grohtml SRCS= pre-html.cc pushbackbuffer.cc ==== //depot/projects/ia64/gnu/usr.bin/groff/src/preproc/pic/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/groff/src/preproc/pic/Makefile,v 1.1 2001/04/17 12:37:10 ru Exp $ +# $FreeBSD: src/gnu/usr.bin/groff/src/preproc/pic/Makefile,v 1.2 2002/04/07 02:40:53 peter Exp $ PROG= pic SRCS= lex.cc main.cc object.cc pic.cc pic_tab.h \ ==== //depot/projects/ia64/gnu/usr.bin/groff/src/preproc/refer/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/groff/src/preproc/refer/Makefile,v 1.1 2001/04/17 12:37:11 ru Exp $ +# $FreeBSD: src/gnu/usr.bin/groff/src/preproc/refer/Makefile,v 1.2 2002/04/07 02:40:53 peter Exp $ PROG= refer SRCS= command.cc label.cc ref.cc refer.cc token.cc ==== //depot/projects/ia64/gnu/usr.bin/groff/src/preproc/tbl/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/groff/src/preproc/tbl/Makefile,v 1.1 2001/04/17 12:37:11 ru Exp $ +# $FreeBSD: src/gnu/usr.bin/groff/src/preproc/tbl/Makefile,v 1.2 2002/04/07 02:40:54 peter Exp $ PROG= tbl SRCS= main.cc table.cc ==== //depot/projects/ia64/gnu/usr.bin/groff/src/roff/groff/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/groff/src/roff/groff/Makefile,v 1.1 2001/04/17 12:37:12 ru Exp $ +# $FreeBSD: src/gnu/usr.bin/groff/src/roff/groff/Makefile,v 1.2 2002/04/07 02:40:54 peter Exp $ PROG= groff SRCS= groff.cc pipeline.c ==== //depot/projects/ia64/gnu/usr.bin/groff/src/roff/troff/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/groff/src/roff/troff/Makefile,v 1.1 2001/04/17 12:37:15 ru Exp $ +# $FreeBSD: src/gnu/usr.bin/groff/src/roff/troff/Makefile,v 1.2 2002/04/07 02:40:54 peter Exp $ PROG= troff SRCS= env.cc node.cc input.cc div.cc symbol.cc dictionary.cc reg.cc \ ==== //depot/projects/ia64/gnu/usr.bin/groff/src/utils/addftinfo/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/groff/src/utils/addftinfo/Makefile,v 1.1 2001/04/17 12:37:15 ru Exp $ +# $FreeBSD: src/gnu/usr.bin/groff/src/utils/addftinfo/Makefile,v 1.2 2002/04/07 02:40:54 peter Exp $ PROG= addftinfo SRCS= addftinfo.cc guess.cc ==== //depot/projects/ia64/gnu/usr.bin/groff/src/utils/hpftodit/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/groff/src/utils/hpftodit/Makefile,v 1.1 2001/04/17 12:37:16 ru Exp $ +# $FreeBSD: src/gnu/usr.bin/groff/src/utils/hpftodit/Makefile,v 1.2 2002/04/07 02:40:54 peter Exp $ PROG= hpftodit SRCS= hpftodit.cc ==== //depot/projects/ia64/gnu/usr.bin/groff/src/utils/indxbib/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/groff/src/utils/indxbib/Makefile,v 1.2 2001/07/10 17:15:52 ru Exp $ +# $FreeBSD: src/gnu/usr.bin/groff/src/utils/indxbib/Makefile,v 1.3 2002/04/07 02:40:54 peter Exp $ PROG= indxbib SRCS= indxbib.cc signal.c ==== //depot/projects/ia64/gnu/usr.bin/groff/src/utils/lkbib/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/groff/src/utils/lkbib/Makefile,v 1.1 2001/04/17 12:37:16 ru Exp $ +# $FreeBSD: src/gnu/usr.bin/groff/src/utils/lkbib/Makefile,v 1.2 2002/04/07 02:40:54 peter Exp $ PROG= lkbib SRCS= lkbib.cc ==== //depot/projects/ia64/gnu/usr.bin/groff/src/utils/lookbib/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/groff/src/utils/lookbib/Makefile,v 1.1 2001/04/17 12:37:17 ru Exp $ +# $FreeBSD: src/gnu/usr.bin/groff/src/utils/lookbib/Makefile,v 1.2 2002/04/07 02:40:55 peter Exp $ PROG= lookbib SRCS= lookbib.cc ==== //depot/projects/ia64/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile,v 1.1 2001/04/17 12:37:17 ru Exp $ +# $FreeBSD: src/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile,v 1.2 2002/04/07 02:40:55 peter Exp $ PROG= tfmtodit SRCS= tfmtodit.cc ==== //depot/projects/ia64/gnu/usr.bin/tar/port.h#3 (text+ko) ==== @@ -17,6 +17,8 @@ along with GNU Tar; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ +/* $FreeBSD: src/gnu/usr.bin/tar/port.h,v 1.2 2002/04/07 01:44:24 peter Exp $ */ + /* AIX requires this to be the first thing in the file. */ #ifdef __GNUC__ #define alloca __builtin_alloca @@ -119,9 +121,9 @@ char *malloc (), *realloc (); char *getenv (); #endif -PTR ck_malloc(); -PTR ck_realloc(); -char *xmalloc(); +PTR ck_malloc (); +PTR ck_realloc (); +char *xmalloc (); #ifndef _POSIX_VERSION #ifdef __MSDOS__ ==== //depot/projects/ia64/gnu/usr.bin/tar/prepend_args.c#2 (text+ko) ==== @@ -16,7 +16,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $FreeBSD: src/gnu/usr.bin/tar/prepend_args.c,v 1.1 2000/12/24 10:52:23 obrien Exp $ */ +/* $FreeBSD: src/gnu/usr.bin/tar/prepend_args.c,v 1.2 2002/04/07 01:44:24 peter Exp $ */ #ifdef HAVE_CONFIG_H @@ -24,6 +24,7 @@ #endif #include <sys/param.h> #include "prepend_args.h" +#include "port.h" /* Find the white-space-separated options specified by OPTIONS, and ==== //depot/projects/ia64/share/colldef/cs_CZ.ISO8859-2.src#2 (text+ko) ==== @@ -1,52 +1,42 @@ # Latin2 (for Czech; partially according to CSN 97 6030) # by Rudolf Cejka <cejkar@dcse.fee.vutbr.cz> # -# $FreeBSD: src/share/colldef/cs_CZ.ISO8859-2.src,v 1.2 2001/06/10 13:43:47 ache Exp $ +# $FreeBSD: src/share/colldef/cs_CZ.ISO8859-2.src,v 1.3 2002/04/07 02:52:11 ache Exp $ # charmap map.ISO8859-2 substitute <ss> with "ss" order \ -# spaces - <SP>;<NS>;\ -# capital and small - (A,a,<A'>,<a'>,<A/>>,<a/>>,<A(>,<a(>,<A:>,<a:>,<A;>,<a;>);\ - (B,b);\ - (C,c,<C'>,<c'>,<C,>,<c,>);\ - (<C<>,<c<>);\ - (D,d,<D<>,<d<>,<D//>,<d//>);\ - (E,e,<E'>,<e'>,<E<>,<e<>,<E:>,<e:>,<E;>,<e;>);\ - (F,f);\ - (G,g);\ - (H,h);\ - (CH,Ch,ch);\ - (I,i,<I'>,<i'>,<I/>>,<i/>>);\ - (J,j);\ - (K,k);\ - (L,l,<L'>,<l'>,<L<>,<l<>,<L//>,<l//>);\ - (M,m);\ - (N,n,<N'>,<n'>,<N<>,<n<>);\ - (O,o,<O'>,<o'>,<O/>>,<o/>>,<O:>,<o:>,<O">,<o">);\ - (P,p);\ - (Q,q);\ - (R,r,<R'>,<r'>);\ - (<R<>,<r<>);\ - (S,s,<S'>,<s'>,<S,>,<s,>);\ - (<S<>,<s<>);\ - (T,t,<T<>,<t<>,<T,>,<t,>);\ - (U,u,<U'>,<u'>,<U0>,<u0>,<U:>,<u:>,<U">,<u">);\ - (V,v);\ - (W,w);\ - (X,x);\ - (Y,y,<Y'>,<y'>);\ - (Z,z,<Z.>,<z.>,<Z'>,<z'>);\ - (<Z<>,<z<>);\ +# controls + <NU>;...;<US>;<PA>;...;<AC>;\ +# + <NS>;<SP>;!;\";<Nb>;\ + <Cu>;<DO>;\ + %;&;<',>;<';>;';\(;\);*;+;<-:>;<*X>;\,;<-->;-;.;<'.>;/;\ # digits 0;...;9;\ -# symbols - .;\,;\;;?;!;:;';`;\";\ - <-->;-;|;/;\\;\(;\);[;];\<;>;\{;\};\ - &;<SE>;%;<DO>;<At>;\ - _;=;^;<-:>;+;<*X>;*;<Nb>;~;<DG>;<Cu>;\ - <'.>;<''>;<'<>;<'(>;<':>;<'">;<',>;<';>;\ -# controls - <NU>;...;<US>;<DT>;<PA>;...;<AC> +# + :;\;;\<;=;>;?;<SE>;<At>;\ +# capital + (A,<A'>,<A/>>,<A(>,<A:>,<A;>);\ + B;(C,<C'>,<C,>,<C<>);(D,<D<>,<D//>);(E,<E'>,<E<>,<E:>,<E;>);\ + F;G;H;\ + {CH,Ch};\ + (I,<I'>,<I/>>);\ + J;K;(L,<L'>,<L<>,<L//>);M;(N,<N'>,<N<>);(O,<O'>,<O/>>,<O:>,<O">);\ + P;Q;(R,<R'>,<R<>);(S,<S'>,<S,>,<S<>);(T,<T<>,<T,>);\ + (U,<U'>,<U0>,<U:>,<U">);\ + V;W;X;(Y,<Y'>);(Z,<Z.>,<Z'>,<Z<>);\ +# + [;\\;];^;<':>;<'">;<'<>;<'(>;_;<''>;`;\ +# small + (a,<a'>,<a/>>,<a(>,<a:>,<a;>);\ + b;(c,<c'>,<c,>,<c<>);(d,<d<>,<d//>);(e,<e'>,<e<>,<e:>,<e;>);\ + f;g;h;\ + ch;\ + (i,<i'>,<i/>>);\ + j;k;(l,<l'>,<l<>,<l//>);m;(n,<n'>,<n<>);(o,<o'>,<o/>>,<o:>,<o">);\ + p;q;(r,<r'>,<r<>);(s,<s'>,<s,>,<s<>);(t,<t<>,<t,>);\ + (u,<u'>,<u0>,<u:>,<u">);\ + v;w;x;(y,<y'>);(z,<z.>,<z'>,<z<>);\ +# + \{;|;\};~;<DG>;<DT> ==== //depot/projects/ia64/sys/kern/vfs_aio.c#8 (text+ko) ==== @@ -13,7 +13,7 @@ * bad that happens because of using this software isn't the responsibility * of the author. This software is distributed AS-IS. * - * $FreeBSD: src/sys/kern/vfs_aio.c,v 1.121 2002/04/04 02:13:20 alc Exp $ + * $FreeBSD: src/sys/kern/vfs_aio.c,v 1.122 2002/04/07 01:28:34 alc Exp $ */ /* @@ -1594,7 +1594,7 @@ { struct proc *p = td->td_proc; int s; - int jobref; + long jobref; struct aiocblist *cb, *ncb; struct aiocb *ujob; struct kaioinfo *ki; @@ -1664,7 +1664,7 @@ int i; int njoblist; int error, s, timo; - int *ijoblist; + long *ijoblist; struct aiocb **ujoblist; if (uap->nent > AIO_LISTIO_MAX) @@ -1890,7 +1890,7 @@ int s; struct aiocblist *cb; struct kaioinfo *ki; - int jobref; + long jobref; ki = p->p_aioinfo; if (ki == NULL) ==== //depot/projects/ia64/usr.bin/sed/process.c#5 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/usr.bin/sed/process.c,v 1.14 2002/04/05 05:40:20 jmallett Exp $"); +__FBSDID("$FreeBSD: src/usr.bin/sed/process.c,v 1.15 2002/04/07 02:29:56 jmallett Exp $"); #ifndef lint static const char sccsid[] = "@(#)process.c 8.6 (Berkeley) 4/20/94"; @@ -136,7 +136,8 @@ case 'D': if (pd) goto new; - if ((p = memchr(ps, '\n', psl - 1)) == NULL) { + if (psl == 0 || + (p = memchr(ps, '\n', psl - 1)) == NULL) { pd = 1; goto new; } else { @@ -188,7 +189,8 @@ case 'P': if (pd) break; - if ((p = memchr(ps, '\n', psl - 1)) != NULL) { + if (psl != 0 && + (p = memchr(ps, '\n', psl - 1)) != NULL) { oldpsl = psl; psl = (p + 1) - ps; } @@ -240,7 +242,7 @@ HS = tspace; break; case 'y': - if (pd) + if (pd || psl == 0) break; for (p = ps, len = psl; --len; ++p) *p = cp->u.y[(unsigned char)*p]; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200204070400.g3740HV66402>