From: Dan F. <dfa...@us...> - 2009-11-24 04:52:22
|
Update of /cvsroot/libexif/exif/exif In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv23760/exif Modified Files: actions.c main.c Log Message: Honour --machine-readable with --show-mnote Index: main.c =================================================================== RCS file: /cvsroot/libexif/exif/exif/main.c,v retrieving revision 1.78 retrieving revision 1.79 diff -u -p -d -r1.78 -r1.79 --- main.c 20 Nov 2009 21:04:36 -0000 1.78 +++ main.c 24 Nov 2009 04:52:11 -0000 1.79 @@ -409,12 +409,17 @@ main (int argc, const char **argv) action_set_value (ed, log, p); else if (remove_tag) action_remove_tag (ed, log, p); - else if (p.machine_readable) + else if (list_mnote) { + if (xml_output) { + exif_log (log, -1, "exif", _("XML format is " + "not available for Maker Notes")); + return 1; + } + action_mnote_list (ed, p); + } else if (p.machine_readable) action_tag_list_machine (ed, p); else if (xml_output) action_tag_list_xml (ed, p); - else if (list_mnote) - action_mnote_list (ed, p); else if (create_exif) /* Nothing here. Data will be saved later. */ ; Index: actions.c =================================================================== RCS file: /cvsroot/libexif/exif/exif/actions.c,v retrieving revision 1.52 retrieving revision 1.53 diff -u -p -d -r1.52 -r1.53 --- actions.c 22 Nov 2009 05:52:53 -0000 1.52 +++ actions.c 24 Nov 2009 04:52:11 -0000 1.53 @@ -472,14 +472,16 @@ action_mnote_list (ExifData *ed, ExifPar } c = exif_mnote_data_count (n); - switch (c) { - case 0: - printf (_("MakerNote does not contain any value.\n")); - break; - default: - printf (ngettext("MakerNote contains %i value:\n", - "MakerNote contains %i values:\n", - c), c); + if (!p.machine_readable) { + switch (c) { + case 0: + printf (_("MakerNote does not contain any value.\n")); + break; + default: + printf (ngettext("MakerNote contains %i value:\n", + "MakerNote contains %i values:\n", + c), c); + } } for (i = 0; i < c; i++) { if (p.use_ids) { @@ -490,10 +492,13 @@ action_mnote_list (ExifData *ed, ExifPar strncpy (b1, s && *s ? s : _("Unknown tag"), TAG_VALUE_BUF); b1[sizeof(b1)-1] = 0; } - fieldwidth = width = p.use_ids ? 6 : 20; - bytes = exif_mbstrlen(b1, &width); - printf ("%.*s%*s", bytes, b1, fieldwidth-width, ""); - fputc ('|', stdout); + if (p.machine_readable) { + printf ("%s\t", b1); + } else { + fieldwidth = width = p.use_ids ? 6 : 20; + bytes = exif_mbstrlen(b1, &width); + printf ("%.*s%*s|", bytes, b1, fieldwidth-width, ""); + } s = C (exif_mnote_data_get_value (n, i, b, TAG_VALUE_BUF)); strncpy (b2, s ? s : _("Unknown value"), TAG_VALUE_BUF); |