initial import; split up on main.c
authorJosh Coalson <jcoalson@users.sourceforce.net>
Fri, 8 Nov 2002 06:07:20 +0000 (06:07 +0000)
committerJosh Coalson <jcoalson@users.sourceforce.net>
Fri, 8 Nov 2002 06:07:20 +0000 (06:07 +0000)
src/metaflac/operations.c [new file with mode: 0644]
src/metaflac/operations.h [new file with mode: 0644]
src/metaflac/operations_shorthand_seektable.c [new file with mode: 0644]
src/metaflac/operations_shorthand_streaminfo.c [new file with mode: 0644]
src/metaflac/operations_shorthand_vorbiscomment.c [new file with mode: 0644]
src/metaflac/options.c [new file with mode: 0644]
src/metaflac/options.h [new file with mode: 0644]
src/metaflac/usage.c [new file with mode: 0644]
src/metaflac/usage.h [new file with mode: 0644]
src/metaflac/utils.c [new file with mode: 0644]
src/metaflac/utils.h [new file with mode: 0644]

diff --git a/src/metaflac/operations.c b/src/metaflac/operations.c
new file mode 100644 (file)
index 0000000..a9922de
--- /dev/null
@@ -0,0 +1,573 @@
+/* metaflac - Command-line FLAC metadata editor
+ * Copyright (C) 2001,2002  Josh Coalson
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+#include "operations.h"
+#include "usage.h"
+#include "utils.h"
+#include "FLAC/assert.h"
+#include "FLAC/metadata.h"
+#include "share/grabbag.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+static void show_version();
+static FLAC__bool do_major_operation(const CommandLineOptions *options);
+static FLAC__bool do_major_operation_on_file(const char *filename, const CommandLineOptions *options);
+static FLAC__bool do_major_operation__list(const char *filename, FLAC__Metadata_Chain *chain, const CommandLineOptions *options);
+static FLAC__bool do_major_operation__append(FLAC__Metadata_Chain *chain, const CommandLineOptions *options);
+static FLAC__bool do_major_operation__remove(FLAC__Metadata_Chain *chain, const CommandLineOptions *options);
+static FLAC__bool do_major_operation__remove_all(FLAC__Metadata_Chain *chain, const CommandLineOptions *options);
+static FLAC__bool do_shorthand_operations(const CommandLineOptions *options);
+static FLAC__bool do_shorthand_operations_on_file(const char *filename, const CommandLineOptions *options);
+static FLAC__bool do_shorthand_operation(const char *filename, FLAC__Metadata_Chain *chain, const Operation *operation, FLAC__bool *needs_write, FLAC__bool utf8_convert);
+static FLAC__bool do_shorthand_operation__add_replay_gain(char **filenames, unsigned num_files, FLAC__bool preserve_modtime);
+static FLAC__bool do_shorthand_operation__add_padding(const char *filename, FLAC__Metadata_Chain *chain, unsigned length, FLAC__bool *needs_write);
+
+static FLAC__bool passes_filter(const CommandLineOptions *options, const FLAC__StreamMetadata *block, unsigned block_number);
+static void write_metadata(const char *filename, FLAC__StreamMetadata *block, unsigned block_number, FLAC__bool raw, FLAC__bool hexdump_application);
+
+/* from operations_shorthand_seektable.c */
+extern FLAC__bool do_shorthand_operation__add_seekpoints(const char *filename, FLAC__Metadata_Chain *chain, const char *specification, FLAC__bool *needs_write);
+
+/* from operations_shorthand_streaminfo.c */
+extern FLAC__bool do_shorthand_operation__streaminfo(const char *filename, FLAC__Metadata_Chain *chain, const Operation *operation, FLAC__bool *needs_write);
+
+/* from operations_shorthand_vorbiscomment.c */
+extern FLAC__bool do_shorthand_operation__vorbis_comment(const char *filename, FLAC__Metadata_Chain *chain, const Operation *operation, FLAC__bool *needs_write, FLAC__bool raw);
+
+FLAC__bool do_operations(const CommandLineOptions *options)
+{
+       FLAC__bool ok = true;
+
+       if(options->show_long_help) {
+               long_usage(0);
+       }
+       if(options->show_version) {
+               show_version();
+       }
+       else if(options->args.checks.num_major_ops > 0) {
+               FLAC__ASSERT(options->args.checks.num_shorthand_ops == 0);
+               FLAC__ASSERT(options->args.checks.num_major_ops == 1);
+               FLAC__ASSERT(options->args.checks.num_major_ops == options->ops.num_operations);
+               ok = do_major_operation(options);
+       }
+       else if(options->args.checks.num_shorthand_ops > 0) {
+               FLAC__ASSERT(options->args.checks.num_shorthand_ops == options->ops.num_operations);
+               ok = do_shorthand_operations(options);
+       }
+
+       return ok;
+}
+
+/*
+ * local routines
+ */
+
+void show_version()
+{
+       printf("metaflac %s\n", FLAC__VERSION_STRING);
+}
+
+FLAC__bool do_major_operation(const CommandLineOptions *options)
+{
+       unsigned i;
+       FLAC__bool ok = true;
+
+       /*@@@ to die after first error,  v---  add '&& ok' here */
+       for(i = 0; i < options->num_files; i++)
+               ok &= do_major_operation_on_file(options->filenames[i], options);
+
+       return ok;
+}
+
+FLAC__bool do_major_operation_on_file(const char *filename, const CommandLineOptions *options)
+{
+       FLAC__bool ok = true, needs_write = false;
+       FLAC__Metadata_Chain *chain = FLAC__metadata_chain_new();
+
+       if(0 == chain)
+               die("out of memory allocating chain");
+
+       if(!FLAC__metadata_chain_read(chain, filename)) {
+               fprintf(stderr, "%s: ERROR: reading metadata, status = \"%s\"\n", filename, FLAC__Metadata_ChainStatusString[FLAC__metadata_chain_status(chain)]);
+               return false;
+       }
+
+       switch(options->ops.operations[0].type) {
+               case OP__LIST:
+                       ok = do_major_operation__list(options->prefix_with_filename? filename : 0, chain, options);
+                       break;
+               case OP__APPEND:
+                       ok = do_major_operation__append(chain, options);
+                       needs_write = true;
+                       break;
+               case OP__REMOVE:
+                       ok = do_major_operation__remove(chain, options);
+                       needs_write = true;
+                       break;
+               case OP__REMOVE_ALL:
+                       ok = do_major_operation__remove_all(chain, options);
+                       needs_write = true;
+                       break;
+               case OP__MERGE_PADDING:
+                       FLAC__metadata_chain_merge_padding(chain);
+                       needs_write = true;
+                       break;
+               case OP__SORT_PADDING:
+                       FLAC__metadata_chain_sort_padding(chain);
+                       needs_write = true;
+                       break;
+               default:
+                       FLAC__ASSERT(0);
+                       return false;
+       }
+
+       if(ok && needs_write) {
+               if(options->use_padding)
+                       FLAC__metadata_chain_sort_padding(chain);
+               ok = FLAC__metadata_chain_write(chain, options->use_padding, options->preserve_modtime);
+               if(!ok)
+                       fprintf(stderr, "%s: ERROR: writing FLAC file, error = %s\n", filename, FLAC__Metadata_ChainStatusString[FLAC__metadata_chain_status(chain)]);
+       }
+
+       FLAC__metadata_chain_delete(chain);
+
+       return ok;
+}
+
+FLAC__bool do_major_operation__list(const char *filename, FLAC__Metadata_Chain *chain, const CommandLineOptions *options)
+{
+       FLAC__Metadata_Iterator *iterator = FLAC__metadata_iterator_new();
+       FLAC__StreamMetadata *block;
+       FLAC__bool ok = true;
+       unsigned block_number;
+
+       if(0 == iterator)
+               die("out of memory allocating iterator");
+
+       FLAC__metadata_iterator_init(iterator, chain);
+
+       block_number = 0;
+       do {
+               block = FLAC__metadata_iterator_get_block(iterator);
+               ok &= (0 != block);
+               if(!ok)
+                       fprintf(stderr, "%s: ERROR: couldn't get block from chain\n", filename);
+               else if(passes_filter(options, FLAC__metadata_iterator_get_block(iterator), block_number))
+                       write_metadata(filename, block, block_number, !options->utf8_convert, options->application_data_format_is_hexdump);
+               block_number++;
+       } while(ok && FLAC__metadata_iterator_next(iterator));
+
+       FLAC__metadata_iterator_delete(iterator);
+
+       return ok;
+}
+
+FLAC__bool do_major_operation__append(FLAC__Metadata_Chain *chain, const CommandLineOptions *options)
+{
+       (void) chain, (void) options;
+       fprintf(stderr, "ERROR: --append not implemented yet\n"); /*@@@*/
+       return false;
+}
+
+FLAC__bool do_major_operation__remove(FLAC__Metadata_Chain *chain, const CommandLineOptions *options)
+{
+       FLAC__Metadata_Iterator *iterator = FLAC__metadata_iterator_new();
+       FLAC__bool ok = true;
+       unsigned block_number;
+
+       if(0 == iterator)
+               die("out of memory allocating iterator");
+
+       FLAC__metadata_iterator_init(iterator, chain);
+
+       block_number = 0;
+       while(ok && FLAC__metadata_iterator_next(iterator)) {
+               block_number++;
+               if(passes_filter(options, FLAC__metadata_iterator_get_block(iterator), block_number)) {
+                       ok &= FLAC__metadata_iterator_delete_block(iterator, options->use_padding);
+                       if(options->use_padding)
+                               ok &= FLAC__metadata_iterator_next(iterator);
+               }
+       }
+
+       FLAC__metadata_iterator_delete(iterator);
+
+       return ok;
+}
+
+FLAC__bool do_major_operation__remove_all(FLAC__Metadata_Chain *chain, const CommandLineOptions *options)
+{
+       FLAC__Metadata_Iterator *iterator = FLAC__metadata_iterator_new();
+       FLAC__bool ok = true;
+
+       if(0 == iterator)
+               die("out of memory allocating iterator");
+
+       FLAC__metadata_iterator_init(iterator, chain);
+
+       while(ok && FLAC__metadata_iterator_next(iterator)) {
+               ok &= FLAC__metadata_iterator_delete_block(iterator, options->use_padding);
+               if(options->use_padding)
+                       ok &= FLAC__metadata_iterator_next(iterator);
+       }
+
+       FLAC__metadata_iterator_delete(iterator);
+
+       return ok;
+}
+
+FLAC__bool do_shorthand_operations(const CommandLineOptions *options)
+{
+       unsigned i;
+       FLAC__bool ok = true;
+
+       /* to die after first error,     v---  add '&& ok' here */
+       for(i = 0; i < options->num_files; i++)
+               ok &= do_shorthand_operations_on_file(options->filenames[i], options);
+
+       /* check if OP__ADD_REPLAY_GAIN requested */
+       if(ok && options->num_files > 0) {
+               for(i = 0; i < options->ops.num_operations; i++) {
+                       if(options->ops.operations[i].type == OP__ADD_REPLAY_GAIN)
+                               ok = do_shorthand_operation__add_replay_gain(options->filenames, options->num_files, options->preserve_modtime);
+               }
+       }
+
+       return ok;
+}
+
+FLAC__bool do_shorthand_operations_on_file(const char *filename, const CommandLineOptions *options)
+{
+       unsigned i;
+       FLAC__bool ok = true, needs_write = false, use_padding = options->use_padding;
+       FLAC__Metadata_Chain *chain = FLAC__metadata_chain_new();
+
+       if(0 == chain)
+               die("out of memory allocating chain");
+
+       if(!FLAC__metadata_chain_read(chain, filename)) {
+               fprintf(stderr, "%s: ERROR: reading metadata, status = \"%s\"\n", filename, FLAC__Metadata_ChainStatusString[FLAC__metadata_chain_status(chain)]);
+               return false;
+       }
+
+       for(i = 0; i < options->ops.num_operations && ok; i++) {
+               ok &= do_shorthand_operation(options->prefix_with_filename? filename : 0, chain, &options->ops.operations[i], &needs_write, options->utf8_convert);
+
+               /* The following seems counterintuitive but the meaning
+                * of 'use_padding' is 'try to keep the overall metadata
+                * to its original size, adding or truncating extra
+                * padding if necessary' which is why we need to turn it
+                * off in this case.  If we don't, the extra padding block
+                * will just be truncated.
+                */
+               if(options->ops.operations[i].type == OP__ADD_PADDING)
+                       use_padding = false;
+       }
+
+       if(ok && needs_write) {
+               if(use_padding)
+                       FLAC__metadata_chain_sort_padding(chain);
+               ok = FLAC__metadata_chain_write(chain, use_padding, options->preserve_modtime);
+               if(!ok)
+                       fprintf(stderr, "%s: ERROR: writing FLAC file, error = %s\n", filename, FLAC__Metadata_ChainStatusString[FLAC__metadata_chain_status(chain)]);
+       }
+
+       FLAC__metadata_chain_delete(chain);
+
+       return ok;
+}
+
+FLAC__bool do_shorthand_operation(const char *filename, FLAC__Metadata_Chain *chain, const Operation *operation, FLAC__bool *needs_write, FLAC__bool utf8_convert)
+{
+       FLAC__bool ok = true;
+
+       switch(operation->type) {
+               case OP__SHOW_MD5SUM:
+               case OP__SHOW_MIN_BLOCKSIZE:
+               case OP__SHOW_MAX_BLOCKSIZE:
+               case OP__SHOW_MIN_FRAMESIZE:
+               case OP__SHOW_MAX_FRAMESIZE:
+               case OP__SHOW_SAMPLE_RATE:
+               case OP__SHOW_CHANNELS:
+               case OP__SHOW_BPS:
+               case OP__SHOW_TOTAL_SAMPLES:
+               case OP__SET_MD5SUM:
+               case OP__SET_MIN_BLOCKSIZE:
+               case OP__SET_MAX_BLOCKSIZE:
+               case OP__SET_MIN_FRAMESIZE:
+               case OP__SET_MAX_FRAMESIZE:
+               case OP__SET_SAMPLE_RATE:
+               case OP__SET_CHANNELS:
+               case OP__SET_BPS:
+               case OP__SET_TOTAL_SAMPLES:
+                       ok = do_shorthand_operation__streaminfo(filename, chain, operation, needs_write);
+                       break;
+               case OP__SHOW_VC_VENDOR:
+               case OP__SHOW_VC_FIELD:
+               case OP__REMOVE_VC_ALL:
+               case OP__REMOVE_VC_FIELD:
+               case OP__REMOVE_VC_FIRSTFIELD:
+               case OP__SET_VC_FIELD:
+               case OP__IMPORT_VC_FROM:
+               case OP__EXPORT_VC_TO:
+                       ok = do_shorthand_operation__vorbis_comment(filename, chain, operation, needs_write, !utf8_convert);
+                       break;
+               case OP__ADD_SEEKPOINT:
+                       ok = do_shorthand_operation__add_seekpoints(filename, chain, operation->argument.add_seekpoint.specification, needs_write);
+                       break;
+               case OP__ADD_REPLAY_GAIN:
+                       /* this command is always executed last */
+                       ok = true;
+                       break;
+               case OP__ADD_PADDING:
+                       ok = do_shorthand_operation__add_padding(filename, chain, operation->argument.add_padding.length, needs_write);
+                       break;
+               default:
+                       ok = false;
+                       FLAC__ASSERT(0);
+                       break;
+       };
+
+       return ok;
+}
+
+FLAC__bool do_shorthand_operation__add_replay_gain(char **filenames, unsigned num_files, FLAC__bool preserve_modtime)
+{
+       FLAC__StreamMetadata streaminfo;
+       float *title_gains = 0, *title_peaks = 0;
+       float album_gain, album_peak;
+       unsigned sample_rate = 0;
+       unsigned bits_per_sample = 0;
+       unsigned channels = 0;
+       unsigned i;
+       const char *error;
+       FLAC__bool first = true;
+
+       FLAC__ASSERT(num_files > 0);
+
+       for(i = 0; i < num_files; i++) {
+               FLAC__ASSERT(0 != filenames[i]);
+               if(!FLAC__metadata_get_streaminfo(filenames[i], &streaminfo)) {
+                       fprintf(stderr, "%s: ERROR: can't open file or get STREAMINFO block\n", filenames[i]);
+                       return false;
+               }
+               if(first) {
+                       first = false;
+                       sample_rate = streaminfo.data.stream_info.sample_rate;
+                       bits_per_sample = streaminfo.data.stream_info.bits_per_sample;
+                       channels = streaminfo.data.stream_info.channels;
+               }
+               else {
+                       if(sample_rate != streaminfo.data.stream_info.sample_rate) {
+                               fprintf(stderr, "%s: ERROR: sample rate of %u Hz does not match previous files' %u Hz\n", filenames[i], streaminfo.data.stream_info.sample_rate, sample_rate);
+                               return false;
+                       }
+                       if(bits_per_sample != streaminfo.data.stream_info.bits_per_sample) {
+                               fprintf(stderr, "%s: ERROR: resolution of %u bps does not match previous files' %u bps\n", filenames[i], streaminfo.data.stream_info.bits_per_sample, bits_per_sample);
+                               return false;
+                       }
+                       if(channels != streaminfo.data.stream_info.channels) {
+                               fprintf(stderr, "%s: ERROR: # channels (%u) does not match previous files' (%u)\n", filenames[i], streaminfo.data.stream_info.channels, channels);
+                               return false;
+                       }
+               }
+               if(!grabbag__replaygain_is_valid_sample_frequency(sample_rate)) {
+                       fprintf(stderr, "%s: ERROR: sample rate of %u Hz is not supported\n", filenames[i], sample_rate);
+                       return false;
+               }
+               if(channels != 1 && channels != 2) {
+                       fprintf(stderr, "%s: ERROR: # of channels (%u) is not supported, must be 1 or 2\n", filenames[i], channels);
+                       return false;
+               }
+       }
+       FLAC__ASSERT(bits_per_sample >= FLAC__MIN_BITS_PER_SAMPLE && bits_per_sample <= FLAC__MAX_BITS_PER_SAMPLE);
+
+       if(!grabbag__replaygain_init(sample_rate))
+               FLAC__ASSERT(0);
+
+       if(
+               0 == (title_gains = (float*)malloc(sizeof(float) * num_files)) ||
+               0 == (title_peaks = (float*)malloc(sizeof(float) * num_files))
+       )
+               die("out of memory allocating space for title gains/peaks");
+
+       for(i = 0; i < num_files; i++) {
+               if(0 != (error = grabbag__replaygain_analyze_file(filenames[i], title_gains+i, title_peaks+i))) {
+                       fprintf(stderr, "%s: ERROR: during analysis (%s)\n", filenames[i], error);
+                       free(title_gains);
+                       free(title_peaks);
+                       return false;
+               }
+       }
+       grabbag__replaygain_get_album(&album_gain, &album_peak);
+
+       for(i = 0; i < num_files; i++) {
+               if(0 != (error = grabbag__replaygain_store_to_file(filenames[i], album_gain, album_peak, title_gains[i], title_peaks[i], preserve_modtime))) {
+                       fprintf(stderr, "%s: ERROR: writing tags (%s)\n", filenames[i], error);
+                       free(title_gains);
+                       free(title_peaks);
+                       return false;
+               }
+       }
+
+       free(title_gains);
+       free(title_peaks);
+       return true;
+}
+
+FLAC__bool do_shorthand_operation__add_padding(const char *filename, FLAC__Metadata_Chain *chain, unsigned length, FLAC__bool *needs_write)
+{
+       FLAC__StreamMetadata *padding = 0;
+       FLAC__Metadata_Iterator *iterator = FLAC__metadata_iterator_new();
+
+       if(0 == iterator)
+               die("out of memory allocating iterator");
+
+       FLAC__metadata_iterator_init(iterator, chain);
+
+       while(FLAC__metadata_iterator_next(iterator))
+               ;
+
+       padding = FLAC__metadata_object_new(FLAC__METADATA_TYPE_PADDING);
+       if(0 == padding)
+               die("out of memory allocating PADDING block");
+
+       padding->length = length;
+
+       if(!FLAC__metadata_iterator_insert_block_after(iterator, padding)) {
+               fprintf(stderr, "%s: ERROR: adding new PADDING block to metadata, status =\"%s\"\n", filename, FLAC__Metadata_ChainStatusString[FLAC__metadata_chain_status(chain)]);
+               FLAC__metadata_object_delete(padding);
+               FLAC__metadata_iterator_delete(iterator);
+               return false;
+       }
+
+       FLAC__metadata_iterator_delete(iterator);
+       *needs_write = true;
+       return true;
+}
+
+FLAC__bool passes_filter(const CommandLineOptions *options, const FLAC__StreamMetadata *block, unsigned block_number)
+{
+       unsigned i, j;
+       FLAC__bool matches_number = false, matches_type = false;
+       FLAC__bool has_block_number_arg = false;
+
+       for(i = 0; i < options->args.num_arguments; i++) {
+               if(options->args.arguments[i].type == ARG__BLOCK_TYPE || options->args.arguments[i].type == ARG__EXCEPT_BLOCK_TYPE) {
+                       for(j = 0; j < options->args.arguments[i].value.block_type.num_entries; j++) {
+                               if(options->args.arguments[i].value.block_type.entries[j].type == block->type) {
+                                       if(block->type != FLAC__METADATA_TYPE_APPLICATION || !options->args.arguments[i].value.block_type.entries[j].filter_application_by_id || 0 == memcmp(options->args.arguments[i].value.block_type.entries[j].application_id, block->data.application.id, FLAC__STREAM_METADATA_APPLICATION_ID_LEN/8))
+                                               matches_type = true;
+                               }
+                       }
+               }
+               else if(options->args.arguments[i].type == ARG__BLOCK_NUMBER) {
+                       has_block_number_arg = true;
+                       for(j = 0; j < options->args.arguments[i].value.block_number.num_entries; j++) {
+                               if(options->args.arguments[i].value.block_number.entries[j] == block_number)
+                                       matches_number = true;
+                       }
+               }
+       }
+
+       if(!has_block_number_arg)
+               matches_number = true;
+
+       if(options->args.checks.has_block_type) {
+               FLAC__ASSERT(!options->args.checks.has_except_block_type);
+       }
+       else if(options->args.checks.has_except_block_type)
+               matches_type = !matches_type;
+       else
+               matches_type = true;
+
+       return matches_number && matches_type;
+}
+
+void write_metadata(const char *filename, FLAC__StreamMetadata *block, unsigned block_number, FLAC__bool raw, FLAC__bool hexdump_application)
+{
+       unsigned i;
+
+/*@@@ yuck, should do this with a varargs function or something: */
+#define PPR if(filename)printf("%s:",filename);
+       PPR; printf("METADATA block #%u\n", block_number);
+       PPR; printf("  type: %u (%s)\n", (unsigned)block->type, block->type<=FLAC__METADATA_TYPE_VORBIS_COMMENT? FLAC__MetadataTypeString[block->type] : "UNKNOWN");
+       PPR; printf("  is last: %s\n", block->is_last? "true":"false");
+       PPR; printf("  length: %u\n", block->length);
+
+       switch(block->type) {
+               case FLAC__METADATA_TYPE_STREAMINFO:
+                       PPR; printf("  minumum blocksize: %u samples\n", block->data.stream_info.min_blocksize);
+                       PPR; printf("  maximum blocksize: %u samples\n", block->data.stream_info.max_blocksize);
+                       PPR; printf("  minimum framesize: %u bytes\n", block->data.stream_info.min_framesize);
+                       PPR; printf("  maximum framesize: %u bytes\n", block->data.stream_info.max_framesize);
+                       PPR; printf("  sample_rate: %u Hz\n", block->data.stream_info.sample_rate);
+                       PPR; printf("  channels: %u\n", block->data.stream_info.channels);
+                       PPR; printf("  bits-per-sample: %u\n", block->data.stream_info.bits_per_sample);
+                       PPR; printf("  total samples: %llu\n", block->data.stream_info.total_samples);
+                       PPR; printf("  MD5 signature: ");
+                       for(i = 0; i < 16; i++) {
+                               printf("%02x", (unsigned)block->data.stream_info.md5sum[i]);
+                       }
+                       printf("\n");
+                       break;
+               case FLAC__METADATA_TYPE_PADDING:
+                       /* nothing to print */
+                       break;
+               case FLAC__METADATA_TYPE_APPLICATION:
+                       PPR; printf("  application ID: ");
+                       for(i = 0; i < 4; i++) {
+                               PPR; printf("%02x", block->data.application.id[i]);
+                       }
+                       PPR; printf("\n");
+                       PPR; printf("  data contents:\n");
+                       if(0 != block->data.application.data) {
+                               if(hexdump_application)
+                                       hexdump(filename, block->data.application.data, block->length - FLAC__STREAM_METADATA_HEADER_LENGTH, "    ");
+                               else
+                                       (void) fwrite(block->data.application.data, 1, block->length - FLAC__STREAM_METADATA_HEADER_LENGTH, stdout);
+                       }
+                       break;
+               case FLAC__METADATA_TYPE_SEEKTABLE:
+                       PPR; printf("  seek points: %u\n", block->data.seek_table.num_points);
+                       for(i = 0; i < block->data.seek_table.num_points; i++) {
+                               if(block->data.seek_table.points[i].sample_number != FLAC__STREAM_METADATA_SEEKPOINT_PLACEHOLDER) {
+                                       PPR; printf("    point %d: sample_number=%llu, stream_offset=%llu, frame_samples=%u\n", i, block->data.seek_table.points[i].sample_number, block->data.seek_table.points[i].stream_offset, block->data.seek_table.points[i].frame_samples);
+                               }
+                               else {
+                                       PPR; printf("    point %d: PLACEHOLDER\n", i);
+                               }
+                       }
+                       break;
+               case FLAC__METADATA_TYPE_VORBIS_COMMENT:
+                       PPR; printf("  vendor string: ");
+                       write_vc_field(0, &block->data.vorbis_comment.vendor_string, raw, stdout);
+                       PPR; printf("  comments: %u\n", block->data.vorbis_comment.num_comments);
+                       for(i = 0; i < block->data.vorbis_comment.num_comments; i++) {
+                               PPR; printf("    comment[%u]: ", i);
+                               write_vc_field(0, &block->data.vorbis_comment.comments[i], raw, stdout);
+                       }
+                       break;
+               default:
+                       PPR; printf("SKIPPING block of unknown type\n");
+                       break;
+       }
+#undef PPR
+}
diff --git a/src/metaflac/operations.h b/src/metaflac/operations.h
new file mode 100644 (file)
index 0000000..da1f832
--- /dev/null
@@ -0,0 +1,26 @@
+/* metaflac - Command-line FLAC metadata editor
+ * Copyright (C) 2001,2002  Josh Coalson
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+#ifndef metaflac__operations_h
+#define metaflac__operations_h
+
+#include "options.h"
+
+FLAC__bool do_operations(const CommandLineOptions *options);
+
+#endif
diff --git a/src/metaflac/operations_shorthand_seektable.c b/src/metaflac/operations_shorthand_seektable.c
new file mode 100644 (file)
index 0000000..7d20f24
--- /dev/null
@@ -0,0 +1,212 @@
+/* metaflac - Command-line FLAC metadata editor
+ * Copyright (C) 2001,2002  Josh Coalson
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+#include "utils.h"
+#include "FLAC/assert.h"
+#include "FLAC/file_decoder.h"
+#include "FLAC/metadata.h"
+#include "share/grabbag.h"
+
+static FLAC__bool populate_seekpoint_values(const char *filename, FLAC__StreamMetadata *block, FLAC__bool *needs_write);
+
+FLAC__bool do_shorthand_operation__add_seekpoints(const char *filename, FLAC__Metadata_Chain *chain, const char *specification, FLAC__bool *needs_write)
+{
+       FLAC__bool ok = true, found_seektable_block = false;
+       FLAC__StreamMetadata *block = 0;
+       FLAC__Metadata_Iterator *iterator = FLAC__metadata_iterator_new();
+       FLAC__uint64 total_samples = 0;
+       unsigned sample_rate = 0;
+
+       if(0 == iterator)
+               die("out of memory allocating iterator");
+
+       FLAC__metadata_iterator_init(iterator, chain);
+
+       do {
+               block = FLAC__metadata_iterator_get_block(iterator);
+               if(block->type == FLAC__METADATA_TYPE_STREAMINFO) {
+                       sample_rate = block->data.stream_info.sample_rate;
+                       total_samples = block->data.stream_info.total_samples;
+               }
+               else if(block->type == FLAC__METADATA_TYPE_SEEKTABLE)
+                       found_seektable_block = true;
+       } while(!found_seektable_block && FLAC__metadata_iterator_next(iterator));
+
+       if(total_samples == 0) {
+               fprintf(stderr, "%s: ERROR: cannot add seekpoints because STREAMINFO block does not specify total_samples\n", filename);
+               return false;
+       }
+
+       if(!found_seektable_block) {
+               /* create a new block */
+               block = FLAC__metadata_object_new(FLAC__METADATA_TYPE_SEEKTABLE);
+               if(0 == block)
+                       die("out of memory allocating SEEKTABLE block");
+               while(FLAC__metadata_iterator_prev(iterator))
+                       ;
+               if(!FLAC__metadata_iterator_insert_block_after(iterator, block)) {
+                       fprintf(stderr, "%s: ERROR: adding new SEEKTABLE block to metadata, status =\"%s\"\n", filename, FLAC__Metadata_ChainStatusString[FLAC__metadata_chain_status(chain)]);
+                       return false;
+               }
+               /* iterator is left pointing to new block */
+               FLAC__ASSERT(FLAC__metadata_iterator_get_block(iterator) == block);
+       }
+
+       FLAC__metadata_iterator_delete(iterator);
+
+       FLAC__ASSERT(0 != block);
+       FLAC__ASSERT(block->type == FLAC__METADATA_TYPE_SEEKTABLE);
+
+       if(!grabbag__seektable_convert_specification_to_template(specification, /*only_explicit_placeholders=*/false, total_samples, sample_rate, block, /*spec_has_real_points=*/0)) {
+               fprintf(stderr, "%s: ERROR (internal) preparing seektable with seekpoints\n", filename);
+               return false;
+       }
+
+       ok = populate_seekpoint_values(filename, block, needs_write);
+
+       if(ok) {
+               //@@@@ compact it
+       }
+
+       return ok;
+}
+
+/*
+ * local routines
+ */
+
+typedef struct {
+       FLAC__StreamMetadata_SeekTable *seektable_template;
+       FLAC__uint64 samples_written;
+       unsigned first_seekpoint_to_check;
+       FLAC__bool error_occurred;
+       FLAC__StreamDecoderErrorStatus error_status;
+} ClientData;
+
+static FLAC__StreamDecoderWriteStatus write_callback_(const FLAC__FileDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data)
+{
+       ClientData *cd = (ClientData*)client_data;
+
+       FLAC__ASSERT(0 != cd);
+
+       if(!cd->error_occurred && cd->seektable_template->num_points > 0) {
+               const unsigned blocksize = frame->header.blocksize;
+               //@@@@
+               cd->samples_written += blocksize;
+               return FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE;
+       }
+       else
+               return FLAC__STREAM_DECODER_WRITE_STATUS_ABORT;
+}
+#if 0
+@@@@
+{
+       const unsigned blocksize = FLAC__stream_encoder_get_blocksize(encoder);
+       const FLAC__uint64 frame_first_sample = seekable_stream_encoder->private_->samples_written;
+       const FLAC__uint64 frame_last_sample = frame_first_sample + (FLAC__uint64)blocksize - 1;
+       FLAC__uint64 test_sample;
+       unsigned i;
+       for(i = seekable_stream_encoder->private_->first_seekpoint_to_check; i < seekable_stream_encoder->private_->seek_table->num_points; i++) {
+               test_sample = seekable_stream_encoder->private_->seek_table->points[i].sample_number;
+               if(test_sample > frame_last_sample) {
+                       break;
+               }
+               else if(test_sample >= frame_first_sample) {
+                       seekable_stream_encoder->private_->seek_table->points[i].sample_number = frame_first_sample;
+                       seekable_stream_encoder->private_->seek_table->points[i].stream_offset = seekable_stream_encoder->private_->bytes_written - seekable_stream_encoder->private_->stream_offset;
+                       seekable_stream_encoder->private_->seek_table->points[i].frame_samples = blocksize;
+                       seekable_stream_encoder->private_->first_seekpoint_to_check++;
+                       /* DO NOT: "break;" and here's why:
+                        * The seektable template may contain more than one target
+                        * sample for any given frame; we will keep looping, generating
+                        * duplicate seekpoints for them, and we'll clean it up later,
+                        * just before writing the seektable back to the metadata.
+                        */
+               }
+               else {
+                       seekable_stream_encoder->private_->first_seekpoint_to_check++;
+               }
+       }
+}
+#endif
+
+static void metadata_callback_(const FLAC__FileDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data)
+{
+       (void)decoder, (void)metadata, (void)client_data;
+       FLAC__ASSERT(0); /* we asked to skip all metadata */
+}
+
+static void error_callback_(const FLAC__FileDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data)
+{
+       ClientData *cd = (ClientData*)client_data;
+
+       FLAC__ASSERT(0 != cd);
+
+       if(!cd->error_occurred) { /* don't let multiple errors overwrite the first one */
+               cd->error_occurred = true;
+               cd->error_status = status;
+       }
+}
+
+FLAC__bool populate_seekpoint_values(const char *filename, FLAC__StreamMetadata *block, FLAC__bool *needs_write)
+{
+       FLAC__FileDecoder *decoder;
+       ClientData client_data;
+       FLAC__bool ok = true;
+
+       FLAC__ASSERT(0 != block);
+       FLAC__ASSERT(block->type == FLAC__METADATA_TYPE_SEEKTABLE);
+
+       client_data.seektable_template = &block->data.seek_table;
+       client_data.samples_written = 0;
+       client_data.first_seekpoint_to_check = 0;
+       client_data.error_occurred = false;
+
+       decoder = FLAC__file_decoder_new();
+
+       if(0 == decoder) {
+               fprintf(stderr, "%s: ERROR (--add-seekpoint) creating the decoder instance\n", filename);
+               return false;
+       }
+
+       FLAC__file_decoder_set_md5_checking(decoder, false);
+       FLAC__file_decoder_set_filename(decoder, filename);
+       FLAC__file_decoder_set_metadata_ignore_all(decoder);
+       FLAC__file_decoder_set_write_callback(decoder, write_callback_);
+       FLAC__file_decoder_set_metadata_callback(decoder, metadata_callback_);
+       FLAC__file_decoder_set_error_callback(decoder, error_callback_);
+       FLAC__file_decoder_set_client_data(decoder, &client_data);
+
+       if(FLAC__file_decoder_init(decoder) != FLAC__FILE_DECODER_OK) {
+               fprintf(stderr, "%s: ERROR (--add-seekpoint) initializing the decoder instance (%s)\n", filename, FLAC__file_decoder_get_resolved_state_string(decoder));
+               ok = false;
+       }
+
+       if(ok && !FLAC__file_decoder_process_until_end_of_file(decoder)) {
+               fprintf(stderr, "%s: ERROR (--add-seekpoint) decoding file (%s)\n", filename, FLAC__file_decoder_get_resolved_state_string(decoder));
+               ok = false;
+       }
+
+       if(ok && client_data.error_occurred) {
+               fprintf(stderr, "%s: ERROR (--add-seekpoint) decoding file (%u:%s)\n", filename, (unsigned)client_data.error_status, FLAC__StreamDecoderErrorStatusString[client_data.error_status]);
+               ok = false;
+       }
+
+       FLAC__file_decoder_delete(decoder);
+       return ok;
+}
diff --git a/src/metaflac/operations_shorthand_streaminfo.c b/src/metaflac/operations_shorthand_streaminfo.c
new file mode 100644 (file)
index 0000000..7bab5c7
--- /dev/null
@@ -0,0 +1,120 @@
+/* metaflac - Command-line FLAC metadata editor
+ * Copyright (C) 2001,2002  Josh Coalson
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+#include "options.h"
+#include "utils.h"
+#include "FLAC/assert.h"
+#include "FLAC/metadata.h"
+#include <string.h>
+
+FLAC__bool do_shorthand_operation__streaminfo(const char *filename, FLAC__Metadata_Chain *chain, const Operation *operation, FLAC__bool *needs_write)
+{
+       unsigned i;
+       FLAC__bool ok = true;
+       FLAC__StreamMetadata *block;
+       FLAC__Metadata_Iterator *iterator = FLAC__metadata_iterator_new();
+
+       if(0 == iterator)
+               die("out of memory allocating iterator");
+
+       FLAC__metadata_iterator_init(iterator, chain);
+
+       block = FLAC__metadata_iterator_get_block(iterator);
+
+       FLAC__ASSERT(0 != block);
+       FLAC__ASSERT(block->type == FLAC__METADATA_TYPE_STREAMINFO);
+
+       if(0 != filename)
+               printf("%s:", filename);
+
+       switch(operation->type) {
+               case OP__SHOW_MD5SUM:
+                       for(i = 0; i < 16; i++)
+                               printf("%02x", block->data.stream_info.md5sum[i]);
+                       printf("\n");
+                       break;
+               case OP__SHOW_MIN_BLOCKSIZE:
+                       printf("%u\n", block->data.stream_info.min_blocksize);
+                       break;
+               case OP__SHOW_MAX_BLOCKSIZE:
+                       printf("%u\n", block->data.stream_info.max_blocksize);
+                       break;
+               case OP__SHOW_MIN_FRAMESIZE:
+                       printf("%u\n", block->data.stream_info.min_framesize);
+                       break;
+               case OP__SHOW_MAX_FRAMESIZE:
+                       printf("%u\n", block->data.stream_info.max_framesize);
+                       break;
+               case OP__SHOW_SAMPLE_RATE:
+                       printf("%u\n", block->data.stream_info.sample_rate);
+                       break;
+               case OP__SHOW_CHANNELS:
+                       printf("%u\n", block->data.stream_info.channels);
+                       break;
+               case OP__SHOW_BPS:
+                       printf("%u\n", block->data.stream_info.bits_per_sample);
+                       break;
+               case OP__SHOW_TOTAL_SAMPLES:
+                       printf("%llu\n", block->data.stream_info.total_samples);
+                       break;
+               case OP__SET_MD5SUM:
+                       memcpy(block->data.stream_info.md5sum, operation->argument.streaminfo_md5.value, 16);
+                       *needs_write = true;
+                       break;
+               case OP__SET_MIN_BLOCKSIZE:
+                       block->data.stream_info.min_blocksize = operation->argument.streaminfo_uint32.value;
+                       *needs_write = true;
+                       break;
+               case OP__SET_MAX_BLOCKSIZE:
+                       block->data.stream_info.max_blocksize = operation->argument.streaminfo_uint32.value;
+                       *needs_write = true;
+                       break;
+               case OP__SET_MIN_FRAMESIZE:
+                       block->data.stream_info.min_framesize = operation->argument.streaminfo_uint32.value;
+                       *needs_write = true;
+                       break;
+               case OP__SET_MAX_FRAMESIZE:
+                       block->data.stream_info.max_framesize = operation->argument.streaminfo_uint32.value;
+                       *needs_write = true;
+                       break;
+               case OP__SET_SAMPLE_RATE:
+                       block->data.stream_info.sample_rate = operation->argument.streaminfo_uint32.value;
+                       *needs_write = true;
+                       break;
+               case OP__SET_CHANNELS:
+                       block->data.stream_info.channels = operation->argument.streaminfo_uint32.value;
+                       *needs_write = true;
+                       break;
+               case OP__SET_BPS:
+                       block->data.stream_info.bits_per_sample = operation->argument.streaminfo_uint32.value;
+                       *needs_write = true;
+                       break;
+               case OP__SET_TOTAL_SAMPLES:
+                       block->data.stream_info.total_samples = operation->argument.streaminfo_uint64.value;
+                       *needs_write = true;
+                       break;
+               default:
+                       ok = false;
+                       FLAC__ASSERT(0);
+                       break;
+       };
+
+       FLAC__metadata_iterator_delete(iterator);
+
+       return ok;
+}
diff --git a/src/metaflac/operations_shorthand_vorbiscomment.c b/src/metaflac/operations_shorthand_vorbiscomment.c
new file mode 100644 (file)
index 0000000..311497a
--- /dev/null
@@ -0,0 +1,292 @@
+/* metaflac - Command-line FLAC metadata editor
+ * Copyright (C) 2001,2002  Josh Coalson
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+#include "options.h"
+#include "utils.h"
+#include "FLAC/assert.h"
+#include "share/utf8.h"
+#include <stdlib.h>
+#include <string.h>
+
+static FLAC__bool remove_vc_all(const char *filename, FLAC__StreamMetadata *block, FLAC__bool *needs_write);
+static FLAC__bool remove_vc_field(const char *filename, FLAC__StreamMetadata *block, const char *field_name, FLAC__bool *needs_write);
+static FLAC__bool remove_vc_firstfield(const char *filename, FLAC__StreamMetadata *block, const char *field_name, FLAC__bool *needs_write);
+static FLAC__bool set_vc_field(const char *filename, FLAC__StreamMetadata *block, const Argument_VcField *field, FLAC__bool *needs_write, FLAC__bool raw);
+static FLAC__bool import_vc_from(const char *filename, FLAC__StreamMetadata *block, const Argument_VcFilename *vc_filename, FLAC__bool *needs_write, FLAC__bool raw);
+static FLAC__bool export_vc_to(const char *filename, FLAC__StreamMetadata *block, const Argument_VcFilename *vc_filename, FLAC__bool raw);
+
+FLAC__bool do_shorthand_operation__vorbis_comment(const char *filename, FLAC__Metadata_Chain *chain, const Operation *operation, FLAC__bool *needs_write, FLAC__bool raw)
+{
+       FLAC__bool ok = true, found_vc_block = false;
+       FLAC__StreamMetadata *block = 0;
+       FLAC__Metadata_Iterator *iterator = FLAC__metadata_iterator_new();
+
+       if(0 == iterator)
+               die("out of memory allocating iterator");
+
+       FLAC__metadata_iterator_init(iterator, chain);
+
+       do {
+               block = FLAC__metadata_iterator_get_block(iterator);
+               if(block->type == FLAC__METADATA_TYPE_VORBIS_COMMENT)
+                       found_vc_block = true;
+       } while(!found_vc_block && FLAC__metadata_iterator_next(iterator));
+
+       if(!found_vc_block) {
+               /* create a new block if necessary */
+               if(operation->type == OP__SET_VC_FIELD || operation->type == OP__IMPORT_VC_FROM) {
+                       block = FLAC__metadata_object_new(FLAC__METADATA_TYPE_VORBIS_COMMENT);
+                       if(0 == block)
+                               die("out of memory allocating VORBIS_COMMENT block");
+                       while(FLAC__metadata_iterator_next(iterator))
+                               ;
+                       if(!FLAC__metadata_iterator_insert_block_after(iterator, block)) {
+                               fprintf(stderr, "%s: ERROR: adding new VORBIS_COMMENT block to metadata, status =\"%s\"\n", filename, FLAC__Metadata_ChainStatusString[FLAC__metadata_chain_status(chain)]);
+                               return false;
+                       }
+                       /* iterator is left pointing to new block */
+                       FLAC__ASSERT(FLAC__metadata_iterator_get_block(iterator) == block);
+               }
+               else {
+                       FLAC__metadata_iterator_delete(iterator);
+                       return ok;
+               }
+       }
+
+       FLAC__ASSERT(0 != block);
+       FLAC__ASSERT(block->type == FLAC__METADATA_TYPE_VORBIS_COMMENT);
+
+       switch(operation->type) {
+               case OP__SHOW_VC_VENDOR:
+                       write_vc_field(filename, &block->data.vorbis_comment.vendor_string, raw, stdout);
+                       break;
+               case OP__SHOW_VC_FIELD:
+                       write_vc_fields(filename, operation->argument.vc_field_name.value, block->data.vorbis_comment.comments, block->data.vorbis_comment.num_comments, raw, stdout);
+                       break;
+               case OP__REMOVE_VC_ALL:
+                       ok = remove_vc_all(filename, block, needs_write);
+                       break;
+               case OP__REMOVE_VC_FIELD:
+                       ok = remove_vc_field(filename, block, operation->argument.vc_field_name.value, needs_write);
+                       break;
+               case OP__REMOVE_VC_FIRSTFIELD:
+                       ok = remove_vc_firstfield(filename, block, operation->argument.vc_field_name.value, needs_write);
+                       break;
+               case OP__SET_VC_FIELD:
+                       ok = set_vc_field(filename, block, &operation->argument.vc_field, needs_write, raw);
+                       break;
+               case OP__IMPORT_VC_FROM:
+                       ok = import_vc_from(filename, block, &operation->argument.vc_filename, needs_write, raw);
+                       break;
+               case OP__EXPORT_VC_TO:
+                       ok = export_vc_to(filename, block, &operation->argument.vc_filename, raw);
+                       break;
+               default:
+                       ok = false;
+                       FLAC__ASSERT(0);
+                       break;
+       };
+
+       FLAC__metadata_iterator_delete(iterator);
+       return ok;
+}
+
+/*
+ * local routines
+ */
+
+FLAC__bool remove_vc_all(const char *filename, FLAC__StreamMetadata *block, FLAC__bool *needs_write)
+{
+       FLAC__ASSERT(0 != block);
+       FLAC__ASSERT(block->type == FLAC__METADATA_TYPE_VORBIS_COMMENT);
+       FLAC__ASSERT(0 != needs_write);
+
+       if(0 != block->data.vorbis_comment.comments) {
+               FLAC__ASSERT(block->data.vorbis_comment.num_comments > 0);
+               if(!FLAC__metadata_object_vorbiscomment_resize_comments(block, 0)) {
+                       fprintf(stderr, "%s: ERROR: memory allocation failure\n", filename);
+                       return false;
+               }
+               *needs_write = true;
+       }
+       else {
+               FLAC__ASSERT(block->data.vorbis_comment.num_comments == 0);
+       }
+
+       return true;
+}
+
+FLAC__bool remove_vc_field(const char *filename, FLAC__StreamMetadata *block, const char *field_name, FLAC__bool *needs_write)
+{
+       int n;
+
+       FLAC__ASSERT(0 != needs_write);
+
+       n = FLAC__metadata_object_vorbiscomment_remove_entries_matching(block, field_name);
+
+       if(n < 0) {
+               fprintf(stderr, "%s: ERROR: memory allocation failure\n", filename);
+               return false;
+       }
+       else if(n > 0)
+               *needs_write = true;
+
+       return true;
+}
+
+FLAC__bool remove_vc_firstfield(const char *filename, FLAC__StreamMetadata *block, const char *field_name, FLAC__bool *needs_write)
+{
+       int n;
+
+       FLAC__ASSERT(0 != needs_write);
+
+       n = FLAC__metadata_object_vorbiscomment_remove_entry_matching(block, field_name);
+
+       if(n < 0) {
+               fprintf(stderr, "%s: ERROR: memory allocation failure\n", filename);
+               return false;
+       }
+       else if(n > 0)
+               *needs_write = true;
+
+       return true;
+}
+
+FLAC__bool set_vc_field(const char *filename, FLAC__StreamMetadata *block, const Argument_VcField *field, FLAC__bool *needs_write, FLAC__bool raw)
+{
+       FLAC__StreamMetadata_VorbisComment_Entry entry;
+       char *converted;
+       FLAC__bool needs_free = false;
+
+       FLAC__ASSERT(0 != block);
+       FLAC__ASSERT(block->type == FLAC__METADATA_TYPE_VORBIS_COMMENT);
+       FLAC__ASSERT(0 != field);
+       FLAC__ASSERT(0 != needs_write);
+
+       if(raw) {
+               entry.entry = field->field;
+       }
+       else if(utf8_encode(field->field, &converted) >= 0) {
+               entry.entry = converted;
+               needs_free = true;
+       }
+       else {
+               fprintf(stderr, "%s: ERROR: couldn't convert comment to UTF-8\n", filename);
+               return false;
+       }
+
+       entry.length = strlen(entry.entry);
+
+       if(!FLAC__metadata_object_vorbiscomment_insert_comment(block, block->data.vorbis_comment.num_comments, entry, /*copy=*/true)) {
+               if(needs_free)
+                       free(converted);
+               fprintf(stderr, "%s: ERROR: memory allocation failure\n", filename);
+               return false;
+       }
+       else {
+               *needs_write = true;
+               if(needs_free)
+                       free(converted);
+               return true;
+       }
+}
+
+FLAC__bool import_vc_from(const char *filename, FLAC__StreamMetadata *block, const Argument_VcFilename *vc_filename, FLAC__bool *needs_write, FLAC__bool raw)
+{
+       FILE *f;
+       char line[65536];
+       FLAC__bool ret;
+
+       if(0 == vc_filename->value || strlen(vc_filename->value) == 0) {
+               fprintf(stderr, "%s: ERROR: empty import file name\n", filename);
+               return false;
+       }
+       if(0 == strcmp(vc_filename->value, "-"))
+               f = stdin;
+       else
+               f = fopen(vc_filename->value, "r");
+
+       if(0 == f) {
+               fprintf(stderr, "%s: ERROR: can't open import file %s\n", filename, vc_filename->value);
+               return false;
+       }
+
+       ret = true;
+       while(ret && !feof(f)) {
+               fgets(line, sizeof(line), f);
+               if(!feof(f)) {
+                       char *p = strchr(line, '\n');
+                       if(0 == p) {
+                               fprintf(stderr, "%s: ERROR: line too long, aborting\n", vc_filename->value);
+                               ret = false;
+                       }
+                       else {
+                               const char *violation;
+                               Argument_VcField field;
+                               *p = '\0';
+                               memset(&field, 0, sizeof(Argument_VcField));
+                               if(!parse_vorbis_comment_field(line, &field.field, &field.field_name, &field.field_value, &field.field_value_length, &violation)) {
+                                       FLAC__ASSERT(0 != violation);
+                                       fprintf(stderr, "%s: ERROR: malformed vorbis comment field \"%s\",\n       %s\n", vc_filename->value, line, violation);
+                                       ret = false;
+                               }
+                               else {
+                                       ret = set_vc_field(filename, block, &field, needs_write, raw);
+                               }
+                               if(0 != field.field)
+                                       free(field.field);
+                               if(0 != field.field_name)
+                                       free(field.field_name);
+                               if(0 != field.field_value)
+                                       free(field.field_value);
+                       }
+               }
+       };
+
+       if(f != stdin)
+               fclose(f);
+       return ret;
+}
+
+FLAC__bool export_vc_to(const char *filename, FLAC__StreamMetadata *block, const Argument_VcFilename *vc_filename, FLAC__bool raw)
+{
+       FILE *f;
+       FLAC__bool ret;
+
+       if(0 == vc_filename->value || strlen(vc_filename->value) == 0) {
+               fprintf(stderr, "%s: ERROR: empty export file name\n", filename);
+               return false;
+       }
+       if(0 == strcmp(vc_filename->value, "-"))
+               f = stdout;
+       else
+               f = fopen(vc_filename->value, "w");
+
+       if(0 == f) {
+               fprintf(stderr, "%s: ERROR: can't open export file %s\n", filename, vc_filename->value);
+               return false;
+       }
+
+       ret = true;
+
+       write_vc_fields(0, 0, block->data.vorbis_comment.comments, block->data.vorbis_comment.num_comments, raw, f);
+
+       if(f != stdout)
+               fclose(f);
+       return ret;
+}
diff --git a/src/metaflac/options.c b/src/metaflac/options.c
new file mode 100644 (file)
index 0000000..6363b00
--- /dev/null
@@ -0,0 +1,944 @@
+/* metaflac - Command-line FLAC metadata editor
+ * Copyright (C) 2001,2002  Josh Coalson
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+#include "options.h"
+#include "usage.h"
+#include "utils.h"
+#include "FLAC/assert.h"
+#include <ctype.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+/*
+   share__getopt format struct; note we don't use short options so we just
+   set the 'val' field to 0 everywhere to indicate a valid option.
+*/
+struct share__option long_options_[] = {
+       /* global options */
+       { "preserve-modtime", 0, 0, 0 },
+       { "with-filename", 0, 0, 0 },
+       { "no-filename", 0, 0, 0 },
+       { "no-utf8-convert", 0, 0, 0 },
+       { "dont-use-padding", 0, 0, 0 },
+       /* shorthand operations */
+       { "show-md5sum", 0, 0, 0 },
+       { "show-min-blocksize", 0, 0, 0 },
+       { "show-max-blocksize", 0, 0, 0 },
+       { "show-min-framesize", 0, 0, 0 },
+       { "show-max-framesize", 0, 0, 0 },
+       { "show-sample-rate", 0, 0, 0 },
+       { "show-channels", 0, 0, 0 },
+       { "show-bps", 0, 0, 0 },
+       { "show-total-samples", 0, 0, 0 },
+       { "set-md5sum", 1, 0, 0 }, /* undocumented */
+       { "set-min-blocksize", 1, 0, 0 }, /* undocumented */
+       { "set-max-blocksize", 1, 0, 0 }, /* undocumented */
+       { "set-min-framesize", 1, 0, 0 }, /* undocumented */
+       { "set-max-framesize", 1, 0, 0 }, /* undocumented */
+       { "set-sample-rate", 1, 0, 0 }, /* undocumented */
+       { "set-channels", 1, 0, 0 }, /* undocumented */
+       { "set-bps", 1, 0, 0 }, /* undocumented */
+       { "set-total-samples", 1, 0, 0 }, /* undocumented */
+       { "show-vc-vendor", 0, 0, 0 },
+       { "show-vc-field", 1, 0, 0 },
+       { "remove-vc-all", 0, 0, 0 },
+       { "remove-vc-field", 1, 0, 0 },
+       { "remove-vc-firstfield", 1, 0, 0 },
+       { "set-vc-field", 1, 0, 0 },
+       { "import-vc-from", 1, 0, 0 },
+       { "export-vc-to", 1, 0, 0 },
+       { "add-seekpoint", 1, 0, 0 },
+       { "add-replay-gain", 0, 0, 0 },
+       { "add-padding", 1, 0, 0 },
+       /* major operations */
+       { "help", 0, 0, 0 },
+       { "version", 0, 0, 0 },
+       { "list", 0, 0, 0 },
+       { "append", 0, 0, 0 },
+       { "remove", 0, 0, 0 },
+       { "remove-all", 0, 0, 0 },
+       { "merge-padding", 0, 0, 0 },
+       { "sort-padding", 0, 0, 0 },
+       /* major operation arguments */
+       { "block-number", 1, 0, 0 },
+       { "block-type", 1, 0, 0 },
+       { "except-block-type", 1, 0, 0 },
+       { "data-format", 1, 0, 0 },
+       { "application-data-format", 1, 0, 0 },
+       { "from-file", 1, 0, 0 },
+       {0, 0, 0, 0}
+};
+
+static FLAC__bool parse_option(int option_index, const char *option_argument, CommandLineOptions *options);
+static void append_new_operation(CommandLineOptions *options, Operation operation);
+static void append_new_argument(CommandLineOptions *options, Argument argument);
+static Operation *append_major_operation(CommandLineOptions *options, OperationType type);
+static Operation *append_shorthand_operation(CommandLineOptions *options, OperationType type);
+static Operation *find_shorthand_operation(CommandLineOptions *options, OperationType type);
+static Argument *append_argument(CommandLineOptions *options, ArgumentType type);
+static FLAC__bool parse_md5(const char *src, FLAC__byte dest[16]);
+static FLAC__bool parse_uint32(const char *src, FLAC__uint32 *dest);
+static FLAC__bool parse_uint64(const char *src, FLAC__uint64 *dest);
+static FLAC__bool parse_filename(const char *src, char **dest);
+static FLAC__bool parse_vorbis_comment_field_name(const char *field_ref, char **name, const char **violation);
+static FLAC__bool parse_add_seekpoint(const char *in, char **out, const char **violation);
+static FLAC__bool parse_add_padding(const char *in, unsigned *out);
+static FLAC__bool parse_block_number(const char *in, Argument_BlockNumber *out);
+static FLAC__bool parse_block_type(const char *in, Argument_BlockType *out);
+static FLAC__bool parse_data_format(const char *in, Argument_DataFormat *out);
+static FLAC__bool parse_application_data_format(const char *in, FLAC__bool *out);
+static void undocumented_warning(const char *opt);
+
+
+void init_options(CommandLineOptions *options)
+{
+       options->preserve_modtime = false;
+
+       /* '2' is a hack to mean "use default if not forced on command line" */
+       FLAC__ASSERT(true != 2);
+       options->prefix_with_filename = 2;
+
+       options->utf8_convert = true;
+       options->use_padding = true;
+       options->show_long_help = false;
+       options->show_version = false;
+       options->application_data_format_is_hexdump = false;
+
+       options->ops.operations = 0;
+       options->ops.num_operations = 0;
+       options->ops.capacity = 0;
+
+       options->args.arguments = 0;
+       options->args.num_arguments = 0;
+       options->args.capacity = 0;
+
+       options->args.checks.num_shorthand_ops = 0;
+       options->args.checks.num_major_ops = 0;
+       options->args.checks.has_block_type = false;
+       options->args.checks.has_except_block_type = false;
+
+       options->num_files = 0;
+       options->filenames = 0;
+}
+
+FLAC__bool parse_options(int argc, char *argv[], CommandLineOptions *options)
+{
+       int ret;
+       int option_index = 1;
+       FLAC__bool had_error = false;
+
+       while ((ret = share__getopt_long(argc, argv, "", long_options_, &option_index)) != -1) {
+               switch (ret) {
+                       case 0:
+                               had_error |= !parse_option(option_index, share__optarg, options);
+                               break;
+                       case '?':
+                       case ':':
+                               had_error = true;
+                               break;
+                       default:
+                               FLAC__ASSERT(0);
+                               break;
+               }
+       }
+
+       if(options->prefix_with_filename == 2)
+               options->prefix_with_filename = (argc - share__optind > 1);
+
+       if(share__optind >= argc && !options->show_long_help && !options->show_version) {
+               fprintf(stderr,"ERROR: you must specify at least one FLAC file;\n");
+               fprintf(stderr,"       metaflac cannot be used as a pipe\n");
+               had_error = true;
+       }
+
+       options->num_files = argc - share__optind;
+
+       if(options->num_files > 0) {
+               unsigned i = 0;
+               if(0 == (options->filenames = malloc(sizeof(char *) * options->num_files)))
+                       die("out of memory allocating space for file names list");
+               while(share__optind < argc)
+                       options->filenames[i++] = local_strdup(argv[share__optind++]);
+       }
+
+       if(options->args.checks.num_major_ops > 0) {
+               if(options->args.checks.num_major_ops > 1) {
+                       fprintf(stderr, "ERROR: you may only specify one major operation at a time\n");
+                       had_error = true;
+               }
+               else if(options->args.checks.num_shorthand_ops > 0) {
+                       fprintf(stderr, "ERROR: you may not mix shorthand and major operations\n");
+                       had_error = true;
+               }
+       }
+
+       if(options->args.checks.has_block_type && options->args.checks.has_except_block_type) {
+               fprintf(stderr, "ERROR: you may not specify both '--block-type' and '--except-block-type'\n");
+               had_error = true;
+       }
+
+       if(had_error)
+               short_usage(0);
+
+       return !had_error;
+}
+
+void free_options(CommandLineOptions *options)
+{
+       unsigned i;
+       Operation *op;
+       Argument *arg;
+
+       FLAC__ASSERT(0 == options->ops.operations || options->ops.num_operations > 0);
+       FLAC__ASSERT(0 == options->args.arguments || options->args.num_arguments > 0);
+
+       for(i = 0, op = options->ops.operations; i < options->ops.num_operations; i++, op++) {
+               switch(op->type) {
+                       case OP__SHOW_VC_FIELD:
+                       case OP__REMOVE_VC_FIELD:
+                       case OP__REMOVE_VC_FIRSTFIELD:
+                               if(0 != op->argument.vc_field_name.value)
+                                       free(op->argument.vc_field_name.value);
+                               break;
+                       case OP__SET_VC_FIELD:
+                               if(0 != op->argument.vc_field.field)
+                                       free(op->argument.vc_field.field);
+                               if(0 != op->argument.vc_field.field_name)
+                                       free(op->argument.vc_field.field_name);
+                               if(0 != op->argument.vc_field.field_value)
+                                       free(op->argument.vc_field.field_value);
+                               break;
+                       case OP__IMPORT_VC_FROM:
+                       case OP__EXPORT_VC_TO:
+                               if(0 != op->argument.vc_filename.value)
+                                       free(op->argument.vc_filename.value);
+                               break;
+                       case OP__ADD_SEEKPOINT:
+                               if(0 != op->argument.add_seekpoint.specification)
+                                       free(op->argument.add_seekpoint.specification);
+                               break;
+                       default:
+                               break;
+               }
+       }
+
+       for(i = 0, arg = options->args.arguments; i < options->args.num_arguments; i++, arg++) {
+               switch(arg->type) {
+                       case ARG__BLOCK_NUMBER:
+                               if(0 != arg->value.block_number.entries)
+                                       free(arg->value.block_number.entries);
+                               break;
+                       case ARG__BLOCK_TYPE:
+                       case ARG__EXCEPT_BLOCK_TYPE:
+                               if(0 != arg->value.block_type.entries)
+                                       free(arg->value.block_type.entries);
+                               break;
+                       case ARG__FROM_FILE:
+                               if(0 != arg->value.from_file.file_name)
+                                       free(arg->value.from_file.file_name);
+                               break;
+                       default:
+                               break;
+               }
+       }
+
+       if(0 != options->ops.operations)
+               free(options->ops.operations);
+
+       if(0 != options->args.arguments)
+               free(options->args.arguments);
+
+       if(0 != options->filenames)
+               free(options->filenames);
+}
+
+/*
+ * local routines
+ */
+
+FLAC__bool parse_option(int option_index, const char *option_argument, CommandLineOptions *options)
+{
+       const char *opt = long_options_[option_index].name;
+       Operation *op;
+       Argument *arg;
+       FLAC__bool ok = true;
+
+       if(0 == strcmp(opt, "preserve-modtime")) {
+               options->preserve_modtime = true;
+       }
+       else if(0 == strcmp(opt, "with-filename")) {
+               options->prefix_with_filename = true;
+       }
+       else if(0 == strcmp(opt, "no-filename")) {
+               options->prefix_with_filename = false;
+       }
+       else if(0 == strcmp(opt, "no-utf8-convert")) {
+               options->utf8_convert = false;
+       }
+       else if(0 == strcmp(opt, "dont-use-padding")) {
+               options->use_padding = false;
+       }
+       else if(0 == strcmp(opt, "show-md5sum")) {
+               (void) append_shorthand_operation(options, OP__SHOW_MD5SUM);
+       }
+       else if(0 == strcmp(opt, "show-min-blocksize")) {
+               (void) append_shorthand_operation(options, OP__SHOW_MIN_BLOCKSIZE);
+       }
+       else if(0 == strcmp(opt, "show-max-blocksize")) {
+               (void) append_shorthand_operation(options, OP__SHOW_MAX_BLOCKSIZE);
+       }
+       else if(0 == strcmp(opt, "show-min-framesize")) {
+               (void) append_shorthand_operation(options, OP__SHOW_MIN_FRAMESIZE);
+       }
+       else if(0 == strcmp(opt, "show-max-framesize")) {
+               (void) append_shorthand_operation(options, OP__SHOW_MAX_FRAMESIZE);
+       }
+       else if(0 == strcmp(opt, "show-sample-rate")) {
+               (void) append_shorthand_operation(options, OP__SHOW_SAMPLE_RATE);
+       }
+       else if(0 == strcmp(opt, "show-channels")) {
+               (void) append_shorthand_operation(options, OP__SHOW_CHANNELS);
+       }
+       else if(0 == strcmp(opt, "show-bps")) {
+               (void) append_shorthand_operation(options, OP__SHOW_BPS);
+       }
+       else if(0 == strcmp(opt, "show-total-samples")) {
+               (void) append_shorthand_operation(options, OP__SHOW_TOTAL_SAMPLES);
+       }
+       else if(0 == strcmp(opt, "set-md5sum")) {
+               op = append_shorthand_operation(options, OP__SET_MD5SUM);
+               FLAC__ASSERT(0 != option_argument);
+               if(!parse_md5(option_argument, op->argument.streaminfo_md5.value)) {
+                       fprintf(stderr, "ERROR (--%s): bad MD5 sum\n", opt);
+                       ok = false;
+               }
+               else
+                       undocumented_warning(opt);
+       }
+       else if(0 == strcmp(opt, "set-min-blocksize")) {
+               op = append_shorthand_operation(options, OP__SET_MIN_BLOCKSIZE);
+               if(!parse_uint32(option_argument, &(op->argument.streaminfo_uint32.value)) || op->argument.streaminfo_uint32.value < FLAC__MIN_BLOCK_SIZE || op->argument.streaminfo_uint32.value > FLAC__MAX_BLOCK_SIZE) {
+                       fprintf(stderr, "ERROR (--%s): value must be >= %u and <= %u\n", opt, FLAC__MIN_BLOCK_SIZE, FLAC__MAX_BLOCK_SIZE);
+                       ok = false;
+               }
+               else
+                       undocumented_warning(opt);
+       }
+       else if(0 == strcmp(opt, "set-max-blocksize")) {
+               op = append_shorthand_operation(options, OP__SET_MAX_BLOCKSIZE);
+               if(!parse_uint32(option_argument, &(op->argument.streaminfo_uint32.value)) || op->argument.streaminfo_uint32.value < FLAC__MIN_BLOCK_SIZE || op->argument.streaminfo_uint32.value > FLAC__MAX_BLOCK_SIZE) {
+                       fprintf(stderr, "ERROR (--%s): value must be >= %u and <= %u\n", opt, FLAC__MIN_BLOCK_SIZE, FLAC__MAX_BLOCK_SIZE);
+                       ok = false;
+               }
+               else
+                       undocumented_warning(opt);
+       }
+       else if(0 == strcmp(opt, "set-min-framesize")) {
+               op = append_shorthand_operation(options, OP__SET_MIN_FRAMESIZE);
+               if(!parse_uint32(option_argument, &(op->argument.streaminfo_uint32.value)) || op->argument.streaminfo_uint32.value >= (1u<<FLAC__STREAM_METADATA_STREAMINFO_MIN_FRAME_SIZE_LEN)) {
+                       fprintf(stderr, "ERROR (--%s): value must be a %u-bit unsigned integer\n", opt, FLAC__STREAM_METADATA_STREAMINFO_MIN_FRAME_SIZE_LEN);
+                       ok = false;
+               }
+               else
+                       undocumented_warning(opt);
+       }
+       else if(0 == strcmp(opt, "set-max-framesize")) {
+               op = append_shorthand_operation(options, OP__SET_MAX_FRAMESIZE);
+               if(!parse_uint32(option_argument, &(op->argument.streaminfo_uint32.value)) || op->argument.streaminfo_uint32.value >= (1u<<FLAC__STREAM_METADATA_STREAMINFO_MAX_FRAME_SIZE_LEN)) {
+                       fprintf(stderr, "ERROR (--%s): value must be a %u-bit unsigned integer\n", opt, FLAC__STREAM_METADATA_STREAMINFO_MAX_FRAME_SIZE_LEN);
+                       ok = false;
+               }
+               else
+                       undocumented_warning(opt);
+       }
+       else if(0 == strcmp(opt, "set-sample-rate")) {
+               op = append_shorthand_operation(options, OP__SET_SAMPLE_RATE);
+               if(!parse_uint32(option_argument, &(op->argument.streaminfo_uint32.value)) || !FLAC__format_sample_rate_is_valid(op->argument.streaminfo_uint32.value)) {
+                       fprintf(stderr, "ERROR (--%s): invalid sample rate\n", opt);
+                       ok = false;
+               }
+               else
+                       undocumented_warning(opt);
+       }
+       else if(0 == strcmp(opt, "set-channels")) {
+               op = append_shorthand_operation(options, OP__SET_CHANNELS);
+               if(!parse_uint32(option_argument, &(op->argument.streaminfo_uint32.value)) || op->argument.streaminfo_uint32.value > FLAC__MAX_CHANNELS) {
+                       fprintf(stderr, "ERROR (--%s): value must be > 0 and <= %u\n", opt, FLAC__MAX_CHANNELS);
+                       ok = false;
+               }
+               else
+                       undocumented_warning(opt);
+       }
+       else if(0 == strcmp(opt, "set-bps")) {
+               op = append_shorthand_operation(options, OP__SET_BPS);
+               if(!parse_uint32(option_argument, &(op->argument.streaminfo_uint32.value)) || op->argument.streaminfo_uint32.value < FLAC__MIN_BITS_PER_SAMPLE || op->argument.streaminfo_uint32.value > FLAC__MAX_BITS_PER_SAMPLE) {
+                       fprintf(stderr, "ERROR (--%s): value must be >= %u and <= %u\n", opt, FLAC__MIN_BITS_PER_SAMPLE, FLAC__MAX_BITS_PER_SAMPLE);
+                       ok = false;
+               }
+               else
+                       undocumented_warning(opt);
+       }
+       else if(0 == strcmp(opt, "set-total-samples")) {
+               op = append_shorthand_operation(options, OP__SET_TOTAL_SAMPLES);
+               if(!parse_uint64(option_argument, &(op->argument.streaminfo_uint64.value)) || op->argument.streaminfo_uint64.value >= (1u<<FLAC__STREAM_METADATA_STREAMINFO_TOTAL_SAMPLES_LEN)) {
+                       fprintf(stderr, "ERROR (--%s): value must be a %u-bit unsigned integer\n", opt, FLAC__STREAM_METADATA_STREAMINFO_TOTAL_SAMPLES_LEN);
+                       ok = false;
+               }
+               else
+                       undocumented_warning(opt);
+       }
+       else if(0 == strcmp(opt, "show-vc-vendor")) {
+               (void) append_shorthand_operation(options, OP__SHOW_VC_VENDOR);
+       }
+       else if(0 == strcmp(opt, "show-vc-field")) {
+               const char *violation;
+               op = append_shorthand_operation(options, OP__SHOW_VC_FIELD);
+               FLAC__ASSERT(0 != option_argument);
+               if(!parse_vorbis_comment_field_name(option_argument, &(op->argument.vc_field_name.value), &violation)) {
+                       FLAC__ASSERT(0 != violation);
+                       fprintf(stderr, "ERROR (--%s): malformed vorbis comment field name \"%s\",\n       %s\n", opt, option_argument, violation);
+                       ok = false;
+               }
+       }
+       else if(0 == strcmp(opt, "remove-vc-all")) {
+               (void) append_shorthand_operation(options, OP__REMOVE_VC_ALL);
+       }
+       else if(0 == strcmp(opt, "remove-vc-field")) {
+               const char *violation;
+               op = append_shorthand_operation(options, OP__REMOVE_VC_FIELD);
+               FLAC__ASSERT(0 != option_argument);
+               if(!parse_vorbis_comment_field_name(option_argument, &(op->argument.vc_field_name.value), &violation)) {
+                       FLAC__ASSERT(0 != violation);
+                       fprintf(stderr, "ERROR (--%s): malformed vorbis comment field name \"%s\",\n       %s\n", opt, option_argument, violation);
+                       ok = false;
+               }
+       }
+       else if(0 == strcmp(opt, "remove-vc-firstfield")) {
+               const char *violation;
+               op = append_shorthand_operation(options, OP__REMOVE_VC_FIRSTFIELD);
+               FLAC__ASSERT(0 != option_argument);
+               if(!parse_vorbis_comment_field_name(option_argument, &(op->argument.vc_field_name.value), &violation)) {
+                       FLAC__ASSERT(0 != violation);
+                       fprintf(stderr, "ERROR (--%s): malformed vorbis comment field name \"%s\",\n       %s\n", opt, option_argument, violation);
+                       ok = false;
+               }
+       }
+       else if(0 == strcmp(opt, "set-vc-field")) {
+               const char *violation;
+               op = append_shorthand_operation(options, OP__SET_VC_FIELD);
+               FLAC__ASSERT(0 != option_argument);
+               if(!parse_vorbis_comment_field(option_argument, &(op->argument.vc_field.field), &(op->argument.vc_field.field_name), &(op->argument.vc_field.field_value), &(op->argument.vc_field.field_value_length), &violation)) {
+                       FLAC__ASSERT(0 != violation);
+                       fprintf(stderr, "ERROR (--%s): malformed vorbis comment field \"%s\",\n       %s\n", opt, option_argument, violation);
+                       ok = false;
+               }
+       }
+       else if(0 == strcmp(opt, "import-vc-from")) {
+               op = append_shorthand_operation(options, OP__IMPORT_VC_FROM);
+               FLAC__ASSERT(0 != option_argument);
+               if(!parse_filename(option_argument, &(op->argument.vc_filename.value))) {
+                       fprintf(stderr, "ERROR (--%s): missing filename\n", opt);
+                       ok = false;
+               }
+       }
+       else if(0 == strcmp(opt, "export-vc-to")) {
+               op = append_shorthand_operation(options, OP__EXPORT_VC_TO);
+               FLAC__ASSERT(0 != option_argument);
+               if(!parse_filename(option_argument, &(op->argument.vc_filename.value))) {
+                       fprintf(stderr, "ERROR (--%s): missing filename\n", opt);
+                       ok = false;
+               }
+       }
+       else if(0 == strcmp(opt, "add-seekpoint")) {
+               const char *violation;
+               char *spec;
+               FLAC__ASSERT(0 != option_argument);
+               if(!parse_add_seekpoint(option_argument, &spec, &violation)) {
+                       FLAC__ASSERT(0 != violation);
+                       fprintf(stderr, "ERROR (--%s): malformed seekpoint specification \"%s\",\n       %s\n", opt, option_argument, violation);
+                       ok = false;
+               }
+               op = find_shorthand_operation(options, OP__ADD_SEEKPOINT);
+               if(0 == op)
+                       op = append_shorthand_operation(options, OP__ADD_SEEKPOINT);
+               local_strcat(&(op->argument.add_seekpoint.specification), spec);
+               local_strcat(&(op->argument.add_seekpoint.specification), ";");
+               free(spec);
+       }
+       else if(0 == strcmp(opt, "add-replay-gain")) {
+               (void) append_shorthand_operation(options, OP__ADD_REPLAY_GAIN);
+       }
+       else if(0 == strcmp(opt, "add-padding")) {
+               op = append_shorthand_operation(options, OP__ADD_PADDING);
+               FLAC__ASSERT(0 != option_argument);
+               if(!parse_add_padding(option_argument, &(op->argument.add_padding.length))) {
+                       fprintf(stderr, "ERROR (--%s): illegal length \"%s\", length must be >= 0 and < 2^%u\n", opt, option_argument, FLAC__STREAM_METADATA_LENGTH_LEN);
+                       ok = false;
+               }
+       }
+       else if(0 == strcmp(opt, "help")) {
+               options->show_long_help = true;
+       }
+       else if(0 == strcmp(opt, "version")) {
+               options->show_version = true;
+       }
+       else if(0 == strcmp(opt, "list")) {
+               (void) append_major_operation(options, OP__LIST);
+       }
+       else if(0 == strcmp(opt, "append")) {
+               (void) append_major_operation(options, OP__APPEND);
+       }
+       else if(0 == strcmp(opt, "remove")) {
+               (void) append_major_operation(options, OP__REMOVE);
+       }
+       else if(0 == strcmp(opt, "remove-all")) {
+               (void) append_major_operation(options, OP__REMOVE_ALL);
+       }
+       else if(0 == strcmp(opt, "merge-padding")) {
+               (void) append_major_operation(options, OP__MERGE_PADDING);
+       }
+       else if(0 == strcmp(opt, "sort-padding")) {
+               (void) append_major_operation(options, OP__SORT_PADDING);
+       }
+       else if(0 == strcmp(opt, "block-number")) {
+               arg = append_argument(options, ARG__BLOCK_NUMBER);
+               FLAC__ASSERT(0 != option_argument);
+               if(!parse_block_number(option_argument, &(arg->value.block_number))) {
+                       fprintf(stderr, "ERROR: malformed block number specification \"%s\"\n", option_argument);
+                       ok = false;
+               }
+       }
+       else if(0 == strcmp(opt, "block-type")) {
+               arg = append_argument(options, ARG__BLOCK_TYPE);
+               FLAC__ASSERT(0 != option_argument);
+               if(!parse_block_type(option_argument, &(arg->value.block_type))) {
+                       fprintf(stderr, "ERROR (--%s): malformed block type specification \"%s\"\n", opt, option_argument);
+                       ok = false;
+               }
+               options->args.checks.has_block_type = true;
+       }
+       else if(0 == strcmp(opt, "except-block-type")) {
+               arg = append_argument(options, ARG__EXCEPT_BLOCK_TYPE);
+               FLAC__ASSERT(0 != option_argument);
+               if(!parse_block_type(option_argument, &(arg->value.block_type))) {
+                       fprintf(stderr, "ERROR (--%s): malformed block type specification \"%s\"\n", opt, option_argument);
+                       ok = false;
+               }
+               options->args.checks.has_except_block_type = true;
+       }
+       else if(0 == strcmp(opt, "data-format")) {
+               arg = append_argument(options, ARG__DATA_FORMAT);
+               FLAC__ASSERT(0 != option_argument);
+               if(!parse_data_format(option_argument, &(arg->value.data_format))) {
+                       fprintf(stderr, "ERROR (--%s): illegal data format \"%s\"\n", opt, option_argument);
+                       ok = false;
+               }
+       }
+       else if(0 == strcmp(opt, "application-data-format")) {
+               FLAC__ASSERT(0 != option_argument);
+               if(!parse_application_data_format(option_argument, &(options->application_data_format_is_hexdump))) {
+                       fprintf(stderr, "ERROR (--%s): illegal application data format \"%s\"\n", opt, option_argument);
+                       ok = false;
+               }
+       }
+       else if(0 == strcmp(opt, "from-file")) {
+               arg = append_argument(options, ARG__FROM_FILE);
+               FLAC__ASSERT(0 != option_argument);
+               arg->value.from_file.file_name = local_strdup(option_argument);
+       }
+       else {
+               FLAC__ASSERT(0);
+       }
+
+       return ok;
+}
+
+void append_new_operation(CommandLineOptions *options, Operation operation)
+{
+       if(options->ops.capacity == 0) {
+               options->ops.capacity = 50;
+               if(0 == (options->ops.operations = malloc(sizeof(Operation) * options->ops.capacity)))
+                       die("out of memory allocating space for option list");
+               memset(options->ops.operations, 0, sizeof(Operation) * options->ops.capacity);
+       }
+       if(options->ops.capacity <= options->ops.num_operations) {
+               unsigned original_capacity = options->ops.capacity;
+               options->ops.capacity *= 4;
+               if(0 == (options->ops.operations = realloc(options->ops.operations, sizeof(Operation) * options->ops.capacity)))
+                       die("out of memory allocating space for option list");
+               memset(options->ops.operations + original_capacity, 0, sizeof(Operation) * (options->ops.capacity - original_capacity));
+       }
+
+       options->ops.operations[options->ops.num_operations++] = operation;
+}
+
+void append_new_argument(CommandLineOptions *options, Argument argument)
+{
+       if(options->args.capacity == 0) {
+               options->args.capacity = 50;
+               if(0 == (options->args.arguments = malloc(sizeof(Argument) * options->args.capacity)))
+                       die("out of memory allocating space for option list");
+               memset(options->args.arguments, 0, sizeof(Argument) * options->args.capacity);
+       }
+       if(options->args.capacity <= options->args.num_arguments) {
+               unsigned original_capacity = options->args.capacity;
+               options->args.capacity *= 4;
+               if(0 == (options->args.arguments = realloc(options->args.arguments, sizeof(Argument) * options->args.capacity)))
+                       die("out of memory allocating space for option list");
+               memset(options->args.arguments + original_capacity, 0, sizeof(Argument) * (options->args.capacity - original_capacity));
+       }
+
+       options->args.arguments[options->args.num_arguments++] = argument;
+}
+
+Operation *append_major_operation(CommandLineOptions *options, OperationType type)
+{
+       Operation op;
+       memset(&op, 0, sizeof(op));
+       op.type = type;
+       append_new_operation(options, op);
+       options->args.checks.num_major_ops++;
+       return options->ops.operations + (options->ops.num_operations - 1);
+}
+
+Operation *append_shorthand_operation(CommandLineOptions *options, OperationType type)
+{
+       Operation op;
+       memset(&op, 0, sizeof(op));
+       op.type = type;
+       append_new_operation(options, op);
+       options->args.checks.num_shorthand_ops++;
+       return options->ops.operations + (options->ops.num_operations - 1);
+}
+
+Operation *find_shorthand_operation(CommandLineOptions *options, OperationType type)
+{
+       unsigned i;
+       for(i = 0; i < options->ops.num_operations; i++)
+               if(options->ops.operations[i].type == type)
+                       return &options->ops.operations[i];
+       return 0;
+}
+
+Argument *append_argument(CommandLineOptions *options, ArgumentType type)
+{
+       Argument arg;
+       memset(&arg, 0, sizeof(arg));
+       arg.type = type;
+       append_new_argument(options, arg);
+       return options->args.arguments + (options->args.num_arguments - 1);
+}
+
+FLAC__bool parse_md5(const char *src, FLAC__byte dest[16])
+{
+       unsigned i, d;
+       int c;
+       FLAC__ASSERT(0 != src);
+       if(strlen(src) != 32)
+               return false;
+       /* strtoul() accepts negative numbers which we do not want, so we do it the hard way */
+       for(i = 0; i < 16; i++) {
+               c = (int)(*src++);
+               if(isdigit(c))
+                       d = (unsigned)(c - '0');
+               else if(c >= 'a' && c <= 'f')
+                       d = (unsigned)(c - 'a') + 10u;
+               else if(c >= 'A' && c <= 'F')
+                       d = (unsigned)(c - 'A') + 10u;
+               else
+                       return false;
+               d <<= 4;
+               c = (int)(*src++);
+               if(isdigit(c))
+                       d |= (unsigned)(c - '0');
+               else if(c >= 'a' && c <= 'f')
+                       d |= (unsigned)(c - 'a') + 10u;
+               else if(c >= 'A' && c <= 'F')
+                       d |= (unsigned)(c - 'A') + 10u;
+               else
+                       return false;
+               dest[i] = (FLAC__byte)d;
+       }
+       return true;
+}
+
+FLAC__bool parse_uint32(const char *src, FLAC__uint32 *dest)
+{
+       FLAC__ASSERT(0 != src);
+       if(strlen(src) == 0 || strspn(src, "0123456789") != strlen(src))
+               return false;
+       *dest = strtoul(src, 0, 10);
+       return true;
+}
+
+/* There's no stroull() in MSVC6 so we just write a specialized one */
+static FLAC__uint64 local__strtoull(const char *src)
+{
+       FLAC__uint64 ret = 0;
+       int c;
+       FLAC__ASSERT(0 != src);
+       while(0 != (c = *src++)) {
+               c -= '0';
+               if(c >= 0 && c <= 9)
+                       ret = (ret * 10) + c;
+               else
+                       break;
+       }
+       return ret;
+}
+
+FLAC__bool parse_uint64(const char *src, FLAC__uint64 *dest)
+{
+       FLAC__ASSERT(0 != src);
+       if(strlen(src) == 0 || strspn(src, "0123456789") != strlen(src))
+               return false;
+       *dest = local__strtoull(src);
+       return true;
+}
+
+FLAC__bool parse_filename(const char *src, char **dest)
+{
+       if(0 == src || strlen(src) == 0)
+               return false;
+       *dest = strdup(src);
+       return true;
+}
+
+FLAC__bool parse_vorbis_comment_field_name(const char *field_ref, char **name, const char **violation)
+{
+       static const char * const violations[] = {
+               "field name contains invalid character"
+       };
+
+       char *q, *s;
+
+       s = local_strdup(field_ref);
+
+       for(q = s; *q; q++) {
+               if(*q < 0x20 || *q > 0x7d || *q == 0x3d) {
+                       free(s);
+                       *violation = violations[0];
+                       return false;
+               }
+       }
+
+       *name = s;
+
+       return true;
+}
+
+FLAC__bool parse_add_seekpoint(const char *in, char **out, const char **violation)
+{
+       static const char *garbled_ = "garbled specification";
+       const unsigned n = strlen(in);
+
+       FLAC__ASSERT(0 != in);
+       FLAC__ASSERT(0 != out);
+
+       if(n == 0) {
+               *violation = "specification is empty";
+               return false;
+       }
+
+       if(n > strspn(in, "0123456789.Xsx")) {
+               *violation = "specification contains invalid character";
+               return false;
+       }
+
+       if(in[n-1] == 'X') {
+               if(n > 1) {
+                       *violation = garbled_;
+                       return false;
+               }
+       }
+       else if(in[n-1] == 's') {
+               if(n-1 > strspn(in, "0123456789.")) {
+                       *violation = garbled_;
+                       return false;
+               }
+       }
+       else if(in[n-1] == 'x') {
+               if(n-1 > strspn(in, "0123456789")) {
+                       *violation = garbled_;
+                       return false;
+               }
+       }
+       else {
+               if(n > strspn(in, "0123456789")) {
+                       *violation = garbled_;
+                       return false;
+               }
+       }
+
+       *out = local_strdup(in);
+       return true;
+}
+
+FLAC__bool parse_add_padding(const char *in, unsigned *out)
+{
+       FLAC__ASSERT(0 != in);
+       FLAC__ASSERT(0 != out);
+       *out = (unsigned)strtoul(in, 0, 10);
+       return *out < (1u << FLAC__STREAM_METADATA_LENGTH_LEN);
+}
+
+FLAC__bool parse_block_number(const char *in, Argument_BlockNumber *out)
+{
+       char *p, *q, *s, *end;
+       long i;
+       unsigned entry;
+
+       if(*in == '\0')
+               return false;
+
+       s = local_strdup(in);
+
+       /* first count the entries */
+       for(out->num_entries = 1, p = strchr(s, ','); p; out->num_entries++, p = strchr(++p, ','))
+               ;
+
+       /* make space */
+       FLAC__ASSERT(out->num_entries > 0);
+       if(0 == (out->entries = malloc(sizeof(unsigned) * out->num_entries)))
+               die("out of memory allocating space for option list");
+
+       /* load 'em up */
+       entry = 0;
+       q = s;
+       while(q) {
+               FLAC__ASSERT(entry < out->num_entries);
+               if(0 != (p = strchr(q, ',')))
+                       *p++ = '\0';
+               if(!isdigit((int)(*q)) || (i = strtol(q, &end, 10)) < 0 || *end) {
+                       free(s);
+                       return false;
+               }
+               out->entries[entry++] = (unsigned)i;
+               q = p;
+       }
+       FLAC__ASSERT(entry == out->num_entries);
+
+       free(s);
+       return true;
+}
+
+FLAC__bool parse_block_type(const char *in, Argument_BlockType *out)
+{
+       char *p, *q, *r, *s;
+       unsigned entry;
+
+       if(*in == '\0')
+               return false;
+
+       s = local_strdup(in);
+
+       /* first count the entries */
+       for(out->num_entries = 1, p = strchr(s, ','); p; out->num_entries++, p = strchr(++p, ','))
+               ;
+
+       /* make space */
+       FLAC__ASSERT(out->num_entries > 0);
+       if(0 == (out->entries = malloc(sizeof(Argument_BlockTypeEntry) * out->num_entries)))
+               die("out of memory allocating space for option list");
+
+       /* load 'em up */
+       entry = 0;
+       q = s;
+       while(q) {
+               FLAC__ASSERT(entry < out->num_entries);
+               if(0 != (p = strchr(q, ',')))
+                       *p++ = 0;
+               r = strchr(q, ':');
+               if(r)
+                       *r++ = '\0';
+               if(0 != r && 0 != strcmp(q, "APPLICATION")) {
+                       free(s);
+                       return false;
+               }
+               if(0 == strcmp(q, "STREAMINFO")) {
+                       out->entries[entry++].type = FLAC__METADATA_TYPE_STREAMINFO;
+               }
+               else if(0 == strcmp(q, "PADDING")) {
+                       out->entries[entry++].type = FLAC__METADATA_TYPE_PADDING;
+               }
+               else if(0 == strcmp(q, "APPLICATION")) {
+                       out->entries[entry].type = FLAC__METADATA_TYPE_APPLICATION;
+                       out->entries[entry].filter_application_by_id = (0 != r);
+                       if(0 != r) {
+                               if(strlen(r) == 4) {
+                                       strcpy(out->entries[entry].application_id, r);
+                               }
+                               else if(strlen(r) == 10 && strncmp(r, "0x", 2) == 0 && strspn(r+2, "0123456789ABCDEFabcdef") == 8) {
+                                       FLAC__uint32 x = strtoul(r+2, 0, 16);
+                                       out->entries[entry].application_id[3] = (FLAC__byte)(x & 0xff);
+                                       out->entries[entry].application_id[2] = (FLAC__byte)((x>>=8) & 0xff);
+                                       out->entries[entry].application_id[1] = (FLAC__byte)((x>>=8) & 0xff);
+                                       out->entries[entry].application_id[0] = (FLAC__byte)((x>>=8) & 0xff);
+                               }
+                               else {
+                                       free(s);
+                                       return false;
+                               }
+                       }
+                       entry++;
+               }
+               else if(0 == strcmp(q, "SEEKTABLE")) {
+                       out->entries[entry++].type = FLAC__METADATA_TYPE_SEEKTABLE;
+               }
+               else if(0 == strcmp(q, "VORBIS_COMMENT")) {
+                       out->entries[entry++].type = FLAC__METADATA_TYPE_VORBIS_COMMENT;
+               }
+               else {
+                       free(s);
+                       return false;
+               }
+               q = p;
+       }
+       FLAC__ASSERT(entry == out->num_entries);
+
+       free(s);
+       return true;
+}
+
+FLAC__bool parse_data_format(const char *in, Argument_DataFormat *out)
+{
+       if(0 == strcmp(in, "binary"))
+               out->is_binary = true;
+       else if(0 == strcmp(in, "text"))
+               out->is_binary = false;
+       else
+               return false;
+       return true;
+}
+
+FLAC__bool parse_application_data_format(const char *in, FLAC__bool *out)
+{
+       if(0 == strcmp(in, "hexdump"))
+               *out = true;
+       else if(0 == strcmp(in, "text"))
+               *out = false;
+       else
+               return false;
+       return true;
+}
+
+void undocumented_warning(const char *opt)
+{
+       fprintf(stderr, "WARNING: undocmented option --%s should be used with caution,\n         only for repairing a damaged STREAMINFO block\n", opt);
+}
diff --git a/src/metaflac/options.h b/src/metaflac/options.h
new file mode 100644 (file)
index 0000000..42fef8f
--- /dev/null
@@ -0,0 +1,196 @@
+/* metaflac - Command-line FLAC metadata editor
+ * Copyright (C) 2001,2002  Josh Coalson
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+#ifndef metaflac__options_h
+#define metaflac__options_h
+
+#include "FLAC/format.h"
+
+#if 0
+/*[JEC] was:#if HAVE_GETOPT_LONG*/
+/*[JEC] see flac/include/share/getopt.h as to why the change */
+#  include <getopt.h>
+#else
+#  include "share/getopt.h"
+#endif
+
+extern struct share__option long_options_[];
+
+typedef enum {
+       OP__SHOW_MD5SUM,
+       OP__SHOW_MIN_BLOCKSIZE,
+       OP__SHOW_MAX_BLOCKSIZE,
+       OP__SHOW_MIN_FRAMESIZE,
+       OP__SHOW_MAX_FRAMESIZE,
+       OP__SHOW_SAMPLE_RATE,
+       OP__SHOW_CHANNELS,
+       OP__SHOW_BPS,
+       OP__SHOW_TOTAL_SAMPLES,
+       OP__SET_MD5SUM,
+       OP__SET_MIN_BLOCKSIZE,
+       OP__SET_MAX_BLOCKSIZE,
+       OP__SET_MIN_FRAMESIZE,
+       OP__SET_MAX_FRAMESIZE,
+       OP__SET_SAMPLE_RATE,
+       OP__SET_CHANNELS,
+       OP__SET_BPS,
+       OP__SET_TOTAL_SAMPLES,
+       OP__SHOW_VC_VENDOR,
+       OP__SHOW_VC_FIELD,
+       OP__REMOVE_VC_ALL,
+       OP__REMOVE_VC_FIELD,
+       OP__REMOVE_VC_FIRSTFIELD,
+       OP__SET_VC_FIELD,
+       OP__IMPORT_VC_FROM,
+       OP__EXPORT_VC_TO,
+       OP__ADD_SEEKPOINT,
+       OP__ADD_REPLAY_GAIN,
+       OP__ADD_PADDING,
+       OP__LIST,
+       OP__APPEND,
+       OP__REMOVE,
+       OP__REMOVE_ALL,
+       OP__MERGE_PADDING,
+       OP__SORT_PADDING
+} OperationType;
+
+typedef enum {
+       ARG__BLOCK_NUMBER,
+       ARG__BLOCK_TYPE,
+       ARG__EXCEPT_BLOCK_TYPE,
+       ARG__DATA_FORMAT,
+       ARG__FROM_FILE
+} ArgumentType;
+
+typedef struct {
+       FLAC__byte value[16];
+} Argument_StreaminfoMD5;
+
+typedef struct {
+       FLAC__uint32 value;
+} Argument_StreaminfoUInt32;
+
+typedef struct {
+       FLAC__uint64 value;
+} Argument_StreaminfoUInt64;
+
+typedef struct {
+       char *value;
+} Argument_VcFieldName;
+
+typedef struct {
+       char *field; /* the whole field as passed on the command line, i.e. "NAME=VALUE" */
+       char *field_name;
+       /* according to the vorbis spec, field values can contain \0 so simple C strings are not enough here */
+       unsigned field_value_length;
+       char *field_value;
+} Argument_VcField;
+
+typedef struct {
+       char *value;
+} Argument_VcFilename;
+
+typedef struct {
+       unsigned num_entries;
+       unsigned *entries;
+} Argument_BlockNumber;
+
+typedef struct {
+       FLAC__MetadataType type;
+       char application_id[4]; /* only relevant if type == FLAC__STREAM_METADATA_TYPE_APPLICATION */
+       FLAC__bool filter_application_by_id;
+} Argument_BlockTypeEntry;
+
+typedef struct {
+       unsigned num_entries;
+       Argument_BlockTypeEntry *entries;
+} Argument_BlockType;
+
+typedef struct {
+       FLAC__bool is_binary;
+} Argument_DataFormat;
+
+typedef struct {
+       char *file_name;
+} Argument_FromFile;
+
+typedef struct {
+       char *specification;
+} Argument_AddSeekpoint;
+
+typedef struct {
+       unsigned length;
+} Argument_AddPadding;
+
+typedef struct {
+       OperationType type;
+       union {
+               Argument_StreaminfoMD5 streaminfo_md5;
+               Argument_StreaminfoUInt32 streaminfo_uint32;
+               Argument_StreaminfoUInt64 streaminfo_uint64;
+               Argument_VcFieldName vc_field_name;
+               Argument_VcField vc_field;
+               Argument_VcFilename vc_filename;
+               Argument_AddSeekpoint add_seekpoint;
+               Argument_AddPadding add_padding;
+       } argument;
+} Operation;
+
+typedef struct {
+       ArgumentType type;
+       union {
+               Argument_BlockNumber block_number;
+               Argument_BlockType block_type;
+               Argument_DataFormat data_format;
+               Argument_FromFile from_file;
+       } value;
+} Argument;
+
+typedef struct {
+       FLAC__bool preserve_modtime;
+       FLAC__bool prefix_with_filename;
+       FLAC__bool utf8_convert;
+       FLAC__bool use_padding;
+       FLAC__bool show_long_help;
+       FLAC__bool show_version;
+       FLAC__bool application_data_format_is_hexdump;
+       struct {
+               Operation *operations;
+               unsigned num_operations;
+               unsigned capacity;
+       } ops;
+       struct {
+               struct {
+                       unsigned num_shorthand_ops;
+                       unsigned num_major_ops;
+                       FLAC__bool has_block_type;
+                       FLAC__bool has_except_block_type;
+               } checks;
+               Argument *arguments;
+               unsigned num_arguments;
+               unsigned capacity;
+       } args;
+       unsigned num_files;
+       char **filenames;
+} CommandLineOptions;
+
+void init_options(CommandLineOptions *options);
+FLAC__bool parse_options(int argc, char *argv[], CommandLineOptions *options);
+void free_options(CommandLineOptions *options);
+
+#endif
diff --git a/src/metaflac/usage.c b/src/metaflac/usage.c
new file mode 100644 (file)
index 0000000..b4269b0
--- /dev/null
@@ -0,0 +1,245 @@
+/* metaflac - Command-line FLAC metadata editor
+ * Copyright (C) 2001,2002  Josh Coalson
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+#include "usage.h"
+#include "FLAC/format.h"
+#include <stdarg.h>
+#include <stdio.h>
+
+static void usage_header(FILE *out)
+{
+       fprintf(out, "==============================================================================\n");
+       fprintf(out, "metaflac - Command-line FLAC metadata editor version %s\n", FLAC__VERSION_STRING);
+       fprintf(out, "Copyright (C) 2001,2002  Josh Coalson\n");
+       fprintf(out, "\n");
+       fprintf(out, "This program is free software; you can redistribute it and/or\n");
+       fprintf(out, "modify it under the terms of the GNU General Public License\n");
+       fprintf(out, "as published by the Free Software Foundation; either version 2\n");
+       fprintf(out, "of the License, or (at your option) any later version.\n");
+       fprintf(out, "\n");
+       fprintf(out, "This program is distributed in the hope that it will be useful,\n");
+       fprintf(out, "but WITHOUT ANY WARRANTY; without even the implied warranty of\n");
+       fprintf(out, "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n");
+       fprintf(out, "GNU General Public License for more details.\n");
+       fprintf(out, "\n");
+       fprintf(out, "You should have received a copy of the GNU General Public License\n");
+       fprintf(out, "along with this program; if not, write to the Free Software\n");
+       fprintf(out, "Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.\n");
+       fprintf(out, "==============================================================================\n");
+}
+
+static void usage_summary(FILE *out)
+{
+       fprintf(out, "Usage:\n");
+       fprintf(out, "  metaflac [options] [operations] FLACfile [FLACfile ...]\n");
+       fprintf(out, "\n");
+       fprintf(out, "Use metaflac to list, add, remove, or edit metadata in one or more FLAC files.\n");
+       fprintf(out, "You may perform one major operation, or many shorthand operations at a time.\n");
+       fprintf(out, "\n");
+       fprintf(out, "Options:\n");
+       fprintf(out, "--preserve-modtime    Preserve the original modification time in spite of edits\n");
+       fprintf(out, "--with-filename       Prefix each output line with the FLAC file name\n");
+       fprintf(out, "                      (the default if more than one FLAC file is specified)\n");
+       fprintf(out, "--no-filename         Do not prefix each output line with the FLAC file name\n");
+       fprintf(out, "                      (the default if only one FLAC file is specified)\n");
+       fprintf(out, "--no-utf8-convert     Do not convert Vorbis comments from UTF-8 to local charset,\n");
+       fprintf(out, "                      or vice versa.  This is useful for scripts.\n");
+       fprintf(out, "--dont-use-padding    By default metaflac tries to use padding where possible\n");
+       fprintf(out, "                      to avoid rewriting the entire file if the metadata size\n");
+       fprintf(out, "                      changes.  Use this option to tell metaflac to not take\n");
+       fprintf(out, "                      advantage of padding this way.\n");
+}
+
+int short_usage(const char *message, ...)
+{
+       va_list args;
+
+       if(message) {
+               va_start(args, message);
+
+               (void) vfprintf(stderr, message, args);
+
+               va_end(args);
+
+       }
+       usage_header(stderr);
+       fprintf(stderr, "\n");
+       fprintf(stderr, "This is the short help; for full help use 'metaflac --help'\n");
+       fprintf(stderr, "\n");
+       usage_summary(stderr);
+
+       return message? 1 : 0;
+}
+
+int long_usage(const char *message, ...)
+{
+       FILE *out = (message? stderr : stdout);
+       va_list args;
+
+       if(message) {
+               va_start(args, message);
+
+               (void) vfprintf(stderr, message, args);
+
+               va_end(args);
+
+       }
+       usage_header(out);
+       fprintf(out, "\n");
+       usage_summary(out);
+       fprintf(out, "\n");
+       fprintf(out, "Shorthand operations:\n");
+       fprintf(out, "--show-md5sum         Show the MD5 signature from the STREAMINFO block.\n");
+       fprintf(out, "--show-min-blocksize  Show the minimum block size from the STREAMINFO block.\n");
+       fprintf(out, "--show-max-blocksize  Show the maximum block size from the STREAMINFO block.\n");
+       fprintf(out, "--show-min-framesize  Show the minimum frame size from the STREAMINFO block.\n");
+       fprintf(out, "--show-max-framesize  Show the maximum frame size from the STREAMINFO block.\n");
+       fprintf(out, "--show-sample-rate    Show the sample rate from the STREAMINFO block.\n");
+       fprintf(out, "--show-channels       Show the number of channels from the STREAMINFO block.\n");
+       fprintf(out, "--show-bps            Show the # of bits per sample from the STREAMINFO block.\n");
+       fprintf(out, "--show-total-samples  Show the total # of samples from the STREAMINFO block.\n");
+       fprintf(out, "\n");
+       fprintf(out, "--show-vc-vendor      Show the vendor string from the VORBIS_COMMENT block.\n");
+       fprintf(out, "--show-vc-field=name  Show all Vorbis comment fields where the the field name\n");
+       fprintf(out, "                      matches 'name'.\n");
+       fprintf(out, "--remove-vc-field=name\n");
+       fprintf(out, "                      Remove all Vorbis comment fields whose field name is\n");
+       fprintf(out, "                      'name'.\n");
+       fprintf(out, "--remove-vc-firstfield=name\n");
+       fprintf(out, "                      Remove first Vorbis comment field whose field name is\n");
+       fprintf(out, "                      'name'.\n");
+       fprintf(out, "--remove-vc-all       Remove all Vorbis comment fields, leaving only the\n");
+       fprintf(out, "                      vendor string in the VORBIS_COMMENT block.\n");
+       fprintf(out, "--set-vc-field=field  Add a Vorbis comment field.  The field must comply with\n");
+       fprintf(out, "                      the Vorbis comment spec, of the form \"NAME=VALUE\".  If\n");
+       fprintf(out, "                      there is currently no VORBIS_COMMENT block, one will be\n");
+       fprintf(out, "                      created.\n");
+       fprintf(out, "--import-vc-from=file Import Vorbis comments from a file.  Use '-' for stdin.\n");
+       fprintf(out, "                      Each line should be of the form NAME=VALUE.  Multi-\n");
+       fprintf(out, "                      line comments are currently not supported.  Specify\n");
+       fprintf(out, "                      --remove-vc-all and/or --no-utf8-convert before\n");
+       fprintf(out, "                      --import-vc-from if necessary.\n");
+       fprintf(out, "--export-vc-to=file   Export Vorbis comments to a file.  Use '-' for stdin.\n");
+       fprintf(out, "                      Each line will be of the form NAME=VALUE.  Specify\n");
+       fprintf(out, "                      --no-utf8-convert if necessary.\n");
+       fprintf(out, "--add-replay-gain     Calculates the title and album gains/peaks of the given\n");
+       fprintf(out, "                      FLAC files as if all the files were part of one album,\n");
+       fprintf(out, "                      then stores them in the VORBIS_COMMENT block.  The tags\n");
+       fprintf(out, "                      are the same as those used by vorbisgain.  Existing\n");
+       fprintf(out, "                      ReplayGain tags will be replaced.  If only one FLAC file\n");
+       fprintf(out, "                      is given, the album and title gains will be the same.\n");
+       fprintf(out, "                      Since this operation requires two passes, it is always\n");
+       fprintf(out, "                      executed last, after all other operations have been\n");
+       fprintf(out, "                      completed and written to disk.  All FLAC files specified\n");
+       fprintf(out, "                      must have the same resolution, sample rate, and number\n");
+       fprintf(out, "                      of channels.  The sample rate must be one of 8, 11.025,\n");
+       fprintf(out, "                      12, 16, 22.05, 24, 32, 44.1, or 48 kHz.\n");
+       fprintf(out, "--add-padding=length  Add a padding block of the given length (in bytes).\n");
+       fprintf(out, "                      The overall length of the new block will be 4 + length;\n");
+       fprintf(out, "                      the extra 4 bytes is for the metadata block header.\n");
+       fprintf(out, "\n");
+       fprintf(out, "Major operations:\n");
+       fprintf(out, "--version\n");
+       fprintf(out, "    Show the metaflac version number.\n");
+       fprintf(out, "--list\n");
+       fprintf(out, "    List the contents of one or more metadata blocks to stdout.  By default,\n");
+       fprintf(out, "    all metadata blocks are listed in text format.  Use the following options\n");
+       fprintf(out, "    to change this behavior:\n");
+       fprintf(out, "\n");
+       fprintf(out, "    --block-number=#[,#[...]]\n");
+       fprintf(out, "    An optional comma-separated list of block numbers to display.  The first\n");
+       fprintf(out, "    block, the STREAMINFO block, is block 0.\n");
+       fprintf(out, "\n");
+       fprintf(out, "    --block-type=type[,type[...]]\n");
+       fprintf(out, "    --except-block-type=type[,type[...]]\n");
+       fprintf(out, "    An optional comma-separated list of block types to included or ignored\n");
+       fprintf(out, "    with this option.  Use only one of --block-type or --except-block-type.\n");
+       fprintf(out, "    The valid block types are: STREAMINFO, PADDING, APPLICATION, SEEKTABLE,\n");
+       fprintf(out, "    VORBIS_COMMENT.  You may narrow down the types of APPLICATION blocks\n");
+       fprintf(out, "    displayed as follows:\n");
+       fprintf(out, "        APPLICATION:abcd        The APPLICATION block(s) whose textual repre-\n");
+       fprintf(out, "                                sentation of the 4-byte ID is \"abcd\"\n");
+       fprintf(out, "        APPLICATION:0xXXXXXXXX  The APPLICATION block(s) whose hexadecimal big-\n");
+       fprintf(out, "                                endian representation of the 4-byte ID is\n");
+       fprintf(out, "                                \"0xXXXXXXXX\".  For the example \"abcd\" above the\n");
+       fprintf(out, "                                hexadecimal equivalalent is 0x61626364\n");
+       fprintf(out, "\n");
+       fprintf(out, "    NOTE: if both --block-number and --[except-]block-type are specified,\n");
+       fprintf(out, "          the result is the logical AND of both arguments.\n");
+       fprintf(out, "\n");
+#if 0
+       /*@@@ not implemented yet */
+       fprintf(out, "    --data-format=binary|text\n");
+       fprintf(out, "    By default a human-readable text representation of the data is displayed.\n");
+       fprintf(out, "    You may specify --data-format=binary to dump the raw binary form of each\n");
+       fprintf(out, "    metadata block.  The output can be read in using a subsequent call to\n");
+       fprintf(out, "    "metaflac --append --from-file=..."\n");
+       fprintf(out, "\n");
+#endif
+       fprintf(out, "    --application-data-format=hexdump|text\n");
+       fprintf(out, "    If the application block you are displaying contains binary data but your\n");
+       fprintf(out, "    --data-format=text, you can display a hex dump of the application data\n");
+       fprintf(out, "    contents instead using --application-data-format=hexdump\n");
+       fprintf(out, "\n");
+#if 0
+       /*@@@ not implemented yet */
+       fprintf(out, "--append\n");
+       fprintf(out, "    Insert a metadata block from a file.  The input file must be in the same\n");
+       fprintf(out, "    format as generated with --list.\n");
+       fprintf(out, "\n");
+       fprintf(out, "    --block-number=#\n");
+       fprintf(out, "    Specify the insertion point (defaults to last block).  The new block will\n");
+       fprintf(out, "    be added after the given block number.  This prevents the illegal insertion\n");
+       fprintf(out, "    of a block before the first STREAMINFO block.  You may not --append another\n");
+       fprintf(out, "    STREAMINFO block.\n");
+       fprintf(out, "\n");
+       fprintf(out, "    --from-file=filename\n");
+       fprintf(out, "    Mandatory 'option' to specify the input file containing the block contents.\n");
+       fprintf(out, "\n");
+       fprintf(out, "    --data-format=binary|text\n");
+       fprintf(out, "    By default the block contents are assumed to be in binary format.  You can\n");
+       fprintf(out, "    override this by specifying --data-format=text\n");
+       fprintf(out, "\n");
+#endif
+       fprintf(out, "--remove\n");
+       fprintf(out, "    Remove one or more metadata blocks from the metadata.  Unless\n");
+       fprintf(out, "    --dont-use-padding is specified, the blocks will be replaced with padding.\n");
+       fprintf(out, "    You may not remove the STREAMINFO block.\n");
+       fprintf(out, "\n");
+       fprintf(out, "    --block-number=#[,#[...]]\n");
+       fprintf(out, "    --block-type=type[,type[...]]\n");
+       fprintf(out, "    --except-block-type=type[,type[...]]\n");
+       fprintf(out, "    See --list above for usage.\n");
+       fprintf(out, "\n");
+       fprintf(out, "    NOTE: if both --block-number and --[except-]block-type are specified,\n");
+       fprintf(out, "          the result is the logical AND of both arguments.\n");
+       fprintf(out, "\n");
+       fprintf(out, "--remove-all\n");
+       fprintf(out, "    Remove all metadata blocks (except the STREAMINFO block) from the\n");
+       fprintf(out, "    metadata.  Unless --dont-use-padding is specified, the blocks will be\n");
+       fprintf(out, "    replaced with padding.\n");
+       fprintf(out, "\n");
+       fprintf(out, "--merge-padding\n");
+       fprintf(out, "    Merge adjacent PADDING blocks into single blocks.\n");
+       fprintf(out, "\n");
+       fprintf(out, "--sort-padding\n");
+       fprintf(out, "    Move all PADDING blocks to the end of the metadata and merge them into a\n");
+       fprintf(out, "    single block.\n");
+
+       return message? 1 : 0;
+}
diff --git a/src/metaflac/usage.h b/src/metaflac/usage.h
new file mode 100644 (file)
index 0000000..293bbd5
--- /dev/null
@@ -0,0 +1,25 @@
+/* metaflac - Command-line FLAC metadata editor
+ * Copyright (C) 2001,2002  Josh Coalson
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+#ifndef metaflac__usage_h
+#define metaflac__usage_h
+
+int short_usage(const char *message, ...);
+int long_usage(const char *message, ...);
+
+#endif
diff --git a/src/metaflac/utils.c b/src/metaflac/utils.c
new file mode 100644 (file)
index 0000000..07edba2
--- /dev/null
@@ -0,0 +1,195 @@
+/* metaflac - Command-line FLAC metadata editor
+ * Copyright (C) 2001,2002  Josh Coalson
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+#include "utils.h"
+#include "FLAC/assert.h"
+#include "share/utf8.h"
+#include <ctype.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+void die(const char *message)
+{
+       FLAC__ASSERT(0 != message);
+       fprintf(stderr, "ERROR: %s\n", message);
+       exit(1);
+}
+
+char *local_strdup(const char *source)
+{
+       char *ret;
+       FLAC__ASSERT(0 != source);
+       if(0 == (ret = strdup(source)))
+               die("out of memory during strdup()");
+       return ret;
+}
+
+void local_strcat(char **dest, const char *source)
+{
+       unsigned ndest, nsource;
+
+       FLAC__ASSERT(0 != dest);
+       FLAC__ASSERT(0 != source);
+
+       ndest = *dest? strlen(*dest) : 0;
+       nsource = strlen(source);
+
+       *dest = realloc(*dest, ndest + nsource);
+       if(0 == *dest)
+               die("out of memory growing string");
+       if(0 == ndest)
+               strcpy(*dest, source);
+       else
+               strcat(*dest, source);
+}
+
+void hexdump(const char *filename, const FLAC__byte *buf, unsigned bytes, const char *indent)
+{
+       unsigned i, left = bytes;
+       const FLAC__byte *b = buf;
+
+       for(i = 0; i < bytes; i += 16) {
+               printf("%s%s%s%08X: "
+                       "%02X %02X %02X %02X %02X %02X %02X %02X "
+                       "%02X %02X %02X %02X %02X %02X %02X %02X "
+                       "%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c\n",
+                       filename? filename:"", filename? ":":"",
+                       indent, i,
+                       left >  0? (unsigned char)b[ 0] : 0,
+                       left >  1? (unsigned char)b[ 1] : 0,
+                       left >  2? (unsigned char)b[ 2] : 0,
+                       left >  3? (unsigned char)b[ 3] : 0,
+                       left >  4? (unsigned char)b[ 4] : 0,
+                       left >  5? (unsigned char)b[ 5] : 0,
+                       left >  6? (unsigned char)b[ 6] : 0,
+                       left >  7? (unsigned char)b[ 7] : 0,
+                       left >  8? (unsigned char)b[ 8] : 0,
+                       left >  9? (unsigned char)b[ 9] : 0,
+                       left > 10? (unsigned char)b[10] : 0,
+                       left > 11? (unsigned char)b[11] : 0,
+                       left > 12? (unsigned char)b[12] : 0,
+                       left > 13? (unsigned char)b[13] : 0,
+                       left > 14? (unsigned char)b[14] : 0,
+                       left > 15? (unsigned char)b[15] : 0,
+                       (left >  0) ? (isprint(b[ 0]) ? b[ 0] : '.') : ' ',
+                       (left >  1) ? (isprint(b[ 1]) ? b[ 1] : '.') : ' ',
+                       (left >  2) ? (isprint(b[ 2]) ? b[ 2] : '.') : ' ',
+                       (left >  3) ? (isprint(b[ 3]) ? b[ 3] : '.') : ' ',
+                       (left >  4) ? (isprint(b[ 4]) ? b[ 4] : '.') : ' ',
+                       (left >  5) ? (isprint(b[ 5]) ? b[ 5] : '.') : ' ',
+                       (left >  6) ? (isprint(b[ 6]) ? b[ 6] : '.') : ' ',
+                       (left >  7) ? (isprint(b[ 7]) ? b[ 7] : '.') : ' ',
+                       (left >  8) ? (isprint(b[ 8]) ? b[ 8] : '.') : ' ',
+                       (left >  9) ? (isprint(b[ 9]) ? b[ 9] : '.') : ' ',
+                       (left > 10) ? (isprint(b[10]) ? b[10] : '.') : ' ',
+                       (left > 11) ? (isprint(b[11]) ? b[11] : '.') : ' ',
+                       (left > 12) ? (isprint(b[12]) ? b[12] : '.') : ' ',
+                       (left > 13) ? (isprint(b[13]) ? b[13] : '.') : ' ',
+                       (left > 14) ? (isprint(b[14]) ? b[14] : '.') : ' ',
+                       (left > 15) ? (isprint(b[15]) ? b[15] : '.') : ' '
+               );
+               left -= 16;
+               b += 16;
+   }
+}
+
+FLAC__bool parse_vorbis_comment_field(const char *field_ref, char **field, char **name, char **value, unsigned *length, const char **violation)
+{
+       static const char * const violations[] = {
+               "field name contains invalid character",
+               "field contains no '=' character"
+       };
+
+       char *p, *q, *s;
+
+       if(0 != field)
+               *field = local_strdup(field_ref);
+
+       s = local_strdup(field_ref);
+
+       if(0 == (p = strchr(s, '='))) {
+               free(s);
+               *violation = violations[1];
+               return false;
+       }
+       *p++ = '\0';
+
+       for(q = s; *q; q++) {
+               if(*q < 0x20 || *q > 0x7d || *q == 0x3d) {
+                       free(s);
+                       *violation = violations[0];
+                       return false;
+               }
+       }
+
+       *name = local_strdup(s);
+       *value = local_strdup(p);
+       *length = strlen(p);
+
+       free(s);
+       return true;
+}
+
+void write_vc_field(const char *filename, const FLAC__StreamMetadata_VorbisComment_Entry *entry, FLAC__bool raw, FILE *f)
+{
+       if(0 != entry->entry) {
+               if(filename)
+                       fprintf(f, "%s:", filename);
+
+               if(!raw) {
+                       /*
+                        * utf8_decode() works on NULL-terminated strings, so
+                        * we append a null to the entry.  @@@ Note, this means
+                        * that comments that contain an embedded null will be
+                        * truncated by utf_decode().
+                        */
+                       char *terminated, *converted;
+
+                       if(0 == (terminated = malloc(entry->length + 1)))
+                               die("out of memory allocating space for vorbis comment");
+                       memcpy(terminated, entry->entry, entry->length);
+                       terminated[entry->length] = '\0';
+                       if(utf8_decode(terminated, &converted) >= 0) {
+                               (void) fwrite(converted, 1, strlen(converted), f);
+                               free(terminated);
+                               free(converted);
+                       }
+                       else {
+                               free(terminated);
+                               (void) fwrite(entry->entry, 1, entry->length, f);
+                       }
+               }
+               else {
+                       (void) fwrite(entry->entry, 1, entry->length, f);
+               }
+       }
+
+       fprintf(f, "\n");
+}
+
+void write_vc_fields(const char *filename, const char *field_name, const FLAC__StreamMetadata_VorbisComment_Entry entry[], unsigned num_entries, FLAC__bool raw, FILE *f)
+{
+       unsigned i;
+       const unsigned field_name_length = (0 != field_name)? strlen(field_name) : 0;
+
+       for(i = 0; i < num_entries; i++) {
+               if(0 == field_name || FLAC__metadata_object_vorbiscomment_entry_matches(entry + i, field_name, field_name_length))
+                       write_vc_field(filename, entry + i, raw, f);
+       }
+}
diff --git a/src/metaflac/utils.h b/src/metaflac/utils.h
new file mode 100644 (file)
index 0000000..7e75bd5
--- /dev/null
@@ -0,0 +1,35 @@
+/* metaflac - Command-line FLAC metadata editor
+ * Copyright (C) 2001,2002  Josh Coalson
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+#ifndef metaflac__utils_h
+#define metaflac__utils_h
+
+#include "FLAC/metadata.h"
+#include <stdio.h> /* for FILE */
+
+void die(const char *message);
+char *local_strdup(const char *source);
+void local_strcat(char **dest, const char *source);
+void hexdump(const char *filename, const FLAC__byte *buf, unsigned bytes, const char *indent);
+
+FLAC__bool parse_vorbis_comment_field(const char *field_ref, char **field, char **name, char **value, unsigned *length, const char **violation);
+
+void write_vc_field(const char *filename, const FLAC__StreamMetadata_VorbisComment_Entry *entry, FLAC__bool raw, FILE *f);
+void write_vc_fields(const char *filename, const char *field_name, const FLAC__StreamMetadata_VorbisComment_Entry entry[], unsigned num_entries, FLAC__bool raw, FILE *f);
+
+#endif