ignoring \r from firmware when existing

[svn42.git] / door_daemon / door_daemon.c

diff --git a/door_daemon/door_daemon.c b/door_daemon/door_daemon.c
index f7bb2f8..0f60c30 100644 (file)
--- a/door_daemon/door_daemon.c
+++ b/door_daemon/door_daemon.c
@@ -38,7 +38,6 @@
 #include "client_list.h"
 
 #include "daemon.h"
-#include "sysexec.h"
 
 int init_command_socket(const char* path)
 {
@@ -289,6 +288,9 @@ int process_door(read_buffer_t* buffer, int door_fd, cmd_t **cmd_q, client_t* cl
     if(buffer->buf[buffer->offset] == '\n') {
       buffer->buf[buffer->offset] = 0;
 
+      if(buffer->offset > 0 && buffer->buf[buffer->offset-1] == '\r')
+        buffer->buf[buffer->offset-1] = 0;
+
       log_printf(NOTICE, "door-firmware: %s", buffer->buf);      
 
       int cmd_fd = -1;