libexif-cvs — CVS commitlogs of all libexif CVS modules

[libexif-cvs] libexif/libexif/canon mnote-canon-tag.c,1.15,1.16

[Dan F. <dfa...@us...>]

Update of /cvsroot/libexif/libexif/libexif/canon
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv1642/canon

Modified Files:
	mnote-canon-tag.c 
Log Message:
GNU gettext behaves strangely when given an empty string, so make sure
not to do that.


Index: mnote-canon-tag.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/canon/mnote-canon-tag.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -d -r1.15 -r1.16
--- mnote-canon-tag.c	14 Nov 2007 05:27:19 -0000	1.15
+++ mnote-canon-tag.c	31 Jan 2008 08:25:34 -0000	1.16
@@ -192,6 +192,10 @@ mnote_canon_tag_get_description (MnoteCa
 
 	bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
 	for (i = 0; i < sizeof (table) / sizeof (table[0]); i++)
-		if (table[i].tag == t) return (_(table[i].description));
+		if (table[i].tag == t) {
+			if (!*table[i].description)
+				return "";
+			return (_(table[i].description));
+		}
 	return NULL;
 }

[libexif-cvs] libexif/libexif/fuji mnote-fuji-tag.c,1.3,1.4

[Dan F. <dfa...@us...>]

Update of /cvsroot/libexif/libexif/libexif/fuji
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv1642/fuji

Modified Files:
	mnote-fuji-tag.c 
Log Message:
GNU gettext behaves strangely when given an empty string, so make sure
not to do that.


Index: mnote-fuji-tag.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/fuji/mnote-fuji-tag.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -d -r1.3 -r1.4
--- mnote-fuji-tag.c	14 Dec 2007 08:28:33 -0000	1.3
+++ mnote-fuji-tag.c	31 Jan 2008 08:25:34 -0000	1.4
@@ -96,6 +96,10 @@ mnote_fuji_tag_get_description (MnoteFuj
 
 	bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
 	for (i = 0; i < sizeof (table) / sizeof (table[0]); i++)
-		if (table[i].tag == t) return (_(table[i].description));
+		if (table[i].tag == t) {
+			if (!*table[i].description)
+				return "";
+			return (_(table[i].description));
+		}
 	return NULL;
 }

[libexif-cvs] libexif/libexif exif-entry.c, 1.115, 1.116 exif-tag.c, 1.38, 1.39

[Dan F. <dfa...@us...>]

Update of /cvsroot/libexif/libexif/libexif
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv1642

Modified Files:
	exif-entry.c exif-tag.c 
Log Message:
GNU gettext behaves strangely when given an empty string, so make sure
not to do that.


Index: exif-tag.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-tag.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -d -r1.38 -r1.39
--- exif-tag.c	15 Dec 2007 16:56:27 -0000	1.38
+++ exif-tag.c	31 Jan 2008 08:25:33 -0000	1.39
@@ -760,8 +760,13 @@ exif_tag_get_description_in_ifd (ExifTag
 
 	if (ifd >= EXIF_IFD_COUNT) return NULL;
 	for (i = 0; ExifTagTable[i].description; i++)
-		if ((ExifTagTable[i].tag == tag) && RECORDED) break;
-	return _(ExifTagTable[i].description);
+		if ((ExifTagTable[i].tag == tag) && RECORDED) {
+			/* GNU gettext acts strangely when given an empty string */
+			if (!*ExifTagTable[i].description)
+				return "";
+			return _(ExifTagTable[i].description);
+		}
+	return NULL;
 }
 
 

Index: exif-entry.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-entry.c,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -p -d -r1.115 -r1.116
--- exif-entry.c	25 Jan 2008 03:51:30 -0000	1.115
+++ exif-entry.c	31 Jan 2008 08:25:33 -0000	1.116
@@ -976,6 +976,8 @@ exif_entry_get_value (ExifEntry *e, char
 		for (j = 0; list[i].strings[j] && (j < v_short); j++);
 		if (!list[i].strings[j])
 			snprintf (val, maxlen, "%i", v_short);
+		else if (!*list[i].strings[j])
+			val[0] = 0;
 		else
 			strncpy (val, _(list[i].strings[j]), maxlen);
 		break;

[libexif-cvs] libexif/libexif/pentax mnote-pentax-tag.c,1.9,1.10

[Dan F. <dfa...@us...>]

Update of /cvsroot/libexif/libexif/libexif/pentax
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv1642/pentax

Modified Files:
	mnote-pentax-tag.c 
Log Message:
GNU gettext behaves strangely when given an empty string, so make sure
not to do that.


Index: mnote-pentax-tag.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/pentax/mnote-pentax-tag.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -d -r1.9 -r1.10
--- mnote-pentax-tag.c	14 Nov 2007 05:27:19 -0000	1.9
+++ mnote-pentax-tag.c	31 Jan 2008 08:25:34 -0000	1.10
@@ -103,6 +103,10 @@ mnote_pentax_tag_get_description (MnoteP
 
 	bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
 	for (i = 0; i < sizeof (table) / sizeof (table[0]); i++)
-		if (table[i].tag == t) return (_(table[i].description));
+		if (table[i].tag == t) {
+			if (!*table[i].description)
+				return "";
+			return (_(table[i].description));
+		}
 	return NULL;
 }

[libexif-cvs] libexif/libexif/olympus mnote-olympus-tag.c, 1.14, 1.15

[Dan F. <dfa...@us...>]

Update of /cvsroot/libexif/libexif/libexif/olympus
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv1642/olympus

Modified Files:
	mnote-olympus-tag.c 
Log Message:
GNU gettext behaves strangely when given an empty string, so make sure
not to do that.


Index: mnote-olympus-tag.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/olympus/mnote-olympus-tag.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -d -r1.14 -r1.15
--- mnote-olympus-tag.c	13 Nov 2007 02:31:23 -0000	1.14
+++ mnote-olympus-tag.c	31 Jan 2008 08:25:34 -0000	1.15
@@ -214,6 +214,10 @@ mnote_olympus_tag_get_description (Mnote
 
 	bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
 	for (i = 0; i < sizeof (table) / sizeof (table[0]); i++)
-		if (table[i].tag == t) return (_(table[i].description));
+		if (table[i].tag == t) {
+			if (!*table[i].description)
+				return "";
+			return (_(table[i].description));
+		}
 	return NULL;
 }

[libexif-cvs] libexif-testsuite/tests check-general-images.in, 1.4, 1.5

[Dan F. <dfa...@us...>]

Update of /cvsroot/libexif/libexif-testsuite/tests
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv13113/tests

Modified Files:
	check-general-images.in 
Log Message:
Verify that tag has been removed.


Index: check-general-images.in
===================================================================
RCS file: /cvsroot/libexif/libexif-testsuite/tests/check-general-images.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -d -r1.4 -r1.5
--- check-general-images.in	29 Jan 2008 04:29:48 -0000	1.4
+++ check-general-images.in	30 Jan 2008 04:14:52 -0000	1.5
@@ -86,6 +86,19 @@ do
 	fi
 	total=$(expr $total + 1)
 
+	# Check that the tag is removed
+	echo -n "Listing tag from \`${tmpimg}'..."
+	"$EXIFEXE" --tag=DateTime "${tmpimg}" > "$tmpfile" 2>&1
+	s="$?"
+	if test "$s" -eq 1; then
+		echo " ok."
+	else
+		echo " FAILED (${s})."
+		errors=$(expr $errors + 1)
+		cat "$tmpfile"
+	fi
+	total=$(expr $total + 1)
+
 	# Check that listing EXIF info still works
 	echo -n "Listing EXIF info from \`${tmpimg}'..."
 	"$EXIFEXE" "${tmpimg}" > "$tmpfile" 2>&1

[libexif-cvs] exif NEWS,1.10,1.11 configure.ac,1.14,1.15

[Dan F. <dfa...@us...>]

Update of /cvsroot/libexif/exif
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv320

Modified Files:
	NEWS configure.ac 
Log Message:
Added new Dutch translation from Erwin Poeze


Index: NEWS
===================================================================
RCS file: /cvsroot/libexif/exif/NEWS,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -d -r1.10 -r1.11
--- NEWS	25 Jan 2008 03:34:03 -0000	1.10
+++ NEWS	29 Jan 2008 20:53:09 -0000	1.11
@@ -1,7 +1,7 @@
 exif-0.6.16.x:
   * Fixed the output of -s and -t when iconv is configured
   * Updated translations: pl
-  * Added translations: sv
+  * Added translations: nl sv
   * Fixed a double character encoding conversion problem with recent
     GNU gettext because version >= 0.10.36 does the conversion of message
     texts itself.

Index: configure.ac
===================================================================
RCS file: /cvsroot/libexif/exif/configure.ac,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -d -r1.14 -r1.15
--- configure.ac	25 Jan 2008 03:34:03 -0000	1.14
+++ configure.ac	29 Jan 2008 20:53:09 -0000	1.15
@@ -39,7 +39,7 @@ GP_PKG_CONFIG
 # i18n support
 # ---------------------------------------------------------------------------
 GP_GETTEXT_HACK([${PACKAGE}],[Lutz Müller and others])
-ALL_LINGUAS="de es fr pl sv"
+ALL_LINGUAS="de es fr nl pl sv"
 AM_GNU_GETTEXT_VERSION([0.14.1])
 AM_GNU_GETTEXT([external])
 AM_PO_SUBDIRS()

[libexif-cvs] exif/po nl.po,NONE,1.1

[Dan F. <dfa...@us...>]

Update of /cvsroot/libexif/exif/po
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv320/po

Added Files:
	nl.po 
Log Message:
Added new Dutch translation from Erwin Poeze


--- NEW FILE: nl.po ---
(This appears to be a binary file; contents omitted.)

[libexif-cvs] libexif-testsuite/tests check-general-images.in, 1.3, 1.4

[Dan F. <dfa...@us...>]

Update of /cvsroot/libexif/libexif-testsuite/tests
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv24690

Modified Files:
	check-general-images.in 
Log Message:
Added thumbnail extraction and tag removal tests.


Index: check-general-images.in
===================================================================
RCS file: /cvsroot/libexif/libexif-testsuite/tests/check-general-images.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -d -r1.3 -r1.4
--- check-general-images.in	29 Nov 2007 02:00:45 -0000	1.3
+++ check-general-images.in	29 Jan 2008 04:29:48 -0000	1.4
@@ -6,6 +6,11 @@
 NOEXIFLIST='*canon-powershot-a400-001.jpg'
 
 tmpfile="./output.tmp"
+tmpimg="./output.jpg"
+
+EXIFEXE=@exif@
+
+echo Testing "$EXIFEXE"
 
 errors=0
 total=0
@@ -14,12 +19,14 @@ total_img=0
 for img in @top_srcdir@/src/pel-images/*.jpg @srcdir@/images/*.jpg
 do
 	test -f "$img" || continue
+	total_img=$(expr $total_img + 1)
+	echo \#${total_img}
 
 	# Test images without EXIF tags
 	case "$img" in 
 		*-thumb* | *no-exif* | $NOEXIFLIST)
 			echo -n "Attempting list of nonexistent EXIF data from \`${img}'..."
-			@exif@ "${img}" > "$tmpfile" 2>&1
+			"$EXIFEXE" "${img}" > "$tmpfile" 2>&1
 			s="$?"
 			if test "$s" -eq 1; then
 				echo " ok."
@@ -31,11 +38,11 @@ do
 			continue
 			;;
 	esac
-	total_img=$(expr $total_img + 1)
 
 	# Check that listing EXIF info works
 	echo -n "Listing EXIF info from \`${img}'..."
-	@exif@ "${img}" > "$tmpfile" 2>&1
+	# Run this in the C locale so the messages are known
+	env LANG=C LANGUAGE=C "$EXIFEXE" "${img}" > "$tmpfile" 2>&1
 	s="$?"
 	if test "$s" -eq 0; then
 		echo " ok."
@@ -47,13 +54,15 @@ do
 	fi
 	total=$(expr $total + 1)
 
-	check_makernote=false
-	grep "^Maker Note" < "$tmpfile" > /dev/null && check_makernote=:
+	check_makernote=
+	grep "^Maker Note" < "$tmpfile" > /dev/null && check_makernote=true
+	check_thumbnail=
+	grep "^EXIF data contains a thumbnail" < "$tmpfile" > /dev/null && check_thumbnail=true
 	rm -f "$tmpfile"
 
 	# Check that listing the makernote works
 	echo -n "Listing MNote info from \`${img}'..."
-	@exif@ --show-mnote "${img}" > "$tmpfile" 2>&1
+	"$EXIFEXE" --show-mnote "${img}" > "$tmpfile" 2>&1
 	s="$?"
 	if test "$s" -eq 0; then
 		echo " ok."
@@ -64,25 +73,64 @@ do
 	fi
 	total=$(expr $total + 1)
 
-	continue
+	# Check that removing a tag works
+	echo -n "Removing tag from \`${img}'..."
+	"$EXIFEXE" --tag=DateTime --remove "${img}" -o "$tmpimg" > "$tmpfile" 2>&1
+	s="$?"
+	if test "$s" -eq 0; then
+		echo " ok."
+	else
+		echo " FAILED (${s})."
+		errors=$(expr $errors + 1)
+		cat "$tmpfile"
+	fi
+	total=$(expr $total + 1)
 
-	# Check that extracting thumbnail works
-	# FIXME: Only do this when there actually *is* a thumbnail to extract.
-	echo -n "Extracting thumbnail from ${img}"
-	thumb="./$(basename "$img").check-general-images.thumb.out.jpg"
-	@exif@ -e -o "$thumb" "$img" > "$tmpfile" 2>&1
+	# Check that listing EXIF info still works
+	echo -n "Listing EXIF info from \`${tmpimg}'..."
+	"$EXIFEXE" "${tmpimg}" > "$tmpfile" 2>&1
 	s="$?"
 	if test "$s" -eq 0; then
 		echo " ok."
+	else
+		echo " FAILED (${s})."
 		errors=$(expr $errors + 1)
+		cat "$tmpfile"
+	fi
+	total=$(expr $total + 1)
+
+	# Check that listing the makernote still works
+	echo -n "Listing MNote info from \`${tmpimg}'..."
+	"$EXIFEXE" --show-mnote "${tmpimg}" > "$tmpfile" 2>&1
+	s="$?"
+	if test "$s" -eq 0; then
+		echo " ok."
 	else
 		echo " FAILED (${s})."
+		errors=$(expr $errors + 1)
 		cat "$tmpfile"
 	fi
-	rm -f "$tmpfile"
 	total=$(expr $total + 1)
 
-	outimg="./$(basename "$img").check-general-images.out.jpg"
+	# Check that extracting thumbnail works
+	if [ "$check_thumbnail" ] ; then
+		echo -n "Extracting thumbnail from ${img}"
+		thumb="./$(basename "$img").check-general-images.thumb.out.jpg"
+		"$EXIFEXE" -e -o "$thumb" "$img" > "$tmpfile" 2>&1
+		s="$?"
+		if test "$s" -eq 0; then
+			echo " ok."
+		else
+			echo " FAILED (${s})."
+			errors=$(expr $errors + 1)
+			cat "$tmpfile"
+		fi
+		rm -f "$tmpfile"
+		total=$(expr $total + 1)
+	else
+		echo "Skipping extract thumbnail test on ${img}"
+	fi
+
 done
 
 self="$(basename "$0")"

[libexif-cvs] libexif/libexif exif-entry.c,1.114,1.115

[Dan F. <dfa...@us...>]

Update of /cvsroot/libexif/libexif/libexif
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv13120/libexif

Modified Files:
	exif-entry.c 
Log Message:
Make sure a buffer is NUL-terminated even in an error condition.


Index: exif-entry.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-entry.c,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -p -d -r1.114 -r1.115
--- exif-entry.c	24 Jan 2008 21:45:35 -0000	1.114
+++ exif-entry.c	25 Jan 2008 03:51:30 -0000	1.115
@@ -590,16 +590,16 @@ exif_entry_get_value (ExifEntry *e, char
 	 */
 	bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
 
-	/* We need the byte order */
-	if (!e || !e->parent || !e->parent->parent)
-		return val;
-	o = exif_data_get_byte_order (e->parent->parent);
-
 	/* make sure the returned string is zero terminated */
 	memset (val, 0, maxlen);
 	maxlen--;
 	memset (b, 0, sizeof (b));
 
+	/* We need the byte order */
+	if (!e || !e->parent || !e->parent->parent)
+		return val;
+	o = exif_data_get_byte_order (e->parent->parent);
+
 	/* Sanity check */
 	if (e->size != e->components * exif_format_get_size (e->format)) {
 		snprintf (val, maxlen, _("Invalid size of entry (%i, "

[libexif-cvs] exif/exif exif-i18n.c,1.6,1.7 exif-i18n.h,1.4,1.5

[Dan F. <dfa...@us...>]

Update of /cvsroot/libexif/exif/exif
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv6219/exif

Modified Files:
	exif-i18n.c exif-i18n.h 
Log Message:
Fixed a double character encoding conversion problem with recent
GNU gettext because version >= 0.10.36 does the conversion of message
texts itself.  The user must configure with --enable-gettext-iconv when
using a gettext that does NOT do the conversion itself.


Index: exif-i18n.c
===================================================================
RCS file: /cvsroot/libexif/exif/exif/exif-i18n.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -d -r1.6 -r1.7
--- exif-i18n.c	25 Nov 2007 09:13:27 -0000	1.6
+++ exif-i18n.c	25 Jan 2008 03:34:03 -0000	1.7
@@ -13,25 +13,29 @@
 #define MIN(a, b)  (((a) < (b)) ? (a) : (b))
 
 const char *
-exif_i18n_convert_utf8_to_lat1 (const char *in)
+exif_i18n_convert_utf8_to_locale (const char *in)
 {
-	if (!in)
-		return "";
-
-#ifdef HAVE_ICONV
+#if defined(ENABLE_GETTEXT_ICONV) && defined(HAVE_ICONV)
+	/* If gettext() doesn't convert the message texts into the proper
+	 * encoding for the current locale, then it's broken (because there's
+	 * no way for the app to know the encoding of the translated text).
+	 * In this case, assume the translated text is in UTF-8 (which could
+	 * be wrong) and use iconv to convert to the proper encoding.
+	 */
 	static iconv_t tr = 0;
 	size_t t = (in ? strlen (in) : 0);
 	static char buf[2048];
 	size_t buf_size = sizeof (buf);
 	char *out = buf;
 
-	if (!in) return NULL;
+	if (!in) return "";
 
 	memset (buf, 0, sizeof (buf));
 	if (!tr) tr = iconv_open (nl_langinfo (CODESET), "UTF-8");
 	iconv (tr, (char **) &in, &t, (char **) &out, &buf_size);
 	return buf;
 #else
+	if (!in) return "";
 	return in;
 #endif
 }

Index: exif-i18n.h
===================================================================
RCS file: /cvsroot/libexif/exif/exif/exif-i18n.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -d -r1.4 -r1.5
--- exif-i18n.h	6 Jan 2008 02:39:54 -0000	1.4
+++ exif-i18n.h	25 Jan 2008 03:34:03 -0000	1.5
@@ -43,8 +43,14 @@
 #endif
 
 
-const char *exif_i18n_convert_utf8_to_lat1 (const char *);
-#define C(s) (exif_i18n_convert_utf8_to_lat1(s))
+/*! Convert a string from UTF-8 into one appropriate for the current locale
+ *  if gettext doesn't doesn't do the conversion itself.
+ *  If given a NULL pointer, returns a pointer to an empty string.
+ * \param[in] in the string to convert
+ * \returns pointer to converted string, which may be in a static buffer
+ */
+const char *exif_i18n_convert_utf8_to_locale (const char *);
+#define C(s) (exif_i18n_convert_utf8_to_locale(s))
 
 
 #endif /* __I18N_H__ */

[libexif-cvs] exif configure.ac,1.13,1.14 NEWS,1.9,1.10

[Dan F. <dfa...@us...>]

Update of /cvsroot/libexif/exif
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv6219

Modified Files:
	configure.ac NEWS 
Log Message:
Fixed a double character encoding conversion problem with recent
GNU gettext because version >= 0.10.36 does the conversion of message
texts itself.  The user must configure with --enable-gettext-iconv when
using a gettext that does NOT do the conversion itself.


Index: NEWS
===================================================================
RCS file: /cvsroot/libexif/exif/NEWS,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -d -r1.9 -r1.10
--- NEWS	23 Jan 2008 04:01:14 -0000	1.9
+++ NEWS	25 Jan 2008 03:34:03 -0000	1.10
@@ -1,9 +1,10 @@
 exif-0.6.16.x:
   * Fixed the output of -s and -t when iconv is configured
-
   * Updated translations: pl
-
   * Added translations: sv
+  * Fixed a double character encoding conversion problem with recent
+    GNU gettext because version >= 0.10.36 does the conversion of message
+    texts itself.
 
 
 exif-0.6.16:

Index: configure.ac
===================================================================
RCS file: /cvsroot/libexif/exif/configure.ac,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -d -r1.13 -r1.14
--- configure.ac	23 Jan 2008 04:01:14 -0000	1.13
+++ configure.ac	25 Jan 2008 03:34:03 -0000	1.14
@@ -1,5 +1,5 @@
 AC_PREREQ(2.59)
-AC_INIT([libexif command line interface], [0.6.15], [lib...@li...], [exif])
+AC_INIT([libexif command line interface], [0.6.15.1], [lib...@li...], [exif])
 AC_CONFIG_SRCDIR([exif/main.c])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([auto-m4])
@@ -55,6 +55,13 @@ AC_CHECK_HEADERS([locale.h])
 AC_CHECK_HEADER([iconv.h], [
 	AC_DEFINE(HAVE_ICONV,1,[whether iconv is available])])
 
+dnl Versions of GNU gettext >= 0.10.36 automatically convert messages into
+dnl the correct locale encoding, but with older versions and maybe non-GNU
+dnl versions the app needs to do that itself.
+AC_ARG_ENABLE(gettext-iconv,
+	      [  --enable-gettext-iconv  convert character encodings (only needed when gettext doesn't do it itself)],
+	      [ AC_DEFINE(ENABLE_GETTEXT_ICONV,1,[whether to run iconv on gettext output]) ])
+
 
 # ---------------------------------------------------------------------------
 # libraries needed

[libexif-cvs] exif README,1.2,1.3

[Dan F. <dfa...@us...>]

Update of /cvsroot/libexif/exif
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv4641

Modified Files:
	README 
Log Message:
Added Internationalization section


Index: README
===================================================================
RCS file: /cvsroot/libexif/exif/README,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -d -r1.2 -r1.3
--- README	12 Feb 2002 19:47:39 -0000	1.2
+++ README	25 Jan 2008 03:29:22 -0000	1.3
@@ -11,3 +11,19 @@ It depends on 
 Have fun!
 
 Lutz <lu...@us...>
+
+
+INTERNATIONALIZATION
+--------------------
+
+All translations for exif, except ru and en_CA, are coordinated by
+the Translation Project at http://translationproject.org/.  This means
+that ALL changes to the .po files (except those two exceptions) MUST be
+made through the TP web site, or they will be eventually overwritten
+and lost.  If you are interested in translating exif into a new
+language, simply join TP and start!  A translation disclaimer is NOT
+required for exif; by making a translation, you agree implicitly to
+provide it under the same license terms as the rest of exif (GPL).
+When a new version of exif is available for translation, a exif
+maintainer will contact the Translation Project and all interested TP
+members will be automatically notified.

[libexif-cvs] libexif-testsuite build-config.sh,1.4,1.5

[Dan F. <dfa...@us...>]

Update of /cvsroot/libexif/libexif-testsuite
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv28974

Modified Files:
	build-config.sh 
Log Message:
Added -d flag to cvs update command so updates work properly.


Index: build-config.sh
===================================================================
RCS file: /cvsroot/libexif/libexif-testsuite/build-config.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -d -r1.4 -r1.5
--- build-config.sh	22 May 2007 23:30:54 -0000	1.4
+++ build-config.sh	24 Jan 2008 22:55:33 -0000	1.5
@@ -99,8 +99,8 @@ while read rdir method restofline <&5; d
 			    echo "$self: Aborting." >&2
 			    exit 1
 			fi
-			echo "(cd $dir && cvs -z3 update -P ${tag})"
-			(cd "$dir" && cvs -z3 update -P ${tag})
+			echo "(cd $dir && cvs -z3 update -dPR ${tag})"
+			(cd "$dir" && cvs -z3 update -dPR ${tag})
 		elif test -d "$dir"; then
 			echo "#            exists, but not from CVS. Assuming tarball, doing nothing."
 		        echo "$self: Directory \`$dir' exists, but is no CVS directory." >&2

[libexif-cvs] libexif/po cs.po,1.11,1.12

[Dan F. <dfa...@us...>]

Update of /cvsroot/libexif/libexif/po
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv20640

Modified Files:
	cs.po 
Log Message:
Bring Czech translation in line with the newly-submitted
translationproject.org version.


Index: cs.po
===================================================================
RCS file: /cvsroot/libexif/libexif/po/cs.po,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -d -r1.11 -r1.12
--- cs.po	15 Dec 2007 16:51:13 -0000	1.11
+++ cs.po	24 Jan 2008 22:35:06 -0000	1.12
@@ -1,17 +1,15 @@
-# libexif 
-# LIBEXIF PO FILE - Czech Translation
-# Copyright:
-#    Jan Patera <pa...@us...>, 2007.
+# Czech translation for libexif.
+# Copyright (C) Jan Patera <pa...@us...>, 2007.
 # This file is distributed under the same license as the libexif package.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: libexif\n"
+"Project-Id-Version: libexif 0.6.17-pre1\n"
 "Report-Msgid-Bugs-To: lib...@li...\n"
 "POT-Creation-Date: 2007-12-14 21:08+0100\n"
-"PO-Revision-Date: 2007-05-24 06:46+0200\n"
+"PO-Revision-Date: 2007-12-15 16:51+0000\n"
 "Last-Translator: Jan Patera <pa...@us...>\n"
-"Language-Team: <cs...@li...>\n"
+"Language-Team: Czech <tra...@li...>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -4999,9 +4997,6 @@ msgstr ""
 msgid "[DO_NOT_TRANSLATE_THIS_MARKER]"
 msgstr ""
 
-#~ msgid "1x"
-#~ msgstr "1x"
-
 #~ msgid "Unknown tag."
 #~ msgstr "Neznámá značka"
 

[libexif-cvs] libexif/libexif exif-entry.c,1.113,1.114

[Dan F. <dfa...@us...>]

Update of /cvsroot/libexif/libexif/libexif
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv1094/libexif

Modified Files:
	exif-entry.c 
Log Message:
Make sure to initialize every tag entry to something sane, even if the specific
tag isn't known.


Index: exif-entry.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-entry.c,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -p -d -r1.113 -r1.114
--- exif-entry.c	9 Jan 2008 13:19:41 -0000	1.113
+++ exif-entry.c	24 Jan 2008 21:45:35 -0000	1.114
@@ -1375,8 +1375,10 @@ exif_entry_initialize (ExifEntry *e, Exi
 		break;
 
 	/* UNDEFINED, no components, no default */
+	/* Use this if the tag is otherwise unsupported */
 	case EXIF_TAG_MAKER_NOTE:
 	case EXIF_TAG_USER_COMMENT:
+	default:
 		e->components = 0;
 		e->format = EXIF_FORMAT_UNDEFINED;
 		e->size = 0;
@@ -1422,8 +1424,5 @@ exif_entry_initialize (ExifEntry *e, Exi
 		if (!e->data) break;
                 memcpy (e->data, "0210", 4);
                 break;
-
-	default:
-		break;
 	}
 }

[libexif-cvs] exif/exif main.c,1.58,1.59

[Dan F. <dfa...@us...>]

Update of /cvsroot/libexif/exif/exif
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv29938/exif

Modified Files:
	main.c 
Log Message:
Improved support for --set-value by supporting sshort and rational types.
Give errors/warnings when the incorrect number of components is given.


Index: main.c
===================================================================
RCS file: /cvsroot/libexif/exif/exif/main.c,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -d -r1.58 -r1.59
--- main.c	9 Nov 2007 06:54:54 -0000	1.58
+++ main.c	24 Jan 2008 21:36:41 -0000	1.59
@@ -104,7 +104,7 @@ search_entry (ExifData *ed, ExifTag tag,
 static void
 convert_arg_to_entry (const char *set_value, ExifEntry *e, ExifByteOrder o)
 {
-	unsigned int i;
+	unsigned int i, numcomponents;
 	char *value_p;
 
         /*
@@ -125,16 +125,27 @@ convert_arg_to_entry (const char *set_va
                 return;
 	}
 
+	/*
+	 * Make sure we can handle this entry
+	 */
+	if ((e->components == 0) && *set_value) {
+		fprintf (stderr, _("Setting a value for this tag "
+				   "is unsupported!"));
+		fputc ('\n', stderr);
+		exit (1);
+	}
+
         value_p = (char*) set_value;
-	for (i = 0; i < e->components; i++) {
+	numcomponents = e->components;
+	for (i = 0; i < numcomponents; ++i) {
                 const char *begin, *end;
                 unsigned char *buf, s;
-                const char comp_separ = ' ';
+		static const char comp_separ = ' ';
 
                 begin = value_p;
 		value_p = strchr (begin, comp_separ);
 		if (!value_p) {
-                        if (i != e->components - 1) {
+                        if (i != numcomponents - 1) {
                                 fprintf (stderr, _("Too few components "
 						   "specified!"));
 				fputc ('\n', stderr);
@@ -155,15 +166,36 @@ convert_arg_to_entry (const char *set_va
 		case EXIF_FORMAT_SHORT:
 			exif_set_short (e->data + (s * i), o, atoi ((char *) buf));
 			break;
+		case EXIF_FORMAT_SSHORT:
+			exif_set_sshort (e->data + (s * i), o, atoi ((char *) buf));
+			break;
+		case EXIF_FORMAT_RATIONAL:
+			/*
+			 * Hack to simplify the loop for rational numbers.
+			 * Should really be using exif_set_rational instead
+			 */
+			if (i == 0) numcomponents *= 2;
+			s /= 2;
+			/* Fall through to LONG handler */
 		case EXIF_FORMAT_LONG:
 			exif_set_long (e->data + (s * i), o, atol ((char *) buf));
 			break;
+		case EXIF_FORMAT_SRATIONAL:
+			/*
+			 * Hack to simplify the loop for rational numbers.
+			 * Should really be using exif_set_srational instead
+			 */
+			if (i == 0) numcomponents *= 2;
+			s /= 2;
+			/* Fall through to SLONG handler */
 		case EXIF_FORMAT_SLONG:
 			exif_set_slong (e->data + (s * i), o, atol ((char *) buf));
 			break;
-		case EXIF_FORMAT_RATIONAL:
-		case EXIF_FORMAT_SRATIONAL:
 		case EXIF_FORMAT_BYTE:
+		case EXIF_FORMAT_SBYTE:
+		case EXIF_FORMAT_FLOAT:
+		case EXIF_FORMAT_DOUBLE:
+		case EXIF_FORMAT_UNDEFINED:
 		default:
 			fprintf (stderr, _("Not yet implemented!"));
 			fputc ('\n', stderr);
@@ -171,6 +203,10 @@ convert_arg_to_entry (const char *set_va
 		}
 		free (buf);
 	}
+	if (value_p && *value_p) {
+		fprintf (stderr, _("Warning; Too many components specified!"));
+		fputc ('\n', stderr);
+	}
 }
 
 /* escape codes for output colors */

[libexif-cvs] exif exif.1,1.5,1.6

[Dan F. <dfa...@us...>]

Update of /cvsroot/libexif/exif
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv26802

Modified Files:
	exif.1 
Log Message:
Improved the documentation


Index: exif.1
===================================================================
RCS file: /cvsroot/libexif/exif/exif.1,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -d -r1.5 -r1.6
--- exif.1	23 Mar 2005 15:52:19 -0000	1.5
+++ exif.1	24 Jan 2008 21:27:52 -0000	1.6
@@ -14,8 +14,9 @@
 .\" License.
 .\" Modified 2002-09-08 by thomas
 .\" Modified 2005-03-23 by hun
+.\" Modified 2008-01-24 by dfandrich
 .\"
-.TH exif 1 "2005-03-23" "" "libexif command line frontend"
+.TH exif 1 "2008-01-24" "" "libexif command line frontend"
 .SH "NAME"
 exif \- shows EXIF information in JPEG files
 .SH "SYNOPSIS"
@@ -29,54 +30,79 @@ Most digital cameras produce EXIF files,
 command line utility allows you to read EXIF information from and write EXIF information to those files.
 .PP
 .B "exif"
-internall uses the
+internally uses the
 .B "libexif"
 library.
 .SH "OPTIONS"
 .TP
+.BI "\-v, \-\-version"
+Display the exif version number
+.TP
 .BI "\-i, \-\-ids"
-Show IDs instead of tag names
+Show ID numbers instead of tag names
 .TP
 .BI "\-t, \-\-tag=" "tag"
-Select
+Select only the given EXIF
 .I "tag"
+which is the textual short tag name or numeric tag number (hexadecimal
+numbers are prefixed with 0x), from the IFD specified with \-\-ifd
 .TP
 .BI "\-\-ifd=" "IFD"
 Select
 .I "IFD"
+where valid IFDs are "0", "1", "EXIF", "GPS", and "Interoperability".
+Defaults to "0".
 .TP
 .BI "\-l, \-\-list\-tags"
-List all EXIF tags
+List all known EXIF tags.  A JPEG file with valid EXIF information must
+be given to use this option, but its contents are ignored.
 .TP
 .BI "\-|, \-\-show\-mnote"
-Show contents of tag MakerNote
+Show contents of tag MakerNote. The contents of this tag is nonstandard (and
+often undocumented) and may therefore not be recognized, or if it is
+recognized it may not be correctly interpreted.
 .TP
 .BI "\-\-remove"
-Remove tag or ifd
+Remove tag or entire IFD (if no tag is specified).
 .TP
 .BI "\-s, \-\-show\-description"
-Show description of tag
+Show description of tag.  The \-\-tag option must also be given.
 .TP
 .BI "\-e, \-\-extract\-thumbnail"
-Extract thumbnail
+Extract thumbnail, writing the thumbnail image to the file specified
+with \-\-output.
 .TP
 .BI "\-r, \-\-remove\-thumbnail"
-Remove thumbnail
+Remove thumbnail from image, writing the new image to the file specified
+with \-\-output.
 .TP
 .BI "-n, \-\-insert\-thumbnail=" "FILE"
 Insert
 .I "FILE"
-as thumbnail
+as thumbnail.  No attempt is made to ensure that the contents of "FILE" is
+in a valid thumbnail format.
 .TP
 .BI "\-o, \-\-output=" "FILE"
-Write output to
-.I "FILE"
+Write output image to
+.IR "FILE" .
+If this option is not given and an image file must be written, the
+name used is the same as the input file with a suffix ".modified.jpeg".
 .TP
 .BI "\-\-set\-value=" "VALUE"
-Set value
+Set the data for the tag specified with \-\-tag and \-\-ifd to "VALUE".
+Compound values consisting of multiple components are separated with
+spaces.
 .TP
 .BI "\-m, \-\-machine\-readable"
 Output in machine-readable (tab delimited) format
+The \-\-xml-output and \-\-machine\-readable options are mutually exclusive.
+.TP
+.BI "\-x, \-\-xml-output"
+Output in an XML format (when possible).
+The \-\-xml-output and \-\-machine\-readable options are mutually exclusive.
+.TP
+.BI "\-d, \-\-debug"
+Show debugging messages
 .SS "Help options"
 .TP
 .BI "\-?, \-\-help"

[libexif-cvs] libexif README,1.14,1.15

[Dan F. <dfa...@us...>]

Update of /cvsroot/libexif/libexif
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv27817

Modified Files:
	README 
Log Message:
Added Internationalization section.


Index: README
===================================================================
RCS file: /cvsroot/libexif/libexif/README,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -d -r1.14 -r1.15
--- README	14 Dec 2007 20:06:32 -0000	1.14
+++ README	24 Jan 2008 18:45:22 -0000	1.15
@@ -93,6 +93,22 @@ to build. In my case, I do something lik
 - make
 
 
+INTERNATIONALIZATION
+--------------------
+
+All translations for libexif, except ru and en_CA, are coordinated by
+the Translation Project at http://translationproject.org/.  This means
+that ALL changes to the .po files (except those two exceptions) MUST be
+made through the TP web site, or they will be eventually overwritten
+and lost.  If you are interested in translating libexif into a new
+language, simply join TP and start!  A translation disclaimer is NOT
+required for libexif; by making a translation, you agree implicitly to
+provide it under the same license terms as the rest of libexif (LGPL).
+When a new version of libexif is available for translation, a libexif
+maintainer will contact the Translation Project and all interested TP
+members will be automatically notified.
+
+
 AUTHORS
 -------
 

[libexif-cvs] libexif NEWS,1.34,1.35

[Dan F. <dfa...@us...>]

Update of /cvsroot/libexif/libexif
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv24402

Modified Files:
	NEWS 
Log Message:
Mention the security fixes.


Index: NEWS
===================================================================
RCS file: /cvsroot/libexif/libexif/NEWS,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -d -r1.34 -r1.35
--- NEWS	24 Jan 2008 00:43:48 -0000	1.34
+++ NEWS	24 Jan 2008 01:16:27 -0000	1.35
@@ -2,7 +2,7 @@ libexif-0.6.16.2:
   * Updated translations: cs, de, pl, sk, vi
   * New translations: nl, se, en_CA
   * Enabled sv translation by default
-  * Bug fixes: #1773810, #1774626
+  * Bug fixes: #1773810, #1774626, CVE-2007-6351, CVE-2007-6352
   * Enhanced support of Canon and Olympus makernotes 
   * Added support for Fuji and Sanyo makernotes
   * Added support for the NO_VERBOSE_TAG_STRINGS and NO_VERBOSE_TAG_DATA

[libexif-cvs] libexif NEWS,1.33,1.34

[Dan F. <dfa...@us...>]

Update of /cvsroot/libexif/libexif
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv11767

Modified Files:
	NEWS 
Log Message:
Updated nl translation by Freek de Kruijf.
Enabled nl and sv translations in configure.ac


Index: NEWS
===================================================================
RCS file: /cvsroot/libexif/libexif/NEWS,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -d -r1.33 -r1.34
--- NEWS	7 Dec 2007 09:13:49 -0000	1.33
+++ NEWS	24 Jan 2008 00:43:48 -0000	1.34
@@ -1,6 +1,7 @@
 libexif-0.6.16.2:
   * Updated translations: cs, de, pl, sk, vi
   * New translations: nl, se, en_CA
+  * Enabled sv translation by default
   * Bug fixes: #1773810, #1774626
   * Enhanced support of Canon and Olympus makernotes 
   * Added support for Fuji and Sanyo makernotes

[libexif-cvs] libexif/po nl.po,1.2,1.3

[Dan F. <dfa...@us...>]

Update of /cvsroot/libexif/libexif/po
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv11020/po

Modified Files:
	nl.po 
Log Message:
Updated nl translation by Freek de Kruijf.
Enabled nl and sv translations in configure.ac


Index: nl.po
===================================================================
RCS file: /cvsroot/libexif/libexif/po/nl.po,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -d -r1.2 -r1.3
--- nl.po	1 Nov 2007 06:39:01 -0000	1.2
+++ nl.po	24 Jan 2008 00:42:46 -0000	1.3
@@ -1,1259 +1,1585 @@
-# translation of libexif-0.6.16.po to Dutch
+# translation of libexif-0.6.17-pre1.po to Dutch
 # Copyright (C) YEAR Lutz Mueller and others
 # This file is distributed under the same license as the PACKAGE package.
 #
-# Freek de Kruijf <f.d...@he...>, 2007.
+# Freek de Kruijf <f.d...@he...>, 2007, 2008.
 msgid ""
 msgstr ""
-"Project-Id-Version: libexif-0.6.16\n"
+"Project-Id-Version: libexif-0.6.17-pre1\n"
[...5434 lines suppressed...]
-#: libexif/pentax/mnote-pentax-tag.c:68
+#: libexif/pentax/mnote-pentax-tag.c:69
 msgid "Auto AF Point"
 msgstr ""
 
-#: libexif/pentax/mnote-pentax-tag.c:70
+#: libexif/pentax/mnote-pentax-tag.c:71
 msgid "Object Distance"
 msgstr ""
 
-#: libexif/pentax/mnote-pentax-tag.c:70
+#: libexif/pentax/mnote-pentax-tag.c:71
 msgid "Distance of photographed object in millimeters."
 msgstr ""
 
-#: libexif/pentax/mnote-pentax-tag.c:72
+#: libexif/pentax/mnote-pentax-tag.c:73
 msgid "Bestshot mode"
 msgstr ""
 

[libexif-cvs] libexif configure.ac,1.41,1.42

[Dan F. <dfa...@us...>]

Update of /cvsroot/libexif/libexif
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv11020

Modified Files:
	configure.ac 
Log Message:
Updated nl translation by Freek de Kruijf.
Enabled nl and sv translations in configure.ac


Index: configure.ac
===================================================================
RCS file: /cvsroot/libexif/libexif/configure.ac,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -d -r1.41 -r1.42
--- configure.ac	18 Dec 2007 20:18:22 -0000	1.41
+++ configure.ac	24 Jan 2008 00:42:46 -0000	1.42
@@ -152,7 +152,7 @@ AM_CONDITIONAL([ENABLE_INTERNAL_DOCS], [
 # ---------------------------------------------------------------------------
 # i18n support
 # ---------------------------------------------------------------------------
-ALL_LINGUAS="cs de en_CA es fr pl ru sk vi"
+ALL_LINGUAS="cs de en_CA es fr nl pl ru sk sv vi"
 AM_PO_SUBDIRS
 GP_GETTEXT_HACK([${PACKAGE}-${LIBEXIF_CURRENT_MIN}],
                 [Lutz Mueller and others])

[libexif-cvs] exif/libjpeg jpeg-marker.c,1.3,1.4

[Dan F. <dfa...@us...>]

Update of /cvsroot/libexif/exif/libjpeg
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv25229/libjpeg

Modified Files:
	jpeg-marker.c 
Log Message:
Fixed a compiler warning.  Made sure some fixed buffers were NUL-terminated.
Made a static table const.


Index: jpeg-marker.c
===================================================================
RCS file: /cvsroot/libexif/exif/libjpeg/jpeg-marker.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -d -r1.3 -r1.4
--- jpeg-marker.c	15 Dec 2002 11:39:13 -0000	1.3
+++ jpeg-marker.c	23 Jan 2008 22:38:41 -0000	1.4
@@ -1,6 +1,6 @@
 /* jpeg-marker.c
  *
- * Copyright © 2001 Lutz Müller <lu...@us...>
+ * Copyright © 2001-2008 Lutz Müller <lu...@us...>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -22,7 +22,7 @@
 
 #include <stdlib.h>
 
-static struct {
+static const struct {
         JPEGMarker marker;
         const char *name;
         const char *description;

[libexif-cvs] exif/exif actions.c,1.29,1.30

[Dan F. <dfa...@us...>]

Update of /cvsroot/libexif/exif/exif
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv25229/exif

Modified Files:
	actions.c 
Log Message:
Fixed a compiler warning.  Made sure some fixed buffers were NUL-terminated.
Made a static table const.


Index: actions.c
===================================================================
RCS file: /cvsroot/libexif/exif/exif/actions.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -d -r1.29 -r1.30
--- actions.c	6 Jan 2008 02:39:54 -0000	1.29
+++ actions.c	23 Jan 2008 22:38:40 -0000	1.30
@@ -1,6 +1,6 @@
 /* actions.c
  *
- * Copyright © 2002 Lutz Müller <lu...@us...>
+ * Copyright © 2002-2008 Lutz Müller <lu...@us...>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -132,9 +132,11 @@ action_mnote_list (const char *filename,
 		} else {
 			p = C (exif_mnote_data_get_title (n, i));
 			strncpy (b1, p && *p ? p : _("Unknown tag"), bs);
+			b1[sizeof(b1)-1] = 0;
 		}
 		p = C (exif_mnote_data_get_value (n, i, b, bs));
 		strncpy (b2, p ? p : _("Unknown value"), bs);
+		b2[sizeof(b2)-1] = 0;
 		/* printf ("%s|%s\n", b1, b2); */
         	if (ids)
                 	fprintf (stdout, "%-6.6s", b1);
@@ -142,7 +144,7 @@ action_mnote_list (const char *filename,
                 	fprintf (stdout, "%-20.20s", b1);
 		fputc ('|', stdout);
         	if (ids) {
-			fputs (CN (b2), stdout);
+			fputs (b2, stdout);
         	} else {
                 	fprintf (stdout, "%-58.58s", b2);
 		}