diff options
Diffstat (limited to 'coreutils')
| -rw-r--r-- | coreutils/Kbuild | 3 | ||||
| -rw-r--r-- | coreutils/diff.c | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/coreutils/Kbuild b/coreutils/Kbuild index 55f19b4ca..dfdcbd43c 100644 --- a/coreutils/Kbuild +++ b/coreutils/Kbuild @@ -10,7 +10,8 @@ lib-y:= lib-$(CONFIG_BASENAME) += basename.o lib-$(CONFIG_CAL) += cal.o lib-$(CONFIG_CAT) += cat.o -lib-$(CONFIG_LESS) += cat.o # less uses it if stdout isn't a tty +lib-$(CONFIG_MORE) += cat.o # more uses it if stdout isn't a tty +lib-$(CONFIG_LESS) += cat.o # less too lib-$(CONFIG_CATV) += catv.o lib-$(CONFIG_CHGRP) += chgrp.o chown.o lib-$(CONFIG_CHMOD) += chmod.o diff --git a/coreutils/diff.c b/coreutils/diff.c index 73b576f31..fa6ef105e 100644 --- a/coreutils/diff.c +++ b/coreutils/diff.c @@ -82,7 +82,7 @@ static char *start; static const char *label1; static const char *label2; static struct stat stb1, stb2; -static char **dl; +USE_FEATURE_DIFF_DIR(static char **dl;) USE_FEATURE_DIFF_DIR(static int dl_count;) struct cand { @@ -1051,7 +1051,7 @@ static int add_to_dirlist(const char *filename, { /* +2: with space for eventual trailing NULL */ dl = xrealloc(dl, (dl_count+2) * sizeof(dl[0])); - dl[dl_count] = xstrdup(filename + (int)userdata); + dl[dl_count] = xstrdup(filename + (int)(ptrdiff_t)userdata); dl_count++; return TRUE; } |