src/usr.bin/cdio/cdio.c - diff - 1.17

Return to cdio.c CVS log

Up to [local] / src / usr.bin / cdio

Diff for /src/usr.bin/cdio/cdio.c between version 1.16 and 1.17

version 1.16, 2001/06/22 14:26:36

version 1.17, 2001/08/14 00:01:56

Line 22

Line 22

*/

*/

#include <ctype.h>

#include <ctype.h>

#include <err.h>

#include <errno.h>

#include <stdio.h>

#include <stdio.h>

#include <stdlib.h>

#include <stdlib.h>

#include <string.h>

#include <string.h>

#include <unistd.h>

#include <unistd.h>

#include <util.h>

#include <util.h>

#include <err.h>

#include <vis.h>

#include <errno.h>

#include <sys/param.h>

#include <sys/param.h>

#include <sys/file.h>

#include <sys/file.h>

#include <sys/cdio.h>

#include <sys/cdio.h>

Line 810

Line 811

struct ioc_read_subchannel ss;

struct ioc_read_subchannel ss;

struct cd_sub_channel_info data;

struct cd_sub_channel_info data;

int rc, trk, m, s, f;

int rc, trk, m, s, f;

char vis_catalog[1 + 4 * 15];

rc = status (&trk, &m, &s, &f);

rc = status (&trk, &m, &s, &f);

if (rc >= 0) {

if (rc >= 0) {

Line 831

Line 833

printf("Media catalog is %sactive",

printf("Media catalog is %sactive",

ss.data->what.media_catalog.mc_valid ? "": "in");

ss.data->what.media_catalog.mc_valid ? "": "in");

if (ss.data->what.media_catalog.mc_valid &&

if (ss.data->what.media_catalog.mc_valid &&

ss.data->what.media_catalog.mc_number[0])

ss.data->what.media_catalog.mc_number[0]) {

printf(", number \"%.15s\"",

strvisx(vis_catalog,

ss.data->what.media_catalog.mc_number);

ss.data->what.media_catalog.mc_number,

15, VIS_SAFE);

printf(", number \"%.15s\"", vis_catalog);

}

putchar('\n');

putchar('\n');

} else

} else

printf("No media catalog info available\n");

printf("No media catalog info available\n");