Restructuring of main() function

websh.c

@@ -100,6 +100,31 @@ void parse(int argc, char *argv[])
 	pname = argv[0];
 }
 
+void child2(int fd[], char readbuffer[])
+{
+	/* CHILD TWO */
+	close(fd[1]);
+	int nbytes = read(fd[0], readbuffer, MAX_LEN);
+	if (nbytes == -1) {
+		perror(pname);
+		exit(EXIT_FAILURE);
+	}
+	printf("%s", readbuffer);
+	return;
+}
+
+void child1(int fd[], char *line)
+{
+	/* CHILD ONE */
+	close(fd[0]);
+	dup2(fd[1], STDOUT_FILENO);
+	execl("/bin/bash", "/bin/bash", "-c", line, (char *) NULL);
+	fprintf(stderr, "[%s] exec failed\n", pname);
+	free(line);
+	exit(EXIT_FAILURE);
+	return;
+}
+
 int main(int argc, char *argv[])
 {
 	parse(argc, argv);
@@ -126,40 +151,21 @@ int main(int argc, char *argv[])
 		pid_t childpid2;
 		pipe(fd);
 
-		while ((nread = getline(&line, &len, stdin)) != -1) {
+		while ((nread = getline(&line, &len, stdin)) > 0) {
-			switch (childpid1 = fork()) {
+			childpid1 = fork();
-			case -1:
+			if (childpid1 > 0) {
-				perror(pname);
-				free(line);
-				exit(EXIT_FAILURE);
-			case 0:
-				/* CHILD ONE */
-				close(fd[0]);
-				dup2(fd[1], STDOUT_FILENO);
-				execl("/bin/bash", "/bin/bash", "-c", line, (char *) NULL);
-				fprintf(stderr, "[%s] exec failed\n", pname);
-				free(line);
-				exit(EXIT_FAILURE);
-			default:
 				/* PARENT ONE */
-				switch (childpid2 = fork()) {
+				childpid2 = fork();
-				case -1:
+				if (childpid2 > 0) {
-					perror(pname);
+					/* PARENT TWO */
-					free(line);
+				} else if (childpid2 == 0) {
-					exit(EXIT_FAILURE);
-				case 0:
 					/* CHILD TWO */
-					close(fd[1]);
+					child2(fd, readbuffer);
-					int nbytes = read(fd[0], readbuffer, MAX_LEN);
+				} else {
-					if (nbytes == -1) {
 					perror(pname);
 					free(line);
 					exit(EXIT_FAILURE);
 				}
-					printf("%s", readbuffer);
-					return 0;
-				default:
-					/* PARENT TWO */
 				do {
 					w = waitpid(childpid2, &status, WUNTRACED | WCONTINUED);
 					if (w == -1) {
@@ -175,10 +181,13 @@ int main(int argc, char *argv[])
 						printf("Continued\n");
 					}
 				} while (!WIFEXITED(status) && !WIFSIGNALED(status));
-					break;
+			} else if (childpid1 == 0) {
-				}
+				/* CHILD ONE */
-
+				child1(fd, line);
-				break;			
+			} else {
+				perror(pname);
+				free(line);
+				exit(EXIT_FAILURE);
 			}
 		}