diff --git a/MSVC/cd-info.vcproj b/MSVC/cd-info.vcproj index bd45e972..e3581358 100644 --- a/MSVC/cd-info.vcproj +++ b/MSVC/cd-info.vcproj @@ -339,18 +339,6 @@ - - - - - - - - @@ -362,9 +350,6 @@ - - diff --git a/Makefile.am b/Makefile.am index bc29a5fd..72b3e184 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -# $Id: Makefile.am,v 1.35 2005/02/05 23:16:34 rocky Exp $ +# $Id: Makefile.am,v 1.36 2005/10/05 09:48:11 rocky Exp $ # # Copyright (C) 2003, 2004 Rocky Bernstein # @@ -20,7 +20,7 @@ ## which configure then turns into a Makefile ... ## which make can then use to produce stuff. Isn't configuration simple? -EXTRA_DIST = libpopt.m4 THANKS README.libcdio \ +EXTRA_DIST = THANKS README.libcdio \ package/libcdio.spec.in package/libcdio.spec \ libcdio.pc.in libcdio.pc \ libcdio_cdda.pc.in libcdio_cdda.pc \ diff --git a/THANKS b/THANKS index f84db863..3f0210bf 100644 --- a/THANKS +++ b/THANKS @@ -1,3 +1,6 @@ +Burkhard Plaum + some GNU/Linux and CD-Text patches + Diego 'Flameeyes' Pettenò patches to FreeBSD and making Gentoo-friendly @@ -30,8 +33,9 @@ Michael Kukat , Nicolas Boullis Build issues, library symbol versioning, Debian packaging and issues -Burkhard Plaum - some GNU/Linux and CD-Text patches +Peter J. Creath + removal of libpopt, paranoia documentation, some bug fixes to + cd-* programs and the paranoia lib Steven M. Schultz All things BSDI and the use of a really fabulous Darwin G5 box. diff --git a/configure.ac b/configure.ac index 2655fa5c..1df7a8a9 100644 --- a/configure.ac +++ b/configure.ac @@ -19,7 +19,7 @@ define(RELEASE_NUM, 77) define(CDIO_VERSION_STR, 0.$1cvs) AC_PREREQ(2.52) -AC_REVISION([$Id: configure.ac,v 1.172 2005/09/30 01:10:54 rocky Exp $])dnl +AC_REVISION([$Id: configure.ac,v 1.173 2005/10/05 09:48:11 rocky Exp $])dnl AC_INIT(libcdio, CDIO_VERSION_STR(RELEASE_NUM)) AC_CONFIG_SRCDIR(src/cd-info.c) @@ -152,14 +152,6 @@ AC_SUBST(CMP) AC_PATH_PROG(OLD_CDPARANOIA, cdparanoia, no) AC_SUBST(OLD_CDPARANOIA) -AM_PATH_LIBPOPT(, - [AC_MSG_WARN([Diagnostic programs cd-drive, cd-info, cd-read, iso-info, and is-read will not get built.]) - enable_cd_info=no; - enable_cd_drive=no; - enable_cd_read=no; - enable_iso_info=no; - enable_iso_read=no]) - AC_DEFINE(LIBCDIO_CONFIG_H, 1, [Is set when libcdio's config.h has been included. Applications wishing to sue their own config.h values (such as set by the application's configure script can define this before including any of libcdio's headers.]) @@ -168,9 +160,12 @@ dnl headers AC_HEADER_STDC AC_CHECK_HEADERS(errno.h fcntl.h glob.h pwd.h) AC_CHECK_HEADERS(stdarg.h stdbool.h stdio.h sys/cdio.h sys/param.h) - AC_CHECK_HEADERS(ncurses.h curses.h, break, [enable_cdda_player='no']) +dnl FreeBSD 4 has getopt in unistd.h. So we include that before +dnl getopt.h +AC_CHECK_HEADERS(unistd.h getopt.h) + AC_SUBST(SBPCD_H) AC_SUBST(UCDROM_H) AC_SUBST(TYPESIZES) @@ -188,38 +183,6 @@ AC_TRY_COMPILE([],[_Pragma("pack(1)")], [ ],ISOC99_PRAGMA=no) AC_MSG_RESULT($ISOC99_PRAGMA) -## -## Check for GNU getopt_long() -## -AC_MSG_CHECKING(for GNU getopt_long) -AC_TRY_RUN([ -#include -#include -#include - -static struct option long_options[] = { - {"help" , no_argument, 0, 1 }, - {"version" , no_argument, 0, 2 }, - {0 , no_argument, 0, 0 } -}; - -int main(int argc, char **argv) { - int option_index = 0; - int c; - - opterr = 0; - while((c = getopt_long(argc, argv, "?hv", - long_options, &option_index)) != EOF) { - } - return 0; -} -], [AC_MSG_RESULT(yes); ac_getopt_long=yes; - AC_DEFINE(HAVE_GETOPT_LONG, [], - [Define this if you have GNU getopt_long()])], - [AC_MSG_RESULT(no); ac_getopt_long=no], - [AC_MSG_RESULT(no); ac_getopt_long=no]) -AM_CONDITIONAL(HAVE_GETOPT_LONG, test x"$ac_getopt_long" = "xyes") - ## ## Check for S_ISSOCK() and S_ISLNK() macros ## diff --git a/lib/driver/osx.c b/lib/driver/osx.c index 080b91d7..18e4aac1 100644 --- a/lib/driver/osx.c +++ b/lib/driver/osx.c @@ -1,5 +1,5 @@ /* - $Id: osx.c,v 1.4 2005/09/30 00:01:09 rocky Exp $ + $Id: osx.c,v 1.5 2005/10/05 09:48:12 rocky Exp $ Copyright (C) 2003, 2004, 2005 Rocky Bernstein from vcdimager code: @@ -34,7 +34,7 @@ #include "config.h" #endif -static const char _rcsid[] = "$Id: osx.c,v 1.4 2005/09/30 00:01:09 rocky Exp $"; +static const char _rcsid[] = "$Id: osx.c,v 1.5 2005/10/05 09:48:12 rocky Exp $"; #include #include @@ -1627,15 +1627,9 @@ cdio_get_devices_osx(void) sizeof(psz_buf) - dev_path_length, kCFStringEncodingASCII ) ) { - CFRelease( str_bsd_path ); - IOObjectRelease( next_media ); - IOObjectRelease( media_iterator ); cdio_add_device_list(&drives, strdup(psz_buf), &num_drives); } - else - { - CFRelease( str_bsd_path ); - } + CFRelease( str_bsd_path ); IOObjectRelease( next_media ); } while( ( next_media = IOIteratorNext( media_iterator ) ) != 0 ); diff --git a/src/Makefile.am b/src/Makefile.am index 4495b577..44c8f542 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,4 +1,4 @@ -# $Id: Makefile.am,v 1.35 2005/03/10 12:47:03 rocky Exp $ +# $Id: Makefile.am,v 1.36 2005/10/05 09:48:12 rocky Exp $ # # Copyright (C) 2003, 2004, 2005 Rocky Bernstein # @@ -42,42 +42,40 @@ endif if BUILD_CD_DRIVE cd_drive_SOURCES = cd-drive.c util.c util.h -cd_drive_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LIBPOPT_LIBS) $(LIBICONV) +cd_drive_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LIBICONV) bin_cd_drive = cd-drive endif if BUILD_CDINFO cd_info_SOURCES = cd-info.c cddb.c cddb.h util.c util.h -cd_info_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LIBPOPT_LIBS) $(CDDB_LIBS) $(VCDINFO_LIBS) $(LIBICONV) +cd_info_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(CDDB_LIBS) $(VCDINFO_LIBS) $(LIBICONV) bin_cd_info = cd-info endif if BUILD_CDINFO_LINUX cdinfo_linux_SOURCES = cdinfo-linux.c -cdinfo_linux_LDADD = $(LIBCDIO_LIBS) $(LIBPOPT_LIBS) +cdinfo_linux_LDADD = $(LIBCDIO_LIBS) bin_cdinfo_linux = cdinfo-linux endif if BUILD_CD_READ cd_read_SOURCES = cd-read.c util.c util.h -cd_read_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LIBPOPT_LIBS) $(LIBICONV) +cd_read_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LIBICONV) bin_cd_read = cd-read endif if BUILD_ISO_INFO iso_info_SOURCES = iso-info.c util.c util.h -iso_info_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LIBPOPT_LIBS) $(LIBICONV) +iso_info_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LIBICONV) bin_iso_info = iso-info endif if BUILD_ISO_READ iso_read_SOURCES = iso-read.c util.c util.h -iso_read_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LIBPOPT_LIBS) $(LIBICONV) +iso_read_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LIBICONV) bin_iso_read = iso-read endif bin_PROGRAMS = $(bin_cd_drive) $(bin_cd_info) $(bin_cdinfo_linux) $(bin_cd_read) $(bin_iso_info) $(bin_iso_read) $(bin_cdda_player) -# Put LIBPOPT_CFLAGS after local include in case LIBPOPT has headers common -# to those in LIBCDIO_CFLAGS -INCLUDES = -I$(top_srcdir) $(LIBCDIO_CFLAGS) $(VCDINFO_CFLAGS) $(CDDB_CFLAGS) $(LIBPOPT_CFLAGS) +INCLUDES = -I$(top_srcdir) $(LIBCDIO_CFLAGS) $(VCDINFO_CFLAGS) $(CDDB_CFLAGS) diff --git a/src/cd-drive.c b/src/cd-drive.c index a41371fe..d495671c 100644 --- a/src/cd-drive.c +++ b/src/cd-drive.c @@ -1,5 +1,5 @@ /* - $Id: cd-drive.c,v 1.23 2005/04/30 10:05:11 rocky Exp $ + $Id: cd-drive.c,v 1.24 2005/10/05 09:48:12 rocky Exp $ Copyright (C) 2004, 2005 Rocky Bernstein @@ -28,6 +28,7 @@ #ifdef HAVE_SYS_TYPES_H #include #endif +#include #include #include @@ -43,44 +44,64 @@ struct arguments /* Configuration option codes */ enum { + OP_HANDLED, + OP_SOURCE_DEVICE, - + + OP_USAGE, + /* These are the remaining configuration options */ OP_VERSION, }; -/* Parse a all options. */ +/* Parse all options. */ static bool -parse_options (int argc, const char *argv[]) +parse_options (int argc, char *argv[]) { int opt; - struct poptOption optionsTable[] = { - {"debug", 'd', POPT_ARG_INT, &opts.debug_level, 0, - "Set debugging to LEVEL"}, - - {"cdrom-device", 'i', POPT_ARG_STRING|POPT_ARGFLAG_OPTIONAL, - &source_name, OP_SOURCE_DEVICE, - "show only info about CD-ROM device", "DEVICE"}, - - {"quiet", 'q', POPT_ARG_NONE, &opts.silent, 0, - "Don't produce warning output" }, - - {"version", 'V', POPT_ARG_NONE, &opts.version_only, 0, - "display version and copyright information and exit"}, - POPT_AUTOHELP {NULL, 0, 0, NULL, 0} + const char* helpText = + "Usage: %s [OPTION...]\n" + " -d, --debug=INT Set debugging to LEVEL\n" + " -i, --cdrom-device[=DEVICE] show only info about CD-ROM device\n" + " -q, --quiet Don't produce warning output\n" + " -V, --version display version and copyright information\n" + " and exit\n" + "\n" + "Help options:\n" + " -?, --help Show this help message\n" + " --usage Display brief usage message\n"; + + const char* usageText = + "Usage: %s [-d|--debug INT] [-i|--cdrom-device DEVICE] [-q|--quiet]\n" + " [-V|--version] [-?|--help] [--usage]\n"; + + const char* optionsString = "d:i::qV?"; + struct option optionsTable[] = { + {"debug", required_argument, NULL, 'd' }, + {"cdrom-device", optional_argument, NULL, 'i' }, + {"quiet", no_argument, NULL, 'q' }, + {"version", no_argument, NULL, 'V' }, + {"help", no_argument, NULL, '?' }, + {"usage", no_argument, NULL, OP_USAGE }, + {NULL, 0, NULL, 0 } }; - poptContext optCon = poptGetContext (NULL, argc, argv, optionsTable, 0); program_name = strrchr(argv[0],'/'); program_name = program_name ? strdup(program_name+1) : strdup(argv[0]); - while ((opt = poptGetNextOpt (optCon)) != -1) { + while ((opt = getopt_long(argc, argv, optionsString, optionsTable, NULL)) != -1) { switch (opt) { - - case OP_SOURCE_DEVICE: + case 'd': + opts.debug_level = atoi(optarg); + break; + + case 'i': if (opts.source_image != DRIVER_UNKNOWN) { + /* NOTE: The libpopt version already set source_name by this time. + To restore this behavior, fall through to the else{} block. + */ report( stderr, "%s: another source type option given before.\n", program_name ); report( stderr, "%s: give only one source type option.\n", @@ -88,44 +109,66 @@ parse_options (int argc, const char *argv[]) break; } else { opts.source_image = DRIVER_DEVICE; - source_name = fillout_device_name(source_name); + if (optarg != NULL) { + source_name = fillout_device_name(optarg); + } break; } break; - + + case 'q': + opts.silent = 1; + break; + + case 'V': + opts.version_only = 1; + break; + + case '?': + fprintf(stderr, helpText, program_name); + free(program_name); + exit(EXIT_FAILURE); + break; + + case OP_USAGE: + fprintf(stderr, usageText, program_name); + free(program_name); + exit(EXIT_FAILURE); + break; + + case OP_HANDLED: + break; + default: - poptFreeContext(optCon); return false; } } - { - const char *remaining_arg = poptGetArg(optCon); - if ( remaining_arg != NULL) { - if (opts.source_image != DRIVER_UNKNOWN) { - report( stderr, "%s: Source specified in option %s and as %s\n", - program_name, source_name, remaining_arg); - poptFreeContext(optCon); - free(program_name); - exit (EXIT_FAILURE); - } + if (optind < argc) { + const char *remaining_arg = argv[optind++]; + + /* NOTE: A bug in the libpopt version checked source_image, which + rendered the subsequent source_image test useless. + */ + if (source_name != NULL) { + report( stderr, "%s: Source specified in option %s and as %s\n", + program_name, source_name, remaining_arg); + free(program_name); + exit (EXIT_FAILURE); + } - if (opts.source_image == DRIVER_DEVICE) - source_name = fillout_device_name(remaining_arg); - else - source_name = strdup(remaining_arg); - - if ( (poptGetArgs(optCon)) != NULL) { - report( stderr, "%s: Source specified in previously %s and %s\n", - program_name, source_name, remaining_arg); - poptFreeContext(optCon); - free(program_name); - exit (EXIT_FAILURE); - - } + if (opts.source_image == DRIVER_DEVICE) + source_name = fillout_device_name(remaining_arg); + else + source_name = strdup(remaining_arg); + + if (optind < argc) { + report( stderr, "%s: Source specified in previously %s and %s\n", + program_name, source_name, remaining_arg); + free(program_name); + exit (EXIT_FAILURE); } } - poptFreeContext(optCon); return true; } @@ -187,7 +230,7 @@ init(void) } int -main(int argc, const char *argv[]) +main(int argc, char *argv[]) { CdIo_t *p_cdio=NULL; diff --git a/src/cd-info.c b/src/cd-info.c index ee790e77..93a83a78 100644 --- a/src/cd-info.c +++ b/src/cd-info.c @@ -1,5 +1,5 @@ /* - $Id: cd-info.c,v 1.144 2005/09/18 20:34:02 rocky Exp $ + $Id: cd-info.c,v 1.145 2005/10/05 09:48:12 rocky Exp $ Copyright (C) 2003, 2004, 2005 Rocky Bernstein Copyright (C) 1996, 1997, 1998 Gerd Knorr @@ -27,6 +27,7 @@ #include "util.h" #include "cddb.h" #include +#include #ifdef HAVE_CDDB #include @@ -95,6 +96,7 @@ struct opts_s /* Configuration option codes */ enum { + OP_HANDLED = 0, OP_SOURCE_UNDEF, OP_SOURCE_AUTO, @@ -103,7 +105,15 @@ enum { OP_SOURCE_CDRDAO, OP_SOURCE_NRG , OP_SOURCE_DEVICE, - + + OP_CDDB_SERVER, + OP_CDDB_CACHE, + OP_CDDB_EMAIL, + OP_CDDB_NOCACHE, + OP_CDDB_TIMEOUT, + + OP_USAGE, + /* These are the remaining configuration options */ OP_VERSION, @@ -111,236 +121,264 @@ enum { char *temp_str; -/* Parse a all options. */ +/* Parse source options. */ +static void +parse_source(int opt) +{ + /* NOTE: The libpopt version made use of an extra temporary + variable (psz_my_source) for all sources _except_ devices. + This distinction seemed to serve no purpose. + */ + + if (opts.source_image != INPUT_UNKNOWN) { + report(stderr, "%s: another source type option given before.\n", + program_name); + report(stderr, "%s: give only one source type option.\n", + program_name); + return; + } + + /* For all input sources which are not a DEVICE, we need to make + a copy of the string; for a DEVICE the fill-out routine makes + the copy. + */ + if (OP_SOURCE_DEVICE != opt) + if (optarg != NULL) source_name = strdup(optarg); + + switch (opt) { + case OP_SOURCE_BIN: + opts.source_image = INPUT_BIN; + break; + case OP_SOURCE_CUE: + opts.source_image = INPUT_CUE; + break; + case OP_SOURCE_CDRDAO: + opts.source_image = INPUT_CDRDAO; + break; + case OP_SOURCE_NRG: + opts.source_image = INPUT_NRG; + break; + case OP_SOURCE_AUTO: + opts.source_image = INPUT_AUTO; + break; + + case OP_SOURCE_DEVICE: + opts.source_image = INPUT_DEVICE; + if (optarg != NULL) source_name = fillout_device_name(optarg); + break; + } +} + + +/* Parse all options. */ static bool -parse_options (int argc, const char *argv[]) +parse_options (int argc, char *argv[]) { int opt; /* used for argument parsing */ - char *psz_my_source; - - struct poptOption optionsTable[] = { - {"access-mode", 'a', POPT_ARG_STRING, &opts.access_mode, 0, - "Set CD access methed"}, - - {"debug", 'd', POPT_ARG_INT, &opts.debug_level, 0, - "Set debugging to LEVEL"}, - - {"no-tracks", 'T', POPT_ARG_NONE, &opts.no_tracks, 0, - "Don't show track information"}, - - {"no-analyze", 'A', POPT_ARG_NONE, &opts.no_analysis, 0, - "Don't filesystem analysis"}, - + + const char* helpText = + "Usage: %s [OPTION...]\n" + " -a, --access-mode=STRING Set CD access method\n" + " -d, --debug=INT Set debugging to LEVEL\n" + " -T, --no-tracks Don't show track information\n" + " -A, --no-analyze Don't filesystem analysis\n" #ifdef HAVE_CDDB - {"no-cddb", '\0', POPT_ARG_NONE, &opts.no_cddb, 0, - "Don't look up audio CDDB information or print that"}, - - {"cddb-port", 'P', POPT_ARG_INT, &cddb_opts.port, 8880, - "CDDB port number to use (default 8880)"}, - - {"cddb-http", 'H', POPT_ARG_NONE, &cddb_opts.http, 0, - "Lookup CDDB via HTTP proxy (default no proxy)"}, - - {"cddb-server", '\0', POPT_ARG_STRING, &cddb_opts.server, 0, - "CDDB server to contact for information (default: freedb.freedb.org)"}, - - {"cddb-cache", '\0', POPT_ARG_STRING, &cddb_opts.cachedir, 0, - "Location of CDDB cache directory (default ~/.cddbclient)"}, - - {"cddb-email", '\0', POPT_ARG_STRING, &cddb_opts.email, 0, - "Email address to give CDDB server (default me@home"}, - - {"no-cddb-cache", '\0', POPT_ARG_NONE, &cddb_opts.disable_cache, 0, - "Lookup CDDB via HTTP proxy (default no proxy)"}, - - {"cddb-timeout", '\0', POPT_ARG_INT, &cddb_opts.timeout, 0, - "CDDB timeout value in seconds (default 10 seconds)"}, -#else - {"no-cddb", '\0', POPT_ARG_NONE, &opts.no_cddb, 0, - "Does nothing since this program is not CDDB-enabled"}, - - {"cddb-port", 'P', POPT_ARG_INT, &cddb_opts.port, 8880, - "Does nothing since this program is not CDDB-enabled"}, - - {"cddb-http", 'H', POPT_ARG_NONE, &cddb_opts.http, 0, - "Does nothing since this program is not CDDB-enabled"}, - - {"cddb-server", '\0', POPT_ARG_STRING, &cddb_opts.server, 0, - "Does nothing since this program is not CDDB-enabled"}, - - {"cddb-cache", '\0', POPT_ARG_STRING, &cddb_opts.cachedir, 0, - "Does nothing since this program is not CDDB-enabled"}, - - {"cddb-email", '\0', POPT_ARG_STRING, &cddb_opts.email, 0, - "Does nothing since this program is not CDDB-enabled"}, - - {"no-cddb-cache", '\0', POPT_ARG_NONE, &cddb_opts.disable_cache, 0, - "Does nothing since this program is not CDDB-enabled"}, - - {"cddb-timeout", '\0', POPT_ARG_INT, &cddb_opts.timeout, 0, - "Does nothing since this program is not CDDB-enabled"}, + " --no-cddb Don't look up audio CDDB information\n" + " or print it\n" + " -P, --cddb-port=INT CDDB port number to use (default 8880)\n" + " -H, --cddb-http Lookup CDDB via HTTP proxy (default no\n" + " proxy)\n" + " --cddb-server=STRING CDDB server to contact for information\n" + " (default: freedb.freedb.org)\n" + " --cddb-cache=STRING Location of CDDB cache directory\n" + " (default ~/.cddbclient)\n" + " --cddb-email=STRING Email address to give CDDB server\n" + " (default me@home)\n" + " --no-cddb-cache Disable caching of CDDB entries\n" + " locally (default caches)\n" + " --cddb-timeout=INT CDDB timeout value in seconds\n" + " (default 10 seconds)\n" +#else + " --no-cddb Does nothing since this program is not\n" + " -P, --cddb-port=INT CDDB-enabled\n" + " -H, --cddb-http\n" + " --cddb-server=STRING\n" + " --cddb-cache=STRING\n" + " --cddb-email=STRING\n" + " --no-cddb-cache\n" + " --cddb-timeout=INT\n" #endif - - {"no-device-info", '\0', POPT_ARG_NONE, &opts.no_device, 0, - "Don't show device info, just CD info"}, - - {"no-disc-mode", '\0', POPT_ARG_NONE, &opts.no_disc_mode, 0, - "Don't show disc-mode info"}, - - {"dvd", '\0', POPT_ARG_NONE, &opts.show_dvd, 0, - "Attempt to give DVD information if a DVD is found."}, - + " --no-device-info Don't show device info, just CD info\n" + " --no-disc-mode Don't show disc-mode info\n" + " --dvd Attempt to give DVD information if a DVD is\n" + " found.\n" #ifdef HAVE_VCDINFO - {"no-vcd", 'v', POPT_ARG_NONE, &opts.no_vcd, 0, - "Don't look up Video CD information"}, -#else - {"no-vcd", 'v', POPT_ARG_NONE, &opts.no_vcd, 1, - "Don't look up Video CD information - for this build, this is always set"}, + " -v, --no-vcd Don't look up Video CD information\n" +#else + " -v, --no-vcd Don't look up Video CD information - for\n" + " this build, this is always set\n" #endif - {"no-ioctl", 'I', POPT_ARG_NONE, &opts.no_ioctl, 0, - "Don't show ioctl() information"}, - - {"bin-file", 'b', POPT_ARG_STRING|POPT_ARGFLAG_OPTIONAL, &psz_my_source, - OP_SOURCE_BIN, "set \"bin\" CD-ROM disk image file as source", "FILE"}, - - {"cue-file", 'c', POPT_ARG_STRING|POPT_ARGFLAG_OPTIONAL, &psz_my_source, - OP_SOURCE_CUE, "set \"cue\" CD-ROM disk image file as source", "FILE"}, - - {"nrg-file", 'N', POPT_ARG_STRING|POPT_ARGFLAG_OPTIONAL, &psz_my_source, - OP_SOURCE_NRG, "set Nero CD-ROM disk image file as source", "FILE"}, - - {"toc-file", 't', POPT_ARG_STRING|POPT_ARGFLAG_OPTIONAL, &psz_my_source, - OP_SOURCE_CDRDAO, "set cdrdao CD-ROM disk image file as source", "FILE"}, - - {"input", 'i', POPT_ARG_STRING|POPT_ARGFLAG_OPTIONAL, &psz_my_source, - OP_SOURCE_AUTO, - "set source and determine if \"bin\" image or device", "FILE"}, - - {"iso9660", '\0', POPT_ARG_NONE, &opts.print_iso9660, 0, - "print directory contents of any ISO-9660 filesystems"}, - - {"cdrom-device", 'C', POPT_ARG_STRING|POPT_ARGFLAG_OPTIONAL, &source_name, - OP_SOURCE_DEVICE, - "set CD-ROM device as source", "DEVICE"}, - - {"list-drives", 'l', POPT_ARG_NONE, &opts.list_drives, 0, - "Give a list of CD-drives" }, - - {"no-header", '\0', POPT_ARG_NONE, &opts.no_header, - 0, "Don't display header and copyright (for regression testing)"}, + " -I, --no-ioctl Don't show ioctl() information\n" + " -b, --bin-file[=FILE] set \"bin\" CD-ROM disk image file as source\n" + " -c, --cue-file[=FILE] set \"cue\" CD-ROM disk image file as source\n" + " -N, --nrg-file[=FILE] set Nero CD-ROM disk image file as source\n" + " -t, --toc-file[=FILE] set cdrdao CD-ROM disk image file as source\n" + " -i, --input[=FILE] set source and determine if \"bin\" image or\n" + " device\n" + " --iso9660 print directory contents of any ISO-9660\n" + " filesystems\n" + " -C, --cdrom-device[=DEVICE] set CD-ROM device as source\n" + " -l, --list-drives Give a list of CD-drives\n" + " --no-header Don't display header and copyright (for\n" + " regression testing)\n" +#ifdef HAVE_JOLIET + " --no-joliet Don't use Joliet extensions\n" +#endif + " --no-rock-ridge Don't use Rock-Ridge-extension information\n" + " --no-xa Don't use XA-extension information\n" + " -q, --quiet Don't produce warning output\n" + " -V, --version display version and copyright information\n" + " and exit\n" + "\n" + "Help options:\n" + " -?, --help Show this help message\n" + " --usage Display brief usage message\n"; + + const char* usageText = + "Usage: %s [-a|--access-mode STRING] [-d|--debug INT] [-T|--no-tracks]\n" + " [-A|--no-analyze] [--no-cddb] [-P|--cddb-port INT] [-H|--cddb-http]\n" + " [--cddb-server=STRING] [--cddb-cache=STRING] [--cddb-email=STRING]\n" + " [--no-cddb-cache] [--cddb-timeout=INT] [--no-device-info]\n" + " [--no-disc-mode] [--dvd] [-v|--no-vcd] [-I|--no-ioctl]\n" + " [-b|--bin-file FILE] [-c|--cue-file FILE] [-N|--nrg-file FILE]\n" + " [-t|--toc-file FILE] [-i|--input FILE] [--iso9660]\n" + " [-C|--cdrom-device DEVICE] [-l|--list-drives] [--no-header]\n" + " [--no-joliet] [--no-rock-ridge] [--no-xa] [-q|--quiet] [-V|--version]\n" + " [-?|--help] [--usage]\n"; + const char* optionsString = "a:d:TAP:HvIb::c::N::t::i::C::lqV?"; + struct option optionsTable[] = { + {"access-mode", required_argument, NULL, 'a'}, + {"debug", required_argument, NULL, 'd' }, + {"no-tracks", no_argument, NULL, 'T' }, + {"no-analyze", no_argument, NULL, 'A' }, + {"no-cddb", no_argument, &opts.no_cddb, 1 }, + {"cddb-port", required_argument, NULL, 'P' }, + {"cddb-http", no_argument, NULL, 'H' }, + {"cddb-server", required_argument, NULL, OP_CDDB_SERVER }, + {"cddb-cache", required_argument, NULL, OP_CDDB_CACHE }, + {"cddb-email", required_argument, NULL, OP_CDDB_EMAIL }, + {"no-cddb-cache", no_argument, NULL, OP_CDDB_NOCACHE }, + {"cddb-timeout", required_argument, NULL, OP_CDDB_TIMEOUT }, + {"no-device-info", no_argument, &opts.no_device, 1 }, + {"no-disc-mode", no_argument, &opts.no_disc_mode, 1 }, + {"dvd", no_argument, &opts.show_dvd, 1 }, + {"no-vcd", no_argument, NULL, 'v' }, + {"no-ioctl", no_argument, NULL, 'I' }, + {"bin-file", optional_argument, NULL, 'b' }, + {"cue-file", optional_argument, NULL, 'c' }, + {"nrg-file", optional_argument, NULL, 'N' }, + {"toc-file", optional_argument, NULL, 't' }, + {"input", optional_argument, NULL, 'i' }, + {"iso9660", no_argument, &opts.print_iso9660, 1 }, + {"cdrom-device", optional_argument, NULL, 'C' }, + {"list-drives", no_argument, NULL, 'l' }, + {"no-header", no_argument, &opts.no_header, 1 }, #ifdef HAVE_JOLIET - {"no-joliet", '\0', POPT_ARG_NONE, &opts.no_joliet, - 0, "Don't use Joliet extensions"}, + {"no-joliet", no_argument, &opts.no_joliet, 1 }, #endif /*HAVE_JOLIET*/ - - {"no-rock-ridge", '\0', POPT_ARG_NONE, &opts.no_rock_ridge, - 0, "Don't use Rock-Ridge-extension information"}, + {"no-rock-ridge", no_argument, &opts.no_rock_ridge, 1 }, + {"no-xa", no_argument, &opts.no_xa, 1 }, + {"quiet", no_argument, NULL, 'q' }, + {"version", no_argument, NULL, 'V' }, - {"no-xa", '\0', POPT_ARG_NONE, &opts.no_xa, - 0, "Don't use XA-extension information"}, - - {"quiet", 'q', POPT_ARG_NONE, &opts.silent, 0, - "Don't produce warning output" }, - - {"version", 'V', POPT_ARG_NONE, &opts.version_only, 0, - "display version and copyright information and exit"}, - POPT_AUTOHELP {NULL, 0, 0, NULL, 0} + {"help", no_argument, NULL, '?' }, + {"usage", no_argument, NULL, OP_USAGE }, + { NULL, 0, NULL, 0 } }; - poptContext optCon = poptGetContext (NULL, argc, argv, optionsTable, 0); program_name = strrchr(argv[0],'/'); program_name = program_name ? strdup(program_name+1) : strdup(argv[0]); - while ((opt = poptGetNextOpt (optCon)) >= 0) { + while ((opt = getopt_long(argc, argv, optionsString, optionsTable, NULL)) >= 0) { switch (opt) { - - case OP_SOURCE_AUTO: - case OP_SOURCE_BIN: - case OP_SOURCE_CUE: - case OP_SOURCE_CDRDAO: - case OP_SOURCE_NRG: - case OP_SOURCE_DEVICE: - if (opts.source_image != INPUT_UNKNOWN) { - report(stderr, "%s: another source type option given before.\n", - program_name); - report(stderr, "%s: give only one source type option.\n", - program_name); - break; - } + case 'a': opts.access_mode = strdup(optarg); break; + case 'd': opts.debug_level = atoi(optarg); break; + case 'T': opts.no_tracks = 1; break; + case 'A': opts.no_analysis = 1; break; + case 'P': cddb_opts.port = atoi(optarg); break; + case 'H': cddb_opts.http = 1; break; + case OP_CDDB_SERVER: cddb_opts.server = strdup(optarg); break; + case OP_CDDB_CACHE: cddb_opts.cachedir = strdup(optarg); break; + case OP_CDDB_EMAIL: cddb_opts.email = strdup(optarg); break; + case OP_CDDB_NOCACHE: cddb_opts.disable_cache = 1; break; + case OP_CDDB_TIMEOUT: cddb_opts.timeout = atoi(optarg); break; + case 'v': opts.no_vcd = 1; break; + case 'I': opts.no_ioctl = 1; break; + case 'b': parse_source(OP_SOURCE_BIN); break; + case 'c': parse_source(OP_SOURCE_CUE); break; + case 'N': parse_source(OP_SOURCE_NRG); break; + case 't': parse_source(OP_SOURCE_CDRDAO); break; + case 'i': parse_source(OP_SOURCE_AUTO); break; + case 'C': parse_source(OP_SOURCE_DEVICE); break; + case 'l': opts.list_drives = 1; break; + case 'q': opts.silent = 1; break; + case 'V': opts.version_only = 1; break; - /* For all input sources which are not a DEVICE, we need to make - a copy of the string; for a DEVICE the fill-out routine makes - the copy. - */ - if (OP_SOURCE_DEVICE != opt) - source_name = strdup(psz_my_source); - - switch (opt) { - case OP_SOURCE_BIN: - opts.source_image = INPUT_BIN; - break; - case OP_SOURCE_CUE: - opts.source_image = INPUT_CUE; - break; - case OP_SOURCE_CDRDAO: - opts.source_image = INPUT_CDRDAO; - break; - case OP_SOURCE_NRG: - opts.source_image = INPUT_NRG; - break; - case OP_SOURCE_AUTO: - opts.source_image = INPUT_AUTO; - break; - case OP_SOURCE_DEVICE: - opts.source_image = INPUT_DEVICE; - source_name = fillout_device_name(source_name); - break; - } + case '?': + fprintf(stderr, helpText, program_name); + free(program_name); + exit(EXIT_FAILURE); + break; + + case OP_USAGE: + fprintf(stderr, usageText, program_name); + free(program_name); + exit(EXIT_FAILURE); + break; + + case OP_HANDLED: break; } } - if (opt < -1) { - /* an error occurred during option processing */ - report(stderr, "%s: %s\n", - poptBadOption(optCon, POPT_BADOPTION_NOALIAS), - poptStrerror(opt)); + + if (optind < argc) { + const char *remaining_arg = argv[optind++]; + + /* NOTE: A bug in the libpopt version checked source_image, which + rendered the subsequent source_image test useless. + */ + if (source_name != NULL) { + report(stderr, "%s: Source '%s' given as an argument of an option and as " + "unnamed option '%s'\n", + program_name, source_name, remaining_arg); + free(program_name); + exit (EXIT_FAILURE); + } + + if (opts.source_image == INPUT_DEVICE) + source_name = fillout_device_name(remaining_arg); + else + source_name = strdup(remaining_arg); + + if (optind < argc) { + report(stderr, "%s: Source specified in previously %s and %s\n", + program_name, source_name, remaining_arg); + free(program_name); + exit (EXIT_FAILURE); + } + } + + if (NULL == source_name) { + report(stderr, "%s: No source specified.\n", program_name); free(program_name); exit (EXIT_FAILURE); } - - { - const char *remaining_arg = poptGetArg(optCon); - if ( remaining_arg != NULL) { - if (opts.source_image != INPUT_UNKNOWN) { - report(stderr, "%s: Source '%s' given as an argument of an option and as " - "unnamed option '%s'\n", - program_name, psz_my_source, remaining_arg); - poptFreeContext(optCon); - free(program_name); - exit (EXIT_FAILURE); - } - - if (opts.source_image == INPUT_DEVICE) - source_name = fillout_device_name(remaining_arg); - else - source_name = strdup(remaining_arg); - - if ( (poptGetArgs(optCon)) != NULL) { - report(stderr, "%s: Source specified in previously %s and %s\n", - program_name, psz_my_source, remaining_arg); - poptFreeContext(optCon); - free(program_name); - exit (EXIT_FAILURE); - - } - } - } - poptFreeContext(optCon); return true; } + /* CDIO logging routines */ #ifdef HAVE_CDDB @@ -764,7 +802,7 @@ init(void) /* ------------------------------------------------------------------------ */ int -main(int argc, const char *argv[]) +main(int argc, char *argv[]) { CdIo_t *p_cdio=NULL; diff --git a/src/cd-paranoia/Makefile.am b/src/cd-paranoia/Makefile.am index 6ce9815c..68da5e0a 100644 --- a/src/cd-paranoia/Makefile.am +++ b/src/cd-paranoia/Makefile.am @@ -1,4 +1,4 @@ -# $Id: Makefile.am,v 1.15 2005/09/17 01:33:29 rocky Exp $ +# $Id: Makefile.am,v 1.16 2005/10/05 09:48:12 rocky Exp $ # # Copyright (C) 2004, 2005 Rocky Bernstein # Copyright (C) 1998 Monty xiphmont@mit.edu @@ -19,17 +19,11 @@ # ############################################################################### -if HAVE_GETOPT_LONG -else -getopt_sources = getopt.c getopt1.c -endif - -EXTRA_DIST = getopt.c getopt1.c \ - usage.txt.in usage-copy.h pod2c.pl \ +EXTRA_DIST = usage.txt.in usage-copy.h pod2c.pl \ doc/FAQ.txt doc/overlapdef.txt -noinst_HEADERS = getopt.h header.h report.h +noinst_HEADERS = header.h report.h transform = s,cd-paranoia,@CDPARANOIA_NAME@, diff --git a/src/cd-paranoia/cd-paranoia.c b/src/cd-paranoia/cd-paranoia.c index 51bf6a17..84b0133d 100644 --- a/src/cd-paranoia/cd-paranoia.c +++ b/src/cd-paranoia/cd-paranoia.c @@ -76,7 +76,14 @@ #include #endif +/* FreeBSD 4 has getopt in unistd.h. So we include that before + getopt.h */ +#ifdef HAVE_UNISTD_H +#include +#endif +#ifdef HAVE_GETOPT_H #include +#endif #ifdef HAVE_ERRNO_H #include diff --git a/src/cd-paranoia/getopt.c b/src/cd-paranoia/getopt.c deleted file mode 100644 index c41531e6..00000000 --- a/src/cd-paranoia/getopt.c +++ /dev/null @@ -1,1056 +0,0 @@ -/* Getopt for GNU. - NOTE: getopt is now part of the C library, so if you don't know what - "Keep this file name-space clean" means, talk to drepper@gnu.org - before changing it! - - Copyright (C) 1987, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98 - Free Software Foundation, Inc. - - NOTE: The canonical source of this file is maintained with the GNU C Library. - Bugs can be reported to bug-glibc@gnu.org. - - 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, 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. */ - -/* This tells Alpha OSF/1 not to define a getopt prototype in . - Ditto for AIX 3.2 and . */ -#ifndef _NO_PROTO -# define _NO_PROTO -#endif - -#ifdef HAVE_CONFIG_H -# include -#endif - -#if !defined __STDC__ || !__STDC__ -/* This is a separate conditional since some stdc systems - reject `defined (const)'. */ -# ifndef const -# define const -# endif -#endif - -#include - -/* Comment out all this code if we are using the GNU C Library, and are not - actually compiling the library itself. This code is part of the GNU C - Library, but also included in many other GNU distributions. Compiling - and linking in this code is a waste when using the GNU C library - (especially if it is a shared library). Rather than having every GNU - program understand `configure --with-gnu-libc' and omit the object files, - it is simpler to just do this in the source for each such file. */ - -#define GETOPT_INTERFACE_VERSION 2 -#if !defined _LIBC && defined __GLIBC__ && __GLIBC__ >= 2 -# include -# if _GNU_GETOPT_INTERFACE_VERSION == GETOPT_INTERFACE_VERSION -# define ELIDE_CODE -# endif -#endif - -#ifndef ELIDE_CODE - - -/* This needs to come after some library #include - to get __GNU_LIBRARY__ defined. */ -#ifdef __GNU_LIBRARY__ -/* Don't include stdlib.h for non-GNU C libraries because some of them - contain conflicting prototypes for getopt. */ -# include -# include -#endif /* GNU C library. */ - -#ifdef VMS -# include -# if HAVE_STRING_H - 0 -# include -# endif -#endif - -#ifndef _ -/* This is for other GNU distributions with internationalized messages. - When compiling libc, the _ macro is predefined. */ -# ifdef HAVE_LIBINTL_H -# include -# define _(msgid) gettext (msgid) -# else -# define _(msgid) (msgid) -# endif -#endif - -/* This version of `getopt' appears to the caller like standard Unix `getopt' - but it behaves differently for the user, since it allows the user - to intersperse the options with the other arguments. - - As `getopt' works, it permutes the elements of ARGV so that, - when it is done, all the options precede everything else. Thus - all application programs are extended to handle flexible argument order. - - Setting the environment variable POSIXLY_CORRECT disables permutation. - Then the behavior is completely standard. - - GNU application programs can use a third alternative mode in which - they can distinguish the relative order of options and other arguments. */ - -#include "getopt.h" - -/* For communication from `getopt' to the caller. - When `getopt' finds an option that takes an argument, - the argument value is returned here. - Also, when `ordering' is RETURN_IN_ORDER, - each non-option ARGV-element is returned here. */ - -char *optarg = NULL; - -/* Index in ARGV of the next element to be scanned. - This is used for communication to and from the caller - and for communication between successive calls to `getopt'. - - On entry to `getopt', zero means this is the first call; initialize. - - When `getopt' returns -1, this is the index of the first of the - non-option elements that the caller should itself scan. - - Otherwise, `optind' communicates from one call to the next - how much of ARGV has been scanned so far. */ - -/* 1003.2 says this must be 1 before any call. */ -int optind = 1; - -/* Formerly, initialization of getopt depended on optind==0, which - causes problems with re-calling getopt as programs generally don't - know that. */ - -int __getopt_initialized = 0; - -/* The next char to be scanned in the option-element - in which the last option character we returned was found. - This allows us to pick up the scan where we left off. - - If this is zero, or a null string, it means resume the scan - by advancing to the next ARGV-element. */ - -static char *nextchar; - -/* Callers store zero here to inhibit the error message - for unrecognized options. */ - -int opterr = 1; - -/* Set to an option character which was unrecognized. - This must be initialized on some systems to avoid linking in the - system's own getopt implementation. */ - -int optopt = '?'; - -/* Describe how to deal with options that follow non-option ARGV-elements. - - If the caller did not specify anything, - the default is REQUIRE_ORDER if the environment variable - POSIXLY_CORRECT is defined, PERMUTE otherwise. - - REQUIRE_ORDER means don't recognize them as options; - stop option processing when the first non-option is seen. - This is what Unix does. - This mode of operation is selected by either setting the environment - variable POSIXLY_CORRECT, or using `+' as the first character - of the list of option characters. - - PERMUTE is the default. We permute the contents of ARGV as we scan, - so that eventually all the non-options are at the end. This allows options - to be given in any order, even with programs that were not written to - expect this. - - RETURN_IN_ORDER is an option available to programs that were written - to expect options and other ARGV-elements in any order and that care about - the ordering of the two. We describe each non-option ARGV-element - as if it were the argument of an option with character code 1. - Using `-' as the first character of the list of option characters - selects this mode of operation. - - The special argument `--' forces an end of option-scanning regardless - of the value of `ordering'. In the case of RETURN_IN_ORDER, only - `--' can cause `getopt' to return -1 with `optind' != ARGC. */ - -static enum -{ - REQUIRE_ORDER, PERMUTE, RETURN_IN_ORDER -} ordering; - -/* Value of POSIXLY_CORRECT environment variable. */ -static char *posixly_correct; - -#ifdef __GNU_LIBRARY__ -/* We want to avoid inclusion of string.h with non-GNU libraries - because there are many ways it can cause trouble. - On some systems, it contains special magic macros that don't work - in GCC. */ -# include -# define my_index strchr -#else - -# if HAVE_STRING_H -# include -# else -# if HAVE_STRINGS_H -# include -# endif -# endif - -/* Avoid depending on library functions or files - whose names are inconsistent. */ - -#ifndef getenv -extern char *getenv (); -#endif - -static char * -my_index (str, chr) - const char *str; - int chr; -{ - while (*str) - { - if (*str == chr) - return (char *) str; - str++; - } - return 0; -} - -/* If using GCC, we can safely declare strlen this way. - If not using GCC, it is ok not to declare it. */ -#ifdef __GNUC__ -/* Note that Motorola Delta 68k R3V7 comes with GCC but not stddef.h. - That was relevant to code that was here before. */ -# if (!defined __STDC__ || !__STDC__) && !defined strlen -/* gcc with -traditional declares the built-in strlen to return int, - and has done so at least since version 2.4.5. -- rms. */ -extern int strlen (const char *); -# endif /* not __STDC__ */ -#endif /* __GNUC__ */ - -#endif /* not __GNU_LIBRARY__ */ - -/* Handle permutation of arguments. */ - -/* Describe the part of ARGV that contains non-options that have - been skipped. `first_nonopt' is the index in ARGV of the first of them; - `last_nonopt' is the index after the last of them. */ - -static int first_nonopt; -static int last_nonopt; - -#ifdef _LIBC -/* Bash 2.0 gives us an environment variable containing flags - indicating ARGV elements that should not be considered arguments. */ - -/* Defined in getopt_init.c */ -extern char *__getopt_nonoption_flags; - -static int nonoption_flags_max_len; -static int nonoption_flags_len; - -static int original_argc; -static char *const *original_argv; - -/* Make sure the environment variable bash 2.0 puts in the environment - is valid for the getopt call we must make sure that the ARGV passed - to getopt is that one passed to the process. */ -static void -__attribute__ ((unused)) -store_args_and_env (int argc, char *const *argv) -{ - /* XXX This is no good solution. We should rather copy the args so - that we can compare them later. But we must not use malloc(3). */ - original_argc = argc; - original_argv = argv; -} -# ifdef text_set_element -text_set_element (__libc_subinit, store_args_and_env); -# endif /* text_set_element */ - -# define SWAP_FLAGS(ch1, ch2) \ - if (nonoption_flags_len > 0) \ - { \ - char __tmp = __getopt_nonoption_flags[ch1]; \ - __getopt_nonoption_flags[ch1] = __getopt_nonoption_flags[ch2]; \ - __getopt_nonoption_flags[ch2] = __tmp; \ - } -#else /* !_LIBC */ -# define SWAP_FLAGS(ch1, ch2) -#endif /* _LIBC */ - -/* Exchange two adjacent subsequences of ARGV. - One subsequence is elements [first_nonopt,last_nonopt) - which contains all the non-options that have been skipped so far. - The other is elements [last_nonopt,optind), which contains all - the options processed since those non-options were skipped. - - `first_nonopt' and `last_nonopt' are relocated so that they describe - the new indices of the non-options in ARGV after they are moved. */ - -#if defined __STDC__ && __STDC__ -static void exchange (char **); -#endif - -static void -exchange (argv) - char **argv; -{ - int bottom = first_nonopt; - int middle = last_nonopt; - int top = optind; - char *tem; - - /* Exchange the shorter segment with the far end of the longer segment. - That puts the shorter segment into the right place. - It leaves the longer segment in the right place overall, - but it consists of two parts that need to be swapped next. */ - -#ifdef _LIBC - /* First make sure the handling of the `__getopt_nonoption_flags' - string can work normally. Our top argument must be in the range - of the string. */ - if (nonoption_flags_len > 0 && top >= nonoption_flags_max_len) - { - /* We must extend the array. The user plays games with us and - presents new arguments. */ - char *new_str = malloc (top + 1); - if (new_str == NULL) - nonoption_flags_len = nonoption_flags_max_len = 0; - else - { - memset (__mempcpy (new_str, __getopt_nonoption_flags, - nonoption_flags_max_len), - '\0', top + 1 - nonoption_flags_max_len); - nonoption_flags_max_len = top + 1; - __getopt_nonoption_flags = new_str; - } - } -#endif - - while (top > middle && middle > bottom) - { - if (top - middle > middle - bottom) - { - /* Bottom segment is the short one. */ - int len = middle - bottom; - register int i; - - /* Swap it with the top part of the top segment. */ - for (i = 0; i < len; i++) - { - tem = argv[bottom + i]; - argv[bottom + i] = argv[top - (middle - bottom) + i]; - argv[top - (middle - bottom) + i] = tem; - SWAP_FLAGS (bottom + i, top - (middle - bottom) + i); - } - /* Exclude the moved bottom segment from further swapping. */ - top -= len; - } - else - { - /* Top segment is the short one. */ - int len = top - middle; - register int i; - - /* Swap it with the bottom part of the bottom segment. */ - for (i = 0; i < len; i++) - { - tem = argv[bottom + i]; - argv[bottom + i] = argv[middle + i]; - argv[middle + i] = tem; - SWAP_FLAGS (bottom + i, middle + i); - } - /* Exclude the moved top segment from further swapping. */ - bottom += len; - } - } - - /* Update records for the slots the non-options now occupy. */ - - first_nonopt += (optind - last_nonopt); - last_nonopt = optind; -} - -/* Initialize the internal data when the first call is made. */ - -#if defined __STDC__ && __STDC__ -static const char *_getopt_initialize (int, char *const *, const char *); -#endif -static const char * -_getopt_initialize (argc, argv, optstring) - int argc; - char *const *argv; - const char *optstring; -{ - /* Start processing options with ARGV-element 1 (since ARGV-element 0 - is the program name); the sequence of previously skipped - non-option ARGV-elements is empty. */ - - first_nonopt = last_nonopt = optind; - - nextchar = NULL; - - posixly_correct = getenv ("POSIXLY_CORRECT"); - - /* Determine how to handle the ordering of options and nonoptions. */ - - if (optstring[0] == '-') - { - ordering = RETURN_IN_ORDER; - ++optstring; - } - else if (optstring[0] == '+') - { - ordering = REQUIRE_ORDER; - ++optstring; - } - else if (posixly_correct != NULL) - ordering = REQUIRE_ORDER; - else - ordering = PERMUTE; - -#ifdef _LIBC - if (posixly_correct == NULL - && argc == original_argc && argv == original_argv) - { - if (nonoption_flags_max_len == 0) - { - if (__getopt_nonoption_flags == NULL - || __getopt_nonoption_flags[0] == '\0') - nonoption_flags_max_len = -1; - else - { - const char *orig_str = __getopt_nonoption_flags; - int len = nonoption_flags_max_len = strlen (orig_str); - if (nonoption_flags_max_len < argc) - nonoption_flags_max_len = argc; - __getopt_nonoption_flags = - (char *) malloc (nonoption_flags_max_len); - if (__getopt_nonoption_flags == NULL) - nonoption_flags_max_len = -1; - else - memset (__mempcpy (__getopt_nonoption_flags, orig_str, len), - '\0', nonoption_flags_max_len - len); - } - } - nonoption_flags_len = nonoption_flags_max_len; - } - else - nonoption_flags_len = 0; -#endif - - return optstring; -} - -/* Scan elements of ARGV (whose length is ARGC) for option characters - given in OPTSTRING. - - If an element of ARGV starts with '-', and is not exactly "-" or "--", - then it is an option element. The characters of this element - (aside from the initial '-') are option characters. If `getopt' - is called repeatedly, it returns successively each of the option characters - from each of the option elements. - - If `getopt' finds another option character, it returns that character, - updating `optind' and `nextchar' so that the next call to `getopt' can - resume the scan with the following option character or ARGV-element. - - If there are no more option characters, `getopt' returns -1. - Then `optind' is the index in ARGV of the first ARGV-element - that is not an option. (The ARGV-elements have been permuted - so that those that are not options now come last.) - - OPTSTRING is a string containing the legitimate option characters. - If an option character is seen that is not listed in OPTSTRING, - return '?' after printing an error message. If you set `opterr' to - zero, the error message is suppressed but we still return '?'. - - If a char in OPTSTRING is followed by a colon, that means it wants an arg, - so the following text in the same ARGV-element, or the text of the following - ARGV-element, is returned in `optarg'. Two colons mean an option that - wants an optional arg; if there is text in the current ARGV-element, - it is returned in `optarg', otherwise `optarg' is set to zero. - - If OPTSTRING starts with `-' or `+', it requests different methods of - handling the non-option ARGV-elements. - See the comments about RETURN_IN_ORDER and REQUIRE_ORDER, above. - - Long-named options begin with `--' instead of `-'. - Their names may be abbreviated as long as the abbreviation is unique - or is an exact match for some defined option. If they have an - argument, it follows the option name in the same ARGV-element, separated - from the option name by a `=', or else the in next ARGV-element. - When `getopt' finds a long-named option, it returns 0 if that option's - `flag' field is nonzero, the value of the option's `val' field - if the `flag' field is zero. - - The elements of ARGV aren't really const, because we permute them. - But we pretend they're const in the prototype to be compatible - with other systems. - - LONGOPTS is a vector of `struct option' terminated by an - element containing a name which is zero. - - LONGIND returns the index in LONGOPT of the long-named option found. - It is only valid when a long-named option has been found by the most - recent call. - - If LONG_ONLY is nonzero, '-' as well as '--' can introduce - long-named options. */ - -int -_getopt_internal (argc, argv, optstring, longopts, longind, long_only) - int argc; - char *const *argv; - const char *optstring; - const struct option *longopts; - int *longind; - int long_only; -{ - optarg = NULL; - - if (optind == 0 || !__getopt_initialized) - { - if (optind == 0) - optind = 1; /* Don't scan ARGV[0], the program name. */ - optstring = _getopt_initialize (argc, argv, optstring); - __getopt_initialized = 1; - } - - /* Test whether ARGV[optind] points to a non-option argument. - Either it does not have option syntax, or there is an environment flag - from the shell indicating it is not an option. The later information - is only used when the used in the GNU libc. */ -#ifdef _LIBC -# define NONOPTION_P (argv[optind][0] != '-' || argv[optind][1] == '\0' \ - || (optind < nonoption_flags_len \ - && __getopt_nonoption_flags[optind] == '1')) -#else -# define NONOPTION_P (argv[optind][0] != '-' || argv[optind][1] == '\0') -#endif - - if (nextchar == NULL || *nextchar == '\0') - { - /* Advance to the next ARGV-element. */ - - /* Give FIRST_NONOPT & LAST_NONOPT rational values if OPTIND has been - moved back by the user (who may also have changed the arguments). */ - if (last_nonopt > optind) - last_nonopt = optind; - if (first_nonopt > optind) - first_nonopt = optind; - - if (ordering == PERMUTE) - { - /* If we have just processed some options following some non-options, - exchange them so that the options come first. */ - - if (first_nonopt != last_nonopt && last_nonopt != optind) - exchange ((char **) argv); - else if (last_nonopt != optind) - first_nonopt = optind; - - /* Skip any additional non-options - and extend the range of non-options previously skipped. */ - - while (optind < argc && NONOPTION_P) - optind++; - last_nonopt = optind; - } - - /* The special ARGV-element `--' means premature end of options. - Skip it like a null option, - then exchange with previous non-options as if it were an option, - then skip everything else like a non-option. */ - - if (optind != argc && !strcmp (argv[optind], "--")) - { - optind++; - - if (first_nonopt != last_nonopt && last_nonopt != optind) - exchange ((char **) argv); - else if (first_nonopt == last_nonopt) - first_nonopt = optind; - last_nonopt = argc; - - optind = argc; - } - - /* If we have done all the ARGV-elements, stop the scan - and back over any non-options that we skipped and permuted. */ - - if (optind == argc) - { - /* Set the next-arg-index to point at the non-options - that we previously skipped, so the caller will digest them. */ - if (first_nonopt != last_nonopt) - optind = first_nonopt; - return -1; - } - - /* If we have come to a non-option and did not permute it, - either stop the scan or describe it to the caller and pass it by. */ - - if (NONOPTION_P) - { - if (ordering == REQUIRE_ORDER) - return -1; - optarg = argv[optind++]; - return 1; - } - - /* We have found another option-ARGV-element. - Skip the initial punctuation. */ - - nextchar = (argv[optind] + 1 - + (longopts != NULL && argv[optind][1] == '-')); - } - - /* Decode the current option-ARGV-element. */ - - /* Check whether the ARGV-element is a long option. - - If long_only and the ARGV-element has the form "-f", where f is - a valid short option, don't consider it an abbreviated form of - a long option that starts with f. Otherwise there would be no - way to give the -f short option. - - On the other hand, if there's a long option "fubar" and - the ARGV-element is "-fu", do consider that an abbreviation of - the long option, just like "--fu", and not "-f" with arg "u". - - This distinction seems to be the most useful approach. */ - - if (longopts != NULL - && (argv[optind][1] == '-' - || (long_only && (argv[optind][2] || !my_index (optstring, argv[optind][1]))))) - { - char *nameend; - const struct option *p; - const struct option *pfound = NULL; - int exact = 0; - int ambig = 0; - int indfound = -1; - int option_index; - - for (nameend = nextchar; *nameend && *nameend != '='; nameend++) - /* Do nothing. */ ; - - /* Test all long options for either exact match - or abbreviated matches. */ - for (p = longopts, option_index = 0; p->name; p++, option_index++) - if (!strncmp (p->name, nextchar, nameend - nextchar)) - { - if ((unsigned int) (nameend - nextchar) - == (unsigned int) strlen (p->name)) - { - /* Exact match found. */ - pfound = p; - indfound = option_index; - exact = 1; - break; - } - else if (pfound == NULL) - { - /* First nonexact match found. */ - pfound = p; - indfound = option_index; - } - else - /* Second or later nonexact match found. */ - ambig = 1; - } - - if (ambig && !exact) - { - if (opterr) - fprintf (stderr, _("%s: option `%s' is ambiguous\n"), - argv[0], argv[optind]); - nextchar += strlen (nextchar); - optind++; - optopt = 0; - return '?'; - } - - if (pfound != NULL) - { - option_index = indfound; - optind++; - if (*nameend) - { - /* Don't test has_arg with >, because some C compilers don't - allow it to be used on enums. */ - if (pfound->has_arg) - optarg = nameend + 1; - else - { - if (opterr) - { - if (argv[optind - 1][1] == '-') - /* --option */ - fprintf (stderr, - _("%s: option `--%s' doesn't allow an argument\n"), - argv[0], pfound->name); - else - /* +option or -option */ - fprintf (stderr, - _("%s: option `%c%s' doesn't allow an argument\n"), - argv[0], argv[optind - 1][0], pfound->name); - - nextchar += strlen (nextchar); - - optopt = pfound->val; - return '?'; - } - } - } - else if (pfound->has_arg == 1) - { - if (optind < argc) - optarg = argv[optind++]; - else - { - if (opterr) - fprintf (stderr, - _("%s: option `%s' requires an argument\n"), - argv[0], argv[optind - 1]); - nextchar += strlen (nextchar); - optopt = pfound->val; - return optstring[0] == ':' ? ':' : '?'; - } - } - nextchar += strlen (nextchar); - if (longind != NULL) - *longind = option_index; - if (pfound->flag) - { - *(pfound->flag) = pfound->val; - return 0; - } - return pfound->val; - } - - /* Can't find it as a long option. If this is not getopt_long_only, - or the option starts with '--' or is not a valid short - option, then it's an error. - Otherwise interpret it as a short option. */ - if (!long_only || argv[optind][1] == '-' - || my_index (optstring, *nextchar) == NULL) - { - if (opterr) - { - if (argv[optind][1] == '-') - /* --option */ - fprintf (stderr, _("%s: unrecognized option `--%s'\n"), - argv[0], nextchar); - else - /* +option or -option */ - fprintf (stderr, _("%s: unrecognized option `%c%s'\n"), - argv[0], argv[optind][0], nextchar); - } - nextchar = (char *) ""; - optind++; - optopt = 0; - return '?'; - } - } - - /* Look at and handle the next short option-character. */ - - { - char c = *nextchar++; - char *temp = my_index (optstring, c); - - /* Increment `optind' when we start to process its last character. */ - if (*nextchar == '\0') - ++optind; - - if (temp == NULL || c == ':') - { - if (opterr) - { - if (posixly_correct) - /* 1003.2 specifies the format of this message. */ - fprintf (stderr, _("%s: illegal option -- %c\n"), - argv[0], c); - else - fprintf (stderr, _("%s: invalid option -- %c\n"), - argv[0], c); - } - optopt = c; - return '?'; - } - /* Convenience. Treat POSIX -W foo same as long option --foo */ - if (temp[0] == 'W' && temp[1] == ';') - { - char *nameend; - const struct option *p; - const struct option *pfound = NULL; - int exact = 0; - int ambig = 0; - int indfound = 0; - int option_index; - - /* This is an option that requires an argument. */ - if (*nextchar != '\0') - { - optarg = nextchar; - /* If we end this ARGV-element by taking the rest as an arg, - we must advance to the next element now. */ - optind++; - } - else if (optind == argc) - { - if (opterr) - { - /* 1003.2 specifies the format of this message. */ - fprintf (stderr, _("%s: option requires an argument -- %c\n"), - argv[0], c); - } - optopt = c; - if (optstring[0] == ':') - c = ':'; - else - c = '?'; - return c; - } - else - /* We already incremented `optind' once; - increment it again when taking next ARGV-elt as argument. */ - optarg = argv[optind++]; - - /* optarg is now the argument, see if it's in the - table of longopts. */ - - for (nextchar = nameend = optarg; *nameend && *nameend != '='; nameend++) - /* Do nothing. */ ; - - /* Test all long options for either exact match - or abbreviated matches. */ - for (p = longopts, option_index = 0; p->name; p++, option_index++) - if (!strncmp (p->name, nextchar, nameend - nextchar)) - { - if ((unsigned int) (nameend - nextchar) == strlen (p->name)) - { - /* Exact match found. */ - pfound = p; - indfound = option_index; - exact = 1; - break; - } - else if (pfound == NULL) - { - /* First nonexact match found. */ - pfound = p; - indfound = option_index; - } - else - /* Second or later nonexact match found. */ - ambig = 1; - } - if (ambig && !exact) - { - if (opterr) - fprintf (stderr, _("%s: option `-W %s' is ambiguous\n"), - argv[0], argv[optind]); - nextchar += strlen (nextchar); - optind++; - return '?'; - } - if (pfound != NULL) - { - option_index = indfound; - if (*nameend) - { - /* Don't test has_arg with >, because some C compilers don't - allow it to be used on enums. */ - if (pfound->has_arg) - optarg = nameend + 1; - else - { - if (opterr) - fprintf (stderr, _("\ -%s: option `-W %s' doesn't allow an argument\n"), - argv[0], pfound->name); - - nextchar += strlen (nextchar); - return '?'; - } - } - else if (pfound->has_arg == 1) - { - if (optind < argc) - optarg = argv[optind++]; - else - { - if (opterr) - fprintf (stderr, - _("%s: option `%s' requires an argument\n"), - argv[0], argv[optind - 1]); - nextchar += strlen (nextchar); - return optstring[0] == ':' ? ':' : '?'; - } - } - nextchar += strlen (nextchar); - if (longind != NULL) - *longind = option_index; - if (pfound->flag) - { - *(pfound->flag) = pfound->val; - return 0; - } - return pfound->val; - } - nextchar = NULL; - return 'W'; /* Let the application handle it. */ - } - if (temp[1] == ':') - { - if (temp[2] == ':') - { - /* This is an option that accepts an argument optionally. */ - if (*nextchar != '\0') - { - optarg = nextchar; - optind++; - } - else - optarg = NULL; - nextchar = NULL; - } - else - { - /* This is an option that requires an argument. */ - if (*nextchar != '\0') - { - optarg = nextchar; - /* If we end this ARGV-element by taking the rest as an arg, - we must advance to the next element now. */ - optind++; - } - else if (optind == argc) - { - if (opterr) - { - /* 1003.2 specifies the format of this message. */ - fprintf (stderr, - _("%s: option requires an argument -- %c\n"), - argv[0], c); - } - optopt = c; - if (optstring[0] == ':') - c = ':'; - else - c = '?'; - } - else - /* We already incremented `optind' once; - increment it again when taking next ARGV-elt as argument. */ - optarg = argv[optind++]; - nextchar = NULL; - } - } - return c; - } -} - -int -getopt (argc, argv, optstring) - int argc; - char *const *argv; - const char *optstring; -{ - return _getopt_internal (argc, argv, optstring, - (const struct option *) 0, - (int *) 0, - 0); -} - -#endif /* Not ELIDE_CODE. */ - -#ifdef TEST - -/* Compile with -DTEST to make an executable for use in testing - the above definition of `getopt'. */ - -int -main (argc, argv) - int argc; - char **argv; -{ - int c; - int digit_optind = 0; - - while (1) - { - int this_option_optind = optind ? optind : 1; - - c = getopt (argc, argv, "abc:d:0123456789"); - if (c == -1) - break; - - switch (c) - { - case '0': - case '1': - case '2': - case '3': - case '4': - case '5': - case '6': - case '7': - case '8': - case '9': - if (digit_optind != 0 && digit_optind != this_option_optind) - printf ("digits occur in two different argv-elements.\n"); - digit_optind = this_option_optind; - printf ("option %c\n", c); - break; - - case 'a': - printf ("option a\n"); - break; - - case 'b': - printf ("option b\n"); - break; - - case 'c': - printf ("option c with value `%s'\n", optarg); - break; - - case '?': - break; - - default: - printf ("?? getopt returned character code 0%o ??\n", c); - } - } - - if (optind < argc) - { - printf ("non-option ARGV-elements: "); - while (optind < argc) - printf ("%s ", argv[optind++]); - printf ("\n"); - } - - exit (0); -} - -#endif /* TEST */ diff --git a/src/cd-paranoia/getopt.h b/src/cd-paranoia/getopt.h deleted file mode 100644 index fb30719a..00000000 --- a/src/cd-paranoia/getopt.h +++ /dev/null @@ -1,133 +0,0 @@ -/* Declarations for getopt. - Copyright (C) 1989,90,91,92,93,94,96,97 Free Software Foundation, Inc. - - NOTE: The canonical source of this file is maintained with the GNU C Library. - Bugs can be reported to bug-glibc@gnu.org. - - 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, 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. */ - -#ifndef _GETOPT_H -#define _GETOPT_H 1 - -#ifdef __cplusplus -extern "C" { -#endif - -/* For communication from `getopt' to the caller. - When `getopt' finds an option that takes an argument, - the argument value is returned here. - Also, when `ordering' is RETURN_IN_ORDER, - each non-option ARGV-element is returned here. */ - -extern char *optarg; - -/* Index in ARGV of the next element to be scanned. - This is used for communication to and from the caller - and for communication between successive calls to `getopt'. - - On entry to `getopt', zero means this is the first call; initialize. - - When `getopt' returns -1, this is the index of the first of the - non-option elements that the caller should itself scan. - - Otherwise, `optind' communicates from one call to the next - how much of ARGV has been scanned so far. */ - -extern int optind; - -/* Callers store zero here to inhibit the error message `getopt' prints - for unrecognized options. */ - -extern int opterr; - -/* Set to an option character which was unrecognized. */ - -extern int optopt; - -/* Describe the long-named options requested by the application. - The LONG_OPTIONS argument to getopt_long or getopt_long_only is a vector - of `struct option' terminated by an element containing a name which is - zero. - - The field `has_arg' is: - no_argument (or 0) if the option does not take an argument, - required_argument (or 1) if the option requires an argument, - optional_argument (or 2) if the option takes an optional argument. - - If the field `flag' is not NULL, it points to a variable that is set - to the value given in the field `val' when the option is found, but - left unchanged if the option is not found. - - To have a long-named option do something other than set an `int' to - a compiled-in constant, such as set a value from `optarg', set the - option's `flag' field to zero and its `val' field to a nonzero - value (the equivalent single-letter option character, if there is - one). For long options that have a zero `flag' field, `getopt' - returns the contents of the `val' field. */ - -struct option -{ -#if defined (__STDC__) && __STDC__ - const char *name; -#else - char *name; -#endif - /* has_arg can't be an enum because some compilers complain about - type mismatches in all the code that assumes it is an int. */ - int has_arg; - int *flag; - int val; -}; - -/* Names for the values of the `has_arg' field of `struct option'. */ - -#define no_argument 0 -#define required_argument 1 -#define optional_argument 2 - -#if defined (__STDC__) && __STDC__ -#ifdef __GNU_LIBRARY__ -/* Many other libraries have conflicting prototypes for getopt, with - differences in the consts, in stdlib.h. To avoid compilation - errors, only prototype getopt for the GNU C library. */ -extern int getopt (int argc, char *const *argv, const char *shortopts); -#else /* not __GNU_LIBRARY__ */ -extern int getopt (); -#endif /* __GNU_LIBRARY__ */ -extern int getopt_long (int argc, char *const *argv, const char *shortopts, - const struct option *longopts, int *longind); -extern int getopt_long_only (int argc, char *const *argv, - const char *shortopts, - const struct option *longopts, int *longind); - -/* Internal only. Users should not call this directly. */ -extern int _getopt_internal (int argc, char *const *argv, - const char *shortopts, - const struct option *longopts, int *longind, - int long_only); -#else /* not __STDC__ */ -extern int getopt (); -extern int getopt_long (); -extern int getopt_long_only (); - -extern int _getopt_internal (); -#endif /* __STDC__ */ - -#ifdef __cplusplus -} -#endif - -#endif /* getopt.h */ diff --git a/src/cd-paranoia/getopt1.c b/src/cd-paranoia/getopt1.c deleted file mode 100644 index ff257374..00000000 --- a/src/cd-paranoia/getopt1.c +++ /dev/null @@ -1,190 +0,0 @@ -/* getopt_long and getopt_long_only entry points for GNU getopt. - Copyright (C) 1987,88,89,90,91,92,93,94,96,97,98 - Free Software Foundation, Inc. - - NOTE: The canonical source of this file is maintained with the GNU C Library. - Bugs can be reported to bug-glibc@gnu.org. - - 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, 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. */ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include "getopt.h" - -#if !defined __STDC__ || !__STDC__ -/* This is a separate conditional since some stdc systems - reject `defined (const)'. */ -#ifndef const -#define const -#endif -#endif - -#include - -/* Comment out all this code if we are using the GNU C Library, and are not - actually compiling the library itself. This code is part of the GNU C - Library, but also included in many other GNU distributions. Compiling - and linking in this code is a waste when using the GNU C library - (especially if it is a shared library). Rather than having every GNU - program understand `configure --with-gnu-libc' and omit the object files, - it is simpler to just do this in the source for each such file. */ - -#define GETOPT_INTERFACE_VERSION 2 -#if !defined _LIBC && defined __GLIBC__ && __GLIBC__ >= 2 -#include -#if _GNU_GETOPT_INTERFACE_VERSION == GETOPT_INTERFACE_VERSION -#define ELIDE_CODE -#endif -#endif - -#ifndef ELIDE_CODE - - -/* This needs to come after some library #include - to get __GNU_LIBRARY__ defined. */ -#ifdef __GNU_LIBRARY__ -#include -#endif - -#ifndef NULL -#define NULL 0 -#endif - -int -getopt_long (argc, argv, options, long_options, opt_index) - int argc; - char *const *argv; - const char *options; - const struct option *long_options; - int *opt_index; -{ - return _getopt_internal (argc, argv, options, long_options, opt_index, 0); -} - -/* Like getopt_long, but '-' as well as '--' can indicate a long option. - If an option that starts with '-' (not '--') doesn't match a long option, - but does match a short option, it is parsed as a short option - instead. */ - -int -getopt_long_only (argc, argv, options, long_options, opt_index) - int argc; - char *const *argv; - const char *options; - const struct option *long_options; - int *opt_index; -{ - return _getopt_internal (argc, argv, options, long_options, opt_index, 1); -} - - -#endif /* Not ELIDE_CODE. */ - -#ifdef TEST - -#include - -int -main (argc, argv) - int argc; - char **argv; -{ - int c; - int digit_optind = 0; - - while (1) - { - int this_option_optind = optind ? optind : 1; - int option_index = 0; - static struct option long_options[] = - { - {"add", 1, 0, 0}, - {"append", 0, 0, 0}, - {"delete", 1, 0, 0}, - {"verbose", 0, 0, 0}, - {"create", 0, 0, 0}, - {"file", 1, 0, 0}, - {0, 0, 0, 0} - }; - - c = getopt_long (argc, argv, "abc:d:0123456789", - long_options, &option_index); - if (c == -1) - break; - - switch (c) - { - case 0: - printf ("option %s", long_options[option_index].name); - if (optarg) - printf (" with arg %s", optarg); - printf ("\n"); - break; - - case '0': - case '1': - case '2': - case '3': - case '4': - case '5': - case '6': - case '7': - case '8': - case '9': - if (digit_optind != 0 && digit_optind != this_option_optind) - printf ("digits occur in two different argv-elements.\n"); - digit_optind = this_option_optind; - printf ("option %c\n", c); - break; - - case 'a': - printf ("option a\n"); - break; - - case 'b': - printf ("option b\n"); - break; - - case 'c': - printf ("option c with value `%s'\n", optarg); - break; - - case 'd': - printf ("option d with value `%s'\n", optarg); - break; - - case '?': - break; - - default: - printf ("?? getopt returned character code 0%o ??\n", c); - } - } - - if (optind < argc) - { - printf ("non-option ARGV-elements: "); - while (optind < argc) - printf ("%s ", argv[optind++]); - printf ("\n"); - } - - exit (0); -} - -#endif /* TEST */ diff --git a/src/cd-read.c b/src/cd-read.c index ea73aa7a..eef5ea76 100644 --- a/src/cd-read.c +++ b/src/cd-read.c @@ -1,5 +1,5 @@ /* - $Id: cd-read.c,v 1.25 2005/09/18 20:34:02 rocky Exp $ + $Id: cd-read.c,v 1.26 2005/10/05 09:48:12 rocky Exp $ Copyright (C) 2003, 2004, 2005 Rocky Bernstein @@ -34,15 +34,19 @@ /* Configuration option codes */ enum { + OP_HANDLED = 0, - /* These correspond to driver_id_t in cdio.h and have to MATCH! */ - OP_SOURCE_UNDEF = DRIVER_UNKNOWN, + /* NOTE: libpopt version associated these with drivers. That + appeared to be an unused historical artifact. + */ OP_SOURCE_AUTO, OP_SOURCE_BIN, OP_SOURCE_CUE, - OP_SOURCE_NRG = DRIVER_NRG, - OP_SOURCE_CDRDAO = DRIVER_CDRDAO, - OP_SOURCE_DEVICE = DRIVER_DEVICE, + OP_SOURCE_NRG, + OP_SOURCE_CDRDAO, + OP_SOURCE_DEVICE, + + OP_USAGE, /* These are the remaining configuration options */ OP_READ_MODE, @@ -173,173 +177,198 @@ process_suboption(const char *subopt, subopt_entry_t *sublist, const int num, } } + +/* Parse source options. */ +static void +parse_source(int opt) +{ + /* NOTE: The libpopt version made use of an extra temporary + variable (psz_my_source) for all sources _except_ devices. + This distinction seemed to serve no purpose. + */ + /* NOTE: The libpopt version had a bug which kept it from + processing toc-file inputs + */ + + if (opts.source_image != INPUT_UNKNOWN) { + report( stderr, "%s: another source type option given before.\n", + program_name ); + report( stderr, "%s: give only one source type option.\n", + program_name ); + return; + } + + /* For all input sources which are not a DEVICE, we need to make + a copy of the string; for a DEVICE the fill-out routine makes + the copy. + */ + if (OP_SOURCE_DEVICE != opt) + if (optarg != NULL) source_name = strdup(optarg); + + switch (opt) { + case OP_SOURCE_BIN: + opts.source_image = INPUT_BIN; + break; + case OP_SOURCE_CUE: + opts.source_image = INPUT_CUE; + break; + case OP_SOURCE_NRG: + opts.source_image = INPUT_NRG; + break; + case OP_SOURCE_AUTO: + opts.source_image = INPUT_AUTO; + break; + case OP_SOURCE_DEVICE: + opts.source_image = INPUT_DEVICE; + if (optarg != NULL) source_name = fillout_device_name(optarg); + break; + } +} + + /* Parse a options. */ static bool -parse_options (int argc, const char *argv[]) +parse_options (int argc, char *argv[]) { - int opt; - char *psz_my_source; - char *opt_arg; - /* Command-line options */ - struct poptOption optionsTable[] = { + const char* helpText = + "Usage: %s [OPTION...]\n" + " -a, --access-mode=STRING Set CD control access mode\n" + " -m, --mode=MODE-TYPE set CD-ROM read mode (audio, m1f1, m1f2,\n" + " m2mf1, m2f2)\n" + " -d, --debug=INT Set debugging to LEVEL\n" + " -x, --hexdump Show output as a hex dump. The default is a\n" + " hex dump when output goes to stdout and no\n" + " hex dump when output is to a file.\n" + " --no-header Don't display header and copyright (for\n" + " regression testing)\n" + " --no-hexdump Don't show output as a hex dump.\n" + " -s, --start=INT Set LBA to start reading from\n" + " -e, --end=INT Set LBA to end reading from\n" + " -n, --number=INT Set number of sectors to read\n" + " -b, --bin-file[=FILE] set \"bin\" CD-ROM disk image file as source\n" + " -c, --cue-file[=FILE] set \"cue\" CD-ROM disk image file as source\n" + " -i, --input[=FILE] set source and determine if \"bin\" image or\n" + " device\n" + " -C, --cdrom-device[=DEVICE] set CD-ROM device as source\n" + " -N, --nrg-file[=FILE] set Nero CD-ROM disk image file as source\n" + " -t, --toc-file[=FILE] set \"TOC\" CD-ROM disk image file as source\n" + " -o, --output-file=FILE Output blocks to file rather than give a\n" + " hexdump.\n" + " -V, --version display version and copyright information\n" + " and exit\n" + "\n" + "Help options:\n" + " -?, --help Show this help message\n" + " --usage Display brief usage message\n"; - {"access-mode", 'a', POPT_ARG_STRING, &opts.access_mode, 0, - "Set CD control access mode"}, - - {"mode", 'm', - POPT_ARG_STRING, &opt_arg, - OP_READ_MODE, - "set CD-ROM read mode (audio, m1f1, m1f2, m2mf1, m2f2)", - "MODE-TYPE"}, - - {"debug", 'd', - POPT_ARG_INT, &opts.debug_level, 0, - "Set debugging to LEVEL"}, - - {"hexdump", 'x', POPT_ARG_NONE, &opts.hexdump, 0, - "Show output as a hex dump. The default is a hex dump when " - "output goes to stdout and no hex dump when output is to a file."}, - - {"no-header", '\0', POPT_ARG_NONE, &opts.no_header, - 0, "Don't display header and copyright (for regression testing)"}, - - {"no-hexdump", '\0', POPT_ARG_NONE, &opts.nohexdump, 0, - "Don't show output as a hex dump."}, - - {"start", 's', - POPT_ARG_INT, &opts.start_lsn, 0, - "Set LBA to start reading from"}, - - {"end", 'e', - POPT_ARG_INT, &opts.end_lsn, 0, - "Set LBA to end reading from"}, - - {"number", 'n', - POPT_ARG_INT, &opts.num_sectors, 0, - "Set number of sectors to read"}, - - {"bin-file", 'b', POPT_ARG_STRING|POPT_ARGFLAG_OPTIONAL, &psz_my_source, - OP_SOURCE_BIN, "set \"bin\" CD-ROM disk image file as source", "FILE"}, - - {"cue-file", 'c', POPT_ARG_STRING|POPT_ARGFLAG_OPTIONAL, &psz_my_source, - OP_SOURCE_CUE, "set \"cue\" CD-ROM disk image file as source", "FILE"}, - - {"input", 'i', POPT_ARG_STRING|POPT_ARGFLAG_OPTIONAL, &psz_my_source, - OP_SOURCE_AUTO, - "set source and determine if \"bin\" image or device", "FILE"}, - - {"cdrom-device", 'C', POPT_ARG_STRING|POPT_ARGFLAG_OPTIONAL, &source_name, - OP_SOURCE_DEVICE, - "set CD-ROM device as source", "DEVICE"}, - - {"nrg-file", 'N', POPT_ARG_STRING|POPT_ARGFLAG_OPTIONAL, &psz_my_source, - OP_SOURCE_NRG, "set Nero CD-ROM disk image file as source", "FILE"}, - - {"toc-file", 't', POPT_ARG_STRING|POPT_ARGFLAG_OPTIONAL, &psz_my_source, - OP_SOURCE_CDRDAO, "set \"TOC\" CD-ROM disk image file as source", "FILE"}, - - {"output-file", 'o', POPT_ARG_STRING, &opts.output_file, 0, - "Output blocks to file rather than give a hexdump.", "FILE"}, - - {"version", 'V', POPT_ARG_NONE, NULL, OP_VERSION, - "display version and copyright information and exit"}, - POPT_AUTOHELP {NULL, 0, 0, NULL, 0} + const char* usageText = + "Usage: %s [-a|--access-mode STRING] [-m|--mode MODE-TYPE]\n" + " [-d|--debug INT] [-x|--hexdump] [--no-header] [--no-hexdump]\n" + " [-s|--start INT] [-e|--end INT] [-n|--number INT] [-b|--bin-file FILE]\n" + " [-c|--cue-file FILE] [-i|--input FILE] [-C|--cdrom-device DEVICE]\n" + " [-N|--nrg-file FILE] [-t|--toc-file FILE] [-o|--output-file FILE]\n" + " [-V|--version] [-?|--help] [--usage]\n"; + + /* Command-line options */ + const char* optionsString = "a:m:d:xs:e:n:b::c::i::C::N::t::o:V?"; + struct option optionsTable[] = { + + {"access-mode", required_argument, NULL, 'a'}, + {"mode", required_argument, NULL, 'm'}, + {"debug", required_argument, NULL, 'd'}, + {"hexdump", no_argument, NULL, 'x'}, + {"no-header", no_argument, &opts.no_header, 1}, + {"no-hexdump", no_argument, &opts.nohexdump, 1}, + {"start", required_argument, NULL, 's'}, + {"end", required_argument, NULL, 'e'}, + {"number", required_argument, NULL, 'n'}, + {"bin-file", optional_argument, NULL, 'b'}, + {"cue-file", optional_argument, NULL, 'c'}, + {"input", optional_argument, NULL, 'i'}, + {"cdrom-device", optional_argument, NULL, 'C'}, + {"nrg-file", optional_argument, NULL, 'N'}, + {"toc-file", optional_argument, NULL, 't'}, + {"output-file", required_argument, NULL, 'o'}, + {"version", no_argument, NULL, 'V'}, + + {"help", no_argument, NULL, '?' }, + {"usage", no_argument, NULL, OP_USAGE }, + { NULL, 0, NULL, 0 } }; - poptContext optCon = poptGetContext (NULL, argc, argv, optionsTable, 0); program_name = strrchr(argv[0],'/'); program_name = program_name ? strdup(program_name+1) : strdup(argv[0]); - while ((opt = poptGetNextOpt (optCon)) >= 0) + while ((opt = getopt_long(argc, argv, optionsString, optionsTable, NULL)) >= 0) switch (opt) { - case OP_SOURCE_AUTO: - case OP_SOURCE_BIN: - case OP_SOURCE_CUE: - case OP_SOURCE_NRG: - case OP_SOURCE_DEVICE: - if (opts.source_image != INPUT_UNKNOWN) { - report( stderr, "%s: another source type option given before.\n", - program_name ); - report( stderr, "%s: give only one source type option.\n", - program_name ); - break; - } - - /* For all input sources which are not a DEVICE, we need to make - a copy of the string; for a DEVICE the fill-out routine makes - the copy. - */ - if (OP_SOURCE_DEVICE != opt) - source_name = strdup(psz_my_source); - - switch (opt) { - case OP_SOURCE_BIN: - opts.source_image = INPUT_BIN; - break; - case OP_SOURCE_CUE: - opts.source_image = INPUT_CUE; - break; - case OP_SOURCE_NRG: - opts.source_image = INPUT_NRG; - break; - case OP_SOURCE_AUTO: - opts.source_image = INPUT_AUTO; - break; - case OP_SOURCE_DEVICE: - opts.source_image = INPUT_DEVICE; - source_name = fillout_device_name(source_name); - break; - } - break; - - case OP_READ_MODE: - process_suboption(opt_arg, modes_sublist, + case 'a': opts.access_mode = strdup(optarg); break; + case 'd': opts.debug_level = atoi(optarg); break; + case 'x': opts.hexdump = 1; break; + case 's': opts.start_lsn = atoi(optarg); break; + case 'e': opts.end_lsn = atoi(optarg); break; + case 'n': opts.num_sectors = atoi(optarg); break; + case 'b': parse_source(OP_SOURCE_BIN); break; + case 'c': parse_source(OP_SOURCE_CUE); break; + case 'i': parse_source(OP_SOURCE_AUTO); break; + case 'C': parse_source(OP_SOURCE_DEVICE); break; + case 'N': parse_source(OP_SOURCE_NRG); break; + case 't': parse_source(OP_SOURCE_CDRDAO); break; + case 'o': opts.output_file = strdup(optarg); break; + + case 'm': + process_suboption(optarg, modes_sublist, sizeof(modes_sublist) / sizeof(subopt_entry_t), "--mode"); break; - case OP_VERSION: + + case 'V': print_version(program_name, VERSION, 0, true); - poptFreeContext(optCon); free(program_name); exit (EXIT_SUCCESS); break; + + case '?': + fprintf(stderr, helpText, program_name); + free(program_name); + exit(EXIT_FAILURE); + break; + + case OP_USAGE: + fprintf(stderr, usageText, program_name); + free(program_name); + exit(EXIT_FAILURE); + break; + + case OP_HANDLED: + break; } - if (opt < -1) { - report( stderr, "%s: %s\n", - poptBadOption(optCon, POPT_BADOPTION_NOALIAS), - poptStrerror(opt) ); - free(program_name); - exit (EXIT_FAILURE); - } - - { - const char *remaining_arg = poptGetArg(optCon); - if ( remaining_arg != NULL) { - if (opts.source_image != INPUT_UNKNOWN) { - report( stderr, "%s: Source specified in option %s and as %s\n", - program_name, source_name, remaining_arg ); - poptFreeContext(optCon); - free(program_name); - exit (EXIT_FAILURE); - } + if (optind < argc) { + const char *remaining_arg = argv[optind++]; + + /* NOTE: A bug in the libpopt version checked source_image, which + rendered the subsequent source_image test useless. + */ + if (source_name != NULL) { + report( stderr, "%s: Source specified in option %s and as %s\n", + program_name, source_name, remaining_arg ); + free(program_name); + exit (EXIT_FAILURE); + } + + if (opts.source_image == INPUT_DEVICE) + source_name = fillout_device_name(remaining_arg); + else + source_name = strdup(remaining_arg); - if (opts.source_image == OP_SOURCE_DEVICE) - source_name = fillout_device_name(remaining_arg); - else - source_name = strdup(remaining_arg); - - if ( (poptGetArgs(optCon)) != NULL) { - report( stderr, "%s: Source specified in previously %s and %s\n", - program_name, source_name, remaining_arg ); - poptFreeContext(optCon); - free(program_name); - exit (EXIT_FAILURE); - - } + if (optind < argc) { + report( stderr, "%s: Source specified in previously %s and %s\n", + program_name, source_name, remaining_arg ); + free(program_name); + exit (EXIT_FAILURE); } } @@ -354,7 +383,6 @@ parse_options (int argc, const char *argv[]) "%s: Need to give a read mode " "(audio, m1f1, m1f2, m2f1 or m2f2)\n", program_name ); - poptFreeContext(optCon); free(program_name); exit(10); } @@ -382,7 +410,6 @@ parse_options (int argc, const char *argv[]) " the sector to read (%lu)\n", program_name, (unsigned long) opts.end_lsn, (unsigned long) opts.num_sectors ); - poptFreeContext(optCon); exit(12); } opts.start_lsn = opts.end_lsn - opts.num_sectors + 1; @@ -401,7 +428,6 @@ parse_options (int argc, const char *argv[]) "%s: end LSN (%lu) needs to be less than start LSN (%lu)\n", program_name, (unsigned long) opts.start_lsn, (unsigned long) opts.end_lsn ); - poptFreeContext(optCon); free(program_name); exit(13); } @@ -412,14 +438,12 @@ parse_options (int argc, const char *argv[]) "and count (%d)\n", program_name, (unsigned long) opts.start_lsn, (unsigned long) opts.end_lsn, opts.num_sectors ); - poptFreeContext(optCon); free(program_name); exit(14); } opts.num_sectors = opts.end_lsn - opts.start_lsn + 1; } - poptFreeContext(optCon); return true; } @@ -454,7 +478,7 @@ init(void) } int -main(int argc, const char *argv[]) +main(int argc, char *argv[]) { uint8_t buffer[CDIO_CD_FRAMESIZE_RAW] = { 0, }; unsigned int blocklen=CDIO_CD_FRAMESIZE_RAW; diff --git a/src/iso-info.c b/src/iso-info.c index afb93c5f..081e2abe 100644 --- a/src/iso-info.c +++ b/src/iso-info.c @@ -1,5 +1,5 @@ /* - $Id: iso-info.c,v 1.30 2005/03/18 12:56:00 rocky Exp $ + $Id: iso-info.c,v 1.31 2005/10/05 09:48:12 rocky Exp $ Copyright (C) 2004, 2005 Rocky Bernstein @@ -47,6 +47,7 @@ #include +#include #if 0 #define STRONG "\033[1m" @@ -73,7 +74,10 @@ struct arguments /* Configuration option codes */ enum { - + OP_HANDLED = 0, + + OP_USAGE, + /* These are the remaining configuration options */ OP_VERSION, @@ -84,75 +88,95 @@ char *temp_str; /* Parse a all options. */ static bool -parse_options (int argc, const char *argv[]) +parse_options (int argc, char *argv[]) { int opt; - struct poptOption optionsTable[] = { - {"debug", 'd', POPT_ARG_INT, &opts.debug_level, 0, - "Set debugging to LEVEL"}, - - {"input", 'i', POPT_ARG_STRING|POPT_ARGFLAG_OPTIONAL, &source_name, 0, - "Filename to read ISO-9960 image from", "FILE"}, - - {'\0', 'f', POPT_ARG_NONE, &opts.print_iso9660_short, 0, - "Generate output similar to 'find . -print'"}, - - {"iso9660", 'l', POPT_ARG_NONE, &opts.print_iso9660, 0, - "Generate output similar to 'ls -lR'"}, - - {"no-header", '\0', POPT_ARG_NONE, &opts.no_header, - 0, "Don't display header and copyright (for regression testing)"}, - + const char* helpText = + "Usage: %s [OPTION...]\n" + " -d, --debug=INT Set debugging to LEVEL\n" + " -i, --input[=FILE] Filename to read ISO-9960 image from\n" + " -f Generate output similar to 'find . -print'\n" + " -l, --iso9660 Generate output similar to 'ls -lR'\n" + " --no-header Don't display header and copyright (for regression\n" + " testing)\n" #ifdef HAVE_JOLIET - {"no-joliet", '\0', POPT_ARG_NONE, &opts.no_joliet, - 0, "Don't use Joliet-extension information"}, + " --no-joliet Don't use Joliet-extension information\n" #endif /*HAVE_JOLIET*/ - - {"no-rock-ridge", '\0', POPT_ARG_NONE, &opts.no_rock_ridge, - 0, "Don't use Rock-Ridge-extension information"}, + " --no-rock-ridge Don't use Rock-Ridge-extension information\n" + " --no-xa Don't use XA-extension information\n" + " -q, --quiet Don't produce warning output\n" + " -V, --version display version and copyright information and exit\n" + "\n" + "Help options:\n" + " -?, --help Show this help message\n" + " --usage Display brief usage message\n"; - {"no-xa", '\0', POPT_ARG_NONE, &opts.no_xa, - 0, "Don't use XA-extension information"}, + const char* usageText = + "Usage: %s [-d|--debug INT] [-i|--input FILE] [-f] [-l|--iso9660]\n" + " [--no-header] [--no-joliet] [--no-rock-ridge] [--no-xa] [-q|--quiet]\n" + " [-V|--version] [-?|--help] [--usage]\n"; - {"quiet", 'q', POPT_ARG_NONE, &opts.silent, 0, - "Don't produce warning output" }, - - {"version", 'V', POPT_ARG_NONE, &opts.version_only, 0, - "display version and copyright information and exit"}, - POPT_AUTOHELP {NULL, 0, 0, NULL, 0} + const char* optionsString = "d:i::flqV?"; + struct option optionsTable[] = { + {"debug", required_argument, NULL, 'd'}, + {"input", optional_argument, NULL, 'i'}, + {"iso9660", no_argument, NULL, 'l'}, + {"no-header", no_argument, &opts.no_header, 1 }, +#ifdef HAVE_JOLIET + {"no-joliet", no_argument, &opts.no_joliet, 1 }, +#endif /*HAVE_JOLIET*/ + {"no-rock-ridge", no_argument, &opts.no_rock_ridge, 1 }, + {"no-xa", no_argument, &opts.no_xa, 1 }, + {"quiet", no_argument, NULL, 'q'}, + {"version", no_argument, NULL, 'V'}, + + {"help", no_argument, NULL, '?' }, + {"usage", no_argument, NULL, OP_USAGE }, + { NULL, 0, NULL, 0 } }; - poptContext optCon = poptGetContext (NULL, argc, argv, optionsTable, 0); program_name = strrchr(argv[0],'/'); program_name = program_name ? strdup(program_name+1) : strdup(argv[0]); - while ((opt = poptGetNextOpt (optCon)) >= 0) { - ; - } - if (opt < -1) { - /* an error occurred during option processing */ - report(stderr, "%s: %s\n", - poptBadOption(optCon, POPT_BADOPTION_NOALIAS), - poptStrerror(opt)); - free(program_name); - exit (EXIT_FAILURE); - } - { - const char *remaining_arg = poptGetArg(optCon); - if ( remaining_arg != NULL) { - if ( (poptGetArgs(optCon)) != NULL) { - report( stderr, "%s: Source specified in previously %s and %s\n", - program_name, source_name, remaining_arg ); - poptFreeContext(optCon); - free(program_name); - exit (EXIT_FAILURE); + while ((opt = getopt_long(argc, argv, optionsString, optionsTable, NULL)) >= 0) { + switch (opt) + { + case 'd': opts.debug_level = atoi(optarg); break; + case 'i': if (optarg != NULL) source_name = strdup(optarg); break; + case 'f': opts.print_iso9660_short = 1; break; + case 'l': opts.print_iso9660 = 1; break; + case 'q': opts.silent = 1; break; + case 'V': opts.version_only = 1; break; + + case '?': + fprintf(stderr, helpText, program_name); + free(program_name); + exit(EXIT_FAILURE); + break; + + case OP_USAGE: + fprintf(stderr, usageText, program_name); + free(program_name); + exit(EXIT_FAILURE); + break; + + case OP_HANDLED: + break; } - source_name = strdup(remaining_arg); + } + + if (optind < argc) { + const char *remaining_arg = argv[optind++]; + if ( optind < argc ) { + report( stderr, "%s: Source specified in previously %s and %s\n", + program_name, source_name, remaining_arg ); + free(program_name); + exit (EXIT_FAILURE); } + source_name = strdup(remaining_arg); } - poptFreeContext(optCon); return true; } @@ -286,7 +310,7 @@ init(void) /* ------------------------------------------------------------------------ */ int -main(int argc, const char *argv[]) +main(int argc, char *argv[]) { iso9660_t *p_iso=NULL; diff --git a/src/iso-read.c b/src/iso-read.c index c5e22474..c7478784 100644 --- a/src/iso-read.c +++ b/src/iso-read.c @@ -1,5 +1,5 @@ /* - $Id: iso-read.c,v 1.9 2005/02/19 11:43:05 rocky Exp $ + $Id: iso-read.c,v 1.10 2005/10/05 09:48:12 rocky Exp $ Copyright (C) 2004, 2005 Rocky Bernstein @@ -45,6 +45,8 @@ #include #endif +#include + /* Used by `main' to communicate with `parse_opt'. And global options */ struct arguments @@ -58,100 +60,112 @@ struct arguments /* Parse a options. */ static bool -parse_options (int argc, const char *argv[]) +parse_options (int argc, char *argv[]) { int opt; /* Configuration option codes */ enum { - OP_VERSION=1 + OP_HANDLED = 0, + OP_VERSION=1, + OP_USAGE }; + const char* helpText = + "Usage: %s [OPTION...]\n" + " -d, --debug=INT Set debugging to LEVEL.\n" + " -i, --image=FILE Read from ISO-9660 image. This option is mandatory\n" + " -e, --extract=FILE Extract FILE from ISO-9660 image. This option is\n" + " mandatory.\n" + " --no-header Don't display header and copyright (for\n" + " regression testing)\n" + " -o, --output-file=FILE Output file. This option is mandatory.\n" + " -V, --version display version and copyright information and exit\n" + "\n" + "Help options:\n" + " -?, --help Show this help message\n" + " --usage Display brief usage message\n"; - /* Command-line options */ - struct poptOption optionsTable[] = { + const char* usageText = + "Usage: %s [-d|--debug INT] [-i|--image FILE] [-e|--extract FILE]\n" + " [--no-header] [-o|--output-file FILE] [-V|--version] [-?|--help]\n" + " [--usage]\n"; - {"debug", 'd', - POPT_ARG_INT, &opts.debug_level, 0, - "Set debugging to LEVEL."}, - - {"image", 'i', POPT_ARG_STRING, &opts.iso9660_image, 0, - "Read from ISO-9660 image. This option is mandatory", - "FILE"}, - - {"extract", 'e', POPT_ARG_STRING, &opts.file_name, 0, - "Extract FILE from ISO-9660 image. This option is mandatory.", - "FILE"}, - - {"no-header", '\0', POPT_ARG_NONE, &opts.no_header, - 0, "Don't display header and copyright (for regression testing)"}, + /* Command-line options */ + const char* optionsString = "d:i:e:o:V?"; + struct option optionsTable[] = { + {"debug", required_argument, NULL, 'd' }, + {"image", required_argument, NULL, 'i' }, + {"extract", required_argument, NULL, 'e' }, + {"no-header", no_argument, &opts.no_header, 1 }, + {"output-file", required_argument, NULL, 'o' }, + {"version", no_argument, NULL, 'V' }, - {"output-file", 'o', POPT_ARG_STRING, &opts.output_file, 0, - "Output file. This option is mandatory.", "FILE"}, - - {"version", 'V', POPT_ARG_NONE, NULL, OP_VERSION, - "display version and copyright information and exit"}, - POPT_AUTOHELP {NULL, 0, 0, NULL, 0} + {"help", no_argument, NULL, '?' }, + {"usage", no_argument, NULL, OP_USAGE }, + { NULL, 0, NULL, 0 } }; - poptContext optCon = poptGetContext (NULL, argc, argv, optionsTable, 0); program_name = strrchr(argv[0],'/'); program_name = program_name ? strdup(program_name+1) : strdup(argv[0]); - while ((opt = poptGetNextOpt (optCon)) != -1) + while ((opt = getopt_long(argc, argv, optionsString, optionsTable, NULL)) != -1) switch (opt) { - case OP_VERSION: + case 'd': opts.debug_level = atoi(optarg); break; + case 'i': opts.iso9660_image = strdup(optarg); break; + case 'e': opts.file_name = strdup(optarg); break; + case 'o': opts.output_file = strdup(optarg); break; + + case 'V': print_version(program_name, CDIO_VERSION, 0, true); - poptFreeContext(optCon); free(program_name); exit (EXIT_SUCCESS); break; - default: - report( stderr, "%s: %s\n", - poptBadOption(optCon, POPT_BADOPTION_NOALIAS), - poptStrerror(opt) ); - report( stderr, "Error while parsing command line - try --help.\n" ); - poptFreeContext(optCon); - free(program_name); - exit (EXIT_FAILURE); + case '?': + fprintf(stderr, helpText, program_name); + free(program_name); + exit(EXIT_FAILURE); + break; + + case OP_USAGE: + fprintf(stderr, usageText, program_name); + free(program_name); + exit(EXIT_FAILURE); + break; + + case OP_HANDLED: + break; } - { - const char *remaining_arg = poptGetArg(optCon); - if ( remaining_arg != NULL) { - if (opts.iso9660_image != NULL) { - report( stderr, "%s: Source specified as --image %s and as %s\n", - program_name, opts.iso9660_image, remaining_arg ); - poptFreeContext(optCon); - free(program_name); - exit (EXIT_FAILURE); - } - - opts.iso9660_image = strdup(remaining_arg); - - if ( (poptGetArgs(optCon)) != NULL) { - report( stderr, - "%s: use only one unnamed argument for the ISO 9660 " - "image name\n", - program_name ); - poptFreeContext(optCon); - free(program_name); - exit (EXIT_FAILURE); - - } + if (optind < argc) { + const char *remaining_arg = argv[optind++]; + if (opts.iso9660_image != NULL) { + report( stderr, "%s: Source specified as --image %s and as %s\n", + program_name, opts.iso9660_image, remaining_arg ); + free(program_name); + exit (EXIT_FAILURE); + } + + opts.iso9660_image = strdup(remaining_arg); + + if (optind < argc ) { + report( stderr, + "%s: use only one unnamed argument for the ISO 9660 " + "image name\n", + program_name ); + free(program_name); + exit (EXIT_FAILURE); } } - poptFreeContext(optCon); - if (NULL == opts.iso9660_image) { report( stderr, "%s: you need to specify an ISO-9660 image name.\n", - program_name ); + program_name ); report( stderr, "%s: Use option --image or try --help.\n", - program_name ); + program_name ); exit (EXIT_FAILURE); } @@ -185,7 +199,7 @@ init(void) } int -main(int argc, const char *argv[]) +main(int argc, char *argv[]) { iso9660_stat_t *statbuf; FILE *outfd; diff --git a/src/util.h b/src/util.h index 7267742a..568445ac 100644 --- a/src/util.h +++ b/src/util.h @@ -1,5 +1,5 @@ /* - $Id: util.h,v 1.12 2005/02/21 09:00:53 rocky Exp $ + $Id: util.h,v 1.13 2005/10/05 09:48:12 rocky Exp $ Copyright (C) 2003, 2004, 2005 Rocky Bernstein @@ -44,10 +44,13 @@ #include #endif -#include -/* Accomodate to older popt that doesn't support the "optional" flag */ -#ifndef POPT_ARGFLAG_OPTIONAL -#define POPT_ARGFLAG_OPTIONAL 0 +/* FreeBSD 4 has getopt in unistd.h. So we include that before + getopt.h */ +#ifdef HAVE_UNISTD_H +#include +#endif +#ifdef HAVE_GETOPT_H +#include #endif #ifdef ENABLE_NLS