diff options
| author | Bruno Haible <bruno@clisp.org> | 2008-05-27 00:09:10 +0000 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2009-06-23 12:15:43 +0200 |
| commit | c049f8597eac8b19c5f316c925154ea1fd623fe6 (patch) | |
| tree | 3c784c3fc79de2637f062671f798137d5f6f0d53 /gettext-tools/libgettextpo/gettext-po.c | |
| parent | 506c01d77ecdbc7c461becd0bd87ec508e90e874 (diff) | |
| download | external_gettext-c049f8597eac8b19c5f316c925154ea1fd623fe6.zip external_gettext-c049f8597eac8b19c5f316c925154ea1fd623fe6.tar.gz external_gettext-c049f8597eac8b19c5f316c925154ea1fd623fe6.tar.bz2 | |
Fix recognition of header fields.
Diffstat (limited to 'gettext-tools/libgettextpo/gettext-po.c')
| -rw-r--r-- | gettext-tools/libgettextpo/gettext-po.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/gettext-tools/libgettextpo/gettext-po.c b/gettext-tools/libgettextpo/gettext-po.c index cb5091b..d4610c2 100644 --- a/gettext-tools/libgettextpo/gettext-po.c +++ b/gettext-tools/libgettextpo/gettext-po.c @@ -1,5 +1,5 @@ /* Public API for GNU gettext PO files. - Copyright (C) 2003-2007 Free Software Foundation, Inc. + Copyright (C) 2003-2008 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2003. This program is free software: you can redistribute it and/or modify @@ -341,14 +341,15 @@ po_header_field (const char *header, const char *field) for (line = header;;) { - if (strncmp (line, field, field_len) == 0 - && line[field_len] == ':' && line[field_len + 1] == ' ') + if (strncmp (line, field, field_len) == 0 && line[field_len] == ':') { const char *value_start; const char *value_end; char *value; - value_start = line + field_len + 2; + value_start = line + field_len + 1; + if (*value_start == ' ') + value_start++; value_end = strchr (value_start, '\n'); if (value_end == NULL) value_end = value_start + strlen (value_start); @@ -387,8 +388,7 @@ po_header_set_field (const char *header, const char *field, const char *value) for (line = header;;) { - if (strncmp (line, field, field_len) == 0 - && line[field_len] == ':' && line[field_len + 1] == ' ') + if (strncmp (line, field, field_len) == 0 && line[field_len] == ':') { const char *oldvalue_start; const char *oldvalue_end; @@ -398,7 +398,9 @@ po_header_set_field (const char *header, const char *field, const char *value) size_t result_len; char *result; - oldvalue_start = line + field_len + 2; + oldvalue_start = line + field_len + 1; + if (*oldvalue_start == ' ') + oldvalue_start++; oldvalue_end = strchr (oldvalue_start, '\n'); if (oldvalue_end == NULL) oldvalue_end = oldvalue_start + strlen (oldvalue_start); |