Rechercher une page de manuel

patch

Langue: ja

Autres versions - même langue

\*(Dt (fedora - 25/11/07)

Version: \*(Dt (openSuse - 09/10/07)

Section: 1 (Commandes utilisateur)

Sommaire

Ì¾Á°
½ñ¼°
ÀâÌÀ
¥ª¥×¥·¥ç¥ó
´Ä¶ÊÑ¿ô
¥Õ¥¡¥¤¥ë
´ØÏ¢¹àÌÜ
¥Ñ¥Ã¥Á¤òÁ÷¤ë¿Í¤Ø¤ÎÃí°Õ
¥¨¥é¡¼¤È½ªÎ»¥¹¥Æ¡¼¥¿¥¹
·Ù¹ð
¸ß´¹À¤ÎÌäÂê
¥Ð¥°
Ãøºî¸¢
Ãø¼Ô

Ì¾Á°

patch - ¥ª¥ê¥¸¥Ê¥ë¥Õ¥¡¥¤¥ë¤Ëº¹Ê¬¥Õ¥¡¥¤¥ë¤òÅ¬ÍÑ¤¹¤ë

½ñ¼°

patch [options] [originalfile [patchfile]]

ÄÌ¾ï¤Ï¤â¤Ã¤È´ÊÃ±¤Ë

patch -pnum <patchfile

ÀâÌÀ

patch ¤Ï¡¢¥×¥í¥°¥é¥à diff ¤ÇÀ¸À®¤µ¤ì¤¿º¹Ê¬¥ê¥¹¥È¤ò´Þ¤à¥Ñ¥Ã¥Á¥Õ¥¡¥¤¥ë patchfile ¤ò°ú¿ô¤Ë¼è¤ê¡¢ 1 ¸Ä¤Þ¤¿¤ÏÊ£¿ô¤Î¥ª¥ê¥¸¥Ê¥ë¥Õ¥¡¥¤¥ë¤Ë¤³¤ì¤é¤Îº¹Ê¬¤òÅ¬ÍÑ¤·¡¢ ¥Ñ¥Ã¥Á¤ÎÅö¤¿¤Ã¤¿¥Ð¡¼¥¸¥ç¥ó¤òÀ¸À®¤¹¤ë¡£ ÄÌ¾ï¡¢¥ª¥ê¥¸¥Ê¥ë¥Õ¥¡¥¤¥ë¤Ï ¥Ñ¥Ã¥Á¤ÎÅö¤¿¤Ã¤¿¥Ð¡¼¥¸¥ç¥ó¤ÈÃÖ¤´¹¤ï¤ë¡£ ¥Ð¥Ã¥¯¥¢¥Ã¥×¤òºîÀ®¤¹¤ë¤³¤È¤â¤Ç¤¤ë ( -b ¤Þ¤¿¤Ï --backup ¥ª¥×¥·¥ç¥ó¤ò»²¾È ) ¡£ ÄÌ¾ï¡¢¥Ñ¥Ã¥Á¤òÅö¤Æ¤ë¥Õ¥¡¥¤¥ë¤ÎÌ¾Á°¤Ï¥Ñ¥Ã¥Á¥Õ¥¡¥¤¥ë¤«¤éÆÀ¤é¤ì¤ë¡£ ¤¿¤À¤·¡¢¥Ñ¥Ã¥Á¤ÎÅö¤¿¤ë¥Õ¥¡¥¤¥ë¤¬ 1 ¸Ä¤À¤±¤Î¾ì¹ç¡¢ orginalfile ¤È¤·¤Æ¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç»ØÄê¤¹¤ë¤³¤È¤¬¤Ç¤¤ë¡£

¼Â¹Ô¤¹¤ë¤È¡¢ patch ¤Ïº¹Ê¬ (diff) ¥ê¥¹¥È¤Î·Á¼°¤òÈ½ÊÌ¤¹¤ë¡£ ¤¿¤À¤·¡¢ -c (--context), -e (--ed), -n (--normal), -u (--unified) ¥ª¥×¥·¥ç¥ó¤Î¤É¤ì¤«¤¬»ØÄê¤µ¤ì¤¿¾ì¹ç¡¢¼«Æ°È½ÊÌ¤Ï¹Ô¤Ê¤ï¤ì¤Ê¤¤¡£ ¥³¥ó¥Æ¥¥¹¥È diff (old-style, new-style, unified) ¤ª¤è¤Ó ¥Î¡¼¥Þ¥ë diff ¤Ï patch ¥×¥í¥°¥é¥à¼«¿È¤¬¥Ñ¥Ã¥Á¤òÅ¬ÍÑ¤¹¤ë¡£ ¤¤¤Ã¤Ý¤¦¡¢ ed diff ¤Ï¥Ñ¥¤¥×¤òÄÌ¤¸¤Æ ed(1) ¥¨¥Ç¥£¥¿¤ËÎ®¤·¹þ¤Þ¤ì¤ë¤À¤±¤Ç¤¢¤ë¡£

patch ¤Ïº¹Ê¬¤ÎÁ°¤Ë¤¢¤ë¥´¥ß¤òÆÉ¤ßÈô¤Ð¤·¡¢º¹Ê¬¤òÅ¬ÍÑ¤·¡¢ ¤½¤·¤Æ¸å¤í¤Ë¤¢¤ë¥´¥ß¤òÆÉ¤ßÈô¤Ð¤½¤¦¤È¤¹¤ë¡£ ¤½¤Î¤¿¤á¡¢º¹Ê¬¥ê¥¹¥È¤ò´Þ¤àµ»ö¤ä¥á¥Ã¥»¡¼¥¸¤ò patch ¤ËÎ®¤·¹þ¤à¤³¤È¤¬¤Ç¤¡¢¤½¤ì¤ÇÆ°ºî¤¹¤ë¤Ï¤º¤Ç¤¢¤ë¡£ diff Á´ÂÎ¤¬°ìÄêÎÌ¥¤¥ó¥Ç¥ó¥È¤µ¤ì¤Æ¤¤¤ë¾ì¹ç¤ä¡¢ ¥³¥ó¥Æ¥¥¹¥È diff ¤¬ CRLF ¤Ç½ª¤ï¤ë¹Ô¤ò´Þ¤ó¤Ç¤¤¤ë¾ì¹ç¡¢ ¥¤¥ó¥¿¡¼¥Í¥Ã¥È RFC 934 ¤Çµ¬Äê¤µ¤ì¤ë¤è¤¦¤Ë "-" ¤Ç»Ï¤Þ¤ë¹Ô¤ÎÀèÆ¬¤Ë 1¸Ä¤Þ¤¿¤ÏÊ£¿ô¸Ä¤Î "- " ¤¬ÉÕ¤¤¤Æ¤¤¤ë¾ì¹ç¤Ë¤Ï¡¢ ¤³¤ì¤é¤Ï¹ÍÎ¸¤µ¤ì¤ë¡£

¥³¥ó¥Æ¥¥¹¥È diff ¤ä ¥Î¡¼¥Þ¥ë diff ( ¥Î¡¼¥Þ¥ë diff ¤Î¾ì¹ç¤ÎÅ¬ÍÑÈÏ°Ï¤Ï¤ä¤ä¶¹¤¤ ) ¤Î¾ì¹ç¡¢ patch ¤Ï¥Ñ¥Ã¥ÁÃæ¤Î¹ÔÈÖ¹æ¤Î¸í¤ê¤ò¸¡½Ð¤¹¤ë¤³¤È¤¬¤Ç¤¡¢ ¥Ñ¥Ã¥Á¤Î¤½¤ì¤¾¤ì¤Î²ô (hunk) ¤Ë¤Ä¤¤¤Æ¡¢Àµ¤·¤¤°ÌÃÖ¤ò¸«¤Ä¤±¤è¤¦¤È¤¹¤ë¡£ ºÇ½é¤Ï¡¢hunk ¤Ë½ñ¤«¤ì¤¿¹ÔÈÖ¹æ¤Ë Ä¾Á°¤Î hunk ¤òÅ¬ÍÑ¤·¤¿ºÝ¤Î¥ª¥Õ¥»¥Ã¥È¤ò²Ã¸º¤·¤¿°ÌÃÖ¤Ç¤Ï¤Ê¤¤¤«¤È¿äÂ¬¤¹¤ë¡£ ¤â¤·¤½¤ì¤¬Àµ¤·¤¤°ÌÃÖ¤Ç¤Ï¤Ê¤¤¾ì¹ç¡¢ patch ¤Ï hunk Ãæ¤Î¥³¥ó¥Æ¥¥¹¥È¤Ë°ìÃ×¤¹¤ë¹Ô¤¬Á°¸å¤Ë¤Ê¤¤¤«¤òÃµ¤¹¡£ ¤Þ¤º¡¢ patch ¤Ï¥³¥ó¥Æ¥¥¹¥È¤Î¤¹¤Ù¤Æ¤Î¹Ô¤¬°ìÃ×¤¹¤ë°ÌÃÖ¤òÃµ¤¹¡£ ¤½¤Î¤è¤¦¤Ê°ÌÃÖ¤¬¸«¤Ä¤«¤é¤Ê¤¤¾ì¹ç¤Ç¡¢¤«¤Ä¥³¥ó¥Æ¥¥¹¥È diff ¤Ç¤¢¤ê¡¢ ¤«¤Ä fuzz factor (Û£ËæÅÙ¹ç¤¤) ¤ÎºÇÂçÃÍ¤¬ 1 °Ê¾å¤Î¾ì¹ç¡¢ ¥³¥ó¥Æ¥¥¹¥È¤ÎºÇ½é¤ÈºÇ¸å¤Î¹Ô¤òÌµ»ë¤·¤Æ¤â¤¦°ìÅÙÃµ¤¹¡£ ¤½¤ì¤â¼ºÇÔ¤·¡¢ fuzz factor ¤ÎºÇÂçÃÍ¤¬ 2 °Ê¾å¤Î¾ì¹ç¡¢ ¥³¥ó¥Æ¥¥¹¥È¤ÎºÇ½é¤ÈºÇ¸å¤Î 2 ¹Ô¤º¤Ä¤òÌµ»ë¤·¤Æ¤â¤¦°ìÅÙÃµ¤¹¡£ ( ¥Ç¥Õ¥©¥ë¥È¤Î fuzz factor ¤ÎºÇÂçÃÍ¤Ï 2 ¤Ç¤¢¤ë¡£ ) patch ¤Ï¡¢¥Ñ¥Ã¥Á¤Î¤½¤Î hunk ¤òÅ¬ÍÑ¤¹¤ë°ÌÃÖ¤ò¸«¤Ä¤±¤é¤ì¤Ê¤¤¾ì¹ç¡¢ ¤½¤Î hunk ¤ò reject (µÑ²¼) ¥Õ¥¡¥¤¥ë¤Ë½ñ¤½Ð¤¹¡£ ÄÌ¾ï¡¢ reject ¥Õ¥¡¥¤¥ë¤ÎÌ¾Á°¤Ï½ÐÎÏ¥Õ¥¡¥¤¥ë¤Î¸å¤í¤Ë .rej ¤òÉÕ¤±¤¿¤â¤Î¤«¡¢ .rej ¤òÉÕ¤±¤ë¤È¥Õ¥¡¥¤¥ëÌ¾¤¬Ä¹¤¯¤Ê¤ê¤¹¤®¤ë¾ì¹ç¤Ë¤Ï # ¤òÉÕ¤±¤¿¤â¤Î¤È¤Ê¤ë ( ¤â¤· # 1 Ê¸»ú¤òÉÕ¤±¤Æ¤âÄ¹¤¯¤Ê¤ê¤¹¤®¤ë¾ì¹ç¤Ë¤Ï¡¢ ¥Õ¥¡¥¤¥ëÌ¾¤ÎºÇ¸å¤ÎÊ¸»ú¤ò # ¤ËÃÖ¤´¹¤¨¤ë ) ¡£ ( reject (µÑ²¼) ¤µ¤ì¤¿ hunk ¤ÏÆþÎÏ¤µ¤ì¤¿¥Ñ¥Ã¥Á¤Î·Á¼°¤Ë¤«¤«¤ï¤é¤º¡¢ ÄÌ¾ï¤Î¥³¥ó¥Æ¥¥¹¥È diff ¤Î·Á¼°¤Ç½ÐÎÏ¤µ¤ì¤ë¡£ ÆþÎÏ¤¬¥Î¡¼¥Þ¥ë diff ¤Î¾ì¹ç¡¢¥³¥ó¥Æ¥¥¹¥È¤ÎÂ¿¤¯¤ÏÃ±½ã¤Ë¶õ¤Ë¤Ê¤ë¡£ ) reject ¥Õ¥¡¥¤¥ëÃæ¤Î hunk ¤ËÉÕ¤±¤é¤ì¤¿¹ÔÈÖ¹æ¤Ï¥Ñ¥Ã¥Á¥Õ¥¡¥¤¥ë¤Î¤â¤Î¤È¤Ï °Û¤Ê¤ë¤«¤â¤·¤ì¤Ê¤¤¡£ reject ¥Õ¥¡¥¤¥ëÃæ¤Î¹ÔÈÖ¹æ¤Ï¡¢¸Å¤¤¥Õ¥¡¥¤¥ë¤Ë¤ª¤±¤ë°ÌÃÖ¤Ç¤Ï¤Ê¤¯¡¢ patch ¤¬¿·¤·¤¤¥Õ¥¡¥¤¥ë¤ÎÃæ¤Ç hunk ¤¬Åö¤¿¤ë¤È»×¤¦¤ª¤ª¤è¤½¤Î°ÌÃÖ¤Ë¤Ê¤Ã¤Æ¤¤¤ë¡£

¤½¤ì¤¾¤ì¤Î hunk ¤Î½èÍý¤¬½ª¤ï¤ë¤È¡¢ hunk ¤¬¼ºÇÔ¤·¤¿¤«¤É¤¦¤«¤ä¡¢ ¤â¤·¼ºÇÔ¤·¤¿¾ì¹ç¡¢ patch ¤¬ ( ¿·¤·¤¤¥Õ¥¡¥¤¥ë¤Î ) ¤É¤Î¹Ô¤Ë ¤½¤Î hunk ¤¬Åö¤¿¤ë¤È»×¤Ã¤¿¤«¤¬ÄÌÃÎ¤µ¤ì¤ë¡£ hunk ¤¬ diff ¤Ë¼¨¤µ¤ì¤¿¹ÔÈÖ¹æ¤È°Û¤Ê¤ë°ÌÃÖ¤ËÅ¬ÍÑ¤µ¤ì¤¿¾ì¹ç¤Ï¡¢ ¤½¤Î¥ª¥Õ¥»¥Ã¥È¤¬ÄÌÃÎ¤µ¤ì¤ë¡£ Âç¤¤Ê¥ª¥Õ¥»¥Ã¥È¤¬ 1 ¸Ä¤À¤±ÄÌÃÎ¤µ¤ì¤¿¾ì¹ç¡¢ ¤¢¤ë hunk ¤¬´Ö°ã¤Ã¤¿°ÌÃÖ¤ËÅ¬ÍÑ¤µ¤ì¤¿ ¤«¤â¤·¤ì¤Ê¤¤¡£ °ìÃ×¤¹¤ë°ÌÃÖ¤òÃµ¤¹¤¿¤á¤Ë fuzz factor ¤¬»È¤ï¤ì¤¿¤«¤É¤¦¤«¤âÄÌÃÎ¤µ¤ì¤ë¤¬¡¢ ¤½¤Î¾ì¹ç¤Ë¤Ï¾¯¡¹ÉÔ¿³¤Ë»×¤Ã¤¿¤Û¤¦¤¬¤è¤¤¡£ --verbose ¥ª¥×¥·¥ç¥ó¤ò»ØÄê¤¹¤ë¤È¡¢ hunk ¤¬¤Ô¤Ã¤¿¤ê°ìÃ×¤·¤¿¾ì¹ç¤Ë¤âÄÌÃÎ¤µ¤ì¤ë¡£

¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç¥ª¥ê¥¸¥Ê¥ë¥Õ¥¡¥¤¥ë origfile ¤¬»ØÄê¤µ¤ì¤Ê¤«¤Ã¤¿¾ì¹ç¡¢ patch ¤Ï diff ¤ÎÁ°¤Ë¤¢¤ë¥´¥ß¤«¤é¼¡¤Î¤è¤¦¤Êµ¬Â§¤ò»È¤Ã¤Æ ÊÔ½¸¤¹¤Ù¤¥Õ¥¡¥¤¥ë¤òÈ½ÊÌ¤·¤è¤¦¤È¤¹¤ë¡£

*: ¥Ø¥Ã¥À¤¬¥³¥ó¥Æ¥¥¹¥È diff ¤Î¤â¤Î¤Ç¤¢¤ë¾ì¹ç¡¢ patch ¤Ï¥Ø¥Ã¥À¤Ë¤¢¤ë¿·µì¤Î¥Õ¥¡¥¤¥ëÌ¾¤ò»È¤¦¡£ -pnum ¤Þ¤¿¤Ï --strip=num ¥ª¥×¥·¥ç¥ó¤Ë¸«¹ç¤Ã¤¿¿ô¤Î¥¹¥é¥Ã¥·¥å¤¬¤Ê¤¤¥Õ¥¡¥¤¥ëÌ¾¤ÏÌµ»ë¤µ¤ì¤ë¡£ /dev/null ¤È¤¤¤¦¥Õ¥¡¥¤¥ëÌ¾¤âÌµ»ë¤µ¤ì¤ë¡£
*: diff ¤ÎÁ°¤Î¥´¥ß¤ÎÃæ¤Ë Index: ¤¬¤¢¤ê¡¢¿·µìÎ¾Êý¤Î¥Õ¥¡¥¤¥ëÌ¾¤¬¤Ê¤¤¤« patch ¤¬ POSIX ¤Ë½àµò¤·¤Æ¤¤¤ë¾ì¹ç¡¢ patch ¤Ï Index: ¤Î¹Ô¤Ë¤¢¤ë¥Õ¥¡¥¤¥ëÌ¾¤ò»È¤¦¡£
*: °Ê²¼¤Î¥ë¡¼¥ë¤ò¼Â¸½¤¹¤ë¤¿¤á¤Ë¡¢ ¥Ø¥Ã¥À¤Ë¸½¤ì¤¿½ç¤Ë´Ø·¸¤Ê¤¯¡¢ ¸õÊä¤È¤Ê¤ë¥Õ¥¡¥¤¥ëÌ¾¤Ï¡¢µì¡¢¿·¡¢ index ¤Î½ç½ø¤Ç°·¤ï¤ì¤ë¡£

¤½¤·¤Æ patch ¤Ï¸õÊä¥ê¥¹¥È¤«¤é¼¡¤Î¤è¤¦¤Ë¥Õ¥¡¥¤¥ëÌ¾¤òÁªÂò¤¹¤ë:

*: Ê£¿ô¤ÎÌ¾Á°¤Î¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤Ã¤¿¾ì¹ç¡¢ patch ¤Ï POSIX ½àµò¤Ê¤é¤ÐºÇ½é¤ÎÌ¾Á°¤ò¡¢ ¤½¤¦¤Ç¤Ê¤±¤ì¤ÐºÇÅ¬¤Ê (best) Ì¾Á°¤òÁªÂò¤¹¤ë¡£
*: patch ¤¬ RCS, ClearCase, SCCS ¤òÌµ»ë¤·¤Ê¤¤¾ì¹ç ( -g num ¤Þ¤¿¤Ï --get=num ¥ª¥×¥·¥ç¥ó¤ò»²¾È ) ¤Ç¡¢¤«¤Ä¸õÊä¥ê¥¹¥È¤ÎÌ¾Á°¤Î¥Õ¥¡¥¤¥ë¤Ï¤É¤ì¤âÂ¸ºß¤·¤Ê¤¤¤¬ RCS, ClearCase, SCCS ¥Þ¥¹¥¿¤¬¸«¤Ä¤«¤Ã¤¿¾ì¹ç¡¢ patch ¤Ï RCS, ClearCase, SCCS ¥Þ¥¹¥¿¤ÎÂ¸ºß¤¹¤ë ¸õÊä¥ê¥¹¥ÈÃæ¤ÎºÇ½é¤ÎÌ¾Á°¤Î¥Õ¥¡¥¤¥ë¤òÁªÂò¤¹¤ë¡£
*: ¸õÊä¥ê¥¹¥È¤ÎÌ¾Á°¤Î¥Õ¥¡¥¤¥ë¤¬¤É¤ì¤âÂ¸ºß¤»¤º¡¢ RCS, ClearCase, SCCS ¥Þ¥¹¥¿¤â¸«¤Ä¤«¤é¤º¡¢ ¸õÊä¥ê¥¹¥È¤Ë¤ÏÊ£¿ô¤ÎÌ¾Á°¤¬¤¢¤ê¡¢ patch ¤¬ POSIX ½àµò¤Ç¤Ï¤Ê¤¯¡¢ ¤½¤Î¥Ñ¥Ã¥Á¤¬¥Õ¥¡¥¤¥ë¤òºîÀ®¤·¤è¤¦¤È¤·¤Æ¤¤¤ë¤è¤¦¤Ë¸«¼õ¤±¤é¤ì¤ë¾ì¹ç¡¢ patch ¤ÏºîÀ®¤¹¤ë¥Ç¥£¥ì¥¯¥È¥ê¤¬ºÇ¤â¾¯¤Ê¤¯¤ÆºÑ¤à¡¢ºÇÅ¬¤Ê (best) Ì¾Á°¤òÁªÂò¤¹¤ë¡£
*: °Ê¾å¤Îµ¬Â§¤Ç¥Õ¥¡¥¤¥ëÌ¾¤¬·è¤Þ¤é¤Ê¤¤¾ì¹ç¡¢ patch ¤Ï¥Ñ¥Ã¥Á¤òÅö¤Æ¤ë¥Õ¥¡¥¤¥ë¤ÎÌ¾Á°¤ò¿Ò¤Í¡¢¤½¤ÎÌ¾Á°¤ò»È¤¦¡£

¶õ¤Ç¤Ê¤¤¥Õ¥¡¥¤¥ëÌ¾¤Î¥ê¥¹¥È¤«¤é ºÇÅ¬¤Ê (best) ¤â¤Î¤òÁª¤Ö¤¿¤á¤Ë¡¢ patch ¤Ï¤Þ¤º¥Ñ¥¹Ì¾¤ÎÍ×ÁÇ¤¬ºÇ¤â¾¯¤Ê¤¤¤â¤Î¤òÁª¤Ó¡¢ ¤½¤ÎÃæ¤«¤é¥Ù¡¼¥¹¥Í¡¼¥à¤ÎºÇ¤âÃ»¤¤¤â¤Î¤òÁª¤Ó¡¢ ¤µ¤é¤Ë¤½¤ÎÃæ¤«¤éºÇ¤âÃ»¤¤¤â¤Î¤òÁª¤Ó¡¢ ºÇ¸å¤Ë¡¢»Ä¤Ã¤¿Ãæ¤ÇºÇ½é¤ÎÌ¾Á°¤òÁª¤Ö¡£

¤µ¤é¤Ë¡¢Á°¤Î¥´¥ß¤Ë Prereq: ¤È¤¤¤¦¹Ô¤¬´Þ¤Þ¤ì¤ë¾ì¹ç¡¢ patch ¤Ï¤½¤ÎÉ¬Í×¾ò·ï¤Î¹Ô¤«¤éºÇ½é¤ÎÃ±¸ì ( ÄÌ¾ï¤Ï¥Ð¡¼¥¸¥ç¥óÈÖ¹æ ) ¤ò¼è¤ê¡¢ ¥ª¥ê¥¸¥Ê¥ë¥Õ¥¡¥¤¥ë¤Ë¤½¤ÎÃ±¸ì¤¬¤¢¤ë¤«¤É¤¦¤«¤ò¥Á¥§¥Ã¥¯¤¹¤ë¡£ ¤â¤·¤Ê¤¤¾ì¹ç¡¢ patch ¤Ï½èÍý¤¹¤ëÁ°¤Ë³ÎÇ§¤òµá¤á¤ë¡£

| patch -d /usr/src/local/blurfl

¤³¤¦¤¹¤ì¤Ð¡¢¥Ç¥£¥ì¥¯¥È¥ê blurfl ¤Ë¤¢¤ë¥Õ¥¡¥¤¥ë¤Ë¡¢¥Ñ¥Ã¥Á¤ò´Þ¤àµ»ö¤«¤éÄ¾ÀÜ¥Ñ¥Ã¥Á¤òÅö¤Æ¤ë¤³¤È¤¬¤Ç¤¤ë¡£

¥ª¥×¥·¥ç¥ó

-b ¤Þ¤¿¤Ï --backup

--backup-if-mismatch

--no-backup-if-mismatch

-B pref ¤Þ¤¿¤Ï --prefix=pref

´Ê°×¥Ð¥Ã¥¯¥¢¥Ã¥×¥Õ¥¡¥¤¥ë¤ÎÌ¾Á°¤òÀ¸À®¤¹¤ë¤È¤¡¢¥Õ¥¡¥¤¥ëÌ¾¤Ë pref ¤È¤¤¤¦¥×¥ì¥Õ¥£¥¯¥¹¤ò¤Ä¤±¤ë¡£ Îã¤¨¤Ð¡¢ -B /junk/ ¤È¤¹¤ë¤È¡¢ src/patch/util.c ¤È¤¤¤¦¥Õ¥¡¥¤¥ë¤ËÂÐ¤¹¤ë´Ê°×¥Ð¥Ã¥¯¥¢¥Ã¥×¥Õ¥¡¥¤¥ë¤ÎÌ¾Á°¤Ï /junk/src/patch/util.c ¤È¤Ê¤ë¡£

--binary

¤¹¤Ù¤Æ¤Î¥Õ¥¡¥¤¥ë¤ò¥Ð¥¤¥Ê¥ê¥â¡¼¥É¤ÇÆÉ¤ß½ñ¤¤¹¤ë¡£ ¤¿¤À¤·¡¢É¸½à½ÐÎÏ¤È /dev/tty ¤ò½ü¤¯¡£ POSIX ½àµò¤Î¥·¥¹¥Æ¥à¤Ç¤Ï¤³¤Î¥ª¥×¥·¥ç¥ó¤ÏÌµ¸ú¤Ç¤¢¤ë¡£ ¤³¤Î¥ª¥×¥·¥ç¥ó¤Ç°ã¤¤¤Î½Ð¤ë DOS ¤Î¤è¤¦¤Ê¥·¥¹¥Æ¥à¤Ç¤Ï¡¢ ¥Ñ¥Ã¥Á¤ò diff -a --binary ¤Î¤è¤¦¤Ë¤·¤Æºî¤é¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤¡£

-c ¤Þ¤¿¤Ï --context

-d dir ¤Þ¤¿¤Ï --directory=dir

²¿¤ò¤¹¤ë¤è¤ê¤âÁ°¤Ë¡¢ ¤¿¤À¤Á¤Ë¥Ç¥£¥ì¥¯¥È¥ê dir ¤Ë°ÜÆ°¤¹¤ë¡£

-D define ¤Þ¤¿¤Ï --ifdef=define

ÊÑ¹¹¤Ë°õ¤òÉÕ¤±¤ë¤Î¤Ë #ifdef ... #endif ¤Î¤è¤¦¤Ê¹½Â¤¤ò»È¤¦¡£ ¤³¤Î¤È¤º¹Ê¬¤ò¼¨¤¹¥·¥ó¥Ü¥ë¤Ë define ¤òÍÑ¤¤¤ë¡£

--dry-run

-e ¤Þ¤¿¤Ï --ed

¥Ñ¥Ã¥Á¥Õ¥¡¥¤¥ë¤ò ed ¥¹¥¯¥ê¥×¥È¤È¤·¤Æ²ò¼á¤¹¤ë¡£

-E ¤Þ¤¿¤Ï --remove-empty-files

¥Ñ¥Ã¥Á¤òÅö¤Æ¤¿¤¢¤È¶õ¤Ë¤Ê¤Ã¤¿¥Õ¥¡¥¤¥ë¤òºï½ü¤¹¤ë¡£ ÄÌ¾ï¡¢¤³¤Î¥ª¥×¥·¥ç¥ó¤ÏÉÔÍ×¤Ç¤¢¤ë¡£ ¤Ê¤¼¤Ê¤é patch ¤Ï¥Ø¥Ã¥À¤Î¥¿¥¤¥à¥¹¥¿¥ó¥×¤ò¸«¤Æ¡¢¥Ñ¥Ã¥Á¤òÅö¤Æ¤¿¤¢¤È¤Ë ¥Õ¥¡¥¤¥ë¤¬Â¸ºß¤¹¤ë¤Ù¤¤«¤É¤¦¤«¤òÈ½ÃÇ¤¹¤ë¤³¤È¤¬¤Ç¤¤ë¤«¤é¤Ç¤¢¤ë¡£ ¤·¤«¤·¡¢ÆþÎÏ¤¬¥³¥ó¥Æ¥¥¹¥È diff ¤Ç¤Ê¤¤¾ì¹ç¤ä patch ¤¬ POSIX ½àµò¤Î¾ì¹ç¡¢ patch ¤Ï¤³¤Î¥ª¥×¥·¥ç¥ó¤¬Í¿¤¨¤é¤ì¤Ê¤¤¸Â¤ê¥Ñ¥Ã¥Á¸å¤Ë¶õ¤Ë¤Ê¤Ã¤¿¥Õ¥¡¥¤¥ë¤òºï½ü¤·¤Ê¤¤¡£ patch ¤¬¥Õ¥¡¥¤¥ë¤òºï½ü¤¹¤ë¤È¤¤Ï¡¢ ¶õ¤Î¾å°Ì¥Ç¥£¥ì¥¯¥È¥ê¤âºï½ü¤·¤è¤¦¤È¤¹¤ë¡£

-f ¤Þ¤¿¤Ï --force

¥æ¡¼¥¶¤¬²¿¤ò¤·¤è¤¦¤È¤·¤Æ¤¤¤ë¤«¤ò´°Á´¤ËÊ¬¤«¤Ã¤Æ¤¤¤ë¤È¤ß¤Ê¤·¡¢ ²¿¤âÌä¤¤¹ç¤ï¤»¤ò¤·¤Ê¤¤¡£ ¤É¤Î¥Õ¥¡¥¤¥ë¤Ë¥Ñ¥Ã¥Á¤òÅö¤Æ¤ë¤Ù¤¤«¤¬ ¥Ø¥Ã¥À¤Ë½ñ¤«¤ì¤Æ¤¤¤Ê¤¤¥Ñ¥Ã¥Á¤Ï¥¹¥¥Ã¥×¤·¡¢ ¥Õ¥¡¥¤¥ë¤Î¥Ð¡¼¥¸¥ç¥ó¤¬¥Ñ¥Ã¥ÁÃæ¤Î Prereq: ¤Î¹Ô¤Ë½ñ¤«¤ì¤¿¥Ð¡¼¥¸¥ç¥ó¤È°ã¤Ã¤Æ¤¤¤Æ¤â¥Ñ¥Ã¥Á¤òÅö¤Æ¡¢ ¥Ñ¥Ã¥Á¤¬È¿Å¾¤·¤Æ¤¤¤ë¤è¤¦¤Ë¸«¤¨¤Æ¤âÈ¿Å¾¤·¤Æ¤¤¤Ê¤¤¤È¤ß¤Ê¤¹¡£ ¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¥³¥á¥ó¥È½ÐÎÏ¤òÍÞÀ©¤·¤Ê¤¤¡£¤½¤¦¤·¤¿¤±¤ì¤Ð -s ¤ò»È¤¦¤³¤È¡£

-F num ¤Þ¤¿¤Ï --fuzz=num

fuzz factor ¤ÎºÇÂçÃÍ¤òÀßÄê¤¹¤ë¡£ ¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¥³¥ó¥Æ¥¥¹¥È diff ¤ËÂÐ¤·¤Æ¤Î¤ßÍ¸ú¤Ç¡¢ patch ¤¬ hunk ¤òÅ¬ÍÑ¤¹¤ë°ÌÃÖ¤òÃµ¤¹¤È¤¤ËÌµ»ë¤¹¤ë¹Ô¿ô¤ÎºÇÂçÃÍ¤ò»ØÄê¤¹¤ë¡£ fuzz factor ¤òÂç¤¤¯¤¹¤ë¤È ¥Ñ¥Ã¥Á¤¬´Ö°ã¤Ã¤ÆÅö¤¿¤Ã¤Æ¤·¤Þ¤¦¾ì¹ç¤¬Â¿¤¯¤Ê¤ë¤³¤È¤ËÃí°Õ¤¹¤ë¤³¤È¡£ ¥Ç¥Õ¥©¥ë¥È¤Î fuzz factor ¤Ï 2 ¤Ç¡¢ ¥³¥ó¥Æ¥¥¹¥È diff ¤Î¥³¥ó¥Æ¥¥¹¥È¤Î¹Ô¿ô¤è¤ê¤âÂç¤¤¯ÀßÄê¤·¤Æ¤Ï¤Ê¤é¤Ê¤¤¡£ ¥³¥ó¥Æ¥¥¹¥È¤Î¹Ô¿ô¤ÏÄÌ¾ï 3 ¤Ç¤¢¤ë¡£

-g num ¤Þ¤¿¤Ï --get=num

¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï ¥Õ¥¡¥¤¥ë¤¬ RCS ¤Þ¤¿¤Ï SCCS ¤Ç´ÉÍý¤µ¤ì¤Æ¤¤¤Æ¡¢ ¥Õ¥¡¥¤¥ë¤¬Â¸ºß¤·¤Ê¤¤¤«ÆÉ¤ß¼è¤êÀìÍÑ¤Ç ¥Ç¥Õ¥©¥ë¥È¥Ð¡¼¥¸¥ç¥ó¤Ë°ìÃ×¤¹¤ë¾ì¹ç¡¢ ¤Þ¤¿¤Ï¥Õ¥¡¥¤¥ë¤¬ ClearCase ¤Ç´ÉÍý¤µ¤ì¤Æ¤¤¤Æ¥Õ¥¡¥¤¥ë¤¬Â¸ºß¤·¤Ê¤¤¾ì¹ç¤Î patch ¤ÎÆ°ºî¤òÊÑ¹¹¤¹¤ë¡£ num ¤¬Àµ¤Ç¤¢¤ì¤Ð¡¢ patch ¤Ï¥ê¥Ó¥¸¥ç¥ó´ÉÍý¥·¥¹¥Æ¥à¤«¤é¥Õ¥¡¥¤¥ë¤ò¼èÆÀ ( ¥Á¥§¥Ã¥¯¥¢¥¦¥È ) ¤¹¤ë¡£ 0 ¤Ç¤¢¤ì¤Ð¡¢ patch ¤Ï RCS, ClearCase, SCCS ¤òÌµ»ë¤·¡¢¥Õ¥¡¥¤¥ë¤ò¼èÆÀ¤·¤Ê¤¤¡£ Éé¤Ç¤¢¤ì¤Ð¡¢ patch ¤Ï¥Õ¥¡¥¤¥ë¤ò¼èÆÀ¤¹¤ë¤«¤É¤¦¤«¤ò¥æ¡¼¥¶¤Ë¿Ò¤Í¤ë¡£ ¤³¤Î¥ª¥×¥·¥ç¥ó¤Î¥Ç¥Õ¥©¥ë¥È¤ÎÃÍ¤Ï¡¢ ´Ä¶ÊÑ¿ô PATCH_GET ¤¬ÀßÄê¤µ¤ì¤Æ¤¤¤ì¤Ð¤½¤ÎÃÍ¤È¤Ê¤ë¡£ ¤½¤¦¤Ç¤Ê¤¤¾ì¹ç¡¢¥Ç¥Õ¥©¥ë¥È¤ÎÃÍ¤Ï patch ¤¬ POSIX ½àµò¤Ç¤¢¤ì¤Ð 0 ¡¢¤½¤¦¤Ç¤Ê¤±¤ì¤ÐÉé¤È¤Ê¤ë¡£

--help

¥ª¥×¥·¥ç¥ó¤ÎÍ×Ìó¤òÉ½¼¨¤·¡¢½ªÎ»¤¹¤ë¡£

-i patchfile ¤Þ¤¿¤Ï --input=patchfile

¥Ñ¥Ã¥Á¤ò patchfile ¤«¤éÆÉ¤ß¹þ¤à¡£ patchfile ¤¬ - ¤Î¾ì¹ç¤ÏÉ¸½àÆþÎÏ¤«¤éÆÉ¤ß¹þ¤ß¡¢¤³¤ì¤¬¥Ç¥Õ¥©¥ë¥È¤Ç¤¢¤ë¡£

-l ¤Þ¤¿¤Ï --ignore-whitespace

-n ¤Þ¤¿¤Ï --normal

¥Ñ¥Ã¥Á¥Õ¥¡¥¤¥ë¤ò¥Î¡¼¥Þ¥ë diff ¤È¤·¤Æ²ò¼á¤¹¤ë¡£

-N ¤Þ¤¿¤Ï --forward

-o outfile ¤Þ¤¿¤Ï --output=outfile

¥Õ¥¡¥¤¥ë¤Ë¥Ñ¥Ã¥Á¤òÅö¤Æ¤ÆÃÖ¤´¹¤¨¤ë¤Î¤Ç¤Ï¤Ê¤¯¡¢ ½ÐÎÏ¤ò outfile ¤ËÁ÷¤ë¡£

-pnum ¤Þ¤¿¤Ï --strip=num

/u/howard/src/blurfl/blurfl.c

¤Ç¤¢¤Ã¤¿¤È¤¹¤ë¤È¡¢ -p0 ¤È¤¹¤ë¤È¥Õ¥¡¥¤¥ëÌ¾Á´ÂÎ¤¬ÊÑ¹¹¤µ¤ì¤º¤ËÍÑ¤¤¤é¤ì¡¢ -p1 ¤È¤¹¤ë¤È

u/howard/src/blurfl/blurfl.c

¤Î¤è¤¦¤ËÀèÆ¬¤Î¥¹¥é¥Ã¥·¥å¤¬¼è¤ê½ü¤«¤ì¡¢ -p4 ¤È¤¹¤ë¤È

blurfl/blurfl.c

--posix

°Ê²¼¤Î¤è¤¦¤Ë¤è¤ê¸·³Ê¤Ë POSIX É¸½à¤Ë¤·¤¿¤¬¤¦¡£

*: diff ¥Ø¥Ã¥À¤«¤éÊ£¿ô¤Î¥Õ¥¡¥¤¥ëÌ¾¤¬ÆÀ¤é¤ì¤¿¾ì¹ç¡¢ ¥ê¥¹¥È (old, new, index) ¤Î¤¦¤ÁºÇ½é¤ËÂ¸ºß¤·¤¿¥Õ¥¡¥¤¥ë¤òÍÑ¤¤¤ë¡£
*: ¥Ñ¥Ã¥Á¤òÅö¤Æ¤¿¤¢¤È¶õ¤Ë¤Ê¤Ã¤¿¥Õ¥¡¥¤¥ë¤òºï½ü¤·¤Ê¤¤¡£
*: RCS, ClearCase, SCCS ¤«¤é ¥Õ¥¡¥¤¥ë¤ò¼èÆÀ¤¹¤ë¤«¤É¤¦¤«¤ò¿Ò¤Í¤Ê¤¤¡£
*: ¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç¤Ï¤¹¤Ù¤Æ¤Î¥ª¥×¥·¥ç¥ó¤¬¥Õ¥¡¥¤¥ë¤ÎÁ°¤Ë¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤¡£
*: ¥Ñ¥Ã¥Á¤¬¸µ¤Î¥Õ¥¡¥¤¥ë¤Ë¤Ô¤Ã¤¿¤ê°ìÃ×¤·¤Ê¤¤¾ì¹ç¤Ç¤â¡¢ ¥Õ¥¡¥¤¥ë¤ò¥Ð¥Ã¥¯¥¢¥Ã¥×¤·¤Ê¤¤¡£

--quoting-style=word

¥Õ¥¡¥¤¥ëÌ¾¤ò½ÐÎÏ¤¹¤ë¤Î¤Ë¥¹¥¿¥¤¥ë word ¤ò»È¤¦¡£ word ¤Ï¼¡¤Î¤É¤ì¤«¤Ç¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤:

literal: ¥Õ¥¡¥¤¥ëÌ¾¤ò¤½¤Î¤Þ¤Þ½ÐÎÏ¤¹¤ë¡£
shell: ¥Õ¥¡¥¤¥ëÌ¾¤Ë¥·¥§¥ë¤Î¥á¥¿¥¥ã¥é¥¯¥¿¤¬´Þ¤Þ¤ì¤ë¾ì¹ç¤ä Û£Ëæ¤Ê½ÐÎÏ¤È¤Ê¤Ã¤Æ¤·¤Þ¤¦¾ì¹ç¡¢ ¥Õ¥¡¥¤¥ëÌ¾¤Ë¥·¥§¥ëÍÑ¤Î°úÍÑÉä¤òÉÕ¤±¤ë¡£
shell-always: ÄÌ¾ï¤Ï°úÍÑÉä¤¬É¬Í×¤Ç¤Ê¤¤¾ì¹ç¤Ë¤â¥·¥§¥ëÍÑ¤Î°úÍÑÉä¤òÉÕ¤±¤ë¡£
c: C ¸À¸ìÊ¸»úÎó¤ÈÆ±ÍÍ¤Ë¥Õ¥¡¥¤¥ëÌ¾¤Ë°úÍÑÉä¤òÉÕ¤±¤ë¡£
escape: c ¤ÈÆ±¤¸¤è¤¦¤Ë°úÍÑÉä¤òÉÕ¤±¤ë¤¬¡¢ºÇ½é¤ÈºÇ¸å¤Î¥À¥Ö¥ë¥¯¥¦¥©¡¼¥ÈÊ¸»ú¤ò¾ÊÎ¬¤¹¤ë¡£

--quoting-style ¥ª¥×¥·¥ç¥ó¤Î¥Ç¥Õ¥©¥ë¥ÈÃÍ¤Ï´Ä¶ÊÑ¿ô QUOTING_STYLE ¤Ç»ØÄê¤¹¤ë¤³¤È¤¬¤Ç¤¤ë¡£ ´Ä¶ÊÑ¿ô¤¬ÀßÄê¤µ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¡¢¥Ç¥Õ¥©¥ë¥ÈÃÍ¤Ï shell ¤Ç¤¢¤ë¡£

-r rejectfile ¤Þ¤¿¤Ï --reject-file=rejectfile

reject ( µÑ²¼¤µ¤ì¤¿ hunk) ¤ò ¥Ç¥Õ¥©¥ë¥È¤Î .rej ¥Õ¥¡¥¤¥ë¤Ç¤Ï¤Ê¤¯ rejectfile ¤Ë½ÐÎÏ¤¹¤ë¡£

-R ¤Þ¤¿¤Ï --reverse

¤³¤Î¥Ñ¥Ã¥Á¤Ï¿·µì¤Î¥Õ¥¡¥¤¥ë¤¬È¿Å¾¤·¤Æ¤¤¤ë¤È¤ß¤Ê¤¹¡£ ( ¤Þ¤¢¡¢¤È¤¤É¤¤¢¤ë¡£¿Í´Ö¤Î¤ä¤ë¤³¤È¤À¤«¤é¡£ ) patch ¤Ï¤½¤ì¤¾¤ì¤Î hunk ¤òÅö¤Æ¤ëÁ°¤ËÈ¿Å¾¤µ¤»¤ë¡£ reject ( µÑ²¼¤µ¤ì¤¿ hunk) ¤âÈ¿Å¾¤·¤¿¤¢¤È¤Î·Á¼°¤Ç½ÐÎÏ¤µ¤ì¤ë¡£ -R ¥ª¥×¥·¥ç¥ó¤Ï ed ·Á¼°¤Î diff ¥¹¥¯¥ê¥×¥È¤ËÂÐ¤·¤Æ¤ÏÆ°ºî¤·¤Ê¤¤¡£ È¿ÂÐ¤ÎÁàºî¤ò¤¹¤ë¤Ë¤Ï¾ðÊó¤¬¾¯¤Ê¤¹¤®¤ë¤«¤é¤Ç¤¢¤ë¡£

-s ¤Þ¤¿¤Ï --silent ¤Þ¤¿¤Ï --quiet

¥¨¥é¡¼¤¬È¯À¸¤·¤Ê¤¤¸Â¤ê¡¢ÀÅ¤«¤ËÆ°ºî¤¹¤ë¡£

-t ¤Þ¤¿¤Ï --batch

-T ¤Þ¤¿¤Ï --set-time

¥Ñ¥Ã¥Á¤òÅö¤Æ¤¿¤¢¤È¤Î¥Õ¥¡¥¤¥ë¤ÎÊÑ¹¹Æü»þ¤È¥¢¥¯¥»¥¹Æü»þ¤ò ¥³¥ó¥Æ¥¥¹¥È diff ¥Ø¥Ã¥À¤Î¥¿¥¤¥à¥¹¥¿¥ó¥×¤ËÀßÄê¤¹¤ë¡£ ¥³¥ó¥Æ¥¥¹¥È diff ¥Ø¥Ã¥À¤Ï¥í¡¼¥«¥ë»þ¹ï¤ò»È¤Ã¤Æ¤¤¤ë¤È¤ß¤Ê¤¹¡£ ¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¿ä¾©¤µ¤ì¤Ê¤¤¡£ ¤Ê¤¼¤Ê¤é¥í¡¼¥«¥ë»þ¹ï¤ò»È¤Ã¤¿¥Ñ¥Ã¥Á¤Ï°Û¤Ê¤ë¥¿¥¤¥à¥¾¡¼¥ó¤Î¿Í¤Ë¤Ï ´ÊÃ±¤Ë»È¤¨¤Ê¤¤¤«¤é¡¢ ¤Þ¤¿¥í¡¼¥«¥ë¥¿¥¤¥à¥¹¥¿¥ó¥×¤Ï ¥µ¥Þ¡¼¥¿¥¤¥à¤ÎÄ´À°¤Ç»þ¹ï¤¬Ìá¤Ã¤¿¾ì¹ç¤ËÛ£Ëæ¤Ë¤Ê¤ë¤«¤é¤Ç¤¢¤ë¡£ ¤³¤Î¥ª¥×¥·¥ç¥ó¤ò»È¤¦Âå¤ï¤ê¤Ë¡¢ UTC ¤Ç¥Ñ¥Ã¥Á¤òÀ¸À®¤·¡¢ -Z ¤Þ¤¿¤Ï --set-utc ¤ò»È¤¦¤³¤È¡£

-u ¤Þ¤¿¤Ï --unified

¥Ñ¥Ã¥Á¥Õ¥¡¥¤¥ë¤ò unified ¥³¥ó¥Æ¥¥¹¥È diff ¤È¤·¤Æ²ò¼á¤¹¤ë¡£

-v ¤Þ¤¿¤Ï --version

-V method ¤Þ¤¿¤Ï --version-control=method

¥Ð¥Ã¥¯¥¢¥Ã¥×¥Õ¥¡¥¤¥ë¤ÎÌ¾Á°¤ò·èÄê¤¹¤ë¤Î¤Ë method ¤ò»È¤¦¡£ method ¤Ï PATCH_VERSION_CONTROL ( ¤Þ¤¿¤Ï¡¢¤½¤ì¤¬¤Ê¤¤¾ì¹ç¡¢ VERSION_CONTROL) ´Ä¶ÊÑ¿ô¤Ç»ØÄê¤Ç¤¡¢¤³¤Î¥ª¥×¥·¥ç¥ó¤Ç¾å½ñ¤¤µ¤ì¤ë¡£ method ¤Ï¥Ð¥Ã¥¯¥¢¥Ã¥×¥Õ¥¡¥¤¥ë¤¬ºî¤é¤ì¤ë¤«¤É¤¦¤«¤Ë¤Ï±Æ¶Á¤»¤º¡¢ ºî¤é¤ì¤ë¥Ð¥Ã¥¯¥¢¥Ã¥×¥Õ¥¡¥¤¥ë¤ÎÌ¾Á°¤Ë±Æ¶Á¤¹¤ë¤À¤±¤Ç¤¢¤ë¡£

method ¤ÎÃÍ¤Ï GNU Emacs ¤Î `version-control' ÊÑ¿ô¤ÈÆ±ÍÍ¤Ç¤¢¤ë¡£ patch ¤Ï¤â¤Ã¤ÈÊ¬¤«¤ê¤ä¤¹¤¤Æ±µÁ¸ì¤âÍý²ò¤¹¤ë¡£ method ¤ÎÍ¸ú¤ÊÃÍ¤Ï¼¡¤Î¤È¤ª¤ê¤Ç¤¢¤ë ( ¶èÊÌ¤¬ÉÕ¤±¤ÐÃ»½Ì·Á¤òÍÑ¤¤¤Æ¤â¤è¤¤ ):

existing ¤Þ¤¿¤Ï nil: ÈÖ¹æÉÕ¤¤Î¥Ð¥Ã¥¯¥¢¥Ã¥×¤¬¤¢¤ë¾ì¹ç¡¢¥Ð¥Ã¥¯¥¢¥Ã¥×¤ËÈÖ¹æ¤òÉÕ¤±¤ë¡£ ¤½¤¦¤Ç¤Ê¤¤¾ì¹ç¡¢´Ê°×¥Ð¥Ã¥¯¥¢¥Ã¥×¤òºî¤ë¡£ ¤³¤ì¤¬¥Ç¥Õ¥©¥ë¥È¤Ç¤¢¤ë¡£
numbered ¤Þ¤¿¤Ï t: ¥Ð¥Ã¥¯¥¢¥Ã¥×¤ËÈÖ¹æ¤òÉÕ¤±¤ë¡£ F ¤È¤¤¤¦¥Õ¥¡¥¤¥ë¤ËÂÐ¤¹¤ëÈÖ¹æÉÕ¤¥Ð¥Ã¥¯¥¢¥Ã¥×¥Õ¥¡¥¤¥ë¤ÎÌ¾Á°¤Ï F.~N~ ¤Î¤è¤¦¤Ë¤Ê¤ë¡£ N ¤Ï¥Ð¡¼¥¸¥ç¥óÈÖ¹æ¤Ç¤¢¤ë¡£
simple ¤Þ¤¿¤Ï never: ´Ê°×¥Ð¥Ã¥¯¥¢¥Ã¥×¤òºî¤ë¡£ -B ¤Þ¤¿¤Ï --prefix¡¢ -Y ¤Þ¤¿¤Ï --basename-prefix¡¢ -z ¤Þ¤¿¤Ï --suffix ¥ª¥×¥·¥ç¥ó¤Ç´Ê°×¥Ð¥Ã¥¯¥¢¥Ã¥×¥Õ¥¡¥¤¥ë¤ÎÌ¾Á°¤¬·è¤Þ¤ë¡£ ¤³¤ì¤é¤Î¤¦¤Á¤É¤Î¥ª¥×¥·¥ç¥ó¤â»ØÄê¤µ¤ì¤Ê¤¤¾ì¹ç¡¢ ´Ê°×¥Ð¥Ã¥¯¥¢¥Ã¥×¥µ¥Õ¥£¥¯¥¹¤¬»È¤ï¤ì¤ë¡£ ¥µ¥Õ¥£¥¯¥¹¤Ï SIMPLE_BACKUP_SUFFIX ´Ä¶ÊÑ¿ô¤¬Â¸ºß¤¹¤ë¾ì¹ç¤Ï¤½¤ÎÃÍ¡¢¤½¤¦¤Ç¤Ê¤¤¾ì¹ç¤Ï .orig ¤Ç¤¢¤ë¡£

--verbose

-x num ¤Þ¤¿¤Ï --debug=num

ÆâÉô¥Ç¥Ð¥Ã¥°¥Õ¥é¥°¤òÀßÄê¤¹¤ë¡£ patch ¤òÊÑ¹¹¤¹¤ë¿Í¤Ë¤·¤«¶½Ì£¤Î¤Ê¤¤¤â¤Î¤Ç¤¢¤ë¡£

-Y pref ¤Þ¤¿¤Ï --basename-prefix=pref

´Ê°×¥Ð¥Ã¥¯¥¢¥Ã¥×¥Õ¥¡¥¤¥ë¤ÎÌ¾Á°¤òÀ¸À®¤¹¤ë¤È¤¡¢ ¥Õ¥¡¥¤¥ëÌ¾¤Î¥Ù¡¼¥¹¥Í¡¼¥à¤Ë ¥×¥ì¥Õ¥£¥¯¥¹ pref ¤òÉÕ¤±¤ë¡£ Îã¤¨¤Ð¡¢ -Y .del/ ¤È¤·¤¿¾ì¹ç¡¢ src/patch/util.c ¤Î´Ê°×¥Ð¥Ã¥¯¥¢¥Ã¥×¥Õ¥¡¥¤¥ë¤ÎÌ¾Á°¤Ï src/patch/.del/util.c ¤È¤Ê¤ë¡£

-z suffix ¤Þ¤¿¤Ï --suffix=suffix

suffix ¤ò´Ê°×¥Ð¥Ã¥¯¥¢¥Ã¥×¥µ¥Õ¥£¥¯¥¹¤È¤·¤Æ»È¤¦¡£ Îã¤¨¤Ð¡¢ -z - ¤È¤·¤¿¾ì¹ç¡¢ src/patch/util.c ¤Î´Ê°×¥Ð¥Ã¥¯¥¢¥Ã¥×¥Õ¥¡¥¤¥ë¤ÎÌ¾Á°¤Ï src/patch/util.c- ¤È¤Ê¤ë¡£ ¥Ð¥Ã¥¯¥¢¥Ã¥×¥µ¥Õ¥£¥¯¥¹¤Ï SIMPLE_BACKUP_SUFFIX ´Ä¶ÊÑ¿ô¤Ç»ØÄê¤¹¤ë¤³¤È¤¬¤Ç¤¡¢¤³¤Î¥ª¥×¥·¥ç¥ó¤Ç¾å½ñ¤¤µ¤ì¤ë¡£

-Z ¤Þ¤¿¤Ï --set-utc

¥Ñ¥Ã¥Á¤òÅö¤Æ¤¿¤¢¤È¤Î¥Õ¥¡¥¤¥ë¤ÎÊÑ¹¹Æü»þ¤È¥¢¥¯¥»¥¹Æü»þ¤ò ¥³¥ó¥Æ¥¥¹¥È diff ¥Ø¥Ã¥À¤Î¥¿¥¤¥à¥¹¥¿¥ó¥×¤ËÀßÄê¤¹¤ë¡£ ¥³¥ó¥Æ¥¥¹¥È diff ¥Ø¥Ã¥À¤Ï À¤³¦¶¨Äê»þ (UTC ¡¢GMT ¤È¤·¤Æ¤âÃÎ¤é¤ì¤ë ) ¤ò »È¤Ã¤Æ¤¤¤ë¤È¤ß¤Ê¤¹¡£ -T ¤Þ¤¿¤Ï --set-time ¥ª¥×¥·¥ç¥ó¤â»²¾È¤¹¤ë¤³¤È¡£

-Z ¤Þ¤¿¤Ï --set-utc ¤ª¤è¤Ó -T ¤Þ¤¿¤Ï --set-time ¥ª¥×¥·¥ç¥ó¤Ï¡¢ÄÌ¾ï¤Ï¥Õ¥¡¥¤¥ë¤Î¥ª¥ê¥¸¥Ê¥ë¤Î»þ¹ï¤¬ ¥Ñ¥Ã¥Á¥Ø¥Ã¥ÀÃæ¤Î»þ¹ï¤È°ìÃ×¤·¤Ê¤¤¾ì¹ç¤ä ÆâÍÆ¤¬¥Ñ¥Ã¥Á¤È¤Ô¤Ã¤¿¤ê°ìÃ×¤·¤Ê¤¤¾ì¹ç¤Ë¤Ï¡¢¥Õ¥¡¥¤¥ë¤Î»þ¹ï¤òÀßÄê¤·¤Ê¤¤¡£ ¤·¤«¤·¡¢ -f ¤Þ¤¿¤Ï --force ¥ª¥×¥·¥ç¥ó¤¬»ØÄê¤µ¤ì¤¿¾ì¹ç¡¢¥Õ¥¡¥¤¥ë¤Î»þ¹ï¤Ï¶¯À©Åª¤ËÀßÄê¤µ¤ì¤ë¡£

diff ¤Î½ÐÎÏ·Á¼°¤ÎÀ©¸Â¤Î¤¿¤á¡¢ ¤³¤ì¤é¤Î¥ª¥×¥·¥ç¥ó¤Ç¤Ï ÆâÍÆ¤ÎÊÑ²½¤·¤Ê¤¤¥Õ¥¡¥¤¥ë¤Î»þ¹ï¤Ï¹¹¿·¤µ¤ì¤Ê¤¤¡£ ¤Þ¤¿¡¢¤³¤ì¤é¤Î¥ª¥×¥·¥ç¥ó¤ò»È¤Ã¤¿¾ì¹ç¤Ë¤Ï¡¢ ¥Ñ¥Ã¥Á¤ÎÅö¤¿¤Ã¤¿¥Õ¥¡¥¤¥ë¤Ë°ÍÂ¸¤¹¤ë¥Õ¥¡¥¤¥ë¤òºï½ü¤·¤Æ ( Îã¤¨¤Ð make clean ¤Ç ) ¡¢ ¤¢¤È¤Ç make ¤ò¼Â¹Ô¤·¤¿¤È¤¤Ë¥Ñ¥Ã¥Á¤ÎÅö¤¿¤Ã¤¿¥Õ¥¡¥¤¥ë¤Î»þ¹ï¤Ç º®Íð¤·¤Ê¤¤¤è¤¦¤Ë¤·¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤¡£

´Ä¶ÊÑ¿ô

PATCH_GET: patch ¤¬Â¸ºß¤·¤Ê¤¤¥Õ¥¡¥¤¥ë¤äÆÉ¤ß¼è¤êÀìÍÑ¤Î¥Õ¥¡¥¤¥ë¤ò¥Ç¥Õ¥©¥ë¥È¤Ç RCS, ClearCase, SCCS ¤«¤é¼èÆÀ¤¹¤ë¤«¤É¤¦¤«¤ò»ØÄê¤¹¤ë¡£ -g ¤Þ¤¿¤Ï --get ¥ª¥×¥·¥ç¥ó¤ò»²¾È¡£
POSIXLY_CORRECT: ÀßÄê¤µ¤ì¤Æ¤¤¤ë¾ì¹ç¡¢ patch ¤Ï¥Ç¥Õ¥©¥ë¥È¤Ç POSIX É¸½à¤Ë¤è¤ê¸·³Ê¤Ë½¾¤¦¡£ --posix ¥ª¥×¥·¥ç¥ó¤ò»²¾È¡£
QUOTING_STYLE: --quoting-style ¥ª¥×¥·¥ç¥ó¤Î¥Ç¥Õ¥©¥ë¥È¤ÎÃÍ¡£
SIMPLE_BACKUP_SUFFIX: .orig ¤ÎÂå¤ï¤ê¤Ë´Ê°×¥Ð¥Ã¥¯¥¢¥Ã¥×¥Õ¥¡¥¤¥ë¤ÎÌ¾Á°¤Ë»È¤¦³ÈÄ¥»Ò¡£
TMPDIR, TMP, TEMP: °ì»þ¥Õ¥¡¥¤¥ë¤òÆþ¤ì¤ë¥Ç¥£¥ì¥¯¥È¥ê patch ¤Ï¤³¤Î¥ê¥¹¥È¤ÎÃæ¤ÇºÇ½é¤ËÀßÄê¤µ¤ì¤Æ¤¤¤ë´Ä¶ÊÑ¿ô¤ò»È¤¦¡£ ¤É¤ì¤âÀßÄê¤µ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¡¢¥Ç¥Õ¥©¥ë¥È¤Ï¥·¥¹¥Æ¥à°ÍÂ¸¤Ç¤¢¤ë¡£ Unix ¥Û¥¹¥È¤Ç¤ÏÄÌ¾ï /tmp ¤Ç¤¢¤ë¡£
VERSION_CONTROL ¤Þ¤¿¤Ï PATCH_VERSION_CONTROL: ¥Ð¡¼¥¸¥ç¥ó¥³¥ó¥È¥í¡¼¥ë¥¹¥¿¥¤¥ë¤òÁªÂò¤¹¤ë¡£ -V ¤Þ¤¿¤Ï --version-control ¥ª¥×¥·¥ç¥ó¤ò»²¾È¡£

¥Õ¥¡¥¤¥ë

$TMPDIR/p*: °ì»þ¥Õ¥¡¥¤¥ë¡£
/dev/tty: À©¸æÃ¼Ëö¡£¥æ¡¼¥¶¤Ë¿Ò¤Í¤¿¼ÁÌä¤ÎÅú¤¨¤òÆÀ¤ë¤¿¤á¤Ë»È¤ï¤ì¤ë¡£

´ØÏ¢¹àÌÜ

diff(1), ed(1)

Marshall T. Rose and Einar A. Stefferud, Proposed Standard for Message Encapsulation, Internet RFC 934 <URL:ftp://ftp.isi.edu/in-notes/rfc934.txt> (1985-01).

¥Ñ¥Ã¥Á¤òÁ÷¤ë¿Í¤Ø¤ÎÃí°Õ

¥Ñ¥Ã¥Á¤òµ¡³£Åª¤Ëºî¤ë¤³¤È¡£ ¤è¤¤ÊýË¡¤Ï diff -Naur old new ¤Î¤è¤¦¤Ê¥³¥Þ¥ó¥É¤ò»È¤¦¤³¤È¤Ç¤¢¤ë¡£ new ¤È old ¤Ï¤½¤ì¤¾¤ì¿·µì¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ç¤¢¤ë¡£ old ¤È new ¤Ë¤Ï 1 ¸Ä¤â¥¹¥é¥Ã¥·¥å¤¬¤¢¤Ã¤Æ¤Ï¤¤¤±¤Ê¤¤¡£ diff ¥³¥Þ¥ó¥É¤Î¥Ø¥Ã¥À¤Ë´Þ¤Þ¤ì¤ëÆü»þ¤ÏÅÁÅýÅª¤Ê Unix ·Á¼°¤ò»È¤Ã¤Æ ¶¨ÄêÀ¤³¦»þ¤Ç½ñ¤«¤ì¤Æ¤¤¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤¡£ ¤½¤¦¤¹¤ì¤Ð ¥Ñ¥Ã¥Á¤ò¼õ¤±¼è¤Ã¤¿¿Í¤¬ -Z ¤Þ¤¿¤Ï --set-utc ¥ª¥×¥·¥ç¥ó¤ò»È¤¦¤³¤È¤¬¤Ç¤¤ë¡£ ¼¡¤Î¤â¤Î¤Ï Bourne ¥·¥§¥ë·Á¼°¤ò»È¤Ã¤¿¥³¥Þ¥ó¥ÉÎã¤Ç¤¢¤ë:

LC_ALL=C TZ=UTC0 diff -Naur gcc-2.7 gcc-2.8

Á÷¤ê½Ð¤¹¥Ñ¥Ã¥Á¥Õ¥¡¥¤¥ë¤ÎºÇ½é¤Î diff ¤È¤·¤Æ¡¢ ¥Ñ¥Ã¥Á¥ì¥Ù¥ë¤ò¥¤¥ó¥¯¥ê¥á¥ó¥È¤·¤Æ¤¤¤¯ patchlevel.h ¥Õ¥¡¥¤¥ë¤òÆþ¤ì¤Æ¤ª¤¯¤È¡¢ Â¿¤¯¤Î¿Í¤ÎÌÌÅÝ¤ò·Ú¸º¤Ç¤¤ë¡£ ¥Ñ¥Ã¥Á¤Ë Prereq: ¹Ô¤ò²Ã¤¨¤Æ¤ª¤±¤Ð¡¢ ½çÈÖ¤ò´Ö°ã¤¨¤Æ·Ù¹ð¤ò¿©¤é¤¦¤Î¤òËÉ¤°¤³¤È¤¬¤Ç¤¤ë¡£

/dev/null ¤ä Æü»þ¤¬ Epoch (1970-01-01 00:00:00 UTC) ¤Î¶õ¤Î¥Õ¥¡¥¤¥ë¤È ºîÀ®¤·¤¿¤¤¥Õ¥¡¥¤¥ë¤òÈæ³Ó¤·¤¿ diff ¤òÁ÷¤ë¤³¤È¤Ç¡¢ ¥Õ¥¡¥¤¥ë¤òºîÀ®¤¹¤ë¤³¤È¤¬¤Ç¤¤ë¡£ ¤³¤ÎÊýË¡¤Ï¥¿¡¼¥²¥Ã¥È¤Î¥Ç¥£¥ì¥¯¥È¥ê¤ËºîÀ®¤·¤¿¤¤¥Õ¥¡¥¤¥ë¤¬ ¤Þ¤ÀÂ¸ºß¤·¤Ê¤¤¾ì¹ç¤Ë¸Â¤Ã¤ÆÆ°ºî¤¹¤ë¡£ È¿ÂÐ¤Ë¡¢ºï½ü¤·¤¿¤¤¥Õ¥¡¥¤¥ë¤ÈÆü»þ¤¬ Epoch ¤Î¶õ¤Î¥Õ¥¡¥¤¥ë¤òÈæ³Ó¤·¤¿ ¥³¥ó¥Æ¥¥¹¥È diff ¤òÁ÷¤ë¤³¤È¤Ç¡¢¥Õ¥¡¥¤¥ë¤òºï½ü¤¹¤ë¤³¤È¤¬¤Ç¤¤ë¡£ ¥Õ¥¡¥¤¥ë¤Ï patch ¤¬ POSIX ½àµò¤Ç¤Ê¤¯¡¢ -E ¤Þ¤¿¤Ï --remove-empty-files ¥ª¥×¥·¥ç¥ó¤¬»ØÄê¤µ¤ì¤Ê¤¤¾ì¹ç¤Ëºï½ü¤µ¤ì¤ë¡£ ¥Õ¥¡¥¤¥ë¤òºîÀ®¤·¤¿¤êºï½ü¤·¤¿¤ê¤¹¤ë¥Ñ¥Ã¥Á¤òÀ¸À®¤¹¤ë´ÊÃ±¤ÊÊýË¡¤Ï¡¢ GNU diff ¤Î -N ¤Þ¤¿¤Ï --new-file ¥ª¥×¥·¥ç¥ó¤ò»È¤¦¤³¤È¤Ç¤¢¤ë¡£

¼õ¤±¼è¤Ã¤¿¿Í¤¬ -pN ¥ª¥×¥·¥ç¥ó¤ò»È¤¦¤³¤È¤¬ÁÛÄê¤µ¤ì¤ë¾ì¹ç¡¢ ¼¡¤Î¤è¤¦¤Ê¥Ñ¥Ã¥Á¤òÁ÷¤é¤Ê¤¤¤³¤È:

diff -Naur v2.0.29/prog/README prog/README

--- v2.0.29/prog/README Mon Mar 10 15:13:12 1997

+++ prog/README Mon Mar 17 14:58:22 1997

diff -Naur v2.0.29/prog/README v2.0.30/prog/README

--- v2.0.29/prog/README Mon Mar 10 15:13:12 1997

+++ v2.0.30/prog/README Mon Mar 17 14:58:22 1997

¥Ð¥Ã¥¯¥¢¥Ã¥×¥Õ¥¡¥¤¥ë¤ÈÌ¾Á°¤¬Æ±¤¸¥Õ¥¡¥¤¥ë¡¢Îã¤¨¤Ð README.orig ¤ÈÈæ³Ó¤·¤¿¥Ñ¥Ã¥Á¤òÁ÷¤é¤Ê¤¤¤³¤È¡£ ¤³¤ÎÊýË¡¤Ç¤Ï patch ¤¬º®Íð¤·¤Æ¡¢ Àµ¤·¤¤¥Õ¥¡¥¤¥ë¤Ç¤Ï¤Ê¤¯ ¥Ð¥Ã¥¯¥¢¥Ã¥×¥Õ¥¡¥¤¥ë¤Ë¥Ñ¥Ã¥Á¤òÅö¤Æ¤Æ¤·¤Þ¤¦¤«¤â¤·¤ì¤Ê¤¤¤«¤é¤Ç¤¢¤ë¡£ ¤½¤¦¤Ç¤Ï¤Ê¤¯¡¢ ¥Õ¥¡¥¤¥ëÌ¾¤¬Æ±¤¸¤ÇÊÌ¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤¢¤ë¥Õ¥¡¥¤¥ë¤É¤¦¤·¡¢Îã¤¨¤Ð old/README ¤È new/README ¤òÈæ³Ó¤·¤¿¥Ñ¥Ã¥Á¤òÁ÷¤ë¤³¤È¡£

¼«Æ°À¸À®¤µ¤ì¤ë¥Õ¥¡¥¤¥ë ( Îã¤¨¤Ð¡¢ makefile ¤Ë configure: configure.in ¤È¤¤¤¦¹Ô¤¬¤¢¤ë¾ì¹ç¤Î configure ¤È¤¤¤¦¥Õ¥¡¥¤¥ë ) ¤òÊÑ¹¹¤¹¤ë¥Ñ¥Ã¥Á¤òºî¤é¤Ê¤¤¤è¤¦¤Ë¤¹¤ë¤³¤È¡£ ¼õ¤±¼è¤Ã¤¿¿Í¤Ï¼«Æ°À¸À®¤µ¤ì¤ë¥Õ¥¡¥¤¥ë¤òºÆÀ¸À®¤¹¤ë¤³¤È¤¬¤Ç¤¤ë¤«¤é¤Ç¤¢¤ë¡£ ¼«Æ°À¸À®¤µ¤ì¤ë¥Õ¥¡¥¤¥ë¤Î diff ¤òÁ÷¤é¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤¾ì¹ç¡¢ UTC ¤òÍÑ¤¤¤Æ diff ¤òºî¤ê¡¢ ¼õ¤±¼è¤Ã¤¿¿Í¤Ë -Z ¤Þ¤¿¤Ï --set-utc ¥ª¥×¥·¥ç¥ó¤ò»È¤Ã¤Æ¥Ñ¥Ã¥Á¤òÅö¤Æ¤Æ¤â¤é¤¤¡¢ ¥Ñ¥Ã¥Á¤ÎÅö¤¿¤Ã¤¿¥Õ¥¡¥¤¥ë¤Ë°ÍÂ¸¤¹¤ë¡¢ ¥Ñ¥Ã¥Á¤ÎÅö¤¿¤Ã¤Æ¤¤¤Ê¤¤¥Õ¥¡¥¤¥ë¤òºï½ü¤·¤Æ¤â¤é¤¦ ( Îã¤¨¤Ð make clean ¤Ç ) ¡£

¥¨¥é¡¼¤È½ªÎ»¥¹¥Æ¡¼¥¿¥¹

¥¨¥é¡¼¤Ï°ìÈÌ¤Ë¡¢ patch ¤¬¥Ñ¥Ã¥Á¥Õ¥¡¥¤¥ë¤ò²òÀÏ¤Ç¤¤Ê¤«¤Ã¤¿¤³¤È¤ò¼¨¤·¤Æ¤¤¤ë¡£

--verbose ¥ª¥×¥·¥ç¥ó¤ò»ØÄê¤·¤¿¾ì¹ç¡¢ Hmm... ¤Ï¥Ñ¥Ã¥Á¥Õ¥¡¥¤¥ë¤ÎÃæ¤Ë½èÍý¤µ¤ì¤Ê¤«¤Ã¤¿¥Æ¥¥¹¥È¤¬¤¢¤ê¡¢ patch ¤¬¥Æ¥¥¹¥È¤ÎÃæ¤Ë¥Ñ¥Ã¥Á¤¬¤¢¤ë¤«¤É¤¦¤«¤ò É¬»à¤ËÃµ¤½¤¦¤È¤·¤Æ¤¤¤ë¤³¤È¤òÉ½¤·¤Æ¤¤¤ë¡£ ¥Ñ¥Ã¥Á¤¬¸«¤Ä¤«¤ë¤È¡¢¤½¤Î¥Ñ¥Ã¥Á¤¬¤É¤ó¤Ê¼ïÎà¤Î¤â¤Î¤«¤ò¼¨¤¹¡£

patch ¤Î½ªÎ»¥¹¥Æ¡¼¥¿¥¹¤Ï¡¢ ¤¹¤Ù¤Æ¤Î hunk ¤ÎÅ¬ÍÑ¤ËÀ®¸ù¤·¤¿¾ì¹ç¤Ë 0 ¡¢ °ìÉô¤Î hunk ¤¬Å¬ÍÑ¤Ç¤¤Ê¤«¤Ã¤¿¾ì¹ç¤Ë 1 ¡¢ ¤â¤Ã¤È¿¼¹ï¤ÊÌäÂê¤Ë¸«Éñ¤ï¤ì¤¿¾ì¹ç¤Ë 2 ¤È¤Ê¤ë¡£ ¥Ð¥Ã¥Á½èÍý¤ÇÊ£¿ô¤Î¥Ñ¥Ã¥Á¤òÅ¬ÍÑ¤¹¤ë¾ì¹ç¡¢ ½ªÎ»¥¹¥Æ¡¼¥¿¥¹¤ò¥Á¥§¥Ã¥¯¤·¤Æ¡¢ ÉôÊ¬Åª¤Ë¤·¤«¥Ñ¥Ã¥Á¤ÎÅö¤¿¤Ã¤Æ¤¤¤Ê¤¤¥Õ¥¡¥¤¥ë¤Ë °Ê¹ß¤Î¥Ñ¥Ã¥Á¤òÅö¤Æ¤Ê¤¤¤è¤¦¤Ë¤¹¤ë¤³¤È¤¬É¬Í×¤Ç¤¢¤ë¡£

·Ù¹ð

patch ¤Ï¡¢ ed ¥¹¥¯¥ê¥×¥ÈÃæ¤Î¹ÔÈÖ¹æ¤¬¤Ï¤ß½Ð¤·¤Æ¤¤¤ë¤«¤É¤¦¤«¤ÏÊ¬¤«¤é¤Ê¤¤¤·¡¢ ¥Î¡¼¥Þ¥ë diff ¤Î¹ÔÈÖ¹æ¤Î´Ö°ã¤¤¤Ï ÊÑ¹¹¤äºï½ü¤ò¸«¤Ä¤±¤¿¾ì¹ç¤Ë¸Â¤Ã¤Æ¸¡½Ð¤Ç¤¤ë¡£ fuzz factor ¤¬ 3 ¤Î¥³¥ó¥Æ¥¥¹¥È diff ¤âÆ±¤¸ÌäÂê¤ËÁø¶ø¤¹¤ë¤«¤â¤·¤ì¤Ê¤¤¡£ Å¬Åö¤ÊÂÐÏÃ¼°¤Î¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤¬Æ³Æþ¤µ¤ì¤ë¤Þ¤Ç¤Ï¡¢ ¤³¤Î¤è¤¦¤Ê¾ì¹ç¤Ï¥³¥ó¥Æ¥¥¹¥È diff ¤òºî¤Ã¤Æ ÊÑ¹¹¤¬ÂÅÅö¤«¤É¤¦¤«¤ò³ÎÇ§¤·¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤¡£ ¤â¤Á¤í¤ó¡¢¥¨¥é¡¼¤Ê¤¯¥³¥ó¥Ñ¥¤¥ë¤Ç¤¤¿¤³¤È¤Ï ¥Ñ¥Ã¥Á¤¬¤¦¤Þ¤¯Åö¤¿¤Ã¤¿¤è¤¤¾Úµò¤Ë¤Ê¤ë¤¬¡¢É¬¤º¤·¤â¤½¤¦¤È¤Ï¤¤¤¨¤Ê¤¤¡£

patch ¤ÏÂ¿¿ô¤Î¿äÂ¬¤¬É¬Í×¤Ê¾ì¹ç¤Ç¤¢¤Ã¤Æ¤â¡¢ÄÌ¾ï¤ÏÀµ¤·¤¤·ë²Ì¤ò½Ð¤¹¡£ ¤·¤«¤·¡¢·ë²Ì¤¬Àµ¤·¤¤¤³¤È¤¬ÊÝ¾Ú¤µ¤ì¤ë¤Î¤Ï¡¢ ¤½¤Î¥Ñ¥Ã¥Á¤¬À¸À®¤µ¤ì¤¿¥Õ¥¡¥¤¥ë¤ÈÁ´¤¯Æ±°ì¤Î¥Ð¡¼¥¸¥ç¥ó¤Î ¥Õ¥¡¥¤¥ë¤ËÅ¬ÍÑ¤µ¤ì¤¿¾ì¹ç¤À¤±¤Ç¤¢¤ë¡£

¸ß´¹À¤ÎÌäÂê

POSIX É¸½à¤Ï patch ¤Î¸ÅÅµÅª¤Ê¿¶¤ëÉñ¤¤¤È°Û¤Ê¤ë¿¶¤ëÉñ¤¤¤òµ¬Äê¤·¤Æ¤¤¤ë¡£ patch ¤Î¥Ð¡¼¥¸¥ç¥ó 2.1 ¤ª¤è¤Ó¤½¤ì°ÊÁ° ( ¤³¤ì¤é¤Ï POSIX ¤Ë ½àµò¤·¤Æ¤¤¤Ê¤¤ ) ¤È Áê¸ß¤Ë±¿ÍÑ¤·¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤¾ì¹ç¡¢¤³¤ì¤é¤Î°ã¤¤¤òÃÎ¤Ã¤Æ¤ª¤¯É¬Í×¤¬¤¢¤ë¡£

*

¸ÅÅµÅª¤Ê patch ¤Ç¤Ï¡¢ -p ¥ª¥×¥·¥ç¥ó¤Î°ú¿ô¤Ï¾ÊÎ¬²ÄÇ½¤Ç¤¢¤ê¡¢Ã±ÆÈ¤Î -p ¤Ï -p0 ¤ÈÆ±Åù¤Ç¤¢¤Ã¤¿¡£ º£Æü¤Î patch ¤Ç¤Ï -p ¥ª¥×¥·¥ç¥ó¤Ë°ú¿ô¤¬É¬¿Ü¤Ç¡¢ -p 0 ¤¬ -p0 ¤ÈÆ±Åù¤Ç¤¢¤ë¡£ ¸ß´¹À¤òºÇÂç¸Â¤ËÊÝ¤Ä¤¿¤á¤Ë¡¢ -p0 ¤ä -p1 ¤È¤¤¤Ã¤¿¥ª¥×¥·¥ç¥ó¤ò»È¤¦¡£

¤Þ¤¿¡¢¸ÅÅµÅª¤Ê patch ¤Ï¥Ñ¥¹¥×¥ì¥Õ¥£¥¯¥¹¤ò¼è¤ê½ü¤¯ºÝ¡¢¥¹¥é¥Ã¥·¥å¤Î¿ô¤òÃ±½ã¤Ë¿ô¤¨¤Æ¤¤¤¿¡£ º£Æü¤Î patch ¤Ï¥Ñ¥¹Ì¾¤ÎÍ×ÁÇ¤ò¿ô¤¨¤ë¡£ ¤Ä¤Þ¤ê¡¢ 1 ¸Ä¤Þ¤¿¤ÏÊ£¿ô¤ÎÎÙÀÜ¤¹¤ë¥¹¥é¥Ã¥·¥å¤ÎÎó¤Ï 1 ¸Ä¤Î¥¹¥é¥Ã¥·¥å¤È¤·¤Æ¿ô¤¨¤é¤ì¤ë¡£ ¸ß´¹À¤òºÇÂç¸Â¤ËÊÝ¤Ä¤¿¤á¤Ë¡¢ ¥Õ¥¡¥¤¥ëÌ¾¤Ë // ¤ò´Þ¤à¥Ñ¥Ã¥Á¤ÏÁ÷¤é¤Ê¤¤¤è¤¦¤Ë¤¹¤ë¤³¤È¡£

*

¸ÅÅµÅª¤Ê patch ¤Ç¤Ï¡¢¥Ç¥Õ¥©¥ë¥È¤Ç¥Ð¥Ã¥¯¥¢¥Ã¥×¤¬Í¸ú¤Ç¤¢¤Ã¤¿¡£ º£Æü¤Î patch ¤Ç¤Ï -b ¤Þ¤¿¤Ï --backup ¥ª¥×¥·¥ç¥ó¤ÇÍ¸ú¤Ë¤Ê¤ë¡£

È¿ÂÐ¤Ë¡¢ POSIX patch ¤Ç¤Ï¡¢ÉÔÀ°¹ç¤¬¤¢¤Ã¤Æ¤â¥Ð¥Ã¥¯¥¢¥Ã¥×¤Ï°ìÀÚºî¤é¤ì¤Ê¤¤¡£ GNU patch ¤Ç¤Ï¡¢¤³¤Î¿¶¤ëÉñ¤¤¤Ï --no-backup-if-mismatch ¥ª¥×¥·¥ç¥ó¤«¡¢ --posix ¥ª¥×¥·¥ç¥ó¤Þ¤¿¤Ï POSIXLY_CORRECT ´Ä¶ÊÑ¿ô¤Ç POSIX ½àµò¤Ë¤¹¤ë¤«¤ÇÍ¸ú¤Ë¤Ê¤ë¡£

¸ÅÅµÅª¤Ê patch ¤Î -b suffix ¥ª¥×¥·¥ç¥ó¤Ï GNU patch ¤Î -b -z suffix ¥ª¥×¥·¥ç¥ó¤ÈÆ±Åù¤Ç¤¢¤ë¡£

*

¸ÅÅµÅª¤Ê patch ¤Ï¡¢ ¥Ñ¥Ã¥Á¥Ø¥Ã¥À¤«¤é¥Ñ¥Ã¥Á¤òÅö¤Æ¤ë¥Õ¥¡¥¤¥ë¤ÎÌ¾Á°¤ò·èÄê¤¹¤ë¤Î¤Ë Ê£»¨¤Ê ( ¤·¤«¤â´°Á´¤Ë¤Ï¥É¥¥å¥á¥ó¥È¤Ë¤Ê¤Ã¤Æ¤¤¤Ê¤¤ ) ¼êË¡¤òÍÑ¤¤¤Æ¤¤¤¿¡£ ¤³¤Î¼êË¡¤Ï POSIX ¤Ë½àµò¤·¤Æ¤ª¤é¤º¡¢¤¤¤¯¤Ä¤«¸í¤ê¤â¤¢¤Ã¤¿¡£ º£Æü¤Î patch ¤Ï°Û¤Ê¤ë¡¢Æ±¤¸¤¯¤é¤¤Ê£»¨¤Ê (¤·¤«¤·¥É¥¥å¥á¥ó¥È¤Ï¤Þ¤·¤Ê) ¼êË¡¤òÍÑ¤¤¤Æ¤ª¤ê¡¢ ¥ª¥×¥·¥ç¥ó¤Ç POSIX ¤Ë½àµò¤¹¤ë¤³¤È¤¬¤Ç¤¤ë¡£ ¸í¤ê¤¬¸º¤Ã¤Æ¤¤¤ë¤È¤è¤¤¤Î¤À¤¬¡£ 2 ¤Ä¤Î¼êË¡¤Ï¡¢ ¥³¥ó¥Æ¥¥¹¥È diff ¤Î¥Ø¥Ã¥À¤Î¥Õ¥¡¥¤¥ëÌ¾¤È Index: ¤Î¹Ô¤¬¥×¥ì¥Õ¥£¥¯¥¹¤ò½ü¤¤¤ÆÁ´¤¯Æ±¤¸¤Ç¤¢¤ë¾ì¹ç¤Ë¤Ï¸ß´¹À¤¬¤¢¤ë¡£ ºî¤Ã¤¿¥Ñ¥Ã¥Á¤Ï¡¢ ¤½¤ì¤¾¤ì¤Î¥Ø¥Ã¥À¤Î¥Õ¥¡¥¤¥ëÌ¾¤¬¤¹¤Ù¤ÆÆ±¤¸¿ô¤Î¥¹¥é¥Ã¥·¥å¤ò´Þ¤ó¤Ç¤¤¤ì¤Ð¡¢ ÄÌ¾ï¤Ï¸ß´¹À¤¬¤¢¤ë¡£

*

¸ÅÅµÅª¤Ê patch ¤¬¥æ¡¼¥¶¤Ë¼ÁÌä¤ò¤¹¤ë¤È¤¤Ï¡¢ ¼ÁÌä¤òÉ¸½à¥¨¥é¡¼¤Ë½ÐÎÏ¤·¡¢ °Ê²¼¤Î¥ê¥¹¥È¤Î¤¦¤Á¥¿¡¼¥ß¥Ê¥ë¤Ç¤¢¤ëºÇ½é¤Î¥Õ¥¡¥¤¥ë¤«¤é²óÅú¤òµá¤á¤ë: É¸½à¥¨¥é¡¼¡¢É¸½à½ÐÎÏ¡¢ /dev/tty¡¢ É¸½àÆþÎÏ¡£ º£Æü¤Î patch ¤Ï¼ÁÌä¤ÏÉ¸½à½ÐÎÏ¤Ë½ÐÎÏ¤·¡¢ /dev/tty ¤«¤é²óÅú¤òÆÀ¤ë¡£ ²óÅú¤Î¥Ç¥Õ¥©¥ë¥È¤Î¤¦¤Á¤¤¤¯¤Ä¤«¤ÏÊÑ¹¹¤µ¤ì¤Æ¤ª¤ê¡¢ ¥Ç¥Õ¥©¥ë¥È¤Î²óÅú¤ò»È¤Ã¤Æ¤â patch ¤¬Ìµ¸Â¥ë¡¼¥×¤Ë´Ù¤é¤Ê¤¤¤è¤¦¤Ë¤Ê¤Ã¤Æ¤¤¤ë¡£

*

¸ÅÅµÅª¤Ê patch ¤Ï¡¢¼ºÇÔ¤·¤¿ hunk ¤Î¿ô¤ò¥¹¥Æ¡¼¥¿¥¹ÃÍ¤È¤·¤Æ½ªÎ»¤·¡¢ ËÜÅö¤ÎÌäÂê¤Ë½Ð¤¯¤ï¤·¤¿¾ì¹ç¤Ï 1 ¤ò¥¹¥Æ¡¼¥¿¥¹ÃÍ¤È¤·¤Æ¤¤¤¿¡£ º£Æü¤Î patch ¤Ï hunk ¤¬¼ºÇÔ¤¹¤ë¤È 1 ¤Ç½ªÎ»¤·¡¢ÌäÂê¤¬¤¢¤ë¾ì¹ç¤Ï 2 ¤Ç½ªÎ»¤¹¤ë¡£

*

GNU patch¡¢ ¸ÅÅµÅª patch¡¢ POSIX ½àµò¤Î patch ¤Î¤É¤ì¤ò»È¤¦¤«Ê¬¤«¤é¤Ê¤¤¿Í¤Ë°¸¤Æ¤Æ¼ê½ç¤òÁ÷¤ë¾ì¹ç¡¢ ¼¡¤Î¥ª¥×¥·¥ç¥ó°Ê³°¤Ï»È¤ï¤Ê¤¤¤³¤È¡£ °Ê²¼¤Î¥ê¥¹¥È¤Ç¤Ï¶õÇò¤â°ÕÌ£¤ò»ý¤Á¡¢°ú¿ô¤ÏÉ¬¿Ü¤Ç¤¢¤ë¡£


-c

-d dir

-D define

-e

-l

-n

-N

-o outfile

-pnum

-R

-r rejectfile

¥Ð¥°

¥Ð¥°¤ÏÅÅ»Ò¥á¡¼¥ë¤Ç <bug-gnu-utils@gnu.org> ¤ØÊó¹ð¤·¤Æ¤¯¤À¤µ¤¤¡£

patch ¤ÏÉôÊ¬°ìÃ×¤äÂç¤¤¯°ïÃ¦¤·¤¿¥ª¥Õ¥»¥Ã¥È¤ä¤Ò¤Ã¤¯¤êÊÖ¤Ã¤¿¥³¡¼¥É¤ËÂÐ¤·¤Æ ¤â¤Ã¤È¸¤¯¤¹¤ë¤³¤È¤â¤Ç¤¤ë¤À¤í¤¦¤¬¡¢¤½¤ÎÆ»¤ÏÄ¹¤¤¤À¤í¤¦¡£

¥³¡¼¥É¤¬½ÅÊ£¤·¤Æ¤¤¤ë¾ì¹ç ( Îã¤¨¤Ð #ifdef OLDCODE ... #else ... #endif ¤Î¤è¤¦¤Ë¶èÀÚ¤é¤ì¤Æ¤¤¤ë¾ì¹ç ) ¡¢ patch ¤ÏÎ¾Êý¤Î¥Ð¡¼¥¸¥ç¥ó¤Ë¥Ñ¥Ã¥Á¤òÅö¤Æ¤ë¤³¤È¤Ï¤Ç¤¤Ê¤¤¡£ ¤â¤·¥Ñ¥Ã¥Á¤¬Åö¤¿¤Ã¤¿¤È¤·¤¿¤é¡¢ ´Ö°ã¤Ã¤¿¤Û¤¦¤Ë¥Ñ¥Ã¥Á¤¬Åö¤¿¤Ã¤Æ¤·¤Þ¤Ã¤Æ¤¤¤ë¤³¤È¤â¤è¤¯¤¢¤ê¡¢ ¤½¤ì¤Ç¤âÀ®¸ù¤·¤¿¤«¤éÂ³¤¤ò¤ä¤ì¤È¤¤¤¦¤À¤í¤¦¡£

Ãøºî¸¢

Permission is granted to make and distribute verbatim copies of this manual provided the copyright notice and this permission notice are preserved on all copies.

Permission is granted to copy and distribute modified versions of this manual under the conditions for verbatim copying, provided that the entire resulting derived work is distributed under the terms of a permission notice identical to this one.

Permission is granted to copy and distribute translations of this manual into another language, under the above conditions for modified versions, except that this permission notice may be included in translations approved by the copyright holders instead of in the original English.

Ãø¼Ô

¥ª¥ê¥¸¥Ê¥ë¤Î patch ¤Ï Larry Wall ¤¬½ñ¤¤¤¿¡£ Paul Eggert ¤Ï×ó°ÕÅª¤ÊÀ©¸Â¤ò¼è¤ê½ü¤¡¢ ¥Ð¥¤¥Ê¥ê¥Õ¥¡¥¤¥ë¤Ø¤ÎÂÐ±þ¤ä¡¢¥Õ¥¡¥¤¥ë¤Î»þ¹ïÀßÄê¡¢¥Õ¥¡¥¤¥ë¤Îºï½ü¤òÄÉ²Ã¤·¤¿¡£ ¤Þ¤¿¡¢¤è¤ê POSIX ¤Ë½àµò¤¹¤ë¤è¤¦¤Ë¤·¤¿¡£ ¤Û¤«¤Ë¤Ï Wayne Davison ¤¬ unidiff ¤Ø¤ÎÂÐ±þ¤òÄÉ²Ã¤·¡¢ David MacKenzie ¤¬¥³¥ó¥Õ¥£¥°¥ì¡¼¥·¥ç¥ó¤È¥Ð¥Ã¥¯¥¢¥Ã¥×¤Ø¤ÎÂÐ±þ¤òÄÉ²Ã¤·¤¿¡£

Linux Certif

Toute la documentation sur la certification Linux LPI

Rechercher une page de manuel

patch

Sommaire

Ì¾Á°

½ñ¼°

ÀâÌÀ

¥ª¥×¥·¥ç¥ó

´Ä¶ÊÑ¿ô

¥Õ¥¡¥¤¥ë

´ØÏ¢¹àÌÜ

¥Ñ¥Ã¥Á¤òÁ÷¤ë¿Í¤Ø¤ÎÃí°Õ

¥¨¥é¡¼¤È½ªÎ»¥¹¥Æ¡¼¥¿¥¹

·Ù¹ð

¸ß´¹À¤ÎÌäÂê

¥Ð¥°

Ãøºî¸¢

Ãø¼Ô

Découvrir

Apprendre

Linux Certif

Toute la documentation sur la certification Linux LPI

Rechercher une page de manuel

patch

Sommaire

Ì¾Á°

½ñ¼°

ÀâÌÀ

¥ª¥×¥·¥ç¥ó

´Ä¶­ÊÑ¿ô

¥Õ¥¡¥¤¥ë

´ØÏ¢¹àÌÜ

¥Ñ¥Ã¥Á¤òÁ÷¤ë¿Í¤Ø¤ÎÃí°Õ

¥¨¥é¡¼¤È½ªÎ»¥¹¥Æ¡¼¥¿¥¹

·Ù¹ð

¸ß´¹À­¤ÎÌäÂê

¥Ð¥°

Ãøºî¸¢

Ãø¼Ô

Découvrir

Apprendre

Partager

´Ä¶ÊÑ¿ô

¸ß´¹À¤ÎÌäÂê