diff options
| author | Andrej Lajovic <natrij@gmail.com> | 2012-11-16 18:48:36 +0100 |
|---|---|---|
| committer | Andreas Jaeger <aj@suse.de> | 2012-11-16 18:48:36 +0100 |
| commit | d64d9f8780f4f566ff11f3b7bbb2ddeef5505d8c (patch) | |
| tree | 720216ac3a092b154533b6ac886bceff13cf1a94 | |
| parent | 447885ebf1c1fc8adf4084f5e2708ff84d0da43b (diff) | |
| download | glibc-d64d9f8780f4f566ff11f3b7bbb2ddeef5505d8c.zip glibc-d64d9f8780f4f566ff11f3b7bbb2ddeef5505d8c.tar.gz glibc-d64d9f8780f4f566ff11f3b7bbb2ddeef5505d8c.tar.bz2 | |
iconv: Fix -c
2012-11-16 Andrej Lajovic <natrij@gmail.com>
[BZ #14672]
* iconv/iconv_prog.c (main): Fix -c handling of '/'.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | NEWS | 6 | ||||
| -rw-r--r-- | iconv/iconv_prog.c | 4 |
3 files changed, 10 insertions, 5 deletions
@@ -1,3 +1,8 @@ +2012-11-16 Andrej Lajovic <natrij@gmail.com> + + [BZ #14672] + * iconv/iconv_prog.c (main): Fix -c handling of '/'. + 2012-11-16 David S. Miller <davem@davemloft.net> * sysdeps/ieee754/ldbl-128/s_log1pl.c (__log1pl): If xm1 is @@ -18,9 +18,9 @@ Version 2.17 14376, 14417, 14459, 14476, 14477, 14501, 14505, 14510, 14516, 14518, 14519, 14530, 14532, 14538, 14543, 14544, 14545, 14557, 14562, 14568, 14576, 14579, 14583, 14587, 14595, 14602, 14610, 14621, 14638, 14645, - 14648, 14652, 14660, 14661, 14669, 14683, 14694, 14716, 14743, 14767, - 14783, 14784, 14785, 14793, 14796, 14797, 14801, 14805, 14807, 14809, - 14811, 14815, 14821, 14824, 14828, 14831, 14838. + 14648, 14652, 14660, 14661, 14669, 14672, 14683, 14694, 14716, 14743, + 14767, 14783, 14784, 14785, 14793, 14796, 14797, 14801, 14805, 14807, + 14809, 14811, 14815, 14821, 14824, 14828, 14831, 14838. * Port to ARM AArch64 contributed by Linaro. diff --git a/iconv/iconv_prog.c b/iconv/iconv_prog.c index 62c6794..a2ce396 100644 --- a/iconv/iconv_prog.c +++ b/iconv/iconv_prog.c @@ -1,5 +1,5 @@ /* Convert text in given files from the specified from-set to the to-set. - Copyright (C) 1998-2011, 2012 Free Software Foundation, Inc. + Copyright (C) 1998-2012 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. @@ -155,7 +155,7 @@ main (int argc, char *argv[]) if (*errhand == '/') { --nslash; - errhand = strchrnul (errhand, '/'); + errhand = strchrnul (errhand + 1, '/'); if (*errhand == '/') { |