Add support for configurations that have leading white space

ChangeLog

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

cmd.c

@@ -193,6 +193,8 @@ bool parse_command(struct videohub_data *d, char *cmd) {
 	}
 
 	if (!v) {
+		if (cmd[0] == '\n') // Do not report 'empty' commands
+			return false;
 		q("WARNING: Videohub sent unknown command!\n");
 		q("         Please report this command to author's email: georgi@unixsol.org\n");
 		q("         You may use -q or --quiet to suppress the message.\n");
@@ -343,10 +345,13 @@ bool parse_command(struct videohub_data *d, char *cmd) {
 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
+	// Clean input
+	char last_char = '\0';
 	for (r = 0; r < cmd_len; r++) {
-		if (_cmd_buffer[r] == '\r') continue;
+		if (_cmd_buffer[r] == '\r') continue; // Remove windows style line endings
+		if (last_char == '\n' && _cmd_buffer[r] == ' ') continue; // Trim leading white space from each line
 		cmd_buffer[cmd_buffer_pos++] = _cmd_buffer[r];
+		last_char = _cmd_buffer[r];
 	}
 	// The buffer contains only one command, no splitting is needed
 	if (!strstr(cmd_buffer, "\n\n")) {

test/input-r2.txt

@@ -0,0 +1,129 @@
+PROTOCOL PREAMBLE:
+                  Version: 2.7
+
+                              VIDEOHUB DEVICE:
+                                              Device present: true
+                                                                  Model name: Blackmagic Smart Videohub 20 x 20
+                                                                                                               Friendly name:      (2)            @
+                                                                                                                                                   Unique ID: XXXXXXXXXXXX
+                                                                                                                                                                          Video inputs: 20
+                                                                                                                                                                                          Video processing units: 0
+                                                                                                                                                                                                                   Video outputs: 20
+       Video monitoring outputs: 0
+                                  Serial ports: 0
+
+                                                 INPUT LABELS:
+                                                              0 Input 1
+                                                                       1 Input 2
+                                                                                2 Input 3
+                                                                                         3 Input 4
+                                                                                                  4 Input 5
+                                                                                                           5 Input 6
+                                                                                                                    6 Input 7
+                                                                                                                             7 Input 8
+                                                                                                                                      8 Input 9
+                                                                                                                                               9 Input 10
+                                                                                                                                                         10 Input 11
+                                                                                                                                                                    11 Input 12
+                                                                                                                                                                               12 Input 13
+                                                                                                                                                                                          13 Input 14
+                                                                                                                                                                                                     14 Input 15
+                                                                                                                                                                                                                15 Input 16
+                                                                                                                                                                                                                           16 Input 17
+         17 Input 18
+                    18 Input 19
+                               19 Input 20
+
+                                          OUTPUT LABELS:
+                                                        0 Output 1
+                                                                  1 Output 2
+                                                                            2 Output 3
+                                                                                      3 Output 4
+                                                                                                4 Output 5
+                                                                                                          5 Output 6
+                                                                                                                    6 Output 7
+                                                                                                                              7 Output 8
+                                                                                                                                        8 Output 9
+                                                                                                                                                  9 Output 10
+                                                                                                                                                             10 Output 11
+                                                                                                                                                                         11 Output 12
+                                                                                                                                                                                     12 Output 13
+                                                                                                                                                                                                 13 Output 14
+                                                                                                                                                                                                             14 Output 15
+                                                                                                                                                                                                                         15 Output 16
+        16 Output 17
+                    17 Output 18
+                                18 Output 19
+                                            19 Output 20
+
+                                                        VIDEO OUTPUT LOCKS:
+                                                                           0 U
+                                                                              1 U
+                                                                                 2 U
+                                                                                    3 U
+                                                                                       4 U
+                                                                                          5 U
+                                                                                             6 U
+                                                                                                7 U
+                                                                                                   8 U
+                                                                                                      9 U
+                                                                                                         10 U
+                                                                                                             11 U
+                                                                                                                 12 U
+                                                                                                                     13 U
+                                                                                                                         14 U
+                                                                                                                             15 U
+                                                                                                                                 16 U
+                                                                                                                                     17 U
+                                                                                                                                         18 U
+                                                                                                                                             19 U
+
+                                                                                                                                                 VIDEO OUTPUT ROUTING:
+                                                                                                                                                                      0 4
+                                                                                                                                                                         1 4
+                                                                                                                                                                            2 2
+                                                                                                                                                                               3 3
+                                                                                                                                                                                  4 4
+                                                                                                                                                                                     5 4
+                                                                                                                                                                                        6 4
+                                                                                                                                                                                           7 4
+                                                                                                                                                                                              8 14
+                                                                                                                                                                                                  9 9
+                                                                                                                                                                                                     10 10
+                                                                                                                                                                                                          11 11
+                                                                                                                                                                                                               12 8
+                                                                                                                                                                                                                   13 8
+                                                                                                                                                                                                                       14 14
+                                                                                                                                                                                                                            1
+5 4
+   16 16
+        17 17
+             18 14
+                  19 19
+
+                       CONFIGURATION:
+                                     Take Mode: true
+
+                                                    END PRELUDE:
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

test/run

@@ -160,3 +160,6 @@ 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"
+
+videohubctrl --test-input test/input-r2.txt $@ &> test/test-r2.out
+check test/test-r2 "Test input with leading whitespace and windows line endings"

test/test-r2.ok

@@ -0,0 +1,72 @@
+Device info
+  -------------------------------------------------------------------
+  | Device address             | sdi-matrix                         |
+  | Device port                | 9990                               |
+  | Model name                 | Blackmagic Smart Videohub 20 x     |
+  | Friendly name              |      (2)            @              |
+  | Unique ID                  | XXXXXXXXXXXX                       |
+  | Protocol                   | 2.7                                |
+  | Video inputs               | 20                                 |
+  | Video outputs              | 20                                 |
+  -------------------------------------------------------------------
+
+Video inputs
+  ----------------------------------------------------------------------
+  | ### | Video input name         | nn | Routed to output         | s |
+  ----------------------------------------------------------------------
+  |   1 | Input 1                  |  0 | -                        |   |
+  |   2 | Input 2                  |  0 | -                        |   |
+  |   3 | Input 3                  |  1 | Output 3                 |   |
+  |   4 | Input 4                  |  1 | Output 4                 |   |
+  |   5 | Input 5                  |  6 | Output 1                 |   |
+  |     |                          |    | Output 2                 |   |
+  |     |                          |    | Output 5                 |   |
+  |     |                          |    | Output 6                 |   |
+  |     |                          |    | Output 7                 |   |
+  |     |                          |    | Output 8                 |   |
+  |   6 | Input 6                  |  0 | -                        |   |
+  |   7 | Input 7                  |  0 | -                        |   |
+  |   8 | Input 8                  |  0 | -                        |   |
+  |   9 | Input 9                  |  2 | Output 13                |   |
+  |     |                          |    | Output 14                |   |
+  |  10 | Input 10                 |  1 | Output 10                |   |
+  |  11 | Input 11                 |  1 | Output 11                |   |
+  |  12 | Input 12                 |  1 | Output 12                |   |
+  |  13 | Input 13                 |  0 | -                        |   |
+  |  14 | Input 14                 |  0 | -                        |   |
+  |  15 | Input 15                 |  3 | Output 9                 |   |
+  |     |                          |    | Output 15                |   |
+  |     |                          |    | Output 19                |   |
+  |  16 | Input 16                 |  0 | -                        |   |
+  |  17 | Input 17                 |  1 | Output 17                |   |
+  |  18 | Input 18                 |  1 | Output 18                |   |
+  |  19 | Input 19                 |  0 | -                        |   |
+  |  20 | Input 20                 |  1 | Output 20                |   |
+  ----------------------------------------------------------------------
+
+Video outputs
+  ---------------------------------------------------------------------
+  | ### | x | Video output name        | Connected video input    | s |
+  ---------------------------------------------------------------------
+  |   1 |   | Output 1                 | Input 5                  |   |
+  |   2 |   | Output 2                 | Input 5                  |   |
+  |   3 |   | Output 3                 | Input 3                  |   |
+  |   4 |   | Output 4                 | Input 4                  |   |
+  |   5 |   | Output 5                 | Input 5                  |   |
+  |   6 |   | Output 6                 | Input 5                  |   |
+  |   7 |   | Output 7                 | Input 5                  |   |
+  |   8 |   | Output 8                 | Input 5                  |   |
+  |   9 |   | Output 9                 | Input 15                 |   |
+  |  10 |   | Output 10                | Input 10                 |   |
+  |  11 |   | Output 11                | Input 11                 |   |
+  |  12 |   | Output 12                | Input 12                 |   |
+  |  13 |   | Output 13                | Input 9                  |   |
+  |  14 |   | Output 14                | Input 9                  |   |
+  |  15 |   | Output 15                | Input 15                 |   |
+  |  16 |   | Output 16                |                          |   |
+  |  17 |   | Output 17                | Input 17                 |   |
+  |  18 |   | Output 18                | Input 18                 |   |
+  |  19 |   | Output 19                | Input 15                 |   |
+  |  20 |   | Output 20                | Input 20                 |   |
+  ---------------------------------------------------------------------
+