rpms/dietlibc/devel dietlibc-0.31.20080212-strend.patch,1.1,1.2

[Enrico Scholz (ensc)]

Author: ensc

Update of /cvs/extras/rpms/dietlibc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404

Modified Files:
	dietlibc-0.31.20080212-strend.patch 
Log Message:
further fixes

dietlibc-0.31.20080212-strend.patch:

Index: dietlibc-0.31.20080212-strend.patch
===================================================================
RCS file: /cvs/extras/rpms/dietlibc/devel/dietlibc-0.31.20080212-strend.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dietlibc-0.31.20080212-strend.patch	14 Feb 2008 21:51:41 -0000	1.1
+++ dietlibc-0.31.20080212-strend.patch	14 Feb 2008 22:06:18 -0000	1.2
@@ -1,6 +1,6 @@
-diff -upN dietlibc-0.31.20080212/lib/strcpy.c.~1~ dietlibc-0.31.20080212/lib/strcpy.c
---- dietlibc-0.31.20080212/lib/strcpy.c.~1~	2008-02-14 21:51:56.000000000 +0100
-+++ dietlibc-0.31.20080212/lib/strcpy.c	2008-02-14 22:45:56.000000000 +0100
+diff -upN dietlibc-0.31.20080212/lib/strcpy.c.strend dietlibc-0.31.20080212/lib/strcpy.c
+--- dietlibc-0.31.20080212/lib/strcpy.c.strend	2008-02-14 22:48:00.000000000 +0100
++++ dietlibc-0.31.20080212/lib/strcpy.c	2008-02-14 22:48:00.000000000 +0100
 @@ -26,8 +26,7 @@ strcpy (char *s1, const char *s2)
      while (1) {
  	l = *(const unsigned long *) s2;
@@ -11,16 +11,16 @@
  	    return (res);
  	}
  	*(unsigned long *) s1 = l;
-diff -upN dietlibc-0.31.20080212/lib/strcmp.c.~1~ dietlibc-0.31.20080212/lib/strcmp.c
---- dietlibc-0.31.20080212/lib/strcmp.c.~1~	2008-02-14 21:51:56.000000000 +0100
-+++ dietlibc-0.31.20080212/lib/strcmp.c	2008-02-14 22:44:44.000000000 +0100
+diff -upN dietlibc-0.31.20080212/lib/strcmp.c.strend dietlibc-0.31.20080212/lib/strcmp.c
+--- dietlibc-0.31.20080212/lib/strcmp.c.strend	2008-02-14 22:48:00.000000000 +0100
++++ dietlibc-0.31.20080212/lib/strcmp.c	2008-02-14 23:02:14.000000000 +0100
 @@ -35,12 +35,12 @@ strcmp (const char *s1, const char *s2)
              ((((l2 - MKW(0x1ul)) & ~l2) & MKW(0x80ul))) || l1 != l2) {
              unsigned char c1, c2;
              while (1) {
 -                c1 = l1 & 0xff;
 -                c2 = l2 & 0xff;
-+	        c1 = GFC(l1);
++		c1 = GFC(l1);
 +                c2 = GFC(l2);
                  if (!c1 || c1 != c2)
                      return (c1 - c2);
@@ -31,9 +31,9 @@
              }
          }
      }
-diff -upN dietlibc-0.31.20080212/dietstring.h.~1~ dietlibc-0.31.20080212/dietstring.h
---- dietlibc-0.31.20080212/dietstring.h.~1~	2003-12-21 13:06:36.000000000 +0100
-+++ dietlibc-0.31.20080212/dietstring.h	2008-02-14 22:45:56.000000000 +0100
+diff -upN dietlibc-0.31.20080212/dietstring.h.strend dietlibc-0.31.20080212/dietstring.h
+--- dietlibc-0.31.20080212/dietstring.h.strend	2003-12-21 13:06:36.000000000 +0100
++++ dietlibc-0.31.20080212/dietstring.h	2008-02-14 23:03:51.000000000 +0100
 @@ -11,6 +11,16 @@
  # define STRALIGN(x) (((unsigned long)x&3)?4-((unsigned long)x&3):0)
  #endif
@@ -44,7 +44,7 @@
 +# define GFC(x) ((x)&0xff)
 +# define INCSTR(x) do { x >>= 8; } while (0)
 +#else
-+# define GFC(x) (((x)>>(sizeof(x)-8))&0xff)
++# define GFC(x) (((x)>>(sizeof(x)*8-8))&0xff)
 +# define INCSTR(x) do { x <<= 8; } while (0)
 +#endif
 +