/[graveman]/graveman/current/src/cdrecord.c
ViewVC logotype

Diff of /graveman/current/src/cdrecord.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.21 by scresto, Mon Feb 21 01:25:28 2005 UTC revision 1.22 by scresto, Sat Feb 26 12:23:36 2005 UTC
# Line 73  Tsearchdrive listesearchdrives[] = { Line 73  Tsearchdrive listesearchdrives[] = {
73      { "dev=/dev/hdd", "/dev/hdd", "IDE", 100 },      { "dev=/dev/hdd", "/dev/hdd", "IDE", 100 },
74  #endif  #endif
75  #if LINUX_SCSI  /* SCSI alias with linux */  #if LINUX_SCSI  /* SCSI alias with linux */
76      { "dev=/dev/scd0", "/dev/scd0", "SCSI", 90 },      { "dev=/dev/scd0", "/dev/scd0", "DSCSI", 90 },
77      { "dev=/dev/scd1", "/dev/scd0", "SCSI", 90 },      { "dev=/dev/scd1", "/dev/scd1", "DSCSI", 90 },
78      { "dev=/dev/scd2", "/dev/scd0", "SCSI", 90 },      { "dev=/dev/scd2", "/dev/scd2", "DSCSI", 90 },
79      { "dev=/dev/scd3", "/dev/scd0", "SCSI", 90 },      { "dev=/dev/scd3", "/dev/scd3", "DSCSI", 90 },
80      { "dev=/dev/scd4", "/dev/scd0", "SCSI", 90 },      { "dev=/dev/scd4", "/dev/scd4", "DSCSI", 90 },
81      { "dev=/dev/scd5", "/dev/scd0", "SCSI", 90 },      { "dev=/dev/scd5", "/dev/scd5", "DSCSI", 90 },
82      { "dev=/dev/scd6", "/dev/scd0", "SCSI", 90 },      { "dev=/dev/scd6", "/dev/scd6", "DSCSI", 90 },
83  #endif  #endif
84      { "", "", "SCSI", 80 }, /* scsi (sg) */      { "", "", "SCSI", 80 }, /* scsi (sg) */
85      { "dev=ATA:", "ATA:", "ATA", 60 }, /* ide sg */      { "dev=ATA:", "ATA:", "ATA", 60 }, /* ide sg */
# Line 185  gboolean scan_for_drives(Tgrave *Ag, GEr Line 185  gboolean scan_for_drives(Tgrave *Ag, GEr
185  {  {
186    gchar **Lcmd;    gchar **Lcmd;
187    gchar *Lcommandline;    gchar *Lcommandline;
188    gint Lpid, g_out, Lnbrarg;    gint Lpid, g_out, g_err, Lnbrarg;
189    gboolean Lbolstatus;    gboolean Lbolstatus;
190    GIOChannel *Lcom;    GIOChannel *Lcom;
191    gboolean Lstatus;    gboolean Lstatus;
# Line 195  gboolean scan_for_drives(Tgrave *Ag, GEr Line 195  gboolean scan_for_drives(Tgrave *Ag, GEr
195    gboolean *Labort = (gboolean *)sc_grave_get_data(Ag, "gabort");    gboolean *Labort = (gboolean *)sc_grave_get_data(Ag, "gabort");
196        
197    free_drives(FALSE);    free_drives(FALSE);
   
198    for (Lcurentry = listesearchdrives; Lcurentry->detectline && *Labort == FALSE; Lcurentry++) {    for (Lcurentry = listesearchdrives; Lcurentry->detectline && *Labort == FALSE; Lcurentry++) {
199      Lcommandline = g_strdup_printf("%s -scanbus %s", conf_get_string("cdrecord"), Lcurentry->detectline);      Lcommandline = g_strdup_printf("%s -scanbus %s", conf_get_string("cdrecord"), Lcurentry->detectline);
200    _DEB("commande =%s\n", Lcommandline);    _DEB("commande =%s\n", Lcommandline);
# Line 208  gboolean scan_for_drives(Tgrave *Ag, GEr Line 207  gboolean scan_for_drives(Tgrave *Ag, GEr
207    
208      Lbolstatus = g_spawn_async_with_pipes(NULL, Lcmd, NULL, /* env argument */      Lbolstatus = g_spawn_async_with_pipes(NULL, Lcmd, NULL, /* env argument */
209        (GSpawnFlags ) (0),        (GSpawnFlags ) (0),
210        NULL, NULL, &Lpid, NULL, &g_out, NULL, Aerror);        NULL, NULL, &Lpid, NULL, &g_out, &g_err, Aerror);
211      g_strfreev(Lcmd);      g_strfreev(Lcmd);
212        
213      if (Lbolstatus == FALSE) {      if (Lbolstatus == FALSE) {

Legend:
Removed from v.1.21  
changed lines
  Added in v.1.22

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26