* ursh.c:

	Lindent

1 files changed, 46 insertions, 48 deletions

diff --git a/src/ursh.c b/src/ursh.c
index 0a5a550..103b8eb 100644
--- a/src/ursh.c
+++ b/src/ursh.c
@@ -31,15 +31,16 @@
  * SUCH DAMAGE.
  */
 
+#if 0
 char copyright[] =
- "@(#) Copyright (c) 1983, 1990 The Regents of the University of California.\n"
- "All rights reserved.\n";
+    "@(#) Copyright (c) 1983, 1990 The Regents of the University of California.\n"
+    "All rights reserved.\n";
 
 /*
  * From: @(#)rsh.c	5.24 (Berkeley) 7/1/91
  */
 char rcsid[] = "$Id: rsh.c,v 1.13 2000/07/23 04:16:24 dholland Exp $";
-#include "../version.h"
+#endif
 
 #include <sys/types.h>
 #include <signal.h>
@@ -57,7 +58,8 @@ char rcsid[] = "$Id: rsh.c,v 1.13 2000/07/23 04:16:24 dholland Exp $";
 #include <unistd.h>
 #include <errno.h>
 #include <string.h>
-#include "pathnames.h"
+
+#include <urshd_config.h>
 
 /*
  * rsh - remote shell
@@ -68,13 +70,12 @@ static void sendsig(int);
 static void talk(int nflag, long omask, int pid, int rem);
 static void usage(void);
 
-int
-main(int argc, char *argv[])
+int main(int argc, char *argv[])
 {
 	struct passwd *pw;
 	struct servent *sp;
 	long omask;
-	int argoff, asrsh, ch, dflag, nflag, one, pid=0, rem, uid;
+	int argoff, asrsh, ch, dflag, nflag, one, pid = 0, rem, uid;
 	char *p;
 	char *args, *host, *user;
 	char *null = NULL;
@@ -89,21 +90,24 @@ main(int argc, char *argv[])
 
 	/* if called as something other than "rsh", use it as the host name */
 	p = strrchr(argv[0], '/');
-	if (p) p++;
-	else p = argv[0];
+	if (p)
+		p++;
+	else
+		p = argv[0];
 
-	if (!strcmp(p, "rsh")) asrsh = 1;
-	else host = p;
+	if (!strcmp(p, "rsh"))
+		asrsh = 1;
+	else
+		host = p;
 
 	/* handle "rsh host flags" */
 	if (!host && argc > 2 && argv[1][0] != '-') {
 		host = argv[1];
 		argoff = 1;
 	}
-
 #define	OPTIONS	"+8KLdel:nw"
 	while ((ch = getopt(argc - argoff, argv + argoff, OPTIONS)) != EOF)
-		switch(ch) {
+		switch (ch) {
 		case 'K':
 			break;
 		case 'L':	/* -8Lew are ignored to allow rlogin aliases */
@@ -136,7 +140,8 @@ main(int argc, char *argv[])
 			fprintf(stderr, "rsh: setuid: %s\n", strerror(errno));
 			exit(1);
 		}
-		if (asrsh) argv[0] = (char *)"rlogin";
+		if (asrsh)
+			argv[0] = (char *)"rlogin";
 		execve(_PATH_RLOGIN, argv, saved_environ);
 		fprintf(stderr, "rsh: can't exec %s.\n", _PATH_RLOGIN);
 		exit(1);
@@ -152,7 +157,6 @@ main(int argc, char *argv[])
 	if (!user)
 		user = pw->pw_name;
 
-
 	args = copyargs(argv);
 
 	sp = NULL;
@@ -180,16 +184,16 @@ main(int argc, char *argv[])
 
 	if (dflag) {
 		if (setsockopt(rem, SOL_SOCKET, SO_DEBUG, &one,
-		    sizeof(one)) < 0)
+			       sizeof(one)) < 0)
 			fprintf(stderr, "rsh: setsockopt: %s.\n",
-			    strerror(errno));
+				strerror(errno));
 		if (setsockopt(rfd2, SOL_SOCKET, SO_DEBUG, &one,
-		    sizeof(one)) < 0)
+			       sizeof(one)) < 0)
 			fprintf(stderr, "rsh: setsockopt: %s.\n",
-			    strerror(errno));
+				strerror(errno));
 	}
 
-	omask = sigblock(sigmask(SIGINT)|sigmask(SIGQUIT)|sigmask(SIGTERM));
+	omask = sigblock(sigmask(SIGINT) | sigmask(SIGQUIT) | sigmask(SIGTERM));
 	if (signal(SIGINT, SIG_IGN) != SIG_IGN)
 		signal(SIGINT, sendsig);
 	if (signal(SIGQUIT, SIG_IGN) != SIG_IGN)
@@ -200,8 +204,7 @@ main(int argc, char *argv[])
 	if (!nflag) {
 		pid = fork();
 		if (pid < 0) {
-			fprintf(stderr,
-			    "rsh: fork: %s.\n", strerror(errno));
+			fprintf(stderr, "rsh: fork: %s.\n", strerror(errno));
 			exit(1);
 		}
 	}
@@ -218,8 +221,7 @@ main(int argc, char *argv[])
 	exit(0);
 }
 
-static void
-talk(int nflag, long omask, int pid, int rem)
+static void talk(int nflag, long omask, int pid, int rem)
 {
 	register int cc, wc;
 	register char *bp;
@@ -232,24 +234,24 @@ talk(int nflag, long omask, int pid, int rem)
 	if (!nflag && pid == 0) {
 		close(rfd2);
 
-reread:		errno = 0;
+	      reread:errno = 0;
 		if ((cc = read(0, buf, sizeof buf)) <= 0)
 			goto done;
 		bp = buf;
 
-rewrite:	FD_ZERO(&rembits);
+	      rewrite:FD_ZERO(&rembits);
 		FD_SET(rem, &rembits);
-		if (select(rem+1, 0, &rembits, 0, 0) < 0) {
+		if (select(rem + 1, 0, &rembits, 0, 0) < 0) {
 			if (errno != EINTR) {
 				fprintf(stderr,
-				    "rsh: select: %s.\n", strerror(errno));
+					"rsh: select: %s.\n", strerror(errno));
 				exit(1);
 			}
 			goto rewrite;
 		}
-		if (! FD_ISSET(rem, &rembits))
+		if (!FD_ISSET(rem, &rembits))
 			goto rewrite;
-			wc = write(rem, bp, cc);
+		wc = write(rem, bp, cc);
 		if (wc < 0) {
 			if (errno == EWOULDBLOCK)
 				goto rewrite;
@@ -260,7 +262,7 @@ rewrite:	FD_ZERO(&rembits);
 		if (cc == 0)
 			goto reread;
 		goto rewrite;
-done:
+	      done:
 		shutdown(rem, 1);
 		exit(0);
 	}
@@ -273,18 +275,18 @@ done:
 			FD_SET(rfd2, &readfrom);
 		if (rem_ok)
 			FD_SET(rem, &readfrom);
-		if (select(rfd2 > rem ? rfd2+1 : rem+1, 
+		if (select(rfd2 > rem ? rfd2 + 1 : rem + 1,
 			   &readfrom, 0, 0, 0) < 0) {
 			if (errno != EINTR) {
 				fprintf(stderr,
-				    "rsh: select: %s.\n", strerror(errno));
+					"rsh: select: %s.\n", strerror(errno));
 				exit(1);
 			}
 			continue;
 		}
 		if (FD_ISSET(rfd2, &readfrom)) {
 			errno = 0;
-				cc = read(rfd2, buf, sizeof buf);
+			cc = read(rfd2, buf, sizeof buf);
 			if (cc > 0)
 				write(2, buf, cc);
 			else if (cc == 0 || errno != EWOULDBLOCK)
@@ -292,7 +294,7 @@ done:
 		}
 		if (FD_ISSET(rem, &readfrom)) {
 			errno = 0;
-				cc = read(rem, buf, sizeof buf);
+			cc = read(rem, buf, sizeof buf);
 			if (cc > 0)
 				write(1, buf, cc);
 			else if (cc == 0 || errno != EWOULDBLOCK)
@@ -301,15 +303,13 @@ done:
 	}
 }
 
-void
-sendsig(int signo)
+void sendsig(int signo)
 {
-	char x = (char) signo;
-		write(rfd2, &x, 1);
+	char x = (char)signo;
+	write(rfd2, &x, 1);
 }
 
-char *
-copyargs(char **argv)
+char *copyargs(char **argv)
 {
 	int cc;
 	char **ap, *p;
@@ -324,19 +324,17 @@ copyargs(char **argv)
 		exit(1);
 	}
 	for (p = args, ap = argv; *ap; ++ap) {
-		/*strcpy(p, *ap);*/
-		for (p = strcpy(p, *ap); *p; ++p);
+		/*strcpy(p, *ap); */
+		for (p = strcpy(p, *ap); *p; ++p) ;
 		if (ap[1])
 			*p++ = ' ';
 	}
-	return(args);
+	return (args);
 }
 
-void
-usage(void)
+void usage(void)
 {
 	fprintf(stderr,
-	    "usage: rsh [-nd%s]%s[-l login] host [command]\n",
-	    "", " ");
+		"usage: rsh [-nd%s]%s[-l login] host [command]\n", "", " ");
 	exit(1);
 }