diff options
author | Rob Landley <rob@landley.net> | 2008-07-03 19:19:00 -0500 |
---|---|---|
committer | Rob Landley <rob@landley.net> | 2008-07-03 19:19:00 -0500 |
commit | 2bfaaf25614985ada5490d08e005b36f948d8186 (patch) | |
tree | 50deab565a6c7da8638278c6f13e01e85881ddcd /lib | |
parent | df92ef5e8e6cf62358b37f441952b7b5f310b20c (diff) | |
download | toybox-2bfaaf25614985ada5490d08e005b36f948d8186.tar.gz |
Add "tee" command.
Diffstat (limited to 'lib')
-rw-r--r-- | lib/lib.c | 24 | ||||
-rw-r--r-- | lib/lib.h | 1 |
2 files changed, 18 insertions, 7 deletions
@@ -593,30 +593,40 @@ void xpidfile(char *name) close(fd); } -// Iterate through an array of files, opening each one (read only) and -// calling a function on that filehandle and name. The special filename -// "-" means stdin. An empty argument list calls function() on stdin. -void loopfiles(char **argv, void (*function)(int fd, char *name)) +// Iterate through an array of files, opening each one and calling a function +// on that filehandle and name. The special filename "-" means stdin if +// flags is O_RDONLY, stdout otherwise. An empty argument list calls +// function() on just stdin/stdout. +// +// Note: read only filehandles are automatically closed when function() +// returns, but writeable filehandles must be close by function() +void loopfiles_rw(char **argv, int flags, void (*function)(int fd, char *name)) { int fd; // If no arguments, read from stdin. - if (!*argv) function(0, "-"); + if (!*argv) function(flags ? 1 : 0, "-"); else do { // Filename "-" means read from stdin. // Inability to open a file prints a warning, but doesn't exit. if (!strcmp(*argv,"-")) fd=0; - else if (0>(fd = open(*argv, O_RDONLY))) { + else if (0>(fd = open(*argv, flags, 0666))) { perror_msg("%s", *argv); toys.exitval = 1; continue; } function(fd, *argv); - close(fd); + if (!flags) close(fd); } while (*++argv); } +// Call loopfiles_rw with O_RDONLY (common case). +void loopfiles(char **argv, void (*function)(int fd, char *name)) +{ + loopfiles_rw(argv, O_RDONLY, function); +} + // Slow, but small. char *get_rawline(int fd, long *plen, char end) @@ -86,6 +86,7 @@ char *itoa(int n); long atolx(char *c); off_t fdlength(int fd); char *xreadlink(char *name); +void loopfiles_rw(char **argv, int flags, void (*function)(int fd, char *name)); void loopfiles(char **argv, void (*function)(int fd, char *name)); char *get_rawline(int fd, long *plen, char end); char *get_line(int fd); |