$NetBSD: patch-tapecopy.c,v 1.1 2011/05/01 23:28:59 ryoon Exp $ --- tapecopy.c.orig 2010-01-08 22:56:27.000000000 +0000 +++ tapecopy.c @@ -242,15 +242,21 @@ static void print_usage (void) static int obtain_status (char *devname, int devfd, struct mtget* mtget) { int rc; /* Return code */ +long gstat; rc = ioctl_tape (devfd, MTIOCGET, (char*)mtget); if (rc < 0) { +#if (defined(BSD) && BSD >= 199306) + gstat = (mtget->mt_dsreg << 16) | mtget->mt_erreg; +#else + gtat = mtget->mt_gstat; +#endif if (1 && EIO == errno && (0 - || GMT_EOD( mtget->mt_gstat ) - || GMT_EOT( mtget->mt_gstat ) + || GMT_EOD( gstat ) + || GMT_EOT( gstat ) ) ) return +1; @@ -260,8 +266,8 @@ int rc; return -1; } - if (GMT_EOD( mtget->mt_gstat ) || - GMT_EOT( mtget->mt_gstat )) + if (GMT_EOD( gstat ) || + GMT_EOT( gstat )) return +1; return 0; @@ -499,6 +505,7 @@ struct mtget mtget; struct mtpos mtpos; /* Area for MTIOCPOS ioctl */ int is3590 = 0; /* 1 == 3590, 0 == 3480/3490 */ #endif /*defined(EXTERNALGUI)*/ +long gstat; INITIALIZE_UTILITY("tapecopy"); @@ -636,8 +643,13 @@ int is3590 = 0; printf (_("HHCTC004I %s tape density code: 0x%lX\n"), (devnamein ? devnamein : devnameout), density); - if (mtget.mt_gstat != 0) - print_status ((devnamein ? devnamein : devnameout), mtget.mt_gstat); +#if (defined(BSD) && BSD >= 199306) + gstat = (mtget.mt_dsreg << 16) | mtget.mt_erreg; +#else + gstat = mtget.mt_gstat; +#endif + if (gstat != 0) + print_status ((devnamein ? devnamein : devnameout), gstat); /* Open the disk file */ if (filenamein)