svn commit: trunk/busybox/libbb

[vda at busybox.net]

Author: vda
Date: 2008-07-12 16:47:24 -0700 (Sat, 12 Jul 2008)
New Revision: 22820

Log:
libbb: shrink print_login_issue (by Vladimir Dronnikov)

function                                             old     new   delta
print_login_issue                                    469     435     -34



Modified:
   trunk/busybox/libbb/login.c


Changeset:
Modified: trunk/busybox/libbb/login.c
===================================================================
--- trunk/busybox/libbb/login.c	2008-07-12 23:02:43 UTC (rev 22819)
+++ trunk/busybox/libbb/login.c	2008-07-12 23:47:24 UTC (rev 22820)
@@ -20,7 +20,7 @@
 
 void FAST_FUNC print_login_issue(const char *issue_file, const char *tty)
 {
-	FILE *fd;
+	FILE *fp;
 	int c;
 	char buf[256+1];
 	const char *outbuf;
@@ -32,10 +32,10 @@
 
 	puts("\r");	/* start a new line */
 
-	fd = fopen(issue_file, "r");
-	if (!fd)
+	fp = fopen(issue_file, "r");
+	if (!fp)
 		return;
-	while ((c = fgetc(fd)) != EOF) {
+	while ((c = fgetc(fp)) != EOF) {
 		outbuf = buf;
 		buf[0] = c;
 		buf[1] = '\0';
@@ -44,7 +44,7 @@
 			buf[2] = '\0';
 		}
 		if (c == '\\' || c == '%') {
-			c = fgetc(fd);
+			c = fgetc(fp);
 			switch (c) {
 			case 's':
 				outbuf = uts.sysname;
@@ -64,8 +64,7 @@
 				break;
 			case 'D':
 			case 'o':
-				c = getdomainname(buf, sizeof(buf) - 1);
-				buf[c >= 0 ? c : 0] = '\0';
+				outbuf = uts.domainname;
 				break;
 			case 'd':
 				strftime(buf, sizeof(buf), fmtstr_d, localtime(&t));
@@ -82,7 +81,7 @@
 		}
 		fputs(outbuf, stdout);
 	}
-	fclose(fd);
+	fclose(fp);
 	fflush(stdout);
 }