mirror of
https://https.git.savannah.gnu.org/git/bash.git
synced 2026-07-19 01:42:51 +02:00
commit bash-20070329 snapshot
This commit is contained in:
+1
-1
@@ -184,7 +184,7 @@ mbskipname (pat, dname)
|
||||
{
|
||||
int ret;
|
||||
wchar_t *pat_wc, *dn_wc;
|
||||
size_t pat_n, dn_n, n;
|
||||
size_t pat_n, dn_n;
|
||||
|
||||
pat_n = xdupmbstowcs (&pat_wc, NULL, pat);
|
||||
dn_n = xdupmbstowcs (&dn_wc, NULL, dname);
|
||||
|
||||
+5
-3
@@ -20,9 +20,11 @@
|
||||
|
||||
#include "stdc.h"
|
||||
|
||||
#define GX_MARKDIRS 0x01 /* mark directory names with trailing `/' */
|
||||
#define GX_NOCASE 0x02 /* ignore case */
|
||||
#define GX_MATCHDOT 0x04 /* match `.' literally */
|
||||
#define GX_MARKDIRS 0x001 /* mark directory names with trailing `/' */
|
||||
#define GX_NOCASE 0x002 /* ignore case */
|
||||
#define GX_MATCHDOT 0x004 /* match `.' literally */
|
||||
#define GX_ALLDIRS 0x008 /* match all directories */
|
||||
#define GX_MATCHDIRS 0x010 /* return only matching directory names */
|
||||
|
||||
extern int glob_pattern_p __P((const char *));
|
||||
extern char **glob_vector __P((char *, char *, int));
|
||||
|
||||
@@ -247,7 +247,6 @@ rangecmp_wc (c1, c2)
|
||||
{
|
||||
static wchar_t s1[2] = { L' ', L'\0' };
|
||||
static wchar_t s2[2] = { L' ', L'\0' };
|
||||
int ret;
|
||||
|
||||
if (c1 == c2)
|
||||
return 0;
|
||||
|
||||
@@ -145,7 +145,8 @@ xdupmbstowcs (destp, indicesp, src)
|
||||
/* In case SRC or DESP is NULL, conversion doesn't take place. */
|
||||
if (src == NULL || destp == NULL)
|
||||
{
|
||||
*destp = NULL;
|
||||
if (destp)
|
||||
*destp = NULL;
|
||||
return (size_t)-1;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user