svn commit: trunk/busybox: coreutils util-linux

landley at busybox.net landley at busybox.net
Sun May 28 01:19:09 UTC 2006


Author: landley
Date: 2006-05-27 18:19:06 -0700 (Sat, 27 May 2006)
New Revision: 15206

Log:
Fix some warnings in allbareconfig.


Modified:
   trunk/busybox/coreutils/ls.c
   trunk/busybox/util-linux/more.c


Changeset:
Modified: trunk/busybox/coreutils/ls.c
===================================================================
--- trunk/busybox/coreutils/ls.c	2006-05-28 01:06:36 UTC (rev 15205)
+++ trunk/busybox/coreutils/ls.c	2006-05-28 01:19:06 UTC (rev 15206)
@@ -353,6 +353,8 @@
 	}
 	free(dnp);			/* free the array holding the dnode pointers */
 }
+#else
+#define dfree(...)
 #endif
 
 static struct dnode **splitdnarray(struct dnode **dn, int nfiles, int which)

Modified: trunk/busybox/util-linux/more.c
===================================================================
--- trunk/busybox/util-linux/more.c	2006-05-28 01:06:36 UTC (rev 15205)
+++ trunk/busybox/util-linux/more.c	2006-05-28 01:19:06 UTC (rev 15206)
@@ -67,9 +67,6 @@
 	int len, page_height;
 	int terminal_width;
 	int terminal_height;
-#ifndef CONFIG_FEATURE_USE_TERMIOS
-	int cin_fileno;
-#endif
 
 	argc--;
 	argv++;
@@ -80,9 +77,9 @@
 		cin = fopen(CURRENT_TTY, "r");
 		if (!cin)
 			cin = bb_xfopen(CONSOLE_DEV, "r");
-		cin_fileno = fileno(cin);
 		please_display_more_prompt = 2;
 #ifdef CONFIG_FEATURE_USE_TERMIOS
+		cin_fileno = fileno(cin);
 		getTermSettings(cin_fileno, &initial_settings);
 		new_settings = initial_settings;
 		new_settings.c_lflag &= ~ICANON;
@@ -112,7 +109,7 @@
 
 		please_display_more_prompt &= ~1;
 
-		get_terminal_width_height(cin_fileno, &terminal_width, &terminal_height);
+		get_terminal_width_height(fileno(cin), &terminal_width, &terminal_height);
 		if (terminal_height > 4)
 			terminal_height -= 2;
 		if (terminal_width > 0)




More information about the busybox-cvs mailing list