Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
e4ea7389
Commit
e4ea7389
authored
Nov 15, 2010
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
directory: collate file names from the same directory
parent
79f83328
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
2 deletions
+7
-2
modules/access/directory.c
modules/access/directory.c
+7
-2
No files found.
modules/access/directory.c
View file @
e4ea7389
...
@@ -96,6 +96,11 @@ static int visible (const char *name)
...
@@ -96,6 +96,11 @@ static int visible (const char *name)
return
name
[
0
]
!=
'.'
;
return
name
[
0
]
!=
'.'
;
}
}
static
int
collate
(
const
char
**
a
,
const
char
**
b
)
{
return
strcoll
(
*
a
,
*
b
);
}
/*****************************************************************************
/*****************************************************************************
* Open: open the directory
* Open: open the directory
*****************************************************************************/
*****************************************************************************/
...
@@ -140,7 +145,7 @@ int DirInit (access_t *p_access, DIR *handle)
...
@@ -140,7 +145,7 @@ int DirInit (access_t *p_access, DIR *handle)
root
->
parent
=
NULL
;
root
->
parent
=
NULL
;
root
->
handle
=
handle
;
root
->
handle
=
handle
;
root
->
uri
=
uri
;
root
->
uri
=
uri
;
root
->
filec
=
vlc_loaddir
(
handle
,
&
root
->
filev
,
visible
,
NULL
);
root
->
filec
=
vlc_loaddir
(
handle
,
&
root
->
filev
,
visible
,
collate
);
if
(
root
->
filec
<
0
)
if
(
root
->
filec
<
0
)
root
->
filev
=
NULL
;
root
->
filev
=
NULL
;
root
->
i
=
0
;
root
->
i
=
0
;
...
@@ -346,7 +351,7 @@ block_t *DirBlock (access_t *p_access)
...
@@ -346,7 +351,7 @@ block_t *DirBlock (access_t *p_access)
}
}
sub
->
parent
=
current
;
sub
->
parent
=
current
;
sub
->
handle
=
handle
;
sub
->
handle
=
handle
;
sub
->
filec
=
vlc_loaddir
(
handle
,
&
sub
->
filev
,
visible
,
NULL
);
sub
->
filec
=
vlc_loaddir
(
handle
,
&
sub
->
filev
,
visible
,
collate
);
if
(
sub
->
filec
<
0
)
if
(
sub
->
filec
<
0
)
sub
->
filev
=
NULL
;
sub
->
filev
=
NULL
;
sub
->
i
=
0
;
sub
->
i
=
0
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment