Date: Mon, 16 May 2011 03:41:48 GMT From: Matt Jacob <mjacob@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 193219 for review Message-ID: <201105160341.p4G3fm5X007326@skunkworks.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/@@193219?ac=10 Change 193219 by mjacob@mjacob-sandbox on 2011/05/16 03:41:41 IFC Affected files ... .. //depot/projects/mjacob-dev/MAINTAINERS#4 integrate .. //depot/projects/mjacob-dev/bin/sh/eval.c#5 integrate .. //depot/projects/mjacob-dev/bin/sh/miscbltin.c#2 integrate .. //depot/projects/mjacob-dev/bin/sh/var.c#5 integrate .. //depot/projects/mjacob-dev/games/fortune/datfiles/fortunes#3 integrate .. //depot/projects/mjacob-dev/games/fortune/datfiles/fortunes-o.real#3 integrate .. //depot/projects/mjacob-dev/games/fortune/datfiles/fortunes-o.sp.ok#2 integrate .. //depot/projects/mjacob-dev/games/fortune/datfiles/fortunes.sp.ok#2 integrate .. //depot/projects/mjacob-dev/games/fortune/datfiles/freebsd-tips.sp.ok#2 integrate .. //depot/projects/mjacob-dev/games/fortune/datfiles/gerrold.limerick#2 integrate .. //depot/projects/mjacob-dev/games/fortune/datfiles/limerick#2 integrate .. //depot/projects/mjacob-dev/games/fortune/datfiles/limerick.sp.ok#2 integrate .. //depot/projects/mjacob-dev/games/fortune/datfiles/startrek.sp.ok#2 integrate .. //depot/projects/mjacob-dev/games/fortune/datfiles/zippy.sp.ok#2 integrate .. //depot/projects/mjacob-dev/games/morse/morse.c#2 integrate .. //depot/projects/mjacob-dev/lib/libprocstat/Makefile#2 integrate .. //depot/projects/mjacob-dev/lib/libprocstat/Symbol.map#1 branch .. //depot/projects/mjacob-dev/lib/libprocstat/Versions.def#1 branch .. //depot/projects/mjacob-dev/lib/libprocstat/libprocstat.c#2 integrate .. //depot/projects/mjacob-dev/sbin/geom/class/part/geom_part.c#5 integrate .. //depot/projects/mjacob-dev/sbin/ifconfig/ifmedia.c#3 integrate .. //depot/projects/mjacob-dev/share/man/man4/hpet.4#2 integrate .. //depot/projects/mjacob-dev/share/man/man4/man4.i386/Makefile#2 integrate .. //depot/projects/mjacob-dev/share/man/man4/man4.i386/glxiic.4#1 branch .. //depot/projects/mjacob-dev/sys/conf/files.i386#5 integrate .. //depot/projects/mjacob-dev/sys/dev/ath/ath_hal/ar5416/ar5416_cal.c#6 integrate .. //depot/projects/mjacob-dev/sys/dev/ath/if_ath.c#7 integrate .. //depot/projects/mjacob-dev/sys/dev/ath/if_ath_sysctl.c#3 integrate .. //depot/projects/mjacob-dev/sys/dev/ath/if_athioctl.h#5 integrate .. //depot/projects/mjacob-dev/sys/dev/bge/if_bge.c#5 integrate .. //depot/projects/mjacob-dev/sys/dev/cxgbe/t4_sge.c#4 integrate .. //depot/projects/mjacob-dev/sys/dev/glxiic/glxiic.c#1 branch .. //depot/projects/mjacob-dev/sys/dev/iwn/if_iwn.c#5 integrate .. //depot/projects/mjacob-dev/sys/dev/mii/mii.c#3 integrate .. //depot/projects/mjacob-dev/sys/dev/mk48txx/mk48txx.c#2 integrate .. //depot/projects/mjacob-dev/sys/dev/mk48txx/mk48txxreg.h#2 integrate .. //depot/projects/mjacob-dev/sys/dev/scc/scc_bfe_ebus.c#2 integrate .. //depot/projects/mjacob-dev/sys/dev/uart/uart_cpu_sparc64.c#2 integrate .. //depot/projects/mjacob-dev/sys/fs/nfs/nfs_commonkrpc.c#3 integrate .. //depot/projects/mjacob-dev/sys/fs/nfs/nfs_commonport.c#4 integrate .. //depot/projects/mjacob-dev/sys/fs/nfsclient/nfs_clkrpc.c#2 integrate .. //depot/projects/mjacob-dev/sys/fs/nfsclient/nfs_clnfsiod.c#3 integrate .. //depot/projects/mjacob-dev/sys/fs/nfsclient/nfs_clsubs.c#4 integrate .. //depot/projects/mjacob-dev/sys/fs/nfsclient/nfs_clvfsops.c#6 integrate .. //depot/projects/mjacob-dev/sys/fs/nfsclient/nfs_clvnops.c#4 integrate .. //depot/projects/mjacob-dev/sys/geom/eli/g_eli_key_cache.c#2 integrate .. //depot/projects/mjacob-dev/sys/geom/part/g_part.c#5 integrate .. //depot/projects/mjacob-dev/sys/i386/conf/NOTES#3 integrate .. //depot/projects/mjacob-dev/sys/modules/Makefile#6 integrate .. //depot/projects/mjacob-dev/sys/modules/glxiic/Makefile#1 branch .. //depot/projects/mjacob-dev/sys/net/if_media.h#3 integrate .. //depot/projects/mjacob-dev/sys/netinet/sctp_output.c#6 integrate .. //depot/projects/mjacob-dev/sys/netinet/sctp_output.h#4 integrate .. //depot/projects/mjacob-dev/sys/nfs/nfs_common.c#2 integrate .. //depot/projects/mjacob-dev/sys/nfsclient/nfs_krpc.c#2 integrate .. //depot/projects/mjacob-dev/sys/nfsclient/nfs_nfsiod.c#2 integrate .. //depot/projects/mjacob-dev/sys/nfsclient/nfs_subs.c#4 integrate .. //depot/projects/mjacob-dev/sys/nfsclient/nfs_vfsops.c#5 integrate .. //depot/projects/mjacob-dev/sys/nfsclient/nfs_vnops.c#3 integrate .. //depot/projects/mjacob-dev/sys/sparc64/sparc64/eeprom.c#2 integrate .. //depot/projects/mjacob-dev/usr.bin/nfsstat/nfsstat.c#5 integrate .. //depot/projects/mjacob-dev/usr.sbin/nfsd/nfsv4.4#3 integrate Differences ... ==== //depot/projects/mjacob-dev/MAINTAINERS#4 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.164 2011/03/14 22:42:41 davidch Exp $ +$FreeBSD: src/MAINTAINERS,v 1.165 2011/05/14 17:44:12 cperciva Exp $ Please note that the content of this file is strictly advisory. No locks listed here are valid. The only strict review requirements @@ -108,7 +108,7 @@ bs{diff,patch} cperciva Pre-commit review requested. portsnap cperciva Pre-commit review requested. freebsd-update cperciva Pre-commit review requested. -openssl - No non-upstream commits should be done. +openssl benl Pre-commit review requested. sys/netgraph/bluetooth emax Pre-commit review preferred. lib/libbluetooth emax Pre-commit review preferred. lib/libsdp emax Pre-commit review preferred. ==== //depot/projects/mjacob-dev/bin/sh/eval.c#5 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.103 2011/04/25 20:54:12 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.104 2011/05/15 17:00:43 jilles Exp $"); #include <paths.h> #include <signal.h> @@ -552,7 +552,8 @@ if (prevfd >= 0) close(prevfd); prevfd = pip[0]; - close(pip[1]); + if (pip[1] != -1) + close(pip[1]); } INTON; if (n->npipe.backgnd == 0) { ==== //depot/projects/mjacob-dev/bin/sh/miscbltin.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sh/miscbltin.c,v 1.44 2010/11/23 22:17:39 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/miscbltin.c,v 1.45 2011/05/15 22:09:27 jilles Exp $"); /* * Miscellaneous builtins. @@ -465,7 +465,7 @@ "(-%c) ", l->option); out1fmt("%-18s %18s ", l->name, optbuf); if (val == RLIM_INFINITY) - out1fmt("unlimited\n"); + out1str("unlimited\n"); else { val /= l->factor; @@ -491,7 +491,7 @@ val = limit.rlim_max; if (val == RLIM_INFINITY) - out1fmt("unlimited\n"); + out1str("unlimited\n"); else { val /= l->factor; ==== //depot/projects/mjacob-dev/bin/sh/var.c#5 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sh/var.c,v 1.59 2011/05/08 17:40:10 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/var.c,v 1.60 2011/05/15 22:09:27 jilles Exp $"); #include <unistd.h> #include <stdlib.h> @@ -681,14 +681,13 @@ out1str(cmdname); out1c(' '); } - p = strchr(vp->text, '='); if (values && !(vp->flags & VUNSET)) { - p++; - outbin(vp->text, p - vp->text, - out1); - out1qstr(p); + outbin(vp->text, + vp->name_len + 1, out1); + out1qstr(vp->text + + vp->name_len + 1); } else - outbin(vp->text, p - vp->text, + outbin(vp->text, vp->name_len, out1); out1c('\n'); } ==== //depot/projects/mjacob-dev/games/fortune/datfiles/fortunes#3 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.292 2011/02/13 18:18:56 brucec Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.293 2011/05/14 19:03:45 uqs Exp $ % ======================================================================= || || @@ -10494,13 +10494,13 @@ Antonio Antonio Was tired of living alonio He thought he would woo Antonio Antonio -Miss Lucamy Lu, Rode of on his polo ponio +Miss Lucamy Lu, Rode off on his polo ponio Miss Lucamy Lucy Molonio. And found the maid In a bowery shade, Sitting and knitting alonio. Antonio Antonio Said if you will be my ownio -I'll love tou true Oh nonio Antonio +I'll love you true Oh nonio Antonio And buy for you You're far too bleak and bonio An icery creamry conio. And all that I wish You singular fish @@ -10509,7 +10509,7 @@ Uttered a dismal moanio And went off and hid Or I'm told that he did -In the Antartical Zonio. +In the Antarctical Zonio. % Antonym, n.: The opposite of the word you're trying to think of. @@ -20232,7 +20232,7 @@ Goodbye, cool world. % Goose pimples rose all over me, my hair stood on end, my eyes filled with -tears of love and gratitude for this greatest of all conquerers of human +tears of love and gratitude for this greatest of all conquerors of human misery and shame, and my breath came in little gasps. If I had not known that the Leader would have scorned such adulation, I might have fallen to my knees in unashamed worship, but instead I drew myself to attention, raised @@ -25099,7 +25099,7 @@ enlightenment % IBM: - [Internation Business Machines Corp.] Also known as Itty Bitty + [International Business Machines Corp.] Also known as Itty Bitty Machines or The Lawyer's Friend. The dominant force in computer marketing, having supplied worldwide some 75% of all known hardware and 10% of all software. To protect itself from the litigious envy ==== //depot/projects/mjacob-dev/games/fortune/datfiles/fortunes-o.real#3 (text+ko) ==== @@ -1,4 +1,4 @@ -%% $FreeBSD: src/games/fortune/datfiles/fortunes-o.real,v 1.38 2011/02/13 18:18:56 brucec Exp $ +%% $FreeBSD: src/games/fortune/datfiles/fortunes-o.real,v 1.39 2011/05/14 19:03:45 uqs Exp $ % PLAYGIRL, Inc. Philadelphia, Pa. 19369 @@ -7722,7 +7722,7 @@ I was lewd, but my God! she was lewder. She said it was crude To be wooed in the nude-- -I persued her, subdued her, and screwed her! +I pursued her, subdued her, and screwed her! % I would like to say, Mister Bunce, I'm a great connoisseur of hot cunts. @@ -9044,7 +9044,7 @@ distant neighbors about the tragedy, a few of them reported that the only stranger they had seen in the area for weeks was a tall desperado wearing a black hat and a red neckerchief. - The cowboy saddled his fastest horse and set out to find the villian. + The cowboy saddled his fastest horse and set out to find the villain. He searched for months but couldn't catch up with the culprit; in town after dusty town he was told that a man fitting the description had been there but had just departed; usually after some heinous crime. ==== //depot/projects/mjacob-dev/games/fortune/datfiles/fortunes-o.sp.ok#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/games/fortune/datfiles/fortunes-o.sp.ok,v 1.3 2007/12/09 01:00:11 dougb Exp $ +# $FreeBSD: src/games/fortune/datfiles/fortunes-o.sp.ok,v 1.4 2011/05/14 19:03:45 uqs Exp $ a'plucking AAAaaeeeeeeeeeiiiiiiiii Aaah @@ -1121,7 +1121,6 @@ penis pere Perelman -persued pestes Peteer Pettigrew @@ -1600,7 +1599,6 @@ vici Vida vidi -villian virginem Visme viziti ==== //depot/projects/mjacob-dev/games/fortune/datfiles/fortunes.sp.ok#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/games/fortune/datfiles/fortunes.sp.ok,v 1.11 2010/03/31 18:21:25 uqs Exp $ +# $FreeBSD: src/games/fortune/datfiles/fortunes.sp.ok,v 1.12 2011/05/14 19:03:45 uqs Exp $ AAAAAAAAAaaaaaaaaaaaaaaaccccccccckkkkkk AAAARRRRGGGGHHHH aafte @@ -139,7 +139,6 @@ ANRS Ansley answerback -Antartic Anthony's Antonym Antrim @@ -375,7 +374,6 @@ Besicovitch Beslove Betazoid -bethumped Bette Bevan BEW @@ -468,7 +466,6 @@ bookaholic Booker's boola -Boorchi Boorstin bootable Boothe @@ -576,7 +573,6 @@ bumperless Bumstead Bungei -BURBULATION Buren Burggoven burgled @@ -623,7 +619,6 @@ Callahan's Callimachus Camden -Camelia Cameron Camillo Campbell @@ -771,7 +766,6 @@ Churchy Chuzzlewit CI -Cianci Ciardi cinched cinema's @@ -806,7 +800,6 @@ cockamamie Cocteau Cody -Cody's Coevolution cogito Cohen's @@ -826,7 +819,6 @@ Commedia Commie CommUNIXque -compuberty computatis Computerdom computerites @@ -1077,8 +1069,6 @@ DMPK Dobb's Dobbs -doberman -doberperson Dobie Doc Docquier @@ -1203,7 +1193,6 @@ Einstein's Eisley Elbert -ELBONICS Eldridge electrocommunications Electrocution @@ -1264,7 +1253,6 @@ Escher esperantisto Esplandian -Esser est estas Estes @@ -1293,7 +1281,6 @@ exhibitionists EXP expatriated -extemporanea extracurricular Exupery Exxon's @@ -1301,7 +1288,6 @@ Eyquem Ezrin FAA -FACISM Factorials Fadiman Fafhrd @@ -1340,7 +1326,6 @@ Felton feminism's Femme -FENDERBERG Fenelon Fenster Ferber @@ -1369,7 +1354,6 @@ fiks filees filename -Filgoer's filigrees Filkharmonics Fillmore @@ -1398,7 +1382,6 @@ Flandry Flannagan's Flannery -FLANNISTER Flappity flatfoot flatteries @@ -1410,7 +1393,6 @@ floppity Florio floss -flouride Flugg's Flummery flutterby @@ -1557,7 +1539,6 @@ Genderplex Genesereth Genghis -genlock genocide Genter Geritol @@ -1605,7 +1586,6 @@ Glanvill Glaser gleekzorp -GLEEMITES Glegg gleknow Glib's @@ -2013,7 +1993,6 @@ ifthen Igmmlptk Ignatowski -ignisecond ihuxw IIc III's @@ -2498,7 +2477,6 @@ Lowells Lowery's Lowes -Lownes LP LPA LSD @@ -2534,7 +2512,6 @@ Mabbitt Mabley Macaroons -MacBeth Maccius MacDowell MacDuff @@ -2621,7 +2598,6 @@ Maud Maud'Dib Maugham -Maughm Maupin Maureens Maurois @@ -2630,7 +2606,6 @@ Maxson May's Mayorga -Mårten MBAs MBH MC @@ -2687,7 +2662,6 @@ mendicants Mengot Menninger -Mensa Menschen Meow meowing @@ -2715,7 +2689,6 @@ microchips Microcomputing micrometric -Microsystem's Microsystems MicroVAXes midgets @@ -2730,7 +2703,6 @@ Milkbone Millay Milligan -millihelen Millikan Millikan's millions @@ -2763,7 +2735,6 @@ Mitgong mittengrabben mitts -mittsquinter MITZIE Mix's Miyamoto @@ -2779,7 +2750,6 @@ Modula Moebius Mohandas -Mohandis mohmen Moishe Molander @@ -2803,7 +2773,6 @@ moonshiner's Moore's mopeds -mophobia Moping moralists Mordecai @@ -2832,7 +2801,6 @@ MTA Muad'dib muckest -mucklucks Mudgeeraba Mudhead mudslide @@ -2888,7 +2856,6 @@ nanometers Nansen Napoleon's -narcolepulacyi Narnia Nasium's Naso @@ -2909,7 +2876,6 @@ Nebuchadnezzar Nebuchadnezzar's necesas -necessitious NecroSoft Nehru Neil's @@ -2940,7 +2906,6 @@ NFL Ngdanga Niagra -Niccoli Nicklaus Nicol Nicolaides @@ -3165,7 +3130,6 @@ PECCATOPHOBIA Pecor's Pedaeration -pediddel Peers's Pegler pelted @@ -3192,7 +3156,6 @@ Petaluma Petersons Petr -petribar Petronius Pfeiffer Pfffttt @@ -3204,7 +3167,6 @@ philogyny phoney Phooey -phosflink Picadilly Pickard Pickle's @@ -3246,7 +3208,6 @@ Pocatello Podunk Pohl's -Poincair Poincare's pointy Polanski @@ -3347,7 +3308,6 @@ punchline punning PUPs -PURPITATION Purshottam PUSHes pushy @@ -3551,7 +3511,6 @@ Sacher's Sadat Saddam -sadoequinecrophilia Saens Safford Safire's @@ -3605,7 +3564,6 @@ Schieffer schisms schizophrenics -schlattwhapper schlichte schluerfen Schmendrick @@ -3631,7 +3589,6 @@ Scott's Scoville SCRBL -SCRIBLINE Scrubb scullery scurries @@ -3784,7 +3741,6 @@ something's Sondheim Sooooo -Soren Sorhed sort've sorta @@ -3799,7 +3755,6 @@ Spacemen Spaceport spacewar -SPAGMUMPS spake Spam spank @@ -3824,7 +3779,6 @@ Springsteen sprites SPSW -SQUATCHO squaws squealers squrooneg @@ -3980,7 +3934,6 @@ telematic telepath teleportation -TELEPRESSION telepsychology tempfile tendrils @@ -4028,7 +3981,6 @@ Tirith tis Tiselius -Titas tites TLC TM @@ -4060,7 +4012,6 @@ Tourbillon Toven trans -transcendant transmogrifiers trapezes Traub @@ -4121,7 +4072,6 @@ tyg typefaces Tyroon -tzu Ubi UDA Udall's @@ -4152,7 +4102,6 @@ untechnician unvoist Updike -upharsen uponst Urey Urho ==== //depot/projects/mjacob-dev/games/fortune/datfiles/freebsd-tips.sp.ok#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/games/fortune/datfiles/freebsd-tips.sp.ok,v 1.1 2007/12/07 22:27:04 dougb Exp $ +# $FreeBSD: src/games/fortune/datfiles/freebsd-tips.sp.ok,v 1.2 2011/05/14 19:03:45 uqs Exp $ aliasname allscreens AUTH @@ -45,7 +45,6 @@ natserv ncal netcat -netscape netstat newfile NICs ==== //depot/projects/mjacob-dev/games/fortune/datfiles/gerrold.limerick#2 (text+ko) ==== @@ -1,9 +1,9 @@ -%% $FreeBSD: src/games/fortune/datfiles/gerrold.limerick,v 1.6 2007/12/31 18:38:32 dougb Exp $ +%% $FreeBSD: src/games/fortune/datfiles/gerrold.limerick,v 1.7 2011/05/14 19:03:54 uqs Exp $ %% From The War Against The Chtorr, %% Copyright David Gerrold, 1984-2000, all rights reserved, %% used with permission of the author. %% -%%© This is the copyright line. +%%© This is the copyright line. %%Eighty-nine is the year we assign. %% These verses are caroled %% by one David Gerrold. ==== //depot/projects/mjacob-dev/games/fortune/datfiles/limerick#2 (text+ko) ==== @@ -1,4 +1,4 @@ -%% $FreeBSD: src/games/fortune/datfiles/limerick,v 1.16 2010/03/31 18:21:25 uqs Exp $ +%% $FreeBSD: src/games/fortune/datfiles/limerick,v 1.17 2011/05/14 19:03:45 uqs Exp $ % A bad little girl in Madrid, A most reprehensible kid, @@ -260,7 +260,7 @@ % A dulcet-voiced callgirl named Shedd, Who's cultured, well-spoken, well-bred, - Had achieved some reknown + Had achieved some renown For her tone going down-- There's a nice civil tongue in her head. % @@ -307,7 +307,7 @@ By bleeding all over his face. % A gay young prince from Morocco -Made love in a manner rococco. +Made love in a manner rococo. He painted his penis To resemble a Venus And flavored his semen with cocoa. ==== //depot/projects/mjacob-dev/games/fortune/datfiles/limerick.sp.ok#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/games/fortune/datfiles/limerick.sp.ok,v 1.1 2007/12/07 22:27:04 dougb Exp $ +# $FreeBSD: src/games/fortune/datfiles/limerick.sp.ok,v 1.2 2011/05/14 19:03:45 uqs Exp $ abbess's Abercrombie Aberystwyth @@ -283,6 +283,7 @@ meanie meanies meany +Mensa mentis midgets minimis @@ -353,11 +354,9 @@ quints ravished Reims -reknown Resounded retriebrve Rhyll -rococco rogered Salinas Sandem ==== //depot/projects/mjacob-dev/games/fortune/datfiles/startrek.sp.ok#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/games/fortune/datfiles/startrek.sp.ok,v 1.2 2003/01/04 17:08:23 schweikh Exp $ +# $FreeBSD: src/games/fortune/datfiles/startrek.sp.ok,v 1.3 2011/05/14 19:03:45 uqs Exp $ Adonais Amanda Apella @@ -14,7 +14,6 @@ Corby Daystrom Deela -Dehaver Elaan Eleen Eneg ==== //depot/projects/mjacob-dev/games/fortune/datfiles/zippy.sp.ok#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/games/fortune/datfiles/zippy.sp.ok,v 1.2 2007/12/07 22:27:04 dougb Exp $ +# $FreeBSD: src/games/fortune/datfiles/zippy.sp.ok,v 1.3 2011/05/14 19:03:45 uqs Exp $ ANAL ASEXUAL Astro @@ -180,7 +180,7 @@ matic meatball meltdown -naugahide +naugahyde obstetrician poindexter pre ==== //depot/projects/mjacob-dev/games/morse/morse.c#2 (text+ko) ==== @@ -43,7 +43,7 @@ static char sccsid[] = "@(#)morse.c 8.1 (Berkeley) 5/31/93"; #endif static const char rcsid[] = - "$FreeBSD: src/games/morse/morse.c,v 1.25 2010/02/15 18:46:02 imp Exp $"; + "$FreeBSD: src/games/morse/morse.c,v 1.26 2011/05/14 19:03:30 uqs Exp $"; #endif /* not lint */ #include <sys/time.h> @@ -161,20 +161,20 @@ static const struct morsetab iso8859_7tab[] = { /* - * The greek alphabet; you'll need an 8859-7 font in order + * The Greek alphabet; you'll need an ISO8859-7 font in order * to see the actual characters. * This table does not implement: * - the special sequences for the seven diphthongs, * - the punctuation differences. * Implementing these features would introduce too many * special-cases in the program's main loop. - * The diphtong sequences are: + * The diphthong sequences are: * alpha iota .-.- * alpha upsilon ..-- * epsilon upsilon ---. * eta upsilon ...- - * omikron iota ---.. - * omikron upsilon ..- + * omicron iota ---.. + * omicron upsilon ..- * upsilon iota .--- * The different punctuation symbols are: * ; ..-.- @@ -193,10 +193,10 @@ {'è', "-.-."}, /* theta */ {'é', ".."}, /* iota */ {'ß', ".."}, /* iota with acute */ - {'ú', ".."}, /* iota with diairesis */ - {'À', ".."}, /* iota with acute and diairesis */ + {'ú', ".."}, /* iota with diaeresis */ + {'À', ".."}, /* iota with acute and diaeresis */ {'ê', "-.-"}, /* kappa */ - {'ë', ".-.."}, /* lamda */ + {'ë', ".-.."}, /* lambda */ {'ì', "--"}, /* mu */ {'í', "-."}, /* nu */ {'î', "-..-"}, /* xi */ @@ -209,8 +209,8 @@ {'ô', "-"}, /* tau */ {'õ', "-.--"}, /* upsilon */ {'ý', "-.--"}, /* upsilon with acute */ - {'û', "-.--"}, /* upsilon and diairesis */ - {'à', "-.--"}, /* upsilon with acute and diairesis */ + {'û', "-.--"}, /* upsilon and diaeresis */ + {'à', "-.--"}, /* upsilon with acute and diaeresis */ {'ö', "..-."}, /* phi */ {'÷', "----"}, /* chi */ {'ø', "--.-"}, /* psi */ @@ -222,29 +222,29 @@ static const struct morsetab koi8rtab[] = { /* - * the cyrillic alphabet; you'll need a KOI8R font in order + * The Cyrillic alphabet; you'll need a KOI8-R font in order * to see the actual characters */ - {'Á', ".-"}, /* a */ + {'Á', ".-"}, /* a */ {'Â', "-..."}, /* be */ {'×', ".--"}, /* ve */ {'Ç', "--."}, /* ge */ {'Ä', "-.."}, /* de */ - {'Å', "."}, /* ye */ - {'£', "."}, /* yo, the same as ye */ + {'Å', "."}, /* ye */ + {'£', "."}, /* yo, the same as ye */ {'Ö', "...-"}, /* she */ {'Ú', "--.."}, /* ze */ - {'É', ".."}, /* i */ + {'É', ".."}, /* i */ {'Ê', ".---"}, /* i kratkoye */ {'Ë', "-.-"}, /* ka */ {'Ì', ".-.."}, /* el */ - {'Í', "--"}, /* em */ - {'Î', "-."}, /* en */ + {'Í', "--"}, /* em */ + {'Î', "-."}, /* en */ {'Ï', "---"}, /* o */ {'Ð', ".--."}, /* pe */ {'Ò', ".-."}, /* er */ {'Ó', "..."}, /* es */ - {'Ô', "-"}, /* te */ + {'Ô', "-"}, /* te */ {'Õ', "..-"}, /* u */ {'Æ', "..-."}, /* ef */ {'È', "...."}, /* kha */ @@ -305,9 +305,9 @@ while ((ch = getopt(argc, argv, GETOPTOPTS)) != -1) switch ((char) ch) { - case 'c': - cpm = atoi(optarg); - break; + case 'c': + cpm = atoi(optarg); + break; case 'd': device = optarg; break; ==== //depot/projects/mjacob-dev/lib/libprocstat/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libprocstat/Makefile,v 1.2 2011/05/12 22:21:39 stas Exp $ +# $FreeBSD: src/lib/libprocstat/Makefile,v 1.3 2011/05/14 22:15:38 stas Exp $ .include <bsd.own.mk> @@ -12,6 +12,9 @@ smbfs.c \ udf.c +VERSION_DEF= ${.CURDIR}/Versions.def +SYMBOL_MAPS= ${.CURDIR}/Symbol.map + INCS= libprocstat.h CFLAGS+= -I. -I${.CURDIR} -D_KVM_VNODE SHLIB_MAJOR= 1 ==== //depot/projects/mjacob-dev/lib/libprocstat/libprocstat.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libprocstat/libprocstat.c,v 1.2 2011/05/12 22:21:39 stas Exp $"); +__FBSDID("$FreeBSD: src/lib/libprocstat/libprocstat.c,v 1.3 2011/05/15 00:46:25 stas Exp $"); #include <sys/param.h> #include <sys/time.h> @@ -253,7 +253,7 @@ if (procstat->type == PROCSTAT_SYSCTL) return (procstat_getfiles_sysctl(procstat, kp, mmapped)); else if (procstat->type == PROCSTAT_KVM) - return (procstat_getfiles_kvm(procstat, kp, mmapped)); + return (procstat_getfiles_kvm(procstat, kp, mmapped)); else return (NULL); } ==== //depot/projects/mjacob-dev/sbin/geom/class/part/geom_part.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sbin/geom/class/part/geom_part.c,v 1.45 2011/05/03 07:33:39 ae Exp $"); +__FBSDID("$FreeBSD: src/sbin/geom/class/part/geom_part.c,v 1.47 2011/05/15 16:16:48 ae Exp $"); #include <sys/stat.h> #include <sys/vtoc.h> @@ -253,13 +253,7 @@ bestsector = 0; LIST_FOREACH(pp, &gp->lg_provider, lg_provider) { s = find_provcfg(pp, "start"); - if (s == NULL) { - s = find_provcfg(pp, "offset"); - sector = - (off_t)strtoimax(s, NULL, 0) / pp->lg_sectorsize; - } else - sector = (off_t)strtoimax(s, NULL, 0); - + sector = (off_t)strtoimax(s, NULL, 0); if (sector < minsector) continue; if (bestpp != NULL && sector >= bestsector) @@ -379,18 +373,9 @@ errx(EXIT_FAILURE, "invalid partition index"); s = find_provcfg(pp, "start"); - if (s == NULL) { - s = find_provcfg(pp, "offset"); - start = (off_t)strtoimax(s, NULL, 0) / pp->lg_sectorsize; - } else - start = (off_t)strtoimax(s, NULL, 0); + start = (off_t)strtoimax(s, NULL, 0); >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201105160341.p4G3fm5X007326>