Attachment 315725 Details for Bug 253817 – patch for rawhide coretuils

[patch] patch for rawhide coretuils

coreutils-6.12-ls-strverscmp.patch (text/plain), 1.36 KB, created by Kamil Dudka on 2008-09-04 08:53:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kamil Dudka

Created: 2008-09-04 08:53:48 UTC

Size: 1.36 KB

patch

obsolete

>diff -ruNp coreutils-6.12.orig/lib/strverscmp.c coreutils-6.12/lib/strverscmp.c
>--- coreutils-6.12.orig/lib/strverscmp.c	2008-03-31 21:42:56.000000000 +0200
>+++ coreutils-6.12/lib/strverscmp.c	2008-08-28 13:15:35.000000000 +0200
>@@ -103,7 +103,7 @@ __strverscmp (const char *s1, const char
>   /* Hint: '0' is a digit too.  */
>   state = S_N | ((c1 == '0') + (ISDIGIT (c1) != 0));
> 
>-  while ((diff = c1 - c2) == 0 && c1 != '\0')
>+  while ((c1 - c2) == 0 && c1 != '\0')
>     {
>       state = next_state[state];
>       c1 = *p1++;
>@@ -111,6 +111,12 @@ __strverscmp (const char *s1, const char
>       state |= (c1 == '0') + (ISDIGIT (c1) != 0);
>     }
> 
>+  if (isalpha(c1) && !isalpha(c2))
>+    c1 = '\0';
>+  if (isalpha(c2) && !isalpha(c1))
>+    c2 = '\0';
>+  diff = c1 - c2;
>+
>   state = result_type[state << 2 | ((c2 == '0') + (ISDIGIT (c2) != 0))];
> 
>   switch (state)
>diff -ruNp coreutils-6.12.orig/src/Makefile.am coreutils-6.12/src/Makefile.am
>--- coreutils-6.12.orig/src/Makefile.am	2008-08-28 13:14:51.000000000 +0200
>+++ coreutils-6.12/src/Makefile.am	2008-08-28 13:16:46.000000000 +0200
>@@ -235,7 +235,7 @@ vdir_SOURCES = ls.c ls-vdir.c
> id_SOURCES = id.c group-list.c
> groups_SOURCES = groups.c group-list.c
> ln_SOURCES = ln.c
>-ls_SOURCES = ls.c ls-ls.c
>+ls_SOURCES = ls.c ls-ls.c ../lib/strverscmp.c
> chown_SOURCES = chown.c chown-core.c
> chgrp_SOURCES = chgrp.c chown-core.c
>

Actions: View | Diff

Attachments on bug 253817: 315725