diff --git a/example/C++/OO/iso3.cpp b/example/C++/OO/isofile.cpp similarity index 98% rename from example/C++/OO/iso3.cpp rename to example/C++/OO/isofile.cpp index c2f7787c..12df2d99 100644 --- a/example/C++/OO/iso3.cpp +++ b/example/C++/OO/isofile.cpp @@ -1,5 +1,5 @@ /* - $Id: iso3.cpp,v 1.2 2006/03/06 04:48:38 rocky Exp $ + $Id: isofile.cpp,v 1.1 2006/04/15 16:12:51 rocky Exp $ Copyright (C) 2006 Rocky Bernstein diff --git a/example/C++/OO/iso2.cpp b/example/C++/OO/isofile2.cpp similarity index 98% rename from example/C++/OO/iso2.cpp rename to example/C++/OO/isofile2.cpp index dd5ed051..af25e7bc 100644 --- a/example/C++/OO/iso2.cpp +++ b/example/C++/OO/isofile2.cpp @@ -1,5 +1,5 @@ /* - $Id: iso2.cpp,v 1.1 2006/03/06 21:54:56 rocky Exp $ + $Id: isofile2.cpp,v 1.1 2006/04/15 16:12:51 rocky Exp $ Copyright (C) 2006 Rocky Bernstein diff --git a/example/C++/OO/iso1.cpp b/example/C++/OO/isolist.cpp similarity index 98% rename from example/C++/OO/iso1.cpp rename to example/C++/OO/isolist.cpp index 114d462d..ef3d7b5d 100644 --- a/example/C++/OO/iso1.cpp +++ b/example/C++/OO/isolist.cpp @@ -1,5 +1,5 @@ /* - $Id: iso1.cpp,v 1.3 2006/03/07 19:55:11 rocky Exp $ + $Id: isolist.cpp,v 1.1 2006/04/15 16:12:51 rocky Exp $ Copyright (C) 2006 Rocky Bernstein diff --git a/example/C++/iso1.cpp b/example/C++/iso1.cpp deleted file mode 100644 index 36bbaed0..00000000 --- a/example/C++/iso1.cpp +++ /dev/null @@ -1,122 +0,0 @@ -/* - $Id: iso1.cpp,v 1.6 2006/03/06 04:48:37 rocky Exp $ - - Copyright (C) 2004, 2006 Rocky Bernstein - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -*/ - -/* Simple program to show using libiso9660 to list files in a directory of - an ISO-9660 image and give some iso9660 information. See the code - to iso-info for a more complete example. - - If a single argument is given, it is used as the ISO 9660 image to - use in the listing. Otherwise a compiled-in default ISO 9660 image - name (that comes with the libcdio distribution) will be used. - - This program can be compiled with either a C or C++ compiler. In - the distributuion we perfer C++ just to make sure we haven't broken - things on the C++ side. - */ - -/* Set up a CD-DA image to test on which is in the libcdio distribution. */ -#define ISO9660_IMAGE_PATH "../../" -#define ISO9660_IMAGE ISO9660_IMAGE_PATH "test/copying.iso" - -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif -#include - -#include - -#ifdef HAVE_STDLIB_H -#include -#endif -#ifdef HAVE_STRING_H -#include -#endif -#ifdef HAVE_UNISTD_H -#include -#endif -#ifdef HAVE_SYS_TYPES_H -#include -#endif - -#define print_vd_info(title, fn) \ - if (fn(p_iso, &psz_str)) { \ - printf(title ": %s\n", psz_str); \ - } \ - free(psz_str); \ - psz_str = NULL; - - -int -main(int argc, const char *argv[]) -{ - CdioList_t *p_entlist; - CdioListNode_t *p_entnode; - char const *psz_fname; - iso9660_t *p_iso; - const char *psz_path="/"; - - if (argc > 1) - psz_fname = argv[1]; - else - psz_fname = ISO9660_IMAGE; - - p_iso = iso9660_open (psz_fname); - - if (NULL == p_iso) { - fprintf(stderr, "Sorry, couldn't open %s as an ISO-9660 image\n", - psz_fname); - return 1; - } - - /* Show basic CD info from the Primary Volume Descriptor. */ - { - char *psz_str = NULL; - print_vd_info("Application", iso9660_ifs_get_application_id); - print_vd_info("Preparer ", iso9660_ifs_get_preparer_id); - print_vd_info("Publisher ", iso9660_ifs_get_publisher_id); - print_vd_info("System ", iso9660_ifs_get_system_id); - print_vd_info("Volume ", iso9660_ifs_get_volume_id); - print_vd_info("Volume Set ", iso9660_ifs_get_volumeset_id); - } - - p_entlist = iso9660_ifs_readdir (p_iso, psz_path); - - /* Iterate over the list of nodes that iso9660_ifs_readdir gives */ - - if (p_entlist) { - _CDIO_LIST_FOREACH (p_entnode, p_entlist) - { - char filename[4096]; - iso9660_stat_t *p_statbuf = - (iso9660_stat_t *) _cdio_list_node_data (p_entnode); - iso9660_name_translate(p_statbuf->filename, filename); - printf ("%s [LSN %6d] %8u %s%s\n", - 2 == p_statbuf->type ? "d" : "-", - p_statbuf->lsn, p_statbuf->size, psz_path, filename); - } - - _cdio_list_free (p_entlist, true); - } - - - iso9660_close(p_iso); - return 0; -} - diff --git a/example/C++/iso2.cpp b/example/C++/iso2.cpp deleted file mode 100644 index 1ec2fa48..00000000 --- a/example/C++/iso2.cpp +++ /dev/null @@ -1,179 +0,0 @@ -/* - $Id: iso2.cpp,v 1.7 2006/03/02 18:46:30 rocky Exp $ - - Copyright (C) 2003, 2004, 2005, 2006 Rocky Bernstein - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -*/ - -/* Simple program to show using libiso9660 to extract a file from a - CUE/BIN CD image. - - If a single argument is given, it is used as the CUE file of a CD image - to use. Otherwise a compiled-in default image name (that - comes with the libcdio distribution) will be used. - - This program can be compiled with either a C or C++ compiler. In - the distribution we prefer C++ just to make sure we haven't broken - things on the C++ side. - */ - -/* This is the CD-image with an ISO-9660 filesystem */ -#define ISO9660_IMAGE_PATH "../../" -#define ISO9660_IMAGE ISO9660_IMAGE_PATH "test/isofs-m1.cue" - -#define ISO9660_PATH "/" -#define ISO9660_FILENAME "COPYING" -#define LOCAL_FILENAME "copying" - -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - -#include "portable.h" - -#include -#include - -#ifdef HAVE_SYS_TYPES_H -#include -#endif -#ifdef HAVE_STDLIB_H -#include -#endif -#ifdef HAVE_STDIO_H -#include -#endif -#ifdef HAVE_ERRNO_H -#include -#endif -#ifdef HAVE_STRING_H -#include -#endif -#ifdef HAVE_UNISTD_H -#include -#endif -#ifdef HAVE_SYS_TYPES_H -#include -#endif - -#define CEILING(x, y) ((x+(y-1))/y) - -#define my_exit(rc) \ - fclose (p_outfd); \ - free(p_statbuf); \ - cdio_destroy(p_cdio); \ - return rc; \ - - -int -main(int argc, const char *argv[]) -{ - iso9660_stat_t *p_statbuf; - FILE *p_outfd; - unsigned int i; - char const *psz_image; - char const *psz_fname; - char translated_name[256]; - char untranslated_name[256] = ISO9660_PATH; - CdIo_t *p_cdio; - - if (argc > 3) { - printf("usage %s [CD-ROM-or-image [filename]]\n", argv[0]); - printf("Extracts filename from CD-ROM-or-image.\n"); - return 1; - } - - if (argc > 1) - psz_image = argv[1]; - else - psz_image = ISO9660_IMAGE; - - if (argc > 2) - psz_fname = argv[2]; - else - psz_fname = ISO9660_FILENAME; - - strcat(untranslated_name, psz_fname); - - p_cdio = cdio_open (psz_image, DRIVER_UNKNOWN); - if (!p_cdio) { - fprintf(stderr, "Sorry, couldn't open %s\n", psz_image); - return 1; - } - - p_statbuf = iso9660_fs_stat (p_cdio, untranslated_name); - - if (NULL == p_statbuf) - { - fprintf(stderr, - "Could not get ISO-9660 file information for file %s\n", - untranslated_name); - cdio_destroy(p_cdio); - return 2; - } - - iso9660_name_translate(psz_fname, translated_name); - - if (!(p_outfd = fopen (translated_name, "wb"))) - { - perror ("fopen()"); - cdio_destroy(p_cdio); - free(p_statbuf); - return 3; - } - - /* Copy the blocks from the ISO-9660 filesystem to the local filesystem. */ - { - const unsigned int i_blocks = CEILING(p_statbuf->size, ISO_BLOCKSIZE); - for (i = 0; i < i_blocks; i ++) - { - char buf[ISO_BLOCKSIZE]; - const lsn_t lsn = p_statbuf->lsn + i; - - memset (buf, 0, ISO_BLOCKSIZE); - - if ( 0 != cdio_read_data_sectors (p_cdio, buf, lsn, ISO_BLOCKSIZE, 1) ) - { - fprintf(stderr, "Error reading ISO 9660 file at lsn %lu\n", - (long unsigned int) p_statbuf->lsn); - my_exit(4); - } - - - fwrite (buf, ISO_BLOCKSIZE, 1, p_outfd); - - if (ferror (p_outfd)) - { - perror ("fwrite()"); - my_exit(5); - } - } - } - - - fflush (p_outfd); - - /* Make sure the file size has the exact same byte size. Without the - truncate below, the file will a multiple of ISO_BLOCKSIZE. - */ - if (ftruncate (fileno (p_outfd), p_statbuf->size)) - perror ("ftruncate()"); - - printf("Extraction of file '%s' from '%s' successful.\n", - translated_name, untranslated_name); - - my_exit(0); -} diff --git a/example/C++/iso3.cpp b/example/C++/isofile2.cpp similarity index 98% rename from example/C++/iso3.cpp rename to example/C++/isofile2.cpp index 341ba083..a0bd2bec 100644 --- a/example/C++/iso3.cpp +++ b/example/C++/isofile2.cpp @@ -1,5 +1,5 @@ /* - $Id: iso3.cpp,v 1.3 2006/03/02 18:46:30 rocky Exp $ + $Id: isofile2.cpp,v 1.1 2006/04/15 16:12:51 rocky Exp $ Copyright (C) 2004, 2006 Rocky Bernstein