===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cdio/cdio.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -c -r1.50 -r1.51
*** src/usr.bin/cdio/cdio.c	2006/06/01 07:12:18	1.50
--- src/usr.bin/cdio/cdio.c	2006/06/01 07:53:01	1.51
***************
*** 1,4 ****
! /*	$OpenBSD: cdio.c,v 1.50 2006/06/01 07:12:18 mjc Exp $	*/
  
  /*  Copyright (c) 1995 Serge V. Vakulenko
   * All rights reserved.
--- 1,4 ----
! /*	$OpenBSD: cdio.c,v 1.51 2006/06/01 07:53:01 deraadt Exp $	*/
  
  /*  Copyright (c) 1995 Serge V. Vakulenko
   * All rights reserved.
***************
*** 192,198 ****
  	int i;
  
  	for (c=cmdtab; c->name; ++c) {
! 		if (! c->args)
  			continue;
  		printf("\t");
  		for (i = c->min, s = c->name; *s; s++, i--) {
--- 192,198 ----
  	int i;
  
  	for (c=cmdtab; c->name; ++c) {
! 		if (!c->args)
  			continue;
  		printf("\t");
  		for (i = c->min, s = c->name; *s; s++, i--) {
***************
*** 232,238 ****
  	char type;
  
  	cdname = getenv("DISC");
! 	if (! cdname)
  		cdname = getenv("CDROM");
  
  	cddb_host = getenv("CDDB");
--- 232,238 ----
  	char type;
  
  	cdname = getenv("DISC");
! 	if (!cdname)
  		cdname = getenv("CDROM");
  
  	cddb_host = getenv("CDDB");
***************
*** 263,269 ****
  	if (argc > 0 && ! strcasecmp(*argv, "help"))
  		usage();
  
! 	if (! cdname) {
  		cdname = DEFAULT_CD_DRIVE;
  		fprintf(stderr,
  		    "No CD device name specified. Defaulting to %s.\n", cdname);
--- 263,269 ----
  	if (argc > 0 && ! strcasecmp(*argv, "help"))
  		usage();
  
! 	if (!cdname) {
  		cdname = DEFAULT_CD_DRIVE;
  		fprintf(stderr,
  		    "No CD device name specified. Defaulting to %s.\n", cdname);
***************
*** 314,320 ****
  				SLIST_INSERT_AFTER(cur_track,tr,track_list);
  			cur_track = tr;
  		}
! 		if (! open_cd(cdname, 1))
  			exit(1);
  		get_disc_size(&availblk);
  		SLIST_FOREACH(tr, &tracks, track_list) {
--- 314,320 ----
  				SLIST_INSERT_AFTER(cur_track,tr,track_list);
  			cur_track = tr;
  		}
! 		if (!open_cd(cdname, 1))
  			exit(1);
  		get_disc_size(&availblk);
  		SLIST_FOREACH(tr, &tracks, track_list) {
***************
*** 441,450 ****
  		if (fd < 0 && ! open_cd(cdname, 0))
  			return (0);
  
! 		if (! strcasecmp(arg, "on"))
  			return ioctl(fd, CDIOCSETDEBUG);
  
! 		if (! strcasecmp(arg, "off"))
  			return ioctl(fd, CDIOCCLRDEBUG);
  
  		printf("%s: Invalid command arguments\n", __progname);
--- 441,450 ----
  		if (fd < 0 && ! open_cd(cdname, 0))
  			return (0);
  
! 		if (!strcasecmp(arg, "on"))
  			return ioctl(fd, CDIOCSETDEBUG);
  
! 		if (!strcasecmp(arg, "off"))
  			return ioctl(fd, CDIOCCLRDEBUG);
  
  		printf("%s: Invalid command arguments\n", __progname);
***************
*** 465,471 ****
  		}
  
  		/* open new device */
! 		if (! open_cd(arg, 0))
  			return (0);
  		(void) strlcpy(newcdname, arg, sizeof(newcdname));
  		cdname = newcdname;
--- 465,471 ----
  		}
  
  		/* open new device */
! 		if (!open_cd(arg, 0))
  			return (0);
  		(void) strlcpy(newcdname, arg, sizeof(newcdname));
  		cdname = newcdname;
***************
*** 615,621 ****
  		rc--;
  	}
  
! 	if (! arg || ! *arg) {
  		/* Play the whole disc */
  		return (play_track(h.starting_track, 1, h.ending_track, 1));
  	}
--- 615,621 ----
  		rc--;
  	}
  
! 	if (!arg || ! *arg) {
  		/* Play the whole disc */
  		return (play_track(h.starting_track, 1, h.ending_track, 1));
  	}
***************
*** 940,946 ****
  		}
  
  		if (trk < h.starting_track)
! 			return play_track(h.starting_track, 1, 
  			    h.ending_track + 1, 1);
  		return play_track(trk, 1, h.ending_track, 1);
  	}
--- 940,946 ----
  		}
  
  		if (trk < h.starting_track)
! 			return play_track(h.starting_track, 1,
  			    h.ending_track + 1, 1);
  		return play_track(trk, 1, h.ending_track, 1);
  	}
***************
*** 1355,1361 ****
  	return ioctl(fd, CDIOCPLAYMSF, (char *) &a);
  }
  
! int 
  status(int *trk, int *min, int *sec, int *frame)
  {
  	struct ioc_read_subchannel s;
--- 1355,1361 ----
  	return ioctl(fd, CDIOCPLAYMSF, (char *) &a);
  }
  
! int
  status(int *trk, int *min, int *sec, int *frame)
  {
  	struct ioc_read_subchannel s;
***************
*** 1431,1437 ****
  		continue;
  
  	len = p - buf;
! 	if (! len)
  		return (0);
  
  	if (*p) {		/* It must be a spacing character! */
--- 1431,1437 ----
  		continue;
  
  	len = p - buf;
! 	if (!len)
  		return (0);
  
  	if (*p) {		/* It must be a spacing character! */
***************
*** 1446,1452 ****
  	*cmd = -1;
  	for (c=cmdtab; c->name; ++c) {
  		/* Is it an exact match? */
! 		if (! strcasecmp(buf, c->name)) {
    			*cmd = c->command;
    			break;
  		}
--- 1446,1452 ----
  	*cmd = -1;
  	for (c=cmdtab; c->name; ++c) {
  		/* Is it an exact match? */
! 		if (!strcasecmp(buf, c->name)) {
    			*cmd = c->command;
    			break;
  		}