aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkraai <kraai@69ca8d6d-28ef-0310-b511-8ec308f3f277>2000-09-27 04:09:22 +0000
committerkraai <kraai@69ca8d6d-28ef-0310-b511-8ec308f3f277>2000-09-27 04:09:22 +0000
commitcf379723edb38a53c8bb443c7e08ad4d90b68dfc (patch)
tree119d96c575fe50db7026ee96d476006823dd0f4b
parent9408814b5c5f0c9368d466160da32b1b4049f03f (diff)
downloadbusybox-w32-cf379723edb38a53c8bb443c7e08ad4d90b68dfc.tar.gz
busybox-w32-cf379723edb38a53c8bb443c7e08ad4d90b68dfc.tar.bz2
busybox-w32-cf379723edb38a53c8bb443c7e08ad4d90b68dfc.zip
Rewrote head to perservere when it can't open a file, and share code
with cat. git-svn-id: svn://busybox.net/trunk/busybox@1138 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat
-rw-r--r--busybox.h1
-rw-r--r--coreutils/head.c93
-rw-r--r--head.c93
-rw-r--r--include/busybox.h1
-rw-r--r--utility.c20
5 files changed, 105 insertions, 103 deletions
diff --git a/busybox.h b/busybox.h
index faad206ee..da17b8ab3 100644
--- a/busybox.h
+++ b/busybox.h
@@ -395,6 +395,7 @@ extern int print_file_by_name(char *filename);
395extern char process_escape_sequence(char **ptr); 395extern char process_escape_sequence(char **ptr);
396extern char *get_last_path_component(char *path); 396extern char *get_last_path_component(char *path);
397extern void xregcomp(regex_t *preg, const char *regex, int cflags); 397extern void xregcomp(regex_t *preg, const char *regex, int cflags);
398extern FILE *wfopen(const char *path, const char *mode);
398extern FILE *xfopen(const char *path, const char *mode); 399extern FILE *xfopen(const char *path, const char *mode);
399 400
400#ifndef DMALLOC 401#ifndef DMALLOC
diff --git a/coreutils/head.c b/coreutils/head.c
index c232e1153..92b43bae2 100644
--- a/coreutils/head.c
+++ b/coreutils/head.c
@@ -26,17 +26,16 @@
26#include <errno.h> 26#include <errno.h>
27#include <stdio.h> 27#include <stdio.h>
28 28
29int head(int len, FILE * src) 29int head(int len, FILE *fp)
30{ 30{
31 int i; 31 int i;
32 char buffer[1024]; 32 char *input;
33 33
34 for (i = 0; i < len; i++) { 34 for (i = 0; i < len; i++) {
35 fgets(buffer, 1024, src); 35 if ((input = get_line_from_file(fp)) == NULL)
36 if (feof(src)) {
37 break; 36 break;
38 } 37 fputs(input, stdout);
39 fputs(buffer, stdout); 38 free(input);
40 } 39 }
41 return 0; 40 return 0;
42} 41}
@@ -44,60 +43,54 @@ int head(int len, FILE * src)
44/* BusyBoxed head(1) */ 43/* BusyBoxed head(1) */
45int head_main(int argc, char **argv) 44int head_main(int argc, char **argv)
46{ 45{
47 char opt; 46 FILE *fp;
48 int len = 10, tmplen, i; 47 int need_headers, opt, len = 10, status = EXIT_SUCCESS;
49 48
50 /* parse argv[] */ 49 /* parse argv[] */
51 for (i = 1; i < argc; i++) { 50 while ((opt = getopt(argc, argv, "n:")) > 0) {
52 if (argv[i][0] == '-') { 51 switch (opt) {
53 opt = argv[i][1]; 52 case 'n':
54 switch (opt) { 53 len = atoi(optarg);
55 case 'n': 54 if (len >= 1)
56 tmplen = 0;
57 if (++i < argc)
58 tmplen = atoi(argv[i]);
59 if (tmplen < 1)
60 usage(head_usage);
61 len = tmplen;
62 break; 55 break;
63 case '-': 56 /* fallthrough */
64 case 'h': 57 default:
65 usage(head_usage); 58 usage(head_usage);
66 default:
67 errorMsg("invalid option -- %c\n", opt);
68 usage(head_usage);
69 }
70 } else {
71 break;
72 } 59 }
73 } 60 }
74 61
75 /* get rest of argv[] or stdin if nothing's left */ 62 /* get rest of argv[] or stdin if nothing's left */
76 if (i >= argc) { 63 if (argv[optind] == NULL) {
77 head(len, stdin); 64 head(len, stdin);
65 return status;
66 }
78 67
79 } else { 68 need_headers = optind != (argc - 1);
80 int need_headers = ((argc - i) > 1); 69 while (argv[optind]) {
81 70 if (strcmp(argv[optind], "-") == 0) {
82 for (; i < argc; i++) { 71 fp = stdin;
83 FILE *src; 72 argv[optind] = "standard input";
84 73 } else {
85 src = fopen(argv[i], "r"); 74 if ((fp = wfopen(argv[optind], "r")) == NULL)
86 if (!src) { 75 status = EXIT_FAILURE;
87 errorMsg("%s: %s\n", argv[i], strerror(errno)); 76 }
88 } else { 77 if (fp) {
89 /* emulating GNU behaviour */ 78 if (need_headers) {
90 if (need_headers) { 79 fprintf(stdout, "==> %s <==\n", argv[optind]);
91 fprintf(stdout, "==> %s <==\n", argv[i]); 80 }
92 } 81 head(len, fp);
93 head(len, src); 82 if (errno) {
94 if (i < argc - 1) { 83 errorMsg("%s: %s\n", argv[optind], strerror(errno));
95 fprintf(stdout, "\n"); 84 status = EXIT_FAILURE;
96 } 85 errno = 0;
97 } 86 }
87 if (optind < argc - 1)
88 fprintf(stdout, "\n");
89 if (fp != stdin)
90 fclose(fp);
98 } 91 }
92 optind++;
99 } 93 }
100 return(0);
101}
102 94
103/* $Id: head.c,v 1.14 2000/09/25 21:45:57 andersen Exp $ */ 95 return status;
96}
diff --git a/head.c b/head.c
index c232e1153..92b43bae2 100644
--- a/head.c
+++ b/head.c
@@ -26,17 +26,16 @@
26#include <errno.h> 26#include <errno.h>
27#include <stdio.h> 27#include <stdio.h>
28 28
29int head(int len, FILE * src) 29int head(int len, FILE *fp)
30{ 30{
31 int i; 31 int i;
32 char buffer[1024]; 32 char *input;
33 33
34 for (i = 0; i < len; i++) { 34 for (i = 0; i < len; i++) {
35 fgets(buffer, 1024, src); 35 if ((input = get_line_from_file(fp)) == NULL)
36 if (feof(src)) {
37 break; 36 break;
38 } 37 fputs(input, stdout);
39 fputs(buffer, stdout); 38 free(input);
40 } 39 }
41 return 0; 40 return 0;
42} 41}
@@ -44,60 +43,54 @@ int head(int len, FILE * src)
44/* BusyBoxed head(1) */ 43/* BusyBoxed head(1) */
45int head_main(int argc, char **argv) 44int head_main(int argc, char **argv)
46{ 45{
47 char opt; 46 FILE *fp;
48 int len = 10, tmplen, i; 47 int need_headers, opt, len = 10, status = EXIT_SUCCESS;
49 48
50 /* parse argv[] */ 49 /* parse argv[] */
51 for (i = 1; i < argc; i++) { 50 while ((opt = getopt(argc, argv, "n:")) > 0) {
52 if (argv[i][0] == '-') { 51 switch (opt) {
53 opt = argv[i][1]; 52 case 'n':
54 switch (opt) { 53 len = atoi(optarg);
55 case 'n': 54 if (len >= 1)
56 tmplen = 0;
57 if (++i < argc)
58 tmplen = atoi(argv[i]);
59 if (tmplen < 1)
60 usage(head_usage);
61 len = tmplen;
62 break; 55 break;
63 case '-': 56 /* fallthrough */
64 case 'h': 57 default:
65 usage(head_usage); 58 usage(head_usage);
66 default:
67 errorMsg("invalid option -- %c\n", opt);
68 usage(head_usage);
69 }
70 } else {
71 break;
72 } 59 }
73 } 60 }
74 61
75 /* get rest of argv[] or stdin if nothing's left */ 62 /* get rest of argv[] or stdin if nothing's left */
76 if (i >= argc) { 63 if (argv[optind] == NULL) {
77 head(len, stdin); 64 head(len, stdin);
65 return status;
66 }
78 67
79 } else { 68 need_headers = optind != (argc - 1);
80 int need_headers = ((argc - i) > 1); 69 while (argv[optind]) {
81 70 if (strcmp(argv[optind], "-") == 0) {
82 for (; i < argc; i++) { 71 fp = stdin;
83 FILE *src; 72 argv[optind] = "standard input";
84 73 } else {
85 src = fopen(argv[i], "r"); 74 if ((fp = wfopen(argv[optind], "r")) == NULL)
86 if (!src) { 75 status = EXIT_FAILURE;
87 errorMsg("%s: %s\n", argv[i], strerror(errno)); 76 }
88 } else { 77 if (fp) {
89 /* emulating GNU behaviour */ 78 if (need_headers) {
90 if (need_headers) { 79 fprintf(stdout, "==> %s <==\n", argv[optind]);
91 fprintf(stdout, "==> %s <==\n", argv[i]); 80 }
92 } 81 head(len, fp);
93 head(len, src); 82 if (errno) {
94 if (i < argc - 1) { 83 errorMsg("%s: %s\n", argv[optind], strerror(errno));
95 fprintf(stdout, "\n"); 84 status = EXIT_FAILURE;
96 } 85 errno = 0;
97 } 86 }
87 if (optind < argc - 1)
88 fprintf(stdout, "\n");
89 if (fp != stdin)
90 fclose(fp);
98 } 91 }
92 optind++;
99 } 93 }
100 return(0);
101}
102 94
103/* $Id: head.c,v 1.14 2000/09/25 21:45:57 andersen Exp $ */ 95 return status;
96}
diff --git a/include/busybox.h b/include/busybox.h
index faad206ee..da17b8ab3 100644
--- a/include/busybox.h
+++ b/include/busybox.h
@@ -395,6 +395,7 @@ extern int print_file_by_name(char *filename);
395extern char process_escape_sequence(char **ptr); 395extern char process_escape_sequence(char **ptr);
396extern char *get_last_path_component(char *path); 396extern char *get_last_path_component(char *path);
397extern void xregcomp(regex_t *preg, const char *regex, int cflags); 397extern void xregcomp(regex_t *preg, const char *regex, int cflags);
398extern FILE *wfopen(const char *path, const char *mode);
398extern FILE *xfopen(const char *path, const char *mode); 399extern FILE *xfopen(const char *path, const char *mode);
399 400
400#ifndef DMALLOC 401#ifndef DMALLOC
diff --git a/utility.c b/utility.c
index df2515c2b..03d649757 100644
--- a/utility.c
+++ b/utility.c
@@ -1634,12 +1634,14 @@ extern void print_file(FILE *file)
1634extern int print_file_by_name(char *filename) 1634extern int print_file_by_name(char *filename)
1635{ 1635{
1636 FILE *file; 1636 FILE *file;
1637 file = fopen(filename, "r"); 1637 if ((file = wfopen(filename, "r")) == NULL)
1638 if (file == NULL) { 1638 return FALSE;
1639 print_file(file);
1640 if (errno) {
1639 errorMsg("%s: %s\n", filename, strerror(errno)); 1641 errorMsg("%s: %s\n", filename, strerror(errno));
1642 errno = 0;
1640 return FALSE; 1643 return FALSE;
1641 } 1644 }
1642 print_file(file);
1643 return TRUE; 1645 return TRUE;
1644} 1646}
1645#endif /* BB_CAT */ 1647#endif /* BB_CAT */
@@ -1719,6 +1721,18 @@ void xregcomp(regex_t *preg, const char *regex, int cflags)
1719} 1721}
1720#endif 1722#endif
1721 1723
1724#if defined BB_CAT || defined BB_HEAD
1725FILE *wfopen(const char *path, const char *mode)
1726{
1727 FILE *fp;
1728 if ((fp = fopen(path, mode)) == NULL) {
1729 errorMsg("%s: %s\n", path, strerror(errno));
1730 errno = 0;
1731 }
1732 return fp;
1733}
1734#endif
1735
1722#if defined BB_HOSTNAME || defined BB_LOADACM || defined BB_MORE || defined BB_SED || defined BB_SH || defined BB_UNIQ || defined BB_WC 1736#if defined BB_HOSTNAME || defined BB_LOADACM || defined BB_MORE || defined BB_SED || defined BB_SH || defined BB_UNIQ || defined BB_WC
1723FILE *xfopen(const char *path, const char *mode) 1737FILE *xfopen(const char *path, const char *mode)
1724{ 1738{
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-04-03 01:34:45 +0000