Attachment #305 for bug #3201

View | Details | Raw Unified | Return to bug 3201
Collapse All | Expand All





#ifdef CDIOREADTOCHEADER
    if(ioctl(disc->cd_desc,CDIOREADTOCHEADER,(char *)&cdth)<0) {
      g_print(_("Error: Failed to read disc contents\n"));
      
      return FALSE;
    }

#endif
#ifdef CDROMREADTOCHDR
    if(ioctl(disc->cd_desc,CDROMREADTOCHDR,&cdth)<0) {
      g_print(_("Error: Failed to read disc contents\n"));

      return FALSE;
    }

    cdte.data_len=sizeof(toc_buffer);
    
    if(ioctl(disc->cd_desc,CDIOREADTOCENTRYS,(char *)&cdte)<0) {
      g_print(_("Error: Failed to read disc contents\n"));

      return FALSE;
    }

      
      cdte.cdte_format=CDROM_MSF;
      if(ioctl(disc->cd_desc,CDROMREADTOCENTRY,&cdte) < 0) {
	g_print(_("Error: Failed to read disc contents\n"));

	return FALSE;
      }

  /*  always unlock door before an eject in case something else locked it  */
#if defined(CDROM_LOCKDOOR)
  if(ioctl(disc->cd_desc,CDROM_LOCKDOOR,0)<0)
    g_print(_("Unlock failed: %d"), errno);
#endif
#ifdef CDIOCALLOW
  if(ioctl(disc->cd_desc,CDIOCALLOW)<0)
    g_print(_("Unlock failed: %d"),errno);
#endif

  if(ioctl(disc->cd_desc,CDIOCEJECT)<0) {
    g_print(_("CDIOCEJECT"));
    return FALSE;
  }
#endif

Lines 222-228 Link Here

(-)grip-3.1.2.orig/src/cdplay.c (-1 / +1 lines)
222	success=TRUE;	222	success=TRUE;
223		223
224	if(DiscDBWriteDiscData(disc,ddata,NULL,TRUE,FALSE)<0)	224	if(DiscDBWriteDiscData(disc,ddata,NULL,TRUE,FALSE)<0)
225	printf(_("Error saving disc data\n"));	225	g_print(_("Error saving disc data\n"));
226		226
227	ginfo->update_required=TRUE;	227	ginfo->update_required=TRUE;
228	ginfo->is_new_disc=TRUE;	228	ginfo->is_new_disc=TRUE;

Lines 177-183 Link Here

(-)grip-3.1.2.orig/src/grip.c (-1 / +1 lines)
177	ginfo->do_redirect=!no_redirect;	177	ginfo->do_redirect=!no_redirect;
178		178
179	if(!CDInitDevice(ginfo->cd_device,&(ginfo->disc))) {	179	if(!CDInitDevice(ginfo->cd_device,&(ginfo->disc))) {
180	printf(_("Error: Unable to initialize [%s]\n"),ginfo->cd_device);	180	g_print(_("Error: Unable to initialize [%s]\n"),ginfo->cd_device);
181	exit(0);	181	exit(0);
182	}	182	}
183		183

Lines 284-290 Link Here

(-)grip-3.1.2.orig/src/id3.c (-1 / +1 lines)
284		284
285	default:	285	default:
286	/* Doh! */	286	/* Doh! */
287	fprintf( stderr,_("unknown ID3 field\n"));	287	g_printerr(_("unknown ID3 field\n"));
288	break;	288	break;
289	}	289	}
290		290

Lines 117-123 Link Here

(-)grip-3.1.2.orig/src/launch.c (-1 / +1 lines)
117	}	117	}
118		118
119	if(!pwd)	119	if(!pwd)
120	printf(_("Error: unable to translate filename. No such user as %s\n"),	120	g_print(_("Error: unable to translate filename. No such user as %s\n"),
121	tok);	121	tok);
122	else {	122	else {
123	g_string_sprintf(outstr,"%s",pwd->pw_dir);	123	g_string_sprintf(outstr,"%s",pwd->pw_dir);

Lines 132-142 Link Here

(-)grip-3.1.2.orig/src/main.c (-1 / +6 lines)
132	void Debug(char *fmt,...)	132	void Debug(char *fmt,...)
133	{	133	{
134	va_list args;	134	va_list args;
		135	char *msg;
135		136
136	if(do_debug) {	137	if(do_debug) {
137	va_start(args,fmt);	138	va_start(args,fmt);
138		139
139	vfprintf(stderr,fmt,args);	140	msg=g_strdup_vprintf(fmt,args);
		141	if(msg) {
		142	g_printerr(msg);
		143	g_free(msg);
		144	}
140	}	145	}
141		146
142	va_end(args);	147	va_end(args);

Lines 55-61 Link Here

(-)grip-3.1.2.orig/src/parsecfg.c (-2 / +2 lines)
55	((int )cfg[cfgent].destvar)=atoi(tok);	55	((int )cfg[cfgent].destvar)=atoi(tok);
56	break;	56	break;
57	default:	57	default:
58	printf(_("Error: Bad entry type\n"));	58	g_print(_("Error: Bad entry type\n"));
59	break;	59	break;
60	}	60	}
61		61
Lines 81-87 Link Here
81	tok=strtok(buf," ");	81	tok=strtok(buf," ");
82		82
83	if(!tok\|\|(strcasecmp(tok,name))) {	83	if(!tok\|\|(strcasecmp(tok,name))) {
84	printf(_("Error: Invalid config file\n"));	84	g_print(_("Error: Invalid config file\n"));
85		85
86	return -1;	86	return -1;
87	}	87	}

Return to bug 3201

Lines 268-274 Link Here

(-)grip-3.1.2.orig/src/cddev.c (-7 / +7 lines)
268		268
269	#ifdef CDIOREADTOCHEADER	269	#ifdef CDIOREADTOCHEADER
270	if(ioctl(disc->cd_desc,CDIOREADTOCHEADER,(char *)&cdth)<0) {	270	if(ioctl(disc->cd_desc,CDIOREADTOCHEADER,(char *)&cdth)<0) {
271	printf(_("Error: Failed to read disc contents\n"));	271	g_print(_("Error: Failed to read disc contents\n"));
272		272
273	return FALSE;	273	return FALSE;
274	}	274	}
Lines 277-283 Link Here
277	#endif	277	#endif
278	#ifdef CDROMREADTOCHDR	278	#ifdef CDROMREADTOCHDR
279	if(ioctl(disc->cd_desc,CDROMREADTOCHDR,&cdth)<0) {	279	if(ioctl(disc->cd_desc,CDROMREADTOCHDR,&cdth)<0) {
280	printf(_("Error: Failed to read disc contents\n"));	280	g_print(_("Error: Failed to read disc contents\n"));
281		281
282	return FALSE;	282	return FALSE;
283	}	283	}
Lines 294-300 Link Here
294	cdte.data_len=sizeof(toc_buffer);	294	cdte.data_len=sizeof(toc_buffer);
295		295
296	if(ioctl(disc->cd_desc,CDIOREADTOCENTRYS,(char *)&cdte)<0) {	296	if(ioctl(disc->cd_desc,CDIOREADTOCENTRYS,(char *)&cdte)<0) {
297	printf(_("Error: Failed to read disc contents\n"));	297	g_print(_("Error: Failed to read disc contents\n"));
298		298
299	return FALSE;	299	return FALSE;
300	}	300	}
Lines 321-327 Link Here
321		321
322	cdte.cdte_format=CDROM_MSF;	322	cdte.cdte_format=CDROM_MSF;
323	if(ioctl(disc->cd_desc,CDROMREADTOCENTRY,&cdte) < 0) {	323	if(ioctl(disc->cd_desc,CDROMREADTOCENTRY,&cdte) < 0) {
324	printf(_("Error: Failed to read disc contents\n"));	324	g_print(_("Error: Failed to read disc contents\n"));
325		325
326	return FALSE;	326	return FALSE;
327	}	327	}
Lines 612-626 Link Here
612	/* always unlock door before an eject in case something else locked it */	612	/* always unlock door before an eject in case something else locked it */
613	#if defined(CDROM_LOCKDOOR)	613	#if defined(CDROM_LOCKDOOR)
614	if(ioctl(disc->cd_desc,CDROM_LOCKDOOR,0)<0)	614	if(ioctl(disc->cd_desc,CDROM_LOCKDOOR,0)<0)
615	printf(_("Unlock failed: %d"), errno);	615	g_print(_("Unlock failed: %d"), errno);
616	#endif	616	#endif
617	#ifdef CDIOCALLOW	617	#ifdef CDIOCALLOW
618	if(ioctl(disc->cd_desc,CDIOCALLOW)<0)	618	if(ioctl(disc->cd_desc,CDIOCALLOW)<0)
619	printf(_("Unlock failed: %d"),errno);	619	g_print(_("Unlock failed: %d"),errno);
620	#endif	620	#endif
621		621
622	if(ioctl(disc->cd_desc,CDIOCEJECT)<0) {	622	if(ioctl(disc->cd_desc,CDIOCEJECT)<0) {
623	printf(_("CDIOCEJECT"));	623	g_print(_("CDIOCEJECT"));
624	return FALSE;	624	return FALSE;
625	}	625	}
626	#endif	626	#endif