[Graveman-cvs] Changes to graveman/current/src/cdrecord.c

[sylvain cresto]

Index: graveman/current/src/cdrecord.c
diff -u graveman/current/src/cdrecord.c:1.21 
graveman/current/src/cdrecord.c:1.22
--- graveman/current/src/cdrecord.c:1.21        Mon Feb 21 01:25:28 2005
+++ graveman/current/src/cdrecord.c     Sat Feb 26 12:23:36 2005
@@ -73,13 +73,13 @@
     { "dev=/dev/hdd", "/dev/hdd", "IDE", 100 },
 #endif
 #if LINUX_SCSI  /* SCSI alias with linux */
-    { "dev=/dev/scd0", "/dev/scd0", "SCSI", 90 },
-    { "dev=/dev/scd1", "/dev/scd0", "SCSI", 90 },
-    { "dev=/dev/scd2", "/dev/scd0", "SCSI", 90 },
-    { "dev=/dev/scd3", "/dev/scd0", "SCSI", 90 },
-    { "dev=/dev/scd4", "/dev/scd0", "SCSI", 90 },
-    { "dev=/dev/scd5", "/dev/scd0", "SCSI", 90 },
-    { "dev=/dev/scd6", "/dev/scd0", "SCSI", 90 },
+    { "dev=/dev/scd0", "/dev/scd0", "DSCSI", 90 },
+    { "dev=/dev/scd1", "/dev/scd1", "DSCSI", 90 },
+    { "dev=/dev/scd2", "/dev/scd2", "DSCSI", 90 },
+    { "dev=/dev/scd3", "/dev/scd3", "DSCSI", 90 },
+    { "dev=/dev/scd4", "/dev/scd4", "DSCSI", 90 },
+    { "dev=/dev/scd5", "/dev/scd5", "DSCSI", 90 },
+    { "dev=/dev/scd6", "/dev/scd6", "DSCSI", 90 },
 #endif
     { "", "", "SCSI", 80 }, /* scsi (sg) */
     { "dev=ATA:", "ATA:", "ATA", 60 }, /* ide sg */
@@ -185,7 +185,7 @@
 {
   gchar **Lcmd;
   gchar *Lcommandline;
-  gint Lpid, g_out, Lnbrarg;
+  gint Lpid, g_out, g_err, Lnbrarg;
   gboolean Lbolstatus;
   GIOChannel *Lcom;
   gboolean Lstatus;
@@ -195,7 +195,6 @@
   gboolean *Labort = (gboolean *)sc_grave_get_data(Ag, "gabort");
   
   free_drives(FALSE);
-
   for (Lcurentry = listesearchdrives; Lcurentry->detectline && *Labort == 
FALSE; Lcurentry++) {
     Lcommandline = g_strdup_printf("%s -scanbus %s", 
conf_get_string("cdrecord"), Lcurentry->detectline);
   _DEB("commande =%s\n", Lcommandline);
@@ -208,7 +207,7 @@
 
     Lbolstatus = g_spawn_async_with_pipes(NULL, Lcmd, NULL, /* env argument */
       (GSpawnFlags ) (0),
-      NULL, NULL, &Lpid, NULL, &g_out, NULL, Aerror);
+      NULL, NULL, &Lpid, NULL, &g_out, &g_err, Aerror);
     g_strfreev(Lcmd);
   
     if (Lbolstatus == FALSE) {