Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Make -number be an error (similar to my change in grep.c); OK tedu@ | 2003-09-07 | 1 | -9/+15 | |
| | |||||
* | - add -P to SYNOPSIS | 2003-09-07 | 1 | -8/+8 | |
| | | | | | | | | | - remove "mutually exclusive" clause - -c produces 15 *'s, not a dozen - add -a to uage() - sync usage() with SYNOPSIS ok tedu@ | ||||
* | try again at -u#. ok deraadt@ | 2003-09-07 | 1 | -4/+15 | |
| | |||||
* | restore undocumented -u# support for the old schoolers. :) | 2003-09-06 | 1 | -3/+3 | |
| | | | | noticed by itojun@, ok deraadt@ | ||||
* | fix spelling of --initial-tab | 2003-08-18 | 1 | -3/+3 | |
| | | | | ok otto@ | ||||
* | clean | 2003-07-29 | 1 | -4/+4 | |
| | |||||
* | Correct computation of argsize when setting diffargs. | 2003-07-27 | 1 | -4/+4 | |
| | |||||
* | - Use a heuristic to bound memory and cpu usage, at the cost of | 2003-07-27 | 1 | -10/+14 | |
| | | | | | | | | | producing suboptimal diffs for large file containing lots of changes. Switch heuristic off with -d/--minimal (GNU compatible). Some hints from millert@. - Improve performance by reducing the number of realloc(3) calls. ok millert@ tedu@ | ||||
* | Add missing terminator to long options list. | 2003-07-22 | 1 | -2/+3 | |
| | |||||
* | Implement the -L and -T options from GNU diff. | 2003-07-22 | 1 | -11/+20 | |
| | |||||
* | Don't print a trailing '/' in foo when printing "Only in foo: bar" | 2003-07-21 | 1 | -3/+5 | |
| | |||||
* | Fix printing of status when not in -l mode which was broken when the | 2003-07-21 | 1 | -4/+4 | |
| | | | | -l support was added. | ||||
* | a little KNF | 2003-07-21 | 1 | -3/+3 | |
| | |||||
* | POSIX-compliant output when there are two paths w/ the same name but | 2003-07-21 | 1 | -4/+8 | |
| | | | | one is a file and the other is a directory in -r mode (cosmetic). | ||||
* | Unlink temp file as soon as it is opened and return a FILE * for | 2003-07-09 | 1 | -50/+26 | |
| | | | | | | | | | | | it so we don't have to worry about cleanup. This means the quit() signal handler and error/errorx can go away too. Move splice() out of diffreg() and into diff.c where it belongs since we don't want to be calling splice() for a directory diff. Add a check for mismatched paths (one file, one dir) in diffreg.c. deraadt@ OK | ||||
* | Re-implement -l flag; diff -l now works correctly in non-directory | 2003-07-09 | 1 | -7/+58 | |
| | | | | mode (like GNU diff). | ||||
* | o Avoid a temp file if using stdin and stdin is redirected from a regular file | 2003-07-08 | 1 | -4/+4 | |
| | | | | o Fix a double free in the temmp file case | ||||
* | Add -q option from GNU diff | 2003-07-06 | 1 | -8/+12 | |
| | |||||
* | Implement -P from GNU diff (like -N but only for files that are missing | 2003-07-06 | 1 | -5/+9 | |
| | | | | from dir1). | ||||
* | Some fairly major changes: | 2003-07-06 | 1 | -132/+183 | |
| | | | | | | | | | | | | | | | | | | | | | o -N is implemented o -X is implemented o -x is implemented o diff.c has been rewritten and GNU long options are now supported o diffdir.c has been rewritten + no longer does fork + exec of /usr/bin/diff + can be called recursively (and will be for -r) o diff.h + don't include any .h files here any more, do it in the .c files + no Bell Labs code in this, gets a UCB copyright (the 32v sources only have a diff.c and there is nothing in common). o diffreg.c + most all remaining globals are now private to diffreg.c + files are only opened once + dynamically allocated objects are either freed or realloced + added missing UCB copyright (there were lots of UCB changes) + print correct thing when -s is specified OK deraadt@ | ||||
* | Accept but ignore -h for backwards compat like GNU diff does. | 2003-07-04 | 1 | -4/+7 | |
| | | | | Pointed out by espie@. Also remove other references to -h mode. | ||||
* | Kill non-standard -l option as discussed with tedu@ | 2003-07-04 | 1 | -9/+5 | |
| | |||||
* | Kill diff -h, we don't use or want diffh. Discussed w/ tedu@ | 2003-07-04 | 1 | -8/+2 | |
| | |||||
* | Some cosmetic fixes: | 2003-07-04 | 1 | -10/+4 | |
| | | | | | | | | o get rid of now-unused tempfile variable o move inifdef into diffreg.c (only used there) o correct a comment o use _PATH_DIFF, _PATH_DIFFH and _PATH_PR instead of variables set to them o get rid of hack to look for pr and diff in /bin | ||||
* | kill a warning: include <string.h> | 2003-06-27 | 1 | -1/+2 | |
| | | | | ok tedu@ | ||||
* | Remove cruft; We don't have the -I, -1 or -2 options anymore so we don't | 2003-06-26 | 1 | -12/+4 | |
| | | | | need the associated scaffolding. tedu@ OK | ||||
* | Fix -r flag that was broken during getopt() conversion--whoops. | 2003-06-26 | 1 | -2/+2 | |
| | |||||
* | Fix temp file handling. | 2003-06-26 | 1 | -15/+39 | |
| | | | | | | | | | o honor TMPDIR environment variable as per man page o need 2 temp files if both file1 and file2 are devices o add error() and errorx() which cleanup temp file and then call err() and errx() respectively. OK tedu@ | ||||
* | pretty code that prints usage | 2003-06-26 | 1 | -3/+5 | |
| | |||||
* | Fix temp file handling and deal with the case where we might need 2 temp files. | 2003-06-26 | 1 | -6/+8 | |
| | |||||
* | put all the flags and globals in diff.c, and declare externs in diff.h | 2003-06-26 | 1 | -2/+41 | |
| | | | | ok millert@ | ||||
* | Add a space after flags that take an argumnent in usage() since getopt() | 2003-06-25 | 1 | -5/+5 | |
| | | | | supports that. | ||||
* | De-uglify usage | 2003-06-25 | 1 | -5/+5 | |
| | |||||
* | Add unidiff support and try to pretty up usage() a bit | 2003-06-25 | 1 | -6/+18 | |
| | |||||
* | o use S_ISDIR instead of doing it by hand | 2003-06-25 | 1 | -6/+5 | |
| | | | | | | | | o rename talloc -> emalloc and ralloc -> erealloc o struct direct -> struct dirent (POSIX) o kill remaining strcpy() o fix unterminated string in setfile() deraadt@ OK | ||||
* | Fix getopt string for -D | 2003-06-25 | 1 | -2/+2 | |
| | |||||
* | o use getopt() | 2003-06-25 | 1 | -119/+86 | |
| | | | | | | | o use err/warn o only call done() when needed (after mkstemp) o add "-C lines" like GNU grep OK deraadt@ | ||||
* | remove silly signal catcher, and just use done. ok deraadt@ | 2003-06-25 | 1 | -8/+1 | |
| | |||||
* | exit path signal race safe | 2003-06-25 | 1 | -12/+14 | |
| | |||||
* | cleanup. ansi, headers, correct prototypes, some safer string and | 2003-06-25 | 1 | -125/+127 | |
| | | | | | tempfile functions, whitespace, ... no functional improvements yet | ||||
* | caldera licenses | 2003-06-25 | 1 | -0/+36 | |
| | |||||
* | 4.3reno diff. This is free because of the Caldera license. Nasty, but a | 2003-06-25 | 1 | -0/+212 | |
place to start. |