[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.30 
graveman/current/src/cdrecord.c:1.31
--- graveman/current/src/cdrecord.c:1.30        Tue May 17 01:16:34 2005
+++ graveman/current/src/cdrecord.c     Sun May 22 11:20:41 2005
@@ -40,6 +40,7 @@
 #define CDRECORD_FIXATING "Fixating..."
 #define CDRECORD_BLANKING "Blanking "
 #define CDRECORD_BAD_RECORDER "Sorry, no CD/DVD-Recorder or unsupported 
CD/DVD-Recorder found"
+#define CDRECORD_CANNOT_OPEN "Cannot open"
 
 /* support du materiel */
 #define CDRECORD_NOT_READ_CD "Does not read CD-R media"
@@ -101,7 +102,13 @@
     { "dev=/dev/sg4", "/dev/sg4",  "SCSI-G", 94 },
     { "dev=/dev/sg5", "/dev/sg5",  "SCSI-G", 94 },
     { "dev=/dev/sg6", "/dev/sg6",  "SCSI-G", 94 },
-
+    { "dev=/dev/sga", "/dev/sga",  "SCSI-g", 96 },
+    { "dev=/dev/sgb", "/dev/sgb",  "SCSI-g", 96 },
+    { "dev=/dev/sgc", "/dev/sgc",  "SCSI-g", 96 },
+    { "dev=/dev/sgd", "/dev/sgd",  "SCSI-g", 96 },
+    { "dev=/dev/sge", "/dev/sge",  "SCSI-g", 96 },
+    { "dev=/dev/sgf", "/dev/sgf",  "SCSI-g", 96 },
+    { "dev=/dev/sgg", "/dev/sgg",  "SCSI-g", 96 },
 #endif
     { "dev=ATA:", "ATA:", "ATA", 60 }, /* ide sg */
     { "dev=ATAPI:", "ATAPI:", "ATAPI", 40 }, /* ide */
@@ -184,6 +191,11 @@
     
   g_strstrip(Lbuffer);  
 _DEB("scan lecteur = %s\n", Lbuffer);
+  if (strstr(Lbuffer, CDRECORD_CANNOT_OPEN)) {
+    *Lcont = 2;
+    return FALSE;
+  }
+
   if (cdrecord_extractlecteur(Lbuffer, &Ldev, &Lmarque, &Lmodel, &Lquoi) == 
TRUE) {
 
     matos_insert_or_update_drive(Ldev, Lmarque, Lmodel, Lquoi, Ldrivedesc);
@@ -265,15 +277,6 @@
   gint Lexit = 0;
   gboolean Lstatus;
 
-  {
-    GSList *ab;
-gchar *abla;
-for (ab = Adrive->dev; ab; ab = g_slist_next(ab)) {
-  abla = ab->data;
-  fprintf(stderr, "==>%s\n", abla);
-}
-  }
-
   Lcommandline = g_strdup_printf("%s -prcap dev=%s", 
conf_get_string("cdrecord"),
       Adev ? Adev : DRIVE_DEV(Adrive));