/[magellan-source]/trunk/mkinitrd-magellan/busybox/coreutils/stty.c

Diff of /trunk/mkinitrd-magellan/busybox/coreutils/stty.c

Parent Directory | Revision Log | View Patch Patch

-revision 983 by niro,
Fri Apr 24 18:33:46 2009 UTC
+revision 984 by niro,
Sun May 30 11:32:42 2010 UTC
 Line 619 
 enum {
  struct globals {
- 	const char *device_name; // = bb_msg_standard_input;
+ 	const char *device_name;
  	/* The width of the screen, for output wrapping */
- 	unsigned max_col; // = 80;
+ 	unsigned max_col;
  	/* Current position, to know when to wrap */
  	unsigned current_col;
  	char buf[10];
 Line 677 
 static tcflag_t *mode_type_flag(unsigned
  	return NULL;
  }
- static void set_speed_or_die(enum speed_setting type, const char *const arg,
+ static void set_speed_or_die(enum speed_setting type, const char *arg,
- 					struct termios * const mode)
+ 					struct termios *mode)
  {
  	speed_t baud;
 Line 734 
 static void wrapf(const char *message, .
  		G.current_col = 0;
  }
- static void set_window_size(const int rows, const int cols)
+ static void newline(void)
+ {
+ 	if (G.current_col != 0)
+ 		wrapf("\n");
+ }
+ static void set_window_size(int rows, int cols)
  {
  	struct winsize win = { 0, 0, 0, 0 };
-Line 755 
 bail:
+Line 761 
 bail:
  		perror_on_device("%s");
  }
- static void display_window_size(const int fancy)
+ static void display_window_size(int fancy)
  {
  	const char *fmt_str = "%s\0%s: no size information for this device";
  	unsigned width, height;
-Line 765 
 static void display_window_size(const in
+Line 771 
 static void display_window_size(const in
  			perror_on_device(fmt_str);
  		}
  	} else {
- 		wrapf(fancy ? "rows %d; columns %d;" : "%d %d\n",
+ 		wrapf(fancy ? "rows %u; columns %u;" : "%u %u\n",
  				height, width);
  	}
  }
-Line 774 
 static const struct suffix_mult stty_suf
+Line 780 
 static const struct suffix_mult stty_suf
  	{ "b",  512 },
  	{ "k", 1024 },
  	{ "B", 1024 },
- 	{ }
+ 	{ "", 0 }
  };
  static const struct mode_info *find_mode(const char *name)
-Line 801 
 enum {
+Line 807 
 enum {
  	param_ospeed  = 8 | 0x80,
  };
- static int find_param(const char *const name)
+ static int find_param(const char *name)
  {
  	static const char params[] ALIGN1 =
  		"line\0"    /* 1 */
-Line 864 
 static void display_recoverable(const st
+Line 870 
 static void display_recoverable(const st
  static void display_speed(const struct termios *mode, int fancy)
  {
- 	                     //01234567 8 9
+ 	//____________________ 01234567 8 9
  	const char *fmt_str = "%lu %lu\n\0ispeed %lu baud; ospeed %lu baud;";
  	unsigned long ispeed, ospeed;
  	ospeed = ispeed = cfgetispeed(mode);
  	if (ispeed == 0 || ispeed == (ospeed = cfgetospeed(mode))) {
  		ispeed = ospeed;                /* in case ispeed was 0 */
- 		         //0123 4 5 6 7 8 9
+ 		//________ 0123 4 5 6 7 8 9
  		fmt_str = "%lu\n\0\0\0\0\0speed %lu baud;";
  	}
  	if (fancy) fmt_str += 9;
  	wrapf(fmt_str, tty_baud_to_value(ispeed), tty_baud_to_value(ospeed));
  }
- static void do_display(const struct termios *mode, const int all)
+ static void do_display(const struct termios *mode, int all)
  {
  	int i;
  	tcflag_t *bitsp;
-Line 889 
 static void do_display(const struct term
+Line 895 
 static void do_display(const struct term
  	if (all)
  		display_window_size(1);
  #ifdef HAVE_C_LINE
- 	wrapf("line = %d;\n", mode->c_line);
+ 	wrapf("line = %u;\n", mode->c_line);
  #else
- 	wrapf("\n");
+ 	newline();
  #endif
  	for (i = 0; i != CIDX_min; ++i) {
-Line 902 
 static void do_display(const struct term
+Line 908 
 static void do_display(const struct term
  #endif
  		/* If eof uses the same slot as min, only print whichever applies */
  #if VEOF == VMIN
- 		if ((mode->c_lflag & ICANON) == 0
+ 		if (!(mode->c_lflag & ICANON)
  		 && (i == CIDX_eof || i == CIDX_eol)
  		) {
  			continue;
-Line 914 
 static void do_display(const struct term
+Line 920 
 static void do_display(const struct term
  #if VEOF == VMIN
  	if ((mode->c_lflag & ICANON) == 0)
  #endif
- 		wrapf("min = %d; time = %d;", mode->c_cc[VMIN], mode->c_cc[VTIME]);
+ 		wrapf("min = %u; time = %u;", mode->c_cc[VMIN], mode->c_cc[VTIME]);
- 	if (G.current_col) wrapf("\n");
+ 	newline();
  	for (i = 0; i < NUM_mode_info; ++i) {
  		if (mode_info[i].flags & OMIT)
  			continue;
  		if (mode_info[i].type != prev_type) {
- 			/* wrapf("\n"); */
+ 			newline();
- 			if (G.current_col) wrapf("\n");
  			prev_type = mode_info[i].type;
  		}
-Line 939 
 static void do_display(const struct term
+Line 944 
 static void do_display(const struct term
  			}
  		}
  	}
- 	if (G.current_col) wrapf("\n");
+ 	newline();
  }
  static void sane_mode(struct termios *mode)
-Line 1138 
 static void set_control_char_or_die(cons
+Line 1143 
 static void set_control_char_or_die(cons
  		value = xatoul_range_sfx(arg, 0, 0xff, stty_suffixes);
  	else if (arg[0] == '\0' || arg[1] == '\0')
  		value = arg[0];
- 	else if (!strcmp(arg, "^-") || !strcmp(arg, "undef"))
+ 	else if (strcmp(arg, "^-") == 0 || strcmp(arg, "undef") == 0)
  		value = _POSIX_VDISABLE;
  	else if (arg[0] == '^') { /* Ignore any trailing junk (^Cjunk) */
  		value = arg[1] & 0x1f; /* Non-letters get weird results */
-Line 1156 
 static void set_control_char_or_die(cons
+Line 1161 
 static void set_control_char_or_die(cons
  #define STTY_noargs             (1 << 4)
  int stty_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
- int stty_main(int argc, char **argv)
+ int stty_main(int argc UNUSED_PARAM, char **argv)
  {
  	struct termios mode;
- 	void (*output_func)(const struct termios *, const int);
+ 	void (*output_func)(const struct termios *, int);
  	const char *file_name = NULL;
  	int display_all = 0;
  	int stty_state;
-Line 1211 
 int stty_main(int argc, char **argv)
+Line 1216 
 int stty_main(int argc, char **argv)
  						if (!file_name)
  							bb_error_msg_and_die(bb_msg_requires_arg, "-F");
  						/* remove -F param from arg[vc] */
- 						--argc;
+ 						while (argv[p]) {
- 						while (argv[p]) { argv[p] = argv[p+1]; ++p; }
+ 							argv[p] = argv[p+1];
+ 							++p;
+ 						}
  					}
  					goto end_option;
  				default:
-Line 1287 
 int stty_main(int argc, char **argv)
+Line 1294 
 int stty_main(int argc, char **argv)
  		(STTY_verbose_output | STTY_recoverable_output))
  		bb_error_msg_and_die("verbose and stty-readable output styles are mutually exclusive");
  	/* Specifying -a or -g with non-options is an error */
- 	if (!(stty_state & STTY_noargs) &&
+ 	if (!(stty_state & STTY_noargs)
- 		(stty_state & (STTY_verbose_output | STTY_recoverable_output)))
+ 	 && (stty_state & (STTY_verbose_output | STTY_recoverable_output))
+ 	) {
  		bb_error_msg_and_die("modes may not be set when specifying an output style");
+ 	}
  	/* Now it is safe to start doing things */
  	if (file_name) {
- 		int fd, fdflags;
  		G.device_name = file_name;
- 		fd = xopen(G.device_name, O_RDONLY | O_NONBLOCK);
+ 		xmove_fd(xopen_nonblocking(G.device_name), STDIN_FILENO);
- 		if (fd != STDIN_FILENO) {
+ 		ndelay_off(STDIN_FILENO);
- 			dup2(fd, STDIN_FILENO);
- 			close(fd);
- 		}
- 		fdflags = fcntl(STDIN_FILENO, F_GETFL);
- 		if (fdflags < 0 ||
- 			fcntl(STDIN_FILENO, F_SETFL, fdflags & ~O_NONBLOCK) < 0)
- 			perror_on_device_and_die("%s: cannot reset non-blocking mode");
  	}
  	/* Initialize to all zeroes so there is no risk memcmp will report a
-Line 1366 
 int stty_main(int argc, char **argv)
+Line 1367 
 int stty_main(int argc, char **argv)
  #endif
  #ifdef TIOCGWINSZ
  		case param_cols:
+ 		case param_columns:
  			set_window_size(-1, xatoul_sfx(argnext, stty_suffixes));
  			break;
  		case param_size:

 Legend:



Removed from v.983
 


changed lines


 
Added in v.984
 Legend:



Removed from v.983
 


changed lines


 
Added in v.984
-Removed from v.983
+Added in v.984