[BusyBox-cvs] busybox/coreutils ls.c, 1.108, 1.109 md5_sha1_sum.c, 1.6, 1.7

Erik Andersen andersen at busybox.net
Sat Mar 27 10:02:44 UTC 2004


Update of /var/cvs/busybox/coreutils
In directory nail:/tmp/cvs-serv8801/busybox/coreutils

Modified Files:
	ls.c md5_sha1_sum.c 
Log Message:
s/fileno\(stdin\)/STDIN_FILENO/g
s/fileno\(stdout\)/STDOUT_FILENO/g


Index: ls.c
===================================================================
RCS file: /var/cvs/busybox/coreutils/ls.c,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -d -r1.108 -r1.109
--- a/ls.c	23 Mar 2004 23:15:36 -0000	1.108
+++ b/ls.c	27 Mar 2004 10:02:42 -0000	1.109
@@ -982,13 +982,13 @@
 
 #ifdef CONFIG_FEATURE_AUTOWIDTH
 	/* Obtain the terminal width.  */
-	get_terminal_width_height(fileno(stdout), &terminal_width, NULL);
+	get_terminal_width_height(STDOUT_FILENO, &terminal_width, NULL);
 	/* Go one less... */
 	terminal_width--;
 #endif
 
 #ifdef CONFIG_FEATURE_LS_COLOR
-	if (isatty(fileno(stdout)))
+	if (isatty(STDOUT_FILENO))
 		show_color = 1;
 #endif
 
@@ -1060,9 +1060,9 @@
 	if ((all_fmt & STYLE_MASK) == STYLE_AUTO)
 #if STYLE_AUTO != 0
 		all_fmt = (all_fmt & ~STYLE_MASK)
-				| (isatty(fileno(stdout)) ? STYLE_COLUMNS : STYLE_SINGLE);
+				| (isatty(STDOUT_FILENO) ? STYLE_COLUMNS : STYLE_SINGLE);
 #else
-		all_fmt |= (isatty(fileno(stdout)) ? STYLE_COLUMNS : STYLE_SINGLE);
+		all_fmt |= (isatty(STDOUT_FILENO) ? STYLE_COLUMNS : STYLE_SINGLE);
 #endif
 
 	/*

Index: md5_sha1_sum.c
===================================================================
RCS file: /var/cvs/busybox/coreutils/md5_sha1_sum.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- a/md5_sha1_sum.c	15 Mar 2004 08:28:21 -0000	1.6
+++ b/md5_sha1_sum.c	27 Mar 2004 10:02:42 -0000	1.7
@@ -55,7 +55,7 @@
 	int src_fd;
 
 	if (strcmp(filename, "-") == 0) {
-		src_fd = fileno(stdin);
+		src_fd = STDIN_FILENO;
 	} else {
 		src_fd = open(filename, O_RDONLY);
 	}




More information about the busybox-cvs mailing list