summaryrefslogtreecommitdiff
path: root/libbb
diff options
context:
space:
mode:
authorDenys Vlasenko2017-04-12 15:48:19 +0200
committerDenys Vlasenko2017-04-12 15:48:19 +0200
commitd9eb40c18519d10aac3b3d008aa7e338ae830b72 (patch)
treecffe3867dedefadb361ec6cbd507e9f967e36e90 /libbb
parent0cecbe7d5de237a6c699c67ae53ae2e2481eff43 (diff)
downloadbusybox-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 'libbb')
-rw-r--r--libbb/bb_cat.c33
-rw-r--r--libbb/print_numbered_lines.c29
2 files changed, 62 insertions, 0 deletions
diff --git a/libbb/bb_cat.c b/libbb/bb_cat.c
new file mode 100644
index 0000000..0a4a350
--- /dev/null
+++ b/libbb/bb_cat.c
@@ -0,0 +1,33 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * Copyright (C) 2003 Manuel Novoa III <mjn3@codepoet.org>
+ *
+ * Licensed under GPLv2, see file LICENSE in this source tree.
+ */
+//kbuild:lib-y += bb_cat.o
+
+#include "libbb.h"
+
+int FAST_FUNC 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;
+}
diff --git a/libbb/print_numbered_lines.c b/libbb/print_numbered_lines.c
new file mode 100644
index 0000000..702aed1
--- /dev/null
+++ b/libbb/print_numbered_lines.c
@@ -0,0 +1,29 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * Copyright (C) 2017 Denys Vlasenko <vda.linux@googlemail.com>
+ *
+ * Licensed under GPLv2, see file LICENSE in this source tree.
+ */
+//kbuild:lib-y += print_numbered_lines.o
+
+#include "libbb.h"
+
+void FAST_FUNC print_numbered_lines(struct number_state *ns, const char *filename)
+{
+ FILE *fp = fopen_or_warn_stdin(filename);
+ unsigned N = ns->start;
+ char *line;
+
+ while ((line = xmalloc_fgetline(fp)) != NULL) {
+ if (ns->all
+ || (ns->nonempty && line[0])
+ ) {
+ printf("%*u%s%s\n", ns->width, N, ns->sep, line);
+ N += ns->inc;
+ } else if (ns->empty_str)
+ fputs(ns->empty_str, stdout);
+ free(line);
+ }
+
+ fclose(fp);
+}