1 | Sat Oct 1 05:24:19 1994 Paul Eggert <eggert@twinsun.com> |
---|
2 | |
---|
3 | * Version 2.7 released. |
---|
4 | |
---|
5 | * configure.in (AC_HEADER_SYS_WAIT): Add. |
---|
6 | (AC_CHECK_HEADERS): Remove sys/wait.h. |
---|
7 | (AC_CHECK_FUNCS): Add tmpnam. |
---|
8 | * system.h (<sys/wait.h>, WEXITSTATUS): Use simpler scheme |
---|
9 | now that HAVE_SYS_WAIT_H is not set on hosts |
---|
10 | that are incompatible with Posix applications. |
---|
11 | |
---|
12 | * util.c (dir_file_pathname): Use filename_lastdirchar not strrchr. |
---|
13 | * sdiff.c (expand_name): Likewise. |
---|
14 | (private_tempnam): Use tmpnam if HAVE_TMPNAM; this simplifies porting. |
---|
15 | (exists, letters): Omit if HAVE_TMPNAM. |
---|
16 | |
---|
17 | * diff3.c (read_diff): If STAT_BLOCKSIZE yields zero, |
---|
18 | adjust it to a more reasonable value. |
---|
19 | |
---|
20 | Sat Sep 24 20:36:40 1994 Paul Eggert <eggert@twinsun.com> |
---|
21 | |
---|
22 | * sdiff.c (exists, private_tempname): Adopt latest GNU libc algorithm. |
---|
23 | (private_tempnam): Specialize for sdiff to avoid portability problems. |
---|
24 | |
---|
25 | Thu Sep 22 16:47:00 1994 Paul Eggert <eggert@twinsun.com> |
---|
26 | |
---|
27 | * configure.in (AC_ARG_PROGRAM): Added. |
---|
28 | (AC_OUTPUT): Add [date > stamp-h]. |
---|
29 | |
---|
30 | * Makefile.in (DEFAULT_EDITOR_PROGRAM, DIFF_PROGRAM, LIBOBJS, |
---|
31 | NULL_DEVICE, PR_PROGRAM, PROGRAMS): New variables. |
---|
32 | (check, stamp-h.in, cmp.o, util.o): New targets. |
---|
33 | (edit_program_name): New variable; replaces old binprefix method. |
---|
34 | (install, uninstall): Use it. |
---|
35 | (binprefix): Removed. |
---|
36 | (distfiles): Add stamp-h.in. |
---|
37 | (clean): Clean stamp-h. |
---|
38 | (config.hin, config.h): Use time stamp files. |
---|
39 | (cmp_o): Add $(LIBOBJS). |
---|
40 | (install): Install info files from srcdir if they're not in `.'. |
---|
41 | |
---|
42 | * cmp.c, io.c (word): Don't define if already defined. |
---|
43 | |
---|
44 | * comp.c (main): Use setmode, not open(..., O_BINARY); this gets stdin. |
---|
45 | Use NULL_DEVICE instead of "/dev/null". |
---|
46 | (cmp): Use %lu instead of %ld when it is more likely to be right. |
---|
47 | |
---|
48 | * diff.h (PR_FILE_NAME): Rename to PR_PROGRAM and move to Makefile.in, |
---|
49 | util.c. |
---|
50 | |
---|
51 | * diff3.c (main): Give proper diagnostic if too many labels were given. |
---|
52 | (read_diff): Use SYSTEM_QUOTE_ARG. |
---|
53 | |
---|
54 | * system.h: <string.h>: Include if HAVE_STRING_H, too. |
---|
55 | <ctype.h>: Include here. All includers changed. |
---|
56 | (CTYPE_DOMAIN, ISDIGIT, ISPRINT, ISSPACE, ISUPPER): New macros that |
---|
57 | work around common <ctype.h> problems. |
---|
58 | (O_BINARY): Remove. |
---|
59 | (SYSTEM_QUOTE_ARG): New macros. |
---|
60 | |
---|
61 | * diff.c: Add comment. |
---|
62 | |
---|
63 | * util.c (PR_PROGRAM): Moved here from diff.h. |
---|
64 | (begin_output): Use SYSTEM_QUOTE_ARG. |
---|
65 | |
---|
66 | * io.c (read_files): Set mode to binary before returning 1. |
---|
67 | |
---|
68 | * sdiff.c (TMPDIR_ENV): New macro. |
---|
69 | (DEFAULT_EDITOR_PROGRAM): Renamed from DEFAULT_EDITOR for consistency. |
---|
70 | (expand_name): Change `isdir' to `is_dir' to avoid theoretical ctype |
---|
71 | namespace contamination. |
---|
72 | (main): Use SYSTEM_QUOTE_ARG. |
---|
73 | (private_tempnam): Don't access "/tmp" directly; use PVT_tmpdir. |
---|
74 | |
---|
75 | Tue Sep 13 18:46:43 1994 Paul Eggert <eggert@twinsun.com> |
---|
76 | |
---|
77 | * configure.in (AC_FUNC_MEMCHR): Remove. Autoconf didn't adopt this, |
---|
78 | since we need not worry about an old experimental library |
---|
79 | where memchr didn't work. |
---|
80 | (AC_FUNC_MEMCMP): Not needed, since we only test for equality. |
---|
81 | (AC_REPLACE_FUNCS): Add test for memchr. |
---|
82 | (AC_CHECK_FUNCS): Check for memchr, not memcpy, since it'll be cached. |
---|
83 | (AC_CHECK_HEADERS): Add string.h; regex.c uses on some old hosts. |
---|
84 | |
---|
85 | * system.h (memcmp): Define in terms of bcmp. |
---|
86 | Use HAVE_MEMCHR to test for all mem* routines. |
---|
87 | |
---|
88 | * Makefile.in (srcs): Remove memcmp.c. |
---|
89 | We use bcmp if memcmp doesn't work, since we only test for equality. |
---|
90 | |
---|
91 | Mon Sep 12 15:52:22 1994 Paul Eggert <eggert@twinsun.com> |
---|
92 | |
---|
93 | * configure.in (AC_CONFIG_HEADER): Rename config.h.in to config.hin. |
---|
94 | (AC_ISC_POSIX, AC_MINIX): Go back to these old names for Autoconf 2. |
---|
95 | (AC_CHECK_HEADERS): Remove now-redundant check for <string.h>. |
---|
96 | (AC_CHECK_FUNCS): Check for strchr. |
---|
97 | (AC_FUNC_MEMCHR, AC_FUNC_MEMCMP, AC_CHECK_FUNCS): Use special-purpose |
---|
98 | macros when suitable. |
---|
99 | * memcmp.c: New file. |
---|
100 | * Makefile.in (CPPFLAGS, DEFS, CFLAGS, LDFLAGS, prefix, exec_prefix): |
---|
101 | Default to autoconf-specified strings. |
---|
102 | (COMPILE): Use the defaults. |
---|
103 | (srcs): Add memcmp.c. |
---|
104 | (distfiles): Rename config.h.in->config.hin, install.sh->install-sh. |
---|
105 | (Makefile, config.h, config.hin, config.status): Rework for |
---|
106 | compatibility with Autoconf 2. |
---|
107 | * io.c (binary_file_p): Assume non-broken memchr. |
---|
108 | * memchr.c: Assume compiler understands void *; otherwise |
---|
109 | we don't match GCC's internal declaration of memchr. |
---|
110 | * system.h: Use more modern autoconf approach to standard C headers. |
---|
111 | * version.c: Include <config.h>, not "config.h". |
---|
112 | |
---|
113 | * diff.c, diff.h (ignore_some_line_changes): |
---|
114 | New variable; replaces `length_varies'. |
---|
115 | (line_end_char): Replace with '\n'; it wasn't being used consistently. |
---|
116 | |
---|
117 | * io.c (find_and_hash_each_line): Fix inconsistencies with -b -w -i and |
---|
118 | incomplete lines. Put incomplete lines into their own bucket. |
---|
119 | This means line_cmp no longer needs line length arguments, |
---|
120 | and equivalence classes' line lengths no longer need to include \n. |
---|
121 | Invoke line_cmp only if ignore_some_line_changes. |
---|
122 | (prepare_text_end): -B no longer ignores missing newlines. |
---|
123 | (read_files): Allocate another bucket for incomplete lines. |
---|
124 | |
---|
125 | * util.c (line_cmp): Now takes just two arguments. No longer |
---|
126 | optimizes for common case of exact equality; the caller does that |
---|
127 | optimization now. The caller is changed accordingly. |
---|
128 | Optimize for the common case of mostly equality. |
---|
129 | Use isupper+tolower instead of islower+toupper, for consistency. |
---|
130 | |
---|
131 | * waitpid.c (waitpid): Fix typo with internal scoping. |
---|
132 | |
---|
133 | Thu Sep 8 08:23:15 1994 Paul Eggert <eggert@twinsun.com> |
---|
134 | |
---|
135 | * configure.in: Revamp for Autoconf 2. |
---|
136 | * memchr.c, waitpid.c: New source files for substitute functions. |
---|
137 | * Makefile.in (diff_o, diff3_o, sdiff_o): Add $(LIBOBJS). |
---|
138 | (srcs): Add memchr.c, waitpid.c. |
---|
139 | (distfiles): Add install.sh, memchr.c, waitpid.c, install.sh. |
---|
140 | * system.h: Use Autoconf 2 style HAVE_DIRENT_H etc. macros for dirs. |
---|
141 | * dir.c (dir_sort): Prefer NAMLEN (p) to strlen (p->d_name). |
---|
142 | Change VOID_CLOSEDIR to CLOSEDIR_VOID for Autoconf 2. |
---|
143 | * sdiff.c, util.c (memchr, waitpid): Remove; use new substitutes. |
---|
144 | * diff3.c (read_diff): Use new waitpid substitute. |
---|
145 | |
---|
146 | * cmp.c, diff.c, diff3.c, sdiff.c (check_stdout, try_help): New fns. |
---|
147 | (usage): Just print more detailed usage message; let caller exit. |
---|
148 | * diff.c (option_help): New variable. |
---|
149 | (filetype): Add Posix.1b file types. |
---|
150 | |
---|
151 | Fri Sep 2 16:01:49 1994 Paul Eggert <eggert@twinsun.com> |
---|
152 | |
---|
153 | * configure.in: Switch to new autoconf names. Add sys/file.h test. |
---|
154 | * Makefile.in (distclean): Clean config.cache, config.log |
---|
155 | (used by new autoconf). |
---|
156 | |
---|
157 | * diff.c, diff3.c, (main), sdiff.c (trapsigs): If we'll have children, |
---|
158 | make sure SIGCHLD isn't ignored. |
---|
159 | |
---|
160 | * diff3.c (DIFF_CHUNK_SIZE): Removed. Get size from STAT_BLOCKSIZE. |
---|
161 | (INT_STRLEN_BOUND): New macro. |
---|
162 | |
---|
163 | * ifdef.c (format_group, groups_letter_value): |
---|
164 | Use * instead of [] in prototypes. |
---|
165 | |
---|
166 | * system.h: Include <sys/file.h> only if HAVE_SYS_FILE_H. |
---|
167 | (S_IXGRP, S_IXOTH, S_IXUSR): Remove unused macros. |
---|
168 | |
---|
169 | * util.c (begin_output): Check fdopen result. |
---|
170 | |
---|
171 | The following changes simplify porting to non-Posix environments. |
---|
172 | * cmp.c, diff.c, diff3.c, sdiff.c, (main): Call initialize_main first. |
---|
173 | * diff.c (binary_I_O): New variable for --binary option. |
---|
174 | (main, usage, compare_files): Support --binary option. |
---|
175 | (compare_files): Use filename_lastdirchar to find last |
---|
176 | directory char in a file name. |
---|
177 | * cmp.c (main), diff.c (compare_files), dir.c (compare_names, |
---|
178 | diff_dirs): Use filename_cmp to compare file names. |
---|
179 | Use same_file to determine whether two files are the same. |
---|
180 | * context.c (print_context_label): Check whether ctime yields 0. |
---|
181 | * diff3.c (read_diff), sdiff.c (cleanup, main, waitpid), |
---|
182 | util.c (begin_output): Use popen+pclose if !HAVE_FORK. |
---|
183 | * io.c (sip): If HAVE_SETMODE, test for binary files in O_BINARY mode. |
---|
184 | * sdiff.c (ck_fdopen): Function removed. |
---|
185 | (edit): Use system if !HAVE_FORK. |
---|
186 | (execdiff): Now assumes caller has pushed all args, plus trailing 0. |
---|
187 | All callers changed. |
---|
188 | (private_tempnam): Try TMP if TMPDIR isn't defined. |
---|
189 | Fit temporary filenames into 8.3 limit. |
---|
190 | * system.h (STAT_BLOCKSIZE): Don't define if already defined. |
---|
191 | (min, max): Undef if already defined. |
---|
192 | (filename_cmp, filename_lastdirchar, HAVE_FORK, HAVE_SETMODE, |
---|
193 | initialize_main O_BINARY, same_file): New macros. |
---|
194 | |
---|
195 | Fri Jun 17 11:23:53 1994 David J. MacKenzie (djm@geech.gnu.ai.mit.edu) |
---|
196 | |
---|
197 | * Makefile.in (info, dvi, diff.dvi): New targets. |
---|
198 | (clean): Remove TeX output files. |
---|
199 | |
---|
200 | Fri Jun 17 05:37:52 1994 Paul Eggert (eggert@twinsun.com) |
---|
201 | |
---|
202 | * cmp.c, io.c (word): Change from typedef to #define, to avoid |
---|
203 | collision with Unicos 8.0 <sys/types.h>, which also typedefs `word'. |
---|
204 | |
---|
205 | Thu Apr 15 00:53:01 1994 Paul Eggert (eggert@twinsun.com) |
---|
206 | |
---|
207 | * diff3.c (scan_diff_line), util.c (print_number_range): Don't |
---|
208 | rely on promotion to make the old-style parameter type agree |
---|
209 | with the prototype parameter type; this doesn't work on |
---|
210 | Apollos running bsd4.3. |
---|
211 | |
---|
212 | Mon Jan 3 02:05:51 1994 Paul Eggert (eggert@twinsun.com) |
---|
213 | |
---|
214 | * Makefile.in (LDFLAGS): Remove -g. Change all link commands |
---|
215 | to use both $(CFLAGS) and $(LDFLAGS). |
---|
216 | |
---|
217 | Mon Dec 13 12:23:27 1993 Paul Eggert (eggert@twinsun.com) |
---|
218 | |
---|
219 | * system.h: Don't assume dirent.h exists just because |
---|
220 | _POSIX_VERSION is defined. |
---|
221 | |
---|
222 | Fri Dec 3 18:39:39 1993 Paul Eggert (eggert@twinsun.com) |
---|
223 | |
---|
224 | * diff.c (main): allow -pu. |
---|
225 | |
---|
226 | Tue Nov 23 03:51:08 1993 Paul Eggert (eggert@twinsun.com) |
---|
227 | |
---|
228 | * Makefile.in (distclean): Remove config.h. |
---|
229 | |
---|
230 | Wed Nov 10 00:28:27 1993 Paul Eggert (eggert@twinsun.com) |
---|
231 | |
---|
232 | * Version 2.6 released. |
---|
233 | |
---|
234 | * analyze.c (too_expensive): New variable, for heuristic to |
---|
235 | limit the worst-case cost to O(N**1.5 log N) at the price of |
---|
236 | producing suboptimal output for large inputs with many differences. |
---|
237 | (diff_2_files): Initialize it. |
---|
238 | (struct partition): New type. |
---|
239 | (SNAKE_LIMIT): New macro; merely documents already-used number 20. |
---|
240 | (diag): New `minimal' arg; all callers changed. Put results into |
---|
241 | struct partition. Apply `too_expensive' heuristic. Tune. |
---|
242 | (compareseq): New `minimal' arg; all callers changed. Tune. |
---|
243 | (shift_boundaries): Improve heuristic to also coalesce adjacent runs |
---|
244 | of changes more often. |
---|
245 | |
---|
246 | * diff.c (long_options, main, usage): Add `--help'. |
---|
247 | (main): Send version number to stdout, not stderr. |
---|
248 | (usage): Send usage to stdout, not stderr. |
---|
249 | (compare_files): Initialize `inf' properly. |
---|
250 | |
---|
251 | * io.c (word): Change to `int'; it makes a big difference on x86. |
---|
252 | (sip, slurp): Put off allocating room to hold the whole file until we |
---|
253 | have to read the whole file. This wins if the file turns out |
---|
254 | to be binary. |
---|
255 | |
---|
256 | * util.c (xmalloc, xrealloc): "virtual memory" -> "memory" |
---|
257 | (primes): Omit large primes if INT_MAX is small. |
---|
258 | |
---|
259 | * sdiff.c (usage): Send usage to stdout, not stderr. |
---|
260 | (long_options, main, usage): Add `--help'. |
---|
261 | (main): Send version number to stdout, not stderr. Exit afterwards. |
---|
262 | |
---|
263 | * diff3.c (usage): Send usage to stdout, not stderr. |
---|
264 | (long_options, main, usage): Add `--help'. |
---|
265 | (read_diff): Detect integer overflow in buffer size calculations. |
---|
266 | |
---|
267 | * cmp.c (word): New type. All uses of `long' for |
---|
268 | word-at-a-time comparisons changed to `word'. |
---|
269 | (long_options, main, usage): Add `--help'. |
---|
270 | (usage): Send usage to stdout, not stderr. |
---|
271 | (main): Add `-v'. Send version number to stdout, not stderr. |
---|
272 | |
---|
273 | * configure.in (AC_HAVE_HEADERS): Add unistd.h; remove AC_UNISTD_H. |
---|
274 | |
---|
275 | Mon Sep 27 07:20:24 1993 Paul Eggert (eggert@twinsun.com) |
---|
276 | |
---|
277 | * diff.c (add_exclude_file): Cast memchr to (char *) |
---|
278 | to suppress bogus warnings on some nonstandard hosts. |
---|
279 | |
---|
280 | * Makefile.in (cmp): Add version.o. |
---|
281 | |
---|
282 | * analyze.c (diff_2_files): Work around memcmp bug with size=0. |
---|
283 | |
---|
284 | * cmp.c (main, usage, version_string): Add --version option. |
---|
285 | |
---|
286 | * system.h (malloc, realloc): Declare only if !HAVE_STDLIB_H. |
---|
287 | (memchr): Declare only if !HAVE_MEMCHR. These changes are |
---|
288 | needed to keep some nonstandard hosts happy. |
---|
289 | |
---|
290 | * util.c (memchr): Make first arg char const * |
---|
291 | to match standard. |
---|
292 | (xmalloc, xrealloc): Cast malloc, realloc |
---|
293 | to (VOID *) to suppress bogus warnings on some nonstandard hosts. |
---|
294 | |
---|
295 | * diff3.c (xmalloc, xrealloc): Cast malloc, realloc |
---|
296 | to (VOID *) to suppress bogus warnings on some nonstandard hosts. |
---|
297 | |
---|
298 | * sdiff.c (xmalloc, xrealloc): Cast malloc, realloc |
---|
299 | to (VOID *) to suppress bogus warnings on some nonstandard hosts. |
---|
300 | (lf_copy, lf_skip, lf_snarf): Cast memchr to (char *) |
---|
301 | to suppress bogus warnings on some nonstandard hosts. |
---|
302 | (memchr): Make first arg char const * |
---|
303 | to match standard. |
---|
304 | |
---|
305 | Mon Sep 27 00:23:37 1993 Paul Eggert (eggert@twinsun.com) |
---|
306 | |
---|
307 | * Version 2.5 released. |
---|
308 | |
---|
309 | * analyze.c (diff_2_files): Work around memcmp bug with size=0. |
---|
310 | |
---|
311 | * cmp.c (main, usage, version_string): Add --version option. |
---|
312 | * Makefile.in (cmp): Add version.o. |
---|
313 | |
---|
314 | * diff.c (add_exclude_file): Cast memchr to (char *) |
---|
315 | to suppress bogus warnings on some nonstandard hosts. |
---|
316 | * sdiff.c (lf_copy, lf_skip, lf_snarf): Likewise. |
---|
317 | |
---|
318 | * diff3.c, sdiff.c, util.c (xmalloc, xrealloc): Cast malloc, realloc |
---|
319 | to (VOID *) to suppress bogus warnings on some nonstandard hosts. |
---|
320 | |
---|
321 | * sdiff.c, util.c (memchr): Make first arg char const * |
---|
322 | to match standard. |
---|
323 | |
---|
324 | * system.h (malloc, realloc): Declare only if !HAVE_STDLIB_H. |
---|
325 | (memchr): Declare only if !HAVE_MEMCHR. These changes are |
---|
326 | needed to keep some nonstandard hosts happy. |
---|
327 | |
---|
328 | * xmalloc.c: Include <sys/types.h> always; some nonstandard hosts |
---|
329 | need it for size_t even if STDC_HEADERS. |
---|
330 | |
---|
331 | Sat Sep 18 01:33:07 1993 Paul Eggert (eggert@twinsun.com) |
---|
332 | |
---|
333 | * configure.in (AC_STAT_MACROS_BROKEN): Add. |
---|
334 | * system.h (S_IS{BLK,CHR,DIR,FIFO,REG,SOCK}): Fix defns if |
---|
335 | STAT_MACROS_BROKEN. |
---|
336 | |
---|
337 | * Makefile.in (diff3, sdiff, cmp): Do not link $(ALLOCA). |
---|
338 | |
---|
339 | * analyze.c (discard_confusing_lines): Make defn static, like decl. |
---|
340 | * sdiff.c (xmalloc): Likewise. |
---|
341 | |
---|
342 | * ifdef.c (format_group): Ensure isdigit argument isn't < 0. |
---|
343 | |
---|
344 | * side.c (print_half_line): Use isprint, since some hosts lack isgraph. |
---|
345 | * util.c (output_1_line): Likewise. Ensure its argument isn't < 0. |
---|
346 | (xmalloc, xrealloc): Remove needless casts. |
---|
347 | |
---|
348 | * system.h (volatile, const): |
---|
349 | Define these before including any system headers, |
---|
350 | so that they're used consistently in all system includes. |
---|
351 | (getenv, malloc, realloc): Declare even if HAVE_STDLIB_H, since some |
---|
352 | <stdlib.h>s don't declare them. |
---|
353 | (memchr): Likewise for <string.h>. |
---|
354 | |
---|
355 | * cmp.c, diff3.c, diff.h, sdiff.c: Include "system.h" first. |
---|
356 | * diff.c: Remove redundant "system.h" inclusion. |
---|
357 | |
---|
358 | * diff3.c (xmalloc): Now static. |
---|
359 | (xmalloc, realloc): Remove needless casts. |
---|
360 | (READNUM): Ensure isdigit argument isn't negative. |
---|
361 | |
---|
362 | Wed Sep 14 07:14:15 1993 Paul Eggert (eggert@twinsun.com) |
---|
363 | |
---|
364 | * Version 2.4 released. |
---|
365 | |
---|
366 | * ifdef.c (scan_char_literal): New function, for new %c'x' and |
---|
367 | %c'\ooo' format specs. |
---|
368 | (format_group, print_ifdef_lines): Use it. Remove %0 format spec. |
---|
369 | |
---|
370 | * cmp.c (cmp): Don't try to read past end of file; this doesn't |
---|
371 | work on ttys. |
---|
372 | |
---|
373 | * system.h, version.c: #include <config.h>, not "config.h", to allow |
---|
374 | configuring in a separate directory when the source directory has |
---|
375 | already been configured. |
---|
376 | * Makefile.in (COMPILE): New defn, with proper -I options so that |
---|
377 | `#include <config.h>' works. |
---|
378 | (.c.o, diff3.o, sdiff.o): Use it. |
---|
379 | |
---|
380 | Mon Sep 13 06:45:43 1993 Paul Eggert (eggert@twinsun.com) |
---|
381 | |
---|
382 | * diff.c (main, longopts): Add --line-format=FORMAT option. |
---|
383 | (specify_format): Args no longer const pointers. All callers changed. |
---|
384 | |
---|
385 | * ifdef.c: Add support for %?c, %(A=B?T:E), PRINTF_SPECn formats. |
---|
386 | (struct group): New struct. |
---|
387 | (print_ifdef_lines): Use it to simplify argument passing. |
---|
388 | Remove the convention that last arg -1 signifies that the lines |
---|
389 | from file 2 are the same as the lines from file 1; this |
---|
390 | convention no longer works, now that line numbers might be |
---|
391 | printed out, since the line numbers may differ. |
---|
392 | Add first FILE * argument to output to. All callers changed. |
---|
393 | Use a faster test for the single-fwrite optimization. |
---|
394 | (format_group, scan_printf_spec, groups_letter_value): New functions. |
---|
395 | |
---|
396 | * diff.h (group_format, line_format): No longer const pointers. |
---|
397 | (format_ifdef): 1st arg is no longer const pointer. |
---|
398 | |
---|
399 | * configure.in: Configure HAVE_LIMITS_H, HAVE_STDLIB_H. |
---|
400 | * system.h <limits.h>, <stdlib.h>, <string.h>: |
---|
401 | Include only if HAVE_LIMITS_H etc. |
---|
402 | |
---|
403 | * system.h (memcmp, memcpy, strchr, strrchr, struct dirent): Prefer |
---|
404 | these standard names to the traditional names (bcmp, bcpy, index, |
---|
405 | rindex, struct direct). All callers changed. |
---|
406 | |
---|
407 | * system.h (PARAMS, VOID): |
---|
408 | Define earlier so that malloc decl can use VOID. |
---|
409 | (STAT_BLOCKSIZE): Simplify ersatz defn; just use 8K. |
---|
410 | |
---|
411 | Fri Sep 3 00:21:02 1993 Paul Eggert (eggert@twinsun.com) |
---|
412 | |
---|
413 | * diff.c (compare_files): Two files with the same name must be |
---|
414 | the same file; avoid a needless `stat' in that case. |
---|
415 | |
---|
416 | Fri Aug 27 06:59:03 1993 Paul Eggert (eggert@twinsun.com) |
---|
417 | |
---|
418 | * Pervasive changes for portability to 64-bit hosts: |
---|
419 | Add prototypes to function declarations. |
---|
420 | Use size_t, not int, when needed. |
---|
421 | |
---|
422 | * Other pervasive changes: |
---|
423 | Use `const' more often. |
---|
424 | Use STD{IN,OUT,ERR}_FILENO instead of [012]. |
---|
425 | Use 0, not NULL, for portability to broken hosts. |
---|
426 | |
---|
427 | * Makefile.in: (srcs, objs, distfiles, cmp): New files cmpbuf.[ch]. |
---|
428 | (distfiles): New files config.h.in, mkinstalldirs. |
---|
429 | (.c.o): Add -DHAVE_CONFIG_H. |
---|
430 | |
---|
431 | * analyze.c: (diag): Pacify `gcc -Wall' with a useless assignment. |
---|
432 | (diff_2_files): Use l.c.m., not max, of files' buffer sizes. |
---|
433 | |
---|
434 | * cmp.c: Make globals static when possible. |
---|
435 | |
---|
436 | (file): Now a 2-element array; replaces `file1' and `file2'. |
---|
437 | (file_desc, buffer): Likewise, for file[12]_desc and buf[12]. |
---|
438 | (main): Likewise, for stat_buf[12]. Index these variables with `i'. |
---|
439 | |
---|
440 | (ignore_initial): New var. |
---|
441 | (long_options): Now const. Add `--ignore-initial'. |
---|
442 | (usage): Sort options and add `--ignore-initial'. |
---|
443 | (main, cmp): Add `--ignore-initial' support. |
---|
444 | |
---|
445 | (main): `cmp - -' now succeeds. |
---|
446 | When comparing standard input to a file, and using a shortcut (e.g. |
---|
447 | looking at file sizes or inode numbers), take the lseek offset into |
---|
448 | account before deciding whether the files are identical. |
---|
449 | Avoid mentioning `dev_t', `ino_t' for portability to nonstandard hosts. |
---|
450 | Use l.c.m. of files' buffer sizes, not 8 * 1024. |
---|
451 | ferror (stdout) does not imply errno has a useful value. |
---|
452 | If 2nd file is "-", treat it first, in case stdin is closed. |
---|
453 | |
---|
454 | (cmp): Always compute `char_number', `smaller' for speed and simplicity. |
---|
455 | Say `cmp: EOF on input', not `/usr/gnu/bin/cmp: EOF on input', |
---|
456 | as per Posix.2. |
---|
457 | |
---|
458 | (block_compare_and_count): Increment line_number argument. |
---|
459 | Remove end_char argument; it's always '\n'. All callers changed. |
---|
460 | Do not assume sizeof(long) == 4; this isn't true on some 64-bit hosts. |
---|
461 | (block_compare): Minimize differences with block_compare_and_count. |
---|
462 | |
---|
463 | (block_read): Coalesce `bp += nread's. |
---|
464 | |
---|
465 | (printc): Remove `FILE *' arg; output to stdout. All callers changed. |
---|
466 | |
---|
467 | * configure.in: Configure HAVE_SIGACTION, RETSIGTYPE, HAVE_VPRINTF. |
---|
468 | Configure into config.h. |
---|
469 | |
---|
470 | * context.c (print_context_label): |
---|
471 | Standard input's st_mtime is no longer a special case |
---|
472 | here, since `compare_files' now sets it to the current time. |
---|
473 | |
---|
474 | * diff.c (usage): Sort options. |
---|
475 | (filetype): New function. |
---|
476 | (compare_files): Set stdin's st_mtime to be the current time. |
---|
477 | Leave its name "-" instead of changing it to "Standard Input"; |
---|
478 | to test whether a file is stdin, we must compare its name to "-" instead |
---|
479 | of its desc to 0, since if it's closed other file descs may be 0. |
---|
480 | When comparing standard input to a file, and using a shortcut (e.g. |
---|
481 | looking at file sizes or inode numbers), take the lseek offset into |
---|
482 | account before deciding whether the files are identical. |
---|
483 | Pretend that nonexistent files have the same filetype as existing files. |
---|
484 | Rename `errorcount' to `failed', since it's boolean. |
---|
485 | In directory comparisons, if a file is neither a regular file nor a |
---|
486 | directory, just print its type and the other file's type. |
---|
487 | |
---|
488 | * diff.h (Is_space, textchar): Remove. |
---|
489 | (struct msg, msg_chain, msg_chain_end): Move to util.c. |
---|
490 | (VOID): Move to system.h. |
---|
491 | (line_cmp, version_string, change_letter, print_number_range, |
---|
492 | find_change): New decls. |
---|
493 | |
---|
494 | * diff.texi: |
---|
495 | whitespace -> white space. It now stands for whatever isspace yields. |
---|
496 | Add --ignore-initial. |
---|
497 | |
---|
498 | * diff3.c (VOID): Move to system.h. |
---|
499 | (version_string): Now char[]. |
---|
500 | (usage): Sort options. |
---|
501 | (process_diff): Pacify `gcc -Wall' with a useless assignment. |
---|
502 | (read_diff): pid is of type pid_t, not int. Use waitpid if available. |
---|
503 | (output_diff3): Simplify test for `\ No newline at end of file' message. |
---|
504 | |
---|
505 | * dir.c (struct dirdata): Rename `files' to `names' to avoid confusion |
---|
506 | with external struct file_data `files'. |
---|
507 | |
---|
508 | * io.c (line_cmp): Move declaration to diff.h. |
---|
509 | (textchar): Remove. |
---|
510 | (find_and_hash_each_line): Use locale's definition of white space |
---|
511 | instead of using one hardwired defn for -b and another for -w. |
---|
512 | |
---|
513 | * normal.c (change_letter, print_number_range, find_change): |
---|
514 | Move decls to diff.h. |
---|
515 | (print_normal_hunk): Now static. |
---|
516 | |
---|
517 | * sdiff.c (SEEK_SET): Move to system.h. |
---|
518 | (version_string): Now char[], not char*. |
---|
519 | (private_tempnam): Remove hardcoded limit on temporary file names. |
---|
520 | (exiterr, perror_fatal, main): When exiting because of a signal, |
---|
521 | exit with that signal's status. |
---|
522 | (lf_refill, main, skip_white, edit, interact): Check for signal. |
---|
523 | (ignore_SIGINT): Renamed from `ignore_signals'. |
---|
524 | (NUM_SIGS, initial_handler): New macros. |
---|
525 | (initial_action, signal_received, sigs_trapped): New vars. |
---|
526 | (catchsig, trapsigs): Use sigaction if possible, since this closes the |
---|
527 | windows of vulnerability that `signal' has. Use RETSIGTYPE not void. |
---|
528 | When a signal comes in, just set a global variable; this is safer. |
---|
529 | (checksigs, untrapsig): New functions. |
---|
530 | (edit): Pacify `gcc -Wall' with a useless assignment. |
---|
531 | Respond to each empty line with help, not to every other empty line. |
---|
532 | (private_tempnam): Remove hardcoded limit on temporary file name length. |
---|
533 | Don't assume sizeof (pid_t) <= sizeof (int). |
---|
534 | |
---|
535 | * system.h: (S_IXOTH, S_IXGRP, S_IXUSR, |
---|
536 | SEEK_SET, SEEK_CUR, |
---|
537 | STDIN_FILENO, STDOUT_FILENO, STDERR_FILENO): |
---|
538 | New macros, if system doesn't define them. |
---|
539 | (volatile): Don't define if already defined. |
---|
540 | (PARAMS): New macro. |
---|
541 | (VOID): Move here from diff.h. |
---|
542 | |
---|
543 | * util.c (struct msg, msg_chain, msg_chain_end): Moved here from diff.h. |
---|
544 | (message5): New function. |
---|
545 | (pr_pid): New var. |
---|
546 | (begin_output): Allocate `name' more precisely. |
---|
547 | Put child pid into pr_pid, so that we can wait for it later. |
---|
548 | Don't check execl's return value, since any return must be an error. |
---|
549 | (finish_output): Detect and report output errors. |
---|
550 | Use waitpid if available. Check pr exit status. |
---|
551 | (line_cmp): Use locale's definition of white space |
---|
552 | instead of using one hardwired defn for -b and another for -w. |
---|
553 | (analyze_cmp): Avoid double negation with `! nontrivial'. |
---|
554 | Pacify `gcc -Wall' be rewriting for-loop into do-while-loop. |
---|
555 | (dir_file_pathname): New function. |
---|
556 | |
---|
557 | * version.c (version_string): Now char[], not char*. |
---|
558 | |
---|
559 | Thu Jul 29 20:44:30 1993 David J. MacKenzie (djm@wookumz.gnu.ai.mit.edu) |
---|
560 | |
---|
561 | * Makefile.in (config.status): Run config.status --recheck, not |
---|
562 | configure, to get the right args passed. |
---|
563 | |
---|
564 | Thu Jul 22 10:46:30 1993 Paul Eggert (eggert@twinsun.com) |
---|
565 | |
---|
566 | * Makefile.in (dist): Replace `if [ ! TEST ]; then ACTION; fi' |
---|
567 | with `[ TEST ] || ACTION || exit' so that the containing for-loop exits |
---|
568 | with proper status for `make'. |
---|
569 | |
---|
570 | Thu Jul 8 19:47:22 1993 David J. MacKenzie (djm@goldman.gnu.ai.mit.edu) |
---|
571 | |
---|
572 | * Makefile.in (installdirs): New target. |
---|
573 | (install): Use it. |
---|
574 | (Makefile, config.status, configure): New targets. |
---|
575 | |
---|
576 | Sat Jun 5 23:10:40 1993 Paul Eggert (eggert@twinsun.com) |
---|
577 | |
---|
578 | * Makefile.in (dist): Switch from .z to .gz. |
---|
579 | |
---|
580 | Wed May 26 17:16:02 1993 Paul Eggert (eggert@twinsun.com) |
---|
581 | |
---|
582 | * diff.c (main): Cast args to compare_files, for traditional C. |
---|
583 | * side.c (print_sdiff_common_lines_print_sdiff_hunk): Likewise. |
---|
584 | * analyze.c, diff3.c, sdiff.c, util.c: Don't assume NULL is defined |
---|
585 | properly. |
---|
586 | |
---|
587 | Tue May 25 14:54:05 1993 Paul Eggert (eggert@twinsun.com) |
---|
588 | |
---|
589 | * analyze.c (diff_2_files): With -q, do not report that files differ |
---|
590 | if all their differences are ignored. |
---|
591 | (briefly_report): New function. |
---|
592 | * diff.h (ignore_some_changes): New variable. |
---|
593 | * diff.c (compare_files): Don't use the file size shortcut if |
---|
594 | ignore_some_changes is nonzero, since the file size may differ |
---|
595 | merely due to ignored changes. |
---|
596 | (main): Set ignore_some_changes if we might ignore some changes. |
---|
597 | Remove unsystematic assignment of 0 to static vars. |
---|
598 | * io.c (read_files): New argument PRETEND_BINARY says whether to |
---|
599 | pretend the files are binary. |
---|
600 | |
---|
601 | * diff3.c (tab_align_flag): New variable, for new -T option. |
---|
602 | (main, usage, output_diff3): Add support for -T. |
---|
603 | |
---|
604 | Sun May 23 15:25:29 1993 Richard Stallman (rms@mole.gnu.ai.mit.edu) |
---|
605 | |
---|
606 | * dir.c (dir_sort): Always init `data' to avoid GCC warning. |
---|
607 | |
---|
608 | Sat May 22 15:35:02 1993 Paul Eggert (eggert@twinsun.com) |
---|
609 | |
---|
610 | * Makefile.in (dist): Change name of package from diff to diffutils. |
---|
611 | Don't bother to build .Z dist; .z suffices. |
---|
612 | |
---|
613 | Fri May 21 16:35:22 1993 Paul Eggert (eggert@twinsun.com) |
---|
614 | |
---|
615 | * diff.c: Include "system.h" to get memchr declaration. |
---|
616 | * system.h (memchr): Declare if !HAVE_MEMCHR, not if |
---|
617 | !HAVE_MEMCHR && !STDC_HEADERS. |
---|
618 | |
---|
619 | Wed May 19 17:43:55 1993 Paul Eggert (eggert@twinsun.com) |
---|
620 | |
---|
621 | * Version 2.3 released. |
---|
622 | |
---|
623 | Fri Apr 23 17:18:44 1993 Paul Eggert (eggert@twinsun.com) |
---|
624 | |
---|
625 | * io.c (find_identical_ends): Do not discard the last HORIZON_LINES |
---|
626 | lines of the prefix, or the first HORIZON_LINES lines of the suffix. |
---|
627 | * diff.c (main, longopts, usage): Add --horizon-lines option. |
---|
628 | * diff3.c (main, process_diff, read_diff): Invoke second diff |
---|
629 | with --horizon-lines determined by the first diff. |
---|
630 | * diff.h, diff3.c (horizon_lines): New variable. |
---|
631 | |
---|
632 | Mon Mar 22 16:16:00 1993 Roland McGrath (roland@churchy.gnu.ai.mit.edu) |
---|
633 | |
---|
634 | * system.h [HAVE_STRING_H || STDC_HEADERS] (bcopy, bcmp, bzero): |
---|
635 | Don't define if already defined. |
---|
636 | |
---|
637 | Fri Mar 5 00:20:16 1993 Richard Stallman (rms@mole.gnu.ai.mit.edu) |
---|
638 | |
---|
639 | * diff.c (main): Use NULL in arg to compare_files. |
---|
640 | |
---|
641 | Thu Feb 25 15:26:01 1993 Roland McGrath (roland@churchy.gnu.ai.mit.edu) |
---|
642 | |
---|
643 | * system.h: Declare memchr #if !HAVE_MEMCHR && !STDC_HEADERS, |
---|
644 | not #if !HAVE_MEMCHR || !STDC_HEADERS. |
---|
645 | |
---|
646 | Mon Feb 22 15:04:46 1993 Richard Stallman (rms@geech.gnu.ai.mit.edu) |
---|
647 | |
---|
648 | * io.c (find_identical_ends): Move complicated arg outside GUESS_LINES. |
---|
649 | |
---|
650 | Mon Feb 22 12:56:12 1993 Roland McGrath (roland@churchy.gnu.ai.mit.edu) |
---|
651 | |
---|
652 | * Makefile.in (.c.o): Add -I$(srcdir); put $(CFLAGS) last before $<. |
---|
653 | |
---|
654 | Sat Feb 20 19:18:56 1993 Richard Stallman (rms@mole.gnu.ai.mit.edu) |
---|
655 | |
---|
656 | * io.c (binary_file_p): Return zero if file size is zero. |
---|
657 | |
---|
658 | Fri Feb 19 17:31:32 1993 Roland McGrath (roland@geech.gnu.ai.mit.edu) |
---|
659 | |
---|
660 | * Version 2.2 released. |
---|
661 | |
---|
662 | * system.h [HAVE_STRING_H || STDC_HEADERS] (index, rindex): Don't |
---|
663 | define if already defined. |
---|
664 | |
---|
665 | Wed Feb 17 17:08:00 1993 Roland McGrath (roland@churchy.gnu.ai.mit.edu) |
---|
666 | |
---|
667 | * Makefile.in (srcs): Remove limits.h. |
---|
668 | |
---|
669 | Thu Feb 11 03:36:00 1993 Richard Stallman (rms@mole.gnu.ai.mit.edu) |
---|
670 | |
---|
671 | * diff3.c (xmalloc): No longer static. |
---|
672 | |
---|
673 | * sdiff.c (edit): Allocate buf dynamically. |
---|
674 | |
---|
675 | * dir.c (dir_sort): Handle VOID_CLOSEDIR. |
---|
676 | |
---|
677 | Wed Feb 10 00:15:54 1993 Richard Stallman (rms@mole.gnu.ai.mit.edu) |
---|
678 | |
---|
679 | * limits.h: File deleted (should never have been there). |
---|
680 | |
---|
681 | Tue Feb 9 03:53:22 1993 Richard Stallman (rms@mole.gnu.ai.mit.edu) |
---|
682 | |
---|
683 | * Makefile.in (.c.o, diff3.o, sdiff.o): Put $(CFLAGS) last. |
---|
684 | |
---|
685 | Wed Feb 3 15:42:10 1993 David J. MacKenzie (djm@goldman.gnu.ai.mit.edu) |
---|
686 | |
---|
687 | * system.h: Don't #define const; let configure do it. |
---|
688 | |
---|
689 | Mon Feb 1 02:13:23 1993 Paul Eggert (eggert@hal.gnu.ai.mit.edu) |
---|
690 | |
---|
691 | * Version 2.1 released. |
---|
692 | |
---|
693 | * Makefile.in (dist): Survive ln failures. Create .tar.z |
---|
694 | (gzipped tar) file as well as .tar.Z (compressed tar) file. |
---|
695 | |
---|
696 | Fri Jan 8 22:31:41 1993 Paul Eggert (eggert@twinsun.com) |
---|
697 | |
---|
698 | * side.c (print_half_line): When the input position falls |
---|
699 | outside the column, do not output a tab even if the output |
---|
700 | position still falls within the column. |
---|
701 | |
---|
702 | Mon Dec 21 13:54:36 1992 David J. MacKenzie (djm@kropotkin.gnu.ai.mit.edu) |
---|
703 | |
---|
704 | * Makefile.in (.c.o): Add -I. |
---|
705 | |
---|
706 | Fri Dec 18 14:08:20 1992 Paul Eggert (eggert@twinsun.com) |
---|
707 | |
---|
708 | * configure.in: Add HAVE_FCNTL_H, since system.h uses it. |
---|
709 | |
---|
710 | Tue Nov 24 10:06:48 1992 David J. MacKenzie (djm@goldman.gnu.ai.mit.edu) |
---|
711 | |
---|
712 | * Makefile.in: Note change from USG to HAVE_STRING_H. |
---|
713 | |
---|
714 | Mon Nov 23 18:44:00 1992 Paul Eggert (eggert@twinsun.com) |
---|
715 | |
---|
716 | * io.c (find_and_hash_each_line): When running out of lines, |
---|
717 | double the number of allocated lines, instead of just doubling |
---|
718 | that number minus the prefix lines. This is more likely to |
---|
719 | avoid the need for further memory allocation. |
---|
720 | |
---|
721 | Wed Nov 18 20:40:28 1992 Paul Eggert (eggert@twinsun.com) |
---|
722 | |
---|
723 | * dir.c (dir_sort): Plug memory leak: space holding directory |
---|
724 | contents was not being reclaimed. Get directory size from |
---|
725 | struct file_data for initial guess at memory needed. |
---|
726 | Detect errors when reading and closing directory. |
---|
727 | (diff_dirs): Pass struct file_data to dir_sort. Finish plugging leak. |
---|
728 | * diff.c (compare_files): Pass struct file_data to diff_dirs. |
---|
729 | |
---|
730 | * io.c (find_and_hash_each_line): Don't assume alloc_lines is |
---|
731 | nonzero when allocating more lines. |
---|
732 | |
---|
733 | Thu Nov 12 16:02:18 1992 Paul Eggert (eggert@twinsun.com) |
---|
734 | |
---|
735 | * diff.c (main): Add `-U lines' as an alias for `--unified=lines'. |
---|
736 | |
---|
737 | * diff3.c (usage): Add third --label option in example. |
---|
738 | |
---|
739 | * util.c (analyze_hunk): Fix test for ignoring blank lines. |
---|
740 | |
---|
741 | * configure.in, system.h: Avoid USG; use HAVE_TIME_H etc. instead. |
---|
742 | |
---|
743 | Mon Nov 9 05:13:25 1992 Paul Eggert (eggert@twinsun.com) |
---|
744 | |
---|
745 | * diff3.c (main, usage): Add -A or --show-all. |
---|
746 | -m now defaults to -A, not -E. Allow up to three -L options. |
---|
747 | (output_diff3_edscript, output_diff3_merge): |
---|
748 | Remove spurious differences between these two functions. |
---|
749 | Output ||||||| for -A. Distinguish between conflicts and overlaps. |
---|
750 | (dotlines, undotlines): New functions that output `Ns', not `N,Ns'. |
---|
751 | (output_diff3_edscript, output_diff3_merge): Use them. |
---|
752 | |
---|
753 | * io.c (find_identical_ends): shift_boundaries needs an extra |
---|
754 | identical line at the end, not at the beginning. |
---|
755 | |
---|
756 | * sdiff.c (edit): execvp wants char **, not const char **. |
---|
757 | |
---|
758 | Mon Oct 19 04:39:32 1992 Paul Eggert (eggert@twinsun.com) |
---|
759 | |
---|
760 | * context.c (print_context_script, find_function): Context |
---|
761 | line numbers start with - file->prefix_lines, not 0. |
---|
762 | |
---|
763 | * io.c (binary_file_p): Undo last change; it was a library bug. |
---|
764 | |
---|
765 | Sun Oct 18 00:17:29 1992 Richard Stallman (rms@mole.gnu.ai.mit.edu) |
---|
766 | |
---|
767 | * io.c (binary_file_p): Consider empty file as non-binary. |
---|
768 | |
---|
769 | Mon Oct 5 05:18:46 1992 Paul Eggert (eggert@twinsun.com) |
---|
770 | |
---|
771 | * diff3.c (main, make_3way_diff, using_to_diff3_block): Don't |
---|
772 | report bogus differences (for one of -mexEX3) just because the |
---|
773 | file0-file1 diffs don't line up with the file0-file2 diffs. |
---|
774 | (This is entirely possible since we don't use diff's -n |
---|
775 | option.) Always compare file1 to file2, so that diff3 sees |
---|
776 | those changes directly. Typically, file2 is now the common |
---|
777 | file, not file0. |
---|
778 | (output_diff3_merge): The input file is file 0, not the common file. |
---|
779 | |
---|
780 | (FC, FO): New macros; they replace FILE1, FILE0 for two-way diffs, |
---|
781 | to distinguish them from three-way diffs. |
---|
782 | |
---|
783 | * diff3.c (using_to_diff3_block): Fold repeated code into loops. |
---|
784 | |
---|
785 | * diff3.c (make_3way_diff, process_diff): Have the *_end |
---|
786 | variable point to the next field to be changed, not to the last |
---|
787 | object allocated; this saves an if-then-else. |
---|
788 | |
---|
789 | * diff3.c (process_diff): Use D_NUMLINES instead of its definiens. |
---|
790 | |
---|
791 | * diff3.c: Make fns and vars static unless they must be external. |
---|
792 | |
---|
793 | Wed Sep 30 09:21:59 1992 Paul Eggert (eggert@twinsun.com) |
---|
794 | |
---|
795 | * analyze.c (diff_2_files): OUTPUT_IFDEF is now robust. |
---|
796 | * diff.h (ROBUST_OUTPUT_STYLE): Likewise. |
---|
797 | (default_line_format): Remove. All refs removed. |
---|
798 | |
---|
799 | * ifdef.c (print_ifdef_lines): Add %L. Optimize %l\n even if user |
---|
800 | specified it, as opposed to its being the default. |
---|
801 | |
---|
802 | Tue Sep 29 19:01:28 1992 Paul Eggert (eggert@twinsun.com) |
---|
803 | |
---|
804 | * diff.c (longopts, main): --{old,new,unchanged,changed}--group-format |
---|
805 | are new options, so that -D is no longer overloaded. Set |
---|
806 | no_diff_means_no_output if --unchanged-{line,group}-format allows it. |
---|
807 | * diff.h (enum line_class): New type. |
---|
808 | (group_format, line_format): Use it to regularize option flags. |
---|
809 | All refs changed. |
---|
810 | |
---|
811 | * ifdef.c (format_ifdef, print_ifdef_lines): %n is no longer a format. |
---|
812 | |
---|
813 | Mon Sep 28 04:51:42 1992 Paul Eggert (eggert@twinsun.com) |
---|
814 | |
---|
815 | * diff.c (main, usage): Replace --line-prefix with the more general |
---|
816 | --{old,new,unchanged}-line-format options. |
---|
817 | * ifdef.c (format_ifdef, print_ifdef_lines): Likewise. |
---|
818 | * diff.h (line_format): Renamed from line_prefix. All refs changed. |
---|
819 | * diff.h, ifdef.c (default_line_format): New variable. |
---|
820 | * util.c (output_1_line): New function. |
---|
821 | (print_1_line): Use it. |
---|
822 | |
---|
823 | * ifdef.c: (format_ifdef, print_ifdef_lines): Add %0 format. |
---|
824 | |
---|
825 | Sun Sep 27 05:38:13 1992 Paul Eggert (eggert@twinsun.com) |
---|
826 | |
---|
827 | * diff.c (main): Add -E or --line-prefix option. Add -D'=xxx' |
---|
828 | for common lines. Change default -D< format from copy of -D> |
---|
829 | format to to -D<%<; similarly for default -D> format. |
---|
830 | * diff.h (common_format, line_prefix): New variables. |
---|
831 | * ifdef.c (format_ifdef): New function. |
---|
832 | (print_ifdef_script, print_ifdef_hunk, print_ifdef_lines): |
---|
833 | Use it for -D'=xxx', -E. |
---|
834 | |
---|
835 | * context.c (find_hunk): Glue together two non-ignorable changes that |
---|
836 | are exactly CONTEXT * 2 lines apart. This shortens output, removes |
---|
837 | a behavioral discontinuity at CONTEXT = 0, and is more compatible |
---|
838 | with traditional diff. |
---|
839 | |
---|
840 | * io.c (find_identical_ends): Slurp stdin at most once. |
---|
841 | |
---|
842 | * util.c (print_line_line): line_flag is const char *. |
---|
843 | |
---|
844 | Thu Sep 24 15:18:07 1992 Paul Eggert (eggert@twinsun.com) |
---|
845 | |
---|
846 | * ifdef.c (print_ifdef_lines): New function, which fwrites a sequence |
---|
847 | of lines all at once for speed. |
---|
848 | (print_ifdef_script, print_ifdef_hunk): Use it. |
---|
849 | |
---|
850 | Thu Sep 24 05:54:14 1992 Paul Eggert (eggert@twinsun.com) |
---|
851 | |
---|
852 | * diff.c (main): Support new -D options for if-then-else formats. |
---|
853 | (specify_format): New function. |
---|
854 | * diff.h (ifndef_format, ifdef_format, ifnelse_format): New variables. |
---|
855 | * ifdef.c (print_ifdef_hunk): Use the new variables instead of |
---|
856 | a hardwired format. |
---|
857 | |
---|
858 | * side.c (print_1sdiff_line): Represent incomplete lines on output. |
---|
859 | (print_sdiff_script): Likewise. Don't print 'q' at end, |
---|
860 | since that doesn't work with incomplete lines. |
---|
861 | * sdiff.c (interact): Don't assume diff output ends with 'q' line. |
---|
862 | * diff.h (ROBUST_OUTPUT_STYLE): OUTPUT_SDIFF is now robust. |
---|
863 | |
---|
864 | * sdiff.c (lf_copy, lf_snarf): Use memchr instead of index, |
---|
865 | to avoid dumping core when files contain null characters. |
---|
866 | (memchr): New function (if memchr is missing). |
---|
867 | |
---|
868 | * io.c (sip): New arg SKIP_TEST to skip test for binary file. |
---|
869 | (read_files): Don't bother testing second file if first is binary. |
---|
870 | |
---|
871 | Thu Sep 17 21:17:49 1992 David J. MacKenzie (djm@nutrimat.gnu.ai.mit.edu) |
---|
872 | |
---|
873 | * system.h [!USG && !_POSIX_VERSION]: Protect from conflicting |
---|
874 | prototype for wait in sys/wait.h. |
---|
875 | |
---|
876 | Wed Sep 16 12:32:18 1992 David J. MacKenzie (djm@nutrimat.gnu.ai.mit.edu) |
---|
877 | |
---|
878 | * Makefile.in: Include binprefix in -DDIFF_PROGRAM. |
---|
879 | |
---|
880 | Tue Sep 15 14:27:25 1992 David J. MacKenzie (djm@nutrimat.gnu.ai.mit.edu) |
---|
881 | |
---|
882 | * Version 2.0. |
---|
883 | |
---|
884 | Sat Sep 12 01:31:19 1992 David J. MacKenzie (djm@nutrimat.gnu.ai.mit.edu) |
---|
885 | |
---|
886 | * util.c, diff.h, system.h [!HAVE_MEMCHR]: Don't use void * |
---|
887 | and const when declaring memchr replacement. Declare memchr |
---|
888 | if !STDC_HEADERS && !USG. |
---|
889 | |
---|
890 | Thu Sep 10 15:17:32 1992 David J. MacKenzie (djm@nutrimat.gnu.ai.mit.edu) |
---|
891 | |
---|
892 | * Makefile.in (uninstall): New target. |
---|
893 | |
---|
894 | * diff.c (excluded_filename): Use fnmatch, not wildmat. |
---|
895 | (usage): Document -x, -X, --exclude, --exclude-from. |
---|
896 | Makefile.in: Use fnmatch.c, not wildmat.c. |
---|
897 | |
---|
898 | Sun Sep 6 23:46:25 1992 Paul Eggert (eggert@twinsun.com) |
---|
899 | |
---|
900 | * configure.in: Add HAVE_MEMCHR. |
---|
901 | * diff.h, util.c: Use it instead of MEMCHR_MISSING. |
---|
902 | |
---|
903 | Sun Sep 6 07:25:49 1992 Paul Eggert (eggert@twinsun.com) |
---|
904 | |
---|
905 | * diff.h: (struct line_def): Replace this 3-word struct with char *. |
---|
906 | This uses less memory, particularly for large files with short lines. |
---|
907 | (struct file_data): New member linbuf_base counts number of lines |
---|
908 | in common prefix that are not recorded in linbuf; |
---|
909 | this uses less memory if files are identical or differ only at end. |
---|
910 | New member buffered_lines counts possibly differing lines. |
---|
911 | New member valid_lines counts valid data. |
---|
912 | New member alloc_lines - linbuf_base replaces old linbufsize. |
---|
913 | linbuf[0] now always points at first differing line. |
---|
914 | Remove unused members ltran, suffix_lines. |
---|
915 | Add const where appropriate. |
---|
916 | (Is_space): New macro, for consistent definition of `white space'. |
---|
917 | (excluded_filename, memchr, sip, slurp): New declarations. |
---|
918 | * ed.c (print_ed_hunk): Adjust to diff.h's struct changes. |
---|
919 | * context.c (pr_context_hunk): Likewise. |
---|
920 | * ifdef.c (print_ifdef_script): Likewise. |
---|
921 | * side.c (print_sdiff_script, print_half_line): Likewise. |
---|
922 | * util.c (analyze_hunk, line_cmp, print_1_line): Likewise. |
---|
923 | |
---|
924 | * analyze.c (shift_boundaries): Remove unneeded variable `end' and |
---|
925 | unnecessary comparisons of `preceding' and `other_preceding' against 0. |
---|
926 | (diff_2_files): When comparing files byte-by-byte for equality, |
---|
927 | don't slurp them all in at once; just compare them a buffer at a time. |
---|
928 | This can win big if they differ early on. |
---|
929 | Move some code to compare_files to enable this change. |
---|
930 | Use only one buffer for stdin with `diff - -'. |
---|
931 | (discard_confusing_lines, diff_2_files): Coalesce malloc/free calls. |
---|
932 | (build_script): Remove obsolete OUTPUT_RCS code. |
---|
933 | |
---|
934 | * diff.c (add_exclude, add_exclude_file, excluded_filename): New fns. |
---|
935 | (main): Use them for the new --exclude and --exclude-from options. |
---|
936 | (compare_files): Don't open a file unless it must be read. |
---|
937 | Treat `diff file file' and `diff file dir' similarly. |
---|
938 | Move some code here from diff_2_files to enable this. |
---|
939 | Simplify file vs dir warning. |
---|
940 | |
---|
941 | * dir.c (dir_sort): Support new --exclude* options. |
---|
942 | |
---|
943 | * io.c (struct equivclass): Put hash code and line length here instead |
---|
944 | of struct line_def, so that they can be shared. |
---|
945 | (find_and_hash_each_line): Compute equivalence class as we go, |
---|
946 | instead of doing it in a separate pass; this thrashes memory less. |
---|
947 | Make buckets realloc-able, since we can't preallocate them. |
---|
948 | Record one more line start than there are lines, so that we can compute |
---|
949 | any line's length by subtracting its start from the next line's, |
---|
950 | instead of storing the length explicitly. This saves memory. |
---|
951 | Move prefix-handling code to find_identical_ends; |
---|
952 | this wins with large prefixes. |
---|
953 | Use Is_space, not is_space, for consistent treatment of white space. |
---|
954 | (prepare_text_end): New function. |
---|
955 | (find_identical_ends): Move slurping here, so it's only done when |
---|
956 | needed. Work even if the buffers are the same (because of `diff - -'). |
---|
957 | Compare prefixes a word at a time for speed. |
---|
958 | (find_equiv_class): Delete; now done by find_and_hash_each_line. |
---|
959 | (read_files): Don't slurp unless needed. |
---|
960 | find_equiv_class's work is now folded into find_and_hash_each_line. |
---|
961 | Don't copy stdin buffer if `diff - -'. |
---|
962 | Check for running out of primes. |
---|
963 | (sip, slurp): Split first part of `slurp' into another function `sip'. |
---|
964 | `sip' sets things up and perhaps reads the first ST_BLKSIZE buffer to |
---|
965 | see whether the file is binary; `slurp' now just finishes the job. |
---|
966 | This lets diff_2_files compare binary files lazily. |
---|
967 | Allocate a one-word sentinel to allow word-at-a-time prefix comparison. |
---|
968 | Count prefix lines only if needed, only count the first file's prefix. |
---|
969 | Don't bother to count suffix lines; it's never needed. |
---|
970 | Set up linbuf[0] to point at first differing line. |
---|
971 | (binary_file_p): Change test for binary files: |
---|
972 | if it has a null byte in its first buffer, it's binary. |
---|
973 | (primes): Add more primes. |
---|
974 | |
---|
975 | * util.c (line_cmp): Use bcmp for speed. |
---|
976 | Use Is_space, not is_space, for consistent treatment of white space. |
---|
977 | (translate_line_number): Internal line numbers now count from 0 |
---|
978 | starting after the prefix. |
---|
979 | (memchr): New function (if memchr is missing). |
---|
980 | |
---|
981 | * Makefile.in: Document HAVE_ST_BLKSIZE. Link with wildmat.o. |
---|
982 | * system.h (STAT_BLOCKSIZE): New macro based on HAVE_ST_BLKSIZE. |
---|
983 | * configure.in: Add AC_ST_BLKSIZE. |
---|
984 | * wildmat.c: New file. |
---|
985 | |
---|
986 | Fri Sep 4 01:28:51 1992 Richard Stallman (rms@mole.gnu.ai.mit.edu) |
---|
987 | |
---|
988 | * sdiff.c (xmalloc): Renamed from ck_malloc. Callers changed. |
---|
989 | |
---|
990 | Thu Sep 3 15:28:59 1992 David J. MacKenzie (djm@nutrimat.gnu.ai.mit.edu) |
---|
991 | |
---|
992 | * diff.h: Don't declare free, index, rindex. |
---|
993 | |
---|
994 | Tue Aug 11 22:18:06 1992 John Gilmore (gnu at cygnus.com) |
---|
995 | |
---|
996 | * io.c (binary_file_p): Use heuristic to avoid declaring info |
---|
997 | files as binary files. Allow about 1.5% non-printing |
---|
998 | characters (in info's case, ^_). |
---|
999 | |
---|
1000 | Tue Jul 7 01:09:26 1992 David J. MacKenzie (djm@nutrimat.gnu.ai.mit.edu) |
---|
1001 | |
---|
1002 | * diff.h: Replace function_regexp and ignore_regexp with lists |
---|
1003 | of compiled regexps. |
---|
1004 | * analyze.c, context.c, util.c: Test whether the lists, not |
---|
1005 | the old variables, are empty. |
---|
1006 | * util.c (analyze_hunk), context.c (find_function): Compare |
---|
1007 | lines with the lists of regexps. |
---|
1008 | * diff.c (add_regexp): New function. |
---|
1009 | (main): Use it. |
---|
1010 | |
---|
1011 | * diff3: Add -v --version option. |
---|
1012 | * Makefile.in: Link with version.o. |
---|
1013 | |
---|
1014 | * system.h: New file. |
---|
1015 | * diff.h, cmp.c, diff3.c, sdiff.c: Use it. |
---|
1016 | |
---|
1017 | * diff.h, diff3.c: Include string.h or strings.h, as appropriate. |
---|
1018 | Declare malloc and realloc. |
---|
1019 | |
---|
1020 | * diff3.c (perror_with_exit): Include program name in message. |
---|
1021 | |
---|
1022 | * diff3.c: Lowercase error messages for GNU standards. |
---|
1023 | |
---|
1024 | * sdiff.c [USG || STDC_HEADERS]: Define bcopy in terms of memcpy. |
---|
1025 | |
---|
1026 | * sdiff.c: Use the version number from version.c. |
---|
1027 | * Makefile.in: Link with version.o. |
---|
1028 | |
---|
1029 | * cmp.c error.c xmalloc.c: New files from textutils. |
---|
1030 | * Makefile.in: Add rules for them. |
---|
1031 | |
---|
1032 | * diff.c (longopts): --unidirectional-new-file is like -P, not -N. |
---|
1033 | Rename --file-label to --label (leave old name, but undocumented). |
---|
1034 | |
---|
1035 | * sdiff.c, diff.c (usage): Condense messages and fix some errors. |
---|
1036 | |
---|
1037 | * diff3.c (main, usage): Add long-named options. |
---|
1038 | |
---|
1039 | Fri Jul 3 14:31:18 1992 David J. MacKenzie (djm@nutrimat.gnu.ai.mit.edu) |
---|
1040 | |
---|
1041 | * diff.h, diff3.c, sdiff.c: Change FOO_MISSING macros to HAVE_FOO. |
---|
1042 | |
---|
1043 | Thu Jun 25 16:59:47 1992 David J. MacKenzie (djm@apple-gunkies.gnu.ai.mit.edu) |
---|
1044 | |
---|
1045 | * diff.c: --reversed-ed -> --forward-ed. |
---|
1046 | |
---|
1047 | Wed Feb 26 12:17:32 1992 Paul Eggert (eggert@yata.uucp) |
---|
1048 | |
---|
1049 | * analyze.c, diff.c, diff.h, io.c: For -y, compare even if same file. |
---|
1050 | |
---|
1051 | Fri Feb 14 22:46:38 1992 Richard Stallman (rms@mole.gnu.ai.mit.edu) |
---|
1052 | |
---|
1053 | * io.c, diff3.c, analyze.c: Add extra parentheses. |
---|
1054 | |
---|
1055 | Sun Feb 9 00:22:42 1992 Richard Stallman (rms@mole.gnu.ai.mit.edu) |
---|
1056 | |
---|
1057 | * diff.h (unidirectional_new_file_flag): New variable. |
---|
1058 | * diff.c (main): Set that for -P. |
---|
1059 | (compare_files): Support -P, somewhat like -N. |
---|
1060 | (longopts): Support long name for -P. |
---|
1061 | |
---|
1062 | Sat Jan 4 20:10:34 1992 Paul Eggert (eggert at yata.uucp) |
---|
1063 | |
---|
1064 | * Makefile.in: Distribute diff.info-* too. |
---|
1065 | |
---|
1066 | * README, sdiff.c: version number now matches version.c. |
---|
1067 | |
---|
1068 | * configure: Fix and document vfork test. |
---|
1069 | |
---|
1070 | * ifdef.c: Don't dump core if `diff -Dx f f'. |
---|
1071 | |
---|
1072 | Mon Dec 23 23:36:08 1991 David J. MacKenzie (djm at wookumz.gnu.ai.mit.edu) |
---|
1073 | |
---|
1074 | * diff.h, diff3.c, sdiff.c: Change POSIX ifdefs to |
---|
1075 | HAVE_UNISTD_H and _POSIX_VERSION. |
---|
1076 | |
---|
1077 | Wed Dec 18 17:00:31 1991 David J. MacKenzie (djm at wookumz.gnu.ai.mit.edu) |
---|
1078 | |
---|
1079 | * Makefile.in (srcs): Add sdiff.c. |
---|
1080 | (tapefiles): Add diff.texi and diff.info. |
---|
1081 | |
---|
1082 | * diff.h, diff3.c, sdiff.c: Use HAVE_VFORK_H instead of |
---|
1083 | VFORK_HEADER and VFORK_WORKS. |
---|
1084 | |
---|
1085 | Tue Dec 17 00:02:59 1991 Paul Eggert (eggert at yata.uucp) |
---|
1086 | |
---|
1087 | * Makefile.in (all): Add diff.info, sdiff. |
---|
1088 | |
---|
1089 | * configure, diff.c, sdiff.c: |
---|
1090 | Prefix long options with `--', not `+'. |
---|
1091 | * diff.c: Regularize option names. |
---|
1092 | |
---|
1093 | * configure: Fix check for vfork. |
---|
1094 | * configure, diff.c, diff.h, diff3.c, sdiff.c: |
---|
1095 | Use Posix definitions when possible. |
---|
1096 | |
---|
1097 | * context.c: Align context with tab if -T is given. Tune. |
---|
1098 | * diff.c, diff.h, side.c: Calculate column widths so that tabs line up. |
---|
1099 | * io.c: Add distinction between white space and printing chars. |
---|
1100 | * side.c: Don't expand tabs unless -t is given. |
---|
1101 | * side.c, util.c: Tab expansion now knows about '\b', '\f', '\r', '\v'. |
---|
1102 | * util.c: -w skips all white space. Remove lint. Tune. |
---|
1103 | |
---|
1104 | * sdiff.c: Support many more diff options, e.g. `-', `sdiff file dir'. |
---|
1105 | Ignore interrupts while the subsidiary editor is in control. |
---|
1106 | Clean up temporary file and kill subsidiary diff if interrupted. |
---|
1107 | Ensure subsidiary diff doesn't ignore SIGPIPE. |
---|
1108 | Don't get confused while waiting for two subprocesses. |
---|
1109 | Don't let buffers overflow. Check for I/O errors. |
---|
1110 | Convert to GNU style. Tune. |
---|
1111 | |
---|
1112 | * sdiff.c, util.c: Don't lose errno. |
---|
1113 | Don't confuse sdiff with messages like `Binary files differ'. |
---|
1114 | * sdiff.c, side.c: Don't assume that common lines are identical. |
---|
1115 | Simplify --sdiff-merge-assist format. |
---|
1116 | |
---|
1117 | Mon Sep 16 16:42:01 1991 Tom Lord (lord at churchy.gnu.ai.mit.edu) |
---|
1118 | |
---|
1119 | * Makefile.in, sdiff.c: introduced sdiff front end to diff. |
---|
1120 | |
---|
1121 | * Makefile.in, analyze.c, diff.c, diff.h, io.c, side.c: Added |
---|
1122 | sdiff-style output format to diff. |
---|
1123 | |
---|
1124 | Mon Aug 26 16:44:55 1991 David J. MacKenzie (djm at pogo.gnu.ai.mit.edu) |
---|
1125 | |
---|
1126 | * Makefile.in, configure: Only put $< in Makefile if using VPATH, |
---|
1127 | because older makes don't understand it. |
---|
1128 | |
---|
1129 | Fri Aug 2 12:22:30 1991 David J. MacKenzie (djm at apple-gunkies) |
---|
1130 | |
---|
1131 | * configure: Create config.status. Remove it and Makefile if |
---|
1132 | interrupted while creating them. |
---|
1133 | |
---|
1134 | Thu Aug 1 22:24:31 1991 David J. MacKenzie (djm at apple-gunkies) |
---|
1135 | |
---|
1136 | * configure: Check for +srcdir etc. arg and look for |
---|
1137 | Makefile.in in that directory. Set VPATH if srcdir is not `.'. |
---|
1138 | * Makefile.in: Get rid of $(archpfx). |
---|
1139 | |
---|
1140 | Tue Jul 30 21:28:44 1991 Richard Stallman (rms at mole.gnu.ai.mit.edu) |
---|
1141 | |
---|
1142 | * Makefile.in (prefix): Renamed from DESTDIR. |
---|
1143 | |
---|
1144 | Wed Jul 24 23:08:56 1991 David J. MacKenzie (djm at wookumz.gnu.ai.mit.edu) |
---|
1145 | |
---|
1146 | * diff.h, diff3.c: Rearrange ifdefs to use POSIX, |
---|
1147 | STDC_HEADERS, VFORK_MISSING, DIRENT. This way it works on |
---|
1148 | more systems that aren't pure USG or BSD. |
---|
1149 | Don't not define const if __GNUC__ is defined -- that would |
---|
1150 | break with -traditional. |
---|
1151 | * configure: Check for those features. |
---|
1152 | |
---|
1153 | Wed Jul 10 01:39:23 1991 David J. MacKenzie (djm at wookumz.gnu.ai.mit.edu) |
---|
1154 | |
---|
1155 | * configure, Makefile.in: $(INSTALLPROG) -> $(INSTALL). |
---|
1156 | |
---|
1157 | Sat Jul 6 16:39:04 1991 David J. MacKenzie (djm at geech.gnu.ai.mit.edu) |
---|
1158 | |
---|
1159 | * Replace Makefile with configure and Makefile.in. |
---|
1160 | Update README with current compilation instructions. |
---|
1161 | |
---|
1162 | Sat Jul 6 14:03:29 1991 Richard Stallman (rms at mole.gnu.ai.mit.edu) |
---|
1163 | |
---|
1164 | * util.c (setup_output): Just save the args for later use. |
---|
1165 | (begin_output): Do the real work, with the values that were saved. |
---|
1166 | It's safe to call begin_output more than once. |
---|
1167 | Print the special headers for context format here. |
---|
1168 | * analyze.c (diff_2_files): Don't print special headers here. |
---|
1169 | * context.c (pr_context_hunk, pr_unidiff_hunk): Call begin_output. |
---|
1170 | * ed.c (print_ed_hunk, print_forward_ed_hunk, print_rcs_hunk): |
---|
1171 | * normal.c (print_normal_hunk): Likewise. |
---|
1172 | * ifdef.c (print_ifdef_hunk): Likewise. |
---|
1173 | * util.c (finish_output): Don't die if begin_output was not called. |
---|
1174 | |
---|
1175 | Thu Jun 20 23:10:01 1991 David J. MacKenzie (djm at geech.gnu.ai.mit.edu) |
---|
1176 | |
---|
1177 | * Makefile: Add TAGS, distclean, and realclean targets. |
---|
1178 | Set SHELL. |
---|
1179 | |
---|
1180 | Tue Apr 30 13:54:36 1991 Richard Stallman (rms at mole.gnu.ai.mit.edu) |
---|
1181 | |
---|
1182 | * diff.h (TRUE, FALSE): Undefine these before defining. |
---|
1183 | |
---|
1184 | Thu Mar 14 18:27:27 1991 Richard Stallman (rms@mole.ai.mit.edu) |
---|
1185 | |
---|
1186 | * Makefile (objs): Include $(ALLOCA). |
---|
1187 | |
---|
1188 | Sat Mar 9 22:34:03 1991 Richard Stallman (rms at mole.ai.mit.edu) |
---|
1189 | |
---|
1190 | * diff.h: Include regex.h. |
---|
1191 | |
---|
1192 | Thu Feb 28 18:59:53 1991 Richard Stallman (rms at mole.ai.mit.edu) |
---|
1193 | |
---|
1194 | * Makefile (diff3): Link with GNU getopt. |
---|
1195 | |
---|
1196 | Sat Feb 23 12:49:43 1991 Richard Stallman (rms at mole.ai.mit.edu) |
---|
1197 | |
---|
1198 | * io.c (find_equiv_class): Make hash code unsigned before mod. |
---|
1199 | |
---|
1200 | * diff.h (files): Add EXTERN. |
---|
1201 | |
---|
1202 | Sun Jan 13 21:33:01 1991 Richard Stallman (rms at mole.ai.mit.edu) |
---|
1203 | |
---|
1204 | * diff.c: +print option renamed +paginate. Remove +all-text. |
---|
1205 | |
---|
1206 | Mon Jan 7 06:18:01 1991 David J. MacKenzie (djm at geech.ai.mit.edu) |
---|
1207 | |
---|
1208 | * Makefile (dist): New target, replacing diff.tar and |
---|
1209 | diff.tar.Z, to encode version number in distribution directory |
---|
1210 | and tar file names. |
---|
1211 | |
---|
1212 | Sun Jan 6 18:42:23 1991 Michael I Bushnell (mib at geech.ai.mit.edu) |
---|
1213 | |
---|
1214 | * Version 1.15 released. |
---|
1215 | |
---|
1216 | * version.c: Updated from 1.15 alpha to 1.15 |
---|
1217 | |
---|
1218 | * context.c (print_context_number_range, |
---|
1219 | print_unidiff_number_range): Don't print N,M when N=M, print |
---|
1220 | just N instead. |
---|
1221 | |
---|
1222 | * README: Updated for version 1.15. |
---|
1223 | Makefile: Updated for version 1.15. |
---|
1224 | |
---|
1225 | * diff3.c (main): Don't get confused if one of the arguments |
---|
1226 | is a directory. |
---|
1227 | |
---|
1228 | * diff.c (compare_files): Don't get confused if comparing |
---|
1229 | standard input to a directory; print error instead. |
---|
1230 | |
---|
1231 | * analyze.c (diff_2_files), context.c (print_context_header, |
---|
1232 | print_context_script), diff.c (main), diff.h (enum |
---|
1233 | output_style): Tread unidiff as an output style in its own |
---|
1234 | right. This also generates an error when both -u and -c are |
---|
1235 | given. |
---|
1236 | |
---|
1237 | * diff.c (main): Better error messages when regexps are bad. |
---|
1238 | |
---|
1239 | * diff.c (compare_files): Don't assume stdin is opened. |
---|
1240 | |
---|
1241 | * diff3.c (read_diff): Don't assume things about the order of |
---|
1242 | descriptor assignment and closes. |
---|
1243 | |
---|
1244 | * util.c (setup_output): Don't assume things about the order |
---|
1245 | of descriptor assignment and closes. |
---|
1246 | |
---|
1247 | * diff.c (compare_files): Set a flag so that closes don't |
---|
1248 | happen more than once. |
---|
1249 | |
---|
1250 | * diff.c (main): Don't just flush stdout, do a close. That |
---|
1251 | way on broken systems we can still get errors. |
---|
1252 | |
---|
1253 | Mon Dec 24 16:24:17 1990 Richard Stallman (rms at mole.ai.mit.edu) |
---|
1254 | |
---|
1255 | * diff.c (usage): Use = for args of long options. |
---|
1256 | |
---|
1257 | Mon Dec 17 18:19:20 1990 Michael I Bushnell (mib at geech.ai.mit.edu) |
---|
1258 | |
---|
1259 | * context.c (print_context_label): Labels were interchanged badly. |
---|
1260 | |
---|
1261 | * context.c (pr_unidiff_hunk): Changes to deal with files |
---|
1262 | ending in incomplete lines. |
---|
1263 | * util.c (print_1_line): Other half of the changes. |
---|
1264 | |
---|
1265 | Mon Dec 3 14:23:55 1990 Richard Stallman (rms at mole.ai.mit.edu) |
---|
1266 | |
---|
1267 | * diff.c (longopts, usage): unidiff => unified. |
---|
1268 | |
---|
1269 | Wed Nov 7 17:13:08 1990 Richard Stallman (rms at mole.ai.mit.edu) |
---|
1270 | |
---|
1271 | * analyze.c (diff_2_files): No warnings about newlines for -D. |
---|
1272 | |
---|
1273 | * diff.c (pr_unidiff_hunk): Remove ref to output_patch_flag. |
---|
1274 | |
---|
1275 | Tue Oct 23 23:19:18 1990 Richard Stallman (rms at mole.ai.mit.edu) |
---|
1276 | |
---|
1277 | * diff.c (compare_files): For -D, compare even args are same file. |
---|
1278 | * analyze.c (diff_2_files): Likewise. |
---|
1279 | Also, output even if files have no differences. |
---|
1280 | |
---|
1281 | * analyze.c (diff_2_files): Print missing newline messages last. |
---|
1282 | Return 2 if a newline is missing. |
---|
1283 | Print them even if files end with identical text. |
---|
1284 | |
---|
1285 | Mon Oct 22 19:40:09 1990 Richard Stallman (rms at mole.ai.mit.edu) |
---|
1286 | |
---|
1287 | * diff.c (usage): Return 2. |
---|
1288 | |
---|
1289 | Wed Oct 10 20:54:04 1990 Richard Stallman (rms at mole.ai.mit.edu) |
---|
1290 | |
---|
1291 | * diff.c (longopts): Add +new-files. |
---|
1292 | |
---|
1293 | Sun Sep 23 22:49:29 1990 Richard Stallman (rms at mole.ai.mit.edu) |
---|
1294 | |
---|
1295 | * context.c (print_context_script): Handle unidiff_flag. |
---|
1296 | (print_context_header): Likewise. |
---|
1297 | (print_unidiff_number_range, pr_unidiff_hunk): New functions. |
---|
1298 | * diff.c (longopts): Add element for +unidiff. |
---|
1299 | (main): Handle +unidiff and -u. |
---|
1300 | (usage): Mention them. |
---|
1301 | |
---|
1302 | Wed Sep 5 16:33:22 1990 Richard Stallman (rms at mole.ai.mit.edu) |
---|
1303 | |
---|
1304 | * io.c (find_and_hash_each_line): Deal with missing final newline |
---|
1305 | after buffering necessary context lines. |
---|
1306 | |
---|
1307 | Sat Sep 1 16:32:32 1990 Richard Stallman (rms at mole.ai.mit.edu) |
---|
1308 | |
---|
1309 | * io.c (find_identical_ends): ROBUST_OUTPUT_FORMAT test was backward. |
---|
1310 | |
---|
1311 | Thu Aug 23 17:17:20 1990 Richard Stallman (rms at mole.ai.mit.edu) |
---|
1312 | |
---|
1313 | * diff3.c (WIFEXITED): Undef it if WEXITSTATUS is not defined. |
---|
1314 | * context.c (find_function): Don't try to return values. |
---|
1315 | |
---|
1316 | Wed Aug 22 11:54:39 1990 Richard Stallman (rms at mole.ai.mit.edu) |
---|
1317 | |
---|
1318 | * diff.h (O_RDONLY): Define if not defined. |
---|
1319 | |
---|
1320 | Tue Aug 21 13:49:26 1990 Richard Stallman (rms at mole.ai.mit.edu) |
---|
1321 | |
---|
1322 | * Handle -L option. |
---|
1323 | * context.c (print_context_label): New function. |
---|
1324 | (print_context_header): Use that. |
---|
1325 | * diff.c (main): Recognize the option. |
---|
1326 | (usage): Updated. |
---|
1327 | * diff.h (file_label): New variable. |
---|
1328 | * diff3.c (main): Recognize -L instead of -t. |
---|
1329 | |
---|
1330 | * diff3.c (main): Support -m without other option. |
---|
1331 | |
---|
1332 | * diff3.c (WEXITSTATUS, WIFEXITED): Define whenever not defined. |
---|
1333 | |
---|
1334 | * diff3.c (bcopy, index, rindex): Delete definitions; not used. |
---|
1335 | (D_LINENUM, D_LINELEN): Likewise. |
---|
1336 | (struct diff_block): lengths includes newlines. |
---|
1337 | (struct diff3_block): Likewise. |
---|
1338 | (always_text, merge): New variables. |
---|
1339 | (read_diff): Return address of end, not size read. Calls changed. |
---|
1340 | Pass -a to diff if given to diff3. |
---|
1341 | current_chunk_size now an int. Detect error in `pipe'. |
---|
1342 | Check for incomplete line of output here. |
---|
1343 | (scan_diff_line): Don't make scan_ptr + 2 before knowing it is valid. |
---|
1344 | No need to check validity of diff output here. |
---|
1345 | Include newline in length of line. |
---|
1346 | (main): Compute rev_mapping here. Handle -a and -m. |
---|
1347 | Error message if excess -t operands. Error for incompatible options. |
---|
1348 | Error if `-' given more than once. |
---|
1349 | Fix error storing in tag_strings. |
---|
1350 | (output_diff3): REV_MAPPING is now an arg. Call changed. |
---|
1351 | Change syntax of "missing newline" message. |
---|
1352 | Expect length of line to include newline. |
---|
1353 | (output_diff3_edscript): Return just 0 or 1. |
---|
1354 | REV_MAPPING is now an arg. Call changed. |
---|
1355 | (output_diff3_merge): New function. |
---|
1356 | (process_diff): Better error message for bad diff format. |
---|
1357 | (fatal, perror_with_exit): Return status 2. |
---|
1358 | |
---|
1359 | * analyze.c (diff_2_files): Report missing newline in either |
---|
1360 | or both files, if not robust output style. |
---|
1361 | |
---|
1362 | * util.c (setup_output): Detect error from pipe. |
---|
1363 | No need to close stdin. |
---|
1364 | |
---|
1365 | * util.c (print_1_line): Change format of missing-newline msg. |
---|
1366 | Change if statements to switch. |
---|
1367 | |
---|
1368 | * io.c (slurp): Don't mention differences in final newline if -B. |
---|
1369 | |
---|
1370 | * io.c (binary_file_p): Use ISO char set as criterion, not ASCII. |
---|
1371 | |
---|
1372 | * io.c (find_identical_ends): Increase value of BEG0 by 1. |
---|
1373 | Other changes in backwards scan to avoid decrementing pointers |
---|
1374 | before start of array, and set LINES properly. |
---|
1375 | |
---|
1376 | * diff.h (ROBUST_OUTPUT_STYLE): New macro. |
---|
1377 | * io.c (find_identical_ends, find_and_hash_each_line): Use that macro. |
---|
1378 | |
---|
1379 | * diff.h (dup2): Don't define if XENIX. |
---|
1380 | |
---|
1381 | * diff.c (main): Check for write error at end. |
---|
1382 | |
---|
1383 | * context.c (find_function): Don't return a value. |
---|
1384 | Use argument FILE rather than global files. |
---|
1385 | |
---|
1386 | * analyze.c: Add external function declarations. |
---|
1387 | * analyze.c (build_script): Turn off explicit check for final newline. |
---|
1388 | |
---|
1389 | * analyze.c (discard_confusing_lines): Make integers unsigned. |
---|
1390 | |
---|
1391 | Tue Jul 31 21:37:16 1990 Richard Stallman (rms at sugar-bombs.ai.mit.edu) |
---|
1392 | |
---|
1393 | * io.c (find_and_hash_each_line): Correct the criterion |
---|
1394 | for leaving out the newline from the end of the line. |
---|
1395 | |
---|
1396 | Tue May 29 21:28:16 1990 Richard Stallman (rms at sugar-bombs.ai.mit.edu) |
---|
1397 | |
---|
1398 | * dir.c (diff_dirs): Free things only if nonzero. |
---|
1399 | |
---|
1400 | Mon Apr 16 18:31:05 1990 Richard Stallman (rms at sugar-bombs.ai.mit.edu) |
---|
1401 | |
---|
1402 | * diff.h (NDIR_IN_SYS): New macro controls location of ndir.h. |
---|
1403 | |
---|
1404 | * diff3.c (xmalloc, xrealloc): Don't die if size == 0 returns 0. |
---|
1405 | |
---|
1406 | Sun Mar 25 15:58:42 1990 Richard Stallman (rms at sugar-bombs.ai.mit.edu) |
---|
1407 | |
---|
1408 | * analyze.c (discard_confusing_lines): |
---|
1409 | `many' wasn't being used; use it. |
---|
1410 | Cancelling provisionals near start of run must handle already |
---|
1411 | cancelled provisionals. |
---|
1412 | Cancelling subruns of provisionals was cancelling last nonprovisional. |
---|
1413 | |
---|
1414 | Sat Mar 24 14:02:51 1990 Richard Stallman (rms at sugar-bombs.ai.mit.edu) |
---|
1415 | |
---|
1416 | * analyze.c (discard_confusing_lines): |
---|
1417 | Threshold for line occurring many times scales by square root |
---|
1418 | of total lines. |
---|
1419 | Within each run, cancel any long subrun of provisionals. |
---|
1420 | Don't update `provisional' while cancelling provisionals. |
---|
1421 | In big outer loop, handle provisional and nonprovisional separately. |
---|
1422 | |
---|
1423 | Thu Mar 22 16:35:33 1990 Richard Stallman (rms at sugar-bombs.ai.mit.edu) |
---|
1424 | |
---|
1425 | * analyze.c (discard_confusing_lines): |
---|
1426 | The first loops to discard provisionals from ends failed to step. |
---|
1427 | In second such loops, keep discarding all consecutive provisionals. |
---|
1428 | Increase threshold for stopping discarding, and also check for |
---|
1429 | consecutive nondiscardables as separate threshold. |
---|
1430 | |
---|
1431 | Fri Mar 16 00:33:08 1990 Richard Stallman (rms at sugar-bombs.ai.mit.edu) |
---|
1432 | |
---|
1433 | * diff3.c (read_diff): Pass -- as first arg to diff. |
---|
1434 | |
---|
1435 | * diff3.c: Include wait.h or define equivalent macros. |
---|
1436 | (read_diff): Don't use stdio printing error in the inferior. |
---|
1437 | Remember the pid and wait for it. Report failing status. |
---|
1438 | Report failure of vfork. |
---|
1439 | |
---|
1440 | Sun Mar 11 17:10:32 1990 Richard Stallman (rms at sugar-bombs.ai.mit.edu) |
---|
1441 | |
---|
1442 | * diff3.c (main): Accept -t options and pass to output_diff3_edscript. |
---|
1443 | (usage): Mention -t. |
---|
1444 | (read_diff): Use vfork. |
---|
1445 | (vfork): Don't use it on Sparc. |
---|
1446 | |
---|
1447 | * diff.h (vfork): Don't use it on Sparc. |
---|
1448 | |
---|
1449 | Tue Mar 6 22:37:20 1990 Richard Stallman (rms at sugar-bombs.ai.mit.edu) |
---|
1450 | |
---|
1451 | * diff3.c (dup2): Don't define on Xenix. |
---|
1452 | |
---|
1453 | * Makefile: Comments for Xenix. |
---|
1454 | |
---|
1455 | Thu Mar 1 17:19:23 1990 Richard Stallman (rms at sugar-bombs.ai.mit.edu) |
---|
1456 | |
---|
1457 | * analyze.c (diff_2_files): `message' requires three args. |
---|
1458 | |
---|
1459 | Fri Feb 23 10:56:50 1990 David J. MacKenzie (djm at albert.ai.mit.edu) |
---|
1460 | |
---|
1461 | * diff.h, util.c, diff3.c: Change 'void *' to 'VOID *', with |
---|
1462 | VOID defined as void if __STDC__, char if not. |
---|
1463 | |
---|
1464 | Sun Feb 18 20:31:58 1990 David J. MacKenzie (djm at albert.ai.mit.edu) |
---|
1465 | |
---|
1466 | * Makefile: Add rules for getopt.c, getopt1.c, getopt.h. |
---|
1467 | |
---|
1468 | * getopt.c, getopt.h, getopt1.c: New files. |
---|
1469 | |
---|
1470 | * main.c (main, usage): Add long options. |
---|
1471 | |
---|
1472 | * analyze.c (shift_boundaries): Remove unused var 'j_end'. |
---|
1473 | |
---|
1474 | Thu Feb 8 02:43:16 1990 Jim Kingdon (kingdon at pogo.ai.mit.edu) |
---|
1475 | |
---|
1476 | * GNUmakefile: include ../Makerules before Makefile. |
---|
1477 | |
---|
1478 | Fri Feb 2 23:21:38 1990 Richard Stallman (rms at sugar-bombs.ai.mit.edu) |
---|
1479 | |
---|
1480 | * analyze.c (diif_2_files): If -B or -I, don't return 1 |
---|
1481 | if all changes were ignored. |
---|
1482 | |
---|
1483 | Wed Jan 24 20:43:57 1990 Richard Stallman (rms at albert.ai.mit.edu) |
---|
1484 | |
---|
1485 | * diff3.c (fatal): Output to stderr. |
---|
1486 | |
---|
1487 | Thu Jan 11 00:25:56 1990 David J. MacKenzie (djm at hobbes.ai.mit.edu) |
---|
1488 | |
---|
1489 | * diff.c (usage): Mention -v. |
---|
1490 | |
---|
1491 | Wed Jan 10 16:06:38 1990 Richard Stallman (rms at sugar-bombs.ai.mit.edu) |
---|
1492 | |
---|
1493 | * diff3.c (output_diff3_edscript): Return number of overlaps. |
---|
1494 | (main): If have overlaps, exit with status 1. |
---|
1495 | |
---|
1496 | Sun Dec 24 10:29:20 1989 Richard Stallman (rms at sugar-bombs.ai.mit.edu) |
---|
1497 | |
---|
1498 | * io.c (find_equiv_class): Fix typo that came from changing init of B |
---|
1499 | to an assigment. |
---|
1500 | |
---|
1501 | * version.c: New file. |
---|
1502 | * diff.c (main): -v prints version number. |
---|
1503 | |
---|
1504 | * io.c (binary_file_p): Null char implies binary file. |
---|
1505 | |
---|
1506 | Fri Nov 17 23:44:55 1989 Richard Stallman (rms at sugar-bombs.ai.mit.edu) |
---|
1507 | |
---|
1508 | * util.c (print_1_line): Fix off by 1 error. |
---|
1509 | |
---|
1510 | Thu Nov 16 13:51:10 1989 Richard Stallman (rms at sugar-bombs.ai.mit.edu) |
---|
1511 | |
---|
1512 | * util.c (xcalloc): Function deleted. |
---|
1513 | |
---|
1514 | * io.c (slurp): Null-terminate the buffer. |
---|
1515 | |
---|
1516 | * io.c (read_files): Delete unused vars. |
---|
1517 | |
---|
1518 | * io.c (find_equiv_class): Don't index by N if too low. |
---|
1519 | |
---|
1520 | * dir.c (dir_sort): Delete the extra declaration of compare_names. |
---|
1521 | |
---|
1522 | * diff.h: Don't declare xcalloc. Declare some other functions. |
---|
1523 | |
---|
1524 | * analyze.c (shift_boundaries): |
---|
1525 | Test for END at end of range before indexing by it. |
---|
1526 | Fix typo `preceeding' in var names. |
---|
1527 | |
---|
1528 | Sat Nov 11 14:04:16 1989 Richard Stallman (rms at sugar-bombs.ai.mit.edu) |
---|
1529 | |
---|
1530 | * diff3.c (using_to_diff3_block): Delete unused vars. |
---|
1531 | (make_3way_diff, process_diff_control, read_diff, output_diff3): Likewise. |
---|
1532 | |
---|
1533 | Mon Nov 6 18:15:50 EST 1989 Jay Fenlason (hack@ai.mit.edu) |
---|
1534 | |
---|
1535 | * README Fix typo. |
---|
1536 | |
---|
1537 | Fri Nov 3 15:27:47 1989 Richard Stallman (rms at sugar-bombs.ai.mit.edu) |
---|
1538 | |
---|
1539 | * diff.c (usage): Mention -D. |
---|
1540 | |
---|
1541 | * ifdef.c (print_ifdef_hunk): Write comments on #else and #endif. |
---|
1542 | |
---|
1543 | Sun Oct 29 16:41:07 1989 Richard Stallman (rms at sugar-bombs.ai.mit.edu) |
---|
1544 | |
---|
1545 | * diff.c (compare_files): Don't fflush for identical files. |
---|
1546 | |
---|
1547 | Wed Oct 25 17:57:12 1989 Randy Smith (randy at apple-gunkies.ai.mit.edu) |
---|
1548 | |
---|
1549 | * diff3.c (using_to_diff3_block): When defaulting lines from |
---|
1550 | FILE0, only copy up to just under the *lowest* line mentioned |
---|
1551 | in the next diff. |
---|
1552 | |
---|
1553 | * diff3.c (fatal): Add \n to error messages. |
---|
1554 | |
---|
1555 | Wed Oct 25 15:05:49 1989 Richard Stallman (rms at sugar-bombs.ai.mit.edu) |
---|
1556 | |
---|
1557 | * Makefile (tapefiles): Add ChangeLog. |
---|
1558 | |
---|
1559 | Tue Oct 3 00:51:17 1989 Richard Stallman (rms at sugar-bombs.ai.mit.edu) |
---|
1560 | |
---|
1561 | * diff3.c (process_diff, create_diff3_block): Init ->next field. |
---|
1562 | |
---|
1563 | Fri Sep 29 08:16:45 1989 Richard Stallman (rms at sugar-bombs.ai.mit.edu) |
---|
1564 | |
---|
1565 | * util.c (line_cmp): Alter end char of line 2, not line 1. |
---|
1566 | |
---|
1567 | Wed Sep 20 00:12:37 1989 Richard Stallman (rms at sugar-bombs.ai.mit.edu) |
---|
1568 | |
---|
1569 | * Makefile (diff.tar): Expect ln to fail on some files; |
---|
1570 | copy them with cp. |
---|
1571 | |
---|
1572 | Mon Sep 18 02:54:29 1989 Richard Stallman (rms at sugar-bombs.ai.mit.edu) |
---|
1573 | |
---|
1574 | * Handle -D option: |
---|
1575 | * io.c (find_and_hash_each_line): Keep all lines of 1st file. |
---|
1576 | * diff.c (main): Handle -D option. |
---|
1577 | (compare_files): Reject -D if files spec'd are directories. |
---|
1578 | * analyze.c (diff_2_files): Handle OUTPUT_IFDEF case. |
---|
1579 | |
---|
1580 | Fri Sep 1 20:15:50 1989 Richard Stallman (rms at sugar-bombs.ai.mit.edu) |
---|
1581 | |
---|
1582 | * diff.c (option_list): Rename arg VECTOR as OPTIONVEC. |
---|
1583 | |
---|
1584 | Mon Aug 28 17:58:27 1989 Richard Stallman (rms at sugar-bombs.ai.mit.edu) |
---|
1585 | |
---|
1586 | * diff.c (compare_files): Clear entire inf[i].stat. |
---|
1587 | |
---|
1588 | Wed Aug 23 17:48:47 1989 Richard Stallman (rms at apple-gunkies.ai.mit.edu) |
---|
1589 | |
---|
1590 | * io.c (find_identical_ends): Sign was backward |
---|
1591 | determining where to bound the scan for the suffix. |
---|
1592 | |
---|
1593 | Wed Aug 16 12:49:16 1989 Richard Stallman (rms at hobbes.ai.mit.edu) |
---|
1594 | |
---|
1595 | * analyze.c (diff_2_files): If -q, treat all files as binary. |
---|
1596 | * diff.c (main): Detect -q, record in no_details_flag. |
---|
1597 | |
---|
1598 | Sun Jul 30 23:12:00 1989 Richard Stallman (rms at sugar-bombs.ai.mit.edu) |
---|
1599 | |
---|
1600 | * diff.c (usage): New function. |
---|
1601 | (main): Call it. |
---|
1602 | |
---|
1603 | Wed Jul 26 02:02:19 1989 Richard Stallman (rms at sugar-bombs.ai.mit.edu) |
---|
1604 | |
---|
1605 | * diff.c (main): Make -C imply -c. |
---|
1606 | |
---|
1607 | Thu Jul 20 17:57:51 1989 Chris Hanson (cph at kleph) |
---|
1608 | |
---|
1609 | * io.c (find_and_hash_each_line): Bug fix in context handling, |
---|
1610 | introduced by last change. |
---|
1611 | |
---|
1612 | Fri Jul 14 17:39:20 1989 Chris Hanson (cph at kleph) |
---|
1613 | |
---|
1614 | * analyze.c: To make RCS work correctly on files that don't |
---|
1615 | necessarily end in newline, introduce some changes that cause |
---|
1616 | diffs to be sensitive to missing final newline. Because |
---|
1617 | non-RCS modes don't want to be affected by these changes, they |
---|
1618 | are conditional on `output_style == OUTPUT_RCS'. |
---|
1619 | (diff_2_files) [OUTPUT_RCS]: Suppress the "File X missing |
---|
1620 | newline" message. |
---|
1621 | (build_script) [OUTPUT_RCS]: Cause the last line to compare as |
---|
1622 | different if exactly one of the files is missing its final |
---|
1623 | newline. |
---|
1624 | |
---|
1625 | * io.c (find_and_hash_each_line): Bug fix in |
---|
1626 | ignore_space_change mode. Change line's length to include the |
---|
1627 | newline. For OUTPUT_RCS, decrement last line's length if |
---|
1628 | there is no final newline. |
---|
1629 | (find_identical_ends) [OUTPUT_RCS]: If one of the files is |
---|
1630 | missing a final newline, make sure it's not included in either |
---|
1631 | the prefix or suffix. |
---|
1632 | |
---|
1633 | * util.c (print_1_line): Change line output routine to account |
---|
1634 | for line length including the newline. |
---|
1635 | |
---|
1636 | Tue Jun 27 02:35:28 1989 Roland McGrath (roland at hobbes.ai.mit.edu) |
---|
1637 | |
---|
1638 | * Makefile: Inserted $(archpfx) where appropriate. |
---|
1639 | |
---|
1640 | Wed May 17 20:18:43 1989 Richard Stallman (rms at sugar-bombs.ai.mit.edu) |
---|
1641 | |
---|
1642 | * diff3.c [USG]: Include fcntl.h. |
---|
1643 | |
---|
1644 | * diff.h [USG]: New compilation flags HAVE_NDIR, HAVE_DIRECT. |
---|
1645 | |
---|
1646 | Wed Apr 26 15:35:57 1989 Richard Stallman (rms at sugar-bombs.ai.mit.edu) |
---|
1647 | |
---|
1648 | * dir.c (diff_dirs): Two new args, NONEX1 and NONEX2, say to pretend |
---|
1649 | nonex dirs are empty. |
---|
1650 | (dir_sort): New arg NONEX, likewise. |
---|
1651 | * diff.c (compare_files): Pass those args. |
---|
1652 | Sometimes call diff_dirs if subdir exists in just one place. |
---|
1653 | |
---|
1654 | Wed Apr 12 01:10:27 1989 Richard Stallman (rms at sugar-bombs.ai.mit.edu) |
---|
1655 | |
---|
1656 | * io.c (find_identical_ends): Set END0 *after* last char |
---|
1657 | during backward scan for suffix. |
---|
1658 | |
---|
1659 | Sat Apr 8 15:49:49 1989 Randall Smith (randy at apple-gunkies.ai.mit.edu) |
---|
1660 | |
---|
1661 | * diff3.c (using_to_diff3_block): Now find high marks in files 1 |
---|
1662 | and 2 through mapping off of the last difference instead of the |
---|
1663 | first. |
---|
1664 | |
---|
1665 | * diff3.c: Many trivial changes to spelling inside comments. |
---|
1666 | |
---|
1667 | Fri Feb 24 12:38:03 1989 Randall Smith (randy at gluteus.ai.mit.edu) |
---|
1668 | |
---|
1669 | * util.c, normal.c, io.c, ed.c, dir.c, diff.h, diff.c, context.c, |
---|
1670 | analyze.c, Makefile: Changed copyright header to conform with new |
---|
1671 | GNU General Public license. |
---|
1672 | * diff3.c: Changed copyright header to conform with new GNU |
---|
1673 | General Public license. |
---|
1674 | * COPYING: Made a hard link to /gp/rms/COPYING. |
---|
1675 | |
---|
1676 | Fri Feb 24 10:01:58 1989 Richard Stallman (rms at sugar-bombs.ai.mit.edu) |
---|
1677 | |
---|
1678 | * io.c (slurp): Leave 2 chars space at end of buffer, not one. |
---|
1679 | (find_identical_ends): Special case if either file is empty; |
---|
1680 | don't try to make a sentinel since could crash. |
---|
1681 | |
---|
1682 | Wed Feb 15 14:24:48 1989 Jay Fenlason (hack at apple-gunkies.ai.mit.edu) |
---|
1683 | |
---|
1684 | * diff3.c (message) Re-wrote routine to avoid using alloca() |
---|
1685 | |
---|
1686 | Wed Feb 15 06:19:14 1989 Richard Stallman (rms at sugar-bombs.ai.mit.edu) |
---|
1687 | |
---|
1688 | * io.c (find_identical_ends): Delete the variable `bytes'. |
---|
1689 | |
---|
1690 | Sun Feb 12 11:50:36 1989 Richard Stallman (rms at sugar-bombs.ai.mit.edu) |
---|
1691 | |
---|
1692 | * io.c (slurp): ->bufsize is nominal amount we have room for; |
---|
1693 | add room for sentinel when calling xmalloc or xrealloc. |
---|
1694 | |
---|
1695 | * io.c (find_identical_ends): Do need overrun check in finding suffix. |
---|
1696 | |
---|
1697 | Fri Feb 10 01:28:15 1989 Richard Stallman (rms at sugar-bombs.ai.mit.edu) |
---|
1698 | |
---|
1699 | * diff.c (main): -C now takes arg to specify context length. |
---|
1700 | Now -p to show C function name--Damned IEEE! |
---|
1701 | Fatal error if context length spec'd twice. |
---|
1702 | |
---|
1703 | * ed.c (print_ed_hunk): Now special treatment only for lines containing |
---|
1704 | precisely a dot and nothing else. Output `..', end the insert, |
---|
1705 | substitute that one line, then resume the insert if nec. |
---|
1706 | |
---|
1707 | * io.c (find_and_hash_lines): When backing up over starting context, |
---|
1708 | don't move past buffer-beg. |
---|
1709 | |
---|
1710 | * io.c (find_identical_ends): Use sentinels to make the loops faster. |
---|
1711 | If files are identical, skip the 2nd loop and return quickly. |
---|
1712 | (slurp): Leave 1 char extra space after each buffer. |
---|
1713 | |
---|
1714 | * analyze.c (diff_2_files): Mention difference in final newlines. |
---|
1715 | |
---|
1716 | Wed Jan 25 22:44:44 1989 Richard Stallman (rms at sugar-bombs.ai.mit.edu) |
---|
1717 | |
---|
1718 | * dir.c (diff_dirs): Use * when calling fcn ptr variable. |
---|
1719 | |
---|
1720 | Sat Dec 17 14:12:06 1988 Richard Stallman (rms at sugar-bombs.ai.mit.edu) |
---|
1721 | |
---|
1722 | * Makefile: New vars INSTALL and LIBS used in some rules; |
---|
1723 | provide default defns plus commented-put defns for sysV. |
---|
1724 | |
---|
1725 | Thu Nov 17 16:42:53 1988 Richard Stallman (rms at sugar-bombs.ai.mit.edu) |
---|
1726 | |
---|
1727 | * dir.c (dir_sort): Open-trouble not fatal; just say # files is -1. |
---|
1728 | (diff_dirs): If dir_sort does that, give up and return 2. |
---|
1729 | |
---|
1730 | * diff.c (compare_files): Don't open directories. |
---|
1731 | Don't close them specially either. |
---|
1732 | Cross-propagate inf[i].dir_p sooner. |
---|
1733 | |
---|
1734 | Sun Nov 13 11:19:36 1988 Richard Stallman (rms at sugar-bombs.ai.mit.edu) |
---|
1735 | |
---|
1736 | * diff.h: Declare index, rindex. |
---|
1737 | |
---|
1738 | * diff.c (compare_files): If comparing foodir with b/f, |
---|
1739 | use foodir/f, not foodir/b/f. |
---|
1740 | |
---|
1741 | * diff.c (compare_files): Don't print "are identical" msg for 2 dirs. |
---|
1742 | Status now 1 if one file is a dir and the other isn't, etc. |
---|
1743 | |
---|
1744 | Thu Nov 3 16:30:24 1988 Randall Smith (randy at gluteus.ai.mit.edu) |
---|
1745 | |
---|
1746 | * Makefile: Added a define for diff3 to define DIFF_PROGRAM. |
---|
1747 | |
---|
1748 | * util.c: Added hack to make sure that perror was not called with |
---|
1749 | a null pointer. |
---|
1750 | |
---|
1751 | * diff.c: Changed S_IFDIR to S_IFMT in masking type of file bits |
---|
1752 | out. |
---|
1753 | |
---|
1754 | * diff3.c: Included USG compatibility defines. |
---|
1755 | |
---|
1756 | * diff.h: Moved sys/file.h into #else USG section (not needed or |
---|
1757 | wanted on System V). |
---|
1758 | |
---|
1759 | * ed.c, analyze.c, context.c: Shortened names to 12 characters for |
---|
1760 | the sake of System V (too simple not to do). |
---|
1761 | |
---|
1762 | Local Variables: |
---|
1763 | mode: indented-text |
---|
1764 | left-margin: 8 |
---|
1765 | version-control: never |
---|
1766 | End: |
---|