pull upstream changes, add auto formatting

1 files changed, 28 insertions, 25 deletions

diff --git a/user/progS.c b/user/progS.c
index d220955..c8e0e60 100644
--- a/user/progS.c
+++ b/user/progS.c
@@ -10,41 +10,44 @@
 **		   s is the sleep time (defaults to 20)
 */
 
-USERMAIN( main ) {
-	char ch = 's';	  // default character to print
-	int nap = 20;	  // nap time
+USERMAIN(main)
+{
+	char ch = 's'; // default character to print
+	int nap = 20; // nap time
 	char buf[128];
 
 	// process the command-line arguments
-	switch( argc ) {
-	case 3:	nap = str2int( argv[2], 10 );
-			// FALL THROUGH
-	case 2:	ch = argv[1][0];
-			break;
+	switch (argc) {
+	case 3:
+		nap = str2int(argv[2], 10);
+		// FALL THROUGH
+	case 2:
+		ch = argv[1][0];
+		break;
 	default:
-			sprint( buf, "userS: argc %d, args: ", argc );
-			cwrites( buf );
-			for( int i = 0; i <= argc; ++i ) {
-				sprint( buf, " %s", argv[argc] ? argv[argc] : "(null)" );
-				cwrites( buf );
-			}
-			cwrites( "\n" );
+		sprint(buf, "userS: argc %d, args: ", argc);
+		cwrites(buf);
+		for (int i = 0; i <= argc; ++i) {
+			sprint(buf, " %s", argv[argc] ? argv[argc] : "(null)");
+			cwrites(buf);
+		}
+		cwrites("\n");
 	}
 
 	// announce our presence
-	write( CHAN_SIO, &ch, 1 );
+	write(CHAN_SIO, &ch, 1);
 
-	sprint( buf, "userS sleeping %d(%d)\n", nap, SEC_TO_MS(nap) );
-	cwrites( buf );
+	sprint(buf, "userS sleeping %d(%d)\n", nap, SEC_TO_MS(nap));
+	cwrites(buf);
 
-	for(;;) {
-		sleep( SEC_TO_MS(nap) );
-		write( CHAN_SIO, &ch, 1 );
+	for (;;) {
+		sleep(SEC_TO_MS(nap));
+		write(CHAN_SIO, &ch, 1);
 	}
 
-	sprint( buf, "!! %c exiting!?!?!?\n", ch );
-	cwrites( buf );
-	exit( 1 );
+	sprint(buf, "!! %c exiting!?!?!?\n", ch);
+	cwrites(buf);
+	exit(1);
 
-	return( 42 );  // shut the compiler up!
+	return (42); // shut the compiler up!
 }