sbase

commit 17a81ace44ffe46b63bb27cb2ca3f23ee82828e2
parent ff97891daddbade2811c44d4be6d7023549daf2d
Author: Connor Lane Smith <cls@lubutu.com>
Date:   Thu,  9 Jun 2011 00:40:23 +0100

extra uname spaces confuse scripts
Diffstat:
M
uname.c
 | 
23
++++++++++++++++++-----

1 file changed, 18 insertions(+), 5 deletions(-)
diff --git a/uname.c b/uname.c
@@ -6,6 +6,8 @@
 #include <sys/utsname.h>
 #include "util.h"
 
+static void print(const char *);
+
 int
 main(int argc, char *argv[])
 {
@@ -44,15 +46,26 @@ main(int argc, char *argv[])
 		eprintf("uname:");
 
 	if(sflag || !(nflag || rflag || vflag || mflag))
-		printf("%s ", u.sysname);
+		print(u.sysname);
 	if(nflag)
-		printf("%s ", u.nodename);
+		print(u.nodename);
 	if(rflag)
-		printf("%s ", u.release);
+		print(u.release);
 	if(vflag)
-		printf("%s ", u.version);
+		print(u.version);
 	if(mflag)
-		printf("%s ", u.machine);
+		print(u.machine);
 	putchar('\n');
 	return EXIT_SUCCESS;
 }
+
+void
+print(const char *s)
+{
+	static bool first = true;
+
+	if(!first)
+		putchar(' ');
+	fputs(s, stdout);
+	first = false;
+}