Merge branch 'master' of ssh://vo20.nl/git/uva

os/ass3/Makefile

@@ -12,5 +12,5 @@ $(PROG): $(OFILES)
 	$(CC) $(CFLAGS) -o $@ -c $<
 
 clean:
-	$(RM) $(OFILES) $(PROG)
+	$(RM) $(OFILES) $(PROG) child.log*
 

os/ass3/fishbones.c

@@ -35,11 +35,6 @@ static void gup(FILE * log1, FILE * log2, int pipe_id[2], int myNumber)
 		/* Read next character from pipe */
 		if( read(pipe_id[0], &c, 1) <= 0 )
 		{
-			if( errno == EINTR )
-			{
-				continue;
-			}
-
 			/* Error while reading from the pipe, exit */
 			fprintf(log1, "Child %d read from pipe with error "
 			              "and exited\n", myNumber);