Add support for parsing responses that contain \r symbols in them

Thanks to alex # dyaconov.com for the test data

ChangeLog

@@ -1,6 +1,7 @@
 |-----------------------------------------------------------------------|
 xxxx-xx-xx : Version -dev
  * Add parsing support for CONFIGURATION command
+ * Add support for input that contains Windows style line endings
  * Ignore 'END PRELUDE' command
 
 2014-12-08 : Version 2.0

cmd.c

@@ -340,10 +340,20 @@ bool parse_command(struct videohub_data *d, char *cmd) {
 	return ret;
 }
 
-int parse_text_buffer(struct videohub_data *d, char *cmd_buffer) {
+int parse_text_buffer(struct videohub_data *d, char *_cmd_buffer) {
+	int r, cmd_buffer_pos = 0, cmd_len = strlen(_cmd_buffer);
+	char *cmd_buffer = xzalloc(cmd_len + 1);
+	// Clean \r from output because it breaks parsing
+	for (r = 0; r < cmd_len; r++) {
+		if (_cmd_buffer[r] == '\r') continue;
+		cmd_buffer[cmd_buffer_pos++] = _cmd_buffer[r];
+	}
 	// The buffer contains only one command, no splitting is needed
-	if (!strstr(cmd_buffer, "\n\n"))
-		return parse_command(d, cmd_buffer);
+	if (!strstr(cmd_buffer, "\n\n")) {
+		bool ret = parse_command(d, cmd_buffer);
+		free(cmd_buffer);
+		return ret;
+	}
 	// Split commands and parse them one by one
 	int ok_commands = 0;
 	char *buf_copy = xstrdup(cmd_buffer);
@@ -361,6 +371,7 @@ int parse_text_buffer(struct videohub_data *d, char *cmd_buffer) {
 		cmd = newcmd + 2; // Advance cmd to the next command
 	}
 	free(buf_copy);
+	free(cmd_buffer);
 	return ok_commands;
 }
 

test/input-r.txt

@@ -0,0 +1,201 @@
+PROTOCOL PREAMBLE:
+Version: 2.4
+
+VIDEOHUB DEVICE:
+Device present: true
+Model name: Blackmagic Micro Videohub
+Friendly name: My Videohub
+Unique ID: 7c2e0d021714
+Video inputs: 16
+Video processing units: 4
+Video outputs: 16
+Video monitoring outputs: 4
+Serial ports: 8
+
+INPUT LABELS:
+0 Windows 1
+1 Windows 2
+2 Windows 3
+3 Windows 4 HD
+4 Input 5
+5 Input 6
+6 Input 7
+7 Input 8
+8 Input 9
+9 Input 10
+10 Input 11
+11 DPlay1
+12 DPlay2
+13 Input 14
+14 Input 15
+15 Loopback
+
+OUTPUT LABELS:
+0 Enc1 1
+1 Enc1 2
+2 Enc1 3
+3 Enc1 4
+4 Output 5
+5 Output 6
+6 Output 7
+7 Output 8
+8 Enc2 1
+9 Output 10
+10 Output 11
+11 Denc
+12 Output 13
+13 Output 14
+14 Output 15
+15 Loopback
+
+VIDEO OUTPUT LOCKS:
+0 L
+1 L
+2 L
+3 L
+4 U
+5 U
+6 U
+7 U
+8 L
+9 U
+10 U
+11 L
+12 O
+13 U
+14 U
+15 O
+
+VIDEO OUTPUT ROUTING:
+0 2
+1 1
+2 0
+3 0
+4 4
+5 5
+6 6
+7 3
+8 3
+9 9
+10 10
+11 12
+12 11
+13 13
+14 14
+15 15
+
+VIDEO INPUT STATUS:
+0 BNC
+1 BNC
+2 BNC
+3 BNC
+4 Optical
+5 Optical
+6 Optical
+7 Optical
+13 None
+14 None
+
+VIDEO OUTPUT STATUS:
+4 None
+5 None
+6 None
+8 BNC
+9 BNC
+10 BNC
+11 BNC
+12 Optical
+13 Optical
+14 Optical
+15 Optical
+
+MONITORING OUTPUT LABELS:
+0 Monitor 1
+1 Monitor 2
+2 Monitor 3
+3 Monitor 4
+
+VIDEO MONITORING OUTPUT ROUTING:
+0 0
+1 1
+2 2
+3 3
+
+MONITORING OUTPUT LOCKS:
+0 U
+1 O
+2 L
+3 U
+
+SERIAL PORT LABELS:
+0 Serial Ctrl 1
+1 Serial Ctrl 2
+2 Deck 3
+3 Deck 4
+4 Serial 5
+5 Serial 6
+6 Serial 7
+7 Serial 8
+
+SERIAL PORT ROUTING:
+0 2
+1 3
+2 5
+3 -1
+2 -1
+
+SERIAL PORT LOCKS:
+0 O
+1 U
+2 L
+3 U
+
+SERIAL PORT STATUS:
+0 RS422
+1 RS422
+2 RS422
+3 RS422
+6 None
+7 None
+
+SERIAL PORT DIRECTIONS:
+0 control
+1 auto
+2 slave
+3 auto
+4 auto
+5 auto
+6 control
+7 slave
+
+PROCESSING UNIT ROUTING:
+0 3
+1 1
+3 2
+
+PROCESSING UNIT LOCKS:
+0 L
+1 U
+2 O
+3 U
+
+FRAME LABELS:
+0 Frame 1
+1 Frame 2
+2 Frame 3
+3 Frame 4
+4 Frame 5
+5 Frame 6
+6 Frame 7
+7 Frame 8
+
+FRAME BUFFER ROUTING:
+0 12
+1 13
+2 14
+
+FRAME BUFFER LOCKS:
+0 U
+1 L
+2 O
+

test/run

@@ -157,3 +157,6 @@ check test/test-18 "Test --list-proc-units option output"
 
 videohubctrl --test-input test/input-00.txt --list-frames $@ &> test/test-19.out
 check test/test-19 "Test --list-frames option output"
+
+videohubctrl --test-input test/input-r.txt $@ &> test/test-r.out
+check test/test-r "Test input with windows line endings"

test/test-r.ok

@@ -0,0 +1,109 @@
+Device info
+  -------------------------------------------------------------------
+  | Device address             | sdi-matrix                         |
+  | Device port                | 9990                               |
+  | Model name                 | Blackmagic Micro Videohub          |
+  | Friendly name              | My Videohub                        |
+  | Unique ID                  | 7c2e0d021714                       |
+  | Protocol                   | 2.4                                |
+  | Video inputs               | 16                                 |
+  | Video outputs              | 16                                 |
+  | Serial ports               | 8                                  |
+  | Video processing units     | 4                                  |
+  | Video monitoring outputs   | 4                                  |
+  -------------------------------------------------------------------
+
+Video inputs
+  ----------------------------------------------------------------------
+  | ### | Video input name         | nn | Routed to output         | s |
+  ----------------------------------------------------------------------
+  |   1 | Windows 1                |  2 | Enc1 3                   | B |
+  |     |                          |    | Enc1 4                   |   |
+  |   2 | Windows 2                |  1 | Enc1 2                   | B |
+  |   3 | Windows 3                |  1 | Enc1 1                   | B |
+  |   4 | Windows 4 HD             |  2 | Output 8                 | B |
+  |     |                          |    | Enc2 1                   |   |
+  |   5 | Input 5                  |  1 | Output 5                 | o |
+  |   6 | Input 6                  |  1 | Output 6                 | o |
+  |   7 | Input 7                  |  1 | Output 7                 | o |
+  |   8 | Input 8                  |  0 | -                        | o |
+  |   9 | Input 9                  |  0 | -                        |   |
+  |  10 | Input 10                 |  1 | Output 10                |   |
+  |  11 | Input 11                 |  1 | Output 11                |   |
+  |  12 | DPlay1                   |  1 | Output 13                |   |
+  |  13 | DPlay2                   |  1 | Denc                     |   |
+  |  14 | Input 14                 |  1 | Output 14                | x |
+  |  15 | Input 15                 |  1 | Output 15                | x |
+  |  16 | Loopback                 |  1 | Loopback                 |   |
+  ----------------------------------------------------------------------
+
+Video outputs
+  ---------------------------------------------------------------------
+  | ### | x | Video output name        | Connected video input    | s |
+  ---------------------------------------------------------------------
+  |   1 | L | Enc1 1                   | Windows 3                |   |
+  |   2 | L | Enc1 2                   | Windows 2                |   |
+  |   3 | L | Enc1 3                   | Windows 1                |   |
+  |   4 | L | Enc1 4                   | Windows 1                |   |
+  |   5 |   | Output 5                 | Input 5                  | x |
+  |   6 |   | Output 6                 | Input 6                  | x |
+  |   7 |   | Output 7                 | Input 7                  | x |
+  |   8 |   | Output 8                 | Windows 4 HD             |   |
+  |   9 | L | Enc2 1                   | Windows 4 HD             | B |
+  |  10 |   | Output 10                | Input 10                 | B |
+  |  11 |   | Output 11                | Input 11                 | B |
+  |  12 | L | Denc                     | DPlay2                   | B |
+  |  13 | O | Output 13                | DPlay1                   | o |
+  |  14 |   | Output 14                | Input 14                 | o |
+  |  15 |   | Output 15                | Input 15                 | o |
+  |  16 | O | Loopback                 | Loopback                 | o |
+  ---------------------------------------------------------------------
+
+Monitoring outputs
+  -----------------------------------------------------------------
+  | ### | x | Monitoring output name   | Connected video input    |
+  -----------------------------------------------------------------
+  |   1 |   | Monitor 1                | Windows 1                |
+  |   2 | O | Monitor 2                | Windows 2                |
+  |   3 | L | Monitor 3                | Windows 3                |
+  |   4 |   | Monitor 4                | Windows 4 HD             |
+  -----------------------------------------------------------------
+
+Serial ports
+  ----------------------------------------------------------------
+  | ### | x | Dir  | Serial port        | Connected serial   | s |
+  ----------------------------------------------------------------
+  |   1 | O |   in | Serial Ctrl 1      | Deck 3             | 4 |
+  |   2 |   | auto | Serial Ctrl 2      | Deck 4             | 4 |
+  |   3 | L |  out | Deck 3             |                    | 4 |
+  |   4 |   | auto | Deck 4             |                    | 4 |
+  |   5 |   | auto | Serial 5           |                    |   |
+  |   6 |   | auto | Serial 6           |                    |   |
+  |   7 |   |   in | Serial 7           |                    | x |
+  |   8 |   |  out | Serial 8           |                    | x |
+  ----------------------------------------------------------------
+
+Processing units
+  --------------------------------------------
+  | Proc Unit | x | Connected video input    |
+  --------------------------------------------
+  |         1 | L | Windows 4 HD             |
+  |         2 |   | Windows 2                |
+  |         3 | O |                          |
+  |         4 |   | Windows 3                |
+  --------------------------------------------
+
+Frames
+  -----------------------------------------------------------------
+  | ### | x | Frame name               | Connected output         |
+  -----------------------------------------------------------------
+  |   1 |   | Frame 1                  | Output 13                |
+  |   2 | L | Frame 2                  | Output 14                |
+  |   3 | O | Frame 3                  | Output 15                |
+  |   4 |   | Frame 4                  |                          |
+  |   5 |   | Frame 5                  |                          |
+  |   6 |   | Frame 6                  |                          |
+  |   7 |   | Frame 7                  |                          |
+  |   8 |   | Frame 8                  |                          |
+  -----------------------------------------------------------------
+