Age | Commit message (Collapse) | Author | |
---|---|---|---|
2006-02-22 | Append two string using strlcpy()/strlcat() instead of snprintf() to | Otto Moerbeek | |
avoid having to check for encoding errors returned by snprintf(). From Ray Lai; ok millert@ jaredy@ | |||
2006-02-16 | Strip newline from lines used with -I, otherwise ^$ will match all | Otto Moerbeek | |
lines and ignore them all. With and ok jaredy@ | |||
2005-12-27 | +.Xr sdiff 1 , | Jason McIntyre | |
2005-06-15 | bye bye whiteouts | Todd C. Miller | |
2005-01-13 | Handle all isspace() chars the same for -w and -b. ok millert@ markus@ | Otto Moerbeek | |
2005-01-06 | clarify what -a does; | Jason McIntyre | |
prod and ok deraadt@ | |||
2004-12-09 | If the -L option is specified twice, use it for the second filename | Todd C. Miller | |
like GNU diff does. Adapted from a diff by YAMAMOTO Takashi | |||
2004-12-07 | advancing argv twice doesn't make it better. | Marc Espie | |
okay otto@. | |||
2004-11-27 | Use unsigned char for bytes that are fed to isxxx() functions, to improve | Otto Moerbeek | |
portability. Spotted by YAMAMOTO Takashi. ok millert@ | |||
2004-11-26 | Fix the getdirentries() loop memory handling and EOF detection. | Otto Moerbeek | |
Also fix typo in sizeof. Problem spotted by YAMAMOTO Takashi; this diff joint work with millert@ ok millert@ | |||
2004-10-20 | Change tabs in string constants to \t. "of course" deraadt@ | Otto Moerbeek | |
2004-10-02 | Keep calling getdirentries() until we no longer fill up our buffer. | Todd C. Miller | |
2004-09-14 | use sizeof(struct cand) instead of defining an unused cand object, and | Theo de Raadt | |
then doing sizeof(cand). silly kids | |||
2004-06-20 | Implement -I option: ignore changes matching a set of regexes. From | Otto Moerbeek | |
Jared Yanovich, with twists from millert@ and me. Testing by brad@, sturm@ and pval@. ok millert@ | |||
2004-06-18 | If a new hunk immediately follows the previous one, merge them | Otto Moerbeek | |
into a single hunk. This makes diff produce the same diff as gdiff in more cases. Found by brad@ and sturm@ using the ports tree. ok millert@ | |||
2004-03-16 | POSIX specifies that in directory mode device special files and | Todd C. Miller | |
FIFOs shall be skipped. Other types of files may be skipped too (this is implementation-dependent). In directory mode, just skip anything that is not a regular file or directory. OK tedu@ | |||
2004-01-25 | use new .St macro; | Jason McIntyre | |
2004-01-07 | Document -p option. ok jmc@ | Otto Moerbeek | |
2004-01-07 | Implement -p option. | Otto Moerbeek | |
"works here" millert@ ok miod@ deraadt@ | |||
2003-11-22 | Fix diff -q exit value which was broken in last commit. | Todd C. Miller | |
2003-11-21 | Fix broken assumption that a file must contain differences if files_differ() | Todd C. Miller | |
fails. Fixes "diff -i" exit value. Problem found by Claudio Jeker. | |||
2003-11-10 | Din't print the "No newline at end of file" to inline (ie: to stdout) | Todd C. Miller | |
for edit scripts. Instead, print it to stderr. This matches the GNU diff behavior and fixes a problem with RCS and files with no trailing newline. tedu@ OK | |||
2003-11-09 | Typos in comments from Jared Yanovich <jjy2+ at pitt dot edu> | Otto Moerbeek | |
2003-10-28 | prototype declared static, but function was not. add static to function. | Anil Madhavapeddy | |
millert@ otto@ ok | |||
2003-10-07 | Fix printing of "Only in foo" when foo is "/" (trailing slash removal | Todd C. Miller | |
was overzealous in this case). Fix tested by Hugo Villeneuve and myself. | |||
2003-09-18 | - move `-d' to comparison options, rather then output options | Jason McIntyre | |
- note (again) that output options are mutually exclusive from Andy Isaacson (PR 3479) | |||
2003-09-07 | Make -number be an error (similar to my change in grep.c); OK tedu@ | Todd C. Miller | |
2003-09-07 | - add -P to SYNOPSIS | Jason McIntyre | |
- remove "mutually exclusive" clause - -c produces 15 *'s, not a dozen - add -a to uage() - sync usage() with SYNOPSIS ok tedu@ | |||
2003-09-07 | try again at -u#. ok deraadt@ | Ted Unangst | |
2003-09-07 | correct ascii file test. ok deraadt@ pb@ | Ted Unangst | |
2003-09-06 | restore undocumented -u# support for the old schoolers. :) | Ted Unangst | |
noticed by itojun@, ok deraadt@ | |||
2003-08-18 | fix spelling of --initial-tab | David Krause | |
ok otto@ | |||
2003-08-13 | Based on what otto@ said on icb. The expensive thing in diff is | Todd C. Miller | |
newcand() (this is what blows up the memory usage so badly). Instead of counting how many times we go through the loop, count how many times we called newcand(). I renamed loopcount -> numtries since it is no longer the number of loop runs. This fixes espie@'s regression. tedu@ OK | |||
2003-08-08 | Guess the number of lines in a file and use that number for initial | Otto Moerbeek | |
memory allocation. Initial version by me, cleanup by millert@. ok millert@ | |||
2003-08-01 | anychange is no longer extern; millert ok | Theo de Raadt | |
2003-07-31 | - Change the hash function to a simple multiplicative one. The old | Otto Moerbeek | |
hash function was apparently optimized for 16 bit processors and generates quite some collisions. - Fix another case of excessive reallocing. ok millert@ | |||
2003-07-31 | o correct exit code when comparing stdin and stdin (a noop) | Todd C. Miller | |
o after copying to a temp file, lseek() to the beginning so the inline cmp routine works. Fixes an exit code issue when comparing against stdin. | |||
2003-07-29 | clean | Theo de Raadt | |
2003-07-27 | We need to initialize clen to 0 each time through diffreg() for | Todd C. Miller | |
when diffreg() is called multiple times (i.e. in directory mode). Fixes a hang I saw doing "diff -r" of two large directory trees. | |||
2003-07-27 | Correct computation of argsize when setting diffargs. | Todd C. Miller | |
2003-07-27 | Start new sentence on a new line. | Otto Moerbeek | |
ok jmc@ | |||
2003-07-27 | - Use a heuristic to bound memory and cpu usage, at the cost of | Otto Moerbeek | |
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@ | |||
2003-07-23 | better ascii test for fewer false negatives. ok millert@ | Ted Unangst | |
2003-07-22 | Add missing terminator to long options list. | Todd C. Miller | |
2003-07-22 | Fixed the "dot alone on a line" bug. | Todd C. Miller | |
2003-07-22 | Bring FILES section up to date. | Todd C. Miller | |
2003-07-22 | Implement the -L and -T options from GNU diff. | Todd C. Miller | |
2003-07-22 | Historically, when comparing two directories in -e mode, BSD diff | Todd C. Miller | |
printed a header that turned the output into an actual script that called ed(1) to make the changes. This conflicts with POSIX so the header has been removed and the standard diff header is used instead. | |||
2003-07-22 | Don't print lines consisting solely of a dot ('.') in -e mode since | Todd C. Miller | |
that will confuse ed(1). POSIX says "one way to fix this bug is to output two periods whenever a lone period is needed, then terminate the append command with a period, and then use the substitute command to convert the two periods into one period." This is exactly what I have done. | |||
2003-07-21 | Historically, the "Only in" messages produced in dir mode | Todd C. Miller | |
were not printed when the output format was -e (ed) since this prevented the output from being used as an ed script. However, POSIX specifies that this message shall always be printed regardless of the output format (this is also what GNU diff does). Also do the same with the "Common subdirectory" message which POSIX lists as optional. |