diff options
| author | Lorry Tar Creator <lorry-tar-importer@lorry> | 2015-12-28 00:06:36 +0000 |
|---|---|---|
| committer | Lorry Tar Creator <lorry-tar-importer@lorry> | 2015-12-28 00:06:36 +0000 |
| commit | 6eb5949dd99d174393465069c2fd0bab32deddcc (patch) | |
| tree | d104f72ac2dcb0f592b1c8e06a5af6790bd4080c /gettext-tools/src/msgmerge.c | |
| parent | 482840e61f86ca321838a91e902c41d40c098bbb (diff) | |
| download | gettext-tarball-6eb5949dd99d174393465069c2fd0bab32deddcc.tar.gz | |
gettext-0.19.7gettext-0.19.7
Diffstat (limited to 'gettext-tools/src/msgmerge.c')
| -rw-r--r-- | gettext-tools/src/msgmerge.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/gettext-tools/src/msgmerge.c b/gettext-tools/src/msgmerge.c index d8e02ae..50faf2d 100644 --- a/gettext-tools/src/msgmerge.c +++ b/gettext-tools/src/msgmerge.c @@ -1,5 +1,6 @@ /* GNU gettext - internationalization aids - Copyright (C) 1995-1998, 2000-2010, 2012 Free Software Foundation, Inc. + Copyright (C) 1995-1998, 2000-2010, 2012, 2015 Free Software + Foundation, Inc. This file was written by Peter Miller <millerp@canb.auug.org.au> This program is free software: you can redistribute it and/or modify @@ -1025,8 +1026,9 @@ message_merge (message_ty *def, message_ty *ref, bool force_fuzzy, char *extended = (char *) obstack_alloc (&pool, header_fields[UNKNOWN].len + len + 1); - memcpy (extended, header_fields[UNKNOWN].string, - header_fields[UNKNOWN].len); + if (header_fields[UNKNOWN].string) + memcpy (extended, header_fields[UNKNOWN].string, + header_fields[UNKNOWN].len); memcpy (&extended[header_fields[UNKNOWN].len], cp, len); extended[header_fields[UNKNOWN].len + len] = '\0'; header_fields[UNKNOWN].string = extended; @@ -1329,6 +1331,9 @@ message_merge (message_ty *def, message_ty *ref, bool force_fuzzy, result->do_wrap = ref->do_wrap; + for (i = 0; i < NSYNTAXCHECKS; i++) + result->do_syntax_check[i] = ref->do_syntax_check[i]; + /* Insert previous msgid, commented out with "#|". Do so only when --previous is specified, for backward compatibility. Since the "previous msgid" represents the original msgid that led to |