#, fuzzy msgid "" msgstr "" "Project-Id-Version: man-pages-l10n VERSION\n" "POT-Creation-Date: 2014-07-17 17:57+0900\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" #. type: TH #: man-pages-posix/man1p/diff.1p:2 #, no-wrap msgid "DIFF" msgstr "" #. type: TH #: man-pages-posix/man1p/diff.1p:2 #, no-wrap msgid "2013" msgstr "" #. type: TH #: man-pages-posix/man1p/diff.1p:2 #, no-wrap msgid "IEEE/The Open Group" msgstr "" #. type: TH #: man-pages-posix/man1p/diff.1p:2 #, no-wrap msgid "POSIX Programmer's Manual" msgstr "" #. type: SH #: man-pages-posix/man1p/diff.1p:3 #, no-wrap msgid "PROLOG" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:8 msgid "" "This manual page is part of the POSIX Programmer's Manual. The Linux " "implementation of this interface may differ (consult the corresponding Linux " "manual page for details of Linux behavior), or the interface may not be " "implemented on Linux." msgstr "" #. type: SH #: man-pages-posix/man1p/diff.1p:9 #, no-wrap msgid "NAME" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:12 msgid "diff \\(em compare two files" msgstr "" #. type: SH #: man-pages-posix/man1p/diff.1p:12 #, no-wrap msgid "SYNOPSIS" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:16 #, no-wrap msgid "" "diff B<[>\\(mic|\\(mie|\\(mif|\\(miu|\\(miC I|\\(miU IB<] [>\\(mibrB<] " ">I\n" msgstr "" #. type: SH #: man-pages-posix/man1p/diff.1p:17 #, no-wrap msgid "DESCRIPTION" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:30 msgid "" "The I utility shall compare the contents of I and I and " "write to standard output a list of changes necessary to convert I " "into I. This list should be minimal. No output shall be produced if " "the files are identical." msgstr "" #. type: SH #: man-pages-posix/man1p/diff.1p:30 #, no-wrap msgid "OPTIONS" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:35 msgid "" "The I utility shall conform to the Base Definitions volume of POSIX." "1\\(hy2008, I
, I." msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:37 msgid "The following options shall be supported:" msgstr "" #. type: IP #: man-pages-posix/man1p/diff.1p:37 #, no-wrap msgid "B<\\(mib>" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:46 msgid "" "Cause any amount of white space at the end of a line to be treated as a " "single EnewlineE (that is, the white-space characters preceding the " "EnewlineE are ignored) and other strings of white-space characters, " "not including EnewlineE characters, to compare equal." msgstr "" #. type: IP #: man-pages-posix/man1p/diff.1p:46 #, no-wrap msgid "B<\\(mic>" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:48 msgid "Produce output in a form that provides three lines of copied context." msgstr "" #. type: IP #: man-pages-posix/man1p/diff.1p:48 #, no-wrap msgid "B<\\(miC\\ >I" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:54 msgid "" "Produce output in a form that provides I lines of copied context (where " "I shall be interpreted as a positive decimal integer)." msgstr "" #. type: IP #: man-pages-posix/man1p/diff.1p:54 #, no-wrap msgid "B<\\(mie>" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:61 msgid "" "Produce output in a form suitable as input for the I utility, which can " "then be used to convert I into I." msgstr "" #. type: IP #: man-pages-posix/man1p/diff.1p:61 #, no-wrap msgid "B<\\(mif>" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:67 msgid "" "Produce output in an alternative form, similar in format to B<\\(mie>, but " "not intended to be suitable as input for the I utility, and in the " "opposite order." msgstr "" #. type: IP #: man-pages-posix/man1p/diff.1p:67 #, no-wrap msgid "B<\\(mir>" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:75 msgid "" "Apply I recursively to files and directories of the same name when " "I and I are both directories." msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:85 msgid "" "The I utility shall detect infinite loops; that is, entering a " "previously visited directory that is an ancestor of the last file " "encountered. When it detects an infinite loop, I shall write a " "diagnostic message to standard error and shall either recover its position " "in the hierarchy or terminate." msgstr "" #. type: IP #: man-pages-posix/man1p/diff.1p:86 #, no-wrap msgid "B<\\(miu>" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:88 msgid "Produce output in a form that provides three lines of unified context." msgstr "" #. type: IP #: man-pages-posix/man1p/diff.1p:88 #, no-wrap msgid "B<\\(miU\\ >I" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:94 msgid "" "Produce output in a form that provides I lines of unified context (where " "I shall be interpreted as a non-negative decimal integer)." msgstr "" #. type: SH #: man-pages-posix/man1p/diff.1p:94 #, no-wrap msgid "OPERANDS" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:96 msgid "The following operands shall be supported:" msgstr "" #. type: IP #: man-pages-posix/man1p/diff.1p:96 #, no-wrap msgid "I,\\ I" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:104 msgid "" "A pathname of a file to be compared. If either the I or I " "operand is B<'\\(mi'>, the standard input shall be used in its place." msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:119 msgid "" "If both I and I are directories, I shall not compare " "block special files, character special files, or FIFO special files to any " "files and shall not compare regular files to directories. Further details " "are as specified in I. The behavior of " "I on other file types is implementation-defined when found in " "directories." msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:129 msgid "" "If only one of I and I is a directory, I shall be " "applied to the non-directory file and the file contained in the directory " "file with a filename that is the same as the last component of the non-" "directory file." msgstr "" #. type: SH #: man-pages-posix/man1p/diff.1p:129 #, no-wrap msgid "STDIN" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:135 msgid "" "The standard input shall be used only if one of the I or I " "operands references standard input. See the INPUT FILES section." msgstr "" #. type: SH #: man-pages-posix/man1p/diff.1p:135 #, no-wrap msgid "INPUT FILES" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:137 msgid "The input files may be of any type." msgstr "" #. type: SH #: man-pages-posix/man1p/diff.1p:137 #, no-wrap msgid "ENVIRONMENT VARIABLES" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:140 msgid "" "The following environment variables shall affect the execution of I:" msgstr "" #. type: IP #: man-pages-posix/man1p/diff.1p:140 #, no-wrap msgid "I" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:146 msgid "" "Provide a default value for the internationalization variables that are " "unset or null. (See the Base Definitions volume of POSIX.1\\(hy2008, " "I
, I for the precedence of " "internationalization variables used to determine the values of locale " "categories.)" msgstr "" #. type: IP #: man-pages-posix/man1p/diff.1p:146 #, no-wrap msgid "I" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:149 msgid "" "If set to a non-empty string value, override the values of all the other " "internationalization variables." msgstr "" #. type: IP #: man-pages-posix/man1p/diff.1p:149 #, no-wrap msgid "I" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:153 msgid "" "Determine the locale for the interpretation of sequences of bytes of text " "data as characters (for example, single-byte as opposed to multi-byte " "characters in arguments and input files)." msgstr "" #. type: IP #: man-pages-posix/man1p/diff.1p:153 #, no-wrap msgid "I" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:158 msgid "" "Determine the locale that should be used to affect the format and contents " "of diagnostic messages written to standard error and informative messages " "written to standard output." msgstr "" #. type: IP #: man-pages-posix/man1p/diff.1p:158 #, no-wrap msgid "I" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:165 msgid "" "Determine the locale for affecting the format of file timestamps written " "with the B<\\(miC> and B<\\(mic> options." msgstr "" #. type: IP #: man-pages-posix/man1p/diff.1p:165 #, no-wrap msgid "I" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:168 msgid "" "Determine the location of message catalogs for the processing of " "I." msgstr "" #. type: IP #: man-pages-posix/man1p/diff.1p:168 #, no-wrap msgid "I" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:173 msgid "" "Determine the timezone used for calculating file timestamps written with a " "context format. If I is unset or null, an unspecified default timezone " "shall be used." msgstr "" #. type: SH #: man-pages-posix/man1p/diff.1p:173 #, no-wrap msgid "ASYNCHRONOUS EVENTS" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:175 man-pages-posix/man1p/diff.1p:751 msgid "Default." msgstr "" #. type: SH #: man-pages-posix/man1p/diff.1p:175 #, no-wrap msgid "STDOUT" msgstr "" #. type: SS #: man-pages-posix/man1p/diff.1p:176 #, no-wrap msgid "Diff Directory Comparison Format" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:183 msgid "" "If both I and I are directories, the following output formats " "shall be used." msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:186 msgid "" "In the POSIX locale, each file that is present in only one directory shall " "be reported using the following format:" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:191 #, no-wrap msgid "" "B<\n" "\"Only in %s: %s\\en\", E>IB, " "E>IE\n" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:197 msgid "" "In the POSIX locale, subdirectories that are common to the two directories " "may be reported with the following format:" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:203 #, no-wrap msgid "" "B<\n" "\"Common subdirectories: %s and %s\\en\", E>IE,\n" " EIE\n" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:214 msgid "" "For each file common to the two directories, if the two files are not to be " "compared: if the two files have the same device ID and file serial number, " "or are both block special files that refer to the same device, or are both " "character special files that refer to the same device, in the POSIX locale " "the output format is unspecified. Otherwise, in the POSIX locale an " "unspecified format shall be used that contains the pathnames of the two " "files." msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:218 msgid "" "For each file common to the two directories, if the files are compared and " "are identical, no output shall be written. If the two files differ, the " "following format is written:" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:223 #, no-wrap msgid "" "B<\n" "\"diff %s %s %s\\en\", E>IE, EIE, " "EIE\n" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:229 msgid "" "where EIE are the options as specified on the command " "line." msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:233 msgid "" "All directory pathnames listed in this section shall be relative to the " "original command line arguments. All other names of files listed in this " "section shall be filenames (pathname components)." msgstr "" #. type: SS #: man-pages-posix/man1p/diff.1p:233 #, no-wrap msgid "Diff Binary Output Format" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:242 msgid "" "In the POSIX locale, if one or both of the files being compared are not text " "files, it is implementation-defined whether I uses the binary file " "output format or the other formats as specified below. The binary file " "output format shall contain the pathnames of two files being compared and " "the string B<\"differ\">." msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:246 msgid "" "If both files being compared are text files, depending on the options " "specified, one of the following formats shall be used to write the " "differences." msgstr "" #. type: SS #: man-pages-posix/man1p/diff.1p:246 #, no-wrap msgid "Diff Default Output Format" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:259 msgid "" "The default (without B<\\(mie>, B<\\(mif>, B<\\(mic>, B<\\(miC>, B<\\(miu>, " "or B<\\(miU> options) I utility output shall contain lines of these " "forms:" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:264 #, no-wrap msgid "B<\n" "\"%da%d\\en\", E>IE, EIE\n" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:266 #, no-wrap msgid "" "\"%da%d,%d\\en\", EIE, EIE, EIE\n" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:268 #, no-wrap msgid "\"%dd%d\\en\", EIE, EIE\n" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:270 #, no-wrap msgid "" "\"%d,%dd%d\\en\", EIE, EIE, EIE\n" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:272 #, no-wrap msgid "\"%dc%d\\en\", EIE, EIE\n" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:274 #, no-wrap msgid "" "\"%d,%dc%d\\en\", EIE, EIE, EIE\n" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:276 #, no-wrap msgid "" "\"%dc%d,%d\\en\", EIE, EIE, EIE\n" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:278 #, no-wrap msgid "" "\"%d,%dc%d,%d\\en\", EIE, EIE, " "EIE, EIE\n" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:307 msgid "" "These lines resemble I subcommands to convert I into I. " "The line numbers before the action letters shall pertain to I; those " "after shall pertain to I. Thus, by exchanging I for I and " "reading the line in reverse order, one can also determine how to convert " "I into I. As in I, identical pairs (where I= " "I) are abbreviated as a single number." msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:312 msgid "" "Following each of these lines, I shall write to standard output all " "lines affected in the first file using the format:" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:317 #, no-wrap msgid "B<\n" "\"E %s\", E>IE\n" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:322 msgid "and all lines affected in the second file using the format:" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:327 #, no-wrap msgid "B<\n" "\"E %s\", E>IE\n" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:340 msgid "" "If there are lines affected in both I and I (as with the B " "subcommand), the changes are separated with a line consisting of three " "EhyphenE characters:" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:345 #, no-wrap msgid "B<\n" "\"\\(mi\\|\\(mi\\|\\(mi\\en\">\n" msgstr "" #. type: SS #: man-pages-posix/man1p/diff.1p:348 #, no-wrap msgid "Diff \\(mie Output Format" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:379 msgid "" "With the B<\\(mie> option, a script shall be produced that shall, when " "provided as input to I, along with an appended B (write) command, " "convert I into I. Only the B (append), B (change), B " "(delete), B (insert), and B (substitute) commands of I shall be " "used in this script. Text lines, except those consisting of the single " "character EperiodE (B<'.'>), shall be output as they appear in the " "file." msgstr "" #. type: SS #: man-pages-posix/man1p/diff.1p:379 #, no-wrap msgid "Diff \\(mif Output Format" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:387 msgid "" "With the B<\\(mif> option, an alternative format of script shall be produced." " It is similar to that produced by B<\\(mie>, with the following differences:" "" msgstr "" #. type: IP #: man-pages-posix/man1p/diff.1p:387 #, no-wrap msgid " 1." msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:393 msgid "" "It is expressed in reverse sequence; the output of B<\\(mie> orders changes " "from the end of the file to the beginning; the B<\\(mif> from beginning to " "end." msgstr "" #. type: IP #: man-pages-posix/man1p/diff.1p:393 #, no-wrap msgid " 2." msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:402 msgid "" "The command form EIE EIE used by " "B<\\(mie> is reversed. For example, 10I with B<\\(mie> would be I10 " "with B<\\(mif>." msgstr "" #. type: IP #: man-pages-posix/man1p/diff.1p:402 #, no-wrap msgid " 3." msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:407 msgid "" "The form used for ranges of line numbers is EspaceE-separated, " "rather than EcommaE-separated." msgstr "" #. type: SS #: man-pages-posix/man1p/diff.1p:407 #, no-wrap msgid "Diff \\(mic or \\(miC Output Format" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:426 msgid "" "With the B<\\(mic> or B<\\(miC> option, the output format shall consist of " "affected lines along with surrounding lines of context. The affected lines " "shall show which ones need to be deleted or changed in I, and those " "added from I. With the B<\\(mic> option, three lines of context, if " "available, shall be written before and after the affected lines. With the " "B<\\(miC> option, the user can specify how many lines of context are written." " The exact format follows." msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:429 man-pages-posix/man1p/diff.1p:581 msgid "" "The name and last modification time of each file shall be output in the " "following format:" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:435 #, no-wrap msgid "" "B<\n" "\"*** %s %s\\en\", >I, EIE\n" "\"\\(mi\\|\\(mi\\|\\(mi %s %s\\en\", I, EIE\n" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:442 msgid "" "Each EIE field shall be the pathname of the corresponding file " "being compared. The pathname written for standard input is unspecified." msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:445 msgid "" "In the POSIX locale, each EIE field shall be equivalent " "to the output from the following command:" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:450 #, no-wrap msgid "B<\n" "date \"+%a %b %e %T %Y\">\n" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:458 man-pages-posix/man1p/diff.1p:617 msgid "" "without the trailing EnewlineE, executed at the time of last " "modification of the corresponding file (or the current time, if the file is " "standard input)." msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:461 man-pages-posix/man1p/diff.1p:640 msgid "" "Then, the following output formats shall be applied for every set of changes." "" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:463 msgid "First, a line shall be written in the following format:" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:468 #, no-wrap msgid "B<\n" "\"***************\\en\">\n" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:476 msgid "" "Next, the range of lines in I shall be written in the following " "format if the range contains two or more lines:" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:481 #, no-wrap msgid "" "B<\n" "\"*** %d,%d ****\\en\", E>IE, EIE\n" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:486 man-pages-posix/man1p/diff.1p:544 msgid "and the following format otherwise:" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:491 #, no-wrap msgid "B<\n" "\"*** %d ****\\en\", E>IE\n" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:497 msgid "" "The ending line number of an empty range shall be the number of the " "preceding line, or 0 if the range is at the start of the file." msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:501 msgid "" "Next, the affected lines along with lines of context (unaffected lines) " "shall be written. Unaffected lines shall be written in the following format:" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:506 #, no-wrap msgid "B<\n" "\" %s\", E>IE\n" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:511 msgid "Deleted lines shall be written as:" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:516 #, no-wrap msgid "B<\n" "\"\\(mi %s\", E>IE\n" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:521 msgid "Changed lines shall be written as:" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:526 #, no-wrap msgid "B<\n" "\"! %s\", E>IE\n" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:534 msgid "" "Next, the range of lines in I shall be written in the following " "format if the range contains two or more lines:" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:539 #, no-wrap msgid "" "B<\n" "\"\\(mi\\|\\(mi\\|\\(mi %d,%d \\(mi\\|\\(mi\\|\\(mi\\|\\(mi\\en\", " "E>IE, EIE\n" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:549 #, no-wrap msgid "" "B<\n" "\"\\(mi\\|\\(mi\\|\\(mi %d \\(mi\\|\\(mi\\|\\(mi\\|\\(mi\\en\", " "E>IE\n" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:557 msgid "" "Then, lines of context and changed lines shall be written as described in " "the previous formats. Lines added from I shall be written in the " "following format:" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:562 #, no-wrap msgid "B<\n" "\"+ %s\", E>IE\n" msgstr "" #. type: SS #: man-pages-posix/man1p/diff.1p:565 #, no-wrap msgid "Diff \\(miu or \\(miU Output Format" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:578 msgid "" "The B<\\(miu> or B<\\(miU> options behave like the B<\\(mic> or B<\\(miC> " "options, except that the context lines are not repeated; instead, the " "context, deleted, and added lines are shown together, interleaved. The " "exact format follows." msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:587 #, no-wrap msgid "" "B<\n" "\"--- %s\\t%s%s %s\\n\", file1, Efile1 timestampE, Efile1 " "fracE, Efile1 zoneE\n" "\"+++ %s\\t%s%s %s\\n\", file2, Efile2 timestampE, Efile2 " "fracE, Efile2 zoneE>\n" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:601 msgid "" "Each EIE field shall be the pathname of the corresponding file " "being compared, or the single character B<'\\(mi'> if standard input is " "being compared. However, if the pathname contains a EtabE or a " "EnewlineE, or if it does not consist entirely of characters taken " "from the portable character set, the behavior is implementation-defined." msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:604 msgid "" "Each EIE field shall be equivalent to the output from the " "following command:" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:609 #, no-wrap msgid "B<\n" "date '+%Y-%m-%d %H:%M:%S'>\n" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:623 msgid "" "Each EIE field shall be either empty, or a decimal point " "followed by at least one decimal digit, indicating the fractional-seconds " "part (if any) of the file timestamp. The number of fractional digits shall " "be at least the number needed to represent the file's timestamp without loss " "of information." msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:637 msgid "" "Each EIE field shall be of the form B<\"shhmm\">, where " "B<\"shh\"> is a signed two-digit decimal number in the range \\(mi24 through " "+25, and B<\"mm\"> is an unsigned two-digit decimal number in the range 00 " "through 59. It represents the timezone of the timestamp as the number of " "hours (hh) and minutes (mm) east (+) or west (\\(mi) of UTC for the " "timestamp. If the hours and minutes are both zero, the sign shall be B<'+'>." " However, if the timezone is not an integral number of minutes away from " "UTC, the EIE field is implementation-defined." msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:643 msgid "" "First, the range of lines in each file shall be written in the following " "format:" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:648 #, no-wrap msgid "B<\n" "\"@@ -%s +%s @@\", Efile1 rangeE, Efile2 rangeE>\n" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:653 msgid "Each EIE field shall be of the form:" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:658 #, no-wrap msgid "B<\n" "\"%1d\", Ebeginning line numberE>\n" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:663 msgid "if the range contains exactly one line, and:" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:668 #, no-wrap msgid "" "B<\n" "\"%1d,%1d\", Ebeginning line numberE, Enumber of linesE>\n" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:675 msgid "" "otherwise. If a range is empty, its beginning line number shall be the " "number of the line just before the range, or 0 if the empty range starts the " "file." msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:678 msgid "" "Next, the affected lines along with lines of context shall be written. Each " "non-empty unaffected line shall be written in the following format:" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:683 #, no-wrap msgid "B<\n" "\" %s\", Eunaffected_lineE>\n" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:699 msgid "" "where the contents of the unaffected line shall be taken from I. It " "is implementation-defined whether an empty unaffected line is written as an " "empty line or a line containing a single EspaceE character. This " "line also represents the same line of I, even though I's line " "may contain different contents due to the B<\\(mib>. Deleted lines shall be " "written as:" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:704 #, no-wrap msgid "B<\n" "\"-%s\", Edeleted_lineE>\n" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:709 msgid "Added lines shall be written as:" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:714 #, no-wrap msgid "B<\n" "\"+%s\", Eadded_lineE>\n" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:721 msgid "" "The order of lines written shall be the same as that of the corresponding " "file. A deleted line shall never be written immediately after an added line." msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:735 msgid "" "If B<\\(miU> I is specified, the output shall contain no more than I " "consecutive unaffected lines; and if the output contains an affected line " "and this line is adjacent to up to I consecutive unaffected lines in the " "corresponding file, the output shall contain these unaffected lines. " "B<\\(miu> shall act like B<\\(miU>3." msgstr "" #. type: SH #: man-pages-posix/man1p/diff.1p:735 #, no-wrap msgid "STDERR" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:737 msgid "The standard error shall be used only for diagnostic messages." msgstr "" #. type: SH #: man-pages-posix/man1p/diff.1p:737 #, no-wrap msgid "OUTPUT FILES" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:739 man-pages-posix/man1p/diff.1p:741 man-pages-posix/man1p/diff.1p:976 msgid "None." msgstr "" #. type: SH #: man-pages-posix/man1p/diff.1p:739 #, no-wrap msgid "EXTENDED DESCRIPTION" msgstr "" #. type: SH #: man-pages-posix/man1p/diff.1p:741 #, no-wrap msgid "EXIT STATUS" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:743 msgid "The following exit values shall be returned:" msgstr "" #. type: IP #: man-pages-posix/man1p/diff.1p:743 #, no-wrap msgid "\\00" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:745 msgid "No differences were found." msgstr "" #. type: IP #: man-pages-posix/man1p/diff.1p:745 #, no-wrap msgid "\\01" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:747 msgid "Differences were found." msgstr "" #. type: IP #: man-pages-posix/man1p/diff.1p:747 #, no-wrap msgid "E1" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:749 msgid "An error occurred." msgstr "" #. type: SH #: man-pages-posix/man1p/diff.1p:749 #, no-wrap msgid "CONSEQUENCES OF ERRORS" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:753 msgid "I" msgstr "" #. type: SH #: man-pages-posix/man1p/diff.1p:753 #, no-wrap msgid "APPLICATION USAGE" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:762 msgid "" "If lines at the end of a file are changed and other lines are added, I " "output may show this as a delete and add, as a change, or as a change and " "add; I is not expected to know which happened and users should not " "care about the difference in output as long as it clearly shows the " "differences between the files." msgstr "" #. type: SH #: man-pages-posix/man1p/diff.1p:762 #, no-wrap msgid "EXAMPLES" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:780 msgid "" "If B is a directory containing a directory named B, B is a " "directory containing a directory named B, B and B both " "contain files named B, and B contains a file named B, " "the command:" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:785 #, no-wrap msgid "B<\n" "diff \\(mir dir1 dir2>\n" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:790 msgid "could produce output similar to:" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:801 #, no-wrap msgid "" "B<\n" "Common subdirectories: dir1/x and dir2/x\n" "Only in dir2/x: y\n" "diff \\(mir dir1/x/date.out dir2/x/date.out\n" "1c1\n" "E Mon Jul 2 13:12:16 PDT 1990\n" "\\(mi\\|\\(mi\\|\\(mi\n" "E Tue Jun 19 21:41:39 PDT 1990>\n" msgstr "" #. type: SH #: man-pages-posix/man1p/diff.1p:804 #, no-wrap msgid "RATIONALE" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:809 msgid "" "The B<\\(mih> option was omitted because it was insufficiently specified and " "does not add to applications portability." msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:818 msgid "" "Historical implementations employ algorithms that do not always produce a " "minimum list of differences; the current language about making every effort " "is the best this volume of POSIX.1\\(hy2008 can do, as there is no metric " "that could be employed to judge the quality of implementations against any " "and all file contents. The statement ``This list should be minimal'' clearly " "implies that implementations are not expected to provide the following " "output when comparing two 100-line files that differ in only one character " "on a single line:" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:826 #, no-wrap msgid "" "B<\n" "1,100c1,100\n" "all 100 lines from file1 preceded with \"E \"\n" "\\(mi\\|\\(mi\\|\\(mi\n" "all 100 lines from file2 preceded with \"E \">\n" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:843 msgid "" "The ``Only in'' messages required when the B<\\(mir> option is specified are " "not used by most historical implementations if the B<\\(mie> option is also " "specified. It is required here because it provides useful information that " "must be provided to update a target directory hierarchy to match a source " "hierarchy. The ``Common subdirectories'' messages are written by System V " "and 4.3 BSD when the B<\\(mir> option is specified. They are allowed here " "but are not required because they are reporting on something that is the " "same, not reporting a difference, and are not needed to update a target " "hierarchy." msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:884 msgid "" "The B<\\(mic> option, which writes output in a format using lines of " "context, has been included. The format is useful for a variety of reasons, " "among them being much improved readability and the ability to understand " "difference changes when the target file has line numbers that differ from " "another similar, but slightly different, copy. The I utility is most " "valuable when working with difference listings using a context format. The " "BSD version of B<\\(mic> takes an optional argument specifying the amount of " "context. Rather than overloading B<\\(mic> and breaking the Utility Syntax " "Guidelines for I, the standard developers decided to add a separate " "option for specifying a context diff with a specified amount of context " "(B<\\(miC>). Also, the format for context Is was extended slightly in " "4.3 BSD to allow multiple changes that are within context lines from each " "other to be merged together. The output format contains an additional four " "EasteriskE characters after the range of affected lines in the first " "filename. This was to provide a flag for old programs (like old versions of " "I) that only understand the old context format. The version of " "context described here does not require that multiple changes within context " "lines be merged, but it does not prohibit it either. The extension is " "upwards-compatible, so any vendors that wish to retain the old version of " "I can do so by adding the extra four EasteriskE characters " "(that is, utilities that currently use I and understand the new merged " "format will also understand the old unmerged format, but not I)." msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:906 msgid "" "The B<\\(miu> and B<\\(miU> options of GNU I have been included. Their " "output format, designed by Wayne Davison, takes up less space than B<\\(mic> " "and B<\\(miC> format, and in many cases is easier to read. The format's " "timestamps do not vary by locale, so I does not affect it. The " "format's line numbers are rendered with the B<%1d> format, not B<%d>, " "because the file format notation rules would allow extra EblankE " "characters to appear around the numbers." msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:918 msgid "" "The substitute command was added as an additional format for the B<\\(mie> " "option. This was added to provide implementations with a way to fix the " "classic ``dot alone on a line'' bug present in many versions of I. " "Since many implementations have fixed this bug, the standard developers " "decided not to standardize broken behavior, but rather to provide the " "necessary tool for fixing the bug. One way to fix this bug is to output two " "periods whenever a lone period is needed, then terminate the append command " "with a period, and then use the substitute command to convert the two " "periods into one period." msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:928 msgid "" "The BSD-derived B<\\(mir> option was added to provide a mechanism for using " "I to compare two file system trees. This behavior is useful, is " "standard practice on all BSD-derived systems, and is not easily reproducible " "with the I utility." msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:946 msgid "" "The requirement that I not compare files in some circumstances, even " "though they have the same name, is based on the actual output of historical " "implementations. The specified behavior precludes the problems arising from " "running into FIFOs and other files that would cause I to hang waiting " "for input with no indication to the user that I was hung. An earlier " "version of this standard specified the output format more precisely, but in " "practice this requirement was widely ignored and the benefit of " "standardization seemed small, so it is now unspecified. In most common " "usage, I B<\\(mir> should indicate differences in the file " "hierarchies, not the difference of contents of devices pointed to by the " "hierarchies." msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:954 msgid "" "Many early implementations of I require seekable files. Since the " "System Interfaces volume of POSIX.1\\(hy2008 supports named pipes, the " "standard developers decided that such a restriction was unreasonable. Note " "also that the allowed filename B<\\(mi> almost always refers to a pipe." msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:961 msgid "" "No directory search order is specified for I. The historical ordering " "is, in fact, not optimal, in that it prints out all of the differences at " "the current level, including the statements about all common subdirectories " "before recursing into those subdirectories." msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:963 msgid "The message:" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:968 #, no-wrap msgid "" "B<\n" "\"diff %s %s %s\\en\", E>IB, " "E>IB, E>IB>\n" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:974 msgid "" "does not vary by locale because it is the representation of a command, not " "an English sentence." msgstr "" #. type: SH #: man-pages-posix/man1p/diff.1p:974 #, no-wrap msgid "FUTURE DIRECTIONS" msgstr "" #. type: SH #: man-pages-posix/man1p/diff.1p:976 #, no-wrap msgid "SEE ALSO" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:981 msgid "I\\^, I\\^, I\\^, I\\^" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:985 msgid "" "The Base Definitions volume of POSIX.1\\(hy2008, I, I, I
, I" msgstr "" #. type: SH #: man-pages-posix/man1p/diff.1p:985 #, no-wrap msgid "COPYRIGHT" msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:996 msgid "" "Portions of this text are reprinted and reproduced in electronic form from " "IEEE Std 1003.1, 2013 Edition, Standard for Information Technology -- " "Portable Operating System Interface (POSIX), The Open Group Base " "Specifications Issue 7, Copyright (C) 2013 by the Institute of Electrical " "and Electronics Engineers, Inc and The Open Group. (This is POSIX.1-2008 " "with the 2013 Technical Corrigendum 1 applied.) In the event of any " "discrepancy between this version and the original IEEE and The Open Group " "Standard, the original IEEE and The Open Group Standard is the referee " "document. The original Standard can be obtained online at http://www.unix." "org/online.html ." msgstr "" #. type: Plain text #: man-pages-posix/man1p/diff.1p:1001 msgid "" "Any typographical or formatting errors that appear in this page are most " "likely to have been introduced during the conversion of the source files to " "man page format. To report such errors, see https://www.kernel.org/doc/man-" "pages/reporting_bugs.html ." msgstr ""