[673b0d8] | 1 | <?xml version="1.0" encoding="ISO-8859-1"?>
|
---|
[b06ca36] | 2 | <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
|
---|
| 3 | "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
|
---|
[673b0d8] | 4 | <!ENTITY % general-entities SYSTEM "../general.ent">
|
---|
| 5 | %general-entities;
|
---|
| 6 | ]>
|
---|
[54e422c1] | 7 |
|
---|
[81fd230] | 8 | <sect1 id="ch-system-diffutils" role="wrap">
|
---|
[54e422c1] | 9 | <?dbhtml filename="diffutils.html"?>
|
---|
| 10 |
|
---|
[e747759] | 11 | <sect1info condition="script">
|
---|
| 12 | <productname>diffutils</productname>
|
---|
| 13 | <productnumber>&diffutils-version;</productnumber>
|
---|
| 14 | <address>&diffutils-url;</address>
|
---|
| 15 | </sect1info>
|
---|
| 16 |
|
---|
[54e422c1] | 17 | <title>Diffutils-&diffutils-version;</title>
|
---|
| 18 |
|
---|
| 19 | <indexterm zone="ch-system-diffutils">
|
---|
| 20 | <primary sortas="a-Diffutils">Diffutils</primary>
|
---|
| 21 | </indexterm>
|
---|
| 22 |
|
---|
| 23 | <sect2 role="package">
|
---|
| 24 | <title/>
|
---|
[673b0d8] | 25 |
|
---|
[54e422c1] | 26 | <para>The Diffutils package contains programs that show the differences
|
---|
| 27 | between files or directories.</para>
|
---|
[6370fa6] | 28 |
|
---|
[54e422c1] | 29 | <segmentedlist>
|
---|
| 30 | <segtitle>&buildtime;</segtitle>
|
---|
| 31 | <segtitle>&diskspace;</segtitle>
|
---|
[5888299] | 32 |
|
---|
[54e422c1] | 33 | <seglistitem>
|
---|
[e4a5635] | 34 | <seg>&diffutils-ch6-sbu;</seg>
|
---|
| 35 | <seg>&diffutils-ch6-du;</seg>
|
---|
[54e422c1] | 36 | </seglistitem>
|
---|
| 37 | </segmentedlist>
|
---|
[a001133] | 38 |
|
---|
[54e422c1] | 39 | </sect2>
|
---|
| 40 |
|
---|
| 41 | <sect2 role="installation">
|
---|
| 42 | <title>Installation of Diffutils</title>
|
---|
| 43 |
|
---|
| 44 | <para>POSIX requires the <command>diff</command> command to treat whitespace
|
---|
| 45 | characters according to the current locale. The following patch fixes the
|
---|
| 46 | non-compliance issue:</para>
|
---|
[fa21b3d] | 47 |
|
---|
[0445a3d] | 48 | <screen><userinput remap="pre">patch -Np1 -i ../&diffutils-i18n-patch;</userinput></screen>
|
---|
[fa21b3d] | 49 |
|
---|
[e6c8119] | 50 | <para>The above patch will cause the Diffutils build system to attempt to
|
---|
| 51 | rebuild the <filename>diff.1</filename> man page using the unavailable
|
---|
| 52 | program <command>help2man</command>. The result is an unreadable man page for
|
---|
| 53 | <command>diff</command>. We can avoid this by updating the timestamp on
|
---|
| 54 | the file <filename>man/diff.1</filename>:</para>
|
---|
| 55 |
|
---|
[0445a3d] | 56 | <screen><userinput remap="pre">touch man/diff.1</userinput></screen>
|
---|
[e6c8119] | 57 |
|
---|
[54e422c1] | 58 | <para>Prepare Diffutils for compilation:</para>
|
---|
[73aedd1d] | 59 |
|
---|
[0445a3d] | 60 | <screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen>
|
---|
[73aedd1d] | 61 |
|
---|
[54e422c1] | 62 | <para>Compile the package:</para>
|
---|
[73aedd1d] | 63 |
|
---|
[0445a3d] | 64 | <screen><userinput remap="make">make</userinput></screen>
|
---|
[73aedd1d] | 65 |
|
---|
[54e422c1] | 66 | <para>This package does not come with a test suite.</para>
|
---|
[81fd230] | 67 |
|
---|
[54e422c1] | 68 | <para>Install the package:</para>
|
---|
[73aedd1d] | 69 |
|
---|
[0445a3d] | 70 | <screen><userinput remap="install">make install</userinput></screen>
|
---|
[73aedd1d] | 71 |
|
---|
[54e422c1] | 72 | </sect2>
|
---|
| 73 |
|
---|
| 74 |
|
---|
| 75 | <sect2 id="contents-diffutils" role="content">
|
---|
| 76 | <title>Contents of Diffutils</title>
|
---|
| 77 |
|
---|
| 78 | <segmentedlist>
|
---|
| 79 | <segtitle>Installed programs</segtitle>
|
---|
| 80 |
|
---|
| 81 | <seglistitem>
|
---|
| 82 | <seg>cmp, diff, diff3, and sdiff</seg>
|
---|
| 83 | </seglistitem>
|
---|
| 84 | </segmentedlist>
|
---|
| 85 |
|
---|
| 86 | <variablelist>
|
---|
| 87 | <bridgehead renderas="sect3">Short Descriptions</bridgehead>
|
---|
| 88 | <?dbfo list-presentation="list"?>
|
---|
| 89 | <?dbhtml list-presentation="table"?>
|
---|
| 90 |
|
---|
| 91 | <varlistentry id="cmp">
|
---|
| 92 | <term><command>cmp</command></term>
|
---|
| 93 | <listitem>
|
---|
| 94 | <para>Compares two files and reports whether or in which bytes they
|
---|
| 95 | differ</para>
|
---|
| 96 | <indexterm zone="ch-system-diffutils cmp">
|
---|
| 97 | <primary sortas="b-cmp">cmp</primary>
|
---|
| 98 | </indexterm>
|
---|
| 99 | </listitem>
|
---|
| 100 | </varlistentry>
|
---|
| 101 |
|
---|
| 102 | <varlistentry id="diff">
|
---|
| 103 | <term><command>diff</command></term>
|
---|
| 104 | <listitem>
|
---|
| 105 | <para>Compares two files or directories and reports which lines in
|
---|
| 106 | the files differ</para>
|
---|
| 107 | <indexterm zone="ch-system-diffutils diff">
|
---|
| 108 | <primary sortas="b-diff">diff</primary>
|
---|
| 109 | </indexterm>
|
---|
| 110 | </listitem>
|
---|
| 111 | </varlistentry>
|
---|
| 112 |
|
---|
| 113 | <varlistentry id="diff3">
|
---|
| 114 | <term><command>diff3</command></term>
|
---|
| 115 | <listitem>
|
---|
| 116 | <para>Compares three files line by line</para>
|
---|
| 117 | <indexterm zone="ch-system-diffutils diff3">
|
---|
| 118 | <primary sortas="b-diff3">diff3</primary>
|
---|
| 119 | </indexterm>
|
---|
| 120 | </listitem>
|
---|
| 121 | </varlistentry>
|
---|
| 122 |
|
---|
| 123 | <varlistentry id="sdiff">
|
---|
| 124 | <term><command>sdiff</command></term>
|
---|
| 125 | <listitem>
|
---|
| 126 | <para>Merges two files and interactively outputs the results</para>
|
---|
| 127 | <indexterm zone="ch-system-diffutils sdiff">
|
---|
| 128 | <primary sortas="b-sdiff">sdiff</primary>
|
---|
| 129 | </indexterm>
|
---|
| 130 | </listitem>
|
---|
| 131 | </varlistentry>
|
---|
| 132 |
|
---|
| 133 | </variablelist>
|
---|
| 134 |
|
---|
| 135 | </sect2>
|
---|
[673b0d8] | 136 |
|
---|
| 137 | </sect1>
|
---|