From 6e4c40baacfd7eaf1578f707759d79b5d95d626c Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Wed, 9 Sep 1998 11:53:19 +0000 Subject: Update. 1998-09-09 09:32 Ulrich Drepper * sysdeps/powerpc/dl-machine.h (elf_machine_rela): Make function inline. 1998-09-07 Paul Eggert * time/mktime.c (__EXTENSIONS__): Define if not defined. (_REENTRANT): Remove. It has undesirable consequences in Solaris 2.6 (e.g. it turns off the putc macro). Defining __EXTENSIONS__ makes localtime_r and gmtime_r visible, which is what we want. * time/strftime.c: Likewise. 1998-09-08 Andreas Schwab * elf/dl-error.c: Fix spelling. 1998-09-08 Andreas Schwab * stdlib/strfmon.c: Quiet -Wparentheses warnings. * stdio-common/_itoa.c: Likewise. * stdio-common/printf_fp.c: Likewise. * stdio-common/vfscanf.c: Likewise. * wcsmbs/wcstok.c: Likewise. * sysdeps/generic/glob.c: Likewise. * posix/getopt.c: Likewise. * sysdeps/posix/getaddrinfo.c: Likewise. * posix/wordexp.c: Likewise. * io/ftw.c: Likewise. * io/fts.c: Likewise. * misc/getpass.c: Likewise. * iconv/gconv_conf.c: Likewise. * argp/argp-fmtstream.c: Likewise. * argp/argp-help.c: Likewise. * elf/dl-load.c: Likewise. * locale/programs/stringtrans.c: Likewise. * catgets/gencat.c: Likewise. * posix/getconf.c: Likewise. * iconv/gconv_conf.c: Likewise. * iconv/iconv_prog.c: Likewise. * string/strcoll.c: Optimize a few expressions. * string/strxfrm.c: Likewise. 1998-09-08 Andreas Schwab * elf/dl-open.c (dl_open_worker): Move decl of new_global up one level to avoid uninit variable warning. 1998-09-09 10:34 Andreas Schwab instead of _dl_default_scope[2] as argument to _dl_init_next. Fix compatibility problems introduced in last change. --- posix/wordexp.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) (limited to 'posix/wordexp.c') diff --git a/posix/wordexp.c b/posix/wordexp.c index dff5d30dad..0eb0721230 100644 --- a/posix/wordexp.c +++ b/posix/wordexp.c @@ -426,6 +426,7 @@ parse_glob (char **word, size_t *word_length, size_t *max_length, /* Sort out quoting */ if (words[*offset] == '\'') + { if (quoted == 0) { quoted = 1; @@ -436,17 +437,20 @@ parse_glob (char **word, size_t *word_length, size_t *max_length, quoted = 0; continue; } + } else if (words[*offset] == '"') - if (quoted == 0) - { - quoted = 2; - continue; - } - else if (quoted == 2) - { - quoted = 0; - continue; - } + { + if (quoted == 0) + { + quoted = 2; + continue; + } + else if (quoted == 2) + { + quoted = 0; + continue; + } + } /* Sort out other special characters */ if (quoted != 1 && words[*offset] == '$') -- cgit v1.2.3