Next: , Previous: Reversed Patches, Up: Imperfect   [Contents][Index]


10.3.3 ÉÔÀµ³Î¤Ê¥Þ¥Ã¥Á¤òpatch¤¬¸«¤Ä¤±¤ë¤è¤¦¤Ë¼ê½õ¤±¤ò¤¹¤ë

¼þ¤ê¤Îʸ¤ò»ÈÍѤ·¤¿º¹Ê¬¤È¡¤¤è¤ê¾¯¤Ê¤¤ÈϰϤÎÄ̾ï¤Îº¹Ê¬¤ËÂФ·¤Æ¡¤¥Ñ¥Ã¥Á¤¬µ­ ½Ò¤·¤Æ¤¤¤ë¹ÔÈֹ椬Àµ¤·¤¯¤Ê¤¤¤È¤­¤Ï¡¤patch¤ÏÀµ¤·¤¤¤â¤Î¤ò¸¡½Ð¤¹ ¤ë¤³¤È¤¬²Äǽ¤Ç¡¤¥Ñ¥Ã¥Á¤Îhunk¤òŬÍѤ¹¤ëÀµ¤·¤¤¾ì½ê¤ò¸«¤Ä¤±¤è¤¦¤È¤·¤Þ¤¹¡¥ºÇ ½é¤Ë¸«¤Ä¤«¤ë¤È¡¤hunk¤Çµ­½Ò¤µ¤ì¤Æ¤¤¤ë¹ÔÈÖ¹æ¤Ë¡¤°ÊÁ°¤Ëhunk¤ËŬÍѤ·¤¿¥ª¥Õ¥»¥Ã ¥È¤ò²Ã¤¨¤¿¤ê°ú¤¤¤¿¤ê¤·¤Þ¤¹¡¥¤½¤ì¤¬Àµ¤·¤¤¾ì½ê¤Ç¤Ï¤Ê¤¤¾ì¹ç¡¤hunk¤ÇÍ¿¤¨¤é¤ì ¤ë¼þ¤ê¤Îʸ¤Ë°ìÃפ¹¤ë¹Ô¤ÎÁ°¸å¤òpatch¤Ï¥¹¥­¥ã¥ó¤·¤Þ¤¹¡¥

ºÇ½é¤Ëpatch¤Ï¼þ¤ê¤Îʸ¤Î¤¹¤Ù¤Æ¤Î¹Ô¤¬¥Þ¥Ã¥Á¤¹¤ë¾ì½ê¤òõ¤·¤Þ¤¹¡¥ ¤½¤Î¤è¤¦¤Ê¾ì½ê¤ò¸«¤Ä¤±¤ë¤³¤È¤¬¤Ç¤­¤º¡¤¼þ¤ê¤Îʸ¤ò»ÈÍѤ·¤Æ¤¤¤ëº¹Ê¬¤ä°ìÂβ½ ¤·¤¿º¹Ê¬¤òÆÉ¤ß¹þ¤ó¤Ç¤¤¤Æ¡¤ºÇÂç¤Îfuzz¤ÎÍ×ÁǤ¬1°Ê¾å¤ËÀßÄꤵ¤ì¤Æ¤¤¤ë¾ì¹ç¡¤ ¼þ¤ê¤Îʸ¤ÎºÇ½é¤ÈºÇ¸å¤Î¹Ô¤ò̵»ë¤·¤Ê¤¬¤é¡¤patch¤Ï¤â¤¦°ìÅÙ¥¹¥­¥ã ¥ó¤·¤Þ¤¹¡¥¤½¤ì¤Ç¤â¼ºÇÔ¤·¡¤ºÇÂç¤Îfuzz¤ÎÍ×ÁǤ¬2°Ê¾å¤ËÀßÄꤵ¤ì¤Æ¤¤¤ë¾ì¹ç¡¤ ¼þ¤ê¤Îʸ¤ÎºÇ½é¤ÎÆó¹Ô¤ÈºÇ¸å¤ÎÆó¹Ô¤ò̵»ë¤·¤Ê¤¬¤é¤â¤¦°ìÅÙ¥¹¥­¥ã¥ó¤·¤Þ¤¹¡¥ºÇ Âç¤Îfuzz¤ÎÍ×ÁǤ¬¤½¤ì¤è¤êÂ礭¤¤¾ì¹ç¤Ï¡¤Æ±Íͤ˳¤±¤Æ¤¤¤­¤Þ¤¹¡¥

-F lines¤ä--fuzz=lines¥ª¥×¥·¥ç¥ó¤Ç¡¤ºÇÂç¤Î fuzz¤ÎÍ×ÁǤòlines¤ËÀßÄꤷ¤Þ¤¹¡¥¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¤¼þ¤ê¤Îʸ¤ò»ÈÍѤ· ¤Æ¤¤¤ëº¹Ê¬¤ä°ìÂ⽤·¤¿º¹Ê¬¤À¤±¤ËŬÍѤµ¤ì¤Þ¤¹¡¥hunk¤òƳÆþ¤¹¤ë¾ì½ê¤òõ¤·¤Æ ¤¤¤ë´Ö¡¤lines¹Ô¤Þ¤Ç̵»ë¤·¤Þ¤¹¡¥¤è¤êÂ礭¤Êfuzz¤ÎÍ×ÁǤǡ¤ÉÔ´°Á´¤Ê¥Ñ¥Ã ¥Á¤òºîÀ®¤¹¤ë²ÄǽÀ­¤¬¹â¤¯¤Ê¤ë¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡¥¥Ç¥Õ¥©¥ë¥È¤Îfuzz¤ÎÃÍ ¤Ï2¤Ç¤¹¡¥¼þ¤ê¤Îʸ¤ò»ÈÍѤ·¤¿º¹Ê¬¤Î¹Ô¿ô¡¤Ä̾ï¤Ï»°¹Ô¡¤°Ê¾å¤ËÀßÄꤷ¤Æ¤â°ÕÌ£ ¤Ï¤¢¤ê¤Þ¤»¤ó¡¥

patch¤¬¥Ñ¥Ã¥Á¤Îhunk¤òƳÆþ¤¹¤ë¾ì½ê¤ò¸«¤Ä¤±¤ë¤³¤È¤¬¤Ç¤­¤Ê¤¤¾ì¹ç¡¤ hunk¤ò¥ê¥¸¥§¥¯¥È¥Õ¥¡¥¤¥ë¤Ë½ñ¤­½Ð¤·¤Þ¤¹(¥ê¥¸¥§¥¯¥È¥Õ¥¡¥¤¥ë¤Î̿̾ÊýË¡¤Ï¡¤ see Reject Names)¡¥ÆþÎϤµ¤ì¤ë¥Ñ¥Ã¥Á¤Î·Á¼°¤Î¤Þ¤Þ¡¤¥ê¥¸¥§¥¯¥È¤µ¤ì¤¿¼þ ¤ê¤Îʸ¤òÍѤ¤¤¿½ñ¼°¤Îhunk¤ò½ñ¤­½Ð¤·¤Æ¤âÌäÂꤢ¤ê¤Þ¤»¤ó¡¥ÆþÎϤ¬Ä̾ï¤Þ¤¿¤Ï ed¤Îº¹Ê¬¤Î¾ì¹ç¡¤¼þ¤ê¤Îʸ¤Î¿¤¯¤Ïñ¤Ë¥Ì¥ë¤Ë¤Ê¤ê¤Þ¤¹¡¥¥ê¥¸¥§¥¯¥È ¥Õ¥¡¥¤¥ë¤Îhunk¤Î¹Ô¿ô¤Ï¡¤¤³¤ì¤é¤Î¥Ñ¥Ã¥Á¥Õ¥¡¥¤¥ë¤È¤Ï°Û¤Ê¤ê¤Þ¤¹¡¥ patch¤¬¼ºÇÔ¤·¤¿¥Õ¥¡¥¤¥ë¤¬Â°¤¹¤ëŬÀڤʾì½ê¤ò¡¤¸Å¤¤¥Õ¥¡¥¤¥ë¤Ç¤Ï ¤Ê¤¯¿·¤·¤¤¥Õ¥¡¥¤¥ë¤Ç¼¨¤·¤Æ¤¤¤Þ¤¹¡¥

--verbose¥ª¥×¥·¥ç¥ó¤¬Í¿¤¨¤é¤ì¤Æ¤¤¤ë¾ì¹ç¡¤¤½¤ì¤¾¤ì¤Îhunk¤¬´°Î»¤¹ ¤ë¤È¤­¡¤patch¤Ïhunk¤¬À®¸ù¤·¤¿¤«¼ºÇÔ¤·¤¿¤«¤ò¹ð¤²¡¤¼ºÇÔ¤·¤¿¾ì¹ç¡¤ hunk¤òŬÍѤ¹¤Ù¤­¹Ô¤À¤Èpatch¤¬¹Í¤¨¤ë(¿·¤·¤¤¥Õ¥¡¥¤¥ë¤Î)¹Ô¤òÊó¹ð ¤·¤Þ¤¹¡¥¤³¤ì¤¬º¹Ê¬¤Ç»ØÄꤵ¤ì¤Æ¤¤¤ë¹ÔÈÖ¹æ¤È°Û¤Ê¤ë¾ì¹ç¡¤¤½¤Î¥ª¥Õ¥»¥Ã¥È¤òÊó ¹ð¤·¤Þ¤¹¡¥Ã±°ì¤ÎÂ礭¤Ê¥ª¥Õ¥»¥Ã¥È¤Ï¡¤patch¤¬hunk¤ò´Ö°ã¤Ã¤¿¾ì½ê ¤ËƳÆþ¤·¤Æ¤¤¤ë¤³¤È¤ò¼¨¤·¤Æ¤¤¤ë²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡¥µ¿¤ï¤·¤¤¾ì¹ç¤â¡¤ patch¤Ï¡¤¥Þ¥Ã¥Á¤¹¤ë¤è¤¦¤ËfuzzÍ×ÁǤò»ÈÍѤ·¤¿¤«¤É¤¦¤«¤òÊó¹ð¤·¤Þ ¤¹¡¥

patch¤Ï¡¤¹ÔÈֹ椬ed¥¹¥¯¥ê¥×¥È¤Çoff¤Ë¤Ê¤Ã¤Æ¤¤¤ë¤«¤É¤¦ ¤«¤òÊó¹ð¤¹¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó¤¬¡¤Êѹ¹¤äºï½ü¥³¥Þ¥ó¥É¤Ë¤Ê¤Ã¤Æ¤¤¤ëÄ̾ï¤Îº¹Ê¬ ¤Ç¤Î´Ö°ã¤Ã¤¿¹ÔÈÖ¹æ¤ò¸¡½Ð¤¹¤ë¤³¤È¤À¤±¤Ï²Äǽ¤Ç¤¹¡¥º¹Ê¬¤Ëɽ¼¨¤µ¤ì¤Æ¤¤¤ë¼þ¤ê ¤Îʸ¤Î¹Ô¿ô(Ä̾ï¤Ï3)°Ê¾å¤Îfuzz Í×ÁǤò»ÈÍѤ·¤Æ¤¤¤ë¤È¤­¤Î¡¤¼þ¤ê¤Îʸ¤ò»ÈÍѤ· ¤¿º¹Ê¬¤Ç¤âƱ¤¸ÌäÂ꤬¤¢¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡¥¤³¤Î¾õ¶·¤Ç¤Ï¡¤¥ª¥ê¥¸¥Ê¥ë¤È¥Ñ¥Ã¥Á ¤ò¤¢¤Æ¤ëÆþÎϤδ֤òÊѹ¹¤¹¤ë¤³¤È¤Ë°ÕÌ£¤¬¤¢¤ë¤«¤É¤¦¤«¤òÃΤ뤿¤á¤Ë¡¤¼þ¤ê¤Îʸ ¤ò»ÈÍѤ·¤¿º¹Ê¬¤ò¸«¤ë¤Ù¤­¤Ç¤·¤ç¤¦¡¥¥¨¥é¡¼Ìµ¤¯ÁȤ߹þ¤Þ¤ì¤ë¤È¡¤¥Ñ¥Ã¥Á¤¬Æ°ºî ¤·¤¿¤³¤È¤ò¸«»ö¤Ë¼¨¤·¤Æ¤¤¤Þ¤¹¤¬¡¤ÊݾڤϤ·¤Æ¤¤¤Þ¤»¤ó¡¥

¶õ¤Î¥Õ¥¡¥¤¥ë¤Ø¤Î¥Ñ¥Ã¥Á¤Ï¡¤Â¸ºß¤·¤Ê¤¤¥Õ¥¡¥¤¥ë¤ËŬÍѤµ¤ì¡¤¤½¤ÎµÕ¤â¿¿¤Ç¤¹¡¥ See Creating and Removing.

patch¤ÏÄ̾¤¿¤¯¤µ¤ó¿ä¬¤¹¤ëɬÍפ¬¤¢¤Ã¤Æ¤â¡¤Àµ¤·¤¤·ë²Ì¤òÀ¸À® ¤·¤Þ¤¹¡¥¤·¤«¤·¡¤·ë²Ì¤Ï¥Ñ¥Ã¥Á¤¬À¸À®¤µ¤ì¤¿¥Õ¥¡¥¤¥ë¤Î¥³¥Ô¡¼¤ËÀµ³Î¤ËŬÍѤµ¤ì ¤ë¤È¤­¤À¤±Êݾڤµ¤ì¤Þ¤¹¡¥