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

[sylvain cresto]

Index: graveman/current/src/dvdrwmediainfo.c
diff -u graveman/current/src/dvdrwmediainfo.c:1.5 
graveman/current/src/dvdrwmediainfo.c:1.6
--- graveman/current/src/dvdrwmediainfo.c:1.5   Tue Mar 29 00:10:26 2005
+++ graveman/current/src/dvdrwmediainfo.c       Thu Mar 31 22:14:12 2005
@@ -49,9 +49,12 @@
   gint Lloccont = 2;
   gint *Lpid = (gint *)sc_grave_get_data(Ag, "pid");
   GString *Loutput;
+  gchar *Ldvdprg = conf_get_string("dvd+rw-mediainfo");
+  gchar *Ldevicestr = get_dvdrwtools_bus(Adevice);
 
-  g_snprintf(Lcommandline, sizeof(Lcommandline)-1, "%s %s", 
conf_get_string("dvd+rw-mediainfo"),
-      get_dvdrwtools_bus(Adevice));
+  if (!Ldvdprg || !Ldevicestr || !*Ldvdprg || !*Ldevicestr) return 0;
+  
+  g_snprintf(Lcommandline, sizeof(Lcommandline)-1, "%s %s", Ldvdprg, 
Ldevicestr);
 _DEB("execution de [%s]\n", Lcommandline);
   if (!g_shell_parse_argv(Lcommandline, &Lnbrarg, &Lcmd, Aerror)) return 0;
 
@@ -83,30 +86,33 @@
   g_io_channel_shutdown(Lcom, FALSE, NULL);
   g_io_channel_unref(Lcom);
   g_spawn_close_pid(*Lpid);
-printf(" LU = >%s\n", Loutput->str);  
-  Larrbuf = g_strsplit(Loutput->str, "\n", 0);
-
-  for (i=0; Larrbuf[i]; i++) {
-    if (!*Larrbuf[i]) continue;
 
-    if (!strncmp(Larrbuf[i], DVDRWMEDIAINFO_MEDIA, 
strlen(DVDRWMEDIAINFO_MEDIA)-1)) {
-      if (strstr(Larrbuf[i], DVDRWMEDIAINFO_DVDPRW)) {
-        Llu |= _MEDIA_DVDPRW;
-        Llu |= _MEDIA_DVDRew;
-      } else if (strstr(Larrbuf[i], DVDRWMEDIAINFO_DVDMRW)) {
-        Llu |= _MEDIA_DVDMRW;
-        Llu |= _MEDIA_DVDRew;
-      } else if (strstr(Larrbuf[i], DVDRWMEDIAINFO_DVDR)) {
-        Llu |= _MEDIA_DVDR;
-        Llu |= _MEDIA_DVDRew;
-      } else if (strstr(Larrbuf[i], DVDRWMEDIAINFO_DVD)) {
-        Llu |= _MEDIA_DVD;
-      }
-    } else if (!strncmp(Larrbuf[i], DVDRWMEDIAINFO_DISCSTATUS, 
strlen(DVDRWMEDIAINFO_DISCSTATUS)-1)) {
-      if (strstr(Larrbuf[i], DVDRWMEDIAINFO_BLANK)) {
-        Llu |= _MEDIA_BLANK;
-      } else {
-        Llu |= _MEDIA_NOBLANK;
+  _DEB("Lu => [%s]\n", Loutput->str);
+  if (Loutput->str) {
+    Larrbuf = g_strsplit(Loutput->str, "\n", 0);
+
+    for (i=0; Larrbuf[i]; i++) {
+      if (!*Larrbuf[i]) continue;
+
+      if (!strncmp(Larrbuf[i], DVDRWMEDIAINFO_MEDIA, 
strlen(DVDRWMEDIAINFO_MEDIA)-1)) {
+        if (strstr(Larrbuf[i], DVDRWMEDIAINFO_DVDPRW)) {
+          Llu |= _MEDIA_DVDPRW;
+          Llu |= _MEDIA_DVDRew;
+        } else if (strstr(Larrbuf[i], DVDRWMEDIAINFO_DVDMRW)) {
+          Llu |= _MEDIA_DVDMRW;
+          Llu |= _MEDIA_DVDRew;
+        } else if (strstr(Larrbuf[i], DVDRWMEDIAINFO_DVDR)) {
+          Llu |= _MEDIA_DVDR;
+          Llu |= _MEDIA_DVDRew;
+        } else if (strstr(Larrbuf[i], DVDRWMEDIAINFO_DVD)) {
+          Llu |= _MEDIA_DVD;
+        }
+      } else if (!strncmp(Larrbuf[i], DVDRWMEDIAINFO_DISCSTATUS, 
strlen(DVDRWMEDIAINFO_DISCSTATUS)-1)) {
+        if (strstr(Larrbuf[i], DVDRWMEDIAINFO_BLANK)) {
+          Llu |= _MEDIA_BLANK;
+        } else {
+          Llu |= _MEDIA_NOBLANK;
+        }
       }
     }