cleaning

diff --git a/morep_server.c b/morep_server.c
index 6c28409bb358dc88a3ab6ac858e3df4089600290..f42a3f07ddeb3729dbc2ecba8a8fa5b9c557aef1 100644 (file)
--- a/morep_server.c
+++ b/morep_server.c
@@ -70,7 +70,7 @@ int server (char *url)
         int rxseqnum = MOREP_Receive (morep, &rxmsgtype);
         uint8_t *rxbuffer = MOREP_Get_Rx_Buffer (morep, &rxmsglen);
         VERBOSE (morep, INFO, PRINTF ("receive %d bytes (%d) [%d]\n", rxmsglen, rxmsgtype, rxseqnum));
-        VERBOSE (morep, INFO, PRINTF ("message: '%s'\n", (char *)rxbuffer));
+        VERBOSE (morep, INFO, PRINTF ("message: '"); fwrite ((char *)rxbuffer, 1, rxmsglen, stdout); printf ("'\n"));
 
         uint8_t *buffer = MOREP_Get_Tx_Buffer (morep, NULL);
         int txmsglen = strlen (words[i]);
@@ -124,7 +124,7 @@ int client (char *url, uint8_t txmsgtype, char *filename)
                 txbuffer[i] = 0;
             }
         } while ((txbuffer[i] != 0) && (++i < txmsglen));
-        if (i == 0) {
+        if ((i == 0) && feof (fid)) {
             continue;
         }
         txmsglen = i;
@@ -141,7 +141,7 @@ int client (char *url, uint8_t txmsgtype, char *filename)
         int rxseqnum = MOREP_Receive (morep, &rxmsgtype);
         uint8_t *rxbuffer = MOREP_Get_Rx_Buffer (morep, &rxmsglen);
         VERBOSE (morep, INFO, PRINTF ("receive %d bytes (%d) [%d]\n", rxmsglen, rxmsgtype, rxseqnum));
-        VERBOSE (morep, INFO, PRINTF ("message: '%s'\n", (char *)rxbuffer));
+        VERBOSE (morep, INFO, PRINTF ("message: '"); fwrite ((char *)rxbuffer, 1, rxmsglen, stdout); printf ("'\n"));
     }
 
     if (fid != stdin) {