aboutsummaryrefslogtreecommitdiff
path: root/libbb
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2017-04-12 15:48:19 +0200
committerDenys Vlasenko <vda.linux@googlemail.com>2017-04-12 15:48:19 +0200
commitd9eb40c18519d10aac3b3d008aa7e338ae830b72 (patch)
treecffe3867dedefadb361ec6cbd507e9f967e36e90 /libbb
parent0cecbe7d5de237a6c699c67ae53ae2e2481eff43 (diff)
downloadbusybox-w32-d9eb40c18519d10aac3b3d008aa7e338ae830b72.tar.gz
busybox-w32-d9eb40c18519d10aac3b3d008aa7e338ae830b72.tar.bz2
busybox-w32-d9eb40c18519d10aac3b3d008aa7e338ae830b72.zip
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 000000000..0a4a350fb
--- /dev/null
+++ b/libbb/bb_cat.c
@@ -0,0 +1,33 @@
1/* vi: set sw=4 ts=4: */
2/*
3 * Copyright (C) 2003 Manuel Novoa III <mjn3@codepoet.org>
4 *
5 * Licensed under GPLv2, see file LICENSE in this source tree.
6 */
7//kbuild:lib-y += bb_cat.o
8
9#include "libbb.h"
10
11int FAST_FUNC bb_cat(char **argv)
12{
13 int fd;
14 int retval = EXIT_SUCCESS;
15
16 if (!*argv)
17 argv = (char**) &bb_argv_dash;
18
19 do {
20 fd = open_or_warn_stdin(*argv);
21 if (fd >= 0) {
22 /* This is not a xfunc - never exits */
23 off_t r = bb_copyfd_eof(fd, STDOUT_FILENO);
24 if (fd != STDIN_FILENO)
25 close(fd);
26 if (r >= 0)
27 continue;
28 }
29 retval = EXIT_FAILURE;
30 } while (*++argv);
31
32 return retval;
33}
diff --git a/libbb/print_numbered_lines.c b/libbb/print_numbered_lines.c
new file mode 100644
index 000000000..702aed1ea
--- /dev/null
+++ b/libbb/print_numbered_lines.c
@@ -0,0 +1,29 @@
1/* vi: set sw=4 ts=4: */
2/*
3 * Copyright (C) 2017 Denys Vlasenko <vda.linux@googlemail.com>
4 *
5 * Licensed under GPLv2, see file LICENSE in this source tree.
6 */
7//kbuild:lib-y += print_numbered_lines.o
8
9#include "libbb.h"
10
11void FAST_FUNC print_numbered_lines(struct number_state *ns, const char *filename)
12{
13 FILE *fp = fopen_or_warn_stdin(filename);
14 unsigned N = ns->start;
15 char *line;
16
17 while ((line = xmalloc_fgetline(fp)) != NULL) {
18 if (ns->all
19 || (ns->nonempty && line[0])
20 ) {
21 printf("%*u%s%s\n", ns->width, N, ns->sep, line);
22 N += ns->inc;
23 } else if (ns->empty_str)
24 fputs(ns->empty_str, stdout);
25 free(line);
26 }
27
28 fclose(fp);
29}