function old new delta fputs_stdout - 12 +12 zxc_vm_process 7237 7230 -7 yes_main 85 78 -7 write_block 380 373 -7 wrapf 305 298 -7 strings_main 437 430 -7 show_bridge 353 346 -7 rev_main 384 377 -7 put_prompt_custom 58 51 -7 put_cur_glyph_and_inc_cursor 168 161 -7 print_numbered_lines 152 145 -7 print_named_ascii 130 123 -7 print_name 135 128 -7 print_login_issue 386 379 -7 print_ascii 208 201 -7 powertop_main 1249 1242 -7 od_main 1789 1782 -7 logread_main 518 511 -7 head_main 804 797 -7 display_process_list 1319 1312 -7 cut_main 1002 995 -7 bb_dump_dump 1550 1543 -7 bb_ask_noecho 393 386 -7 baseNUM_main 702 695 -7 expand_main 755 745 -10 dumpleases_main 497 487 -10 write1 12 - -12 putcsi 37 23 -14 print_login_prompt 55 41 -14 paste_main 525 511 -14 cat_main 440 426 -14 print_it 245 230 -15 print_addrinfo 1188 1171 -17 print_rule 770 750 -20 print_linkinfo 842 822 -20 httpd_main 791 771 -20 ------------------------------------------------------------------------------ (add/remove: 1/1 grow/shrink: 0/34 up/down: 12/-341) Total: -329 bytes Signed-off-by: Ron Yorston <rmy@pobox.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
		
			
				
	
	
		
			141 lines
		
	
	
		
			3.4 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			141 lines
		
	
	
		
			3.4 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| /* vi: set sw=4 ts=4: */
 | |
| /*
 | |
|  * paste.c - implementation of the posix paste command
 | |
|  *
 | |
|  * Written by Maxime Coste <mawww@kakoune.org>
 | |
|  *
 | |
|  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
 | |
|  */
 | |
| //config:config PASTE
 | |
| //config:	bool "paste (4.9 kb)"
 | |
| //config:	default y
 | |
| //config:	help
 | |
| //config:	paste is used to paste lines of different files together
 | |
| //config:	and write the result to stdout
 | |
| 
 | |
| //applet:IF_PASTE(APPLET_NOEXEC(paste, paste, BB_DIR_USR_BIN, BB_SUID_DROP, paste))
 | |
| 
 | |
| //kbuild:lib-$(CONFIG_PASTE) += paste.o
 | |
| 
 | |
| //usage:#define paste_trivial_usage
 | |
| //usage:       "[-d LIST] [-s] [FILE]..."
 | |
| //usage:#define paste_full_usage "\n\n"
 | |
| //usage:       "Paste lines from each input file, separated with tab\n"
 | |
| //usage:     "\n	-d LIST	Use delimiters from LIST, not tab"
 | |
| //usage:     "\n	-s      Serial: one file at a time"
 | |
| //usage:
 | |
| //usage:#define paste_example_usage
 | |
| //usage:       "# write out directory in four columns\n"
 | |
| //usage:       "$ ls | paste - - - -\n"
 | |
| //usage:       "# combine pairs of lines from a file into single lines\n"
 | |
| //usage:       "$ paste -s -d '\\t\\n' file\n"
 | |
| 
 | |
| #include "libbb.h"
 | |
| 
 | |
| static void paste_files(FILE** files, int file_cnt, char* delims, int del_cnt)
 | |
| {
 | |
| 	char *line;
 | |
| 	char delim;
 | |
| 	int active_files = file_cnt;
 | |
| 	int i;
 | |
| 
 | |
| 	while (active_files > 0) {
 | |
| 		int del_idx = 0;
 | |
| 
 | |
| 		for (i = 0; i < file_cnt; ++i) {
 | |
| 			if (files[i] == NULL)
 | |
| 				continue;
 | |
| 
 | |
| 			line = xmalloc_fgetline(files[i]);
 | |
| 			if (!line) {
 | |
| 				fclose_if_not_stdin(files[i]);
 | |
| 				files[i] = NULL;
 | |
| 				--active_files;
 | |
| 				continue;
 | |
| 			}
 | |
| 			fputs_stdout(line);
 | |
| 			free(line);
 | |
| 			delim = '\n';
 | |
| 			if (i != file_cnt - 1) {
 | |
| 				delim = delims[del_idx++];
 | |
| 				if (del_idx == del_cnt)
 | |
| 					del_idx = 0;
 | |
| 			}
 | |
| 			if (delim != '\0')
 | |
| 				fputc(delim, stdout);
 | |
| 		}
 | |
| 	}
 | |
| }
 | |
| 
 | |
| static void paste_files_separate(FILE** files, char* delims, int del_cnt)
 | |
| {
 | |
| 	char *line, *next_line;
 | |
| 	char delim;
 | |
| 	int i;
 | |
| 
 | |
| 	for (i = 0; files[i]; ++i) {
 | |
| 		int del_idx = 0;
 | |
| 
 | |
| 		line = NULL;
 | |
| 		while ((next_line = xmalloc_fgetline(files[i])) != NULL) {
 | |
| 			if (line) {
 | |
| 				fputs_stdout(line);
 | |
| 				free(line);
 | |
| 				delim = delims[del_idx++];
 | |
| 				if (del_idx == del_cnt)
 | |
| 					del_idx = 0;
 | |
| 				if (delim != '\0')
 | |
| 					fputc(delim, stdout);
 | |
| 			}
 | |
| 			line = next_line;
 | |
| 		}
 | |
| 		if (line) {
 | |
| 			/* coreutils adds \n even if this is a final line
 | |
| 			 * of the last file and it was not \n-terminated.
 | |
| 			 */
 | |
| 			printf("%s\n", line);
 | |
| 			free(line);
 | |
| 		}
 | |
| 		fclose_if_not_stdin(files[i]);
 | |
| 	}
 | |
| }
 | |
| 
 | |
| #define PASTE_OPT_DELIMITERS (1 << 0)
 | |
| #define PASTE_OPT_SEPARATE   (1 << 1)
 | |
| 
 | |
| int paste_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 | |
| int paste_main(int argc UNUSED_PARAM, char **argv)
 | |
| {
 | |
| 	char *delims = (char*)"\t";
 | |
| 	int del_cnt = 1;
 | |
| 	unsigned opt;
 | |
| 	int i;
 | |
| 
 | |
| 	opt = getopt32(argv, "d:s", &delims);
 | |
| 	argv += optind;
 | |
| 
 | |
| 	if (opt & PASTE_OPT_DELIMITERS) {
 | |
| 		if (!delims[0])
 | |
| 			bb_simple_error_msg_and_die("-d '' is not supported");
 | |
| 		/* unknown mappings are not changed: "\z" -> '\\' 'z' */
 | |
| 		/* trailing backslash, if any, is preserved */
 | |
| 		del_cnt = strcpy_and_process_escape_sequences(delims, delims) - delims;
 | |
| 		/* note: handle NUL properly (do not stop at it!): try -d'\t\0\t' */
 | |
| 	}
 | |
| 
 | |
| 	if (!argv[0])
 | |
| 		(--argv)[0] = (char*) "-";
 | |
| 	for (i = 0; argv[i]; ++i) {
 | |
| 		argv[i] = (void*) fopen_or_warn_stdin(argv[i]);
 | |
| 		if (!argv[i])
 | |
| 			xfunc_die();
 | |
| 	}
 | |
| 
 | |
| 	if (opt & PASTE_OPT_SEPARATE)
 | |
| 		paste_files_separate((FILE**)argv, delims, del_cnt);
 | |
| 	else
 | |
| 		paste_files((FILE**)argv, i, delims, del_cnt);
 | |
| 
 | |
| 	fflush_stdout_and_exit(0);
 | |
| }
 |