1 | <?xml version="1.0" encoding="ISO-8859-1"?>
|
---|
2 | <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
|
---|
3 | "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
|
---|
4 | <!ENTITY % general-entities SYSTEM "../general.ent">
|
---|
5 | %general-entities;
|
---|
6 | ]>
|
---|
7 |
|
---|
8 | <sect1 id="ch-system-diffutils" role="wrap">
|
---|
9 | <?dbhtml filename="diffutils.html"?>
|
---|
10 |
|
---|
11 | <sect1info condition="script">
|
---|
12 | <productname>diffutils</productname>
|
---|
13 | <productnumber>&diffutils-version;</productnumber>
|
---|
14 | <address>&diffutils-url;</address>
|
---|
15 | </sect1info>
|
---|
16 |
|
---|
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/>
|
---|
25 |
|
---|
26 | <para>The Diffutils package contains programs that show the differences
|
---|
27 | between files or directories.</para>
|
---|
28 |
|
---|
29 | <segmentedlist>
|
---|
30 | <segtitle>&buildtime;</segtitle>
|
---|
31 | <segtitle>&diskspace;</segtitle>
|
---|
32 |
|
---|
33 | <seglistitem>
|
---|
34 | <seg>&diffutils-ch6-sbu;</seg>
|
---|
35 | <seg>&diffutils-ch6-du;</seg>
|
---|
36 | </seglistitem>
|
---|
37 | </segmentedlist>
|
---|
38 |
|
---|
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>
|
---|
47 |
|
---|
48 | <screen><userinput remap="pre">patch -Np1 -i ../&diffutils-i18n-patch;</userinput></screen>
|
---|
49 |
|
---|
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 |
|
---|
56 | <screen><userinput remap="pre">touch man/diff.1</userinput></screen>
|
---|
57 |
|
---|
58 | <para>Prepare Diffutils for compilation:</para>
|
---|
59 |
|
---|
60 | <screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen>
|
---|
61 |
|
---|
62 | <para>Compile the package:</para>
|
---|
63 |
|
---|
64 | <screen><userinput remap="make">make</userinput></screen>
|
---|
65 |
|
---|
66 | <para>This package does not come with a test suite.</para>
|
---|
67 |
|
---|
68 | <para>Install the package:</para>
|
---|
69 |
|
---|
70 | <screen><userinput remap="install">make install</userinput></screen>
|
---|
71 |
|
---|
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>
|
---|
136 |
|
---|
137 | </sect1>
|
---|