Changeset 2936 for branches/3.0/mondo/src/common/libmondo-devices.c

Timestamp:

01/28/12 01:26:17 (17 months ago)

Author:

bruno

Message:

• Improve again scanbus regexp analysis (using -E optin for grep)

File:

• branches/3.0/mondo/src/common/libmondo-devices.c (modified) (2 diffs)

branches/3.0/mondo/src/common/libmondo-devices.c

@@ -559 +559 @@
     if (find_home_of_exe(cdr_exe)) {
         sprintf(command,
-                "%s -scanbus 2> /dev/null | tr -s '\t' ' ' | grep \"[0-9]*,[0-9]*,[0-9]*\" | grep -v \"[0-9]*) \\*\" | grep '[D|C][V|D]' | cut -d' ' -f2 | head -n1",
+                "%s -scanbus 2> /dev/null | tr -s '\t' ' ' | grep \"[0-9]*,[0-9]*,[0-9]*\" | grep -v \"[0-9]*) \\*\" | grep -E '[D|C][V|D]' | cut -d' ' -f2 | head -n1",
                 cdr_exe);
         mr_asprintf(&tmp, "%s", call_program_and_get_last_line_of_output(command));
@@ -871 +871 @@
 
     sprintf(command,
-            "%s -scanbus | grep \"[0-9],[0-9],[0-9]\" | grep \"[D|C][V|D]\" | grep -n \"\" | grep \"%s\" | cut -d':' -f2",
+            "%s -scanbus | grep \"[0-9],[0-9],[0-9]\" | grep -E \"[D|C][V|D]\" | grep -n \"\" | grep \"%s\" | cut -d':' -f2",
             cdr_exe, g_cdrw_drive_is_here);
     log_msg(1, "command=%s", command);