diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2005-10-07 03:06:02 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2005-10-07 03:06:02 +0000 |
| commit | f3c660f8d015c11866a963dae8a6518793508ba7 (patch) | |
| tree | 3b452b56827fcabfbfb9bfa0667bb6d618061432 | |
| parent | 3f5bf4ab305690c62db6dd098d9c66f9d24e5b54 (diff) | |
| download | glib-f3c660f8d015c11866a963dae8a6518793508ba7.tar.gz | |
Handle all-zero sequences correctly. (#317930, Sebastien Bacher)
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)
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-2-12 | 5 | ||||
| -rw-r--r-- | glib/gunicollate.c | 12 |
4 files changed, 26 insertions, 1 deletions
@@ -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-03 Matthias Clasen <mclasen@redhat.com> * configure.in: Bump version number diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 3df9e8b1b..a56cf23e7 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -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-03 Matthias Clasen <mclasen@redhat.com> * configure.in: Bump version number diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 3df9e8b1b..a56cf23e7 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -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-03 Matthias Clasen <mclasen@redhat.com> * configure.in: Bump version number diff --git a/glib/gunicollate.c b/glib/gunicollate.c index 2e668427c..93954e888 100644 --- a/glib/gunicollate.c +++ b/glib/gunicollate.c @@ -415,7 +415,17 @@ g_utf8_collate_key_for_filename (const gchar *str, else if (g_ascii_isdigit(*p)) ++digits; else - break; + { + /* count an all-zero sequence as + * one digit plus leading zeros + */ + if (!digits) + { + ++digits; + --leading_zeros; + } + break; + } } while (*p != '\0'); |