luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-08 18:24:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix sorting of 0 sequences in filenames

Browse Source
This commit is contained in:
Matthias Clasen
2005-10-07 03:04:03 +00:00
parent a8b39bf42b
commit df2746311f
4 changed files with 26 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@@ -1,3 +1,8 @@
2005-10-06 Matthias Clasen <mclasen@redhat.com>
* glib/gunicollate.c (g_utf8_collate_key_for_filename): Handle
all-zero sequences correctly. (#317930, Sebastien Bacher)
2005-10-05 Matthias Clasen <mclasen@redhat.com> 2005-10-05 Matthias Clasen <mclasen@redhat.com>
* glib/gmarkup.c (g_markup_escape_text): Doc addition * glib/gmarkup.c (g_markup_escape_text): Doc addition

5
ChangeLog.pre-2-10
View File

@@ -1,3 +1,8 @@
2005-10-06 Matthias Clasen <mclasen@redhat.com>
* glib/gunicollate.c (g_utf8_collate_key_for_filename): Handle
all-zero sequences correctly. (#317930, Sebastien Bacher)
2005-10-05 Matthias Clasen <mclasen@redhat.com> 2005-10-05 Matthias Clasen <mclasen@redhat.com>
* glib/gmarkup.c (g_markup_escape_text): Doc addition * glib/gmarkup.c (g_markup_escape_text): Doc addition

5
ChangeLog.pre-2-12
View File

@@ -1,3 +1,8 @@
2005-10-06 Matthias Clasen <mclasen@redhat.com>
* glib/gunicollate.c (g_utf8_collate_key_for_filename): Handle
all-zero sequences correctly. (#317930, Sebastien Bacher)
2005-10-05 Matthias Clasen <mclasen@redhat.com> 2005-10-05 Matthias Clasen <mclasen@redhat.com>
* glib/gmarkup.c (g_markup_escape_text): Doc addition * glib/gmarkup.c (g_markup_escape_text): Doc addition

10
glib/gunicollate.c
View File

@@ -415,8 +415,18 @@ g_utf8_collate_key_for_filename (const gchar *str,
else if (g_ascii_isdigit(*p)) else if (g_ascii_isdigit(*p))
++digits; ++digits;
else else
{
/* count an all-zero sequence as
* one digit plus leading zeros
*/
if (!digits)
{
++digits;
--leading_zeros;
}
break; break;
} }
}
while (*p != '\0'); while (*p != '\0');
while (digits > 1) while (digits > 1)