diff options
author | Matheus Izvekov <mizvekov@gmail.com> | 2010-01-18 04:57:17 +0100 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2010-01-18 04:57:17 +0100 |
commit | d4a7728dc3b37e2956034f18fc26c04bc0aa2b0e (patch) | |
tree | b08fde45be76ab4afb1c9af5df1177007c5b111e /editors/Config.in | |
parent | f3fc9ac166d2413d331e3189a132a693608695ba (diff) | |
download | busybox-w32-d4a7728dc3b37e2956034f18fc26c04bc0aa2b0e.tar.gz busybox-w32-d4a7728dc3b37e2956034f18fc26c04bc0aa2b0e.tar.bz2 busybox-w32-d4a7728dc3b37e2956034f18fc26c04bc0aa2b0e.zip |
diff: rewrite. much smaller and more correct
function old new delta
diffreg 1815 3156 +1341
diff_main 860 1194 +334
read_token - 161 +161
skip_dir - 44 +44
seek_ft - 31 +31
fetch 362 392 +30
line_compar - 21 +21
add_to_dirlist 65 61 -4
print_only 16 - -16
skipline 51 - -51
newcand 85 - -85
asciifile 89 - -89
print_status 178 73 -105
make_temp 148 - -148
files_differ 168 - -168
get_recursive_dirlist 182 - -182
sort 226 - -226
prepare 283 - -283
change 283 - -283
do_diff 416 - -416
dump_unified_vec 457 - -457
check 1512 595 -917
------------------------------------------------------------------------------
(add/remove: 4/12 grow/shrink: 3/3 up/down: 1962/-3430) Total: -1468 bytes
Signed-off-by: Matheus Izvekov <mizvekov@gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'editors/Config.in')
-rw-r--r-- | editors/Config.in | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/editors/Config.in b/editors/Config.in index 7dbc9b6da..e1285f4ea 100644 --- a/editors/Config.in +++ b/editors/Config.in | |||
@@ -35,14 +35,6 @@ config DIFF | |||
35 | differences between them in a form that can be given to | 35 | differences between them in a form that can be given to |
36 | the patch command. | 36 | the patch command. |
37 | 37 | ||
38 | config FEATURE_DIFF_BINARY | ||
39 | bool "Enable checks for binary files" | ||
40 | default y | ||
41 | depends on DIFF | ||
42 | help | ||
43 | This option enables support for checking for binary files | ||
44 | before a comparison is carried out. | ||
45 | |||
46 | config FEATURE_DIFF_DIR | 38 | config FEATURE_DIFF_DIR |
47 | bool "Enable directory support" | 39 | bool "Enable directory support" |
48 | default y | 40 | default y |
@@ -51,14 +43,6 @@ config FEATURE_DIFF_DIR | |||
51 | This option enables support for directory and subdirectory | 43 | This option enables support for directory and subdirectory |
52 | comparison. | 44 | comparison. |
53 | 45 | ||
54 | config FEATURE_DIFF_MINIMAL | ||
55 | bool "Enable -d option to find smaller sets of changes" | ||
56 | default n | ||
57 | depends on DIFF | ||
58 | help | ||
59 | Enabling this option allows the use of -d to make diff | ||
60 | try hard to find the smallest possible set of changes. | ||
61 | |||
62 | config ED | 46 | config ED |
63 | bool "ed" | 47 | bool "ed" |
64 | default n | 48 | default n |