The R Project SVN R

Rev

Rev 87319 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 87319 Rev 87508
Line 596... Line 596...
596
	Rprintf("calling globextend from glob0\n");
596
	Rprintf("calling globextend from glob0\n");
597
#endif /* GLOB_DEBUG */
597
#endif /* GLOB_DEBUG */
598
	pglob->gl_flags = oldflags;
598
	pglob->gl_flags = oldflags;
599
	return(globextend(qpat, pglob, &limit));
599
	return(globextend(qpat, pglob, &limit));
600
    }
600
    }
601
    else if (!(pglob->gl_flags & GLOB_NOSORT))
601
    else if (!(pglob->gl_flags & GLOB_NOSORT) &&
-
 
602
	      (pglob->gl_pathc - oldpathc) > 0)
602
	qsort(pglob->gl_pathv + pglob->gl_offs + oldpathc,
603
	qsort(pglob->gl_pathv + pglob->gl_offs + oldpathc,
603
	      pglob->gl_pathc - oldpathc, sizeof(wchar_t *),
604
	      pglob->gl_pathc - oldpathc, sizeof(wchar_t *),
604
	      (pglob->gl_flags & (GLOB_ALPHASORT|GLOB_NOCASE))
605
	      (pglob->gl_flags & (GLOB_ALPHASORT|GLOB_NOCASE))
605
	      ? ci_compare : compare);
606
	      ? ci_compare : compare);
606
    pglob->gl_flags = oldflags;
607
    pglob->gl_flags = oldflags;