X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=src%2Fprocess1.c;h=9fdee30b55edb5020a3eb2c05201fa24154f44ca;hb=717e5b533ec94ef8f9a703bd4f019a2f45e138df;hp=9374646fb5ae6e4baf745486e96ac0fab2695425;hpb=1a182bf57e39422f23439520b40fc6007e991757;p=wsti_so.git

diff --git a/src/process1.c b/src/process1.c
index 9374646..9fdee30 100644
--- a/src/process1.c
+++ b/src/process1.c
@@ -5,9 +5,51 @@
 /* open/read/write/close */
 #include <fcntl.h>
 
+/* Signals handling.. */
+#include <signal.h>
+
 /** If buffer is too small to hold entire string, it is incremented by this value */
 #define BUFFER_STEP 16
 
+/** Buffer used to store line of characters */
+char * buffer = NULL;
+
+/** Named pipe used to communnicate with process2 */
+char * write_pipe = "/tmp/process1pipe";
+
+/** File descriptor of pipe */
+int file_descriptor;
+
+/**
+ * Handler for signals.
+ */
+void sig_handler(int signo)
+{
+	fprintf(stderr, "[%s] Received %s!\n", "process1", strsignal(signo));
+	if (signo == SIGUSR1) {
+	}
+	else if (signo == SIGTERM) {
+		fprintf(stderr, "[%s] > Releasing resources\n", "process1");
+		close(write_pipe);
+		unlink(write_pipe);
+
+		if (buffer) {
+			free(buffer);
+			buffer = NULL;
+		}
+		exit(0);
+	}
+	else if (signo == SIGTSTP) {
+		fprintf(stderr, "[%s] > Closing pipe\n", "process1");
+		close(write_pipe);
+		raise (SIGSTOP);
+	}
+	else if (signo == SIGCONT) {
+		fprintf(stderr, "[%s] > Opening pipe\n", "process1");
+		file_descriptor = open(write_pipe, O_WRONLY);
+	}
+}
+
 /**
  * Program reads entire lines of text from the standard input and pass them
  * to the process2 using created pipe.
@@ -16,9 +58,6 @@ int main(void) {
 	/** Currently fetched from stdin character */
 	int c;
 
-	/** Buffer used to store line of characters */
-	char * buffer = NULL;
-
 	/** Current buffer length*/
 	int buffer_length = 0;
 
@@ -31,16 +70,28 @@ int main(void) {
 	 */
 	char * tmp = NULL;
 
-	/** Named pipe used to communnicate with process2 */
-	char * fifo = "/tmp/process1fifo";
+	fprintf(stderr, "[%s] Init!\n", "process1");
+
+	/**
+	 * Register signals handled by process
+	 */
+	if (signal(SIGUSR1, sig_handler) == SIG_ERR) {
+		fprintf(stderr, "can't catch SIGUSR1\n");
+	}
+	if (signal(SIGTERM, sig_handler) == SIG_ERR) {
+		fprintf(stderr, "can't catch SIGTERM\n");
+	}
+	if (signal(SIGTSTP, sig_handler) == SIG_ERR) {
+		fprintf(stderr, "can't catch SIGTSTP\n");
+	}
+	if (signal(SIGCONT, sig_handler) == SIG_ERR) {
+		fprintf(stderr, "can't catch SIGCONT\n");
+	}
 
-	/** File descriptor of pipe */
-	int file_descriptor;
+	mkfifo(write_pipe, 0666);
 
-	mkfifo(fifo, 0666);
+	file_descriptor = open(write_pipe, O_WRONLY);
 
-	file_descriptor = open(fifo, O_WRONLY);
-	
 	do {
 		c = fgetc(stdin);
 
@@ -62,16 +113,17 @@ int main(void) {
 		}
 
 		/*
-		 * If there were no errors parse data.
+		 * If there were no errors or it was not just an empty newline:
+		 * parse data.
 		 */
-		if (c != EOF) {
+		if (c != EOF || ((i == 0) && (c == 10))) {
 			/* If newline has been found
 			 * return entire string and release the memory
 			 */
-			if (c == 10) {
+			if (c == 10 && (i != 0)) {
 				buffer[i] = '\n';
-				write(file_descriptor, buffer, ++buffer_length);
-				/*fprintf(stdout, "%s\n", buffer);*/
+				write(file_descriptor, buffer, strlen(buffer));
+				fprintf(stderr, "[%s] buffer: %s/%d\n", "process1", buffer, strlen(buffer));
 
 				buffer_length = 0;
 				i = 0;
@@ -87,7 +139,7 @@ int main(void) {
 				buffer = tmp;
 				buffer[i] = c;
 
-				/* Used for debug..*/
+				/* Used only for debugging..*/
 				/*
 				printf("c: %c/%d, i: %d, bl: %d\n", c, c, i, buffer_length);
 				*/
@@ -96,8 +148,9 @@ int main(void) {
 		}
 	} while(c != EOF);
 
-	close(fifo);
-	unlink(fifo);
+	/* Release resources in normal program flow exit. */
+	close(write_pipe);
+	unlink(write_pipe);
 
 	if (buffer) {
 		free(buffer);