Attachment #51298 for bug #118991

View | Details | Raw Unified | Return to bug 118991
Collapse All | Expand All




		strncat (val, _("(Photographer)"), maxlen - strlen (val));

		/* Second part: Editor. */
		t = e->data + strlen ((char *) e->data) + 1;
		ts = e->data + e->size - t;
		strncat (val, " - ", maxlen - strlen (val));
		if (e->size && e->data) {
		    t = e->data + strlen ((char *) e->data) + 1;
		    ts = e->data + e->size - t;
		    if ((ts > 0) && (strspn ((char *)t, " ") != ts))
			strncat (val, (char *)t, MIN (maxlen - strlen (val), ts));
		} else {
			strncat (val, _("[None]"), maxlen - strlen (val));
		}
		strncat (val, " ", maxlen - strlen (val));
		strncat (val, _("(Editor)"), maxlen - strlen (val));


Return to bug 118991

Lines 682-695 Link Here

(-)exif-entry.c (-5 / +6 lines)
682	strncat (val, _("(Photographer)"), maxlen - strlen (val));	682	strncat (val, _("(Photographer)"), maxlen - strlen (val));
683		683
684	/* Second part: Editor. */	684	/* Second part: Editor. */
685	t = e->data + strlen ((char *) e->data) + 1;
686	ts = e->data + e->size - t;
687	strncat (val, " - ", maxlen - strlen (val));	685	strncat (val, " - ", maxlen - strlen (val));
688	if (e->size && e->data && (ts > 0) &&	686	if (e->size && e->data) {
689	(strspn ((char *)t, " ") != ts))	687	t = e->data + strlen ((char *) e->data) + 1;
		688	ts = e->data + e->size - t;
		689	if ((ts > 0) && (strspn ((char *)t, " ") != ts))
690	strncat (val, (char *)t, MIN (maxlen - strlen (val), ts));	690	strncat (val, (char *)t, MIN (maxlen - strlen (val), ts));
691	else	691	} else {
692	strncat (val, _("[None]"), maxlen - strlen (val));	692	strncat (val, _("[None]"), maxlen - strlen (val));
		693	}
693	strncat (val, " ", maxlen - strlen (val));	694	strncat (val, " ", maxlen - strlen (val));
694	strncat (val, _("(Editor)"), maxlen - strlen (val));	695	strncat (val, _("(Editor)"), maxlen - strlen (val));
695		696