diff options
| author | Denys Vlasenko | 2017-04-12 15:48:19 +0200 |
|---|---|---|
| committer | Denys Vlasenko | 2017-04-12 15:48:19 +0200 |
| commit | d9eb40c18519d10aac3b3d008aa7e338ae830b72 (patch) | |
| tree | cffe3867dedefadb361ec6cbd507e9f967e36e90 /coreutils | |
| parent | 0cecbe7d5de237a6c699c67ae53ae2e2481eff43 (diff) | |
| download | busybox-d9eb40c18519d10aac3b3d008aa7e338ae830b72.zip busybox-d9eb40c18519d10aac3b3d008aa7e338ae830b72.tar.gz | |
fix errors found with make_single_applets.sh
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'coreutils')
| -rw-r--r-- | coreutils/cat.c | 27 | ||||
| -rw-r--r-- | coreutils/who.c | 5 |
2 files changed, 3 insertions, 29 deletions
diff --git a/coreutils/cat.c b/coreutils/cat.c index 4169d95..96970b1 100644 --- a/coreutils/cat.c +++ b/coreutils/cat.c @@ -16,8 +16,6 @@ //applet:IF_CAT(APPLET_NOFORK(cat, cat, BB_DIR_BIN, BB_SUID_DROP, cat)) //kbuild:lib-$(CONFIG_CAT) += cat.o -// For -n: -//kbuild:lib-$(CONFIG_CAT) += nl.o /* BB_AUDIT SUSv3 compliant */ /* http://www.opengroup.org/onlinepubs/007904975/utilities/cat.html */ @@ -49,31 +47,6 @@ /* This is a NOFORK applet. Be very careful! */ - -int bb_cat(char **argv) -{ - int fd; - int retval = EXIT_SUCCESS; - - if (!*argv) - argv = (char**) &bb_argv_dash; - - do { - fd = open_or_warn_stdin(*argv); - if (fd >= 0) { - /* This is not a xfunc - never exits */ - off_t r = bb_copyfd_eof(fd, STDOUT_FILENO); - if (fd != STDIN_FILENO) - close(fd); - if (r >= 0) - continue; - } - retval = EXIT_FAILURE; - } while (*++argv); - - return retval; -} - int cat_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int cat_main(int argc UNUSED_PARAM, char **argv) { diff --git a/coreutils/who.c b/coreutils/who.c index ec9d251..4adead7 100644 --- a/coreutils/who.c +++ b/coreutils/who.c @@ -40,11 +40,12 @@ // APPLET_ODDNAME:name main location suid_type help //applet:IF_USERS(APPLET_ODDNAME(users, who, BB_DIR_USR_BIN, BB_SUID_DROP, users)) -//applet:IF_USERS(APPLET_ODDNAME(w, who, BB_DIR_USR_BIN, BB_SUID_DROP, w)) +//applet:IF_W( APPLET_ODDNAME(w, who, BB_DIR_USR_BIN, BB_SUID_DROP, w)) //applet:IF_WHO( APPLET( who, BB_DIR_USR_BIN, BB_SUID_DROP)) //kbuild:lib-$(CONFIG_USERS) += who.o -//kbuild:lib-$(CONFIG_WHO) += who.o +//kbuild:lib-$(CONFIG_W) += who.o +//kbuild:lib-$(CONFIG_WHO) += who.o /* BB_AUDIT SUSv3 _NOT_ compliant -- missing options -b, -d, -l, -m, -p, -q, -r, -s, -t, -T, -u; Missing argument 'file'. */ |