diff options
Diffstat (limited to 'sysutils/cdrtools-devel/files/patch-cdda2wav::interface.c')
| -rw-r--r-- | sysutils/cdrtools-devel/files/patch-cdda2wav::interface.c | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/sysutils/cdrtools-devel/files/patch-cdda2wav::interface.c b/sysutils/cdrtools-devel/files/patch-cdda2wav::interface.c index 3183cc7116cc..6b4ae583dabc 100644 --- a/sysutils/cdrtools-devel/files/patch-cdda2wav::interface.c +++ b/sysutils/cdrtools-devel/files/patch-cdda2wav::interface.c @@ -1,19 +1,13 @@ --- cdda2wav/interface.c Mon Dec 29 11:28:09 2003 +++ cdda2wav/interface.c Sun Jan 18 01:35:50 2004 -@@ -444,7 +444,15 @@ +@@ -452,6 +452,10 @@ default: /* for example ATAPI cds */ #else - #if defined (__FreeBSD__) -- case 117: -+#if __FreeBSD_version >= 501113 -+ case 4: /* GEOM */ -+ if (memcmp(pdev_name, "/dev/acd", sizeof("/dev/acd") - 1) != 0) { -+ fprintf(stderr, "%s is not an ATAPI CDROM device\n", pdev_name); -+ exit(SYNTAX_ERROR); -+ } + #if defined (__FreeBSD__) || defined(__DragonFly__) ++#if __FreeBSD_version >= 600021 ++ case 0: /* majors abandoned */ + /* FALLTHROUGH */ +#endif -+ case 117: /* pre-GEOM atapi cd */ - if (!S_ISCHR(statstruct->st_mode)) { - fprintf(stderr, "%s is not a char device\n",pdev_name); - exit(SYNTAX_ERROR); + #if __FreeBSD_version >= 501113 + case 4: /* GEOM */ + /* FALLTHROUGH */ |