diff options
| author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2012-11-17 17:50:14 +0000 |
|---|---|---|
| committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2012-11-17 17:50:14 +0000 |
| commit | c27e56d74f3fb58f18e5381e49d30e1134b2005e (patch) | |
| tree | 961e5061add44ed5f4bdded12ae6f2bb7d4c930a /libc/iconv/iconv_prog.c | |
| parent | 976bc9d4ac64f30edc1e8fa8ec7552703f04a6de (diff) | |
| download | eglibc2-c27e56d74f3fb58f18e5381e49d30e1134b2005e.tar.gz | |
Merge changes between r21628 and r21775 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@21776 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/iconv/iconv_prog.c')
| -rw-r--r-- | libc/iconv/iconv_prog.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libc/iconv/iconv_prog.c b/libc/iconv/iconv_prog.c index db917c5a3..b99d35367 100644 --- a/libc/iconv/iconv_prog.c +++ b/libc/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. @@ -156,7 +156,7 @@ main (int argc, char *argv[]) if (*errhand == '/') { --nslash; - errhand = strchrnul (errhand, '/'); + errhand = strchrnul (errhand + 1, '/'); if (*errhand == '/') { |