📄 patch.1
字号:
1329(to)S1443(install)S1725(that)S(hunk)200 1912 A2148(of)S2268(the)S2427(patch,)S2706(it)S(will)157 2798 A2991(put)S3155(the)S(hunk)200 3314 A3550(out)S3714(to)S3828(a)S3908(reject)S4168(\256le,)S4357(which)S4638(normally)S5036(is)S5138(the)S5904 V1080(name)S1323(of)S1432(the)S1581(output)S1863(\256le)S2018(plus)S2211(``.rej'')S(\(``#'')220 2505 A2751(on)S2877(systems)S3221(that)S3398(do)S3524(not)S(support)301 3678 A(long)178 4005 A4209(\256lenames\).)S4705(\(Note)S4961(that)S5138(the)S6024 V1080(rejected)S(hunk)200 1427 A(will)157 1654 A1838(come)S2083(out)S2238(in)S2343(context)S2666(diff)S2839(form)S3062(whether)S3414(the)S(input)206 3564 A3797(patch)S4042(was)S4226(a)S4298(context)S4621(diff)S4794(or)S4905(a)S4976(normal)S6144 V1080(diff.)S1302(If)S1396(the)S(input)206 1545 A1777(was)S1960(a)S2031(normal)S2342(diff,)S2539(many)S2788(of)S2898(the)S3047(contexts)S(will)157 3408 A3591(simply)S3890(be)S4011(null.\))S4277(The)S4460(line)S4638(numbers)S5011(on)S5138(the)S6264 V(hunks)239 1080 A1357(in)S1473(the)S1634(reject)S1897(\256le)S2064(may)S2275(be)S2408(different)S2794(than)S3005(in)S3121(the)S3282(patch)S3538(\256le:)S3733(they)S3944(re\257ect)S4235(the)S4396(approximate)S4937(location)S6384 V1080(patch)S1323(thinks)S1593(the)S1741(failed)S(hunks)239 1996 A(belong)273 2260 A2558(in)S2661(the)S2809(new)S3002(\256le)S3156(rather)S3417(than)S3615(the)S3763(old)S3916(one.)S6552 V1080(As)S(each)185 1223 A(hunk)200 1439 A1670(is)S1768(completed,)S(you)150 2243 A(will)157 2424 A2612(be)S2738(told)S2925(whether)S3281(the)S(hunk)200 3435 A(succeeded)414 3666 A4111(or)S4226(failed,)S4512(and)S4688(which)S4966(line)S5149(\(in)S6672 V1080(the)S1231(new)S1427(\256le\))S10 I1618(patch)S10 R(thought)306 1869 A2202(the)S(hunk)200 2352 A(should)267 2579 A2873(go)S3000(on.)S3177(If)S3272(this)S3444(is)S3538(different)S3913(from)S4136(the)S4286(line)S4464(number)S4798(speci\256ed)S5183(in)S6792 V1080(the)S1246(diff)S(you)150 1435 A(will)157 1628 A1828(be)S1966(told)S2165(the)S2331(offset.)S2654(A)S2770(single)S3053(large)S3299(offset)S3573(MAY)S3852(be)S3991(an)S4130(indication)S4576(that)S4771(a)S(hunk)200 4860 A5104(was)S6912 V1080(installed)S1459(in)S1575(the)S(wrong)257 1736 A(place.)238 2031 A2332(You)S(will)157 2543 A2738(also)S2938(be)S3071(told)S3265(if)S3364(a)S3446(fuzz)S3657(factor)S3930(was)S4124(used)S4345(to)S4460(make)S4715(the)S4875(match,)S5183(in)S7032 V1080(which)S1351(case)S(you)150 1550 A(should)267 1725 A2017(also)S2204(be)S2324(slightly)S2650(suspicious.)S7200 V1080(If)S1173(no)S1298(original)S1636(\256le)S1790(is)S1882(speci\256ed)S2265(on)S2390(the)S2538(command)S2959(line,)S10 I3160(patch)S10 R(will)157 3409 A3592(try)S3730(to)S3834(\256gure)S4095(out)S4249(from)S4471(the)S4620(leading)S4942(garbage)S7320 V1080(what)S1311(the)S1469(name)S1722(of)S1841(the)S1999(\256le)S2163(to)S2276(edit)S2462(is.)S2614(In)S2733(the)S2891(header)S3195(of)S3314(a)S3394(context)S3725(diff,)S3931(the)S4089(\256lename)S4471(is)S(found)234 4573 A4841(from)S5071(lines)S7440 V1080(beginning)S1509(with)S(``***'')286 1716 A2030(or)S(``---'',)263 2142 A2433(with)S2640(the)S2791(shortest)S3132(name)S3378(of)S3490(an)S3613(existing)S3959(\256le)S4116(winning.)S4523(Only)S4752(context)S5076(diffs)S7903 V720(Page)S941(1)S2780(\()S2822(LOCAL)S3167(\))S4455(September)S4911(13,)S(1996)200 5061 A8143 VEP%%Page: 2 2BP/slant 0 def/height 0 def480 V10 R720(PATCH)S1059(\()S1101(1)S1159(\))S2696(Eighth)S(Edition)296 2989 A4788(PATCH)S5127(\()S5169(1)S5227(\))S960 V1080(have)S1306(lines)S1532(like)S1719(that,)S1931(but)S2095(if)S2193(there)S2431(is)S2534(an)S(``Index:'')393 2664 A3092(line)S3278(in)S3391(the)S3549(leading)S3880(garbage,)S10 I4259(patch)S10 R(will)157 4517 A4709(try)S4856(to)S4969(use)S5138(the)S1080 V1080(\256lename)S1460(from)S1689(that)S1873(line.)S2107(The)S2297(context)S2626(diff)S2806(header)S3109(takes)S(precedence)454 3350 A3838(over)S4051(an)S4180(Index)S4443(line.)S4678(If)S4780(no)S4914(\256lename)S1200 V1080(can)S1245(be)S1365(intuited)S1697(from)S1918(the)S2066(leading)S2387(garbage,)S(you)150 2756 A(will)157 2931 A3113(be)S3233(asked)S3487(for)S3630(the)S3778(name)S4021(of)S4130(the)S4278(\256le)S4432(to)S4535(patch.)S1368 V1080(If)S1174(the)S1323(original)S1662(\256le)S(cannot)268 1818 A2113(be)S(found)234 2235 A2496(or)S2607(is)S2701(read-only,)S3139(but)S3294(a)S3366(suitable)S3706(SCCS)S3979(or)S4090(RCS)S4307(\256le)S4463(is)S(handy,)270 4557 A10 I4854(patch)S10 R(will)157 5104 A1488 V1080(attempt)S1407(to)S1510(get)S1658(or)S1767(check)S2027(out)S2180(the)S2328(\256le.)S1656 V(Additionally,)533 1080 A1643(if)S1735(the)S1888(leading)S2214(garbage)S2563(contains)S2928(a)S3003(``Prereq:)S3393('')S3491(line,)S10 I3697(patch)S10 R(will)157 3950 A4137(take)S4335(the)S4488(\256rst)S4675(word)S4912(from)S5138(the)S1776 V1080(prerequisites)S1622(line)S1800(\(normally)S2224(a)S2296(version)S2619(number\))S2987(and)S3159(check)S3421(the)S(input)206 3571 A3803(\256le)S3958(to)S4062(see)S4217(if)S4305(that)S4482(word)S4715(can)S4881(be)S(found.)259 5002 A1896 V1080(If)S1173(not,)S10 I1351(patch)S10 R(will)157 1599 A1781(ask)S1940(for)S2083(con\256rmation)S2622(before)S(proceeding.)472 2905 A2064 V1080(The)S1262(upshot)S1554(of)S1663(all)S1789(this)S1959(is)S2051(that)S(you)150 2227 A(should)267 2402 A2694(be)S2814(able)S3007(to)S3110(say,)S3294(while)S3543(in)S3646(a)S3716(news)S(interface,)379 3948 A4352(the)S4500(following:)S2244 V1440(|)S1485(patch)S1728(-d)S1837(/usr/src/local/blur\257)S2424 V1080(and)S1250(patch)S1493(a)S1563(\256le)S1717(in)S1820(the)S1968(blur\257)S2211(directory)S2600(directly)S2933(from)S3154(the)S3302(article)S3580(containing)S4029(the)S4177(patch.)S2592 V1080(If)S1174(the)S1323(patch)S1567(\256le)S1722(contains)S2083(more)S2316(than)S2515(one)S2686(patch,)S10 I2955(patch)S10 R(will)157 3204 A3387(try)S3525(to)S3629(apply)S(each)185 3878 A4089(of)S4199(them)S4426(as)S4536(if)S4625(they)S4825(came)S5065(from)S2712 V1080(separate)S1449(patch)S1705(\256les.)S1961(This)S2178(means,)S(among)273 2498 A2809(other)S3054(things,)S3362(that)S3551(it)S3645(is)S3750(assumed)S4133(that)S4321(the)S4481(name)S4736(of)S4857(the)S5017(\256le)S5183(to)S2832 V1080(patch)S1337(must)S1571(be)S1705(determined)S2197(for)S(each)185 2354 A2578(diff)S2763(listing,)S3078(and)S3262(that)S3452(the)S3614(garbage)S3972(before)S(each)185 4269 A4493(diff)S4678(listing)S(will)157 4969 A5166(be)S2952 V1080(examined)S1497(for)S1641(interesting)S2092(things)S2363(such)S2573(as)S2683(\256lenames)S3095(and)S3266(revision)S3616(level,)S3863(as)S3973(mentioned)S4423(previously.)S4923(You)S5121(can)S3072 V1080(give)S1282(switches)S1658(\(and)S1866(another)S2197(original)S2539(\256le)S2697(name\))S2978(for)S3125(the)S(second)279 3277 A3585(and)S3759(subsequent)S4234(patches)S4565(by)S4694(separating)S5138(the)S3192 V(corresponding)575 1080 A1690(argument)S2105(lists)S2302(by)S2437(a)S2517(`+'.)S2727(\(The)S2953(argument)S3368(list)S3526(for)S3679(a)S(second)279 3759 A4073(or)S4192(subsequent)S4673(patch)S4926(may)S5133(not)S3312 V1080(specify)S1396(a)S1466(new)S1659(patch)S1902(\256le,)S2081(however.\))S3480 V10 I1080(Patch)S10 R(recognizes)431 1340 A1796(the)S1944(following)S2360(switches:)S3648 V10 B-11080(-)S10 B1137(b)S10 R1330(causes)S1639(the)S1808(next)S2027(argument)S2453(to)S2577(be)S2718(interpreted)S3201(as)S3331(the)S(backup)290 3500 A3837(extension,)S4294(to)S4419(be)S4561(used)S4792(in)S(place)213 4917 A5177(of)S3768 V1330(``.orig'')S1678(or)S(``\304''.)195 1787 A3936 V10 B-11080(-)S10 B1137(B)S10 R1330(causes)S1620(the)S1770(next)S1970(argument)S2377(to)S2482(be)S2604(interpreted)S3068(as)S3179(a)S3251(pre\256x)S3514(to)S3620(the)S(backup)290 3771 A4089(\256le)S4246(name.)S4517(If)S4613(this)S4786(argument)S5194(is)S4056 V1330(speci\256ed)S1713(any)S1883(argument)S2288(from)S2509(-b)S(will)157 2618 A2800(be)S(ignored.)332 2920 A4224 V10 B-11080(-)S10 B1137(c)S10 R1330(forces)S10 I1602(patch)S10 R1850(to)S1953(interpret)S2320(the)S2468(patch)S2711(\256le)S2865(as)S2974(a)S3044(context)S3365(diff.)S4392 V10 B-11080(-)S10 B1137(d)S10 R1330(causes)S10 I1618(patch)S10 R1866(to)S1969(interpret)S2336(the)S2484(next)S2682(argument)S3087(as)S3196(a)S3266(directory,)S3680(and)S3850(cd)S3970(to)S4073(it)S4154(before)S4437(doing)S4690(anything)S5066(else.)S4560 V10 B-11080(-)S10 B1137(D)S10 R1330(causes)S10 I1619(patch)S10 R1868(to)S1972(use)S2132(the)S("#ifdef...#endif")655 2281 A2962(construct)S3357(to)S3461(mark)S3694(changes.)S4095(The)S4279(argument)S4686(following)S(will)157 5104 A4680 V1330(be)S1461(used)S1681(as)S1801(the)S1960(differentiating)S2573(symbol.)S2954(Note)S3185(that,)S3396(unlike)S3682(the)S3840(C)S3942(compiler,)S4360(there)S4597(must)S4827(be)S4957(a)S(space)224 5037 A4800 V1330(between)S1691(the)S10 B-11839(-)S10 B1896(D)S10 R1994(and)S2164(the)S2312(argument.)S4968 V10 B-11080(-)S10 B1137(e)S10 R1330(forces)S10 I1602(patch)S10 R1850(to)S1953(interpret)S2320(the)S2468(patch)S2711(\256le)S2865(as)S2974(an)S3094(ed)S3214(script.)S5136 V10 B-11080(-)S10 B1137(E)S10 R1330(causes)S10 I1618(patch)S10 R1866(to)S1969(remove)S2296(output)S2577(\256les)S2770(that)S2946(are)S3095(empty)S3371(after)S3582(the)S3730(patches)S4057(have)S4272(been)S4487(applied.)S5304 V10 B-11080(-)S10 B1137(f)S10 R1330(forces)S10 I1610(patch)S10 R1866(to)S1977(assume)S2306(that)S2490(the)S2646(user)S(knows)262 2847 A3142(exactly)S3466(what)S3695(he)S3823(or)S3940(she)S4107(is)S4208(doing,)S4495(and)S4674(to)S4786(not)S4948(ask)S5116(any)S5424 V1330(questions.)S1790(It)S1883(assumes)S2249(the)S2402(following:)S2851(skip)S3048(patches)S3380(for)S3528(which)S3804(a)S3879(\256le)S4038(to)S4146(patch)S4394(can't)S4626(be)S(found;)262 4751 A5043(patch)S5544 V1330(\256les)S1532(even)S(though)278 1756 A2068(they)S2275(have)S2499(the)S(wrong)257 2656 A2947(version)S3277(for)S3429(the)S3586(``Prereq:'')S4048(line)S4233(in)S4346(the)S4504(patch;)S4785(and)S4965(assume)S5664 V1330(that)S1510(patches)S1841(are)S1994(not)S2151(reversed)S2522(even)S2741(if)S2832(they)S(look)178 3033 A3239(like)S3418(they)S3619(are.)S3821(This)S4028(option)S4312(does)S4524(not)S(suppress)346 4680 A5054(com-)S5784 V1330(mentary;)S1713(use)S10 B-11872(-)S10 B1929(s)S10 R1993(for)S⌨️ 快捷键说明
复制代码
Ctrl + C
搜索代码
Ctrl + F
全屏模式
F11
切换主题
Ctrl + Shift + D
显示快捷键
?
增大字号
Ctrl + =
减小字号
Ctrl + -