Commit 27950be9 authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

busybox 1.5.0 patches

parent 8ca4af14
Loading
Loading
Loading
Loading
+14 −0
Original line number Diff line number Diff line
--- busybox-1.5.0/miscutils/hdparm.c	Thu Mar 22 22:21:34 2007
+++ busybox-1.5.0-hdparm/miscutils/hdparm.c	Sat Mar 31 12:23:07 2007
@@ -1569,9 +1569,9 @@
 	if (set_mult) {
 		print_flag(get_mult, "multcount", mult);
 #ifdef HDIO_DRIVE_CMD
-		bb_ioctl(fd, HDIO_SET_MULTCOUNT, &mult, "HDIO_SET_MULTCOUNT");
+		bb_ioctl(fd, HDIO_SET_MULTCOUNT, (void *)mult, "HDIO_SET_MULTCOUNT");
 #else
-		force_operation |= (!bb_ioctl(fd, HDIO_SET_MULTCOUNT, &mult, "HDIO_SET_MULTCOUNT"));
+		force_operation |= (!bb_ioctl(fd, HDIO_SET_MULTCOUNT, (void *)mult, "HDIO_SET_MULTCOUNT"));
 #endif
 	}
 	if (set_readonly) {
+13 −0
Original line number Diff line number Diff line
--- busybox-1.5.0/procps/ps.c	Thu Mar 22 22:21:37 2007
+++ busybox-1.5.0-ps/procps/ps.c	Wed Mar 28 23:57:34 2007
@@ -262,7 +262,9 @@
 		parse_o(default_o);
 	post_process();
 
-	terminal_width = INT_MAX;
+	/* Was INT_MAX, but some libc's go belly up with printf("%.*s")
+	 * and such large widths */
+	terminal_width = 30000;
 	if (isatty(1)) {
 		get_terminal_width_height(1, &terminal_width, NULL);
 		terminal_width--;